jufubao-base 1.0.121 → 1.0.123

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.121",
+  "version": "1.0.123",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",

package/src/components/JfbBaseConPhone/JfbBaseConPhone.vue

@@ -83,7 +83,7 @@
               :bg-color="mainColor"
               width="360rpx"
               radius="20rpx"
-              size="small"
+              size="medium"
               @click="handleConfirm"
               >直接领取</XdButton
             >
@@ -102,7 +102,7 @@
             class="jfb-base-con-phone__body-wrap-btn"
           >
             <XdButton
-              size="small"
+              size="medium"
               type="primary"
               :bg-color="mainColor"
               radius="20rpx"
@@ -110,7 +110,7 @@
               >{{ btnOneName }}</XdButton
             >
             <XdButton
-              size="small"
+              size="medium"
               type="primary"
               :bg-color="mainColor"
               radius="20rpx"
@@ -266,9 +266,9 @@ export default {
           let image1 = await getImageInfo(getServiceUrl(res.used_background));
           console.log({ ...image }, "imageimage");
           this.topHeight = image.imgHeight / this.$rpxNum;
-          this.topWidth = '100%';
+          this.topWidth = "100%";
           this.bottomHeight = image1.imgHeight / this.$rpxNum;
-          this.bottomWidth = '100%';
+          this.bottomWidth = "100%";
           this.background = getServiceUrl(res.background);
           this.used_background = getServiceUrl(res.used_background);
           this.errmessage = res.message;

package/src/components/JfbBasePay/JfbBasePay.vue

@@ -363,6 +363,7 @@ export default {
           });
         });
     },
+
     //第三方支付
     async doThirdPay() {
       if (this.$configProject.isPreview) return;
@@ -387,14 +388,16 @@ export default {
         channel_provider_id,
         login_providers: login_providers.join(","),
       };
-      // #ifdef H5
-      if (!(!this.$configProject.isPreview && (isWechat() || isWechatTools()))){
+
+      //设置支付成功页面地址
+      if (!this.$configProject.isPreview){
+        data['pay_success_url'] = '';
+        // #ifdef H5
         data['pay_success_url'] = `${window.location.protocol}//${window.location.host}/${this.projectAttr.deploy_dir}`;
+        // #endif
         data['pay_success_url'] += this.getSuccessUrl + `?order_id=${this.main_order_id}`;
       }
-      // #endif
-
-
+      console.warn(`setThirdPlace.data:${data}`);
       jfbRootExec("setThirdPlace", {
         vm: this,
         data,
@@ -403,10 +406,13 @@ export default {
           this.$xdHideLoading();
           // #ifdef H5
           if(res && res.payment_type === 'url') {
+            console.warn(`setThirdPlace.type:url`);
+            console.warn(`setThirdPlace.res.${res.payment_url}`);
             window.location.replace(res.payment_url);
             return
           }
           // #endif
+          console.warn(`setThirdPlace.type:slef`);
           const { channel_data } = res;
           const paySignData = JSON.parse(Base64.decode(channel_data));
           this.openTemplatePay(paySignData, (ps) => {