tanxue 1 mese fa
parent
commit
6d19dd9511

+ 21 - 18
components/zhuapaiConfirm/zhuapai.vue

@@ -8,18 +8,18 @@
 			<!-- 测试抓拍使用 -->
 			<!-- <button @click="handleZhua">抓拍</button> -->
 		</view>
-		<span v-show="showVideo" @click="noShowVideoBtn" class="shiti-video-hidden-btn"><i></i></span>
-		<span v-show="!showVideo" @click="showVideoBtn" class="shiti-video-show-btn"><i></i></span>
+		<view v-show="showVideo" @click="noShowVideoBtn" class="shiti-video-hidden-btn">
+			<icon :style="{ backgroundImage: 'url(' + iconsArr.videoCloseIcon + ')' }"></icon>
+		</view>
+		<view v-show="!showVideo" @click="showVideoBtn" class="shiti-video-show-btn">
+			<icon :style="{ backgroundImage: 'url(' + iconsArr.videoPlayIcon + ')' }"></icon>
+		</view>
 	</view>
 </template>
 
 <script setup>
-	import {
-		ref,
-		onUnmounted,
-		nextTick,
-		computed,
-	} from "vue";
+	import {ref,onUnmounted,nextTick,computed,onMounted,reactive} from "vue";
+	import cacheManager from '@/utils/cacheManager.js';
 	import * as ksApi from "@/api/kaoshi.js"
 	import {
 		getStaticUrl
@@ -30,7 +30,7 @@
 	
 	const zhuapaiStore = useZhuapaiStore();
 
-	const imgUrl = getStaticUrl('static/images/exam/nokaoshi.png')
+	const imgUrl = '';
 
 	const cameraContext = ref(null);
 
@@ -45,10 +45,15 @@
 
 	const stopTimer = ref(null);
 	const style = ref({
-		top: "10vh",
+		top: "17vh",
 		right: "0",
 	});
 
+	const iconsArr = reactive({
+			noKaoshiImg: '',
+			videoCloseIcon: '',
+			videoPlayIcon: '',
+	})
 	const myClass = computed(() => {
 		return {
 			'show-video': showVideo.value,
@@ -274,7 +279,10 @@
 			console.log('结束')
 		}, 10 * 1000)
 	}
-
+	onMounted(() => {
+		iconsArr.videoCloseIcon = cacheManager.get('projectImg').video_close_icon;
+		iconsArr.videoPlayIcon = cacheManager.get('projectImg').video_play_icon;
+	});
 	defineExpose({
 		init,
 		showVideoBtn
@@ -319,7 +327,7 @@
 			position: absolute;
 			top: 0;
 
-			i {
+			icon{
 				width: 32rpx;
 				height: 32rpx;
 				display: block;
@@ -334,8 +342,7 @@
 			height: 60rpx;
 			left: 0;
 
-			i {
-				background-image: url("@/static/images/exam/video-close-icon.svg");
+			icon {
 				margin: 6rpx auto 6rpx 6rpx;
 			}
 		}
@@ -345,10 +352,6 @@
 			padding: 20rpx;
 			border-radius: 8rpx;
 			right: 0;
-
-			i {
-				background-image: url("@/static/images/exam/video-play-icon.svg");
-			}
 		}
 	}
 </style>

BIN
static/images/common/tel-green-icon.png


BIN
static/images/common/user-green-icon.png


BIN
static/images/common/zydj-icon.png


BIN
static/images/exam/nokaoshi.png


+ 0 - 7
static/images/exam/video-close-icon.svg

@@ -1,7 +0,0 @@
-<svg t="1690253103663" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6610"
-     id="mx_n_1690253103664" width="50" height="50">
-    <path d="M256 85.333333h682.666667v682.666667h-85.333334v85.333333h85.333334c46.933333 0 85.333333-38.4 85.333333-85.333333V85.333333c0-46.933333-38.4-85.333333-85.333333-85.333333H256C209.066667 0 170.666667 38.4 170.666667 85.333333v85.333334h85.333333V85.333333z"
-          fill="#00807b" p-id="6611"></path>
-    <path d="M768 170.666667H85.333333C38.4 170.666667 0 209.066667 0 256v682.666667c0 46.933333 38.4 85.333333 85.333333 85.333333h682.666667c46.933333 0 85.333333-38.4 85.333333-85.333333V256c0-46.933333-38.4-85.333333-85.333333-85.333333z m0 768H85.333333V256h682.666667v682.666667z"
-          fill="#00807b" p-id="6612"></path>
-</svg>

+ 0 - 1
static/images/exam/video-play-icon.svg

@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1690178518545" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2659" id="mx_n_1690178518546" xmlns:xlink="http://www.w3.org/1999/xlink" width="50" height="50"><path d="M907.712 642.592l-2.624-302.592-204.256 145.056 206.88 157.536z m-39.68-354.784a64 64 0 0 1 101.056 51.648l2.624 302.592a64 64 0 0 1-102.752 51.456l-206.912-157.536a64 64 0 0 1 1.728-103.104l204.256-145.056z" fill="#00807b" p-id="2660"></path><path d="M144 256a32 32 0 0 0-32 32v417.376a32 32 0 0 0 32 32h456.32a32 32 0 0 0 32-32V288a32 32 0 0 0-32-32H144z m0-64h456.32a96 96 0 0 1 96 96v417.376a96 96 0 0 1-96 96H144a96 96 0 0 1-96-96V288a96 96 0 0 1 96-96z" fill="#00807b" p-id="2661"></path></svg>