@uxda/appkit 4.3.13 → 4.3.14

package/COMPONENT_USAGE.md

@@ -152,7 +152,7 @@ const handleAgreeClick = () => {
 ### 注意事项
 
 1. **环境要求**
-   - H5环境：必须在微信浏览器中打开
+   <!-- - H5环境：必须在微信浏览器中打开 -->
    - 小程序环境：需要配置微信登录权限
 
 2. **数据获取**
@@ -228,7 +228,7 @@ const handleRechargeComplete = (result) => {
 
 1. 组件会自动获取充值金额列表
 2. 必须勾选协议才能进行支付
-3. H5环境需要在微信浏览器中打开
+<!-- 3. H5环境需要在微信浏览器中打开 -->
 
 ---
 
@@ -586,7 +586,7 @@ A:
 ### Q4: H5环境支付失败怎么办？
 
 A: 确保：
-1. 在微信浏览器中打开
+<!-- 1. 在微信浏览器中打开 -->
 2. 已正确配置 `payFinishJumpUrl`
 3. 检查网络连接和接口权限
 

package/dist/index.js

@@ -3151,7 +3151,8 @@ const endpointsList$2 = {
     translate: (data) => ({
       appCode: data.app,
       // caseCode: 'recharge', // 这个参数可以不要
-      tenantId: data.tenant
+      tenantId: data.tenant,
+      scene: data.scene
     }),
     transform: (data) => data.amountList.map((d) => ({
       token: d.desc,
@@ -3184,6 +3185,9 @@ const endpointsList$2 = {
       return {
         json,
         // 拉起微信支付用的JSON串
+        paymentType: data.paymentType,
+        prePayStr: data.prePayStr,
+        thirdPayId: data.thirdPayId,
         paymentId: data.payId
         // 查询用支付ID
       };
@@ -3212,6 +3216,9 @@ const endpointsList$2 = {
       return {
         json,
         // 拉起微信支付用的JSON串
+        paymentType: data.paymentType,
+        prePayStr: data.prePayStr,
+        thirdPayId: data.thirdPayId,
         paymentId: data.payId
         // 查询用支付ID
       };
@@ -3220,6 +3227,13 @@ const endpointsList$2 = {
   \u83B7\u53D6\u589E\u503C\u6743\u76CA\u7C7B\u76EE: {
     path: "/payment/paymentCaseConfig/getBalanceAndRiskQueryPriceConfig",
     transform: (data) => data
+  },
+  \u83B7\u53D6\u652F\u4ED8\u7ED3\u679C: {
+    path: "/payment/outer/payment/getPayResult",
+    translate: (data) => ({
+      thirdPayId: data.thirdPayId
+    }),
+    transform: (data) => data
   }
 };
 const endpoints$1 = Object.fromEntries(
@@ -3389,12 +3403,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 {
@@ -3418,12 +3434,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 {
@@ -3455,6 +3473,10 @@ function isWechat() {
   let ua = window.navigator.userAgent.toLowerCase();
   return ua.includes("micromessenger");
 }
+function isAlipay() {
+  let ua = window.navigator.userAgent.toLowerCase();
+  return ua.includes("alipayclient");
+}
 const isIOS = () => {
   if (typeof window !== "undefined") {
     return /iPhone|iPad|iPod/i.test(window.navigator.userAgent);
@@ -3474,7 +3496,7 @@ var script$E = /* @__PURE__ */ defineComponent({
     payFinishJumpUrl: { type: String, required: false }
   },
   emits: ["complete", "agree", "loaded"],
-  setup(__props, { emit: __emit }) {
+  setup(__props, { expose: __expose, emit: __emit }) {
     const props = __props;
     const { params } = useRouter();
     const emit = __emit;
@@ -3482,7 +3504,8 @@ var script$E = /* @__PURE__ */ defineComponent({
       agreed: false,
       selected: 0,
       agreementOpen: false,
-      buttonLoading: false
+      buttonLoading: false,
+      thirdPayId: ""
     });
     const amounts = ref([]);
     const onAgreementLinkClick = (e) => {
@@ -3497,7 +3520,8 @@ var script$E = /* @__PURE__ */ defineComponent({
       const $http = useHttp$2({ Appcode: props.app !== "cloudkitPro" ? props.app : "", Tenant: props.tenant });
       $http.get(endpoints$1.\u83B7\u53D6\u5145\u503C\u91D1\u989D\u5217\u8868, {
         app: props.app,
-        tenant: props.tenant
+        tenant: props.tenant,
+        scene: isWechat() ? "" : "APP"
       }).then((response) => {
         amounts.value = response;
         emit("loaded");
@@ -3513,28 +3537,22 @@ var script$E = /* @__PURE__ */ defineComponent({
       }
       state.buttonLoading = true;
       if (Taro.getEnv() === "WEB") {
-        if (!isWechat()) {
-          showToast({
-            title: "\u8BF7\u4F7F\u7528\u5FAE\u4FE1\u6D4F\u89C8\u5668\u6253\u5F00",
-            icon: "none"
-          });
-          state.buttonLoading = false;
-          return false;
-        }
         requestBrandWCPay({
           amount: amounts.value[state.selected].amount,
           app: "loankitMp",
           tenant: props.tenant,
           accountAuthFlag: false,
-          channelCode: "centergzh",
+          channelCode: getChannelCode(),
           payFinishJumpUrl: props.payFinishJumpUrl,
           fromMini: !!params.from,
           clientInfo: "H5"
         }).then((result) => {
-          console.log(result, "------requestBrandWCPay");
           state.buttonLoading = false;
           if (typeof result === "boolean" && result) {
             window.location.href = props.payFinishJumpUrl;
+          } else if (typeof result === "object" && result?.paymentType === "H5" && result?.prePayStr) {
+            state.thirdPayId = result?.thirdPayId || "";
+            window.location.href = result?.prePayStr;
           } else {
             emit("complete", result);
           }
@@ -3557,6 +3575,29 @@ var script$E = /* @__PURE__ */ defineComponent({
         });
       }
     };
+    function getChannelCode() {
+      if (isWechat()) {
+        return "centergzh";
+      } else if (isAlipay()) {
+        return "YundouZfb";
+      } else {
+        return "distributor";
+      }
+    }
+    const payResultCheck = () => {
+      if (!state.thirdPayId) return;
+      const $http = useHttp$2();
+      $http.get(endpoints$1.\u83B7\u53D6\u652F\u4ED8\u7ED3\u679C, {
+        thirdPayId: state.thirdPayId
+      }).then((response) => {
+        if (response.payStatus === "paid") {
+          emit("complete", true);
+        }
+      });
+    };
+    __expose({
+      payResultCheck
+    });
     return (_ctx, _cache) => {
       const _component_nut_checkbox = Checkbox;
       const _component_nut_button = Button;
@@ -3872,7 +3913,7 @@ var script$A = /* @__PURE__ */ defineComponent({
     apps: { type: String, required: false }
   },
   emits: ["complete", "agree", "loaded"],
-  setup(__props, { emit: __emit }) {
+  setup(__props, { expose: __expose, emit: __emit }) {
     const props = __props;
     const { formatAmount } = useAmount();
     const { params } = useRouter();
@@ -3881,7 +3922,8 @@ var script$A = /* @__PURE__ */ defineComponent({
       agreed: false,
       selected: 0,
       // agreementOpen: false,
-      buttonLoading: false
+      buttonLoading: false,
+      thirdPayId: ""
     });
     const balance = ref(0);
     const amounts = ref([]);
@@ -3921,7 +3963,8 @@ var script$A = /* @__PURE__ */ defineComponent({
     onMounted(() => {
       const $http = useHttp$2({ Appcode: props.headerApp, Tenant: props.tenant });
       $http.get(endpoints$1.\u83B7\u53D6\u589E\u503C\u6743\u76CA\u7C7B\u76EE, {
-        rightCode: props.app === "corporateStar" ? "riskQueryCompany" : "riskQueryMulti"
+        rightCode: props.app === "corporateStar" ? "riskQueryCompany" : "riskQueryMulti",
+        scene: isWechat() ? "" : "APP"
       }).then((res) => {
         balance.value = res.balance;
         amounts.value = res.paymentCaseConfigVOS;
@@ -3961,28 +4004,24 @@ var script$A = /* @__PURE__ */ defineComponent({
       }
       state.buttonLoading = true;
       if (Taro.getEnv() === "WEB") {
-        if (!isWechat()) {
-          showToast({
-            title: "\u8BF7\u4F7F\u7528\u5FAE\u4FE1\u6D4F\u89C8\u5668\u6253\u5F00",
-            icon: "none"
-          });
-          state.buttonLoading = false;
-          return false;
-        }
         requestBrandWCPayByBean({
           caseConfigId: amounts.value[state.selected].id,
           amount: currentAmount.value,
           app: "loankitMp",
           tenant: props.tenant,
           accountAuthFlag: false,
-          channelCode: "centergzh",
+          channelCode: getChannelCode(),
           payFinishJumpUrl: props.payFinishJumpUrl,
           fromMini: !!params.from,
           useCloudBean: isCombinedPayment.value
         }).then((result) => {
+          console.log(result, "------requestBrandWCPayByBean");
           state.buttonLoading = false;
           if (typeof result === "boolean" && result) {
             window.location.href = props.payFinishJumpUrl;
+          } else if (typeof result === "object" && result?.paymentType === "H5" && result?.prePayStr) {
+            state.thirdPayId = result?.thirdPayId || "";
+            window.location.href = result?.prePayStr;
           } else {
             emit("complete", {
               result,
@@ -4034,6 +4073,15 @@ var script$A = /* @__PURE__ */ defineComponent({
         });
       }
     }
+    function getChannelCode() {
+      if (isWechat()) {
+        return "centergzh";
+      } else if (isAlipay()) {
+        return "YundouZfb";
+      } else {
+        return "distributor";
+      }
+    }
     const onPayClick = async () => {
       if (selectBean.value && !isCombinedPayment.value) {
         showDialog.value = true;
@@ -4074,6 +4122,23 @@ var script$A = /* @__PURE__ */ defineComponent({
         });
       });
     }
+    const payResultCheck = () => {
+      if (!state.thirdPayId) return;
+      const $http = useHttp$2();
+      $http.get(endpoints$1.\u83B7\u53D6\u652F\u4ED8\u7ED3\u679C, {
+        thirdPayId: state.thirdPayId
+      }).then((response) => {
+        if (response.payStatus === "paid") {
+          emit("complete", {
+            result: true,
+            type: isCombinedPayment.value ? "combined" : "wePay"
+          });
+        }
+      });
+    };
+    __expose({
+      payResultCheck
+    });
     return (_ctx, _cache) => {
       const _component_nut_checkbox = Checkbox;
       const _component_nut_button = Button;

package/package.json

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

package/src/payment/api/endpoints.ts

@@ -13,6 +13,7 @@ const endpointsList: HttpEndpoints = {
       appCode: data.app,
       // caseCode: 'recharge', // 这个参数可以不要
       tenantId: data.tenant,
+      scene: data.scene,
     }),
     transform: (data: any) =>
       data.amountList.map((d: any) => ({
@@ -44,6 +45,9 @@ const endpointsList: HttpEndpoints = {
       } catch (e) {}
       return {
         json, // 拉起微信支付用的JSON串
+        paymentType: data.paymentType,
+        prePayStr: data.prePayStr,
+        thirdPayId: data.thirdPayId,
         paymentId: data.payId, // 查询用支付ID
       }
     },
@@ -69,6 +73,9 @@ const endpointsList: HttpEndpoints = {
       } catch (e) {}
       return {
         json, // 拉起微信支付用的JSON串
+        paymentType: data.paymentType,
+        prePayStr: data.prePayStr,
+        thirdPayId: data.thirdPayId,
         paymentId: data.payId, // 查询用支付ID
       }
     },
@@ -77,6 +84,13 @@ const endpointsList: HttpEndpoints = {
     path: '/payment/paymentCaseConfig/getBalanceAndRiskQueryPriceConfig',
     transform: (data: any) => data,
   },
+  获取支付结果: {
+    path: '/payment/outer/payment/getPayResult',
+    translate: (data: any) => ({
+      thirdPayId: data.thirdPayId,
+    }),
+    transform: (data: any) => data,
+  },
 } as const
 
 const keys = Object.keys(endpointsList as any)

package/src/payment/components/RechargeView.vue

@@ -22,7 +22,7 @@ import AmountPicker from './AmountPicker.vue'
 import { useHttp, endpoints } from '../api'
 import { requestBrandWCPay, requestPayment } from '../services'
 import Taro, { showToast, useRouter } from '@tarojs/taro'
-import { isWechat } from '../../shared/composables/useDeviceEnv'
+import { isAlipay, isWechat } from '../../shared/composables/useDeviceEnv'
 
 // 充值用户界面
 // 配置了必须的属性后
@@ -61,6 +61,7 @@ const state = reactive({
   selected: 0,
   agreementOpen: false,
   buttonLoading: false,
+  thirdPayId: '',
 })
 
 const amounts = ref<any[]>([])
@@ -81,7 +82,8 @@ onMounted(async () => {
 
   $http.get<any[]>(endpoints.获取充值金额列表, {
     app: props.app,
-    tenant: props.tenant
+    tenant: props.tenant,
+    scene: isWechat() ? '' : 'APP'
   }).then(response => {
     amounts.value = response
     emit('loaded')
@@ -99,28 +101,30 @@ const onPayClick = () => {
   state.buttonLoading = true
 
   if (Taro.getEnv() === 'WEB') {
-    if (!isWechat()) {
-      showToast({
-        title: '请使用微信浏览器打开',
-        icon: 'none',
-      })
-      state.buttonLoading = false
-      return false
-    }
+    // if (!isWechat()) {
+    //   showToast({
+    //     title: '请使用微信浏览器打开',
+    //     icon: 'none',
+    //   })
+    //   state.buttonLoading = false
+    //   return false
+    // }
     requestBrandWCPay({
       amount: amounts.value[state.selected].amount,
       app: 'loankitMp',
       tenant: props.tenant,
       accountAuthFlag: false,
-      channelCode: 'centergzh',
+      channelCode: getChannelCode(),
       payFinishJumpUrl: props.payFinishJumpUrl,
       fromMini: !!params.from,
       clientInfo: 'H5'
-    }).then(result => {
-      console.log(result, '------requestBrandWCPay')
+    }).then((result: any) => {
       state.buttonLoading = false
       if (typeof result === 'boolean' && result) {
         window.location.href = props.payFinishJumpUrl as string
+      } else if (typeof result === 'object' && result?.paymentType === 'H5' && result?.prePayStr) {
+        state.thirdPayId = result?.thirdPayId || ''
+        window.location.href = result?.prePayStr;
       } else {
         emit('complete', result)
       }
@@ -143,6 +147,34 @@ const onPayClick = () => {
     })
   }
 }
+
+// 根据环境判断渠道编码
+function getChannelCode() {
+  if (isWechat()) {
+    return 'centergzh';
+  } else if (isAlipay()) {
+    return 'YundouZfb';
+  } else {
+    return 'distributor';
+  }
+}
+
+const payResultCheck = () => {
+  if (!state.thirdPayId) return
+  
+  const $http = useHttp()
+  $http.get<any>(endpoints.获取支付结果, {
+    thirdPayId: state.thirdPayId
+  }).then(response => {
+    if (response.payStatus === 'paid') {
+      emit('complete', true)
+    }
+  })
+}
+
+defineExpose({
+  payResultCheck
+})
 </script>
 
 <style lang="scss">

package/src/payment/components/TradeView.vue

@@ -108,7 +108,7 @@ import { endpoints as balanceEndpoints } from "../../balance/api";
 import { requestBrandWCPayByBean, requestPaymentByBean } from "../services";
 import Taro, { showToast, useRouter, showModal } from "@tarojs/taro";
 import { useAmount } from "../../shared/composables/useAmount";
-import { isWechat } from "../../shared/composables/useDeviceEnv";
+import { isAlipay, isWechat } from "../../shared/composables/useDeviceEnv";
 
 // 充值用户界面
 // 配置了必须的属性后
@@ -156,6 +156,7 @@ const state = reactive({
   selected: 0,
   // agreementOpen: false,
   buttonLoading: false,
+  thirdPayId: '',
 });
 
 const balance = ref<number>(0);
@@ -219,6 +220,7 @@ onMounted(() => {
     .get<any[]>(endpoints.获取增值权益类目, {
       rightCode:
         props.app === "corporateStar" ? "riskQueryCompany" : "riskQueryMulti",
+      scene: isWechat() ? '' : 'APP'
     })
     .then((res: any) => {
       balance.value = res.balance;
@@ -267,14 +269,14 @@ function proceedWechatPayment() {
   state.buttonLoading = true;
 
   if (Taro.getEnv() === "WEB") {
-    if (!isWechat()) {
-      showToast({
-        title: "请使用微信浏览器打开",
-        icon: "none",
-      });
-      state.buttonLoading = false;
-      return false;
-    }
+    // if (!isWechat()) {
+    //   showToast({
+    //     title: "请使用微信浏览器打开",
+    //     icon: "none",
+    //   });
+    //   state.buttonLoading = false;
+    //   return false;
+    // }
     // 组合支付或纯微信支付：传递caseConfigId和amount，后端会自动处理云豆扣减
     requestBrandWCPayByBean({
       caseConfigId: amounts.value[state.selected].id,
@@ -282,15 +284,19 @@ function proceedWechatPayment() {
       app: "loankitMp",
       tenant: props.tenant,
       accountAuthFlag: false,
-      channelCode: "centergzh",
+      channelCode: getChannelCode(),
       payFinishJumpUrl: props.payFinishJumpUrl,
       fromMini: !!params.from,
       useCloudBean: isCombinedPayment.value
     })
-      .then((result) => {
+      .then((result: any) => {
+        console.log(result, '------requestBrandWCPayByBean')
         state.buttonLoading = false;
         if (typeof result === "boolean" && result) {
           window.location.href = props.payFinishJumpUrl as string;
+        } else if (typeof result === 'object' && result?.paymentType === 'H5' && result?.prePayStr) {
+          state.thirdPayId = result?.thirdPayId || ''
+          window.location.href = result?.prePayStr;
         } else {
           emit("complete", {
             result,
@@ -346,6 +352,17 @@ function proceedWechatPayment() {
   }
 }
 
+// 根据环境判断渠道编码
+function getChannelCode() {
+  if (isWechat()) {
+    return 'centergzh';
+  } else if (isAlipay()) {
+    return 'YundouZfb';
+  } else {
+    return 'distributor';
+  }
+}
+
 const onPayClick = async () => {
   // 用云豆支付（纯云豆支付）
   if (selectBean.value && !isCombinedPayment.value) {
@@ -399,6 +416,25 @@ const onPayClick = async () => {
   })
 }
 
+const payResultCheck = () => {
+  if (!state.thirdPayId) return
+  
+  const $http = useHttp()
+  $http.get<any>(endpoints.获取支付结果, {
+    thirdPayId: state.thirdPayId
+  }).then(response => {
+    if (response.payStatus === 'paid') {
+      emit("complete", {
+        result: true,
+        type: isCombinedPayment.value ? "combined" : "wePay",
+      });
+    }
+  })
+}
+
+defineExpose({
+  payResultCheck
+})
 </script>
 
 <style lang="scss">

package/src/payment/services/request-payment.ts

@@ -68,13 +68,15 @@ const requestBrandWCPay = (params: PaymentParams, Appcode = '') => {
         ...params,
       })
       .then((response: any) => {
-        if (!response.json) {
+        if (!response.json && !response.prePayStr) {
           showToast({
             title: response.message,
             icon: 'none',
           })
           resolve(false)
-        } else if (params.fromMini) {
+        } else if (!response.json && response.prePayStr) {
+          resolve(response)
+        }  else if (params.fromMini) {
           resolve(response.json)
         } else {
           requestWxH5Pay(response.json).then((result) => {
@@ -100,12 +102,14 @@ const requestBrandWCPayByBean = (params: PaymentParams, Appcode = '') => {
         ...params,
       })
       .then((response: any) => {
-        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 {