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

components/listCard/kaoshiCard.vue

@@ -3,7 +3,7 @@
 		<!-- card title -->
 		<view class="card-head-box">
 			<view class="card-line-title">考试</view>
-			<view class="card-more" @click="checkMore" v-if="data.count">更多<text class="more-num">{{data.count}}</text><icon class="more-jt"></icon></view>
+			<view class="card-more" @click="checkMore" v-if="!data.count">更多<text class="more-num">{{data.count}}</text><icon class="more-jt"></icon></view>
 		</view>
 		
 		<!-- kaoshi title -->
@@ -26,7 +26,7 @@
 				<icon class="card-num-icon"></icon>
 				<view class="content-text-box">
 					<text>次数</text>
-					<view>{{data.joinCount}}次</view>
+					<view>{{data.maxTimes ? data.maxTimes:'不限'}}次</view>
 				</view>
 			</view>
 			<view class="card-content-item">
@@ -76,14 +76,14 @@
 	const activeks = ref(null);
 	
 	function checkMore() {
-		uni.redirectTo({
+		uni.navigateTo({
 			url: '/pages/client/Kaoshi/list?from=shouye'
 		})
 	}
 	
 	// 修改身份
 	function handleChangeIdentification() {
-		uni.redirectTo({
+		uni.navigateTo({
 			url:'/pages/client/my/info?from=shouye'
 		})
 	}
@@ -113,7 +113,7 @@
 	
 	function checkKaoshi(item) {
 		uni.redirectTo({
-			url: `/pages/client/Kaoshi/exam?ksId=${item.ksId}&zhuapai=${activeks.value.zhuapai}?from=shouye`
+			url: `/pages/client/Kaoshi/exam?ksId=${item.ksId}&zhuapai=${activeks.value.zhuapai}&from=shouye`
 		})
 	}
 	

components/listCard/kechengCard.vue

@@ -36,13 +36,13 @@
 	})
 	
 	function checkMore() {
-		uni.redirectTo({
+		uni.navigateTo({
 			url:"/pages/client/Kecheng/list?from=shouye"
 		})
 	}
 	
 	function handleStudy(item) {
-		uni.redirectTo({
+		uni.navigateTo({
 			url: `/pages/client/Kecheng/study?kcId=${item.kcId}&from=shouye`
 		})
 	}

components/listCard/lianxiCard.vue

@@ -57,7 +57,7 @@
 	const lxzRef = ref(null)
 	
 	function checkMore() {
-		uni.redirectTo({
+		uni.navigateTo({
 			url: '/pages/client/Lianxi/list?from=shouye'
 		})
 	}
@@ -71,8 +71,8 @@
 	}
 	
 	function checkKaoshi(item) {
-		uni.redirectTo({
-			url: `/pages/client/Lianxi/exam?lxId=${item.lxId}?from=shouye`
+		uni.navigateTo({
+			url: `/pages/client/Lianxi/exam?lxId=${item.lxId}&from=shouye`
 		})
 	}
 	

components/questions/danxuan.vue

@@ -53,6 +53,11 @@
 				showError: props.question.reply == index && props.question.result != index
 			}
 		} else {
+      if (props.question.reply == '') {
+        return {
+          active: false
+        }
+      }
 			return {
 				active: props.question.reply == index
 			}

components/zhuapaiConfirm/index.vue

@@ -6,7 +6,7 @@
 			<view class="phone-camera-box" style="overflow: hidden;">
 				<view v-show="!showConfirmBtn" class="sxt-tip-box" style="text-align: center;">摄像头正在初始化...</view>
 				<video v-show="showConfirmBtn" ref="videoRef" style="width:100%; height: 320rpx;" id="videoConfirm"
-					:controls="false"></video>
+					:controls="false" :enable-progress-gesture="false"></video>
 					
 				<!-- 隐藏抓拍绘制图片 -->
 				<canvas id="canvasConfirm" style="width: auto; height: 320rpx;visibility: hidden;position: absolute;"></canvas>

components/zhuapaiConfirm/useCamera.js

@@ -398,7 +398,7 @@ export function useH5Camera({
 				const ImageFile = context.canvas.toDataURL('image/png');
 				getSnapShotImage(ImageFile);
 			} else {
-				 const ImageFile = this.getBase64Image()
+				 const ImageFile = getBase64Image()
 				getSnapShotImage(ImageFile);
 			}
 		} catch (err) {

components/zhuapaiConfirm/zhuapai.vue

@@ -171,10 +171,10 @@
 
 <style lang="scss">
 	.zhuapai-drop-container {
-		width: 180rpx;height: 400rpx;margin: 0;padding: 0;z-index: 10;position: absolute;overflow: hidden;
+    width: 180rpx;height: 400rpx;margin: 0;padding: 0;z-index: 10;position: absolute;overflow: hidden;
 		.phone-camera-box-zhuapai{
 			width: 100%;height: 240rpx;position: absolute;overflow: hidden;
-			.uni-video-container{background-color: transparent;}
+			.uni-video-container{background-color: transparent; pointer-events: none;}
 			.canvas-view-box,.hidden-video{transform: translateY(10000rpx);}
 		}
 		.video-view-box{width:100%;height: 240rpx;position: absolute;}
@@ -186,6 +186,6 @@
 		.shiti-video-show-btn{
 			background-color: #dcfbf1;padding:20rpx;top:0;right:0;border-radius:8rpx;
 			i{background-image: url("@/static/images/exam/video-play-icon.svg");}
-		} 
+		}
 	}
 </style>

pages/client/Kaoshi/exam.vue

@@ -139,7 +139,6 @@
 		data.ksId = option.ksId;
 		data.zhuapai = option.zhuapai;
 		data.from = option.from;
-
 		if (data.zhuapai && data.zhuapai != 0) {
 			// 考试前确认摄像头
 			nextTick(() => {

pages/client/Kaoshi/list.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="phone-list-page">
 		<view class="icon-title-bjcolor-navBar-box">
-			<!-- <view @click="goUpPage" class="nav-bar-icon"></view> -->
+			 <view @click="goUpPage" class="nav-bar-icon"></view>
 			<text class="nav-bar-title">考试管理</text>
 		</view>
 		<!-- 考试列表 -->
@@ -20,7 +20,7 @@
 								</view>
 								<!-- 时间 -->
 								<view class="ks-totalTm"><icon class="phone-time-icon"/>时间：{{item.totalTm}}分钟</view>
-								<view class="ks-totalTm"><icon class="phone-cishu-icon"/>次数：{{item.maxTimes}}次</view>
+								<view class="ks-totalTm"><icon class="phone-cishu-icon"/>次数：{{item.maxTimes ? item.maxTimes:'不限'}}次</view>
 								<!-- 分数 -->
 								<view class="ks-score-content">
 									<view class="ks-score"><icon class="phone-zongfen-icon"/>总分：<text>{{item.ksScore}}</text></view>
@@ -80,19 +80,9 @@
 	})
 	
 	function goUpPage() {
-		if ( data.from == 'shouye') {
-			uni.redirectTo({
-				url: '/pages/client/ShouYe/shouye'
-			})
-		} else if (data.from = 'my'){
-			uni.redirectTo({
-				url: '/pages/client/my/index'
-			})
-		} else {
-			uni.redirectTo({
-				url: '/pages/client/ShouYe/shouye'
-			})
-		}
+		uni.redirectTo({
+			url: '/pages/client/ShouYe/shouye'
+		})
 	}
 	// 修改身份
 	function handleChangeIdentification() {

pages/client/Kecheng/list.vue

@@ -63,19 +63,9 @@
 	})
 
 	function goUpPage() {
-		if ( data.from == 'shouye') {
-			uni.redirectTo({
-				url: '/pages/client/ShouYe/shouye'
-			})
-		} else if (data.from == 'my'){
-			uni.redirectTo({
-				url: '/pages/client/my/index'
-			})
-		} else {
-			uni.redirectTo({
-				url: '/pages/client/ShouYe/shouye'
-			})
-		}
+		uni.redirectTo({
+			url: '/pages/client/ShouYe/shouye'
+		})
 	}
 
 	function handleSearch() {

pages/client/Lianxi/list.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="phone-list-page">
 		<view class="icon-title-bjcolor-navBar-box">
-			<!-- <view @click="goUpPage" class="nav-bar-icon"></view> -->
+			<view @click="goUpPage" class="nav-bar-icon"></view>
 			<text class="nav-bar-title">练习管理</text>
 		</view>
 		<!-- 考试列表 -->
@@ -85,19 +85,9 @@
 	}
 	
 	function goUpPage() {
-		if ( data.from == 'shouye') {
-			uni.redirectTo({
-				url: '/pages/client/ShouYe/shouye'
-			})
-		} else if (data.from == 'my') {
-			uni.redirectTo({
-				url: '/pages/client/my/index'
-			})
-		} else {
-			uni.redirectTo({
-				url: '/pages/client/ShouYe/shouye'
-			})
-		}
+		uni.redirectTo({
+			url: '/pages/client/ShouYe/shouye'
+		})
 	}
 	
 	function handleSearch() {

pages/client/my/index.vue

@@ -55,7 +55,7 @@
 
 <script setup>
 	import {toast} from "@/utils/common";
-	import {onLoad} from '@dcloudio/uni-app';
+	import {onLoad,onShow} from '@dcloudio/uni-app';
 	import cacheManager from '@/utils/cacheManager.js';
 	import {getMineUser,getMineInfo,getMineLogout} from '@/api/my.js'
 	import {reactive,ref} from "vue";
@@ -68,6 +68,7 @@
 		kaoshiCount: '',
 		kechengCount: '',
 		lianxiCount: '',
+    from:''
 	});
 	const commonDialogRef = ref(null);
 	const exitContent = '你确定要执行这个操作吗？';
@@ -80,27 +81,27 @@
 	function goToPage(data){
 		switch (data) {
 		    case 'ks':
-		        uni.redirectTo({
+		        uni.navigateTo({
 		        	url:'/pages/client/Kaoshi/list?from=my'
 		        })
 		        break;
 		    case 'lx':
-		        uni.redirectTo({
+		        uni.navigateTo({
 		        	url:'/pages/client/Lianxi/list?from=my'
 		        })
 		        break;
 		    case 'kc':
-		        uni.redirectTo({
+		        uni.navigateTo({
 		        	url:'/pages/client/Kecheng/list?from=my'
 		        })
 		        break;
 			case 'cj':
-			    uni.redirectTo({
+			    uni.navigateTo({
 			    	url:'/pages/client/Chengji/list?from=my'
 			    })
 			    break;
 			case 'grcj':
-			    uni.redirectTo({
+			    uni.navigateTo({
 			    	url:'/pages/client/my/myInfo?from=my'
 			    })
 			    break;
@@ -126,7 +127,6 @@
 	}
 	function exitBtn(){
 		getMineLogout().then(res => {
-			console.log(res,'res');
 			toast('退出登录成功')
 			cacheManager.clearAll();
 			uni.reLaunch({
@@ -137,8 +137,12 @@
 		})
 	}
 	onLoad(() => {
-		getMyInit()
+    getMyInit()
 	})
+
+  onShow(() => {
+
+  })
 </script>
 
 <style>

pages/client/my/myInfo.vue

@@ -172,16 +172,16 @@
 
 	function handleBack() {
 		if (data.from == 'my') {
-			uni.redirectTo({
+			uni.navigateTo({
 				url: '/pages/client/my/index'
 			})
 		} else if (data.from == 'kaoshi') {
-			uni.redirectTo({
+			uni.navigateTo({
 				url: '/pages/client/ShouYe/shouye'
 			})
 		} else {
-			uni.redirectTo({
-				url: '/pages/client/ShouYe/shouye'
+			uni.navigateTo({
+				url: '/pages/client/my/index'
 			})
 		}
 	}