jufubao-base 1.0.159-beta9 → 1.0.160-beta1

package/src/components/JfbBaseConDialog/Api.js

@@ -29,7 +29,7 @@ module.exports = [
     disabled: true,
   },
   {
-    mapFnName: 'getAllCoupon', //自定义方法名字（必选）
+    mapFnName: 'getOnceCoupon', //自定义方法名字（必选）
     title: '领取优惠券',
     path: '/sms-coupon/v1/activity-prizes-user/set',
     isRule: false,
@@ -40,6 +40,18 @@ module.exports = [
     isConsole: true,
     disabled: true,
   },
+  {
+    mapFnName: 'getAllCoupon', //自定义方法名字（必选）
+    title: '领取优惠券',
+    path: '/sms-coupon/v1/activity-prizes-user/set-all',
+    isRule: false,
+    params: {
+      distribution_method: ['发放方式 entry=主动发放, homed=首页发放,paid=消费后发放,card_binded=绑定卡后发放', 'String', '选填'],
+      namespace: ['业务线', 'String', '必填'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
   {
     mapFnName: 'getCouponResult', //自定义方法名字（必选）
     title: '轮询查询活动结果',

package/src/components/JfbBaseConDialog/JfbBaseConDialog.vue

@@ -53,10 +53,13 @@
         </view>
         <view v-else class="jfb-base-con-dialog__body-dialog-content">
           <xd-cou-card-bind
+            :isAll="isAll"
+            :isRandom="isRandom"
             :list="couponList"
             :setting="couponOther"
             @closeDialog="handleCardBindClose"
             @getCoupont="handleGetCoupon"
+            @getAllCoupont="getAllCoupont"
           ></xd-cou-card-bind>
         </view>
       </view>
@@ -114,6 +117,8 @@ export default {
       //预览是否显示弹窗
       is_preview_hide_dailog: false,
 
+      isAll: false,
+      isRandom: false
     };
   },
   computed: {
@@ -153,7 +158,7 @@ export default {
     //领取优惠券
     handleGetCoupon(item){
       this.$xdShowLoading({});
-      jfbRootExec("getAllCoupon", {
+      jfbRootExec("getOnceCoupon", {
         vm: this,
         data: {
           prize_id: item.prize_id,
@@ -182,7 +187,6 @@ export default {
     },
 
     getResult() {
-      debugger
       jfbRootExec("getCouponResult", {
         vm: this,
         data: {
@@ -200,11 +204,13 @@ export default {
               time: 2000,
               isClose: false,
             });
-            this.getDialogList();
-            if (this.timer) {
-              this.timeNum = 0;
-              clearTimeout(this.timer);
-            }
+            setTimeout(()=>{
+              this.getDialogList();
+              if (this.timer) {
+                this.timeNum = 0;
+                clearTimeout(this.timer);
+              }
+            },2000)
             return;
           }
           if (res.status_type === "error") {
@@ -215,13 +221,15 @@ export default {
               time: 2000,
               isClose: false,
             });
-            if (res.code === 400) {
-              this.getDialogList();
-            }
-            if (this.timer) {
-              this.timeNum = 0;
-              clearTimeout(this.timer);
-            }
+            setTimeout(()=>{
+              if (res.code === 400) {
+                this.getDialogList();
+              }
+              if (this.timer) {
+                this.timeNum = 0;
+                clearTimeout(this.timer);
+              }
+            },2000)
             return;
           }
 
@@ -261,6 +269,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) => {
@@ -279,14 +288,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) {
-            debugger
             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();
+          }
         }
       })
     },
@@ -299,6 +321,43 @@ export default {
       }
     },
 
+    getAllCoupont(info) {
+      this.p_getAllDialogList();
+    },
+
+    p_getAllDialogList() {
+      //getAllCoupon
+      this.$xdShowLoading({});
+      jfbRootExec("getAllCoupon", {
+        vm: this,
+        data: {
+          distribution_method: this.distribution_method,
+          activity_id: this.activity_id,
+          ...this.dispatchData
+        }
+      }).then(res => {
+        if (res.code === 400) {
+          this.$xdHideLoading();
+          this.$xdAlert({
+            content: res.message,
+            zIndex: 3200,
+            time: 2000,
+            isClose: false,
+          });
+          setTimeout(()=>{
+            this.getDialogList();
+          },2000)          
+          return;
+        }
+        this.order_num = res.tmp_order_number;
+        setTimeout(()=>{
+          this.getResult();
+        },1000)
+      }).catch((err) => {
+        console.log(err, "err");
+      });
+    },
+
     handlePop() {
       console.warn(`this.time${this.time * 60 + "分钟"}`);
       storage.set(this.containerId, 1, this.time);
@@ -320,7 +379,6 @@ export default {
       ){
         this.getDialogList();
       }
-
       //支付跟绑卡是主动触发
       if(this.distribution_method === 'card_binded'){
         jfbRootFnExec(this, 'onCustomEvent')("baseConDialog@hasCon", this.containerId);
@@ -450,6 +508,7 @@ export default {
           font-size: unit(40, rpx);
         }
         &-close {
+          margin-top: 20rpx;
           margin: 0 auto;
         }
         &-left {

package/src/components/JfbBaseConDialog/XdCouCardBind.vue

@@ -3,34 +3,85 @@
     <view
       class="ticket_box"
       :style="{
-       backgroundImage: dialogBackground
+        backgroundImage: dialogBackground,
       }"
     >
-      <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 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>
-          <view class="item_sub">{{ item.prize_name }}</view>
+        </view>
+        <view style="text-align:center;padding-top:54rpx" v-else>
+          <img
+            style="width:360rpx;height:340rpx"
+            :src="bottomBackground"
+            alt=""
+          />
+        </view>
+        <xd-button
+          size="small"
+          type="primary"
+          :style="btnImage"
+          @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>
+            <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>
@@ -49,157 +100,196 @@
 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,
+    },
+    isRandom: {
+      type: Boolean,
+      default: false,
     },
-    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);
+    },
+    btnImage() {
+      let btn_style = this.setting.app_coupon_button_bg_url
+              ? {
+                  // 设置背景图片
+                  backgroundImage: `url(${getServiceUrl(
+                    this.setting.can_take !== "Y"
+                      ? this.setting.app_coupon_button_see_url
+                      : this.setting.app_coupon_button_bg_url
+                  )})`,
+                  // 设置背景大小
+                  backgroundSize: "100% 100%",
+                  // 设置背景重复
+                  backgroundRepeat: "no-repeat",
+                  // 设置背景颜色
+                  backgroundColor: "",
+                  height: '70rpx',
+                  width: '450rpx',
+                  marginTop: '26rpx'
+                }
+              : {
+                  // 设置背景颜色
+                  backgroundColor: "#FB5B3F",
+                  height: '70rpx',
+                  width: '450rpx',
+                  marginTop: '26rpx'
+                };
+      return btn_style
     }
   },
-  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);
       }
     },
-    handleClose(){
+    getAllCoupont() {
+      this.$emit("getAllCoupont");
+    },
+    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: 1000rpx;
+  padding-bottom: 80rpx;
+  position: relative;
+  .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: 60rpx;
+  }
 
-      }
-      &.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 {
+    margin: 0 auto;
+    margin-top: 20rpx;
+  }
+}
 </style>

