826

src/components/newLesson/audio.vue

@@ -49,7 +49,7 @@
             <div class="tips">{{showObj.audio[index].tips}}</div>
           </div>
           <!-- @click="imgPop=true" -->
-          <div :class="{'image-block':true}" ref="imageBlock" >
+          <div :class="{'image-block':true}" ref="imageBlock">
             <img ref="imgItem" @click="ImagePreviewF(index)" :src="showObj.audio[index].image" />
           </div>
           <div class="btnBox">
@@ -141,8 +141,8 @@
         <no-finish-dia />
       </div>
     </mt-popup>
-    <div v-if="imgModel" class='imgBox' style="background: transparent">
-      <div class="box" >
+    <div v-if="imgModel" class="imgBox" style="background: transparent">
+      <div class="box">
         <img ref="imgItem" :src="showObj.audio[index].image" />
       </div>
     </div>
@@ -151,7 +151,8 @@
         @backList="backList()"
         ref="sharePage"
         @closeShare="closeShare()"
-        :contentData="contentData"/>
+        :contentData="contentData"
+      />
     </div>
     <audio ref="audioDom" id="audioDom" class="audio" :src="audioPoint"></audio>
   </div>
@@ -161,7 +162,7 @@
 import { Toast } from "vant";
 import { Popup } from "mint-ui";
 import tapToVideo from "../../assets/tapToVideo.png";
