@uxda/appkit 4.3.15 → 4.3.17

package/dist/index.js

@@ -4,12 +4,12 @@ import '@nutui/nutui-taro/dist/packages/checkbox/style/css';
 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, NsTabsItem, 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) => {
@@ -128,6 +128,7 @@ function requestWxH5Pay(options) {
           title: "\u63D0\u793A",
           content: "\u5F53\u524D\u73AF\u5883\u4E0D\u652F\u6301\u5FAE\u4FE1\u652F\u4ED8\uFF0C\u8BF7\u5728\u5FAE\u4FE1\u5185\u7F6E\u6D4F\u89C8\u5668\u4E2D\u6253\u5F00",
           confirmText: "\u786E\u5B9A",
+          confirmColor: "#017fff",
           success: () => {
           }
         });
@@ -310,71 +311,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 = 850;
+        const maxHeight = 850;
+        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 +429,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 +581,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 +690,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 +717,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,18 +733,18 @@ 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" };
 const _hoisted_3$m = { class: "number" };
-const _hoisted_4$h = { class: "form-btn" };
-const _hoisted_5$d = {
+const _hoisted_4$i = { class: "form-btn" };
+const _hoisted_5$e = {
   key: 1,
   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 },
@@ -738,7 +819,7 @@ var script$J = /* @__PURE__ */ defineComponent({
                 method: (value) => value.length === 6
               }]
             }, null, 8, ["modelValue", "rules"]),
