瀏覽代碼

文本调整

wangxy 2 月之前
父節點
當前提交
18084c9c20
共有 3 個文件被更改,包括 10 次插入5 次删除
  1. 2 1
      components/zhuapaiConfirm/useCamera.js
  2. 6 2
      components/zhuapaiConfirm/zhuapai.vue
  3. 2 2
      pages/client/Kaoshi/exam.vue

+ 2 - 1
components/zhuapaiConfirm/useCamera.js

@@ -504,6 +504,7 @@ export function useH5Camera({
 		startH5Camera,
 		startH5Camera,
 		stopH5Camera,
 		stopH5Camera,
 		handlePaiZhao,
 		handlePaiZhao,
-		errorFunComplete
+		errorFunComplete,
+		playVideo
 	}
 	}
 }
 }

+ 6 - 2
components/zhuapaiConfirm/zhuapai.vue

@@ -35,6 +35,7 @@
 
 
 	let zhuapaiFun = null;
 	let zhuapaiFun = null;
 	let stopCamera = null;
 	let stopCamera = null;
+	let playVideoFun = null;
 
 
 	const DropRef = ref(null);
 	const DropRef = ref(null);
 	const DropContainerRef = ref(null);
 	const DropContainerRef = ref(null);
@@ -62,7 +63,8 @@
 	}
 	}
 
 
 	function showVideoBtn() {
 	function showVideoBtn() {
-		showVideo.value = true
+		showVideo.value = true;
+		playVideoFun && playVideoFun();
 	}
 	}
 
 
 	function touchmove(event) {
 	function touchmove(event) {
@@ -128,7 +130,8 @@
 		const {
 		const {
 			startH5Camera,
 			startH5Camera,
 			handlePaiZhao,
 			handlePaiZhao,
-			stopH5Camera
+			stopH5Camera,
+			playVideo
 		} = useH5Camera({
 		} = useH5Camera({
 			elVideoId: '#videoZhaPai',
 			elVideoId: '#videoZhaPai',
 			elCanvasId: '#canvasZhuaPai',
 			elCanvasId: '#canvasZhuaPai',
@@ -140,6 +143,7 @@
 		startH5Camera();
 		startH5Camera();
 		zhuapaiFun = handlePaiZhao;
 		zhuapaiFun = handlePaiZhao;
 		stopCamera = stopH5Camera;
 		stopCamera = stopH5Camera;
+		playVideoFun = playVideo;
 		// #endif
 		// #endif
 
 
 	}
 	}

+ 2 - 2
pages/client/Kaoshi/exam.vue

@@ -232,7 +232,7 @@
 		}
 		}
 	});
 	});
 	
 	
-	
+
 	function handleScoreClose() {
 	function handleScoreClose() {
 		handleBack()
 		handleBack()
 	}
 	}
@@ -398,7 +398,7 @@
 
 
 	function qpZhuapai() {
 	function qpZhuapai() {
 		// 重新开启抓拍
 		// 重新开启抓拍
-		zhuapaiRef.value && zhuapaiRef.value.showVideoBtn()
+		zhuapaiRef.value && zhuapaiRef.value.showVideoBtn();
 	}
 	}
 	// 切屏功能 end
 	// 切屏功能 end