소스 검색

fix: 已拍完一张后退出重新进入,不需要在次拍照

xuqiaoying 2 년 전
부모
커밋
f41d85a8b3
2개의 변경된 파일14개의 추가작업 그리고 31개의 파일을 삭제
  1. 6 5
      pages3/live/detail.vue
  2. 8 26
      pages3/polyv/detail.vue

+ 6 - 5
pages3/live/detail.vue

@@ -1029,7 +1029,7 @@ export default {
 			this.$api.studyRecordQueryLiveLast({
 				orderGoodsId:this.orderGoodsId,
 				courseId:this.courseId
-			}).then(res => {
+			}).then(async res => {
 				console.log(res,'couse')
 				if(res.data.data) {
           this.moduleId = res.data.data.moduleId
@@ -1038,6 +1038,7 @@ export default {
 					this.$store.commit("setPlaySectionId", { playSectionId: res.data.data.sectionId });
 					this.$store.commit("setPlayVID", { playVID: res.data.data.recordingUrl });
 					this.sectionItem = res.data.data;
+          await this.getPhotoLastRecord() // 获取拍照历史
 						this.playVideo(res.data.data)
 					} else if(res.data.data.sectionType == 2) { //直播
 						this.studyRecordGetLastLive();
@@ -1049,6 +1050,7 @@ export default {
 						if(!res.data.data.recordingUrl) {
 							return;
 						}
+            await this.getPhotoLastRecord() // 获取拍照历史
 						this.playVideo(res.data.data)
 					}
 					
@@ -1361,8 +1363,8 @@ export default {
           this.liveDuration = this.liveDuration + 1; //每隔1秒
           if (this.liveDuration == 2) {
             //直播第2秒拍照
-						console.log(this.channelItem)
-						console.log(this.photoHistoryList,'this.photoHistoryList')
+						// console.log(this.channelItem)
+						// console.log(this.photoHistoryList,'this.photoHistoryList')
             if (
               this.goodsPhotographConfig && this.goodsPhotographConfig.livephotograph == 1 &&
               this.channelItem.learning != 1 && this.photoHistoryList.length == 0
@@ -1519,13 +1521,12 @@ export default {
         this.needSeek = true; //需要跳转到播放记录
       }
       this.startStatus = true;
-      console.log('222222222222')
       //获取节笔记
       this.getNoteList();
     },
     //正常播放视频
     async playVideo(item) {
-      console.log(item);
+      console.log(item, '2222222222');
       if (item.sectionType == 3) { // 回放的不播放
         return
       }

+ 8 - 26
pages3/polyv/detail.vue

@@ -813,7 +813,7 @@ export default {
         data: { informId: this.informId }
       }).then((res) => {
         if (res.data.code == 200) {
-          console.log('埋点')
+          // console.log('埋点')
         }
       })
     },
@@ -1017,7 +1017,6 @@ export default {
     },
     // 原来的mouted内容
     originMounted() {
-      // console.log('originMounted')
       uni.$on("changeSection", (oldSectionId) => {
         console.log('originMounted->playVID:', this.playVID, oldSectionId);
           this.hasStart = false;
@@ -1034,7 +1033,6 @@ export default {
         this.postStudyRecord(0, oldSectionId);
       });
       uni.$on("getSection", (item) => {
-        console.log('清除====',item, item.recordingUrl)
         //清除直播
           this.hasStart = false;
         this.isPlayRebuild = item.rebuild;
@@ -1058,7 +1056,6 @@ export default {
         this.chapterId = arr[1];
       });
       uni.$on("getChannel", (item) => {
-        // console.log('--->清除录播录播清除录播录播')
         //清除录播
           this.hasStart = false;
         this.$store.commit("setPlayVID", { playVID: null });
@@ -1071,7 +1068,6 @@ export default {
         this.channelItem = item;
       });
       uni.$on("isRebuild", (item) => {
-        // console.log(item);
         this.isRebuild = item;
       });
       this.updateChapterOpen(true);
@@ -1346,18 +1342,17 @@ export default {
 			this.$api.studyRecordQueryLiveLast({
 				orderGoodsId:this.orderGoodsId,
 				courseId:this.courseId
-			}).then(res => {
-				console.log(res,'couse最后一次观看的视频', this.courseId)
+			}).then(async res => {
 				if(res.data.data) {
           this.moduleId = res.data.data.moduleId
           this.chapterId = res.data.data.chapterId
 					if(res.data.data.sectionType == 1) { //录播
-          // console.log('录播录播录播')
 					this.$store.commit("setPlaySectionId", { playSectionId: res.data.data.sectionId });
 					this.$store.commit("setPlayVID", { playVID: res.data.data.recordingUrl });
 
           console.log('playVID:', this.playVID, 'playSectionId-', this.playSectionId, 'moduleId:', this.moduleId,'chapterId:', this.chapterId, 'courseId:', this.courseId)
 					this.sectionItem = res.data.data;
+          await this.getPhotoLastRecord() // 获取拍照历史
 						this.playVideo(res.data.data)
 					} else if(res.data.data.sectionType == 2) { //直播
 						this.studyRecordGetLastLive();
@@ -1804,6 +1799,7 @@ export default {
         moduleId: parseInt(self.moduleId),
 				orderGoodsId: this.orderGoodsId,
       };
+      // /course/photo/log/getLastInfo'
       this.$api.getPhotoLastRecord(data).then((res) => {
         if (res.data.code == 200) {
           //清空历史数据
@@ -1986,8 +1982,6 @@ export default {
           this.liveDuration = this.liveDuration + 1; //每隔1秒
           if (this.liveDuration == 2) {
             //直播第2秒拍照
-						console.log(this.channelItem)
-						console.log(this.photoHistoryList,'this.photoHistoryList')
             if (
               this.goodsPhotographConfig && this.goodsPhotographConfig.livephotograph == 1 &&
               this.channelItem.learning != 1 && this.photoHistoryList.length == 0
@@ -2003,9 +1997,7 @@ export default {
     },
     playerLiveStatusChange(e) {
       const status = e.detail.status;
-      console.log("直播状态", status);
       if (status === "live") {
-        console.log("开始直播");
         //开始播放
         if (this.timer) {
           clearInterval(this.timer);
@@ -2019,7 +2011,7 @@ export default {
           //只有播放过的结束才提交,避免未开播触发结束
           this.postStudyRecord(1);
         }
-        console.log("结束直播");
+        // console.log("结束直播");
         this.livePlay = false;
         // 未开始
       }
@@ -2052,7 +2044,6 @@ export default {
       };
     },
     async initLive() {
-      console.log(this.playChannelId, 7111);
       this.liveObj = await this.getLiveUid(this.playChannelId);
       this.initLiveOk = true;
       let optionsData = {};
@@ -2148,7 +2139,7 @@ export default {
       }
       this.recordObj = null;
       this.recordObj = await this.getRecordLast();
-      console.log('this.recordObj:', this.recordObj)
+      // console.log('this.recordObj:', this.recordObj)
       this.needSeek = true; //跳转到播放记录
       this.startStatus = true;
       // 提交学习记录
@@ -2186,7 +2177,6 @@ export default {
       this.noteId = item.noteId;
       //没视频播放
       if (this.playSectionId == 0) {
-        console.log("即将跳到笔记位置1");
         this.$u.toast("即将跳到笔记位置");
         this.$store.commit("setPlaySectionId", {
           playSectionId: item.sectionId || item.menuId,
@@ -2195,7 +2185,6 @@ export default {
         this.playNoteVideo(item);
       } else {
         //正在看当前笔记视频
-        console.log("即将跳到笔记位置2");
         this.$u.toast("即将跳到笔记位置");
         //跳到笔记时刻
         var polyvPlayerContext = this.selectComponent("#playerVideo");
@@ -2317,13 +2306,11 @@ export default {
       });
     },
     clearCtx() {
-      console.log(4234);
       this.placeholder = "您可以在这里输入答疑内容";
       this.ctxValue = "";
       this.assignUserId = 0;
     },
     focusNote(event) {
-      console.log('event', event.detail.height)
       this.bottomHeight = event.detail.height
     },
     blurNote() {
@@ -2411,17 +2398,14 @@ export default {
       if (status > 0) {
         data.status = status;
       }
-      console.log("提交接口:", data,'sectionId:', sectionId,'chapterId:', self.chapterId,'moduleId:', self.moduleId, 'courseId:', this.courseId);
+      // console.log("提交接口:", data,'sectionId:', sectionId,'chapterId:', self.chapterId,'moduleId:', self.moduleId, 'courseId:', this.courseId);
       this.$api.studyRecord(data).then((res) => {
-        // console.log('提交接口的结果:', res)
         if (res.data.code == 200) {
           if (status > 0) {
             let moduleId = this.moduleId || 0;
             let chapterId = this.chapterId || 0;
             let playNextIdisRebuild = `moduleId${moduleId}chapterId${chapterId}sectionId${sectionId}isRebuild`;
             let playNextId = `moduleId${moduleId}chapterId${chapterId}sectionId${sectionId}`; //拼接对应章节唯一id
-            console.log(playNextId, "playNextId");
-            console.log(playNextIdisRebuild, "playNextIdisRebuild");
 
             uni.$emit("playNext" + playNextIdisRebuild, {
               fromRebuild: this.isRebuild,
@@ -2437,7 +2421,6 @@ export default {
             title: res.data.msg,
           });
         }
-        // console.log(res, "res");
       });
     },
     uploadFile(options, int) {
@@ -2552,8 +2535,7 @@ export default {
       var polyvPlayerContext = this.selectComponent("#playerVideo");
       if (polyvPlayerContext != null) {
         this.playTime = polyvPlayerContext.getCurrentTime(); //播放时刻
-        // console.log(this.playTime, 789, this.photoHistoryList)
-        // console.log('photoNum:', this.photoNum, 'this.photoList:', this.photoList, 'this.sectionItem.learning:', this.sectionItem.learning)
+        // console.log(this.playTime, 789, this.photoHistoryList, 'this.photoList:', this.photoList)
         //判断是否需要拍照
         if (this.photoNum > 0) {
           this.configPhoto();