@uxda/appkit 4.2.55 → 4.2.57

package/dist/index.js

@@ -1666,6 +1666,33 @@ const requestBrandWCPay = (params, Appcode = "") => {
     });
   });
 };
+const requestBrandWCPayByBean = (params, Appcode = "") => {
+  return new Promise((resolve, reject) => {
+    const $http = useHttp$2({
+      Appcode,
+      Tenant: params.tenant
+    });
+    $http.post(endpoints.\u83B7\u53D6\u6743\u76CA\u5FAE\u4FE1\u652F\u4ED8, {
+      ...params
+    }).then((response) => {
+      if (!response.json) {
+        showToast({
+          title: response.message,
+          icon: "none"
+        });
+        resolve(false);
+      } else {
+        requestWxH5Pay(response.json).then((result) => {
+          if (result) {
+            resolve(true);
+          } else {
+            resolve(false);
+          }
+        });
+      }
+    });
+  });
+};
 var requestPayment$1 = {
   install($app) {
     $app.requestPayment = requestPayment;
@@ -1735,6 +1762,7 @@ var script$B = /* @__PURE__ */ defineComponent({
           payFinishJumpUrl: props.payFinishJumpUrl
         }).then((result) => {
           console.log(result);
+          window.location.href = props.payFinishJumpUrl;
         });
       } else {
         wx.login({
@@ -2025,7 +2053,8 @@ var script$x = /* @__PURE__ */ defineComponent({
   props: {
     headerApp: { type: String, required: true },
     app: { type: String, required: true },
-    tenant: { type: String, required: true }
+    tenant: { type: String, required: true },
+    payFinishJumpUrl: { type: String, required: false }
   },
   emits: ["complete", "agree"],
   setup(__props, { emit: __emit }) {
@@ -2090,22 +2119,37 @@ var script$x = /* @__PURE__ */ defineComponent({
         return false;
       }
       state.buttonLoading = true;
-      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) => {
-            state.buttonLoading = false;
-            if (result) {
-              emit("complete", { result: true, type: "wePay" });
-            }
-          });
-        }
-      });
+      if (Taro.getEnv() === "WEB") {
+        requestBrandWCPayByBean({
+          caseConfigId: amounts.value[state.selected].id,
+          amount: amounts.value[state.selected].paymentAmount,
+          app: "loankitMp",
+          tenant: props.tenant,
+          accountAuthFlag: false,
+          channelCode: "centergzh",
+          payFinishJumpUrl: props.payFinishJumpUrl
+        }).then((result) => {
+          console.log(result);
+          window.location.href = props.payFinishJumpUrl;
+        });
+      } 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) => {
+              state.buttonLoading = false;
+              if (result) {
+                emit("complete", { result: true, type: "wePay" });
+              }
+            });
+          }
+        });
+      }
     };
     return (_ctx, _cache) => {
       const _component_nut_checkbox = Checkbox;

package/package.json

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

package/src/payment/components/RechargeView.vue

@@ -102,6 +102,7 @@ const onPayClick = () => {
       payFinishJumpUrl: props.payFinishJumpUrl
     }).then(result => {
       console.log(result), 'result'
+      window.location.href = props.payFinishJumpUrl as string
     })
   } else {
     wx.login({

package/src/payment/components/TradeView.vue

@@ -50,7 +50,7 @@
 import { computed, onMounted, reactive, ref } from 'vue'
 import RightsPicker, { Amount } from './RightsPicker.vue'
 import { endpoints, useHttp } from '../api'
-import { requestPaymentByBean } from '../services'
+import { requestBrandWCPayByBean, requestPaymentByBean } from '../services'
 import Taro, { showToast } from '@tarojs/taro'
 import { useAmount } from '../../shared/composables/useAmount'
 
@@ -74,7 +74,11 @@ export interface RechargeViewProps {
   /**
    * 租户
    */
-  tenant: string
+  tenant: string,
+  /**
+   * h5支付完成后跳转地址
+   */
+  payFinishJumpUrl?: ''
 }
 
 const props = defineProps<RechargeViewProps>()
@@ -157,22 +161,38 @@ const onPayClick = () => {
     return false
   }
   state.buttonLoading = true
-  wx.login({
-    success({ code }: { code: string }) {
-      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 => {
-        state.buttonLoading = false
-        if (result) {
-          emit('complete', { result: true, type: 'wePay' })
-        }
-      })
-    }
-  })
+
+  if (Taro.getEnv() === 'WEB') {
+    requestBrandWCPayByBean({
+      caseConfigId: amounts.value[state.selected].id,
+      amount: amounts.value[state.selected].paymentAmount,
+      app: 'loankitMp',
+      tenant: props.tenant,
+      accountAuthFlag: false,
+      channelCode: 'centergzh',
+      payFinishJumpUrl: props.payFinishJumpUrl
+    }).then(result => {
+      console.log(result), 'result'
+      window.location.href = props.payFinishJumpUrl as string
+    })
+  } else {
+    wx.login({
+      success({ code }: { code: string }) {
+        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 => {
+          state.buttonLoading = false
+          if (result) {
+            emit('complete', { result: true, type: 'wePay' })
+          }
+        })
+      }
+    })
+  }
 }
 </script>
 

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

@@ -87,10 +87,40 @@ const requestBrandWCPay = (params: PaymentParams, Appcode = '') => {
   })
 }
 
+const requestBrandWCPayByBean = (params: PaymentParams, Appcode = '') => {
+  return new Promise<boolean>((resolve, reject) => {
+    const $http = useHttp({
+      Appcode: Appcode,
+      Tenant: params.tenant,
+    })
+    $http
+      .post(endpoints.获取权益微信支付, {
+        ...params,
+      })
+      .then((response: any) => {
+        if (!response.json) {
+          showToast({
+            title: response.message,
+            icon: 'none',
+          })
+          resolve(false)
+        } else {
+          requestWxH5Pay(response.json).then((result) => {
+            if (result) {
+              resolve(true)
+            } else {
+              resolve(false)
+            }
+          })
+        }
+      })
+  })
+}
+
 export default {
   install($app: DollarApp) {
     $app.requestPayment = requestPayment
   },
 }
 
-export { requestPayment, requestPaymentByBean, requestBrandWCPay }
+export { requestPayment, requestPaymentByBean, requestBrandWCPay, requestBrandWCPayByBean }