package/src/components/JfbBaseConList/Api.js

@@ -33,7 +33,7 @@ module.exports = [
     disabled: true,
   },
   {
-    mapFnName: 'getAllCoupon', //自定义方法名字（必选）
+    mapFnName: 'getOnceCoupon', //自定义方法名字（必选）
     title: '领取优惠券',
     path: '/sms-coupon/v1/activity-prizes-user/set',
     isRule: false,
@@ -44,6 +44,18 @@ module.exports = [
     isConsole: true,
     disabled: true,
   },
+  {
+    mapFnName: 'getAllCoupon', //自定义方法名字（必选）
+    title: '领取优惠券',
+    path: '/sms-coupon/v1/activity-prizes-user/set-all',
+    isRule: false,
+    params: {
+      distribution_method: ['发放方式 entry=主动发放, homed=首页发放,paid=消费后发放,card_binded=绑定卡后发放', 'String', '选填'],
+      namespace: ['业务线', 'String', '必填'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
   {
     mapFnName: 'getCouponResult', //自定义方法名字（必选）
     title: '轮询查询活动结果',

package/src/components/JfbBaseConList/Attr.js

@@ -56,6 +56,17 @@ export default {
         placeholder: '请选择按钮文字颜色',
         classNmae: 'input60',
       },
+      {
+        label: "按钮文字大小",
+        ele: "el-input",
+        type: "number",
+        valueKey: "btnTextSize",
+        groupKey: 'content',
+        value: data.btnTextSize || '',
+        placeholder: "请输入按钮文字大小",
+        className: "input80",
+        inline: false,
+      },
       {
         label: '按钮圆角设置:',
         ele: 'xd-site-select-list',