jufubao-base 1.0.158-beta4 → 1.0.158-beta6

package/package.json

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

package/src/components/JfbBaseAfterOrderDetail/JfbBaseAfterOrderDetail.vue

@@ -63,7 +63,7 @@
                 class="jfb-base-after-order-detail__body-movie-content-info-bottom"
               >
                 <view >
-                  <xd-unit v-if="info.business_icon !== 'gift' && info.is_not_show_price !== 'Y'" :price="item.sale_price"></xd-unit>
+                  <xd-unit v-if="info.business_icon !== 'gift'" :price="item.sale_price"></xd-unit>
                 </view>
                 <view style=" font-size: 28rpx; display: flex; align-items: center; color: #666;">x {{ item.buy_count }}</view>
               </view>
@@ -80,7 +80,7 @@
               :style="{ color: mainColor }"
             >补发快递：{{ info['express_name'] }}</view> -->
             <view v-else :style="{ color: mainColor }">
-              <view v-if="info.business_code !== 'gift' && info.is_not_show_price !== 'Y'">
+              <view v-if="info.business_code !== 'gift'">
                 已退款：¥{{ info.total_refund_sale_amount }}
               </view>
             </view>

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/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: {
@@ -261,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) => {
@@ -279,14 +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) {
-            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 +317,41 @@ 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,
+          });
+          this.getDialogList();
+          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 +373,6 @@ export default {
       ){
         this.getDialogList();
       }
-
       //支付跟绑卡是主动触发
       if(this.distribution_method === 'card_binded'){
         jfbRootFnExec(this, 'onCustomEvent')("baseConDialog@hasCon", this.containerId);

package/src/components/JfbBaseConDialog/XdCouCardBind.vue

@@ -3,34 +3,90 @@
     <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 v-else>
+          <img
+            style="width: 100%"
+            mode="widthFix"
+            :src="bottomBackground"
+            alt=""
+          />
+        </view>
+        <xd-button
+          size="small"
+          type="primary"
+          :style="{
+            backgroundImage: btnImage,
+            backgroundSize: '100% 100%',
+            width: '80%'
+          }"
+          @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 +105,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,
+    },
+    isRandom: {
+      type: Boolean,
+      default: false,
     },
-    setting: {}
+    btnImage: {
+      type: String,
+      default: "",
+    },
+    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);
       }
     },
-    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;
+.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;
+  }
 
-      &.P,
-      &.Y{
+  .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 {
+    }
+    &.N {
+      background: #f3f3f3;
+      .item_head {
+        color: #bbbbbb;
       }
-      &.N{
-        background: #F3F3F3;
-        .item_head{
-          color: #BBBBBB;
-        }
-        .item_sub{
-          color: #BBBBBB;
-        }
-        .ticket_icon{
-          color: #D6D6D6;
-
-        }
-        .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;
-        }
-      }
-      .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/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/JfbBaseConList.vue

@@ -24,9 +24,9 @@
           backgroundSize: '100%',
           backgroundRepeat: 'no-repeat',
           minHeight: `${layoutInfo.bodyMinHeightRpx}rpx`,
-         }"
+        }"
       >
-        <view v-if="couponList&&couponList.length > 0" >
+        <view v-if="!message">
           <view class="jfb-base-con-list__body-content">
             <view class="jfb-base-con-list__body-content-header">
               <view class="jfb-base-con-list__body-content-header-left">
@@ -34,7 +34,10 @@
                 <view>赠送优惠券</view>
               </view>
               <view
-                :style="{ color: '#FA2125', backgroundColor: contentBackground }"
+                :style="{
+                  color: '#FA2125',
+                  backgroundColor: contentBackground,
+                }"
                 class="jfb-base-con-list__body-content-header-right"
                 @click="showRule = true"
               >
@@ -42,64 +45,162 @@
                 <xd-font-icon size="20" icon="iconxiangyou_xian"></xd-font-icon>
               </view>
             </view>
-            <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 v-if="isAll">
+              <view v-if="isRandom">
+                <view class="jfb-base-con-list__body-content-list">
+                  <view>
+                    <img
+                      style="width: 100%"
+                      mode="widthFix"
+                      :src="app_coupon_bottom_url"
+                      alt=""
+                    />
+                  </view>
+                  <xd-button
+                    size="small"
+                    type="primary"
+                    :style="btn_style"
+                    @click="can_take!=='Y'?toCoupon():getAllCoupont()"
+                    >{{ btn_txt }}</xd-button
+                  >
+                </view>
+              </view>
+              <view v-else>
                 <view
