@uxda/appkit 4.2.60 → 4.2.61

package/dist/index.js

@@ -1714,6 +1714,11 @@ const services$1 = [
   invokeRecharge$1
 ];
 
+function isWechat() {
+  let ua = window.navigator.userAgent.toLowerCase();
+  return ua.includes("micromessenger");
+}
+
 const _hoisted_1$y = { class: "view recharge-view" };
 const _hoisted_2$o = { class: "flex-grow" };
 const _hoisted_3$i = { class: "amount-footer" };
@@ -1763,6 +1768,14 @@ var script$B = /* @__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",
@@ -1771,7 +1784,7 @@ var script$B = /* @__PURE__ */ defineComponent({
           channelCode: "centergzh",
           payFinishJumpUrl: props.payFinishJumpUrl
         }).then((result) => {
-          console.log(result);
+          state.buttonLoading = false;
           window.location.href = props.payFinishJumpUrl;
         });
       } else {
@@ -2130,6 +2143,14 @@ var script$x = /* @__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: amounts.value[state.selected].paymentAmount,
@@ -2139,7 +2160,7 @@ var script$x = /* @__PURE__ */ defineComponent({
           channelCode: "centergzh",
           payFinishJumpUrl: props.payFinishJumpUrl
         }).then((result) => {
-          console.log(result);
+          state.buttonLoading = false;
           window.location.href = props.payFinishJumpUrl;
         });
       } else {

package/package.json

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

package/src/payment/components/RechargeView.vue

@@ -20,6 +20,7 @@ import AmountPicker from './AmountPicker.vue'
 import { useHttp, endpoints } from '../api'
 import { requestBrandWCPay, requestPayment } from '../services'
 import Taro, { showToast } from '@tarojs/taro'
+import { isWechat } from '../../shared/composables/useDeviceEnv'
 
 // 充值用户界面
 // 配置了必须的属性后
@@ -93,6 +94,14 @@ const onPayClick = () => {
   state.buttonLoading = true
 
   if (Taro.getEnv() === 'WEB') {
+    if (!isWechat()) {
+      showToast({
+        title: '请使用微信浏览器打开',
+        icon: 'none',
+      })
+      state.buttonLoading = false
+      return false
+    }
     requestBrandWCPay({
       amount: amounts.value[state.selected].amount,
       app: 'loankitMp',
@@ -101,7 +110,7 @@ const onPayClick = () => {
       channelCode: 'centergzh',
       payFinishJumpUrl: props.payFinishJumpUrl
     }).then(result => {
-      console.log(result), 'result'
+      state.buttonLoading = false
       window.location.href = props.payFinishJumpUrl as string
     })
   } else {

package/src/payment/components/TradeView.vue

@@ -53,6 +53,7 @@ import { endpoints, useHttp } from '../api'
 import { requestBrandWCPayByBean, requestPaymentByBean } from '../services'
 import Taro, { showToast } from '@tarojs/taro'
 import { useAmount } from '../../shared/composables/useAmount'
+import { isWechat } from '../../shared/composables/useDeviceEnv'
 
 // 充值用户界面
 // 配置了必须的属性后
@@ -163,6 +164,14 @@ const onPayClick = () => {
   state.buttonLoading = true
 
   if (Taro.getEnv() === 'WEB') {
+    if (!isWechat()) {
+      showToast({
+        title: '请使用微信浏览器打开',
+        icon: 'none',
+      })
+      state.buttonLoading = false
+      return false
+    }
     requestBrandWCPayByBean({
       caseConfigId: amounts.value[state.selected].id,
       amount: amounts.value[state.selected].paymentAmount,
@@ -172,7 +181,7 @@ const onPayClick = () => {
       channelCode: 'centergzh',
       payFinishJumpUrl: props.payFinishJumpUrl
     }).then(result => {
-      console.log(result), 'result'
+      state.buttonLoading = false
       window.location.href = props.payFinishJumpUrl as string
     })
   } else {

package/src/shared/composables/useDeviceEnv.ts

@@ -0,0 +1,11 @@
+// 是否微信环境
+export function isWechat() {
+  let ua = window.navigator.userAgent.toLowerCase()
+  return ua.includes('micromessenger')
+}
+
+// 是否支付宝环境
+export function isAlipay() {
+  let ua = window.navigator.userAgent.toLowerCase()
+  return ua.includes('alipayclient')
+}