-import { ImagePreview } from 'vant';
+import { ImagePreview } from "vant";
 import {
   getUserCollectApi,
   addUserCollectApi,
@@ -187,7 +188,7 @@ export default {
   },
   data() {
     return {
-      imgModel:false,
+      imgModel: false,
       userCourse: {},
       finishStuat: finishStuat,
       popupVisible: false,
@@ -212,7 +213,7 @@ export default {
       timer: null,
       playType: Number(localStorage.getItem("playType")) | 0,
       audioPoint: "",
-      stay_time:''
+      stay_time: ""
     };
   },
   mounted() {
@@ -223,14 +224,12 @@ export default {
     }
   },
   methods: {
-    ImagePreviewF(index){
+    ImagePreviewF(index) {
       ImagePreview({
-        images: [
-          this.showObj.audio[index].image,
-          ],
-          lazyLoad:true,
-          startPosition:0,
-          showIndex:false
+        images: [this.showObj.audio[index].image],
+        lazyLoad: true,
+        startPosition: 0,
+        showIndex: false
       });
     },
     changeStar(data) {
@@ -762,8 +761,6 @@ export default {
         page_id: 5,
         stay_time: lookTime
       };
-      getUserWatchApi({category_id:query.category_id}).then(res => {
-        this.$store.dispatch("setWatchDetail", res);
       subUserLessonApi(
         query.elementId,
         query.category_id,
@@ -774,23 +771,18 @@ export default {
         lessonDetail.nowTime = nowTime;
         lessonDetail.star_num = res.total_star_num;
         localStorage.setItem("lessonDetail", JSON.stringify(lessonDetail));
-        });
         if (
           (Number(lookTime) + Number(lessonDetail.total_watch_time)) / 60 <
           7
         ) {
           this.popupVisible2 = true;
+          // debugger
         } else {
+          getUserWatchApi({ category_id: query.category_id }).then(res => {
+            this.$store.dispatch("setWatchDetail", res);
             this.share_show = true;
-        }
+            // debugger
           });
-      if (
-          (Number(lookTime) + Number(lessonDetail.total_watch_time)) / 60 <
-          7
-        ) {
-          this.popupVisible2 = true;
-        } else {
-          this.share_show = true;
           setTimeout(() => {
             if (this.$store.state.lookStatus == 0) {
               this.audioPoint = audioGood;
@@ -799,12 +791,13 @@ export default {
             } else {
               this.audioPoint = audioPerfect;
             }
-            this.$refs.audioDom.load()
-            setTimeout(()=>{
-              this.$refs.audioDom.play()
-            },100)
+            this.$refs.audioDom.load();
+            setTimeout(() => {
+              this.$refs.audioDom.play();
+            }, 100);
           }, 300);
         }
+      });
       // this.$refs.sharePage.playAudio()
       // this.$refs.sharePage.initPage()
     }
@@ -858,19 +851,19 @@ export default {
   background-size: 40 * @toVw 290 * @toVw;
   display: inline-block;
 }
-.imgBox{
-  position:fixed;
+.imgBox {
+  position: fixed;
   width: 100%;
   height: 100%;
   top: 0;
   left: 0;
-  .box{
+  .box {
     width: 100%;
     height: 100vh;
     transform: translateX(0px);
-      img{
+    img {
       position: absolute;
-      width:80vw;
+      width: 80vw;
       margin: auto;
       top: 0;
       left: 0;
@@ -878,7 +871,6 @@ export default {
       bottom: 0;
     }
   }
-
 }
 ._282918034425091245 {
   height: 8 * @toVw;
@@ -1181,8 +1173,7 @@ export default {
     padding: 20 * @toVw;
   }
 }
-.mint-popup{
-
+.mint-popup {
 }
 .imgPop-block {
   // max-height: 500 * @toVw;
@@ -1909,7 +1900,7 @@ export default {
 }
 </style>
 <style>
-.van-image-preview__image{
+.van-image-preview__image {
   /* max-height: 150%; */
   /* bottom: none; */
 }

src/components/newLesson/index.vue

@@ -420,6 +420,7 @@ export default {
           localStorage.setItem("lessonDetail", JSON.stringify(lessonDetail));
         });
       },120000)
+      debugger
       this.$store.dispatch('setTimeout',this.saveTime)
     },
     initPage() {

src/components/newLesson/video.vue

@@ -44,7 +44,8 @@
       <div
         class="video-block hp-video"
         v-if="showObj.video[videoIndex]"
-        v-show="!share_show && !popupVisible && !star">
+        v-show="!share_show && !popupVisible && !star"
+      >
         <video
           ref="videoDom"
           id="myVideo"
@@ -218,11 +219,11 @@ export default {
       },
       false
     );
-    console.log(videojs)
+    // console.log(videojs)
   },
   methods: {
     activity() {},
-    sliceUrl(){
+    sliceUrl() {
       localStorage.setItem("clarityType", this.clarityType);
       this.showObj.video.forEach(el => {
         el.url =
@@ -241,13 +242,13 @@ export default {
       this.currentTime = this.$refs.videoDom.currentTime;
       if (a == "1280") {
         this.clarityType = 1280;
-        this.sliceUrl()
+        this.sliceUrl();
       } else if (a == "720") {
         this.clarityType = 720;
-        this.sliceUrl()
+        this.sliceUrl();
       } else {
         this.clarityType = 540;
-        this.sliceUrl()
+        this.sliceUrl();
       }
       this.secClarity = false;
       // this.$nextTick(()=>{
@@ -324,8 +325,6 @@ export default {
         page_id: 5,
         stay_time: lookTime
       };
-      getUserWatchApi({ category_id: query.category_id }).then(res => {
-        this.$store.dispatch("setWatchDetail", res);
       subUserLessonApi(
         query.elementId,
         query.category_id,
@@ -336,20 +335,17 @@ export default {
         lessonDetail.nowTime = nowTime;
         lessonDetail.star_num = res.total_star_num;
         localStorage.setItem("lessonDetail", JSON.stringify(lessonDetail));
-        });
         if (
           (Number(lookTime) + Number(lessonDetail.total_watch_time)) / 60 <
           7
         ) {
           this.popupVisible = true;
         } else {
+          getUserWatchApi({ category_id: query.category_id }).then(res => {
+            this.$store.dispatch("setWatchDetail", res);
             this.share_show = true;
-        }
+            // debugger
           });
-      if ((Number(lookTime) + Number(lessonDetail.total_watch_time)) / 60 < 7) {
-        this.popupVisible = true;
-      } else {
-        this.share_show = true;
           setTimeout(() => {
             if (this.$store.state.lookStatus == 0) {
               this.audioPoint = audioGood;
@@ -364,6 +360,7 @@ export default {
             }, 100);
           }, 300);
         }
+      });
     },
     videoEnd(event) {
       event.srcElement.play();
@@ -380,7 +377,10 @@ export default {
           JSON.parse(localStorage.getItem("lessonDetail")).domTitle.length
         ),
         elementName:
-          JSON.parse(localStorage.getItem("lessonDetail")).domTitle.slice(0,9) +
+          JSON.parse(localStorage.getItem("lessonDetail")).domTitle.slice(
+            0,
+            9
+          ) +
           "-" +
           JSON.parse(localStorage.getItem("lessonDetail")).domTitle.slice(
             10,
@@ -431,7 +431,7 @@ export default {
     videoPlay() {
       // 神策埋点 点击操作
       // this.$refs.videoDom.load()
-      console.log('canplay')
+      console.log("canplay");
       var video = document.getElementById("myVideo");
       if (this.currentTime) {
         setTimeout(() => {
@@ -482,7 +482,7 @@ export default {
         : 1280;
       if (this.contentData.content.age && value === 2) {
         let video = [];
-        video = this.$common.deepCopy(this.contentData.content.video)
+        video = this.$common.deepCopy(this.contentData.content.video);
         video.forEach(el => {
           let str = el.url;
           if (this.contentData.title == 2) {
@@ -495,7 +495,7 @@ export default {
         };
       } else {
         let video = [];
-        video = this.$common.deepCopy(this.contentData.content.video)
+        video = this.$common.deepCopy(this.contentData.content.video);
         video.forEach(el => {
           let str = el.url;
           if (this.contentData.title == 2) {

src/main.js

@@ -41,9 +41,9 @@ if (process.env.NODE_ENV == 'production') {
 }
 
 Vue.prototype.$common = common
-if (process.env.NODE_ENV != 'production') {
-  new VConsole();
-}
+// if (process.env.NODE_ENV != 'production') {
+//   new VConsole();
+// }
 
 router.beforeEach((to, from, next) => {
   next()