-                  class="jfb-base-con-list__body-content-list-item"
-                  :class="'status_' + item.can_take_num"
-                  :style="{
-                    backgroundColor: item.can_take_num==='Y'||item.can_take_num==='P'? contentBackground:'#F3F3F3',
-                  }"
+                  v-if="can_take === 'Y'"
+                  class="jfb-base-con-list__body-content-list"
                 >
-                  <view class="item_head">
-                    <image class="t_icon" mode="widthFix" :src="item.headIcon" ></image>
-                    <view>{{  item.prize_type }}</view>
+                  <view>
+                    <view v-for="(item, index) in couponList" :key="index">
+                      <view
+                        class="jfb-base-con-list__body-content-list-item"
+                        :class="'status_' + item.can_take_num"
+                        :style="{
+                          backgroundColor:
+                            item.can_take_num === 'Y' ||
+                            item.can_take_num === 'P'
+                              ? contentBackground
+                              : '#F3F3F3',
+                        }"
+                      >
+                        <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
+                          size="100"
+                          :style="{
+                            color: item.iconColor,
+                            position: 'absolute',
+                            right: '0rpx',
+                            top: '0rpx',
+                          }"
+                          :icon="item.icon"
+                        ></xd-font-icon>
+                      </view>
+                    </view>
                   </view>
-                  <view class="item_sub">{{ item.prize_name }}</view>
-                  <xd-font-icon
-                    size="100"
+                  <xd-button
+                    size="small"
+                    type="primary"
+                    :style="btn_style"
+                    @click="can_take!=='Y'?toCoupon():getAllCoupont()"
+                    >{{ 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>
+
+            <view v-else>
+              <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"
+                    :class="'status_' + item.can_take_num"
                     :style="{
-                      color: item.iconColor,
-                      position: 'absolute',
-                      right: '0rpx',
-                      top: '0rpx',
+                      backgroundColor:
+                        item.can_take_num === 'Y' || item.can_take_num === 'P'
+                          ? contentBackground
+                          : '#F3F3F3',
                     }"
-                    :icon="item.icon"
-                  ></xd-font-icon>
-                  <view class="btn_wrap">
-                    <xd-button
-                      size="small"
-                      :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"
-                    >{{ item.btn_txt }}</xd-button>
+                  >
+                    <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
+                      size="100"
+                      :style="{
+                        color: item.iconColor,
+                        position: 'absolute',
+                        right: '0rpx',
+                        top: '0rpx',
+                      }"
+                      :icon="item.icon"
+                    ></xd-font-icon>
+                    <view class="btn_wrap">
+                      <xd-button
+                        size="small"
+                        :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"
+                        >{{ item.btn_txt }}</xd-button
+                      >
+                    </view>
                   </view>
                 </view>
               </view>
-            </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
+                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>
-          <view class="jfb-base-con-list__body-content-foot" @click="toCoupon" >
+          <view class="jfb-base-con-list__body-content-foot" @click="toCoupon">
             <view
               :style="{
-              padding:outPadding,
-              border:border,
-              borderRadius:radius + 'rpx',
-              color: btnTextColor,
-              backgroundColor: btnBgColor,
-              boxShadow:shadow
-            }">查看已领票券</view>
+                padding: outPadding,
+                border: border,
+                borderRadius: radius + 'rpx',
+                color: btnTextColor,
+                backgroundColor: btnBgColor,
+                boxShadow: shadow,
+              }"
+              >查看已领票券</view
+            >
           </view>
         </view>
-        <view
-          v-else
-          class="empty_data"
-        >
+        <view v-else class="empty_data">
           <image :src="emptyBg"></image>
           {{ message }}
         </view>
@@ -109,7 +210,10 @@
           title="活动规则说明"
           :show.sync="showRule"
         >
-          <xd-content-xss style="text-align:left" :html="notice"></xd-content-xss>
+          <xd-content-xss
+            style="text-align: left"
+            :html="notice"
+          ></xd-content-xss>
         </xd-dailog>
       </view>
     </view>
