jufubao-base 1.0.104 → 1.0.105-beta2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.104",
+  "version": "1.0.105-beta2",
   "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/Attr.js

@@ -6,6 +6,17 @@
 export default {
   style: [],
   content: [
+    {
+      label: '查看已领票券路径:', //label
+      ele: 'xd-select-pages-path', //package 名称
+      valueKey: 'collectedPath', //form[valueKey]
+      placeholder: '请选择查看已领票券路径',
+      value: null,
+      setting: {
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      inline: false,
+    },
     // {
     //   label: '领券规则:',
     //   ele: 'xd-site-news',

package/src/components/JfbBaseConList/JfbBaseConList.vue

@@ -16,15 +16,14 @@
       <view class="jfb-base-con-list__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
-    <view class="jfb-base-con-list__body" v-if="done">
+    <view class="jfb-base-con-list__body" v-if="done" :style="{
+      backgroundImage: `url(${background})`,
+      backgroundSize: '100%',
+      backgroundRepeat: 'no-repeat',
+      minHeight: `${layoutInfo.bodyMinHeightRpx}rpx`,
+    }">
       <view
         v-if="couponList&&couponList.length > 0"
-        :style="{
-          backgroundImage: `url(${background})`,
-          backgroundSize: '100%',
-          backgroundRepeat: 'no-repeat',
-          height: `${layoutInfo.bodyMinHeightRpx}rpx`,
-        }"
       >
         <view class="jfb-base-con-list__body-content">
           <view class="jfb-base-con-list__body-content-header">
@@ -41,7 +40,7 @@
               <xd-font-icon size="20" icon="iconxiangyou_xian"></xd-font-icon>
             </view>
           </view>
-          <view class="jfb-base-con-list__body-content-list">
+          <view v-if="can_take === 'Y' && has_times === 'Y'" class="jfb-base-con-list__body-content-list">
             <view v-for="(item, index) in couponList" :key="index">
               <view
                 class="jfb-base-con-list__body-content-list-item"
@@ -106,24 +105,27 @@
                     <view></view>
 
                     <xd-button
-                      v-if="item.can_take_num !== 'Y'"
                       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;"
                       :style="item.btn"
                       :color="item.infoColor"
-                      >领取</xd-button
-                    >
+                      >{{ item.btn_txt }}</xd-button>
                   </view>
                 </view>
               </view>
             </view>
           </view>
-          <view class="jfb-base-con-list__body-content-foot"
-            >可在我的-我的票券进行查看</view
-          >
+          <view v-else class="jfb-base-con-list__body-content-list" style="padding-bottom: 60rpx;">
+            <image mode="widthFix" src="//sandbox-img.jufubao.cn/uploads/20240123/0b022b56928000ae54f5e7c9669cf214.png?ver=tjJC9jW3mbfiz2p19I6l"></image>
+          </view>
         </view>
+        <view class="jfb-base-con-list__body-content-foot"
+          @click="toCoupon"
+          >查看已领票券</view
+        >
       </view>
       <view
         v-else
@@ -180,6 +182,9 @@ export default {
       activity_id: "",
       background: "",
       app_coupon_url: "",
+      used_up_url: "",
+      can_take: "",
+      has_times: "",
       method: "entry",
       maxTime: 5, //最长轮询2的N次方（秒）
       date: 2, //时间底数
@@ -188,6 +193,8 @@ export default {
       order_num: null,
       done: false,
       message: "",
+
+      collectedPath: "",
     };
   },
   computed: {
@@ -213,6 +220,7 @@ export default {
     init(value) {
       this.contentBackground = '#FFF8F8';
       this.iconColor = '#FF4D4A';
+      this.collectedPath = getContainerPropsValue(value, "content.collectedPath", {value: ''}).value;
     },
     getList() {
       jfbRootExec("getCouponList", {
@@ -225,16 +233,22 @@ export default {
       })
         .then((res) => {
           this.background = getServiceUrl(res.background);
+          this.used_up_url = getServiceUrl(res.used_up_url);
+          this.can_take = res.can_take;
+          this.has_times = res.has_times;
+          
           this.couponList =
             res.list &&
             res.list.length > 0 &&
             res.list.map((item) => {
+              let mapArr = {"Y": "去查看", "P": "领取", "N": "已发完"}
+              item.btn_txt = mapArr[item.can_take_num];
               if (item.can_take_num === "Y" || item.can_take_num === "P") {
                 //按钮样式
                 item.btn = res.app_coupon_button_bg_url
                   ? {
                       backgroundImage: `url(${getServiceUrl(
-                        res.app_coupon_button_bg_url
+                        item.can_take_num === "Y" ? res.app_coupon_button_see_url : res.app_coupon_button_bg_url
                       )})`,
                       backgroundSize: "100%",
                       backgroundRepeat: "no-repeat",
@@ -288,7 +302,16 @@ export default {
           console.log(err, "err");
         });
     },
+    toCoupon(){
+      this.$xdUniHelper.navigateTo({
+        url: this.collectedPath,
+      });
+    },
     getCoupont(item) {
+      if(item.can_take_num === "Y") {
+        this.toCoupon();
+        return;
+      }
       this.$xdShowLoading({});
       jfbRootExec("getAllCoupon", {
         vm: this,
@@ -329,6 +352,7 @@ export default {
       })
         .then((res) => {
           if (res.status_type === "success") {
+            this.order_num = null;
             this.$xdHideLoading();
             this.$xdAlert({
               content: "领取成功",
@@ -438,6 +462,9 @@ export default {
   &__body {
     position: relative;
     overflow-y: auto;
+    padding-top: 82px;
+    box-sizing: border-box;
+    background-color: #FAFAFA;
     .empty_data {
       text-align: center;
       color: #999999;
@@ -455,8 +482,6 @@ export default {
       border-radius: unit(20, rpx);
       background: #fff;
       padding: unit(34, rpx);
-      position: relative;
-      top: unit(164, rpx);
       margin-right: auto;
       margin-left: auto;
       width: unit(650, rpx);
@@ -534,7 +559,7 @@ export default {
         color: #a6a6a6;
         font-size: unit(24, rpx);
         text-align: center;
-        margin-top: unit(40, rpx);
+        margin: unit(40, rpx) 0;
       }
     }
   }

package/src/components/JfbBaseConList/Mock.js

@@ -1,11 +1,24 @@
 '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",
+    "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) => {