调整页面

components/listCard/kaoshiCard.vue

@@ -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">
@@ -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/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

@@ -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>