diff --git a/src/assets/newLesson/noFinishBg.png b/src/assets/newLesson/noFinishBg.png new file mode 100644 index 0000000000000000000000000000000000000000..a001b04bb4bd7806ae3294bdfa040e9e3f0bf00e Binary files /dev/null and b/src/assets/newLesson/noFinishBg.png differ diff --git a/src/components/map/index.vue b/src/components/map/index.vue index 8153f15e8fbd0b702962935a90d29a51bb63cd59..10c0c32836805e839f75859b95f99f08bf05fdc1 100644 --- a/src/components/map/index.vue +++ b/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 } } }); diff --git a/src/components/newLesson/nofinishdia.vue b/src/components/newLesson/nofinishdia.vue new file mode 100644 index 0000000000000000000000000000000000000000..f051185c4f735899da0ec36767812f1dbbc18862 --- /dev/null +++ b/src/components/newLesson/nofinishdia.vue @@ -0,0 +1,33 @@ +<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> diff --git a/src/components/newLesson/video.vue b/src/components/newLesson/video.vue index 21add19383c8608c57c2a3f1b1db587e4153abd4..2a0a4c049b3fa862e860f73972f1a5a87a6761f3 100644 --- a/src/components/newLesson/video.vue +++ b/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{