fstarter 2.11.3 → 2.11.4

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "fstarter",
   "description": "A Vue.js project",
-  "version": "2.11.3",
+  "version": "2.11.4",
   "author": "han.zhang <zhanghan810810@163.com>",
   "license": "MIT",
   "private": false,

package/src/plugins/plugins/nativeUtils.js

@@ -46,7 +46,7 @@ if(isProductionEnvironment()){
   faceResultUrl = 'https://bcs.ihasl.com/api/v1/bcs/face/faceResultQuery'
   appid = 'wx751d925fbededc73' // 回调安全域名 wx.ihasl
   tokenKey = '6297391dca6d4090ae60959acb73cda1'
-  loginUrl = 'https://www.ihasl.com/pages/salessupport/app/#/login'
+  loginUrl = 'https://www.ihasl.com/pages/app2-hasl/#/login'
 } else {
   console.log('测试环境')
   auth = 0
@@ -55,9 +55,7 @@ if(isProductionEnvironment()){
   faceResultUrl = 'https://testbcs.ihasl.com/api/v1/bcs/face/faceResultQuery'
   appid = 'wx38c646900b5b7ec0' // 回调安全域名 teststatic.com
   tokenKey = '814a0b7eb0f82e02246da5e098b6e2b5'
-  loginUrl = 'https://teststatic.ihasl.com/pages/salessupport/app/#/login'
-  // 本地的
-  // loginUrl = 'http://172.20.10.2:8080/#/login'
+  loginUrl = 'https://teststatic.ihasl.com/pages/app2-hasl/#/login'
 }
 console.log(appid, 'appid')
 
@@ -1175,19 +1173,26 @@ nFqBB1zM586NpO+4hua/1Ol5OiqoQJ4iQinyDiA=
       });
       document.getElementById('cancelBtn').addEventListener('click', () => {
         nativeUtils.closeDialog();
-        nativeUtils._takePictureReject(new Error('用户取消了操作'));
+        if (nativeUtils._takePictureReject) {
+          nativeUtils._takePictureReject(new Error('用户取消了操作'));
+        }
+      });
+
+      // 添加点击背景关闭弹窗的功能
+      const cameraDialog = dialog.querySelector('.camera-dialog');
+      cameraDialog.addEventListener('click', function (e) {
+        if (e.target === cameraDialog) {
+          // 点击背景时也视为取消操作
+          nativeUtils.closeDialog();
+          if (nativeUtils._takePictureReject) {
+            nativeUtils._takePictureReject(new Error('用户取消了操作'));
+          }
+        }
       });
     }, 0);
 
     // 添加到文档
     document.body.appendChild(dialog);
-
-    // 添加事件监听器，点击背景关闭弹窗
-    dialog.addEventListener('click', function (e) {
-      if (e.target.classList.contains('camera-dialog')) {
-        this.closeDialog();
-      }
-    });
   },
   // 关闭弹窗
   closeDialog() {
@@ -1209,6 +1214,13 @@ nFqBB1zM586NpO+4hua/1Ol5OiqoQJ4iQinyDiA=
         document.body.removeChild(dialog);
       }, 300);
     }
+
+    // 在关闭弹窗时也要触发reject，防止Promise悬挂
+    if (nativeUtils._takePictureReject) {
+      nativeUtils._takePictureReject(new Error('用户取消了操作'));
+    }
+
+    // 清理全局引用
     delete nativeUtils._takePictureResolve;
     delete nativeUtils._takePictureReject;
   },