Merge branch '2024鹅状元' of https://gogs.mtavip.com/wangguoyu/uniProject into 2024鹅状元

pages/study/lookShipin.vue

@@ -72,7 +72,7 @@
 			this.videoId = data.videoId
 			this.progressMarkers = data.progressMarkers
 			this.getLive(); //获取播放凭证
-			uni.$on('playEnd', this.playEnd);
+			//uni.$on('playEnd', this.playEnd);
 		},
 		methods: {
 			playEnd(data) {
@@ -228,10 +228,10 @@
 
 				});
 				player.one('ended', function() {
-				
-					uni.$emit('playEnd', {
-						data: 'end'
-					});
+				that.$ownerInstance.callMethod('playEnd', {data:'end'})
+					// uni.$emit('playEnd', {
+					// 	data: 'end'
+					// });
 				});
 			},
 

pages/unitTest/index.vue

@@ -50,9 +50,6 @@
 		toast
 	} from "@/utils/common.js"
 	import {
-		useStudyRouteParams
-	} from "@/utils/emitEvents.js"
-	import {
 		useExam
 	} from './useUnit';
 	import {
@@ -60,9 +57,6 @@
 		onMounted
 	} from "vue";
 
-	const {setStudyStorage} = useStudyRouteParams();
-	
-
 	const {
 		count,
 		total,