jufubao-base 1.0.104 → 1.0.105-beta1

package/package.json

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

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"
                       @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,6 +302,11 @@ export default {
           console.log(err, "err");
         });
     },
+    toCoupon(){
+      this.$xdUniHelper.navigateTo({
+        url: this.collectedPath,
+      });
+    },
     getCoupont(item) {
       this.$xdShowLoading({});
       jfbRootExec("getAllCoupon", {
@@ -438,6 +457,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 +477,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 +554,7 @@ export default {
         color: #a6a6a6;
         font-size: unit(24, rpx);
         text-align: center;
-        margin-top: unit(40, rpx);
+        margin: unit(40, rpx) 0;
       }
     }
   }