@@ -167,18 +271,23 @@ export default {
       collectedPath: "",
 
       //按钮设置
-      btnBgColor:'',
-      btnTextColor:'',
-      padding:{},
+      btnBgColor: "",
+      btnTextColor: "",
+      padding: {},
       radius: 0,
       //边框
-      is_border:'N',
-      is_border_c:'',
-      is_border_w:'',
+      is_border: "N",
+      is_border_c: "",
+      is_border_w: "",
       //投影
-      is_shadow: 'Y',
+      is_shadow: "Y",
       is_shadow_bg: 0,
       is_shadow_w: 0,
+
+      isAll: false,
+      isRandom: false,
+      btn_txt: "",
+      btn_style: {},
     };
   },
   computed: {
@@ -191,15 +300,17 @@ export default {
       str = `${str} ${this.checkValue(this.padding.right, 0)}rpx`;
       str = `${str} ${this.checkValue(this.padding.bottom, 0)}rpx`;
       str = `${str} ${this.checkValue(this.padding.left, 0)}rpx`;
-      return str
+      return str;
     },
     border() {
-      if (this.is_border === 'Y') return `${this.is_border_w}rpx solid ${this.is_border_c}`;
-      else return '0';
+      if (this.is_border === "Y")
+        return `${this.is_border_w}rpx solid ${this.is_border_c}`;
+      else return "0";
     },
-    shadow(){
-      if(this.is_shadow === 'Y') return  `0 0 ${this.is_shadow_w}rpx ${this.is_shadow_bg}`;
-      else return '0 0 0 rgba(0,0,0,0)';
+    shadow() {
+      if (this.is_shadow === "Y")
+        return `0 0 ${this.is_shadow_w}rpx ${this.is_shadow_bg}`;
+      else return "0 0 0 rgba(0,0,0,0)";
     },
   },
   watch: {
@@ -217,22 +328,50 @@ export default {
   },
   methods: {
     init(value) {
-      this.contentBackground = '#FFF8F8';
-      this.iconColor = '#FF4D4A';
-      this.collectedPath = getContainerPropsValue(value, "content.collectedPath", {value: ''}).value;
+      this.contentBackground = "#FFF8F8";
+      this.iconColor = "#FF4D4A";
+      this.collectedPath = getContainerPropsValue(
+        value,
+        "content.collectedPath",
+        { value: "" }
+      ).value;
 
       this.padding = getContainerPropsValue(value, "content.padding", {});
-      this.btnBgColor = getContainerPropsValue(value, "content.btnBgColor", 'rgba(0,0,0,0)');
-      this.btnTextColor = getContainerPropsValue(value, "content.btnTextColor", '#666');
-      this.radius = getContainerPropsValue(value, "content.radius", '0');
+      this.btnBgColor = getContainerPropsValue(
+        value,
+        "content.btnBgColor",
+        "rgba(0,0,0,0)"
+      );
+      this.btnTextColor = getContainerPropsValue(
+        value,
+        "content.btnTextColor",
+        "#666"
+      );
+      this.radius = getContainerPropsValue(value, "content.radius", "0");
 
-      this.is_border = getContainerPropsValue(value, "content.is_border", 'N');
-      this.is_border_c = getContainerPropsValue(value, "content.is_border_c", '#e5e5e5');
-      this.is_border_w = getContainerPropsValue(value, "content.is_border_w", 1);
+      this.is_border = getContainerPropsValue(value, "content.is_border", "N");
+      this.is_border_c = getContainerPropsValue(
+        value,
+        "content.is_border_c",
+        "#e5e5e5"
+      );
+      this.is_border_w = getContainerPropsValue(
+        value,
+        "content.is_border_w",
+        1
+      );
 
-      this.is_shadow = getContainerPropsValue(value, 'content.is_shadow', 'N');
-      this.is_shadow_bg = getContainerPropsValue(value, 'content.is_shadow_bg', '#fff');
-      this.is_shadow_w = getContainerPropsValue(value, 'content.is_shadow_w', '10');
+      this.is_shadow = getContainerPropsValue(value, "content.is_shadow", "N");
+      this.is_shadow_bg = getContainerPropsValue(
+        value,
+        "content.is_shadow_bg",
+        "#fff"
+      );
+      this.is_shadow_w = getContainerPropsValue(
+        value,
+        "content.is_shadow_w",
+        "10"
+      );
     },
 
     getList() {
@@ -248,30 +387,77 @@ export default {
         .then((res) => {
           this.background = getServiceUrl(res.background);
           this.used_up_url = res.used_up_url && getServiceUrl(res.used_up_url);
+          this.app_activity_button =
+            res.app_activity_button && getServiceUrl(res.app_activity_button);
+          this.app_activity_url =
+            res.app_activity_url && getServiceUrl(res.app_activity_url);
+          this.app_coupon_bottom_url =
+            res.app_coupon_bottom_url &&
+            getServiceUrl(res.app_coupon_bottom_url);
           this.can_take = res.can_take;
           this.has_times = res.has_times;
           this.next_url = res.next_url;
+          this.isAll = res.receive_method === "batch";
+          this.isRandom = res.distribution_type === "random";
+          // 判断是否是一键领取
+          if (this.isAll) {
+            // 定义按钮文字
+            let btn_txt = "";
+            // 设置按钮样式
+            this.btn_style = res.app_coupon_button_bg_url
+              ? {
+                  // 设置背景图片
+                  backgroundImage: `url(${getServiceUrl(
+                    res.can_take !== "Y"
+                      ? res.app_coupon_button_see_url
+                      : res.app_coupon_button_bg_url
+                  )})`,
+                  // 设置背景大小
+                  backgroundSize: "100% 100%",
+                  // 设置背景重复
+                  backgroundRepeat: "no-repeat",
+                  // 设置背景颜色
+                  backgroundColor: "",
+                  // 设置外边距
+                  margin: "0",
+                }
+              : {
+                  // 设置背景颜色
+                  backgroundColor: "#FB5B3F",
+                  // 设置外边距
+                  margin: "0",
+                };
+            // 设置按钮文字
+            btn_txt = res.can_take === "Y" ? "一键领取" : "去查看";
+            // 判断是否是随机领取
+            if (this.isRandom) {
+              // 设置按钮文字
+              btn_txt = res.can_take === "Y" ? "开心领取" : "去查看";
+            }
+            // 设置按钮文字
+            this.btn_txt = btn_txt;
+          }
 
-          this.couponList =
-            res.list &&
-            res.list.length > 0 &&
-            res.list.map((item) => {
-              let mapArr = {"Y": "去查看", "P": "领取", "N": "已发完"}
+          if (res.list && res.list.length) {
+            this.couponList = 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(
-                        item.can_take_num === "Y" ? res.app_coupon_button_see_url : 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% 100%",
                       backgroundRepeat: "no-repeat",
-                      backgroundColor: '',
+                      backgroundColor: "",
                       margin: "0",
                     }
                   : {
-                      backgroundColor: '#FB5B3F',
+                      backgroundColor: "#FB5B3F",
                       margin: "0",
                     };
                 //整块背景
@@ -282,34 +468,39 @@ export default {
                   backgroundRepeat: "no-repeat",
                 };
                 //icon
-                item.icon=item.can_take_num === "Y"?'iconyilingqu':'icondailingqu'
+                item.icon =
+                  item.can_take_num === "Y" ? "iconyilingqu" : "icondailingqu";
                 //icon颜色
-                item.iconColor = item.can_take_num === "Y"?'#D6D6D6':this.iconColor
+                item.iconColor =
+                  item.can_take_num === "Y" ? "#D6D6D6" : this.iconColor;
                 //券名称颜色
-                item.nameColor = '#FB5B3F'
+                item.nameColor = "#FB5B3F";
                 //其他文字颜色
-                item.infoColor = '#fff'
+                item.infoColor = "#fff";
               } else {
                 //按钮样式
                 item.btn = { background: "#D6D6D6", margin: "0" };
                 //整块背景
-                item.headIcon = getServiceUrl(res.app_coupon_invalid_url)
+                item.headIcon = getServiceUrl(res.app_coupon_invalid_url);
                 item.couponBackground = {
-                  backgroundImage: `url(${getServiceUrl(res.app_coupon_invalid_url)})`,
+                  backgroundImage: `url(${getServiceUrl(
+                    res.app_coupon_invalid_url
+                  )})`,
                   backgroundSize: "100%",
                   backgroundRepeat: "no-repeat",
                 };
                 //icon
-                item.icon='iconyifawan'
+                item.icon = "iconyifawan";
                 //icon颜色
-                item.iconColor = '#D6D6D6'
+                item.iconColor = "#D6D6D6";
                 //券名称颜色
-                item.nameColor = '#BBBBBB'
+                item.nameColor = "#BBBBBB";
                 //其他文字颜色
-                item.infoColor = '#BBBBBB'
+                item.infoColor = "#BBBBBB";
               }
               return item;
             });
+          }
           console.log("couponList", this.couponList);
           this.message = res.message;
           this.notice = res.about;
@@ -320,19 +511,19 @@ export default {
         });
     },
 
-    toCoupon(){
+    toCoupon() {
       this.$xdUniHelper.navigateTo({
         url: this.next_url || this.collectedPath,
       });
     },
 
     getCoupont(item) {
-      if(item.can_take_num === "Y") {
+      if (item.can_take_num === "Y") {
         this.toCoupon();
         return;
       }
       this.$xdShowLoading({});
-      jfbRootExec("getAllCoupon", {
+      jfbRootExec("getOnceCoupon", {
         vm: this,
         data: {
           ...this.options,
@@ -355,9 +546,42 @@ export default {
             return;
           }
           this.order_num = res.tmp_order_number;
-          setTimeout(()=>{
+          setTimeout(() => {
+            this.getResult();
+          }, 1000);
+        })
+        .catch((err) => {
+          console.log(err, "err");
+        });
+    },
+
+    getAllCoupont() {
+      this.$xdShowLoading({});
+      jfbRootExec("getAllCoupon", {
+        vm: this,
+        data: {
+          ...this.options,
+          distribution_method: this.method,
+          namespace: this.pageBusinessCode,
+          activity_id: this.activity_id,
+        },
+      })
+        .then((res) => {
+          if (res.code == 400) {
+            this.$xdHideLoading();
+            this.$xdAlert({
+              content: res.message,
+              zIndex: 3200,
+              time: 2000,
+              isClose: false,
+            });
+            this.getList();
+            return;
+          }
+          this.order_num = res.tmp_order_number;
+          setTimeout(() => {
             this.getResult();
-          },1000)
+          }, 1000);
         })
         .catch((err) => {
           console.log(err, "err");
@@ -383,6 +607,7 @@ export default {
               isClose: false,
             });
             this.getList();
+            this.btn_txt = "去查看";
             if (this.timeer) {
               this.time = 0;
               clearTimeout(this.timeer);
@@ -415,6 +640,7 @@ export default {
                 `pay_${res.status_type}`
               );
             }
+            this.btn_txt = `领取中 ${res.success_num}/${res.total_num}`;
             this.time++;
           }, Math.pow(this.date, this.time > this.maxTime ? this.maxTime : this.time) * 1000);
         })
@@ -470,7 +696,7 @@ export default {
       overflow-y: auto;
       padding-top: 220rpx;
       box-sizing: border-box;
-      background-color: #FAFAFA;
+      background-color: #fafafa;
     }
 
     .empty_data {
@@ -531,40 +757,39 @@ export default {
           margin: unit(20, rpx) auto 0 auto;
           position: relative;
 
-          &.status_N{
-            .item_head{
-              color: #BBBBBB;
+          &.status_N {
+            .item_head {
+              color: #bbbbbb;
             }
-            .item_sub{
-              color: #BBBBBB;
+            .item_sub {
+              color: #bbbbbb;
             }
           }
-          .btn_wrap{
+          .btn_wrap {
             position: absolute;
             right: 30rpx;
             bottom: 40rpx;
           }
 
-          .item_head{
+          .item_head {
             display: flex;
             align-items: center;
             font-size: 40rpx;
             color: #000000;
             font-weight: 500;
 
-            .t_icon{
+            .t_icon {
               width: 44rpx;
               margin-right: 20rpx;
               max-height: 80rpx;
             }
           }
-          .item_sub{
+          .item_sub {
             margin-top: 26rpx;
-            color: #FF4D4A;
+            color: #ff4d4a;
             font-size: 36rpx;
             font-weight: 400;
           }
-
         }
       }
       &-foot {

package/src/components/JfbBaseConList/Mock.js

@@ -20,7 +20,7 @@ module.exports = {
     "rule":"<p>打发&middot;</p>",
     "request_id":"a2603f2a480485f4"
   },
-  getAllCoupon: {
+  getOnceCoupon: {
     "request_id": "5987aa28c709d4ef"
   }
 }

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -579,7 +579,7 @@
           </view>
         </view>
         <view
-          v-if="info.pay_info && (biz_code !== 'gift' || info.is_show_gift_price) && is_not_show_price !== 'Y'"
+          v-if="info.pay_info && (biz_code !== 'gift' || info.is_show_gift_price)"
           class="jfb-base-order-detail__body-card"
           :style="{
             background: backgroundColor,
@@ -824,7 +824,6 @@ export default {
       viewStatus: "", //业务类型预览
       isPreview: false, //是否预览
       biz_code: "",
-      is_not_show_price: "",
 
       showPassword: false,
       dialogPassword: "",
@@ -940,7 +939,6 @@ export default {
       })
         .then((res) => {
           this.biz_code = res.biz_code;
-          this.is_not_show_price = res.is_not_show_price;
           if (this.isPreview) {
             switch (this.viewStatus) {
               case "mall":

package/src/components/JfbBaseOrderList/JfbBaseOrderList.vue

@@ -149,7 +149,7 @@
             </view>
             <view class="jfb-base-order-list__body-order-item-bottom">
               <view>下单时间:{{ item.created_time_text }}</view>
-              <view v-if="item.biz_code !== 'gift' && item.is_not_show_price !== 'Y'">
+              <view v-if="item.biz_code !== 'gift'">
                 <text>合计:</text>
                 <xd-unit
                   :isOld="false"