jufubao-base 1.0.67 → 1.0.69-beta1

package/src/components/JfbBaseConList/Mock.js

@@ -0,0 +1,19 @@
+'use strict';
+
+module.exports = {
+  getCouponList: {
+    "list": [
+      {
+        "prize_id": 25,
+        "prize_name": "满100减1",
+        "prize_num": 23
+      }
+    ],
+    "background": "//sandbox-img.jufubao.cn/uploads/20231123/4767f11be07185af4d31c657812dd96f.jpg",
+    "app_coupon_url": "//sandbox-img.jufubao.cn/uploads/20231123/9709c60e75753585d7bab94699ce1d96.jpg",
+    "request_id": "60417690eab2c156"
+  },
+  getAllCoupon: {
+    "request_id": "5987aa28c709d4ef"
+  }
+}

package/src/components/JfbBasePay/JfbBasePay.vue

@@ -179,6 +179,8 @@ import XdFormInput from "@/components/XdFormInput/XdFormInput";
 import XdRadio from "@/components/XdRadio/XdRadio";
 import XdUnit from "@/components/XdUnit/XdUnit";
 import StyleForm from "@/utils/StyleForm";
+import {isWechat,isWechatTools} from "@/utils/xd.base";
+
 let styleForm = new StyleForm({bgColor: '#fafafa'}, getContainerPropsValue, 'pay');
 
 export default {
@@ -240,8 +242,9 @@ export default {
   },
   created() {
     this.init(this.container);
+
     // #ifdef H5
-    if (!this.$configProject.isPreview){
+    if (!this.$configProject.isPreview && (isWechat() || isWechatTools())){
       this.p_getH5WxAuthorize()
     }
     // #endif
@@ -356,9 +359,10 @@ export default {
     },
     //第三方支付
     doThirdPay() {
-      if(this.$configProject.isPreview) return ;
-      const { channel_provider_id, order_id, payInfo } = this;
-      let { login_providers = [] } = this.projectAttr;
+      if (this.$configProject.isPreview) return;
+      const {channel_provider_id, order_id, payInfo} = this;
+      let {login_providers = []} = this.projectAttr;
+      console.log(this.projectAttr)
       if (+payInfo.channel_amount > 0 && !this.channel_provider_id) {
         uni.showToast({
           title: "请选择支付方式",
@@ -367,17 +371,32 @@ export default {
         return false;
       }
       this.$xdShowLoading({});
+
+      let data = {
+        order_id,
+        channel_provider_id,
+        login_providers: login_providers.join(","),
+      };
+      // #ifdef H5
+      if (!(!this.$configProject.isPreview && (isWechat() || isWechatTools()))){
+        data['pay_success_url'] = `${window.location.protocol}//${window.location.host}/${this.projectAttr.deploy_dir}`;
+        data['pay_success_url'] += this.getSuccessUrl + `?order_id=${this.main_order_id}`;
+      }
+      // #endif
+
+
       jfbRootExec("setThirdPlace", {
         vm: this,
-        data: {
-          order_id,
-          channel_provider_id,
-          login_providers: login_providers.join(",")
-        },
+        data,
       })
         .then((res) => {
           this.$xdHideLoading();
-          console.log("thirdPay", res);
+          // #ifdef H5
+          if(res && res.payment_type === 'url') {
+            window.location.replace(res.payment_url);
+            return
+          }
+          // #endif
           const { channel_data } = res;
           const paySignData = JSON.parse(Base64.decode(channel_data));
           this.openTemplatePay(paySignData, (ps) => {

package/src/components/JfbBaseSuccess/JfbBaseSuccess.vue

@@ -400,6 +400,11 @@ export default {
     this.isPreview = this.$configProject.isPreview;
     this.init(this.container);
   },
+  destroyed() {
+    if (this.timeer) {
+      clearTimeout(this.timeer);
+    }
+  },
   methods: {
 
     onJfbLoad(options) {
@@ -638,12 +643,6 @@ export default {
       }
     },
 
-    destroyed() {
-      if (this.timeer) {
-        clearTimeout(this.timeer);
-      }
-    },
-
     /**
      * @description 页面返回按钮
      * @param options