jufubao-base 1.0.106-beta1 → 1.0.106-beta4

package/package.json

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

package/src/components/JfbBaseConDialog/JfbBaseConDialog.vue

@@ -105,7 +105,7 @@ export default {
       activity_id: "",
       backgroundColor: "",
       distribution_method: "homed", //触发事件
-      dispatchData: "", //触发事件参数
+      dispatchData: {}, //触发事件参数
 
       couponList: [],
       couponOther: {},
@@ -177,6 +177,7 @@ export default {
         vm: this,
         data: {
           tmp_order_number: this.order_num,
+          ...this.dispatchData
         },
       })
         .then((res) => {
@@ -314,8 +315,9 @@ export default {
       this.onJfbLoad(options);
     },
     handleToList() {
+      let otherParams = this.$xdUniHelper.jsonToParams(this.dispatchData);
       this.$xdUniHelper.navigateTo({
-        url: `${this.list_url}?activity_id=${this.activity_id}&distribution_method=${this.distribution_method}`,
+        url: `${this.list_url}?activity_id=${this.activity_id}&distribution_method=${this.distribution_method}&${otherParams}`,
       });
     },
     handleClose() {

package/src/components/JfbBaseConList/JfbBaseConList.vue

@@ -193,6 +193,7 @@ export default {
       order_num: null,
       done: false,
       message: "",
+      options: {},
 
       collectedPath: "",
     };
@@ -226,6 +227,7 @@ export default {
       jfbRootExec("getCouponList", {
         vm: this,
         data: {
+          ...this.options,
           distribution_method: this.method,
           namespace: this.pageBusinessCode,
           activity_id: this.activity_id,
@@ -316,6 +318,7 @@ export default {
       jfbRootExec("getAllCoupon", {
         vm: this,
         data: {
+          ...this.options,
           distribution_method: this.method,
           namespace: this.pageBusinessCode,
           activity_id: this.activity_id,
@@ -347,6 +350,7 @@ export default {
       jfbRootExec("getCouponResult", {
         vm: this,
         data: {
+          ...this.options,
           tmp_order_number: this.order_num,
         },
       })
@@ -422,6 +426,7 @@ export default {
     // },
     onJfbLoad(options) {
       console.log(this.pageBusinessCode, "pageNamespace");
+      this.options = options;
       this.activity_id = options.activity_id;
       this.method = options.distribution_method
         ? options.distribution_method

package/src/components/JfbBasePay/Api.js

@@ -23,9 +23,10 @@ module.exports = [
     disabled: true,
   },
   {
-    mapFnName: 'getBaseOrderDetail', //自定义方法名字（必选）
+    mapFnName: 'getBaseOrderStatus', //自定义方法名字（必选）
     title: '获取订单详情',
-    path: '/order/v1/order/detail',
+    // path: '/order/v1/order/detail',
+    path: "/order/v1/order/pay-status",
     isRule: false,
     params: {
       main_order_id: ['id', 'Number', '必选'],

package/src/components/JfbBasePay/JfbBasePay.vue

@@ -297,23 +297,29 @@ export default {
       return time;
     },
     p_getBaseOrderDetail(){
-      jfbRootExec("getBaseOrderDetail", {
-        vm: this,
-        data: {
-          main_order_id: this.main_order_id,
-        }
-      }).then(res => {
-        let { is_can_pay, can_pay_message } = res.can_pay_info
-        this.is_can_pay = is_can_pay;
-        this.can_pay_message = can_pay_message;
-        if(is_can_pay !== "Y"){
-          uni.showToast({
-            title: can_pay_message,
-            icon: 'none',
-            duration: 3000
-          });
-          // this.$xdNavigateBack()
-        }
+      return new Promise((resolve, reject) => {
+        jfbRootExec("getBaseOrderStatus", {
+          vm: this,
+          data: {
+            main_order_id: this.main_order_id,
+          }
+        }).then(res => {
+          let { is_can_pay, can_pay_message } = res.can_pay_info
+          this.is_can_pay = is_can_pay;
+          this.can_pay_message = can_pay_message;
+          if(is_can_pay !== "Y"){
+            uni.showToast({
+              title: can_pay_message,
+              icon: 'none',
+              duration: 3000
+            });
+            reject();
+            // this.$xdNavigateBack()
+          }
+          resolve();
+        }).catch(err => {
+          reject();
+        })
       })
     },
     p_getPayOrderDetail() {
@@ -358,8 +364,12 @@ export default {
         });
     },
     //第三方支付
-    doThirdPay() {
+    async doThirdPay() {
       if (this.$configProject.isPreview) return;
+
+      if(this.type !== 'recharge') {
+        await this.p_getBaseOrderDetail();
+      }
       const {channel_provider_id, order_id, payInfo} = this;
       let {login_providers = []} = this.projectAttr;
       console.log(this.projectAttr)

package/src/components/JfbBasePoster/Attr.js

@@ -380,6 +380,7 @@ export default {
         list: [
           {"label": "一行", "value": 1},
           {"label": "两行", "value": 2},
+          {"label": "三行", "value": 3},
         ]
       },
       params['isCarousel']===2 && params['rows'] === 1 && {

package/src/components/JfbBasePoster/MoreScreen.vue

@@ -112,7 +112,7 @@
       getHeight() {
         let height = this.height * this.config.rows;
         let padding = 0;
-        if (this.config.rows === 2) padding = Number(this.config.padding) * this.$rpxNum;
+        if (this.config.rows >= 2) padding = Number(this.config.padding) * this.$rpxNum * (this.config.rows -1);
         return height + padding;
       },
 		},