jufubao-base 1.0.158-beta5 → 1.0.158-beta7

package/package.json

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

package/src/components/JfbBaseCardInfo/JfbBaseCardInfo.vue

@@ -221,7 +221,6 @@ export default {
       }
 
       let path = this.getUrlCallback(this.my_card_url || this.backUrl);
-
       //有优惠券处理
       if(this.hasCon){
         this.toShowCouponDialog();

package/src/components/JfbBaseCardInfoEntry/JfbBaseCardInfoEntry.vue

@@ -238,7 +238,6 @@ export default {
       }
     },
     handlerAfterBindCard(res){
-
       if(res.pop_info && res.pop_info.pop_code === '1001'){
         this.handleBindConfirm();
         return;

package/src/components/JfbBaseConDialog/JfbBaseConDialog.vue

@@ -57,7 +57,6 @@
             :isRandom="isRandom"
             :list="couponList"
             :setting="couponOther"
-            :btnImage="btnImage"
             @closeDialog="handleCardBindClose"
             @getCoupont="handleGetCoupon"
             @getAllCoupont="getAllCoupont"
@@ -118,10 +117,8 @@ export default {
       //预览是否显示弹窗
       is_preview_hide_dailog: false,
 
-      isAll: true,
-      isRandom: true,
-      btnImage: ''
-
+      isAll: false,
+      isRandom: false
     };
   },
   computed: {
@@ -268,6 +265,7 @@ export default {
             this.list[this.currentIndex].app_activity_button
           );
           this.activity_id = this.list[this.currentIndex].activity_id;
+          this.isAll = 
           this.handlePop();
         })
         .catch((err) => {
@@ -286,13 +284,27 @@ export default {
         const { list, ...other } = res;
         this.couponList = list;
         this.couponOther = other;
-        if(res.can_take === "Y" && res.has_times === "Y" && list.length > 0){
+        this.isAll = res.receive_method==="batch"
+        this.isRandom = res.distribution_type==="random"
+        this.activity_id = res.activity_id
+        if(res.receive_method !== "batch") {
+          if(res.can_take === "Y" && res.has_times === "Y" && list.length > 0){
+          if (this.isPreview) {
+            console.log(getContainerPropsValue(value, "content.is_show_dailog", 'Y'))
+            this.isShow = getContainerPropsValue(value, "content.is_show_dailog", 'Y') === 'N';
+            }else this.isShow = true;
+          }else{
+            this.handleCardBindClose();
+          }
+        } else {
+          if(res.can_take === "Y"){
           if (this.isPreview) {
             console.log(getContainerPropsValue(value, "content.is_show_dailog", 'Y'))
             this.isShow = getContainerPropsValue(value, "content.is_show_dailog", 'Y') === 'N';
-          }else this.isShow = true;
-        }else{
-          this.handleCardBindClose();
+            }else this.isShow = true;
+          }else{
+            this.handleCardBindClose();
+          }
         }
       })
     },
@@ -305,7 +317,7 @@ export default {
       }
     },
 
