谢杰标 2 жил өмнө
parent
commit
8cd6ceae47

+ 16 - 10
components/course/courseChapter.vue

@@ -7,11 +7,16 @@
         <text class="menu_name">{{ menuItem.name }}</text>
       </view>
 
-      <view
-        class="title_status"
-        :class="['grey', 'blue', 'gre'][learnStatus + 1]"
-      >
-        {{ ["待学习", "学习中", "已学完"][learnStatus + 1] }}
+      <view class="fl">
+        <view class="title_status gre" v-if="menuItem.commonSign == 1"
+          >公共章</view
+        >
+        <view
+          class="title_status"
+          :class="['grey', 'blue', 'gre'][learnStatus + 1]"
+        >
+          {{ ["待学习", "学习中", "已学完"][learnStatus + 1] }}
+        </view>
       </view>
     </view>
     <view v-show="!down">
@@ -169,6 +174,7 @@ export default {
   onLoad() {},
   created() {},
   mounted() {
+    // console.log('needOpen:', this.needOpen, this.chapterOpen);
     if (this.needOpen && this.chapterOpen) {
       this.updateChapterOpen(false);
       this.openChapter(this.menuItem);
@@ -719,10 +725,10 @@ export default {
   computed: {
     ...mapGetters(["goodsAuditionConfigIdList", "chapterOpen"]),
     learnStatus() {
-      if (!this.isBuy) {
-        return 0;
-      }
+      // console.log(this.menuItem, "this.menuItem");
       let { id, courseId, moduleId } = this.menuItem;
+      // console.log(this.menuItem, id, courseId, moduleId, "this.menuItem");
+      // console.log(this.sectionItem,)
       if (
         this.sectionItem.courseId == courseId &&
         this.sectionItem.moduleId == (moduleId || 0) &&
@@ -809,12 +815,12 @@ export default {
     margin-left: 8rpx;
   }
   .title_status {
-    width: 80rpx;
-    height: 28rpx;
+    padding: 2rpx 8rpx;
     border-radius: 8rpx;
     font-size: 20rpx;
     color: #ffffff;
     text-align: center;
+    margin-left: 4rpx;
   }
   .gre {
     background: #34c759;

+ 6 - 6
pages3/polyv/detail.vue

@@ -2282,7 +2282,6 @@ export default {
               self.photoHistoryList.push(res.data.data[i].photoIndex);
             }
           }
-          // console.log('7777', this.photoHistoryList, this.photoList);
         }
       });
     },
@@ -2363,8 +2362,8 @@ export default {
           return;
         }
         //没有历史拍照间隔数据
-        if (this.photoList.length == 0) {
-          this.commonConfig(
+        if (!this.photoList || this.photoList.length == 0) {
+          this.photoList = this.commonConfig(
             totalVideoTime,
             this.jjShiGongYuan ? 46 * 60 : undefined
           );
@@ -2404,6 +2403,7 @@ export default {
     },
     // 随机前后五分钟
     commonConfig(totalVideoTime, fixS) {
+      console.log("🚀 ~ file: detail.vue:2407 ~ commonConfig ~ fixS:", fixS)
       let photoList = [0];
       // 固定间隔时间取
       if (fixS) {
@@ -3186,7 +3186,7 @@ export default {
         }
         //开始播放
         this.timer && clearInterval(this.timer);
-        if (this.playSecIsLearn && (this.erJianErZao || this.photoNum > 0)) {
+        if (this.playSecIsLearn && (this.erJianErZao|| this.jjShiGongYuan || this.photoNum > 0)) {
           this.clearPauseTimer();
           this.isReach = false;
           this.timer = setInterval(this.timeEvent, 1000); //定时器
@@ -3938,8 +3938,8 @@ export default {
           }
           //开始播放
           this.timer && clearInterval(this.timer);
-          if (this.playSecIsLearn && (this.erJianErZao || this.photoNum > 0)) {
-            this.clearPauseTimer();
+          if (this.playSecIsLearn && (this.erJianErZao|| this.jjShiGongYuan || this.photoNum > 0)) {
+           this.clearPauseTimer();
             this.isReach = false;
             this.timer = setInterval(this.timeEvent, 1000); //定时器
           }