@uxda/appkit 4.2.60 → 4.2.62

package/dist/index.js

@@ -125,9 +125,10 @@ function requestWxH5Pay(options) {
           timeStamp: options.timeStamp
         },
         function(res) {
-          console.log(res, "res");
           if (res.err_msg == "get_brand_wcpay_request:ok") {
-            resolve(res);
+            resolve(true);
+          } else {
+            resolve(false);
           }
         }
       );
@@ -1714,6 +1715,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 +1769,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,8 +1785,11 @@ var script$B = /* @__PURE__ */ defineComponent({
           channelCode: "centergzh",
           payFinishJumpUrl: props.payFinishJumpUrl
         }).then((result) => {
-          console.log(result);
-          window.location.href = props.payFinishJumpUrl;
+          console.log(result, "------requestBrandWCPay");
+          state.buttonLoading = false;
+          if (result) {
+            window.location.href = props.payFinishJumpUrl;
+          }
         });
       } else {
         wx.login({
@@ -2130,6 +2147,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,8 +2164,11 @@ var script$x = /* @__PURE__ */ defineComponent({
           channelCode: "centergzh",
           payFinishJumpUrl: props.payFinishJumpUrl
         }).then((result) => {
-          console.log(result);
-          window.location.href = props.payFinishJumpUrl;
+          console.log(result, "------requestBrandWCPay");
+          state.buttonLoading = false;
+          if (result) {
+            window.location.href = props.payFinishJumpUrl;
+          }
         });
       } else {
         wx.login({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxda/appkit",
-  "version": "4.2.60",
+  "version": "4.2.62",
   "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,8 +110,11 @@ const onPayClick = () => {
       channelCode: 'centergzh',
       payFinishJumpUrl: props.payFinishJumpUrl
     }).then(result => {
-      console.log(result), 'result'
-      window.location.href = props.payFinishJumpUrl as string
+      console.log(result, '------requestBrandWCPay')
+      state.buttonLoading = false
+      if (result) {
+        window.location.href = props.payFinishJumpUrl as string
+      }
     })
   } else {
     wx.login({

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,8 +181,11 @@ const onPayClick = () => {
       channelCode: 'centergzh',
       payFinishJumpUrl: props.payFinishJumpUrl
     }).then(result => {
-      console.log(result), 'result'
-      window.location.href = props.payFinishJumpUrl as string
+      console.log(result, '------requestBrandWCPay')
+      state.buttonLoading = false
+      if (result) {
+        window.location.href = props.payFinishJumpUrl as string
+      }
     })
   } else {
     wx.login({

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')
+}

package/src/shared/weixin/jssdk.ts

@@ -56,10 +56,11 @@ function requestWxH5Pay(options: PrePayOptions) {
           timeStamp: options.timeStamp,
         },
         function (res) {
-          console.log(res, 'res')
           if (res.err_msg == 'get_brand_wcpay_request:ok') {
-            resolve(res)
             //res.err_msg将在用户支付成功后返回ok，但并不保证它绝对可靠，商户需进一步调用后端查单确认支付结果。
+            resolve(true)
+          } else {
+            resolve(false)
           }
         }
       )