-    getAllCoupont() {
+    getAllCoupont(info) {
       this.p_getAllDialogList();
     },
 
@@ -316,6 +328,7 @@ export default {
         vm: this,
         data: {
           distribution_method: this.distribution_method,
+          activity_id: this.activity_id,
           ...this.dispatchData
         }
       }).then(res => {

package/src/components/JfbBaseConDialog/XdCouCardBind.vue

@@ -3,50 +3,95 @@
     <view
       class="ticket_box"
       :style="{
-       backgroundImage: dialogBackground
+        backgroundImage: dialogBackground,
       }"
     >
-      <view v-if="!isRandom" class="ticket_list">
-        <view
-          class="ticket_item"
-          :class="item.can_take_num"
-          v-for="(item,i) in uiList"
-          :key="i"
-        >
-          <view class="item_head">
-            <image class="t_icon" mode="widthFix" :src="item.headIcon"></image>
-            <view>{{  item.prize_type }}</view>
-          </view>
-          <view class="item_sub">{{ item.prize_name }}</view>
+      <view v-if="isAll">
+        <view v-if="!isRandom" class="ticket_list">
+          <view
+            class="ticket_item"
+            :class="item.can_take_num"
+            v-for="(item, i) in uiList"
+            :key="i"
+          >
+            <view class="item_head">
+              <image
+                class="t_icon"
+                mode="widthFix"
+                :src="item.headIcon"
+              ></image>
+              <view>{{ item.prize_type }}</view>
+            </view>
+            <view class="item_sub">{{ item.prize_name }}</view>
 
-          <xd-font-icon class="ticket_icon" :color="item.iconColor" :icon="item.icon"></xd-font-icon>
-          <view v-if="!isAll" class="btn">
-            <xd-button
-              size="small"
-              type="primary"
-              :disabled="item.remain_card_count == 0"
-              :style="{
-                backgroundImage: item.btnImage,
-                backgroundSize: '100% 100%',
-              }"
-              @click="getCoupont(item)"
-            >{{item.btn_txt}}</xd-button>
+            <xd-font-icon
+              class="ticket_icon"
+              :color="item.iconColor"
+              :icon="item.icon"
+            ></xd-font-icon>
           </view>
         </view>
+        <view v-else>
+          <img
+            style="width: 100%"
+            mode="widthFix"
+            :src="bottomBackground"
+            alt=""
+          />
+        </view>
+        <xd-button
+          size="small"
+          type="primary"
+          :style="{
+            backgroundImage: btnImage,
+            backgroundSize: '100% 100%',
+            height: '70rpx',
+            width: '450rpx',
+            marginTop: '26rpx'
+          }"
+          @click="getAllCoupont"
+          >{{ isRandom ? "开心获取" : "一键领取" }}</xd-button
+        >
       </view>
       <view v-else>
-        随机领取图片
+        <view class="ticket_list">
+          <view
+            class="ticket_item"
+            :class="item.can_take_num"
+            v-for="(item, i) in uiList"
+            :key="i"
+          >
+            <view class="item_head">
+              <image
+                class="t_icon"
+                mode="widthFix"
+                :src="item.headIcon"
+              ></image>
+              <view>{{ item.prize_type }}</view>
+            </view>
+            <view class="item_sub">{{ item.prize_name }}</view>
+
+            <xd-font-icon
+              class="ticket_icon"
+              :color="item.iconColor"
+              :icon="item.icon"
+            ></xd-font-icon>
+            <view class="btn">
+              <xd-button
+                size="small"
+                type="primary"
+                :disabled="item.remain_card_count == 0"
+                :style="{
+                  backgroundImage: item.btnImage,
+                  backgroundSize: '100% 100%',
+                }"
+                @click="getCoupont(item)"
+                >{{ item.btn_txt }}</xd-button
+              >
+            </view>
+          </view>
+        </view>
       </view>
-       <xd-button
-        v-if="isAll"
-        size="small"
-        type="primary"
-        :style="{
-          backgroundImage: btnImage,
-          backgroundSize: '100% 100%',
-        }"
-        @click="getAllCoupont"
-      >{{isRandom?'开心获取':'一键领取'}}</xd-button>
     </view>
 
     <xd-font-icon
@@ -62,172 +107,173 @@
 import XdButton from "@/components/XdButton/XdButton";
 import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
 import getServiceUrl from "@/common/getServiceUrl";
