jufubao-base 1.0.159-beta8 → 1.0.159

package/src/components/JfbBaseCardShiftEntry/JfbBaseCardShiftEntry.vue

@@ -24,7 +24,7 @@
       <view
         class="card-list"
         :style="{
-            background: headerBg['color'],
+           background: headerBg['color'],
             backgroundSize: '100%'
           }">
         <view class="card-list-warp" :style="{backgroundImage: `url(${headerBg['image']})`}">
@@ -74,17 +74,21 @@
           <view>转换后预估票券额度</view>
         </view>
         <view
-          :class=" item.key === 'other_card_point'? 'jfb-base-card-shift-entry__body-content-special': 'jfb-base-card-shift-entry__body-content-item'"
+          :class="
+            item.key === 'other_card_point'
+              ? 'jfb-base-card-shift-entry__body-content-special'
+              : 'jfb-base-card-shift-entry__body-content-item'
+          "
           v-for="(item, index) in changeValueKey"
           :key="index"
         >
           <view> {{ item.label }}： </view>
           <view :style="{color:mainColor,fontWeight:500}" v-if="item.type === 'price'">
-            <text>{{ info[item.key] }}</text>
+            {{ info[item.key] }}
             <text>点</text>
           </view>
           <view style="color: #333; font-weight: 500" v-else>
-            <text>{{ info[item.key] }}</text>
+            {{ info[item.key] }}
             <text v-if="item.type === 'type'">券</text>
           </view>
         </view>
@@ -105,8 +109,9 @@
         <xd-button
           @click="handleChange"
           width="500rpx"
-          type="primary"
-        >立即转换</xd-button>
+          type="primary">
+          转换
+        </xd-button>
       </view>
       <xd-dailog
         class="dialog"
@@ -127,13 +132,12 @@
             <text :style="{color:mainColor,marginLeft:'20rpx'}">转换成功</text>
           </view>
           <view class="jfb-base-card-shift-entry__body-success-content">
-            <text>已成功将</text>
-            <text style="color:#333;padding: 0 16rpx">{{ card_number }}</text>
-            <text>转换成为</text>
-            <text style="color:#333;padding: 0 16rpx">{{ changeNumber }}</text>
-            <text>可在券包中查看</text>
+            已成功将  <text style="color:#333;padding: 0 16rpx">{{ card_number }}</text>  转换成为
+            <text style="color:#333;padding: 0 16rpx">{{ changeNumber }}</text>可在券包中查看
           </view>
-          <xd-button type="primarys" width="360rpx" @click="handleToLink">返回列表</xd-button>
+          <xd-button type="primarys" width="360rpx" @click="handleToLink"
+          >返回列表</xd-button
+          >
         </view>
       </xd-dailog>
     </view>