-            createElementVNode("div", _hoisted_4$h, [
+            createElementVNode("div", _hoisted_4$i, [
               !sent.value ? withDirectives((openBlock(), createBlock(
                 unref(NsButton),
                 {
@@ -757,7 +838,7 @@ var script$J = /* @__PURE__ */ defineComponent({
               ]) : createCommentVNode("v-if", true),
               sent.value ? (openBlock(), createElementBlock(
                 "div",
-                _hoisted_5$d,
+                _hoisted_5$e,
                 toDisplayString(countdown.value) + "s\u540E\u91CD\u65B0\u53D1\u9001",
                 1
                 /* TEXT */
@@ -770,6 +851,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 +868,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 +889,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 +959,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",
@@ -1016,7 +1099,7 @@ const vendor$3 = {
           traceId: header.traceId,
           duration: endTime - startTime
         });
-        if (data.success) {
+        if (data.success || data.code === "401") {
           resolve({
             status: +data.code,
             message: data.msg,
@@ -1039,7 +1122,7 @@ function useHttp$3() {
   const headers = {
     Token: appkitOptions.tempToken() || appkitOptions.token(),
     Appcode: appkitOptions.app(),
-    cookie: `tid=${appkitOptions.tenant()}`,
+    tid: appkitOptions.tenant(),
     gray: appkitOptions.gray ? appkitOptions.gray() : "0"
   };
   const $http = createHttp({
@@ -1081,7 +1164,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 +1211,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 +1222,83 @@ 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 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 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;
+        const compressImg = await compressImage(path || tempFilePath, getCompressQuality(size)) || {};
+        const filePath = compressImg.tempFilePath || path;
+        if (props.customUpload) {
+          props.customUpload(filePath);
+          return;
         }
-        console.log(filePath, "filePath");
-        showLoading({ title: "\u8EAB\u4EFD\u8BC1\u8BC6\u522B\u4E2D.." });
+        showLoading({ title: "\u8EAB\u4EFD\u8BC1\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.hasUploadVo ? props.uploadUrl : "/hkapprove/ocr/idcard"}`,
           filePath,
           name: "file",
           formData: {
             objectNo: `min${Date.now()}`,
-            side: props.side
+            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" });
+          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"
@@ -1244,7 +1308,42 @@ var script$G = /* @__PURE__ */ defineComponent({
         hideLoading();
         console.log(err);
       }
-      emits("complete", result);
+      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?.signDate) {
+          $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 = [
@@ -1282,21 +1381,545 @@ 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({
+          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) {
+      try {
+        let { path, size, tempFilePath } = csRes.tempFiles[0];
+        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 + 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 getBankCardInfo(res.result);
+        } else {
+          hideLoading();
+          showToast({
+            title: res.msg,
+            icon: "error"
+          });
+        }
+      } catch (err) {
+        hideLoading();
+        console.log(err);
+      }
+    }
+    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 = [
+      {
+        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-bank", [__props.disabled ? "disabled" : ""]]),
+              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, "\u94F6\u884C\u5361\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$H.__file = "src/shared/components/OcrBank.vue";
+
+var script$G = /* @__PURE__ */ defineComponent({
+  __name: "OcrBusinessLicense",
+  props: {
+    disabled: { type: Boolean, required: true, default: false },
+    customClick: { type: Boolean, required: false, default: false }
+  },
+  emits: ["complete"],
+  setup(__props, { expose: __expose, emit: __emit }) {
+    const appKitOptions = useAppKitOptions();
+    const emits = __emit;
+    const props = __props;
+    function allTrim(str) {
+      return str.replace(/\s+/g, "");
+    }
+    async function onUpload() {
+      if (props.disabled) {
+        return;
+      }
+      let result = null;
+      try {
+        const csRes = await chooseMedia({
+          count: 1,
+          sourceType: ["album", "camera"]
+        });
+        let { size, tempFilePath } = csRes.tempFiles[0];
+        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({
+          url: baseUrl + "/promoact/common/parseBusinessLicense",
+          filePath,
+          name: "file",
+          formData: {
+            objectNo: `min${Date.now()}`,
+            appCode: appKitOptions.app()
+          },
+          header: {
+            token: session || ""
+          }
+        });
+        hideLoading();
+        const res = JSON.parse(upRes.data);
+        if (res.code === "200") {
+          const faceInfo = res.result || {};
+          result = {
+            companyName: allTrim(faceInfo.companyName || ""),
+            idCardNo: allTrim(faceInfo.idCardNo || ""),
+            legalPersonName: allTrim(faceInfo.legalPersonName || ""),
+            fileId: faceInfo.fileId,
+            originalUrl: faceInfo.originalUrl,
+            downloadUrl: faceInfo.downloadUrl
+          };
+          console.log("===\u8BC6\u522B", result);
+          if (!result.companyName && !result.idCardNo) {
+            showToast({ title: "\u8BC6\u522B\u5931\u8D25\uFF0C\u8BF7\u91CD\u8BD5", icon: "none" });
+          }
+        } else {
+          showToast({
+            title: res.msg,
+            icon: "error"
+          });
+        }
+      } catch (err) {
+        hideLoading();
+        console.log(err);
+      }
+      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: _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, "\u8425\u4E1A\u6267\u7167\u8BC6\u522B-\u70B9\u51FB"]
+      ]);
+    };
+  }
+});
+
+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;
+    function getFileType(filePath, fileName) {
+      const lowerPath = filePath.toLowerCase();
+      const lowerName = (fileName || "").toLowerCase();
+      if (lowerPath.endsWith(".pdf") || lowerName.endsWith(".pdf")) {
+        return "pdf";
+      }
+      const imageExtensions = [".jpg", ".jpeg", ".png", ".gif", ".bmp", ".webp"];
+      if (imageExtensions.some((ext) => lowerPath.endsWith(ext) || lowerName.endsWith(ext))) {
+        return "img";
+      }
+      return "img";
+    }
+    async function onUploadFile(csRes, fileType) {
+      try {
+        let { path, size, tempFilePath, name } = csRes.tempFiles[0];
+        const originalPath = path || tempFilePath;
+        const detectedFileType = fileType || getFileType(originalPath, name);
+        let filePath = originalPath;
+        if (detectedFileType === "img") {
+          const compressImg = await compressImage(originalPath, getCompressQuality(size)) || {};
+          filePath = compressImg.tempFilePath || originalPath;
+        }
+        if (props.customUpload) {
+          props.customUpload(filePath, detectedFileType);
+          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, detectedFileType);
+        } else {
+          hideLoading();
+          showToast({
+            title: res.msg,
+            icon: "error"
+          });
+        }
+      } catch (err) {
+        hideLoading();
+        console.log(err);
+      }
+    }
+    async function getOcrInfo(file, fileType = "img") {
+      try {
+        const fileUrl = typeof file === "string" ? file : file.originalUrl;
+        const res = await $http.get("/hkbase/common/vatInvoice", {
+          fileUrl,
+          fileType
+        });
+        hideLoading();
+        if (!res?.purchaserRegisterNum) {
+          $n.dialog({
+            title: "\u8BC6\u522B\u5931\u8D25",
+            message: `\u60A8\u4E0A\u4F20\u7684${fileType === "pdf" ? "\u6587\u4EF6" : "\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${fileType === "pdf" ? "PDF\u6587\u4EF6" : "\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,
+          fileType,
+          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"
+      },
+      {
+        name: "\u9009\u62E9\u6587\u4EF6",
+        type: "file"
+      }
+    ];
+    if (Taro.getEnv() === "WEB") {
+      actionSheetMenus.splice(2, 1);
+    }
+    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 if (item.type === "message") {
+        const csRes = await chooseMessageFile({
+          count: 1,
+          type: "image"
+        });
+        onUploadFile(csRes);
+      } else if (item.type === "file") {
+        const csRes = await chooseMessageFile({
+          count: 1,
+          type: "file"
+        });
+        onUploadFile(csRes);
+      }
+    }
+    function chooseFileInWeb() {
+      return new Promise((resolve, reject) => {
+        const input = document.createElement("input");
+        input.type = "file";
+        input.accept = "image/*,.pdf";
+        input.style.display = "none";
+        input.onchange = async (e) => {
+          const file = e.target?.files?.[0];
+          if (!file) {
+            document.body.removeChild(input);
+            resolve();
+            return;
+          }
+          let fileType = "img";
+          if (file.type === "application/pdf" || file.name.toLowerCase().endsWith(".pdf")) {
+            fileType = "pdf";
+          }
+          const filePath = URL.createObjectURL(file);
+          try {
+            const csRes = {
+              tempFiles: [{
+                path: filePath,
+                tempFilePath: filePath,
+                size: file.size,
+                name: file.name
+              }]
+            };
+            await onUploadFile(csRes, fileType);
+            resolve();
+          } catch (error) {
+            reject(error);
+          } finally {
+            document.body.removeChild(input);
+            URL.revokeObjectURL(filePath);
+          }
+        };
+        input.oncancel = () => {
+          document.body.removeChild(input);
+          resolve();
+        };
+        document.body.appendChild(input);
+        input.click();
+      });
+    }
+    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);
+        try {
+          await chooseFileInWeb();
+        } catch (err) {
+          console.error("\u6587\u4EF6\u9009\u62E9\u5931\u8D25:", err);
+        }
         return;
       }
       activeSheetVisible.value = true;
     }
+    __expose({
+      onUpload
+    });
     return (_ctx, _cache) => {
       const _component_nut_action_sheet = ActionSheet;
       const _directive_track_click = resolveDirective("track-click");
@@ -1307,8 +1930,8 @@ var script$G = /* @__PURE__ */ defineComponent({
           withDirectives((openBlock(), createElementBlock(
             "div",
             {
-              class: normalizeClass(["ocr-icon", [__props.disabled ? "disabled" : ""]]),
-              onClick: onPhotograph
+              class: normalizeClass(["ocr-invoice", [__props.disabled ? "disabled" : "", __props.className]]),
+              onClick: _cache[0] || (_cache[0] = ($event) => !__props.customClick ? onUpload() : null)
             },
             [
               renderSlot(_ctx.$slots, "icon", {}, () => [
@@ -1318,11 +1941,11 @@ var script$G = /* @__PURE__ */ defineComponent({
             2
             /* CLASS */
           )), [
-            [_directive_track_click, "\u8EAB\u4EFD\u8BC1\u8BC6\u522B-\u70B9\u51FB"]
+            [_directive_track_click, "\u53D1\u7968\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,125 +1958,7 @@ var script$G = /* @__PURE__ */ defineComponent({
   }
 });
 
-script$G.__file = "src/shared/components/OcrIcon.vue";
-
-var script$F = /* @__PURE__ */ defineComponent({
-  __name: "OcrBusinessLicense",
-  props: {
-    disabled: { type: Boolean, required: true }
-  },
-  emits: ["complete"],
-  setup(__props, { 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() {
-      if (props.disabled) {
-        return;
-      }
-      console.log("===onIconClick");
-      let result = null;
-      try {
-        const csRes = await chooseMedia({
-          count: 1,
-          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 session = appKitOptions.token();
-        const baseUrl = appKitOptions.baseUrl();
-        const upRes = await uploadFile({
-          url: baseUrl + "/promoact/common/parseBusinessLicense",
-          filePath,
-          name: "file",
-          formData: {
-            objectNo: `min${Date.now()}`
-          },
-          header: {
-            token: session || ""
-          }
-        });
-        hideLoading();
-        const res = JSON.parse(upRes.data);
-        if (res.code === "200") {
-          const faceInfo = res.result || {};
-          result = {
-            companyName: allTrim(faceInfo.companyName || ""),
-            idCardNo: allTrim(faceInfo.idCardNo || ""),
-            legalPersonName: allTrim(faceInfo.legalPersonName || ""),
-            fileId: faceInfo.fileId,
-            originalUrl: faceInfo.originalUrl,
-            downloadUrl: faceInfo.downloadUrl
-          };
-          console.log("===\u8BC6\u522B", result);
-          if (!result.companyName && !result.idCardNo) {
-            showToast({ title: "\u8BC6\u522B\u5931\u8D25\uFF0C\u8BF7\u91CD\u8BD5", icon: "none" });
-          }
-        } else {
-          showToast({
-            title: res.msg,
-            icon: "error"
-          });
-        }
-      } catch (err) {
-        hideLoading();
-        console.log(err);
-      }
-      emits("complete", result);
-    }
-    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
-        },
-        [
-          createVNode(unref(NsIcon), { name: "https://cdn.ddjf.com/static/images/beidouxing/ocr-icon.png" })
-        ],
-        2
-        /* CLASS */
-      )), [
-        [_directive_track_click, "\u8425\u4E1A\u6267\u7167\u8BC6\u522B-\u70B9\u51FB"]
-      ]);
-    };
-  }
-});
-
-script$F.__file = "src/shared/components/OcrBusinessLicense.vue";
+script$F.__file = "src/shared/components/OcrInvoice.vue";
 
 var HttpMethod = /* @__PURE__ */ ((HttpMethod2) => {
   HttpMethod2["get"] = "GET";
@@ -1501,6 +2006,7 @@ const request = (config) => {
       }
     }).catch((e) => {
       console.log("request.catch===", e);
+      reject(e);
     });
   });
 };
@@ -2008,7 +2514,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 = [];
@@ -2698,9 +3203,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);
@@ -2767,7 +3274,7 @@ const vendor$2 = {
           traceId: header.traceId,
           duration: endTime - startTime
         });
-        if (data.success) {
+        if (data.success || data.code === "401") {
           resolve({
             status: +data.code,
             message: data.msg,
@@ -2778,6 +3285,7 @@ const vendor$2 = {
             title: data.msg,
             icon: "none"
           });
+          reject(data.msg);
         }
       }).catch((e) => {
         reject(e);
@@ -2790,7 +3298,7 @@ function useHttp$2(defaultHeader) {
   const headers = {
     Token: appkitOptions.tempToken() || appkitOptions.token(),
     Appcode: defaultHeader?.Appcode || appkitOptions.app(),
-    cookie: `tid=${defaultHeader?.Tenant || appkitOptions.tenant()}`,
+    tid: defaultHeader?.Tenant || appkitOptions.tenant(),
     gray: appkitOptions.gray ? appkitOptions.gray() : "0"
   };
   const $http = createHttp({
@@ -2799,6 +3307,7 @@ function useHttp$2(defaultHeader) {
     headers,
     interceptors: [
       (raw) => {
+        console.log(raw, "=======raw");
         if (raw.status == 401) {
           appkitOptions[401]();
           return true;
@@ -2895,12 +3404,14 @@ const requestBrandWCPay = (params, Appcode = "") => {
     $http.post(endpoints$1.\u83B7\u53D6\u5FAE\u4FE1\u652F\u4ED8\u53C2\u6570\u5305, {
       ...params
     }).then((response) => {
-      if (!response.json) {
+      if (!response.json && !response.prePayStr) {
         showToast({
           title: response.message,
           icon: "none"
         });
         resolve(false);
+      } else if (!response.json && response.prePayStr) {
+        resolve(response);
       } else if (params.fromMini) {
         resolve(response.json);
       } else {
@@ -2924,12 +3435,14 @@ const requestBrandWCPayByBean = (params, Appcode = "") => {
     $http.post(endpoints$1.\u83B7\u53D6\u6743\u76CA\u5FAE\u4FE1\u652F\u4ED8, {
       ...params
     }).then((response) => {
-      if (!response.json) {
+      if (!response.json && !response.prePayStr) {
         showToast({
           title: response.message,
           icon: "none"
         });
         resolve(false);
+      } else if (!response.json && response.prePayStr) {
+        resolve(response);
       } else if (params.fromMini) {
         resolve(response.json);
       } else {
@@ -2941,6 +3454,8 @@ const requestBrandWCPayByBean = (params, Appcode = "") => {
           }
         });
       }
+    }).catch(() => {
+      resolve(false);
     });
   });
 };
@@ -2993,7 +3508,7 @@ function isChrome() {
 const _hoisted_1$B = { class: "view recharge-view" };
 const _hoisted_2$r = { class: "flex-grow" };
 const _hoisted_3$l = { class: "amount-footer" };
-const _hoisted_4$g = { class: "agreement" };
+const _hoisted_4$h = { class: "agreement" };
 var script$E = /* @__PURE__ */ defineComponent({
   __name: "RechargeView",
   props: {
@@ -3110,7 +3625,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
@@ -3118,7 +3633,7 @@ var script$E = /* @__PURE__ */ defineComponent({
           renderSlot(_ctx.$slots, "banner")
         ]),
         createElementVNode("view", _hoisted_3$l, [
-          createElementVNode("view", _hoisted_4$g, [
+          createElementVNode("view", _hoisted_4$h, [
             createVNode(_component_nut_checkbox, {
               modelValue: state.agreed,
               "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => state.agreed = $event)
@@ -3191,7 +3706,7 @@ const _hoisted_3$k = {
   key: 0,
   class: "caption"
 };
-const _hoisted_4$f = {
+const _hoisted_4$g = {
   key: 1,
   class: "caption"
 };
@@ -3232,7 +3747,7 @@ var script$C = /* @__PURE__ */ defineComponent({
           ),
           __props.payMethod == "bean" ? (openBlock(), createElementBlock("div", _hoisted_3$k, "\u6743\u76CA\u5DF2\u5230\u8D26")) : (openBlock(), createElementBlock(
             "div",
-            _hoisted_4$f,
+            _hoisted_4$g,
             toDisplayString(views[__props.type][1]) + "\u5C06\u57281\u5206\u949F\u4E4B\u5185\u5230\u8D26",
             1
             /* TEXT */
@@ -3379,8 +3894,8 @@ const _hoisted_3$i = {
   key: 0,
   class: "bean-buy"
 };
-const _hoisted_4$e = { class: "left" };
-const _hoisted_5$c = {
+const _hoisted_4$f = { class: "left" };
+const _hoisted_5$d = {
   key: 0,
   class: "amount"
 };
@@ -3390,24 +3905,33 @@ 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: {
     headerApp: { type: String, required: true },
     app: { type: String, required: true },
     tenant: { type: String, required: true },
-    payFinishJumpUrl: { type: String, required: false }
+    payFinishJumpUrl: { type: String, required: false },
+    apps: { type: String, required: false }
   },
   emits: ["complete", "agree", "loaded"],
   setup(__props, { expose: __expose, emit: __emit }) {
@@ -3434,8 +3958,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 });
@@ -3451,24 +3995,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"
@@ -3479,13 +4027,14 @@ var script$A = /* @__PURE__ */ defineComponent({
       if (Taro.getEnv() === "WEB") {
         requestBrandWCPayByBean({
           caseConfigId: amounts.value[state.selected].id,
-          amount: amounts.value[state.selected].paymentAmount,
+          amount: currentAmount.value,
           app: "loankitMp",
           tenant: props.tenant,
           accountAuthFlag: false,
           channelCode: getChannelCode(),
           payFinishJumpUrl: props.payFinishJumpUrl,
-          fromMini: !!params.from
+          fromMini: !!params.from,
+          useCloudBean: isCombinedPayment.value
         }).then((result) => {
           state.buttonLoading = false;
           if (typeof result === "boolean" && result) {
@@ -3494,28 +4043,56 @@ var script$A = /* @__PURE__ */ defineComponent({
             state.thirdPayId = result?.thirdPayId || "";
             window.location.href = result?.prePayStr;
           } 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"
             });
           }
         });
       }
-    };
+    }
     function getChannelCode() {
       if (isWechat()) {
         return "centergzh";
@@ -3525,6 +4102,46 @@ var script$A = /* @__PURE__ */ defineComponent({
         return "distributor";
       }
     }
+    const onPayClick = async () => {
+      if (selectBean.value && !isCombinedPayment.value) {
+        showDialog.value = true;
+        return;
+      }
+      if (isCombinedPayment.value) {
+        const res = await checkBalance();
+        if (!res) return;
+      }
+      proceedWechatPayment();
+    };
+    async function checkBalance() {
+      const $http = useHttp$2();
+      return new Promise((resolve, reject) => {
+        state.buttonLoading = true;
+        $http.get(endpoints$2.\u83B7\u53D6\u4F59\u989D\u660E\u7EC6, {
+          app: props.apps
+        }).then((data) => {
+          state.buttonLoading = false;
+          if (data.commonAccount < balance.value) {
+            showModal({
+              title: "\u6E29\u99A8\u63D0\u793A",
+              content: "\u4E91\u8C46\u4E0D\u8DB3\uFF0C\u8BF7\u5237\u65B0\u540E\u518D\u6B21\u786E\u8BA4",
+              showCancel: false,
+              confirmText: "\u5237\u65B0",
+              confirmColor: "#017fff",
+              success: () => {
+                balance.value = data.commonAccount;
+              }
+            });
+            resolve(false);
+          } else {
+            resolve(true);
+          }
+        }).catch((error) => {
+          state.buttonLoading = false;
+          resolve(false);
+        });
+      });
+    }
     const payResultCheck = () => {
       if (!state.thirdPayId) return;
       const $http = useHttp$2();
@@ -3534,7 +4151,7 @@ var script$A = /* @__PURE__ */ defineComponent({
         if (response.payStatus === "paid") {
           emit("complete", {
             result: true,
-            type: "wePay"
+            type: isCombinedPayment.value ? "combined" : "wePay"
           });
         }
       });
@@ -3555,7 +4172,7 @@ var script$A = /* @__PURE__ */ defineComponent({
             onChange: onAmountSelect
           }, null, 8, ["items", "selected"]),
           amounts.value[state.selected] ? (openBlock(), createElementBlock("div", _hoisted_3$i, [
-            createElementVNode("div", _hoisted_4$e, [
+            createElementVNode("div", _hoisted_4$f, [
               _cache[4] || (_cache[4] = createElementVNode(
                 "div",
                 { class: "title" },
@@ -3563,29 +4180,28 @@ var script$A = /* @__PURE__ */ defineComponent({
                 -1
                 /* CACHED */
               )),
-              !selectBean.value ? (openBlock(), createElementBlock(
+              !selectBean.value || isCombinedPayment.value ? (openBlock(), createElementBlock(
                 "div",
-                _hoisted_5$c,
-                "\u4F59\u989D " + toDisplayString(unref(formatAmount)(balance.value || 0)),
+                _hoisted_5$d,
+                " \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 */
               ),
@@ -3593,12 +4209,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)
@@ -3626,14 +4250,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,
@@ -3684,22 +4308,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 */
                 )
@@ -3719,7 +4343,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,
@@ -3729,8 +4353,8 @@ const components = {
 const _hoisted_1$w = { class: "account-card" };
 const _hoisted_2$n = { class: "card" };
 const _hoisted_3$h = { class: "card-row" };
-const _hoisted_4$d = { class: "card-row-left" };
-const _hoisted_5$b = { class: "bean-nums number" };
+const _hoisted_4$e = { class: "card-row-left" };
+const _hoisted_5$c = { class: "bean-nums number" };
 const _hoisted_6$8 = { class: "card-row-right" };
 var script$z = /* @__PURE__ */ defineComponent({
   __name: "BalanceCard",
@@ -3777,7 +4401,7 @@ var script$z = /* @__PURE__ */ defineComponent({
       return openBlock(), createElementBlock("div", _hoisted_1$w, [
         createElementVNode("div", _hoisted_2$n, [
           createElementVNode("div", _hoisted_3$h, [
-            createElementVNode("div", _hoisted_4$d, [
+            createElementVNode("div", _hoisted_4$e, [
               _cache[0] || (_cache[0] = createElementVNode(
                 "div",
                 { class: "bean-box" },
@@ -3795,7 +4419,7 @@ var script$z = /* @__PURE__ */ defineComponent({
               )),
               createElementVNode(
                 "div",
-                _hoisted_5$b,
+                _hoisted_5$c,
                 toDisplayString(unref(formatAmount)(balance.value.total || 0)),
                 1
                 /* TEXT */
@@ -3857,8 +4481,8 @@ const consumptionDirections = ["\u5168\u90E8", "\u6536\u5165", "\u652F\u51FA"];
 const _hoisted_1$v = { class: "consumption-filter" };
 const _hoisted_2$m = { class: "consumption-filter-content" };
 const _hoisted_3$g = { class: "title" };
-const _hoisted_4$c = { class: "info" };
-const _hoisted_5$a = ["onClick"];
+const _hoisted_4$d = { class: "info" };
+const _hoisted_5$b = ["onClick"];
 const _hoisted_6$7 = { class: "consumption-filter-btn spa-between" };
 var script$y = /* @__PURE__ */ defineComponent({
   __name: "ConsumptionFilter",
@@ -3937,7 +4561,7 @@ var script$y = /* @__PURE__ */ defineComponent({
                     1
                     /* TEXT */
                   ),
-                  createElementVNode("div", _hoisted_4$c, [
+                  createElementVNode("div", _hoisted_4$d, [
                     (openBlock(true), createElementBlock(
                       Fragment,
                       null,
@@ -3946,7 +4570,7 @@ var script$y = /* @__PURE__ */ defineComponent({
                           onClick: () => onFilterSectionClick(index, it.code),
                           class: normalizeClass([getItemClass(index, it.code), "info-item"]),
                           key: i
-                        }, toDisplayString(typeof it === "string" ? it : it.name), 11, _hoisted_5$a);
+                        }, toDisplayString(typeof it === "string" ? it : it.name), 11, _hoisted_5$b);
                       }),
                       128
                       /* KEYED_FRAGMENT */
@@ -3996,7 +4620,7 @@ script$y.__file = "src/balance/components/ConsumptionFilter.vue";
 const _hoisted_1$u = { class: "appkit-date-filter" };
 const _hoisted_2$l = { class: "content" };
 const _hoisted_3$f = { class: "time" };
-const _hoisted_4$b = { class: "buttons spa-between" };
+const _hoisted_4$c = { class: "buttons spa-between" };
 var script$x = /* @__PURE__ */ defineComponent({
   __name: "DateFilter",
   props: {
@@ -4119,7 +4743,7 @@ var script$x = /* @__PURE__ */ defineComponent({
             )
           ])
         ]),
-        createElementVNode("div", _hoisted_4$b, [
+        createElementVNode("div", _hoisted_4$c, [
           createElementVNode("div", {
             class: "btn",
             onClick: reset
@@ -4295,8 +4919,8 @@ script$u.__file = "src/balance/components/Tip.vue";
 const _hoisted_1$q = { class: "account-view" };
 const _hoisted_2$k = { class: "scroll-content" };
 const _hoisted_3$e = { class: "row jusify-right" };
-const _hoisted_4$a = { class: "balance" };
-const _hoisted_5$9 = { class: "bean-box spa-between" };
+const _hoisted_4$b = { class: "balance" };
+const _hoisted_5$a = { class: "bean-box spa-between" };
 const _hoisted_6$6 = { class: "bean-counts spa-between" };
 const _hoisted_7$5 = { class: "counts number" };
 const _hoisted_8$4 = {
@@ -4537,7 +5161,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
@@ -4558,8 +5182,8 @@ var script$t = /* @__PURE__ */ defineComponent({
                   [_directive_track_click]
                 ])
               ]),
-              createElementVNode("div", _hoisted_4$a, [
-                createElementVNode("div", _hoisted_5$9, [
+              createElementVNode("div", _hoisted_4$b, [
+                createElementVNode("div", _hoisted_5$a, [
                   _cache[9] || (_cache[9] = createElementVNode(
                     "div",
                     { class: "bean-img" },
@@ -4842,7 +5466,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"
@@ -5032,8 +5656,8 @@ script$t.__file = "src/balance/components/AccountView.vue";
 const _hoisted_1$p = { class: "balance-reminder" };
 const _hoisted_2$j = { class: "body" };
 const _hoisted_3$d = { class: "footer" };
-const _hoisted_4$9 = { class: "col" };
-const _hoisted_5$8 = { class: "col" };
+const _hoisted_4$a = { class: "col" };
+const _hoisted_5$9 = { class: "col" };
 var script$s = /* @__PURE__ */ defineComponent({
   __name: "BalanceReminder",
   props: {
@@ -5074,7 +5698,7 @@ var script$s = /* @__PURE__ */ defineComponent({
               )
             ]),
             createElementVNode("div", _hoisted_3$d, [
-              createElementVNode("div", _hoisted_4$9, [
+              createElementVNode("div", _hoisted_4$a, [
                 createVNode(_component_nut_button, {
                   class: "cancel-button",
                   onClick: _cache[0] || (_cache[0] = ($event) => emit("update:modelValue", false)),
@@ -5091,7 +5715,7 @@ var script$s = /* @__PURE__ */ defineComponent({
                   /* STABLE */
                 })
               ]),
-              createElementVNode("div", _hoisted_5$8, [
+              createElementVNode("div", _hoisted_5$9, [
                 withDirectives((openBlock(), createBlock(_component_nut_button, {
                   block: "",
                   class: "recharge-button",
@@ -5229,8 +5853,8 @@ script$r.__file = "src/balance/components/DateRange.vue";
 const _hoisted_1$n = { class: "list-filter-picker" };
 const _hoisted_2$i = { class: "list-filter-picker-content" };
 const _hoisted_3$c = { class: "title" };
-const _hoisted_4$8 = { class: "info" };
-const _hoisted_5$7 = ["onClick"];
+const _hoisted_4$9 = { class: "info" };
+const _hoisted_5$8 = ["onClick"];
 const _hoisted_6$5 = { class: "list-filter-picker-btn spa-between" };
 var script$q = /* @__PURE__ */ defineComponent({
   __name: "ListFilterPicker",
@@ -5307,7 +5931,7 @@ var script$q = /* @__PURE__ */ defineComponent({
                     1
                     /* TEXT */
                   ),
-                  createElementVNode("div", _hoisted_4$8, [
+                  createElementVNode("div", _hoisted_4$9, [
                     (openBlock(true), createElementBlock(
                       Fragment,
                       null,
@@ -5316,7 +5940,7 @@ var script$q = /* @__PURE__ */ defineComponent({
                           onClick: () => onFilterSectionClick(item.name, it.value),
                           class: normalizeClass([getItemClass(item.name, it.value), "info-item"]),
                           key: i
-                        }, toDisplayString(typeof it === "string" ? it : it.label), 11, _hoisted_5$7);
+                        }, toDisplayString(typeof it === "string" ? it : it.label), 11, _hoisted_5$8);
                       }),
                       128
                       /* KEYED_FRAGMENT */
@@ -5432,8 +6056,8 @@ const _hoisted_1$m = {
 };
 const _hoisted_2$h = { class: "promoter-card-hd-num number" };
 const _hoisted_3$b = ["src"];
-const _hoisted_4$7 = { class: "promoter-card-ft" };
-const _hoisted_5$6 = {
+const _hoisted_4$8 = { class: "promoter-card-ft" };
+const _hoisted_5$7 = {
   key: 0,
   class: "promoter-card-ft-item"
 };
@@ -5529,6 +6153,7 @@ var script$o = /* @__PURE__ */ defineComponent({
       showModal({
         content: toastMap[type],
         showCancel: false,
+        confirmColor: "#017fff",
         confirmText: "\u77E5\u9053\u4E86"
       });
     }
@@ -5591,8 +6216,8 @@ var script$o = /* @__PURE__ */ defineComponent({
           ])), [
             [_directive_track_click]
           ]) : createCommentVNode("v-if", true),
-          createElementVNode("div", _hoisted_4$7, [
-            __props.applyRecord.accessCheckStatus === "Y" ? (openBlock(), createElementBlock("div", _hoisted_5$6, [
+          createElementVNode("div", _hoisted_4$8, [
+            __props.applyRecord.accessCheckStatus === "Y" ? (openBlock(), createElementBlock("div", _hoisted_5$7, [
               __props.\u663E\u793A\u4E0B\u7EA7\u5206\u9500\u5546 ? (openBlock(), createElementBlock(
                 Fragment,
                 { key: 0 },
@@ -6034,8 +6659,8 @@ script$l.__file = "src/components/dd-selector/index.vue";
 const _hoisted_1$j = { class: "self-registration" };
 const _hoisted_2$f = { class: "self-registration-body" };
 const _hoisted_3$a = ["src"];
-const _hoisted_4$6 = { class: "self-registration__input" };
-const _hoisted_5$5 = { class: "self-registration-bottom" };
+const _hoisted_4$7 = { class: "self-registration__input" };
+const _hoisted_5$6 = { class: "self-registration-bottom" };
 var script$k = /* @__PURE__ */ defineComponent({
   __name: "SelfRegistration",
   props: {
@@ -6195,7 +6820,7 @@ var script$k = /* @__PURE__ */ defineComponent({
                 required: ""
               }, {
                 default: withCtx(() => [
-                  createElementVNode("div", _hoisted_4$6, [
+                  createElementVNode("div", _hoisted_4$7, [
                     withDirectives(createElementVNode(
                       "input",
                       {
@@ -6211,7 +6836,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",
@@ -6346,7 +6974,7 @@ var script$k = /* @__PURE__ */ defineComponent({
             /* STABLE */
           })
         ]),
-        createElementVNode("div", _hoisted_5$5, [
+        createElementVNode("div", _hoisted_5$6, [
           withDirectives((openBlock(), createBlock(_component_nut_button, {
             block: "",
             type: "primary",
@@ -6445,7 +7073,7 @@ const vendor$1 = {
           traceId: header.traceId,
           duration: endTime - startTime
         });
-        if (data.success) {
+        if (data.success || data.code === "401") {
           resolve({
             status: +data.code,
             message: data.msg,
@@ -6468,7 +7096,7 @@ function useHttp$1() {
   const headers = {
     Token: appkitOptions.tempToken() || appkitOptions.token(),
     Appcode: appkitOptions.app(),
-    cookie: `tid=${appkitOptions.tenant()}`,
+    tid: appkitOptions.tenant(),
     gray: appkitOptions.gray ? appkitOptions.gray() : "0"
   };
   const $http = createHttp({
@@ -6782,7 +7410,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,
@@ -7053,7 +7681,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();
@@ -7110,8 +7739,8 @@ const _hoisted_3$7 = {
   key: 0,
   class: "wrapper"
 };
-const _hoisted_4$5 = ["onClick"];
-const _hoisted_5$4 = { class: "time" };
+const _hoisted_4$6 = ["onClick"];
+const _hoisted_5$5 = { class: "time" };
 const _hoisted_6$3 = {
   key: 0,
   class: "notice-list-label"
@@ -7244,7 +7873,7 @@ var script$f = /* @__PURE__ */ defineComponent({
                       createElementVNode("div", null, [
                         createElementVNode(
                           "div",
-                          _hoisted_5$4,
+                          _hoisted_5$5,
                           toDisplayString(formatMinutes(item.receiveTime)),
                           1
                           /* TEXT */
@@ -7301,7 +7930,7 @@ var script$f = /* @__PURE__ */ defineComponent({
                           /* CLASS */
                         )
                       ])
-                    ], 10, _hoisted_4$5)), [
+                    ], 10, _hoisted_4$6)), [
                       [_directive_track_click, "\u6D88\u606F\u8BE6\u60C5"]
                     ]);
                   }),
@@ -7343,16 +7972,21 @@ var script$f = /* @__PURE__ */ defineComponent({
 
 script$f.__file = "src/notice/components/NoticeList.vue";
 
-const _hoisted_1$d = {
+const _hoisted_1$d = ["onClick"];
+const _hoisted_2$9 = {
+  key: 0,
+  class: "custom-title-dot"
+};
+const _hoisted_3$6 = {
   key: 0,
   class: "read-all"
 };
-const _hoisted_2$9 = {
+const _hoisted_4$5 = {
   key: 0,
   class: "news-item-title-icon",
-  src: "https://cdn.ddjf.com/static/images/loan-manage-app/ic_msg_system_notice.webp"
+  src: "https://cdn.ddjf.com/static/images/fnfundkit/ic_msg_system_notice.png"
 };
-const _hoisted_3$6 = { class: "news-item-time" };
+const _hoisted_5$4 = { class: "news-item-time" };
 var script$e = /* @__PURE__ */ defineComponent({
   __name: "NoticeList2",
   props: {
@@ -7363,9 +7997,28 @@ var script$e = /* @__PURE__ */ defineComponent({
   emits: ["itemClick"],
   setup(__props, { expose: __expose, emit: __emit }) {
     const props = __props;
+    const tabList = ref([
+      {
+        label: "\u5168\u90E8",
+        value: "\u5168\u90E8"
+      },
+      {
+        label: "\u4E1A\u52A1\u6D88\u606F",
+        value: "\u4E1A\u52A1\u6D88\u606F"
+      },
+      {
+        label: "\u7CFB\u7EDF\u516C\u544A",
+        value: "\u7CFB\u7EDF\u516C\u544A"
+      },
+      {
+        label: "\u672A\u8BFB",
+        value: "\u672A\u8BFB"
+      }
+    ]);
     const $http = useHttp$1(), \u663E\u793A\u9AA8\u67B6\u5C4F = ref(true);
     useDidShow(() => {
       nextPage(1);
+      getNotice();
     });
     const state = reactive({
       search: "",
@@ -7418,6 +8071,7 @@ var script$e = /* @__PURE__ */ defineComponent({
     }
     function itemClick(item) {
       read(item);
+      getNotice();
       emits("itemClick", item);
     }
     function read(item) {
@@ -7430,7 +8084,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"];
@@ -7445,9 +8100,26 @@ var script$e = /* @__PURE__ */ defineComponent({
           });
         });
       } finally {
+        setTimeout(() => {
+          getNotice();
+        }, 300);
         hideLoading();
       }
     }
+    const noticeShow = ref(false);
+    async function getNotice() {
+      const appkitOptions = useAppKitOptions();
+      const $http2 = useHttp$1();
+      $http2.get("/cas/msg/count-unread", {
+        deviceType: 2,
+        appCode: props.app,
+        tenantId: appkitOptions.tenant(),
+        userId: props.userId
+      }).then((result) => {
+        if (typeof result === "object") return;
+        noticeShow.value = result > 0;
+      });
+    }
     const emits = __emit;
     __expose({
       readAll
@@ -7463,7 +8135,7 @@ var script$e = /* @__PURE__ */ defineComponent({
               class: normalizeClass(["tabContainer", { inH5: unref(isWeb)() }])
             },
             [
-              createCommentVNode(' <ns-search\n       v-track-search="{\n          trackInput: false,\n          trackSubmit: true,\n          minLength: 2,\n        }"\n        style="margin: 0 12px"\n        placeholder="\u8BF7\u8F93\u5165\u5173\u952E\u5B57\u641C\u7D22"\n        v-model="state.search"\n      ></ns-search> '),
+              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),
@@ -7471,30 +8143,50 @@ var script$e = /* @__PURE__ */ defineComponent({
                 square: "",
                 size: "xl",
                 style: { "height": "46px" },
-                onChange: onTabChange
+                class: "news-tab",
+                items: tabList.value
               }, {
-                default: withCtx(() => [
-                  createVNode(unref(NsTabsItem), {
-                    key: "\u5168\u90E8",
-                    tab: "\u5168\u90E8"
-                  }),
-                  createVNode(unref(NsTabsItem), {
-                    key: "\u4E1A\u52A1\u6D88\u606F",
-                    tab: "\u4E1A\u52A1\u6D88\u606F"
-                  }),
-                  createVNode(unref(NsTabsItem), {
-                    key: "\u7CFB\u7EDF\u516C\u544A",
-                    tab: "\u7CFB\u7EDF\u516C\u544A"
-                  }),
-                  createVNode(unref(NsTabsItem), {
-                    key: "\u672A\u8BFB",
-                    tab: "\u672A\u8BFB"
-                  })
+                titles: withCtx(() => [
+                  (openBlock(true), createElementBlock(
+                    Fragment,
+                    null,
+                    renderList(tabList.value, (item) => {
+                      return openBlock(), createElementBlock("div", {
+                        class: normalizeClass([{ customLine: state.tab === item.value }, "nut-tabs__titles-item custom-tab-item"]),
+                        key: item.value,
+                        onClick: ($event) => {
+                          state.tab = item.value;
+                          onTabChange();
+                        }
+                      }, [
+                        createElementVNode(
+                          "div",
+                          {
+                            class: normalizeClass(["custom-title", { active: state.tab === item.value }])
+                          },
+                          [
+                            createElementVNode(
+                              "div",
+                              null,
+                              toDisplayString(item.label),
+                              1
+                              /* TEXT */
+                            ),
+                            item.value === "\u672A\u8BFB" && noticeShow.value ? (openBlock(), createElementBlock("div", _hoisted_2$9, " \u2022\u2022\u2022 ")) : createCommentVNode("v-if", true)
+                          ],
+                          2
+                          /* CLASS */
+                        )
+                      ], 10, _hoisted_1$d);
+                    }),
+                    128
+                    /* KEYED_FRAGMENT */
+                  ))
                 ]),
                 _: 1
                 /* STABLE */
-              }, 8, ["modelValue"]),
-              state.list.length > 0 ? (openBlock(), createElementBlock("div", _hoisted_1$d, [
+              }, 8, ["modelValue", "items"]),
+              state.list.length > 0 ? (openBlock(), createElementBlock("div", _hoisted_3$6, [
                 withDirectives((openBlock(), createElementBlock("div", {
                   class: "btn",
                   onClick: readAll
@@ -7551,7 +8243,7 @@ var script$e = /* @__PURE__ */ defineComponent({
                               class: "news-item-title"
                             },
                             [
-                              item.\u662F\u516C\u544A ? (openBlock(), createElementBlock("img", _hoisted_2$9)) : createCommentVNode("v-if", true),
+                              item.\u662F\u516C\u544A ? (openBlock(), createElementBlock("img", _hoisted_4$5)) : createCommentVNode("v-if", true),
                               createTextVNode(
                                 " " + toDisplayString(item.\u6807\u9898),
                                 1
@@ -7572,7 +8264,7 @@ var script$e = /* @__PURE__ */ defineComponent({
                           }, null, 8, ["style", "content"]),
                           createElementVNode(
                             "div",
-                            _hoisted_3$6,
+                            _hoisted_5$4,
                             toDisplayString(item.\u65F6\u95F4),
                             1
                             /* TEXT */
@@ -7830,7 +8522,7 @@ const vendor = {
           traceId: header.traceId,
           duration: endTime - startTime
         });
-        if (data.success) {
+        if (data.success || data.code === "401") {
           resolve({
             status: +data.code,
             message: data.msg,
@@ -7853,7 +8545,7 @@ function useHttp() {
   const headers = {
     Token: appkitOptions.tempToken() || appkitOptions.token(),
     Appcode: appkitOptions.app(),
-    cookie: `tid=${appkitOptions.tenant()}`,
+    tid: appkitOptions.tenant(),
     gray: appkitOptions.gray ? appkitOptions.gray() : "0"
   };
   const $http = createHttp({
@@ -8029,7 +8721,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();
@@ -8142,6 +8835,7 @@ var script$b = /* @__PURE__ */ defineComponent({
         title: "\u63D0\u793A",
         content: "\u786E\u5B9A\u8981\u9000\u51FA\u767B\u5F55\u5417\uFF1F",
         confirmText: "\u786E\u5B9A",
+        confirmColor: "#017fff",
         success: async (e) => {
           if (e.confirm) {
             emits("logout");
@@ -10005,7 +10699,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(
@@ -10715,8 +11410,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)
                         ]),
@@ -11325,4 +12021,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 };