Merge branch '2025北京诚祥App' of https://gogs.mtavip.com/wangguoyu/uniProject into 2025北京诚祥App

pages/admin/Kaoshi/exam.vue

@@ -46,7 +46,7 @@
 		<template v-if="activeSt">
 			<button type="default" size="mini" hover-class="none" class="phone-green-btn ks-btn-prev" @click="handlePrev" v-if="!isFistStId">上一题</button>
 			<button type="default" size="mini" hover-class="none"class="phone-green-btn ks-btn-next" @click="handleNext" v-if="!isLastStId">下一题</button>
-			<button type="default" size="mini" hover-class="none"class="phone-green-btn ks-btn-next" @click="handleBack" v-if="isLastStId">交卷</button>
+			<button type="default" size="mini" hover-class="none"class="phone-green-btn ks-btn-next" @click="handleBack" v-if="isLastStId">退出</button>
 		</template>
 
 		<!-- 答题卡 -->
@@ -247,7 +247,7 @@
 	}
 
 	function handlePopupBack() {
-		popupRef.value.close()
+		popupRef.value && popupRef.value.close()
 	}
 
 	function handlePrev() {

pages/admin/Kecheng/study.vue

@@ -116,6 +116,7 @@
 				return data;
 			},
 			handlePlay(data) {
+				console.log('data',data,this.curPlayData)
 				if (!this.kechengFlag) {
 					uni.showToast({
 						icon: 'none',
@@ -124,10 +125,11 @@
 					return;
 				}
 				this.showVideo = true;
-				if (this.curPlayData && this.curPlayData.videoId == data.videoId) {
+				if (this.curPlayData && this.curPlayData.url == data.url) {
 					return;
 				}
 				this.curPlayData = data;
+
 				kechengApi.getVideoAuth({
 					videoId: data.url
 				}).then(res => {

pages/admin/Lianxi/lianxi.vue

@@ -47,7 +47,7 @@
 		<template v-if="activeSt">
 			<button type="default" size="mini" hover-class="none" class="phone-green-btn ks-btn-prev" @click="handlePrev" v-if="!isFistStId">上一题</button>
 			<button type="default" size="mini" hover-class="none"class="phone-green-btn ks-btn-next" @click="handleNext" v-if="!isLastStId">下一题</button>
-					<button type="default" size="mini" hover-class="none"class="phone-green-btn ks-btn-next" @click="handleBack" v-if="isLastStId">交卷</button>
+					<button type="default" size="mini" hover-class="none"class="phone-green-btn ks-btn-next" @click="handleBack" v-if="isLastStId">退出</button>
 		</template>
 
 		<!-- 答题卡 -->
@@ -149,7 +149,7 @@
 	
 	const dlName = computed(() => {
 		if (data.StListForSearch && activeSt.value) {
-			return data.StListForSearch[activeSt.value.onlyNum].paragraphName
+			return data.StListForSearch[activeSt.value.onlyNum-1].paragraphName
 		} else {
 			return ''
 		}
@@ -248,7 +248,7 @@
 	}
 
 	function handlePopupBack() {
-		popupRef.value.close()
+		popupRef.value && popupRef.value.close()
 	}
 
 	function handlePrev() {

pages/client/Kaoshi/exam.vue

@@ -529,7 +529,7 @@
 	}
 
 	function handlePopupBack() {
-		popupRef.value.close()
+		popupRef.value && popupRef.value.close()
 	}
 
 	function handlePrev() {

pages/client/Lianxi/exam.vue

@@ -380,7 +380,7 @@
 	}
 
 	function handlePopupBack() {
-		popupRef.value.close()
+		popupRef.value && popupRef.value.close()
 	}
 
 	function handlePrev() {