jufubao-base 1.0.67-beta204 → 1.0.67-beta220

package/package.json

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

package/src/components/JfbBaseConDialog/JfbBaseConDialog.vue

@@ -161,6 +161,10 @@ export default {
       storage.remove(this.containerId);
       this.getDialogList();
     },
+    onJfbShow(options) {
+      this.isShow=false
+      this.onJfbLoad(options);
+    },
     handleToList() {
       this.$xdUniHelper.navigateTo({
         url: `${this.list_url}?activity_id=${this.activity_id}&distribution_method=homed`,

package/src/components/JfbBaseConList/JfbBaseConList.vue

@@ -21,7 +21,7 @@
         v-if="couponList.length > 0"
         :style="{
           backgroundImage: `url(${background})`,
-          backgroundSize: '100% 100%',
+          backgroundSize: '100%',
           backgroundRepeat: 'no-repeat',
           height: `${layoutInfo.bodyMinHeightRpx}rpx`,
         }"
@@ -46,15 +46,29 @@
               v-for="(item, index) in couponList"
               :key="index"
               class="jfb-base-con-list__body-content-list-item"
-              :style="{ background: contentBackground }"
+              :style="{
+                background:
+                  item.remain_card_count == 0 ? '#f3f3f3' : contentBackground,
+              }"
             >
               <view class="jfb-base-con-list__body-content-list-item-left">
                 <view
                   :style="item.couponBackground"
                   class="jfb-base-con-list__body-content-list-item-left-info"
                 >
-                  <view :style="{ color: mainColor }">满减券</view>
-                  <view>{{ item.prize_name }}</view>
+                  <view
+                    :style="{
+                      color: item.remain_card_count == 0 ? '#D6D6D6' : mainColor,
+                      textAlign: 'center'
+                    }"
+                    >{{ item.prize_type }}</view
+                  >
+                  <view
+                    :style="{
+                      color: item.remain_card_count == 0 ? '#D6D6D6' : '#fff',
+                    }"
+                    >{{ item.prize_name }}</view
+                  >
                 </view>
               </view>
               <view class="jfb-base-con-list__body-content-list-item-right">
@@ -66,10 +80,10 @@
                     v-if="item.remain_card_count > 0"
                     size="100"
                     :style="{
-                      color: item.can_take === 'N' ? '#D6D6D6' : mainColor,
+                      color: item.can_take === 'N' ? '#D6D6D6' : iconColor,
                       position: 'absolute',
                       right: '-30rpx',
-                      top: '-40rpx',
+                      top: '-30rpx',
                     }"
                     :icon="
                       item.can_take === 'N' ? 'iconyilingqu' : 'icondailingqu'
@@ -82,7 +96,7 @@
                       color: '#D6D6D6',
                       position: 'absolute',
                       right: '-30rpx',
-                      top: '-40rpx',
+                      top: '-58rpx',
                     }"
                     icon="iconyifawan"
                   ></xd-font-icon>
@@ -90,7 +104,7 @@
                 <view
                   class="jfb-base-con-list__body-content-list-item-right-num"
                 >
-                  <view
+                  <!-- <view
                     :style="{
                       color: mainColor,
                       display: 'flex',
@@ -104,31 +118,35 @@
                       icon="icondanchuangguanbi_xian"
                     ></xd-font-icon>
                     {{ item.prize_num }}
-                  </view>
+                  </view> -->
+                  <view></view>
 
                   <xd-button
+                    v-if="item.can_take === 'Y'"
                     size="small"
-                    :disabled="item.can_take === 'N'"
+                    :disabled="item.remain_card_count ==0"
                     @click="getCoupont(item)"
                     type="primary"
                     :style="item.btn"
-                    >{{ item.can_take === "N" ? "已领取" : "领取" }}</xd-button
+                    :color="item.remain_card_count ==0 ? '#AAA' : '#fff'"
+                    >领取</xd-button
                   >
                 </view>
               </view>
             </view>
           </view>
+          <view class="jfb-base-con-list__body-content-foot"
+            >可在个人中心-我的票券进行查看</view
+          >
         </view>
-        <view class="jfb-base-con-list__body-foot"
-          >可在个人中心-我的票券进行查看</view
-        >
       </view>
       <view
         v-else
         class="empty_data"
         :style="{ minHeight: layoutInfo.bodyMinHeightPx + 'px' }"
       >
-        <image src="https://img.jufubao.cn/component/sp_nodata.png"></image>
+        <image :src="emptyBg"></image>
+        {{ message }}
       </view>
       <xd-dailog
         :cancel="false"
@@ -165,10 +183,11 @@ export default {
     XdDailog,
     XdContentXss,
   },
-  mixins: [componentsMixins, extsMixins, JfbBaseConListMixin],
+  mixins: [componentsMixins, extsMixins, JfbBaseConListMixin, colorCardMixins],
   data() {
     return {
       contentBackground: "",
+      iconColor: "",
       couponList: [],
       notice: "",
       showRule: false,
@@ -183,10 +202,14 @@ export default {
       timeer: null,
       order_num: null,
       done: false,
+      message: "",
     };
   },
   computed: {
     ...mapState(["pageBusinessCode"]),
+    emptyBg() {
+      return this.getNoData();
+    },
   },
   watch: {
     container(value) {
@@ -204,6 +227,7 @@ export default {
   methods: {
     init(value) {
       this.contentBackground = Color(this.mainColor).alpha(0.2).toString();
+      this.iconColor = Color(this.mainColor).alpha(0.3).toString();
     },
     getList() {
       jfbRootExec("getCouponList", {
@@ -226,14 +250,17 @@ export default {
                       background: `url(${getServiceUrl(
                         res.app_coupon_button_bg_url
                       )})`,
-                      backgroundSize: "100% 100%",
+                      backgroundSize: "100%",
                       backgroundRepeat: "no-repeat",
                       margin: "0",
                     }
-                  : { background: this.mainColor, margin: "0" };
+                  : {
+                      background: this.mainColor,
+                      margin: "0",
+                    };
                 item.couponBackground = {
                   background: `url(${getServiceUrl(res.app_coupon_url)})`,
-                  backgroundSize: "100% 100%",
+                  backgroundSize: "100%",
                   backgroundRepeat: "no-repeat",
                 };
               } else {
@@ -242,12 +269,14 @@ export default {
                   background: `url(${getServiceUrl(
                     res.app_coupon_invalid_url
                   )})`,
-                  backgroundSize: "100% 100%",
+                  backgroundSize: "100%",
                   backgroundRepeat: "no-repeat",
                 };
               }
               return item;
             });
+            console.log("couponList", this.couponList);
+          this.message = res.message;
           this.done = true;
         })
         .catch((err) => {
@@ -401,7 +430,8 @@ export default {
       border-radius: unit(20, rpx);
       background: #fff;
       padding: unit(34, rpx);
-      margin-top: unit(164, rpx);
+      position: relative;
+      top: unit(164, rpx);
       margin-right: auto;
       margin-left: auto;
       width: unit(650, rpx);
@@ -475,11 +505,12 @@ export default {
           }
         }
       }
-    }
-    &-foot {
-      color: #a6a6a6;
-      font-size: unit(24, rpx);
-      text-align: center;
+      &-foot {
+        color: #a6a6a6;
+        font-size: unit(24, rpx);
+        text-align: center;
+        margin-top: unit(40, rpx);
+      }
     }
   }
 }