@uxda/appkit 4.3.3 → 4.3.4

package/dist/index.js

@@ -1,15 +1,15 @@
-import { Grid, GridItem, Popup, ActionSheet, Checkbox, Button, Dialog, DatePicker, Form, FormItem, RadioGroup, Radio, Ellipsis, Skeleton, Cell, Input, Steps, Step } from '@nutui/nutui-taro';
+import { GridItem, Grid, Popup, ActionSheet, Checkbox, Button, Dialog, DatePicker, Radio, RadioGroup, FormItem, Form, Ellipsis, Skeleton, Cell, Input, Step, Steps } from '@nutui/nutui-taro';
 import '@nutui/nutui-taro/dist/packages/button/style/css';
 import '@nutui/nutui-taro/dist/packages/checkbox/style/css';
-import { defineComponent, reactive, createBlock, openBlock, withCtx, createElementBlock, Fragment, renderList, normalizeClass, createElementVNode, toDisplayString, createTextVNode, ref, computed, onUnmounted, resolveDirective, createCommentVNode, withDirectives, renderSlot, createVNode, normalizeStyle, unref, isRef, onMounted, createStaticVNode, watch, vShow, mergeModels, useModel, resolveComponent, vModelText, watchPostEffect, withModifiers } from 'vue';
+import { defineComponent, reactive, openBlock, createBlock, withCtx, createElementBlock, Fragment, renderList, normalizeClass, createElementVNode, toDisplayString, createTextVNode, ref, computed, onUnmounted, resolveDirective, createCommentVNode, withDirectives, renderSlot, createVNode, normalizeStyle, unref, isRef, onMounted, createStaticVNode, watch, vShow, mergeModels, useModel, resolveComponent, vModelText, watchPostEffect, withModifiers } from 'vue';
 import '@nutui/nutui-taro/dist/packages/grid/style/css';
 import '@nutui/nutui-taro/dist/packages/griditem/style/css';
-import Taro, { showModal, getSystemInfoSync, getMenuButtonBoundingClientRect, uploadFile, request as request$1, showToast, chooseMedia, chooseMessageFile, showLoading, hideLoading, getStorageSync, setStorageSync, getSystemInfo, getNetworkType, getEnv, getAccountInfoSync, getPerformance, onAppHide, useDidShow, onAppShow, onNetworkStatusChange, useRouter } from '@tarojs/taro';
+import Taro, { showModal, getSystemInfoSync, getMenuButtonBoundingClientRect, request as request$1, uploadFile, showToast, chooseMedia, chooseMessageFile, showLoading, hideLoading, getStorageSync, setStorageSync, getSystemInfo, getNetworkType, getEnv, getAccountInfoSync, getPerformance, onAppHide, useDidShow, onAppShow, onNetworkStatusChange, useRouter } from '@tarojs/taro';
 import '@nutui/nutui-taro/dist/packages/popup/style/css';
 import isMobilePhone from 'validator/es/lib/isMobilePhone';
 import isIdentityCard from 'validator/es/lib/isIdentityCard';
 import qs from 'qs';
-import { NsForm, NsInput, NsButton, NsIcon, usePopup, useNutshell, NsButtonGroup, usePaging, NsPage, NsTabs, NsPageContent, NsSkeleton, NsRepeator, NsCard, NsEmpty, NsCheckbox } from '@uxda/nutshell/taro';
+import { NsForm, NsInput, NsButton, useNutshell, NsIcon, usePopup, NsButtonGroup, usePaging, NsPage, NsTabs, NsPageContent, NsSkeleton, NsRepeator, NsCard, NsEmpty, NsCheckbox } from '@uxda/nutshell/taro';
 import '@nutui/nutui-taro/dist/packages/actionsheet/style/css';
 import pako from 'pako';
 import dsBridge from 'dsbridge';
@@ -34,7 +34,7 @@ import '@nutui/nutui-taro/dist/packages/step/style/css';
 
 const _hoisted_1$G = { class: "token-line number" };
 const _hoisted_2$t = { class: "number" };
