From fc1e036d1e45ede32c60c5d374ca220cff64eec3 Mon Sep 17 00:00:00 2001
From: yindongqi <yin_dongqi@163.com>
Date: Tue, 29 Jul 2025 15:56:54 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E7=A7=BB=E9=99=A4=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/login/Account.vue         |  2 +-
 src/components/login/Account2.vue        |  2 +-
 src/components/study/Exam - 副本 (2).vue |  1 -
 src/components/study/Exam.vue            | 36 +++++++++++++++++++++++-
 src/components/study/courseDetail.vue    |  4 +--
 5 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/src/components/login/Account.vue b/src/components/login/Account.vue
index 7eb111b..af47a51 100644
--- a/src/components/login/Account.vue
+++ b/src/components/login/Account.vue
@@ -63,7 +63,7 @@ export default {
                     if (res.data.is_need_check_face == 1) {
                       //需要人脸识别，只能微信客户端登录
                       var ua = window.navigator.userAgent.toLowerCase();
-                      if (ua.match(/MicroMessenger/i) != "micromessenger") {
+                      if (!/MicroMessenger/i.test(ua) || /wxwork/i.test(ua)) {
                         this.$router.push({ path: "/wxerror" });
                       } else {
                         Toast(res.msg);
diff --git a/src/components/login/Account2.vue b/src/components/login/Account2.vue
index 56a7e11..a1fec60 100644
--- a/src/components/login/Account2.vue
+++ b/src/components/login/Account2.vue
@@ -71,7 +71,7 @@ export default {
                   if (res.data.is_need_check_face == 1) {
                     //需要人脸识别，只能微信客户端登录
                     var ua = window.navigator.userAgent.toLowerCase();
-                    if (ua.match(/MicroMessenger/i) != "micromessenger") {
+                    if (!/MicroMessenger/i.test(ua) || /wxwork/i.test(ua)) {
                       this.$router.push({ path: "/wxerror" });
                     } else {
                       Toast(res.msg);
diff --git a/src/components/study/Exam - 副本 (2).vue b/src/components/study/Exam - 副本 (2).vue
index 0034fef..77e7567 100644
--- a/src/components/study/Exam - 副本 (2).vue	
+++ b/src/components/study/Exam - 副本 (2).vue	
@@ -397,7 +397,6 @@
         this.getConfig()
       },
     }
-    // git提交测试
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/study/Exam.vue b/src/components/study/Exam.vue
index 9c4367c..fff08b3 100644
--- a/src/components/study/Exam.vue
+++ b/src/components/study/Exam.vue
@@ -123,6 +123,12 @@
           style="width: 100%; height: 100%; padding: 10px 0;">{{ item.name }}</mt-button>
       </div>
     </mt-popup>
+    <div v-show="showPhotoMask" class="photo-mask" @click="showPhotoMask = false">
+      <div class="mask-content" @click.stop>
+        <p>未上传证件照，无法开启正式考试</p>
+        <mt-button type="primary" @click="$router.push('/user/uploadphoto')">去上传</mt-button>
+      </div>
+    </div>
     <input type="hidden" ref="isphoto" :value="loginInfo.isphoto" />
     <input type="hidden" ref="needuploadphoto" :value="loginInfo.need_upload_photo" />
     <input type="hidden" ref="exam_end_time" :value="loginInfo.id_end" />
@@ -161,6 +167,7 @@ export default {
       true_quesstion: 0,
       title: "考试中心",
       monishow: true,
+      showPhotoMask: false,
       submitCount: 0, //开启相机的次数
       allSubmitCount: 3, //允许拍照次数
       canTakePhoto: true, //节流
@@ -339,7 +346,7 @@ export default {
           (err) => { }
         );
       } else {
-        Toast("未上传证件照，无法开启正式考试");
+        this.showPhotoMask = true;
       }
     },
     start_bu() {
@@ -853,6 +860,33 @@ export default {
 };
 </script>
 
+<style scoped>
+.photo-mask {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.5);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  z-index: 1000;
+}
+.mask-content {
+  background: white;
+  padding: 30px;
+  border-radius: 10px;
+  text-align: center;
+  width: 80%;
+  max-width: 400px;
+}
+.mask-content p {
+  margin-bottom: 20px;
+  font-size: 16px;
+}
+</style>
+
 <style lang="scss" scoped>
 .mint-header.is-fixed {
   color: #000;
diff --git a/src/components/study/courseDetail.vue b/src/components/study/courseDetail.vue
index 0e1e340..9b7d3d4 100644
--- a/src/components/study/courseDetail.vue
+++ b/src/components/study/courseDetail.vue
@@ -415,7 +415,7 @@ export default {
           if (_this.last30sTimer && _this.section[_this.choose_section_index].is_end != 1) {
             // console.log("最后2秒我运行了11111111111111111");
             _this.last30sTimer = false;
-            for (let index = 0; index < 3; index++) {
+            for (let index = 0; index < 1; index++) {
               _this.onPlayerEnded();
             }
             setTimeout(() => {
@@ -469,7 +469,7 @@ export default {
     },
     onPlayerEnded() {
       if (this.section[this.choose_section_index].is_end != 1) {
-        this.getData("/Home/saveRecord", {
+        this.getData("/Home/saveRecordEnd", {
           token: getStore("token"),
           id: this.choose_section_id,
           record: '',