fstarter 2.11.2 → 2.11.4

package/package.json

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

package/src/plugins/assets/fileServer.js

@@ -1,5 +1,6 @@
 import isp_phone from '../platform/isp_phone'
 import { EBType, SHELL } from './callNative'
+import nativeUtils from '../plugins/nativeUtils'
 // import { FilePathPkg } from './filePath'
 // import { callService } from '../../../assets/libs/service/serviceImpl'
 // import SC from '../service/requestName'
@@ -15,6 +16,8 @@ import config from './config'
 export const FileServerPkg = {}
 export const EventGetFilename = 'getFileName'
 export const EventGetMessage = 'getMessage'
+export const EventGetPic = 'getPic'
+export const EventGetIdCard = 'getIDcard'
 
 // 文件服务器的地址
 FileServerPkg.baseHost = config.file.baseURL
@@ -71,6 +74,8 @@ function handleShellCall(fileName, actions) {
   } else {
     console.log('注意！壳上传没有配置调用【保存服务】的服务；上传类型' + callerType)
     // 直接发送事件，不调用服务
+    FileServerPkg.fnCaller.$emit(EventGetPic, {fileName,actions})
+    FileServerPkg.fnCaller.$emit(EventGetIdCard, {fileName,actions})
     if (fileName) FileServerPkg.fnCaller.$emit(EventGetFilename, fileName)
     if (actions) FileServerPkg.fnCaller.$emit(EventGetMessage, actions)
     if (FileServerPkg.callerStateSetFn) FileServerPkg.callerStateSetFn(fileName) // 设置状态值
@@ -295,7 +300,21 @@ FileServerPkg.pictureUploadSaveShow = function(uploadType, eventSender, callerPa
   const shellParam = setShellParam(shellType, callerParam.shell, callerParam.maxSizeKB)
   FileServerPkg.callerServiceParamFn = setServiceParamFn(uploadType, callerParam.service, isCallService)
   FileServerPkg.callerStateSetFn = getStateSetFn(uploadType, callerParam.state)
-  isp_phone.callShell(TypeShellMapping[shellType], shellParam, null, eventSender)
+  nativeUtils.takePicture({
+    maxCount: 1, // 最多可选择的图片数量, 默认为9
+    maxSize: 500, // 图片大小限制，单位为KB
+    sourceType: ['album'], // 可选来源类型，'album' 为相册，'camera' 为相机 默认两者都有
+    sceneDesc: '选择图片上传', // 场景描述
+    actions: shellParam.actions,
+    domain: 'INDUCTION',
+    buz: 'PICTURE',
+    buzId: '111'
+  }).then(res => {
+    handleShellCall(res.fileId + '.' + res.ext, res.actions)
+    // FileServerPkg.fnCaller.$emit(EventGetFilename, res.fileId + '.' + res.ext)
+    // if (actions) FileServerPkg.fnCaller.$emit(EventGetMessage, actions)
+  })
+  // isp_phone.callShell(TypeShellMapping[shellType], shellParam, null, eventSender)
 }
 
 /* *************************************************************************
@@ -339,7 +358,7 @@ function setShellParam(uploadType, param, maxSizeKB, count) {
 function setServiceParamFn(uploadType, param, isCallService) {
   if (isCallService) {
     const shellType = UType2Shell[uploadType]
-    
+
     if (param) {
       // 如果是影像件上传服务的入参（默认是电投）
       return function(fileName) {
@@ -379,7 +398,7 @@ function setServiceParamFn(uploadType, param, isCallService) {
 
 // state保存返回的是一个可执行的函数，传入filename即可
 function getStateSetFn(uploadType, param) {
-  
+
   if (param) {
     const stateParams = param.personKey ? [param.personKey] : []
     if (UType2State[uploadType] && UType2State[uploadType].save) {

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')
 
@@ -956,15 +954,6 @@ nFqBB1zM586NpO+4hua/1Ol5OiqoQJ4iQinyDiA=
         for (let i = 0; i < base64Files.length; i++) {
           const element = base64Files[i];
 
-          // 需要上传时显示进度提示
-          if (params.isUpload) {
-            Toast.loading({
-              forbidClick: true,
-              message: `选择了${base64Files.length}张图片，正在上传第${i+1}张`,
-              duration: 0, // 持续展示 toast
-            });
-          }
-
           try {
             console.log(isCropper, '--------------是否需要裁剪---------');
 
@@ -989,6 +978,23 @@ nFqBB1zM586NpO+4hua/1Ol5OiqoQJ4iQinyDiA=
               continue; // 继续处理下一张图片
             }
 
+            // 需要上传时显示进度提示
+            if (params.isUpload) {
+              if(base64Files.length>1){
+                Toast.loading({
+                  forbidClick: true,
+                  message: `选择了${base64Files.length}张图片，正在上传第${i+1}张`,
+                  duration: 0,
+                });
+              } else {
+                Toast.loading({
+                  forbidClick: true,
+                  message: '上传中...',
+                  duration: 0,
+                });
+              }
+            }
+
             // 3. 需要上传：转换为文件并上传
             const file = await nativeUtils.base64ToFile(element.imageBase64, 'image.png');
             const result = await nativeUtils.uploadFile(
@@ -1167,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() {
@@ -1201,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;
   },