@uxda/appkit 4.2.61 → 4.2.63

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);
           }
         }
       );
@@ -1784,8 +1785,11 @@ var script$B = /* @__PURE__ */ defineComponent({
           channelCode: "centergzh",
           payFinishJumpUrl: props.payFinishJumpUrl
         }).then((result) => {
+          console.log(result, "------requestBrandWCPay");
           state.buttonLoading = false;
-          window.location.href = props.payFinishJumpUrl;
+          if (result) {
+            window.location.href = props.payFinishJumpUrl;
+          }
         });
       } else {
         wx.login({
@@ -2160,8 +2164,11 @@ var script$x = /* @__PURE__ */ defineComponent({
           channelCode: "centergzh",
           payFinishJumpUrl: props.payFinishJumpUrl
         }).then((result) => {
+          console.log(result, "------requestBrandWCPay");
           state.buttonLoading = false;
-          window.location.href = props.payFinishJumpUrl;
+          if (result) {
+            window.location.href = props.payFinishJumpUrl;
+          }
         });
       } else {
         wx.login({
@@ -6035,6 +6042,10 @@ var script$9 = /* @__PURE__ */ defineComponent({
         });
         if (res.tempFilePaths) {
           const filePath = res.tempFilePaths[0];
+          if (Taro.getEnv() === "WEB") {
+            updateImage(filePath);
+            return;
+          }
           emits("crop", filePath);
         }
       }

package/package.json

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

package/src/payment/components/RechargeView.vue

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

package/src/payment/components/TradeView.vue

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

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

package/src/user/components/UserInfo.vue

@@ -204,6 +204,11 @@ async function toUpload() {
     if (res.tempFilePaths) {
       const filePath = res.tempFilePaths[0];
 
+      if (Taro.getEnv() === "WEB") {
+        updateImage(filePath);
+        return
+      }
+
       emits("crop", filePath);
     }
   }