@@ -192,8 +196,7 @@ export default {
       //页面跳转地址
       backUrl: "",
       bottomHeight: 120,
-      changeBg: '',
-      headerBg:'',
+      changeBg: ''
     };
   },
   computed: {
@@ -216,7 +219,7 @@ export default {
       this.$xdConfirm({
         title: "是否确认转换",
         isHtml: true,
-        styles: this.styles,
+        $vm: this,
         content:content,
         success:(action)=>{
           if(action.confirm) {
@@ -588,7 +591,7 @@ export default {
     .fixe_bottom{
       display: flex;
       align-items: center;
-      justify-content: center;
+      justify-content: space-between;
       height: unit(100, rpx);
       padding: 0 unit(40, rpx);
       background: #FFF;

package/src/components/JfbBaseCardSweepInfo/JfbBaseCardSweepInfo.vue

@@ -114,9 +114,8 @@ export default {
     };
   },
   watch: {
-    container(value,oldValue) {
-      if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
-      if (this.$configProject['isPreview']) this.init(value)
+    container(value) {
+      this.init(value);
     },
   },
   computed: {

package/src/components/JfbBaseCardV2/JfbBaseCardV2.vue

@@ -82,13 +82,22 @@
               </view>
               <view class="jfb-base-card__body-card-item-right-bottom">
                 <view class="jfb-base-card__body-card-item-right-bottom-info">
-                  <view class="jfb-base-card__body-card-item-right-bottom-info-residue">剩余{{ item.unit }}数：{{ item.card_point }}{{ item.unit }}</view>
-                  <view class="jfb-base-card__body-card-item-right-bottom-info-deduction">购买其他物品可抵：{{ item.other_card_point }}</view>
+                  <view
+                    class="jfb-base-card__body-card-item-right-bottom-info-residue"
+                  >
+                    剩余{{ item.unit }}数：{{ item.card_point }}{{ item.unit }}
+                  </view>
+                  <view
+                    class="jfb-base-card__body-card-item-right-bottom-info-deduction"
+                  >
+                    购买其他物品可抵：{{ item.other_card_point }}
+                  </view>
                 </view>
                 <view
                   @click.stop="toDetail(item)"
                   :style="{ background: mainColor }"
-                >查看</view>
+                  >查看</view
+                >
               </view>
             </view>
           </view>
@@ -97,14 +106,8 @@
       <view :style="{height:'128rpx'}"></view>
       <view class="bottom_fix" :style="button_bottom">
         <view>
-          <!-- #ifdef MP-WEIXIN-->
-          <view><xd-button type="primary" @click="toBindCard">绑定新卡</xd-button></view>
-          <view><xd-button type="primary" @click="toOrderList">我的订单</xd-button></view>
-          <!-- #endif-->
-          <!-- #ifdef H5-->
           <xd-button type="primary" @click="toBindCard">绑定新卡</xd-button>
           <xd-button type="primary" @click="toOrderList">我的订单</xd-button>
-          <!-- #endif-->
         </view>
       </view>
     </view>
@@ -120,7 +123,6 @@
   import componentsMixins from "@/mixins/componentsMixins";
   import extsMixins from "@/mixins/extsMixins";
   import {Base64} from "js-base64";
-  import {mapState} from "vuex";
 
   export default {
     name: "JfbBaseCardV2",
@@ -135,7 +137,6 @@
       return {
         cardList: [],
         inCallback: "",
-
         //面板
         cardInfoPath: "", //卡券详情
         cardBindPath: "",
@@ -153,14 +154,11 @@
       }
     },
     watch: {
-      container(value,oldValue) {
-        if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
-        if (this.$configProject['isPreview']) this.init(value)
-      },
+      container(value) {
+        this.init(value)
+      }
     },
     computed: {
-      ...mapState(['jfbAuthorize']),
-
       button_bottom() {
         return this.fixedStyle({paddingBottom: 0, zIndex: 111})
       },
@@ -206,7 +204,6 @@
           }).filter((item) => item["is_valid"] === "Y");
         })
       },
-
       /**
        * @description 监听事件变化
        * @param container {object} 业务组件对象自己
@@ -218,7 +215,6 @@
         this.login_name = getContainerPropsValue(container, "content.login_name", "登录");
         this.margin = getContainerPropsValue(container, 'content.margin', {top: 0, left: 0, bottom: 0, right: 0});
       },
-
       handleBindLogin(item){
         this.$xdShowLoading({});
         jfbRootExec("loginCardBind", {
@@ -226,8 +222,8 @@
           data: { card_number: item["card_number"] },
         })
           .then((res) => {
+            console.log(res);
             this.$xdHideLoading();
-
             //#ifdef MP-WEIXIN
             if (this.jfbAuthorize !== null) {
               this.jfbAuthorize.setCardToken(res);
@@ -236,16 +232,13 @@
 
             if (this.$configProject.isPreview) {
               console.log("handleBindLogin", "预览模式不跳转", this.inCallback);
-            }
-            else {
-              console.warn(`handleBindLogin: ${this.inCallback}`);
+            } else {
               this.$xdUniHelper.redirectTo({
                 url: this.inCallback,
               });
             }
           })
           .catch((res) => {
-            console.error(res);
             this.$xdHideLoading();
           });
       },
@@ -291,22 +284,13 @@
         box-shadow: 0px 0px 8rpx 0px rgba(179, 193, 196, 0.5);
         z-index: 111;
 
-        & > view {
+        &>view {
           width: 100%;
           display: flex;
           justify-content: center;
           align-items: center;
           padding: unit(24, rpx);
           box-sizing: border-box;
-
-          /* #ifdef MP-WEIXIN */
-          & > view {
-            flex: 1;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-          }
-          /* #endif */
         }
       }
     }

package/src/components/JfbBaseCardV3/JfbBaseCardV3.vue

@@ -51,8 +51,6 @@
   import componentsMixins from "@/mixins/componentsMixins";
   import extsMixins from "@/mixins/extsMixins";
   import {Base64} from "js-base64";
-  import {mapState} from "vuex";
-
   export default {
     name: "JfbBaseCardV3",
     components: {
@@ -79,13 +77,11 @@
       }
     },
     watch: {
-      container(value,oldValue) {
-        if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
-        if (this.$configProject['isPreview']) this.init(value)
-      },
+      container(value) {
+        this.init(value)
+      }
     },
     computed: {
-      ...mapState(['jfbAuthorize']),
       button_bottom() {
         return this.fixedStyle({paddingBottom: 24, zIndex: 111})
       },
@@ -144,7 +140,12 @@
         })
       },
       toDetail(item) {
-        this.$xdUniHelper.navigateTo({url: `${this.detailUrl}?card_number=${item["card_number"]}`,}, false);
+        this.$xdUniHelper.navigateTo(
+          {
+            url: `${this.detailUrl}?card_number=${item["card_number"]}`,
+          },
+          false
+        );
       },
       /**
        * @description 已绑定卡登录
@@ -174,11 +175,10 @@
               this.$xdHideLoading();
               //#ifdef MP-WEIXIN
               if (this.jfbAuthorize !== null) {
-                this.jfbAuthorize.setCardToken(res, null);
+                this.jfbAuthorize.setCardToken(res);
               }
               //#endif
-              console.log(this.inCallback);
-              debugger
+
               if (this.$configProject.isPreview) {
                 console.log("handleBindLogin", "预览模式不跳转", this.inCallback);
               } else {
@@ -190,9 +190,9 @@
             .catch((res) => {
               this.$xdHideLoading();
             });
-        }
-        else {
-          this.$xdUniHelper.navigateTo({
+        } else {
+          this.$xdUniHelper.navigateTo(
+            {
               url: `${this.changeUrl}?card_number=${item["card_number"]}`,
             },
             false

package/src/components/JfbBaseCity/JfbBaseCity.vue

@@ -44,9 +44,8 @@ export default {
     }
   },
   watch: {
-    container(value,oldValue) {
-      if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
-      if (this.$configProject['isPreview']) this.init(value)
+    container(value) {
+      this.init(value)
     }
   },
   created() {

package/src/components/JfbBaseClear/JfbBaseClear.vue

@@ -54,9 +54,8 @@
       ...mapState(['jfbAuthorize']),
     },
     watch: {
-      container(value,oldValue) {
-        if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
-        if (this.$configProject['isPreview']) this.init(value)
+      container(value) {
+        this.init(value)
       }
     },
     created() {

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 {