jufubao-base 1.0.128 → 1.0.130-beta2

package/src/components/JfbBaseConDialog/Attr.js

@@ -6,26 +6,47 @@
 export default {
   style: [],
   content:(data) => {
+    let distribution_method = data.distribution_method;
+    if(!data.distribution_method) distribution_method = 'homed';
+    //let isHide = typeof data['isHide'] === 'boolean' ? data['isHide']:false;
+
     return [
+      // {
+      //   label: '是否隐藏弹框(仅预览模式生效):',
+      //   ele: 'xd-radio',
+      //   valueKey: 'isHide',
+      //   groupKey:'content',
+      //   value: isHide,
+      //   placeholder: '请选择是否隐藏弹框',
+      //   multiple: false,
+      //   className: 'input60',
+      //   list: [
+      //     { label: '是', value: true },
+      //     { label: '否', value: false },
+      //   ]
+      // },
       {
-        label: '选取优惠券列表路径:', //label
-        ele: 'xd-select-pages-path', //package 名称
-        valueKey: 'list_url', //form[valueKey]
+        label: '选取优惠券列表路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'list_url',
+        groupKey:'advanced',
         placeholder: '请选择优惠券列表路径',
-        value: data['list_url'] ||null,
+        value: data['list_url'] || null,
         setting: {
           router: XdBus.getParentApi('getPagesTree'),
         },
         inline: false,
       },
+
       {
         label: '活动提示方式:',
         ele: 'xd-radio',
         valueKey: 'type',
+        groupKey:'content',
         value: data['type']||1,
         placeholder: '请选择活动提示方式',
         multiple: false,
-        className: 'input80',
+        className: 'input60',
         list: [
           { label: '弹框', value: 1 },
           { label: '切换', value: 2 },
@@ -35,7 +56,8 @@ export default {
         label: "触发事件:",
         ele: "xd-select-list",
         valueKey: "distribution_method",
-        value: data.distribution_method || "",
+        groupKey:'content',
+        value: distribution_method,
         placeholder: "请选择触发事件",
         className: 'input80',
         list: [
@@ -49,24 +71,12 @@ export default {
         ele: 'el-input',
         type: 'text',
         valueKey: 'time',
+        groupKey:'content',
         value: data.time || '',
         placeholder: '请输入弹窗间隔，默认值：3小时',
-        className: 'input80',
+        className: 'input60',
         unit: '小时'
       },
-      {
-        label: '是否隐藏弹框(仅预览模式生效):',
-        ele: 'xd-radio',
-        valueKey: 'isHide',
-        value: data['isHide']||false,
-        placeholder: '请选择是否隐藏弹框',
-        multiple: false,
-        className: 'input80',
-        list: [
-          { label: '是', value: true },
-          { label: '否', value: false },
-        ]
-      },
     ].filter(i=>i)
   },
   advanced: [],

package/src/components/JfbBaseConDialog/JfbBaseConDialog.vue

@@ -18,7 +18,7 @@
     <!-- #endif -->
     <view class="jfb-base-con-dialog__body">
       <view v-if="isShow" class="jfb-base-con-dialog__body-dialog">
-        <view class="jfb-base-con-dialog__body-dialog-mask"></view>
+        <view class="jfb-base-con-dialog__body-dialog-mask" @click.stop="handleMaskHide"></view>
         <view v-if="distribution_method !== 'card_binded'" class="jfb-base-con-dialog__body-dialog-content">
           <view v-if="list.length>1" class="jfb-base-con-dialog__body-dialog-content-num">
             <text>{{ currentIndex + 1 }}/{{ list.length }}</text>
@@ -60,13 +60,11 @@
           ></xd-cou-card-bind>
         </view>
       </view>
-      
       <view
         :style="{ background: backgroundColor, color: warningColor }"
         class="jfb-base-con-dialog__body-pop"
         v-if="isPreview"
-        >弹框方便编辑(占位)，在线上此模块不显</view
-      >
+      >弹框方便编辑(占位)，在线上此模块不显</view>
     </view>
   </view>
 </template>
@@ -119,9 +117,9 @@ export default {
     ...mapState(["pageBusinessCode"]),
   },
   watch: {
-    container(value) {
-      console.log(value, "aakakakkaka");
-      this.init(value);
+    container(value,oloValue) {
+      if(JSON.stringify(value) === JSON.stringify(oloValue)) return;
+      if (this.$configProject['isPreview']) this.init(value)
     },
   },
   created() {
@@ -130,18 +128,21 @@ export default {
     this.init(this.container);
   },
   methods: {
+    handleMaskHide(){
+      if(this.isPreview ) this.isShow = false;
+    },
+
     init(value) {
-      this.list_url = getContainerPropsValue(value, "content.list_url", {
-        value: "",
-      }).value;
+      this.list_url = getContainerPropsValue(value, "content.list_url", {value: "",}).value;
       this.distribution_method = getContainerPropsValue(value, "content.distribution_method", "homed");
       this.type = getContainerPropsValue(value, "content.type", 1);
-      this.isHide = getContainerPropsValue(value, "content.isHide", false);
+      this.isHide = false;
       this.time = Number(getContainerPropsValue(value, "content.time", 3));
       if (this.isPreview) {
         this.isShow = !this.isHide;
       }
     },
+
     //领取优惠券
     handleGetCoupon(item){
       this.$xdShowLoading({});
@@ -153,7 +154,7 @@ export default {
           ...this.dispatchData
         }
       }).then(res => {
-        if (res.code == 400) {
+        if (res.code === 400) {
           this.$xdHideLoading();
           this.$xdAlert({
             content: res.message,
@@ -172,6 +173,7 @@ export default {
         console.log(err, "err");
       });
     },
+
     getResult() {
       jfbRootExec("getCouponResult", {
         vm: this,
@@ -205,7 +207,7 @@ export default {
               time: 2000,
               isClose: false,
             });
-            if (res.code == 400) {
+            if (res.code === 400) {
               this.getDialogList();
             }
             if (this.timer) {
@@ -231,6 +233,7 @@ export default {
           console.log(err, "err");
         });
     },
+
     p_getDialogList(){
       jfbRootExec("getCouponDialogList", {
         vm: this,
@@ -241,7 +244,6 @@ export default {
         },
       })
         .then((res) => {
-          console.log(res, "resresres");
           this.list = res.list;
           if(res.list.length === 0) return;
           this.currentImage = getServiceUrl(
@@ -257,8 +259,9 @@ export default {
           console.log(err, "err");
         });
     },
+
     p_getCouponList(){
-      jfbRootExec("getCouponList", {
+      jfbRootExec("getDialogCouponList", {
         vm: this,
         data: {
           distribution_method: this.distribution_method,
@@ -275,6 +278,7 @@ export default {
         }
       })
     },
+
     getDialogList() {
       if(this.distribution_method === 'card_binded'){
         this.p_getCouponList();
@@ -282,21 +286,30 @@ export default {
         this.p_getDialogList();
       }
     },
+
     handlePop() {
-      console.log("this.time", this.time * 60 + "分钟");
+      console.warn(`this.time${this.time * 60 + "分钟"}`);
       storage.set(this.containerId, 1, this.time);
       this.isShow = true;
     },
+
     onJfbLoad(options) {
-      console.log(11111);
-      //支付跟绑卡是主动触发
-      try {
-        if (!storage.get(this.containerId) &&
-          this.distribution_method !== "paid" && 
-          this.distribution_method !== "card_binded") this.getDialogList();
-      } catch (error) {
-        console.log(error, "errorerror");
+
+      //预览模式
+      if(this.isPreview) {
+        this.getDialogList();
+        return;
+      }
+
+      //非绑卡组件与支付组件（直接触发）
+      if (!storage.get(this.containerId) &&
+        this.distribution_method !== "paid" &&
+        this.distribution_method !== "card_binded"
+      ){
+        this.getDialogList();
       }
+
+      //支付跟绑卡是主动触发
       if(this.distribution_method === 'card_binded'){
         jfbRootFnExec(this, 'onCustomEvent')("baseConDialog@hasCon", this.containerId);
       }
@@ -305,15 +318,17 @@ export default {
       this.isShow = false;
       this.$bus.$emit("onCloseConDialog", this.containerId);
     },
-    
+
     onJfbUpdate(data) {
       storage.remove(this.containerId);
       this.getDialogList();
     },
+
     onJfbShow(options) {
       this.isShow=false
       this.onJfbLoad(options);
     },
+
     handleToList() {
       let otherParams = "";
       try {
@@ -331,7 +346,9 @@ export default {
         url: `${linkUrl}?activity_id=${this.activity_id}&distribution_method=${this.distribution_method}&${otherParams}`,
       });
     },
+
     handleClose() {
+      debugger
       //切换下一张，没有下一张，关闭
       if (this.currentIndex == this.list.length - 1 || this.type == 2) {
         this.isShow = false;
@@ -346,6 +363,7 @@ export default {
       );
       this.activity_id = this.list[this.currentIndex].activity_id;
     },
+
     handleChange(type) {
       this.currentIndex =
         type === "left" ? this.currentIndex - 1 : this.currentIndex + 1;
@@ -362,6 +380,7 @@ export default {
       );
       this.activity_id = this.list[this.currentIndex].activity_id;
     },
+
     onJfbCustomEvent({action, data}){
       if(action === '@showBaseConDialog'){
         this.dispatchData = data;
@@ -400,7 +419,7 @@ export default {
         bottom: 0;
         left: 0;
         right: 0;
-        background: rgba(0, 0, 0, 0.5);
+        background: rgba(0, 0, 0, 0.3);
       }
 
       &-content {

package/src/components/JfbBaseConDialog/JfbBaseConDialogLess.less

@@ -13,9 +13,8 @@
 
 //start
 .jfb-base-con-dialog {
-  border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(50, rpx);
+  min-height: unit(100, rpx);
 
   &__body{
       position: relative;
@@ -23,21 +22,21 @@
       z-index: 2
   }
 
-  &.editx {
+  &.editx,&:hover {
     position: relative;
-    border: 1px dashed blue;
-    box-sizing: border-box;
-    z-index: 3
-
-  }
-
-  &:hover {
-    border: 1px dashed blue;
-  }
+    z-index: 3;
+    &::after {
+      border: 2rpx dashed blue;
+      content: " ";
+      position: absolute;
+      top:0;
+      left:0;
+      bottom:0;
+      right:0;
+      z-index: 4;
+      cursor: pointer;
+    }
 
-  &.noBorder {
-    border-color: rgba(0,0,0,0);
-    border-width: 0;
   }
 
 
@@ -72,9 +71,9 @@
 
 /**notPreview**/
 .jfb-base-con-dialog {
-  &:before {
-    content: " ";
-    display: table;
-  }
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
 }
 /**endNotPreview**/

package/src/components/JfbBaseConDialog/Mock.js

@@ -26,5 +26,24 @@ module.exports = {
       }
     ],
     "request_id": "4b9803ed0ecdc0f6"
-  }
+  },
+  getDialogCouponList: {
+    "list":[
+      {"prize_id":153,"prize_name":"满50减50","prize_type":"满减券","prize_num":1,"can_take":"Y","is_over":"N","can_take_num":"P","today_times":1,"today_num":0,"total_times":1,"total_num":0,"remain_card_count":55},
+      {"prize_id":153,"prize_name":"满50减50","prize_type":"满减券","prize_num":1,"can_take":"Y","is_over":"N","can_take_num":"P","today_times":1,"today_num":0,"total_times":1,"total_num":0,"remain_card_count":55},
+      {"prize_id":153,"prize_name":"满50减50","prize_type":"满减券","prize_num":1,"can_take":"Y","is_over":"N","can_take_num":"P","today_times":1,"today_num":0,"total_times":1,"total_num":0,"remain_card_count":55}
+    ],
+    "background":"//sandbox-img.jufubao.cn/uploads/20231204/96b801e0dc27422c183dc90d905dd2ed.jpg",
+    "used_up_url": "",
+    "has_times": "Y",
+    "can_take":"Y",
+    "message":"",
+    "app_coupon_url":"//sandbox-img.jufubao.cn/uploads/20231205/fee9b644b83495c9ba8a4db277600b54.jpg",
+    "app_activity_button":"//sandbox-img.jufubao.cn/uploads/20231207/35f3065b2b2bc3fc2dda73d7b5b9eae8.jpg",
+    "app_coupon_button_bg_url":"//sandbox-img.jufubao.cn/uploads/20231212/026a3ea901f87f51b531d06c24604676.png",
+    "app_coupon_button_see_url": "//sandbox-img.jufubao.cn/uploads/20231212/026a3ea901f87f51b531d06c24604676.png",
+    "app_coupon_invalid_url":"//sandbox-img.jufubao.cn/uploads/20231208/8b153ce4870686a37295c16fbc992235.jpg",
+    "rule":"<p>打发&middot;</p>",
+    "request_id":"a2603f2a480485f4"
+  },
 }

package/src/components/JfbBaseConDialog/XdCouCardBind.vue

@@ -1,11 +1,17 @@
 <template>
   <view class="xd-cou-card-bind">
-    <view class="ticket_box" :style="{
-      backgroundImage: dialogBackground
-    }">
+    <view
+      class="ticket_box"
+      :style="{
+       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="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>
@@ -29,7 +35,7 @@
         </view>
       </view>
     </view>
-    
+
     <xd-font-icon
       @click="handleClose"
       class="dialog_close"
@@ -116,7 +122,7 @@ export default{
       box-sizing: border-box;
       padding-bottom: 20rpx;
     }
-    
+
     .ticket_item{
       display: flex;
       flex-direction: column;
@@ -143,7 +149,7 @@ export default{
         }
         .ticket_icon{
           color: #D6D6D6;
-          
+
         }
         .btn{
           .xd-button{
@@ -196,4 +202,4 @@ export default{
       transform: translateX(-50%);
     }
   }
-</style>
+</style>