jufubao-base 1.0.105-beta1 → 1.0.105-beta5

package/package.json

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

package/src/components/JfbBaseConDialog/Attr.js

@@ -31,6 +31,18 @@ export default {
           { label: '切换', value: 2 },
         ]
       },
+      {
+        label: "触发事件:",
+        ele: "xd-select-list",
+        valueKey: "distribution_method",
+        value: data.distribution_method || "",
+        placeholder: "请选择触发事件",
+        list: [
+          // { label: "首页发放", value: "homed" },
+          { label: "支付成功", value: "paid" },
+          { label: "绑卡成功", value: "card_binded" },
+        ]
+      },
       {
         label: '弹窗间隔:',
         ele: 'el-input',

package/src/components/JfbBaseConDialog/JfbBaseConDialog.vue

@@ -93,6 +93,9 @@ export default {
       isPreview: false, //是否预览
       activity_id: "",
       backgroundColor: "",
+      distribution_method: "homed", //触发事件
+      dispatchData: "", //触发事件参数
+
     };
   },
   computed: {
@@ -114,6 +117,7 @@ export default {
       this.list_url = getContainerPropsValue(value, "content.list_url", {
         value: "",
       }).value;
+      this.distribution_method = getContainerPropsValue(value, "content.distribution_method", "");
       this.type = getContainerPropsValue(value, "content.type", 1);
       this.isHide = getContainerPropsValue(value, "content.isHide", false);
       this.time = Number(getContainerPropsValue(value, "content.time", 3));
@@ -122,10 +126,12 @@ export default {
       }
     },
     getDialogList() {
+
       jfbRootExec("getCouponDialogList", {
         vm: this,
         data: {
           namespace: this.pageBusinessCode,
+          distribution_method: this.distribution_method,
         },
       })
         .then((res) => {
@@ -167,7 +173,7 @@ export default {
     },
     handleToList() {
       this.$xdUniHelper.navigateTo({
-        url: `${this.list_url}?activity_id=${this.activity_id}&distribution_method=homed`,
+        url: `${this.list_url}?activity_id=${this.activity_id}&distribution_method=${this.distribution_method}`,
       });
     },
     handleClose() {
@@ -201,6 +207,13 @@ export default {
       );
       this.activity_id = this.list[this.currentIndex].activity_id;
     },
+    onJfbCustomEvent({action, data}){
+      if(action === '@showBaseConDialog'){
+        this.dispatchData = data;
+        this.getDialogList();
+      }
+      console.log('onJfbCustomEvent',action, data);
+    }
   },
 };
 </script>

package/src/components/JfbBaseConList/JfbBaseConList.vue

@@ -106,7 +106,7 @@
 
                     <xd-button
                       size="small"
-                      :disabled="item.remain_card_count == 0"
+                      :disabled="item.can_take_num !=='Y' && item.remain_card_count == 0"
                       @click="getCoupont(item)"
                       type="primary"
                       style="width: 170rpx;height: 60rpx;"
@@ -233,7 +233,7 @@ export default {
       })
         .then((res) => {
           this.background = getServiceUrl(res.background);
-          this.used_up_url = getServiceUrl(res.used_up_url);
+          this.used_up_url = res.used_up_url && getServiceUrl(res.used_up_url);
           this.can_take = res.can_take;
           this.has_times = res.has_times;
           
@@ -308,6 +308,10 @@ export default {
       });
     },
     getCoupont(item) {
+      if(item.can_take_num === "Y") {
+        this.toCoupon();
+        return;
+      }
       this.$xdShowLoading({});
       jfbRootExec("getAllCoupon", {
         vm: this,
@@ -348,6 +352,7 @@ export default {
       })
         .then((res) => {
           if (res.status_type === "success") {
+            this.order_num = null;
             this.$xdHideLoading();
             this.$xdAlert({
               content: "领取成功",

package/src/components/JfbBaseConList/Mock.js

@@ -1,11 +1,25 @@
 'use strict';
 
 module.exports = {
-  getCouponList: {"list":[
-    {"prize_id":153,"prize_name":"满50减50","prize_type":"满减券","prize_num":1,"can_take":"Y","is_over":"N","can_take_num":"P","today_times":1,"today_num":0,"total_times":1,"total_num":0,"remain_card_count":55},
-    {"prize_id":153,"prize_name":"满50减50","prize_type":"满减券","prize_num":1,"can_take":"Y","is_over":"N","can_take_num":"P","today_times":1,"today_num":0,"total_times":1,"total_num":0,"remain_card_count":55},
-    {"prize_id":153,"prize_name":"满50减50","prize_type":"满减券","prize_num":1,"can_take":"Y","is_over":"N","can_take_num":"P","today_times":1,"today_num":0,"total_times":1,"total_num":0,"remain_card_count":55}
-  ],"background":"//sandbox-img.jufubao.cn/uploads/20231204/96b801e0dc27422c183dc90d905dd2ed.jpg","can_take":"Y","message":"","app_coupon_url":"//sandbox-img.jufubao.cn/uploads/20231205/fee9b644b83495c9ba8a4db277600b54.jpg","app_activity_button":"//sandbox-img.jufubao.cn/uploads/20231207/35f3065b2b2bc3fc2dda73d7b5b9eae8.jpg","app_coupon_button_bg_url":"//sandbox-img.jufubao.cn/uploads/20231212/026a3ea901f87f51b531d06c24604676.png","app_coupon_invalid_url":"//sandbox-img.jufubao.cn/uploads/20231208/8b153ce4870686a37295c16fbc992235.jpg","request_id":"a2603f2a480485f4"},
+  getCouponList: {
+    "list":[
+      {"prize_id":153,"prize_name":"满50减50","prize_type":"满减券","prize_num":1,"can_take":"Y","is_over":"N","can_take_num":"P","today_times":1,"today_num":0,"total_times":1,"total_num":0,"remain_card_count":55},
+      {"prize_id":153,"prize_name":"满50减50","prize_type":"满减券","prize_num":1,"can_take":"Y","is_over":"N","can_take_num":"P","today_times":1,"today_num":0,"total_times":1,"total_num":0,"remain_card_count":55},
+      {"prize_id":153,"prize_name":"满50减50","prize_type":"满减券","prize_num":1,"can_take":"Y","is_over":"N","can_take_num":"P","today_times":1,"today_num":0,"total_times":1,"total_num":0,"remain_card_count":55}
+    ],
+    "background":"//sandbox-img.jufubao.cn/uploads/20231204/96b801e0dc27422c183dc90d905dd2ed.jpg",
+    "used_up_url": "",
+    "has_times": "Y",
+    "can_take":"Y",
+    "message":"",
+    "app_coupon_url":"//sandbox-img.jufubao.cn/uploads/20231205/fee9b644b83495c9ba8a4db277600b54.jpg",
+    "app_activity_button":"//sandbox-img.jufubao.cn/uploads/20231207/35f3065b2b2bc3fc2dda73d7b5b9eae8.jpg",
+    "app_coupon_button_bg_url":"//sandbox-img.jufubao.cn/uploads/20231212/026a3ea901f87f51b531d06c24604676.png",
+    "app_coupon_button_see_url": "//sandbox-img.jufubao.cn/uploads/20231212/026a3ea901f87f51b531d06c24604676.png",
+    "app_coupon_invalid_url":"//sandbox-img.jufubao.cn/uploads/20231208/8b153ce4870686a37295c16fbc992235.jpg",
+    "rule":"<p>打发&middot;</p>",
+    "request_id":"a2603f2a480485f4"
+  },
   getAllCoupon: {
     "request_id": "5987aa28c709d4ef"
   }

package/src/components/JfbBaseSuccess/JfbBaseSuccess.vue

@@ -321,7 +321,7 @@ import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
 import XdDailog from "@/components/XdDailog/XdDailog";
 import XdButton from "@/components/XdButton/XdButton";
 import XdUnit from "@/components/XdUnit/XdUnit";
-import { jfbRootExec } from "@/utils/xd.event";
+import { jfbRootExec, jfbRootFnExec } from "@/utils/xd.event";
 import JfbBaseSuccessMixin from "./JfbBaseSuccessMixin";
 import componentsMixins from "@/mixins/componentsMixins";
 import extsMixins from "@/mixins/extsMixins";
@@ -495,6 +495,9 @@ export default {
         },
       })
         .then((res) => {
+          if(res.status.status_type === 'success') {
+            jfbRootFnExec(this, 'onCustomEvent')("@showBaseConDialog", {order_id: this.order_id});
+          }
           this.handleOrderResolve(res);
         })
         .catch((err) => {