-var script$M = /* @__PURE__ */ defineComponent({
+var script$O = /* @__PURE__ */ defineComponent({
   __name: "AmountPicker",
   props: {
     items: { type: Array, required: true, default: () => [] },
@@ -107,7 +107,7 @@ var script$M = /* @__PURE__ */ defineComponent({
   }
 });
 
-script$M.__file = "src/payment/components/AmountPicker.vue";
+script$O.__file = "src/payment/components/AmountPicker.vue";
 
 const getSdkConfig = (appCode, url) => {
   return new Promise((resolve, reject) => {
@@ -310,71 +310,84 @@ function useEncode() {
   };
 }
 
-const globalData = {};
-
-const appKitOptions = {
-  app: () => "",
-  tenant: () => "",
-  token: () => "",
-  tempToken: () => "",
-  baseUrl: () => "",
-  401() {
-  },
-  gray: () => ""
-};
-const useAppKitOptions = () => {
-  if (!globalData.$appKitOptions) {
-    globalData.$appKitOptions = appKitOptions;
-  }
-  return globalData.$appKitOptions;
-};
-
-const mappings$1 = {
-  downloadUrl: "thrumb",
-  fileId: "id",
-  fileName: "name",
-  fileSize: "size",
-  fileSuffix: "ext",
-  fileType: "type",
-  originalUrl: "url"
-};
-const transformFields = (row) => {
-  return Object.fromEntries(Object.entries(row).map(([k, v]) => [mappings$1[k] || k, v]));
+const compressImageWithCanvas = (src, quality) => {
+  return new Promise((resolve, reject) => {
+    const img = new Image();
+    img.crossOrigin = "anonymous";
+    img.onload = () => {
+      try {
+        const canvas = document.createElement("canvas");
+        const ctx = canvas.getContext("2d");
+        if (!ctx) {
+          reject(new Error("\u65E0\u6CD5\u83B7\u53D6 canvas \u4E0A\u4E0B\u6587"));
+          return;
+        }
+        const maxWidth = 900;
+        const maxHeight = 900;
+        let width = img.width;
+        let height = img.height;
+        if (width > maxWidth || height > maxHeight) {
+          const ratio = Math.min(maxWidth / width, maxHeight / height);
+          width = width * ratio;
+          height = height * ratio;
+        }
+        canvas.width = width;
+        canvas.height = height;
+        ctx.drawImage(img, 0, 0, width, height);
+        canvas.toBlob(
+          (blob) => {
+            if (!blob) {
+              reject(new Error("\u56FE\u7247\u538B\u7F29\u5931\u8D25"));
+              return;
+            }
+            const compressedUrl = URL.createObjectURL(blob);
+            resolve(compressedUrl);
+          },
+          "image/jpeg",
+          quality / 100
+        );
+      } catch (error) {
+        reject(error);
+      }
+    };
+    img.onerror = () => {
+      reject(new Error("\u56FE\u7247\u52A0\u8F7D\u5931\u8D25"));
+    };
+    img.src = src;
+  });
 };
-const useUpload = (config) => {
-  const appkitOptions = useAppKitOptions();
-  const upload = (url, file) => {
+async function compressImage(src, quality = 80) {
+  if (Taro.getEnv() === "WEB") {
+    try {
+      const compressedUrl = await compressImageWithCanvas(src, quality);
+      return { tempFilePath: compressedUrl };
+    } catch (error) {
+      console.error("\u56FE\u7247\u538B\u7F29\u5931\u8D25:", error);
+      return { tempFilePath: src };
+    }
+  } else {
     return new Promise((resolve, reject) => {
-      uploadFile({
-        url: config.baseUrl + url,
-        filePath: file.path,
-        name: "file",
-        formData: {
-          objectNo: `min${Date.now()}`
-        },
-        header: {
-          ...config.headers,
-          token: appkitOptions.tempToken() || appkitOptions.token()
+      Taro.compressImage({
+        src,
+        quality,
+        success: (res) => {
+          resolve(res);
         },
-        success: (rsp) => {
-          const { data } = rsp;
-          try {
-            const response = JSON.parse(data);
-            console.log("===response", response);
-            resolve(transformFields(response.result));
-          } catch (e) {
-            reject({
-              message: "\u6587\u4EF6\u4E0A\u4F20\u5F02\u5E38"
-            });
-          }
+        fail: (res) => {
+          reject(res);
         }
       });
     });
-  };
-  return {
-    upload
-  };
-};
+  }
+}
+function getCompressQuality(size) {
+  let quality = 100;
+  const curSize = size / (1024 * 1024);
+  if (curSize > 6) {
+    quality = quality - (curSize - 6) / curSize * 100;
+  }
+  return quality;
+}
 
 const defaultCryptoConfig = {
   maskField: "mask",
@@ -415,6 +428,25 @@ function useCrypto(config) {
   };
 }
 
+const globalData = {};
+
+const appKitOptions = {
+  app: () => "",
+  tenant: () => "",
+  token: () => "",
+  tempToken: () => "",
+  baseUrl: () => "",
+  401() {
+  },
+  gray: () => ""
+};
+const useAppKitOptions = () => {
+  if (!globalData.$appKitOptions) {
+    globalData.$appKitOptions = appKitOptions;
+  }
+  return globalData.$appKitOptions;
+};
+
 const defaultLogOptions = {
   projectName: "ddyk-dev",
   logStore: "ddjf-internet-web",
@@ -548,11 +580,59 @@ function useWxAuth() {
   };
 }
 
+const mappings$1 = {
+  downloadUrl: "thrumb",
+  fileId: "id",
+  fileName: "name",
+  fileSize: "size",
+  fileSuffix: "ext",
+  fileType: "type",
+  originalUrl: "url"
+};
+const transformFields = (row) => {
+  return Object.fromEntries(Object.entries(row).map(([k, v]) => [mappings$1[k] || k, v]));
+};
+const useUpload = (config) => {
+  const appkitOptions = useAppKitOptions();
+  const upload = (url, file) => {
+    return new Promise((resolve, reject) => {
+      uploadFile({
+        url: config.baseUrl + url,
+        filePath: file.path,
+        name: "file",
+        formData: {
+          objectNo: `min${Date.now()}`,
+          appCode: config.headers?.appcode || appkitOptions.app()
+        },
+        header: {
+          ...config.headers,
+          token: appkitOptions.tempToken() || appkitOptions.token()
+        },
+        success: (rsp) => {
+          const { data } = rsp;
+          try {
+            const response = JSON.parse(data);
+            console.log("===response", response);
+            resolve(transformFields(response.result));
+          } catch (e) {
+            reject({
+              message: "\u6587\u4EF6\u4E0A\u4F20\u5F02\u5E38"
+            });
+          }
+        }
+      });
+    });
+  };
+  return {
+    upload
+  };
+};
+
 const _hoisted_1$F = {
   key: 0,
   class: "page-title"
 };
-var script$L = /* @__PURE__ */ defineComponent({
+var script$N = /* @__PURE__ */ defineComponent({
   __name: "PageHeader",
   props: {
     title: { type: String, required: false, default: "" },
@@ -609,10 +689,10 @@ var script$L = /* @__PURE__ */ defineComponent({
   }
 });
 
-script$L.__file = "src/shared/components/PageHeader.vue";
+script$N.__file = "src/shared/components/PageHeader.vue";
 
 const _hoisted_1$E = { class: "drawer-body" };
-var script$K = /* @__PURE__ */ defineComponent({
+var script$M = /* @__PURE__ */ defineComponent({
   __name: "AppDrawer",
   props: {
     modelValue: { type: Boolean, required: true },
@@ -636,7 +716,7 @@ var script$K = /* @__PURE__ */ defineComponent({
         "onUpdate:visible": onVisibleChange
       }, {
         default: withCtx(() => [
-          createVNode(script$L, {
+          createVNode(script$N, {
             title: __props.title,
             style: normalizeStyle(unref(Taro).getEnv() !== "WEB" ? "" : "--height: 40px"),
             onClose: onPageHeaderClose
@@ -652,7 +732,7 @@ var script$K = /* @__PURE__ */ defineComponent({
   }
 });
 
-script$K.__file = "src/shared/components/AppDrawer.vue";
+script$M.__file = "src/shared/components/AppDrawer.vue";
 
 const _hoisted_1$D = { class: "app-verify column" };
 const _hoisted_2$s = { class: "caption" };
@@ -663,7 +743,7 @@ const _hoisted_5$e = {
   class: "caption"
 };
 const _hoisted_6$a = { class: "row buttons" };
-var script$J = /* @__PURE__ */ defineComponent({
+var script$L = /* @__PURE__ */ defineComponent({
   __name: "AppVerify",
   props: {
     phone: { type: String, required: true },
@@ -770,6 +850,7 @@ var script$J = /* @__PURE__ */ defineComponent({
         createElementVNode("div", _hoisted_6$a, [
           withDirectives((openBlock(), createBlock(unref(NsButton), {
             class: "cancel-btn",
+            r: 20,
             onClick: _cache[2] || (_cache[2] = ($event) => emits("cancel"))
           }, {
             default: withCtx(() => [..._cache[3] || (_cache[3] = [
@@ -786,6 +867,7 @@ var script$J = /* @__PURE__ */ defineComponent({
           ]),
           withDirectives((openBlock(), createBlock(unref(NsButton), {
             color: "primary",
+            r: 20,
             onClick: onOk
           }, {
             default: withCtx(() => [..._cache[4] || (_cache[4] = [
@@ -806,10 +888,10 @@ var script$J = /* @__PURE__ */ defineComponent({
   }
 });
 
-script$J.__file = "src/shared/components/AppVerify.vue";
+script$L.__file = "src/shared/components/AppVerify.vue";
 
 const _hoisted_1$C = { key: 0 };
-var script$I = /* @__PURE__ */ defineComponent({
+var script$K = /* @__PURE__ */ defineComponent({
   __name: "index",
   props: {
     text: { type: String, required: false },
@@ -876,7 +958,7 @@ var script$I = /* @__PURE__ */ defineComponent({
   }
 });
 
-script$I.__file = "src/components/dd-notice-bar/index.vue";
+script$K.__file = "src/components/dd-notice-bar/index.vue";
 
 const typeMappings = {
   CZ: "\u5145\u503C",
@@ -1081,7 +1163,7 @@ function useHttp$3() {
   return $http;
 }
 
-var script$H = /* @__PURE__ */ defineComponent({
+var script$J = /* @__PURE__ */ defineComponent({
   __name: "DeviceVersion",
   props: {
     versions: { type: String, required: false, default: "{}" }
@@ -1128,7 +1210,7 @@ var script$H = /* @__PURE__ */ defineComponent({
       }
     });
     return (_ctx, _cache) => {
-      return showAlert.value ? (openBlock(), createBlock(script$I, {
+      return showAlert.value ? (openBlock(), createBlock(script$K, {
         key: 0,
         showClose: "",
         style: normalizeStyle(topStype.value),
@@ -1139,102 +1221,262 @@ var script$H = /* @__PURE__ */ defineComponent({
   }
 });
 
-script$H.__file = "src/shared/components/DeviceVersion.vue";
+script$J.__file = "src/shared/components/DeviceVersion.vue";
 
-var script$G = /* @__PURE__ */ defineComponent({
+var script$I = /* @__PURE__ */ defineComponent({
   __name: "OcrIcon",
   props: {
     disabled: { type: Boolean, required: false, default: false },
     side: { type: String, required: false, default: "face" },
-    class: { type: String, required: false, default: "" }
+    className: { type: String, required: false, default: "" },
+    uploadUrl: { type: String, required: false, default: "/saas-base/file/uploadPublic" },
+    customUpload: { type: Function, required: false },
+    hasUploadVo: { type: Boolean, required: false, default: true },
+    customClick: { type: Boolean, required: false, default: false }
   },
   emits: ["complete"],
-  setup(__props, { emit: __emit }) {
+  setup(__props, { expose: __expose, emit: __emit }) {
     const appKitOptions = useAppKitOptions();
+    const $http = useHttp$3(), $n = useNutshell();
     const emits = __emit;
     const props = __props;
-    async function taroImgCompress(src, quality = 80) {
-      if (Taro.getEnv() === "WEB") {
-        return src;
-      } else {
-        return new Promise((resolve, reject) => {
-          Taro.compressImage({
-            src,
-            quality,
-            success: (res) => {
-              resolve(res);
-            },
-            fail: (res) => {
-              reject(res);
+    function allTrim(str) {
+      return str.replace(/\s+/g, "");
+    }
+    async function onUploadFile(csRes) {
+      let result = null;
+      try {
+        let { path, size, tempFilePath } = csRes.tempFiles[0];
+        const compressImg = await compressImage(path || tempFilePath, getCompressQuality(size)) || {};
+        const filePath = compressImg.tempFilePath || path;
+        if (props.customUpload) {
+          props.customUpload(filePath);
+          return;
+        }
+        showLoading({ title: "\u8EAB\u4EFD\u8BC1\u8BC6\u522B\u4E2D..", mask: true });
+        const session = appKitOptions.token();
+        const baseUrl = appKitOptions.baseUrl();
+        const upRes = await uploadFile({
+          url: `${baseUrl}${!props.hasUploadVo ? props.uploadUrl : "/hkapprove/ocr/idcard"}`,
+          filePath,
+          name: "file",
+          formData: {
+            objectNo: `min${Date.now()}`,
+            side: props.side,
+            appCode: appKitOptions.app()
+          },
+          header: {
+            token: session || ""
+          }
+        });
+        const res = JSON.parse(upRes.data);
+        if (res.code === "200") {
+          if (props.hasUploadVo) {
+            hideLoading();
+            const faceInfo = res.result.faceInfo || {};
+            const backInfo = res.result.backInfo || {};
+            result = {
+              faceInfo: {
+                name: allTrim(faceInfo.name || ""),
+                certNo: allTrim(faceInfo.num || ""),
+                address: allTrim(faceInfo.address || "")
+              },
+              backInfo: {
+                startDate: backInfo?.startDate || "",
+                endDate: backInfo?.endDate || ""
+              },
+              fileUploadVO: res.result.fileUploadVO || {}
+            };
+            if (props.side === "face" && !result.faceInfo.name && !result.faceInfo.certNo) {
+              showToast({ title: "\u8BC6\u522B\u5931\u8D25\uFF0C\u8BF7\u91CD\u8BD5", icon: "none" });
+            }
+            if (props.side === "back" && !result.backInfo?.startDate && !result.backInfo?.endDate) {
+              showToast({ title: "\u8BC6\u522B\u5931\u8D25\uFF0C\u8BF7\u91CD\u8BD5", icon: "none" });
             }
+          } else {
+            await getOcrInfo(res.result);
+          }
+        } else {
+          hideLoading();
+          showToast({
+            title: res.msg,
+            icon: "error"
           });
+        }
+      } catch (err) {
+        hideLoading();
+        console.log(err);
+      }
+      props.hasUploadVo && (result?.faceInfo.name || result?.backInfo.startDate) && emits("complete", result);
+    }
+    async function getOcrInfo(file) {
+      try {
+        const res = await $http.get("/hkbase/common/idCard", {
+          fileUrl: typeof file === "string" ? file : file.originalUrl,
+          side: props.side
         });
+        hideLoading();
+        if (props.side === "face" && !res?.name || props.side === "back" && !res?.startDate) {
+          $n.dialog({
+            title: "\u8BC6\u522B\u5931\u8D25",
+            message: `\u60A8\u4E0A\u4F20\u7684\u56FE\u7247\u53EF\u80FD\u4E0D\u591F\u6E05\u6670\u6216\u4E0E\u5F53\u524D\u529F\u80FD\u4E0D\u7B26\uFF0C\u8BF7\u91CD\u65B0\u4E0A\u4F20\u4E00\u5F20\u6E05\u6670\u3001\u5B8C\u6574\u7684\u56FE\u7247\u3002\u8C22\u8C22\uFF01`,
+            okText: "\u6211\u77E5\u9053\u4E86",
+            cancelText: ""
+          });
+          return;
+        }
+        emits("complete", {
+          faceInfo: {
+            name: allTrim(res?.name || ""),
+            certNo: allTrim(res?.cardNumber || ""),
+            address: allTrim(res?.address || "")
+          },
+          backInfo: {
+            startDate: res?.expireDate || "",
+            endDate: res?.signDate || ""
+          },
+          fileUploadVO: {
+            fileUrl: typeof file === "string" ? file : file.originalUrl,
+            fileKey: typeof file === "string" ? file : file.fileId
+          }
+        });
+      } catch (err) {
+        hideLoading();
+      }
+    }
+    const activeSheetVisible = ref(false);
+    const actionSheetMenus = [
+      {
+        name: "\u62CD\u6444",
+        type: "camera"
+      },
+      {
+        name: "\u4ECE\u76F8\u518C\u9009\u62E9",
+        type: "album"
+      },
+      {
+        name: "\u4ECE\u804A\u5929\u4F1A\u8BDD\u9009\u62E9",
+        type: "message"
       }
+    ];
+    if (Taro.getEnv() === "WEB") {
+      actionSheetMenus.pop();
     }
-    function getCompressQuality(size) {
-      let quality = 100;
-      const curSize = size / (1024 * 1024);
-      if (curSize > 6) {
-        quality = quality - (curSize - 6) / curSize * 100;
+    async function chooseImages(item) {
+      if (["camera", "album"].includes(item.type)) {
+        const csRes = await chooseMedia({
+          count: 1,
+          sourceType: [item.type],
+          // "camera" | "album"
+          maxDuration: 60
+          // 使用duration属性判断是图片还是视频，图片没有该属性
+        });
+        onUploadFile(csRes);
+      } else {
+        const csRes = await chooseMessageFile({
+          count: 1,
+          type: "image"
+        });
+        onUploadFile(csRes);
       }
-      return quality;
     }
-    function allTrim(str) {
-      return str.replace(/\s+/g, "");
+    async function onUpload() {
+      if (props.disabled) return;
+      if (Taro.getEnv() === "WEB") {
+        const csRes = await chooseMedia({
+          count: 1,
+          sourceType: ["album"],
+          // "camera" | "album"
+          maxDuration: 60
+          // 使用duration属性判断是图片还是视频，图片没有该属性
+        });
+        onUploadFile(csRes);
+        return;
+      }
+      activeSheetVisible.value = true;
     }
+    __expose({
+      onUpload
+    });
+    return (_ctx, _cache) => {
+      const _component_nut_action_sheet = ActionSheet;
+      const _directive_track_click = resolveDirective("track-click");
+      return openBlock(), createElementBlock(
+        Fragment,
+        null,
+        [
+          withDirectives((openBlock(), createElementBlock(
+            "div",
+            {
+              class: normalizeClass(["ocr-icon", [__props.disabled ? "disabled" : "", __props.className]]),
+              onClick: _cache[0] || (_cache[0] = ($event) => !__props.customClick ? onUpload() : null)
+            },
+            [
+              renderSlot(_ctx.$slots, "icon", {}, () => [
+                createVNode(unref(NsIcon), { name: "https://cdn.ddjf.com/static/images/beidouxing/ocr-icon.png" })
+              ])
+            ],
+            2
+            /* CLASS */
+          )), [
+            [_directive_track_click, "\u8EAB\u4EFD\u8BC1\u8BC6\u522B-\u70B9\u51FB"]
+          ]),
+          createVNode(_component_nut_action_sheet, {
+            visible: activeSheetVisible.value,
+            "onUpdate:visible": _cache[1] || (_cache[1] = ($event) => activeSheetVisible.value = $event),
+            "menu-items": actionSheetMenus,
+            onChoose: chooseImages,
+            "cancel-txt": "\u53D6\u6D88"
+          }, null, 8, ["visible"])
+        ],
+        64
+        /* STABLE_FRAGMENT */
+      );
+    };
+  }
+});
+
+script$I.__file = "src/shared/components/OcrIcon.vue";
+
+var script$H = /* @__PURE__ */ defineComponent({
+  __name: "OcrBank",
+  props: {
+    disabled: { type: Boolean, required: false, default: false },
+    class: { type: String, required: false, default: "" },
+    uploadUrl: { type: String, required: false, default: "/hkbase/file/uploadFile" },
+    customClick: { type: Boolean, required: false, default: false }
+  },
+  emits: ["complete"],
+  setup(__props, { expose: __expose, emit: __emit }) {
+    const appKitOptions = useAppKitOptions();
+    const $http = useHttp$3(), $n = useNutshell();
+    const emits = __emit;
+    const props = __props;
     async function onUploadFile(csRes) {
-      let result = null;
       try {
-        console.log("===\u4E0A\u4F20", csRes);
         let { path, size, tempFilePath } = csRes.tempFiles[0];
-        let filePath;
-        if (Taro.getEnv() !== "WEB") {
-          const compressImg = await taroImgCompress(path || tempFilePath, getCompressQuality(size)) || {};
-          filePath = compressImg.tempFilePath || path;
-        } else {
-          filePath = path || tempFilePath;
-        }
-        console.log(filePath, "filePath");
-        showLoading({ title: "\u8EAB\u4EFD\u8BC1\u8BC6\u522B\u4E2D.." });
+        const compressImg = await compressImage(path || tempFilePath, getCompressQuality(size)) || {};
+        const filePath = compressImg.tempFilePath || path;
+        showLoading({ title: "\u94F6\u884C\u5361\u8BC6\u522B\u4E2D..", mask: true });
         const session = appKitOptions.token();
         const baseUrl = appKitOptions.baseUrl();
         const upRes = await uploadFile({
-          url: baseUrl + "/hkapprove/ocr/idcard",
+          url: baseUrl + props.uploadUrl,
           filePath,
           name: "file",
           formData: {
             objectNo: `min${Date.now()}`,
-            side: props.side
+            appCode: appKitOptions.app()
           },
           header: {
             token: session || ""
           }
         });
-        hideLoading();
         const res = JSON.parse(upRes.data);
         if (res.code === "200") {
-          const faceInfo = res.result.faceInfo || {};
-          const backInfo = res.result.backInfo || {};
-          result = {
-            faceInfo: {
-              name: allTrim(faceInfo.name || ""),
-              certNo: allTrim(faceInfo.num || ""),
-              address: allTrim(faceInfo.address || "")
-            },
-            backInfo: {
-              startDate: backInfo?.startDate || "",
-              endDate: backInfo?.endDate || ""
-            },
-            fileUploadVO: res.result.fileUploadVO || {}
-          };
-          console.log("===\u8BC6\u522B", result);
-          if (props.side === "face" && !result.faceInfo.name && !result.faceInfo.certNo) {
-            showToast({ title: "\u8BC6\u522B\u5931\u8D25\uFF0C\u8BF7\u91CD\u8BD5", icon: "none" });
-          }
-          if (props.side === "back" && !result.backInfo?.startDate && !result.backInfo?.endDate) {
-            showToast({ title: "\u8BC6\u522B\u5931\u8D25\uFF0C\u8BF7\u91CD\u8BD5", icon: "none" });
-          }
+          await getBankCardInfo(res.result);
         } else {
+          hideLoading();
           showToast({
             title: res.msg,
             icon: "error"
@@ -1244,7 +1486,30 @@ var script$G = /* @__PURE__ */ defineComponent({
         hideLoading();
         console.log(err);
       }
-      emits("complete", result);
+    }
+    async function getBankCardInfo(file) {
+      try {
+        const res = await $http.get("/hkbase/common/bankCard", {
+          fileUrl: typeof file === "string" ? file : file.originalUrl
+        });
+        hideLoading();
+        if (res && !res.bankCardNumber) {
+          $n.dialog({
+            title: "\u8BC6\u522B\u5931\u8D25",
+            message: `\u60A8\u4E0A\u4F20\u7684\u56FE\u7247\u53EF\u80FD\u4E0D\u591F\u6E05\u6670\u6216\u4E0E\u5F53\u524D\u529F\u80FD\u4E0D\u7B26\uFF0C\u8BF7\u91CD\u65B0\u4E0A\u4F20\u4E00\u5F20\u6E05\u6670\u3001\u5B8C\u6574\u7684\u56FE\u7247\u3002\u8C22\u8C22\uFF01`,
+            okText: "\u6211\u77E5\u9053\u4E86",
+            cancelText: ""
+          });
+          return;
+        }
+        emits("complete", {
+          ...res,
+          fileUrl: typeof file === "string" ? file : file.originalUrl,
+          fileKey: typeof file === "string" ? file : file.fileId
+        });
+      } catch (err) {
+        hideLoading();
+      }
     }
     const activeSheetVisible = ref(false);
     const actionSheetMenus = [
@@ -1282,7 +1547,7 @@ var script$G = /* @__PURE__ */ defineComponent({
         onUploadFile(csRes);
       }
     }
-    async function onPhotograph() {
+    async function onUpload() {
       if (props.disabled) return;
       if (Taro.getEnv() === "WEB") {
         const csRes = await chooseMedia({
@@ -1297,6 +1562,9 @@ var script$G = /* @__PURE__ */ defineComponent({
       }
       activeSheetVisible.value = true;
     }
+    __expose({
+      onUpload
+    });
     return (_ctx, _cache) => {
       const _component_nut_action_sheet = ActionSheet;
       const _directive_track_click = resolveDirective("track-click");
@@ -1307,8 +1575,8 @@ var script$G = /* @__PURE__ */ defineComponent({
           withDirectives((openBlock(), createElementBlock(
             "div",
             {
-              class: normalizeClass(["ocr-icon", [__props.disabled ? "disabled" : ""]]),
-              onClick: onPhotograph
+              class: normalizeClass(["ocr-bank", [__props.disabled ? "disabled" : ""]]),
+              onClick: _cache[0] || (_cache[0] = ($event) => !__props.customClick ? onUpload() : null)
             },
             [
               renderSlot(_ctx.$slots, "icon", {}, () => [
@@ -1318,11 +1586,11 @@ var script$G = /* @__PURE__ */ defineComponent({
             2
             /* CLASS */
           )), [
-            [_directive_track_click, "\u8EAB\u4EFD\u8BC1\u8BC6\u522B-\u70B9\u51FB"]
+            [_directive_track_click, "\u94F6\u884C\u5361\u8BC6\u522B-\u70B9\u51FB"]
           ]),
           createVNode(_component_nut_action_sheet, {
             visible: activeSheetVisible.value,
-            "onUpdate:visible": _cache[0] || (_cache[0] = ($event) => activeSheetVisible.value = $event),
+            "onUpdate:visible": _cache[1] || (_cache[1] = ($event) => activeSheetVisible.value = $event),
             "menu-items": actionSheetMenus,
             onChoose: chooseImages,
             "cancel-txt": "\u53D6\u6D88"
@@ -1335,48 +1603,26 @@ var script$G = /* @__PURE__ */ defineComponent({
   }
 });
 
-script$G.__file = "src/shared/components/OcrIcon.vue";
+script$H.__file = "src/shared/components/OcrBank.vue";
 
-var script$F = /* @__PURE__ */ defineComponent({
+var script$G = /* @__PURE__ */ defineComponent({
   __name: "OcrBusinessLicense",
   props: {
-    disabled: { type: Boolean, required: true }
+    disabled: { type: Boolean, required: true, default: false },
+    customClick: { type: Boolean, required: false, default: false }
   },
   emits: ["complete"],
-  setup(__props, { emit: __emit }) {
+  setup(__props, { expose: __expose, emit: __emit }) {
     const appKitOptions = useAppKitOptions();
     const emits = __emit;
     const props = __props;
-    async function taroImgCompress(src, quality = 80) {
-      return new Promise((resolve, reject) => {
-        Taro.compressImage({
-          src,
-          quality,
-          success: (res) => {
-            resolve(res);
-          },
-          fail: (res) => {
-            reject(res);
-          }
-        });
-      });
-    }
-    function getCompressQuality(size) {
-      let quality = 100;
-      const curSize = size / (1024 * 1024);
-      if (curSize > 6) {
-        quality = quality - (curSize - 6) / curSize * 100;
-      }
-      return quality;
-    }
     function allTrim(str) {
       return str.replace(/\s+/g, "");
     }
-    async function onIconClick() {
+    async function onUpload() {
       if (props.disabled) {
         return;
       }
-      console.log("===onIconClick");
       let result = null;
       try {
         const csRes = await chooseMedia({
@@ -1384,14 +1630,9 @@ var script$F = /* @__PURE__ */ defineComponent({
           sourceType: ["album", "camera"]
         });
         let { size, tempFilePath } = csRes.tempFiles[0];
-        let filePath;
-        if (Taro.getEnv() !== "WEB") {
-          const compressImg = await taroImgCompress(tempFilePath, getCompressQuality(size)) || {};
-          filePath = compressImg.tempFilePath;
-        } else {
-          filePath = tempFilePath;
-        }
-        showLoading({ title: "\u8425\u4E1A\u6267\u7167\u8BC6\u522B\u4E2D.." });
+        const compressImg = await compressImage(tempFilePath, getCompressQuality(size)) || {};
+        const filePath = compressImg.tempFilePath;
+        showLoading({ title: "\u8425\u4E1A\u6267\u7167\u8BC6\u522B\u4E2D..", mask: true });
         const session = appKitOptions.token();
         const baseUrl = appKitOptions.baseUrl();
         const upRes = await uploadFile({
@@ -1399,7 +1640,8 @@ var script$F = /* @__PURE__ */ defineComponent({
           filePath,
           name: "file",
           formData: {
-            objectNo: `min${Date.now()}`
+            objectNo: `min${Date.now()}`,
+            appCode: appKitOptions.app()
           },
           header: {
             token: session || ""
@@ -1433,16 +1675,21 @@ var script$F = /* @__PURE__ */ defineComponent({
       }
       emits("complete", result);
     }
+    __expose({
+      onUpload
+    });
     return (_ctx, _cache) => {
       const _directive_track_click = resolveDirective("track-click");
       return withDirectives((openBlock(), createElementBlock(
         "div",
         {
           class: normalizeClass([["ocr-business-license", __props.disabled ? "disabled" : ""], "ocr-icon"]),
-          onClick: onIconClick
+          onClick: _cache[0] || (_cache[0] = ($event) => !__props.customClick ? onUpload() : null)
         },
         [
-          createVNode(unref(NsIcon), { name: "https://cdn.ddjf.com/static/images/beidouxing/ocr-icon.png" })
+          renderSlot(_ctx.$slots, "icon", {}, () => [
+            createVNode(unref(NsIcon), { name: "https://cdn.ddjf.com/static/images/beidouxing/ocr-icon.png" })
+          ])
         ],
         2
         /* CLASS */
@@ -1453,7 +1700,194 @@ var script$F = /* @__PURE__ */ defineComponent({
   }
 });
 
-script$F.__file = "src/shared/components/OcrBusinessLicense.vue";
+script$G.__file = "src/shared/components/OcrBusinessLicense.vue";
+
+var script$F = /* @__PURE__ */ defineComponent({
+  __name: "OcrInvoice",
+  props: {
+    disabled: { type: Boolean, required: false, default: false },
+    side: { type: String, required: false, default: "face" },
+    className: { type: String, required: false, default: "" },
+    customUpload: { type: Function, required: false },
+    uploadUrl: { type: String, required: false, default: "/hkbase/file/uploadFile" },
+    customClick: { type: Boolean, required: false, default: false }
+  },
+  emits: ["complete"],
+  setup(__props, { expose: __expose, emit: __emit }) {
+    const appKitOptions = useAppKitOptions();
+    const $http = useHttp$3(), $n = useNutshell();
+    const emits = __emit;
+    const props = __props;
+    async function onUploadFile(csRes) {
+      try {
+        let { path, size, tempFilePath } = csRes.tempFiles[0];
+        const compressImg = await compressImage(path || tempFilePath, getCompressQuality(size)) || {};
+        const filePath = compressImg.tempFilePath || path;
+        if (props.customUpload) {
+          props.customUpload(filePath);
+          return;
+        }
+        showLoading({ title: "\u53D1\u7968\u8BC6\u522B\u4E2D..", mask: true });
+        const session = appKitOptions.token();
+        const baseUrl = appKitOptions.baseUrl();
+        const upRes = await uploadFile({
+          url: `${baseUrl}${props.uploadUrl}`,
+          filePath,
+          name: "file",
+          formData: {
+            objectNo: `min${Date.now()}`,
+            appCode: appKitOptions.app()
+          },
+          header: {
+            token: session || ""
+          }
+        });
+        const res = JSON.parse(upRes.data);
+        if (res.code === "200") {
+          await getOcrInfo(res.result);
+        } else {
+          hideLoading();
+          showToast({
+            title: res.msg,
+            icon: "error"
+          });
+        }
+      } catch (err) {
+        hideLoading();
+        console.log(err);
+      }
+    }
+    async function getOcrInfo(file) {
+      try {
+        const res = await $http.get("/hkbase/common/vatInvoice", {
+          fileUrl: typeof file === "string" ? file : file.originalUrl,
+          fileType: "img"
+        });
+        hideLoading();
+        if (!res?.purchaserRegisterNum) {
+          $n.dialog({
+            title: "\u8BC6\u522B\u5931\u8D25",
+            message: `\u60A8\u4E0A\u4F20\u7684\u56FE\u7247\u53EF\u80FD\u4E0D\u591F\u6E05\u6670\u6216\u4E0E\u5F53\u524D\u529F\u80FD\u4E0D\u7B26\uFF0C\u8BF7\u91CD\u65B0\u4E0A\u4F20\u4E00\u5F20\u6E05\u6670\u3001\u5B8C\u6574\u7684\u56FE\u7247\u3002\u8C22\u8C22\uFF01`,
+            okText: "\u6211\u77E5\u9053\u4E86",
+            cancelText: ""
+          });
+          return;
+        }
+        emits("complete", {
+          invoiceDate: res?.invoiceDate,
+          invoiceNum: res?.invoiceNum,
+          invoiceNumConfirm: res?.invoiceNumConfirm,
+          invoiceType: res?.invoiceType,
+          noteDrawer: res?.noteDrawer,
+          purchaserBank: res?.purchaserBank,
+          purchaserName: res?.purchaserName,
+          purchaserRegisterNum: res?.purchaserRegisterNum,
+          remarks: res?.remarks,
+          sellerName: res?.sellerName,
+          sellerRegisterNum: res?.sellerRegisterNum,
+          serviceType: res?.serviceType,
+          totalAmount: res?.totalAmount,
+          totalTax: res?.totalTax,
+          fileUrl: typeof file === "string" ? file : file.originalUrl,
+          fileKey: typeof file === "string" ? file : file.fileId
+        });
+      } catch (err) {
+        hideLoading();
+      }
+    }
+    const activeSheetVisible = ref(false);
+    const actionSheetMenus = [
+      {
+        name: "\u62CD\u6444",
+        type: "camera"
+      },
+      {
+        name: "\u4ECE\u76F8\u518C\u9009\u62E9",
+        type: "album"
+      },
+      {
+        name: "\u4ECE\u804A\u5929\u4F1A\u8BDD\u9009\u62E9",
+        type: "message"
+      }
+    ];
+    if (Taro.getEnv() === "WEB") {
+      actionSheetMenus.pop();
+    }
+    async function chooseImages(item) {
+      if (["camera", "album"].includes(item.type)) {
+        const csRes = await chooseMedia({
+          count: 1,
+          sourceType: [item.type],
+          // "camera" | "album"
+          maxDuration: 60
+          // 使用duration属性判断是图片还是视频，图片没有该属性
+        });
+        onUploadFile(csRes);
+      } else {
+        const csRes = await chooseMessageFile({
+          count: 1,
+          type: "image"
+        });
+        onUploadFile(csRes);
+      }
+    }
+    async function onUpload() {
+      if (props.disabled) return;
+      if (Taro.getEnv() === "WEB") {
+        const csRes = await chooseMedia({
+          count: 1,
+          sourceType: ["album"],
+          // "camera" | "album"
+          maxDuration: 60
+          // 使用duration属性判断是图片还是视频，图片没有该属性
+        });
+        onUploadFile(csRes);
+        return;
+      }
+      activeSheetVisible.value = true;
+    }
+    __expose({
+      onUpload
+    });
+    return (_ctx, _cache) => {
+      const _component_nut_action_sheet = ActionSheet;
+      const _directive_track_click = resolveDirective("track-click");
+      return openBlock(), createElementBlock(
+        Fragment,
+        null,
+        [
+          withDirectives((openBlock(), createElementBlock(
+            "div",
+            {
+              class: normalizeClass(["ocr-invoice", [__props.disabled ? "disabled" : "", __props.className]]),
+              onClick: _cache[0] || (_cache[0] = ($event) => !__props.customClick ? onUpload() : null)
+            },
+            [
+              renderSlot(_ctx.$slots, "icon", {}, () => [
+                createVNode(unref(NsIcon), { name: "https://cdn.ddjf.com/static/images/beidouxing/ocr-icon.png" })
+              ])
+            ],
+            2
+            /* CLASS */
+          )), [
+            [_directive_track_click, "\u53D1\u7968\u8BC6\u522B-\u70B9\u51FB"]
+          ]),
+          createVNode(_component_nut_action_sheet, {
+            visible: activeSheetVisible.value,
+            "onUpdate:visible": _cache[1] || (_cache[1] = ($event) => activeSheetVisible.value = $event),
+            "menu-items": actionSheetMenus,
+            onChoose: chooseImages,
+            "cancel-txt": "\u53D6\u6D88"
+          }, null, 8, ["visible"])
+        ],
+        64
+        /* STABLE_FRAGMENT */
+      );
+    };
+  }
+});
+
+script$F.__file = "src/shared/components/OcrInvoice.vue";
 
 var HttpMethod = /* @__PURE__ */ ((HttpMethod2) => {
   HttpMethod2["get"] = "GET";
@@ -1501,6 +1935,7 @@ const request = (config) => {
       }
     }).catch((e) => {
       console.log("request.catch===", e);
+      reject(e);
     });
   });
 };
@@ -1559,15 +1994,6 @@ function isApp() {
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-var TrackingEventType = /* @__PURE__ */ ((TrackingEventType2) => {
-  TrackingEventType2["PAGE_VIEW"] = "page_view";
-  TrackingEventType2["PAGE_LEAVE"] = "page_leave";
-  TrackingEventType2["APP_DEVICE_INFO"] = "app_device_info";
-  TrackingEventType2["CLICK"] = "click";
-  TrackingEventType2["CUSTOM"] = "custom";
-  return TrackingEventType2;
-})(TrackingEventType || {});
-const { PAGE_VIEW, PAGE_LEAVE, CLICK, CUSTOM, APP_DEVICE_INFO } = TrackingEventType;
 const DEFAULT_CONFIG = {
   enabled: true,
   debug: false,
@@ -2017,7 +2443,6 @@ class TrackingSDK {
    * 发送埋点数据
    */
   async flush() {
-    console.log(this.eventQueue.length, "this.eventQueue.length");
     if (this.eventQueue.length === 0) return;
     const events = [...this.eventQueue];
     this.eventQueue = [];
@@ -2703,9 +3128,11 @@ const endpointsList$2 = {
       certificateNo: params.user,
       accountAuthFlag: params.accountAuthFlag || false,
       channelCode: params.channelCode || null,
-      payFinishJumpUrl: params.payFinishJumpUrl || null
+      payFinishJumpUrl: params.payFinishJumpUrl || null,
+      useCloudBean: params.useCloudBean || false
     }),
     transform: (data) => {
+      console.log(data, "data-----");
       let json = null;
       try {
         json = JSON.parse(data.prePayStr);
@@ -2773,6 +3200,7 @@ const vendor$2 = {
             title: data.msg,
             icon: "none"
           });
+          reject(data.msg);
         }
       }).catch((e) => {
         reject(e);
@@ -2936,6 +3364,8 @@ const requestBrandWCPayByBean = (params, Appcode = "") => {
           }
         });
       }
+    }).catch(() => {
+      resolve(false);
     });
   });
 };
@@ -3061,7 +3491,7 @@ var script$E = /* @__PURE__ */ defineComponent({
       const _directive_track_click = resolveDirective("track-click");
       return openBlock(), createElementBlock("view", _hoisted_1$B, [
         createElementVNode("view", _hoisted_2$r, [
-          createVNode(script$M, {
+          createVNode(script$O, {
             items: amounts.value,
             selected: state.selected,
             onChange: onAmountSelect
@@ -3340,17 +3770,25 @@ const _hoisted_6$9 = {
 };
 const _hoisted_7$6 = { class: "amount" };
 const _hoisted_8$5 = ["src"];
-const _hoisted_9$4 = { class: "amount-footer" };
+const _hoisted_9$4 = {
+  key: 0,
+  class: "balance-warning"
+};
 const _hoisted_10$3 = {
+  key: 1,
+  class: "balance-warning-tip"
+};
+const _hoisted_11$3 = { class: "amount-footer" };
+const _hoisted_12$3 = {
   key: 0,
   class: "agreement"
 };
-const _hoisted_11$3 = { class: "buy-amount" };
-const _hoisted_12$3 = { class: "left" };
-const _hoisted_13$2 = { class: "amount" };
-const _hoisted_14$2 = { class: "item" };
-const _hoisted_15$2 = { class: "item" };
+const _hoisted_13$2 = { class: "buy-amount" };
+const _hoisted_14$2 = { class: "left" };
+const _hoisted_15$2 = { class: "amount" };
 const _hoisted_16$2 = { class: "item" };
+const _hoisted_17$2 = { class: "item" };
+const _hoisted_18$2 = { class: "item" };
 var script$A = /* @__PURE__ */ defineComponent({
   __name: "TradeView",
   props: {
@@ -3383,8 +3821,28 @@ var script$A = /* @__PURE__ */ defineComponent({
       state.selected = selected;
       selectBean.value = false;
     };
+    const extraPaymentAmount = computed(() => {
+      if (!selectBean.value || !amounts.value[state.selected]) {
+        return 0;
+      }
+      const paymentAmount = amounts.value[state.selected].paymentAmount || 0;
+      const currentBalance = balance.value || 0;
+      return Math.max(0, paymentAmount - currentBalance);
+    });
     const currentAmount = computed(() => {
-      return amounts.value[state.selected] && !selectBean.value ? amounts.value[state.selected].paymentAmount : 0;
+      if (!amounts.value[state.selected]) {
+        return 0;
+      }
+      if (selectBean.value) {
+        if (balance.value < amounts.value[state.selected].paymentAmount) {
+          return extraPaymentAmount.value;
+        }
+        return 0;
+      }
+      return amounts.value[state.selected].paymentAmount || 0;
+    });
+    const isCombinedPayment = computed(() => {
+      return selectBean.value && amounts.value[state.selected] && balance.value < amounts.value[state.selected].paymentAmount;
     });
     onMounted(() => {
       const $http = useHttp$2({ Appcode: props.headerApp, Tenant: props.tenant });
@@ -3398,24 +3856,28 @@ var script$A = /* @__PURE__ */ defineComponent({
     const showDialog = ref(false);
     async function beanPay() {
       const $http = useHttp$2({ Appcode: props.headerApp, Tenant: props.tenant });
-      $http.post(`/payment/paymentCaseConfig/purchase/${amounts.value[state.selected].id}`).then((response) => {
+      try {
+        const response = await $http.post(
+          `/payment/paymentCaseConfig/purchase/${amounts.value[state.selected].id}`
+        );
         if (response) {
           showDialog.value = false;
           emit("complete", { result: response, type: "bean" });
         } else {
           showToast({
-            title: response.message,
+            title: response?.message || "\u652F\u4ED8\u5931\u8D25",
             icon: "none"
           });
         }
-      });
-    }
-    const onPayClick = () => {
-      if (selectBean.value) {
-        showDialog.value = true;
-        return;
+      } catch (error) {
+        showToast({
+          title: error?.message || "\u652F\u4ED8\u5931\u8D25",
+          icon: "none"
+        });
       }
-      if (!selectBean.value && !state.agreed) {
+    }
+    function proceedWechatPayment() {
+      if (!state.agreed) {
         showToast({
           title: "\u8BF7\u52FE\u9009\u300A\u5927\u9053\u4E91\u5E73\u53F0\u4E91\u8C46\u5145\u503C\u534F\u8BAE\u300B",
           icon: "none"
@@ -3434,40 +3896,75 @@ var script$A = /* @__PURE__ */ defineComponent({
         }
         requestBrandWCPayByBean({
           caseConfigId: amounts.value[state.selected].id,
-          amount: amounts.value[state.selected].paymentAmount,
+          amount: currentAmount.value,
           app: "loankitMp",
           tenant: props.tenant,
           accountAuthFlag: false,
           channelCode: "centergzh",
           payFinishJumpUrl: props.payFinishJumpUrl,
-          fromMini: !!params.from
+          fromMini: !!params.from,
+          useCloudBean: isCombinedPayment.value
         }).then((result) => {
-          console.log(result, "------requestBrandWCPay");
           state.buttonLoading = false;
           if (typeof result === "boolean" && result) {
             window.location.href = props.payFinishJumpUrl;
           } else {
-            emit("complete", { result, type: "wePay" });
+            emit("complete", {
+              result,
+              type: isCombinedPayment.value ? "combined" : "wePay"
+            });
           }
+        }).catch((error) => {
+          state.buttonLoading = false;
+          showToast({
+            title: error.message || "\u652F\u4ED8\u5931\u8D25",
+            icon: "none"
+          });
         });
       } else {
         wx.login({
           success({ code }) {
-            requestPaymentByBean({
-              caseConfigId: amounts.value[state.selected].id,
-              amount: amounts.value[state.selected].paymentAmount,
-              app: props.app,
-              tenant: props.tenant,
-              user: code
-            }, props.headerApp).then((result) => {
+            requestPaymentByBean(
+              {
+                caseConfigId: amounts.value[state.selected].id,
+                amount: currentAmount.value,
+                app: props.app,
+                tenant: props.tenant,
+                user: code
+              },
+              props.headerApp
+            ).then((result) => {
               state.buttonLoading = false;
               if (result) {
-                emit("complete", { result: true, type: "wePay" });
+                emit("complete", {
+                  result: true,
+                  type: isCombinedPayment.value ? "combined" : "wePay"
+                });
               }
+            }).catch((error) => {
+              state.buttonLoading = false;
+              showToast({
+                title: error.message || "\u652F\u4ED8\u5931\u8D25",
+                icon: "none"
+              });
+            });
+          },
+          fail() {
+            state.buttonLoading = false;
+            showToast({
+              title: "\u767B\u5F55\u5931\u8D25\uFF0C\u8BF7\u91CD\u8BD5",
+              icon: "none"
             });
           }
         });
       }
+    }
+    const onPayClick = () => {
+      if (selectBean.value && !isCombinedPayment.value) {
+        showDialog.value = true;
+        return;
+      }
+      proceedWechatPayment();
     };
     return (_ctx, _cache) => {
       const _component_nut_checkbox = Checkbox;
@@ -3490,29 +3987,28 @@ var script$A = /* @__PURE__ */ defineComponent({
                 -1
                 /* CACHED */
               )),
-              !selectBean.value ? (openBlock(), createElementBlock(
+              !selectBean.value || isCombinedPayment.value ? (openBlock(), createElementBlock(
                 "div",
                 _hoisted_5$d,
-                "\u4F59\u989D " + toDisplayString(unref(formatAmount)(balance.value || 0)),
+                " \u4F59\u989D " + toDisplayString(unref(formatAmount)(balance.value || 0)),
                 1
                 /* TEXT */
               )) : (openBlock(), createElementBlock(
                 "div",
                 _hoisted_6$9,
-                "\u6263\u51CF\u540E\u4F59\u989D " + toDisplayString(unref(formatAmount)(balance.value - amounts.value[state.selected].paymentAmount)),
+                " \u6263\u51CF\u540E\u4F59\u989D " + toDisplayString(unref(formatAmount)(balance.value - amounts.value[state.selected].paymentAmount)),
                 1
                 /* TEXT */
               ))
             ]),
-            balance.value >= amounts.value[state.selected].paymentAmount ? (openBlock(), createElementBlock("div", {
-              key: 0,
+            createElementVNode("div", {
               class: "right",
               onClick: _cache[0] || (_cache[0] = ($event) => selectBean.value = !selectBean.value)
             }, [
               createElementVNode(
                 "div",
                 _hoisted_7$6,
-                "-" + toDisplayString(unref(formatAmount)(amounts.value[state.selected].paymentAmount || 0)),
+                " -" + toDisplayString(unref(formatAmount)(amounts.value[state.selected].paymentAmount || 0)),
                 1
                 /* TEXT */
               ),
@@ -3520,12 +4016,20 @@ var script$A = /* @__PURE__ */ defineComponent({
                 class: "icon",
                 src: selectBean.value ? "https://cdn.ddjf.com/static/images/appkit/select.svg" : "https://cdn.ddjf.com/static/images/appkit/not-select.svg"
               }, null, 8, _hoisted_8$5)
-            ])) : createCommentVNode("v-if", true)
+            ]),
+            isCombinedPayment.value ? (openBlock(), createElementBlock(
+              "div",
+              _hoisted_9$4,
+              " \u4E91\u8C46\u4F59\u989D\u4E0D\u8DB3,\u8FD8\u9700\u989D\u5916\u652F\u4ED8" + toDisplayString(unref(formatAmount)(extraPaymentAmount.value)) + "\u5143 ",
+              1
+              /* TEXT */
+            )) : createCommentVNode("v-if", true)
           ])) : createCommentVNode("v-if", true),
+          isCombinedPayment.value ? (openBlock(), createElementBlock("div", _hoisted_10$3, " \u8BF7\u5728\u652F\u4ED8\u5B8C\u6210\u524D\u786E\u4FDD\u5143\u8C46\u4F59\u989D\u4E0D\u88AB\u6D88\u8017,\u5426\u5219\u672C\u6B21\u6743\u76CA\u53EF\u80FD\u8D2D\u4E70\u5931\u8D25 ")) : createCommentVNode("v-if", true),
           renderSlot(_ctx.$slots, "banner")
         ]),
-        createElementVNode("view", _hoisted_9$4, [
-          !selectBean.value ? (openBlock(), createElementBlock("view", _hoisted_10$3, [
+        createElementVNode("view", _hoisted_11$3, [
+          !selectBean.value || isCombinedPayment.value ? (openBlock(), createElementBlock("view", _hoisted_12$3, [
             createVNode(_component_nut_checkbox, {
               modelValue: state.agreed,
               "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => state.agreed = $event)
@@ -3553,14 +4057,14 @@ var script$A = /* @__PURE__ */ defineComponent({
               /* STABLE */
             }, 8, ["modelValue"])
           ])) : createCommentVNode("v-if", true),
-          createElementVNode("div", _hoisted_11$3, [
-            createElementVNode("div", _hoisted_12$3, [
+          createElementVNode("div", _hoisted_13$2, [
+            createElementVNode("div", _hoisted_14$2, [
               _cache[8] || (_cache[8] = createTextVNode(
                 " \u5F85\u652F\u4ED8\uFF1A ",
                 -1
                 /* CACHED */
               )),
-              createElementVNode("span", _hoisted_13$2, [
+              createElementVNode("span", _hoisted_15$2, [
                 _cache[7] || (_cache[7] = createElementVNode(
                   "i",
                   null,
@@ -3611,22 +4115,22 @@ var script$A = /* @__PURE__ */ defineComponent({
               [
                 createElementVNode(
                   "div",
-                  _hoisted_14$2,
-                  "\u4E91\u8C46\u6263\u51CF\uFF1A" + toDisplayString(unref(formatAmount)(amounts.value[state.selected].paymentAmount || 0)),
+                  _hoisted_16$2,
+                  " \u4E91\u8C46\u6263\u51CF\uFF1A" + toDisplayString(unref(formatAmount)(amounts.value[state.selected].paymentAmount || 0)),
                   1
                   /* TEXT */
                 ),
                 createElementVNode(
                   "div",
-                  _hoisted_15$2,
-                  "\u6743\u76CA\u589E\u52A0\uFF1A" + toDisplayString(unref(formatAmount)(amounts.value[state.selected].priceRightNum || 0)) + "\u7B14",
+                  _hoisted_17$2,
+                  " \u6743\u76CA\u589E\u52A0\uFF1A" + toDisplayString(unref(formatAmount)(amounts.value[state.selected].priceRightNum || 0)) + "\u7B14 ",
                   1
                   /* TEXT */
                 ),
                 createElementVNode(
                   "div",
-                  _hoisted_16$2,
-                  "\u6263\u51CF\u540E\u4E91\u8C46\u4F59\u989D\uFF1A" + toDisplayString(unref(formatAmount)(balance.value - amounts.value[state.selected].paymentAmount)),
+                  _hoisted_18$2,
+                  " \u6263\u51CF\u540E\u4E91\u8C46\u4F59\u989D\uFF1A" + toDisplayString(unref(formatAmount)(balance.value - amounts.value[state.selected].paymentAmount)),
                   1
                   /* TEXT */
                 )
@@ -3646,7 +4150,7 @@ var script$A = /* @__PURE__ */ defineComponent({
 script$A.__file = "src/payment/components/TradeView.vue";
 
 const components = {
-  AmountPicker: script$M,
+  AmountPicker: script$O,
   RechargeView: script$E,
   UserAgreement: script$D,
   RechargeResult: script$C,
@@ -3757,7 +4261,7 @@ var script$z = /* @__PURE__ */ defineComponent({
               ])
             ])
           ]),
-          createCommentVNode(' <div class="line"></div>\r\n      <div class="card-row">\r\n        <div class="card-row-left desc">\u6743\u76CA\u4F7F\u7528\u65F6\u81EA\u52A8\u6263\u51CF\u4E91\u8C46</div>\r\n        <div class="card-row-right">\r\n          <div class="pay" v-track-click @click="gotoRecharge">\r\n            <div>\u5145\u503C</div>\r\n            <img\r\n              class="pay-icon"\r\n              src="https://cdn.ddjf.com/static/images/bpms-workBench/bean-right.png"\r\n            />\r\n          </div>\r\n        </div>\r\n      </div> ')
+          createCommentVNode(' <div class="line"></div>\n      <div class="card-row">\n        <div class="card-row-left desc">\u6743\u76CA\u4F7F\u7528\u65F6\u81EA\u52A8\u6263\u51CF\u4E91\u8C46</div>\n        <div class="card-row-right">\n          <div class="pay" v-track-click @click="gotoRecharge">\n            <div>\u5145\u503C</div>\n            <img\n              class="pay-icon"\n              src="https://cdn.ddjf.com/static/images/bpms-workBench/bean-right.png"\n            />\n          </div>\n        </div>\n      </div> ')
         ])
       ]);
     };
@@ -4464,7 +4968,7 @@ var script$t = /* @__PURE__ */ defineComponent({
         [
           createElementVNode("div", _hoisted_1$q, [
             createElementVNode("div", _hoisted_2$k, [
-              createVNode(unref(script$L), {
+              createVNode(unref(script$N), {
                 title: unref(Taro).getEnv() !== "WEB" ? "\u6211\u7684\u8D26\u6237" : "",
                 class: normalizeClass({ "with-background": scrolled.value > 0 }),
                 onClose: onPageHeaderClose
@@ -4769,7 +5273,7 @@ var script$t = /* @__PURE__ */ defineComponent({
             _: 1
             /* STABLE */
           }, 8, ["visible"]),
-          createVNode(unref(script$K), {
+          createVNode(unref(script$M), {
             modelValue: secondBalanceOpen.value,
             "onUpdate:modelValue": _cache[6] || (_cache[6] = ($event) => secondBalanceOpen.value = $event),
             title: "\u6536\u652F\u660E\u7EC6"
@@ -6138,7 +6642,10 @@ var script$k = /* @__PURE__ */ defineComponent({
                     ), [
                       [vModelText, formState.name]
                     ]),
-                    createVNode(script$G, { onComplete: onOCRInfo }, {
+                    createVNode(script$I, {
+                      "has-upload-vo": false,
+                      onComplete: onOCRInfo
+                    }, {
                       icon: withCtx(() => [..._cache[9] || (_cache[9] = [
                         createElementVNode(
                           "img",
@@ -6584,7 +7091,7 @@ var script$i = /* @__PURE__ */ defineComponent({
   emits: ["detail", "close", "view", "popup", "hasBanner"],
   setup(__props, { emit: __emit }) {
     const props = __props;
-    const { noticeClick } = useNotice();
+    const { toReadFun, noticeClick } = useNotice();
     const bannerMessages = ref([]);
     const popMessages = ref([]);
     const activeKey = ref(0);
@@ -6709,7 +7216,7 @@ var script$i = /* @__PURE__ */ defineComponent({
                 Fragment,
                 null,
                 renderList(bannerMessages.value, (item, key) => {
-                  return withDirectives((openBlock(), createBlock(script$I, {
+                  return withDirectives((openBlock(), createBlock(script$K, {
                     class: normalizeClass({ show: key === activeKey.value }),
                     key,
                     showClose: item.noticeType === 0,
@@ -6980,7 +7487,8 @@ function useCommonList(api, query, loading = true, method = "GET") {
   const isLoading = ref(false);
   async function fetchData(loading2) {
     loading2 && showLoading({
-      title: "\u52A0\u8F7D\u4E2D..."
+      title: "\u52A0\u8F7D\u4E2D...",
+      mask: true
     });
     isLoading.value = true;
     const $http = useHttp$1();
@@ -7382,7 +7890,8 @@ var script$e = /* @__PURE__ */ defineComponent({
     async function readAll() {
       try {
         showLoading({
-          title: "\u8BF7\u7A0D\u540E..."
+          title: "\u8BF7\u7A0D\u540E...",
+          mask: true
         });
         const appkitOptions = useAppKitOptions();
         const ep = endpoints["\u5168\u90E8\u5DF2\u8BFB"];
@@ -7430,7 +7939,7 @@ var script$e = /* @__PURE__ */ defineComponent({
               class: normalizeClass(["tabContainer", { inH5: unref(isWeb)() }])
             },
             [
-              createCommentVNode(' <ns-tabs\r\n        v-model="state.tab"\r\n        fill="#fff"\r\n        square\r\n        size="xl"\r\n        style="height: 46px"\r\n        @change="onTabChange"\r\n      >\r\n        <ns-tabs-item key="\u5168\u90E8" tab="\u5168\u90E8"></ns-tabs-item>\r\n        <ns-tabs-item key="\u4E1A\u52A1\u6D88\u606F" tab="\u4E1A\u52A1\u6D88\u606F"></ns-tabs-item>\r\n        <ns-tabs-item key="\u7CFB\u7EDF\u516C\u544A" tab="\u7CFB\u7EDF\u516C\u544A"></ns-tabs-item>\r\n        <ns-tabs-item key="\u672A\u8BFB" tab="\u672A\u8BFB"></ns-tabs-item>\r\n      </ns-tabs> '),
+              createCommentVNode(' <ns-tabs\n        v-model="state.tab"\n        fill="#fff"\n        square\n        size="xl"\n        style="height: 46px"\n        @change="onTabChange"\n      >\n        <ns-tabs-item key="\u5168\u90E8" tab="\u5168\u90E8"></ns-tabs-item>\n        <ns-tabs-item key="\u4E1A\u52A1\u6D88\u606F" tab="\u4E1A\u52A1\u6D88\u606F"></ns-tabs-item>\n        <ns-tabs-item key="\u7CFB\u7EDF\u516C\u544A" tab="\u7CFB\u7EDF\u516C\u544A"></ns-tabs-item>\n        <ns-tabs-item key="\u672A\u8BFB" tab="\u672A\u8BFB"></ns-tabs-item>\n      </ns-tabs> '),
               createVNode(unref(NsTabs), {
                 modelValue: state.tab,
                 "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => state.tab = $event),
@@ -8016,7 +8525,8 @@ var script$b = /* @__PURE__ */ defineComponent({
     }
     async function updateImage(filePath) {
       showLoading({
-        title: "\u4E0A\u4F20\u4E2D..."
+        title: "\u4E0A\u4F20\u4E2D...",
+        mask: true
       });
       const appkitOptions = useAppKitOptions();
       const $http = useHttp();
@@ -9992,7 +10502,8 @@ var script$6 = /* @__PURE__ */ defineComponent({
       const $http = useHttp();
       const appkitOptions = useAppKitOptions();
       showLoading({
-        title: "\u53CD\u9988\u4E2D..."
+        title: "\u53CD\u9988\u4E2D...",
+        mask: true
       });
       const attachment = JSON.parse(
         JSON.stringify(
@@ -10702,8 +11213,9 @@ var script$2 = /* @__PURE__ */ defineComponent({
                         rules: ["required"]
                       }, {
                         append: withCtx(() => [
-                          !\u5DF2\u8BA4\u8BC1.value ? (openBlock(), createBlock(unref(script$G), {
+                          !\u5DF2\u8BA4\u8BC1.value ? (openBlock(), createBlock(unref(script$I), {
                             key: 0,
+                            "has-upload-vo": false,
                             onComplete: onOcrComplete
                           })) : createCommentVNode("v-if", true)
                         ]),
@@ -11312,4 +11824,4 @@ const AppKit = {
   }
 };
 
-export { script$t as AccountView, script$M as AmountPicker, script$K as AppDrawer, script$J as AppVerify, script$z as BalanceCard, script$s as BalanceReminder, script$r as DateRange, script$H as DeviceVersion, script$p as ListFilter, script$4 as LoginSetting, script$i as NoticeBanner, script$h as NoticeEntry, script$f as NoticeList, script$e as NoticeList2, script$F as OcrBusinessLicense, script$G as OcrIcon, script$L as PageHeader, script$o as PromoterCard, script$C as RechargeResult, script$E as RechargeView, script$k as SelfRegistration, script as SharePoster, script$A as TradeView, script$D as UserAgreement, script$2 as UserAuth, script$a as UserBinding, script$9 as UserBindingSuccess, script$d as UserEntry, script$6 as UserFeedback, script$5 as UserFeedbackEntry, script$7 as UserHeadCrop, script$b as UserInfo, script$3 as UserResourceEmpty, components, createHttp, AppKit as default, defaultCryptoConfig, generateUniqueId, getSdkConfig, initTracking, installTrackingPlugin, jssdkServices, requestPayment$2 as requestPayment, requestWxH5Pay, services$1 as services, trackingSDK, useAppKit, useCountdown, useCrypto, useEncode, useLogger, usePageTracking, useSafeArea, useTabbar, useUpload, useValidator, useWxAuth };
+export { script$t as AccountView, script$O as AmountPicker, script$M as AppDrawer, script$L as AppVerify, script$z as BalanceCard, script$s as BalanceReminder, script$r as DateRange, script$J as DeviceVersion, script$p as ListFilter, script$4 as LoginSetting, script$i as NoticeBanner, script$h as NoticeEntry, script$f as NoticeList, script$e as NoticeList2, script$H as OcrBank, script$G as OcrBusinessLicense, script$I as OcrIcon, script$F as OcrInvoice, script$N as PageHeader, script$o as PromoterCard, script$C as RechargeResult, script$E as RechargeView, script$k as SelfRegistration, script as SharePoster, script$A as TradeView, script$D as UserAgreement, script$2 as UserAuth, script$a as UserBinding, script$9 as UserBindingSuccess, script$d as UserEntry, script$6 as UserFeedback, script$5 as UserFeedbackEntry, script$7 as UserHeadCrop, script$b as UserInfo, script$3 as UserResourceEmpty, components, compressImage, compressImageWithCanvas, createHttp, AppKit as default, defaultCryptoConfig, generateUniqueId, getCompressQuality, getSdkConfig, initTracking, installTrackingPlugin, jssdkServices, requestPayment$2 as requestPayment, requestWxH5Pay, services$1 as services, trackingSDK, useAppKit, useCountdown, useCrypto, useEncode, useLogger, usePageTracking, useSafeArea, useTabbar, useUpload, useValidator, useWxAuth };