@uxda/appkit 4.3.5 → 4.3.7

package/dist/index.js

@@ -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: () => {
           }
         });
@@ -1718,13 +1719,30 @@ var script$F = /* @__PURE__ */ defineComponent({
     const $http = useHttp$3(), $n = useNutshell();
     const emits = __emit;
     const props = __props;
-    async function onUploadFile(csRes) {
+    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 } = csRes.tempFiles[0];
-        const compressImg = await compressImage(path || tempFilePath, getCompressQuality(size)) || {};
-        const filePath = compressImg.tempFilePath || path;
+        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);
+          props.customUpload(filePath, detectedFileType);
           return;
         }
         showLoading({ title: "\u53D1\u7968\u8BC6\u522B\u4E2D..", mask: true });
@@ -1744,7 +1762,7 @@ var script$F = /* @__PURE__ */ defineComponent({
         });
         const res = JSON.parse(upRes.data);
         if (res.code === "200") {
-          await getOcrInfo(res.result);
+          await getOcrInfo(res.result, detectedFileType);
         } else {
           hideLoading();
           showToast({
@@ -1757,17 +1775,18 @@ var script$F = /* @__PURE__ */ defineComponent({
         console.log(err);
       }
     }
-    async function getOcrInfo(file) {
+    async function getOcrInfo(file, fileType = "img") {
       try {
+        const fileUrl = typeof file === "string" ? file : file.originalUrl;
         const res = await $http.get("/hkbase/common/vatInvoice", {
-          fileUrl: typeof file === "string" ? file : file.originalUrl,
-          fileType: "img"
+          fileUrl,
+          fileType
         });
         hideLoading();
         if (!res?.purchaserRegisterNum) {
           $n.dialog({
             title: "\u8BC6\u522B\u5931\u8D25",
-            message: `\u60A8\u4E0A\u4F20\u7684\u56FE\u7247\u53EF\u80FD\u4E0D\u591F\u6E05\u6670\u6216\u4E0E\u5F53\u524D\u529F\u80FD\u4E0D\u7B26\uFF0C\u8BF7\u91CD\u65B0\u4E0A\u4F20\u4E00\u5F20\u6E05\u6670\u3001\u5B8C\u6574\u7684\u56FE\u7247\u3002\u8C22\u8C22\uFF01`,
+            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: ""
           });
@@ -1788,7 +1807,8 @@ var script$F = /* @__PURE__ */ defineComponent({
           serviceType: res?.serviceType,
           totalAmount: res?.totalAmount,
           totalTax: res?.totalTax,
-          fileUrl: typeof file === "string" ? file : file.originalUrl,
+          fileUrl,
+          fileType,
           fileKey: typeof file === "string" ? file : file.fileId
         });
       } catch (err) {
@@ -1808,10 +1828,14 @@ var script$F = /* @__PURE__ */ defineComponent({
       {
         name: "\u4ECE\u804A\u5929\u4F1A\u8BDD\u9009\u62E9",
         type: "message"
+      },
+      {
+        name: "\u9009\u62E9\u6587\u4EF6",
+        type: "file"
       }
     ];
     if (Taro.getEnv() === "WEB") {
-      actionSheetMenus.pop();
+      actionSheetMenus.splice(2, 1);
     }
     async function chooseImages(item) {
       if (["camera", "album"].includes(item.type)) {
@@ -1823,25 +1847,72 @@ var script$F = /* @__PURE__ */ defineComponent({
           // 使用duration属性判断是图片还是视频，图片没有该属性
         });
         onUploadFile(csRes);
-      } else {
+      } 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;
@@ -3795,7 +3866,8 @@ var script$A = /* @__PURE__ */ defineComponent({
     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"],
   setup(__props, { emit: __emit }) {
@@ -3959,13 +4031,46 @@ var script$A = /* @__PURE__ */ defineComponent({
         });
       }
     }
-    const onPayClick = () => {
+    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);
+        });
+      });
+    }
     return (_ctx, _cache) => {
       const _component_nut_checkbox = Checkbox;
       const _component_nut_button = Button;
@@ -5960,6 +6065,7 @@ var script$o = /* @__PURE__ */ defineComponent({
       showModal({
         content: toastMap[type],
         showCancel: false,
+        confirmColor: "#017fff",
         confirmText: "\u77E5\u9053\u4E86"
       });
     }
@@ -8639,6 +8745,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");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxda/appkit",
-  "version": "4.3.5",
+  "version": "4.3.7",
   "description": "小程序应用开发包",
   "main": "dist/index.js",
   "module": "dist/index.ts",

package/src/balance/components/PromoterCard.vue

@@ -152,6 +152,7 @@ function onHelpClick(type: string) {
   showModal({
     content: toastMap[type],
     showCancel: false,
+    confirmColor: '#017fff',
     confirmText: '知道了',
   })
 }

package/src/payment/components/TradeView.vue

@@ -104,8 +104,9 @@
 import { computed, onMounted, reactive, ref } from "vue";
 import RightsPicker, { Amount } from "./RightsPicker.vue";
 import { endpoints, useHttp } from "../api";
+import { endpoints as balanceEndpoints } from "../../balance/api";
 import { requestBrandWCPayByBean, requestPaymentByBean } from "../services";
-import Taro, { showToast, useRouter } from "@tarojs/taro";
+import Taro, { showToast, useRouter, showModal } from "@tarojs/taro";
 import { useAmount } from "../../shared/composables/useAmount";
 import { isWechat } from "../../shared/composables/useDeviceEnv";
 
@@ -134,6 +135,10 @@ export interface RechargeViewProps {
    * h5支付完成后跳转地址
    */
   payFinishJumpUrl?: "";
+  /**
+   * 所有应用
+   **/
+   apps?: string;
 }
 
 const props = defineProps<RechargeViewProps>();
@@ -339,16 +344,59 @@ function proceedWechatPayment() {
   }
 }
 
-const onPayClick = () => {
+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()
+  return new Promise((resolve, reject) => {
+    state.buttonLoading = true;
+    $http
+      .get<any>(balanceEndpoints.获取余额明细, {
+        app: props.apps,
+      })
+      .then((data) => {
+        state.buttonLoading = false;
+        if (data.commonAccount < balance.value) {
+          showModal({
+            title: '温馨提示',
+            content: '云豆不足，请刷新后再次确认',
+            showCancel: false,
+            confirmText: '刷新',
+            confirmColor: '#017fff',
+            success: () => {
+              balance.value = data.commonAccount;
+            }
+          })
+          resolve(false)
+          
+        } else {
+          resolve(true)
+        }
+      }).catch((error) => {
+        state.buttonLoading = false;
+        resolve(false)
+      })
+  })
+}
+
 </script>
 
 <style lang="scss">

package/src/shared/components/OcrInvoice.vue

@@ -49,14 +49,45 @@ const props = withDefaults(defineProps<OcrProps>(), {
   customClick: false
 })
 
-async function onUploadFile(csRes: any) {
+/**
+ * 判断文件类型
+ */
+function getFileType(filePath: string, fileName?: string): 'img' | 'pdf' {
+  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: any, fileType?: 'img' | 'pdf') {
   try {
-    let { path, size, tempFilePath } = csRes.tempFiles[0]
-    const compressImg: any = (await compressImage(path || tempFilePath, getCompressQuality(size))) || {}
-    const filePath = compressImg.tempFilePath || path
+    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: any = (await compressImage(originalPath, getCompressQuality(size))) || {}
+      filePath = compressImg.tempFilePath || originalPath
+    }
 
     if (props.customUpload) {
-      props.customUpload(filePath)
+      props.customUpload(filePath, detectedFileType)
       return
     }
 
@@ -79,7 +110,7 @@ async function onUploadFile(csRes: any) {
 
     const res = JSON.parse(upRes.data)
     if (res.code === '200') {
-      await getOcrInfo(res.result)
+      await getOcrInfo(res.result, detectedFileType)
     } else {
       hideLoading()
       showToast({
@@ -94,18 +125,19 @@ async function onUploadFile(csRes: any) {
 }
 
 // 根据证件路径获取证件信息
-async function getOcrInfo(file: string | FileType) {
+async function getOcrInfo(file: string | FileType, fileType: 'img' | 'pdf' = 'img') {
   try {
+    const fileUrl = typeof file === 'string' ? file : file.originalUrl
     const res: any = await $http.get('/hkbase/common/vatInvoice', {
-      fileUrl: typeof file === 'string' ? file : file.originalUrl,
-      fileType: 'img'
+      fileUrl,
+      fileType: fileType
     })
     hideLoading()
 
     if (!res?.purchaserRegisterNum) {
       $n.dialog({
         title: '识别失败',
-        message: `您上传的图片可能不够清晰或与当前功能不符，请重新上传一张清晰、完整的图片。谢谢！`,
+        message: `您上传的${fileType === 'pdf' ? '文件' : '图片'}可能不够清晰或与当前功能不符，请重新上传一张清晰、完整的${fileType === 'pdf' ? 'PDF文件' : '图片'}。谢谢！`,
         okText: '我知道了',
         cancelText: '',
       })
@@ -127,7 +159,8 @@ async function getOcrInfo(file: string | FileType) {
       serviceType: res?.serviceType,
       totalAmount: res?.totalAmount,
       totalTax: res?.totalTax,
-      fileUrl: typeof file === 'string' ? file : file.originalUrl,
+      fileUrl: fileUrl,
+      fileType: fileType,
       fileKey: typeof file === 'string' ? file : file.fileId,
     })
   } catch (err) {
@@ -150,9 +183,14 @@ const actionSheetMenus = [
     name: '从聊天会话选择',
     type: 'message',
   },
+  {
+    name: '选择文件',
+    type: 'file',
+  },
 ]
 if (Taro.getEnv() === 'WEB') {
-  actionSheetMenus.pop()
+  // Web 端移除"从聊天会话选择"，保留"选择文件"
+  actionSheetMenus.splice(2, 1)
 }
 
 // 选择图像上传
@@ -165,27 +203,93 @@ async function chooseImages(item: any) {
     })
 
     onUploadFile(csRes)
-  } else {
+  } else if (item.type === 'message') {
     const csRes = await chooseMessageFile({
       count: 1,
       type: 'image',
     })
 
+    onUploadFile(csRes)
+  } else if (item.type === 'file') {
+    // 选择文件（包括PDF）
+    const csRes = await chooseMessageFile({
+      count: 1,
+      type: 'file',
+    })
+
+    // 不预先指定类型，让 onUploadFile 根据文件名自动判断
     onUploadFile(csRes)
   }
 }
 
+/**
+ * Web 端选择文件（支持图片和PDF）
+ */
+function chooseFileInWeb() {
+  return new Promise<void>((resolve, reject) => {
+    const input = document.createElement('input')
+    input.type = 'file'
+    input.accept = 'image/*,.pdf'
+    input.style.display = 'none'
+    
+    input.onchange = async (e: any) => {
+      const file = e.target?.files?.[0]
+      if (!file) {
+        document.body.removeChild(input)
+        resolve()
+        return
+      }
+
+      // 根据文件 MIME 类型和扩展名判断文件类型
+      let fileType: 'img' | 'pdf' = 'img'
+      if (file.type === 'application/pdf' || file.name.toLowerCase().endsWith('.pdf')) {
+        fileType = 'pdf'
+      }
+      
+      const filePath = URL.createObjectURL(file)
+
+      try {
+        // 构造类似 chooseMedia 返回的数据结构
+        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)
+        // 清理 blob URL
+        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)
+    // Web 端弹出选择：图片或PDF
+    try {
+      await chooseFileInWeb()
+    } catch (err) {
+      console.error('文件选择失败:', err)
+    }
     return
   }
 

package/src/shared/weixin/jssdk.ts

@@ -51,6 +51,7 @@ function requestWxH5Pay(options: PrePayOptions) {
           title: '提示',
           content: '当前环境不支持微信支付，请在微信内置浏览器中打开',
           confirmText: '确定',
+          confirmColor: '#017fff',
           success: () => {},
         })
         return

package/src/user/components/UserInfo.vue

@@ -360,6 +360,7 @@ function toLogout() {
     title: "提示",
     content: "确定要退出登录吗？",
     confirmText: "确定",
+    confirmColor: '#017fff',
     success: async (e: any) => {
       if (e.confirm) {
         emits("logout");