wangxy 1 месяц назад
Родитель
Сommit
9efd290e20
2 измененных файлов с 9 добавлено и 13 удалено
  1. 1 1
      pages/xinshuxue/components/videoPlay2.vue
  2. 8 12
      pages/xinshuxue/lookShipin.vue

+ 1 - 1
pages/xinshuxue/components/videoPlay2.vue

@@ -41,7 +41,7 @@
 			},
 			},
 			playEnd() {
 			playEnd() {
 				// 增加videoPlay2 用于判断能力提升视频学习完不作为本节已学完的标准
 				// 增加videoPlay2 用于判断能力提升视频学习完不作为本节已学完的标准
-				this.$emit('playEnd','videoPlay2')
+        this.$emit('playEnd')
 			}
 			}
 		}
 		}
 	}
 	}

+ 8 - 12
pages/xinshuxue/lookShipin.vue

@@ -17,7 +17,7 @@
 				@playEnd="playEnd"></videoPlayVue>
 				@playEnd="playEnd"></videoPlayVue>
 			<videoPlayVue2 ref="c2" v-show="videoId2 && showB" :key="2" :videoId1="videoId2"
 			<videoPlayVue2 ref="c2" v-show="videoId2 && showB" :key="2" :videoId1="videoId2"
 				:progressMarkers1="progressMarkers2" :playAuth1="playAuth2" :hideFlag1="hideFlag2"
 				:progressMarkers1="progressMarkers2" :playAuth1="playAuth2" :hideFlag1="hideFlag2"
-				:seek-time1="seekTime2" class="ksp-video-box" @playEnd="playEnd"></videoPlayVue2>
+				:seek-time1="seekTime2" class="ksp-video-box" @playEnd="playEnd2"></videoPlayVue2>
 			<view class="ksp-scroll-view">
 			<view class="ksp-scroll-view">
 				<view class="ksp-item-list" v-for="(item,index) in jieInfo.jiedianList1" :key="index" v-show="showA">
 				<view class="ksp-item-list" v-for="(item,index) in jieInfo.jiedianList1" :key="index" v-show="showA">
 					<view class="list-head">
 					<view class="list-head">
@@ -56,7 +56,6 @@
 		</view>
 		</view>
 		<!-- 弹窗 -->
 		<!-- 弹窗 -->
 		<tishiDlVue ref="popupRef"></tishiDlVue>
 		<tishiDlVue ref="popupRef"></tishiDlVue>
-		<tishiDlVue2 ref="popupRef2"></tishiDlVue2>
 	</view>
 	</view>
 
 
 </template>
 </template>
@@ -81,7 +80,6 @@
 	import cacheManager from "@/utils/cacheManager.js";
 	import cacheManager from "@/utils/cacheManager.js";
 	import * as httpApi from "@/api/chanpinShuxue.js";
 	import * as httpApi from "@/api/chanpinShuxue.js";
 	import tishiDlVue from './components/tishiDl.vue';
 	import tishiDlVue from './components/tishiDl.vue';
-	import tishiDlVue2 from './components/tishiDl2.vue';
 	import videoPlayVue from './components/videoPlay.vue';
 	import videoPlayVue from './components/videoPlay.vue';
 	import videoPlayVue2 from './components/videoPlay2.vue';
 	import videoPlayVue2 from './components/videoPlay2.vue';
 	import ezyActiveVue from "@/components/ezyActive/ezyActive.vue";
 	import ezyActiveVue from "@/components/ezyActive/ezyActive.vue";
@@ -124,7 +122,6 @@
 		},
 		},
 		components: {
 		components: {
 			tishiDlVue,
 			tishiDlVue,
-			tishiDlVue2,
 			videoPlayVue,
 			videoPlayVue,
 			videoPlayVue2,
 			videoPlayVue2,
 			ezyActiveVue
 			ezyActiveVue
@@ -156,12 +153,7 @@
 				this.$refs.c2 && this.$refs.c2.handleStop()
 				this.$refs.c2 && this.$refs.c2.handleStop()
 			},
 			},
 			//  当前节学习完成
 			//  当前节学习完成
-			saveJieWancheng(data) {
-				if (data) {
-					console.log('增加videoPlay2 用于判断能力提升视频学习完不作为本节已学完的标准');
-					this.$refs.popupRef2.open();
-					return false
-				}
+			saveJieWancheng() {
 				httpApi.getShuxueChanpinWancheng({
 				httpApi.getShuxueChanpinWancheng({
 					jieId: this.jieInfo.jieId
 					jieId: this.jieInfo.jieId
 				}).then(res => {
 				}).then(res => {
@@ -213,12 +205,16 @@
 				this.getDataInfo()
 				this.getDataInfo()
 			},
 			},
 			playEnd(data) {
 			playEnd(data) {
-				console.log('data', data);
 				// #ifdef APP-PLUS
 				// #ifdef APP-PLUS
 				plus.screen.lockOrientation('portrait-primary');
 				plus.screen.lockOrientation('portrait-primary');
 				// #endif
 				// #endif
-				this.saveJieWancheng(data);
+				this.saveJieWancheng();
 			},
 			},
+      playEnd2(data) {
+        // #ifdef APP-PLUS
+        plus.screen.lockOrientation('portrait-primary');
+        // #endif
+      },
 			getLive() {
 			getLive() {
 				if (!this.videoId) {
 				if (!this.videoId) {
 					toast("video缺失!")
 					toast("video缺失!")