星星系统

src/components/map/index.vue

@@ -310,7 +310,7 @@
         if(this.thisLesson.content.tips){
           let query = {
             periods_id:this.periods_id,
-            category_id:this.thisLesson.id,
+            category_id:this.thisLesson.categoryId,
             elementId:this.thisLesson.id,
             course_type:this.$route.query.course_type,
             parent_category_id:this.parent_category_id,
@@ -320,7 +320,7 @@
         }else{
           let query = {
             periods_id:this.periods_id,
-            category_id:this.thisLesson.category_id,
+            category_id:this.thisLesson.categoryId,
             parent_category_id:this.parent_category_id,
             element_id:this.thisLesson.id,
             course_type:this.$route.query.course_type,
@@ -343,7 +343,8 @@
           getLessonDetailApi(this.periods_id,data.id,data.ele_id).then(res=>{
             res.content = JSON.parse(res.content);
             this.thisLesson = res;
-            this.thisLesson.id = data.id;
+            this.thisLesson.id = data.ele_id;
+            this.thisLesson.categoryId = data.id;
             this.thisLesson.domTitle = data.name;
             this.thisLesson.day = i;
             this.popupVisible=true;
@@ -378,12 +379,12 @@
                 if(x>=3){
                   index=x-3
                 }else{
-                  index = x
+                  index = 0
                 }
                 if(x>4){
                   index2 = x-4
                 }else{
-                  index2 = x
+                  index2 = 0
                 }
               }
             });

src/components/newLesson/nofinishdia.vue

+<template>
+  <div class="nofinish-block" :style="{backgroundImage:`url('${noFinishBg}')`}">
+
+    <div class="go-on">
+      继续学习
+    </div>
+  </div>
+</template>
+
+<script>
+  import noFinishBg from '../../assets/newLesson/noFinishBg.png'
+  export default {
+    name: "nofinishdia",
+    data(){
+      return{
+        noFinishBg:noFinishBg
+      }
+    }
+  }
+</script>
+
+<style scoped lang="less">
+  @import "../../util/public";
+  .nofinish-block{
+    width: 235*@toVw;
+    height: 270*@toVw;
+    position: relative;
+    .go-on{
+      position: absolute;
+    ;
+    }
+  }
+</style>

src/components/newLesson/video.vue

@@ -33,10 +33,13 @@
           <div @click="changeAudio()">音频教学</div>
         </div>
       </div>
-      <div class="finish-block">
+      <div class="finish-block" v-if="nowShow === 3">
         <img :src="finishStuat">
       </div>
     </div>
+    <mt-popup>
+      <no-finish-dia/>
+    </mt-popup>
     <guide-block/>
   </div>
 
@@ -48,10 +51,12 @@
   import guideBlock from '../guide/video'
   import tapToAudio from '../../assets/tapToAudio.png'
   import finishStuat from '../../assets/newLesson/finishStudy.png'
+  import noFinishDia from './nofinishdia'
   export default {
     name: "play",
     components:{
-      guideBlock
+      guideBlock,
+      noFinishDia
     },
     data(){
       return{