-export default{
+export default {
   name: "XdCouCardBind",
   components: {
     XdButton,
-    XdFontIcon
+    XdFontIcon,
   },
   props: {
     list: {
       type: Array,
-      default(){
-        return []
-      }
+      default() {
+        return [];
+      },
     },
     isAll: {
       type: Boolean,
-      default: false
+      default: false,
     },
     isRandom: {
       type: Boolean,
-      default: false
+      default: false,
     },
     btnImage: {
       type: String,
-      default: ""
+      default: "",
     },
-    setting: {}
+    setting: {},
   },
   computed: {
-    uiList(){
-      return this.list.map(item => {
-        let mapArr = {"Y": "去查看", "P": "领取", "N": "已发完"}
+    uiList() {
+      return this.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"){
+        if (item.can_take_num === "Y" || item.can_take_num === "P") {
           item.headIcon = getServiceUrl(this.setting.app_coupon_url);
-          item.btnImage = `url(${getServiceUrl(this.setting.app_coupon_button_bg_url)})`;
-          item.icon = item.can_take_num === "Y" ? "iconyilingqu" : "icondailingqu";
-          item.iconColor = item.can_take_num === "Y"?'#D6D6D6':"#FF4D4A"
-        }else if(item.can_take_num === "N"){
+          item.btnImage = `url(${getServiceUrl(
+            this.setting.app_coupon_button_bg_url
+          )})`;
+          item.icon =
+            item.can_take_num === "Y" ? "iconyilingqu" : "icondailingqu";
+          item.iconColor = item.can_take_num === "Y" ? "#D6D6D6" : "#FF4D4A";
+        } else if (item.can_take_num === "N") {
           item.headIcon = getServiceUrl(this.setting.app_coupon_invalid_url);
           item.btnImage = "";
           item.icon = "iconyifawan";
-          item.iconColor = '#D6D6D6'
+          item.iconColor = "#D6D6D6";
         }
         return item;
-      })
+      });
     },
-    dialogBackground(){
+    dialogBackground() {
       return `url(${getServiceUrl(this.setting.background)})`;
-    }
+    },
+    bottomBackground() {
+      return getServiceUrl(this.setting.app_coupon_bottom_url);
+    },
   },
-  data(){
-    return {
-
-    }
+  data() {
+    return {};
   },
   methods: {
     //领取优惠券
-    getCoupont(item){
-      if(item.can_take_num === "P"){
+    getCoupont(item) {
+      if (item.can_take_num === "P") {
         this.$emit("getCoupont", item);
       }
     },
     getAllCoupont() {
-      this.$emit("getAllCoupont", item);
+      this.$emit("getAllCoupont");
     },
-    handleClose(){
+    handleClose() {
       this.$emit("closeDialog");
-    }
-  }
-}
+    },
+  },
+};
 </script>
 
 <style lang="less" scoped>
 @ticketHeight: 180rpx;
 @bgHeight: @ticketHeight - 40rpx;
-  .xd-cou-card-bind{
-    width: 600rpx;
-    max-height: 900rpx;
-    padding-bottom: 80rpx;
-    .ticket_box{
-      background-color: #fff;
-      background-size: 100% auto;
-      background-repeat: no-repeat;
-      padding-top: 200rpx;
-      border-radius: 20rpx;
-      box-sizing: border-box;
-      padding-bottom: 20rpx;
-    }
-
-    .ticket_item{
-      display: flex;
-      flex-direction: column;
-      position: relative;
-      width: 540rpx;
-      height: @ticketHeight;
-      margin: 20rpx auto;
-      border-radius: 20rpx;
-      padding: 30rpx;
-      box-sizing: border-box;
-      background: #FFF8F8;
-
-      &.P,
-      &.Y{
+.xd-cou-card-bind {
+  width: 600rpx;
+  max-height: 900rpx;
+  padding-bottom: 80rpx;
+  .ticket_box {
+    background-color: #fff;
+    background-size: 100% auto;
+    background-repeat: no-repeat;
+    padding-top: 200rpx;
+    border-radius: 20rpx;
+    box-sizing: border-box;
+    padding-bottom: 20rpx;
+  }
 
-      }
-      &.N{
-        background: #F3F3F3;
-        .item_head{
-          color: #BBBBBB;
-        }
-        .item_sub{
-          color: #BBBBBB;
-        }
-        .ticket_icon{
-          color: #D6D6D6;
+  .ticket_item {
+    display: flex;
+    flex-direction: column;
+    position: relative;
+    width: 540rpx;
+    height: @ticketHeight;
+    margin: 20rpx auto;
+    border-radius: 20rpx;
+    padding: 30rpx;
+    box-sizing: border-box;
+    background: #fff8f8;
 
-        }
-        .btn{
-          .xd-button{
-            background-color: #DDDDDD !important;
-            color: #999999 !important;
-          }
-        }
-      }
-      .item_head{
-        display: flex;
-        align-items: center;
-        font-size: 40rpx;
-        color: #000000;
-        font-weight: 500;
-        .t_icon{
-          width: 44rpx;
-          margin-right: 20rpx;
-        }
+    &.P,
+    &.Y {
+    }
+    &.N {
+      background: #f3f3f3;
+      .item_head {
+        color: #bbbbbb;
       }
-      .item_sub{
-        margin-top: 20rpx;
-        color: #FF4D4A;
-        font-size: 36rpx;
-        font-weight: 400;
+      .item_sub {
+        color: #bbbbbb;
       }
-      .ticket_icon{
-        font-size: 80rpx !important;
-        position: absolute;
-        top: 0;
-        right: 0;
+      .ticket_icon {
+        color: #d6d6d6;
       }
-      .btn{
-        position: absolute;
-        right: 20rpx;
-        bottom: 20rpx;
-        .xd-button{
-          height: 30rpx;
-          width: 100rpx;
-          font-size: 28rpx;
-          background-size: cover !important;
-          background-color: #fb5b3f;
+      .btn {
+        .xd-button {
+          background-color: #dddddd !important;
+          color: #999999 !important;
         }
       }
-
     }
-    .dialog_close{
+    .item_head {
+      display: flex;
+      align-items: center;
+      font-size: 40rpx;
+      color: #000000;
+      font-weight: 500;
+      .t_icon {
+        width: 44rpx;
+        margin-right: 20rpx;
+      }
+    }
+    .item_sub {
+      margin-top: 20rpx;
+      color: #ff4d4a;
+      font-size: 36rpx;
+      font-weight: 400;
+    }
+    .ticket_icon {
+      font-size: 80rpx !important;
       position: absolute;
-      bottom: 0rpx;
-      left: 50%;
-      transform: translateX(-50%);
+      top: 0;
+      right: 0;
+    }
+    .btn {
+      position: absolute;
+      right: 20rpx;
+      bottom: 20rpx;
+      .xd-button {
+        height: 30rpx;
+        width: 100rpx;
+        font-size: 28rpx;
+        background-size: cover !important;
+        background-color: #fb5b3f;
+      }
     }
   }
+  .dialog_close {
+    position: absolute;
+    bottom: 0rpx;
+    left: 50%;
+    transform: translateX(-50%);
+  }
+}
 </style>

package/src/components/JfbBaseConList/JfbBaseConList.vue

@@ -68,7 +68,6 @@
               </view>
               <view v-else>
                 <view
-                  v-if="can_take === 'Y'"
                   class="jfb-base-con-list__body-content-list"
                 >
                   <view>
@@ -78,8 +77,7 @@
                         :class="'status_' + item.can_take_num"
                         :style="{
                           backgroundColor:
-                            item.can_take_num === 'Y' ||
-                            item.can_take_num === 'P'
+                            item.can_take_num === 'Y'
                               ? contentBackground
                               : '#F3F3F3',
                         }"
@@ -114,13 +112,6 @@
                     >{{ btn_txt }}</xd-button
                   >
                 </view>
-                <view
-                  v-else
-                  class="jfb-base-con-list__body-content-list"
-                  style="padding-bottom: 60rpx"
-                >
-                  <image mode="widthFix" :src="used_up_url"></image>
-                </view>
               </view>
             </view>
 
@@ -418,14 +409,16 @@ export default {
                   backgroundRepeat: "no-repeat",
                   // 设置背景颜色
                   backgroundColor: "",
-                  // 设置外边距
-                  margin: "0",
+                  height: '70rpx',
+                  width: '450rpx',
+                  marginTop: '26rpx'
                 }
               : {
                   // 设置背景颜色
                   backgroundColor: "#FB5B3F",
-                  // 设置外边距
-                  margin: "0",
+                  height: '70rpx',
+                  width: '450rpx',
+                  marginTop: '26rpx'
                 };
             // 设置按钮文字
             btn_txt = res.can_take === "Y" ? "一键领取" : "去查看";