jufubao-base 1.0.134-beta5 → 1.0.134-beta7

package/package.json

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

package/src/components/JfbBaseConDialog/Attr.js

@@ -11,20 +11,6 @@ export default {
     //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: '选取优惠券列表路径:',
         ele: 'xd-select-pages-path',
@@ -43,7 +29,7 @@ export default {
         ele: 'xd-radio',
         valueKey: 'type',
         groupKey:'content',
-        value: data['type']||1,
+        value: data['type'] || 1,
         placeholder: '请选择活动提示方式',
         multiple: false,
         className: 'input60',
@@ -77,6 +63,19 @@ export default {
         className: 'input60',
         unit: '小时'
       },
+      {
+        label: '是否隐藏弹框(仅预览模式生效):',
+        ele: 'xd-radio',
+        valueKey: 'is_hide_dailog',
+        groupKey:'content',
+        value: data['is_hide_dailog'] || 'N',
+        placeholder: '请选择是否隐藏弹框',
+        className: 'input60',
+        list: [
+          { label: '是', value: 'Y' },
+          { label: '否', value: 'N' },
+        ]
+      },
     ].filter(i=>i)
   },
   advanced: [],

package/src/components/JfbBaseConDialog/JfbBaseConDialog.vue

@@ -98,7 +98,7 @@ export default {
       currentBtnImage: "",
       currentIndex: 0,
       isShow: false,
-      type: "",
+      type: 1,
       isPreview: false, //是否预览
       activity_id: "",
       backgroundColor: "",
@@ -111,6 +111,9 @@ export default {
       timer: null,
       timeNum: 0,
 
+      //预览是否显示弹窗
+      is_preview_hide_dailog: false,
+
     };
   },
   computed: {
@@ -121,6 +124,13 @@ export default {
       if(JSON.stringify(value) === JSON.stringify(oloValue)) return;
       if (this.$configProject['isPreview']) this.init(value)
     },
+    is_preview_hide_dailog(value){
+      if(value === true) this.isShow = false;
+      else {
+        storage.remove(this.containerId);
+        this.onJfbLoad();
+      }
+    },
   },
   created() {
     this.isPreview = this.$configProject.isPreview;
@@ -136,11 +146,8 @@ export default {
       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 = false;
       this.time = Number(getContainerPropsValue(value, "content.time", 3));
-      if (this.isPreview) {
-        this.isShow = !this.isHide;
-      }
+      this.is_preview_hide_dailog = getContainerPropsValue(value, "content.is_hide_dailog", 'N') === 'Y';
     },
 
     //领取优惠券
@@ -175,6 +182,7 @@ export default {
     },
 
     getResult() {
+      debugger
       jfbRootExec("getCouponResult", {
         vm: this,
         data: {
@@ -272,7 +280,11 @@ export default {
         this.couponList = list;
         this.couponOther = other;
         if(res.can_take === "Y" && res.has_times === "Y" && list.length > 0){
-          this.isShow = true;
+          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();
         }
@@ -297,7 +309,7 @@ export default {
 
       //预览模式
       if(this.isPreview) {
-        this.getDialogList();
+        if(!this.is_preview_hide_dailog) this.getDialogList();
         return;
       }
 
@@ -348,9 +360,8 @@ export default {
     },
 
     handleClose() {
-      debugger
       //切换下一张，没有下一张，关闭
-      if (this.currentIndex == this.list.length - 1 || this.type == 2) {
+      if (this.currentIndex === (this.list.length - 1) || this.type === 2) {
         this.isShow = false;
         return;
       }
@@ -365,8 +376,7 @@ export default {
     },
 
     handleChange(type) {
-      this.currentIndex =
-        type === "left" ? this.currentIndex - 1 : this.currentIndex + 1;
+      this.currentIndex = type === "left" ? this.currentIndex - 1 : this.currentIndex + 1;
       //不小于0，不大于数组长度
       this.currentIndex = Math.max(
         0,
@@ -386,7 +396,6 @@ export default {
         this.dispatchData = data;
         this.getDialogList();
       }
-      console.log('onJfbCustomEvent',action, data);
     }
   },
 };

package/src/components/JfbBaseNotice/Attr.js

@@ -6,7 +6,7 @@
  */
 export default {
   style: [],
-  content: (data) => {
+  content: (data={}) => {
     if (!data.style) data.style = '1';
     const checkNotice = ()=>{
       let temp = false;
@@ -21,7 +21,6 @@ export default {
     const checkScroll = ()=>{
       return data.style !== '2'
     }
-
     return [
       {
         label: '内容配置:',
@@ -265,7 +264,19 @@ export default {
         inline:false,
         notice:'预览模式点击使用“<span style="color:red">弹窗显示</span>”会重新触发页面刷新，可点击弹出遮罩层进行关闭功能'
       },
-
+      {
+        label: '是否隐藏弹框(仅预览模式生效):',
+        ele: 'xd-radio',
+        valueKey: 'is_hide_dailog',
+        groupKey:'content',
+        value: data['is_hide_dailog'] || 'N',
+        placeholder: '请选择是否隐藏弹框',
+        className: 'input60',
+        list: [
+          { label: '是', value: 'Y' },
+          { label: '否', value: 'N' },
+        ]
+      },
       {
         ele: 'title',
         label: '静态显示',
@@ -418,7 +429,6 @@ export default {
         inline: false,
         notice: '内容边距设置，<span style="color: red">单位：像素</span>。默认值：0像素',
       },
-
       {
         ele: 'title',
         label: '弹窗显示',

package/src/components/JfbBaseNotice/JfbBaseNotice.vue

@@ -211,6 +211,7 @@
         scrollMargin:{},
 
         backgroundColor: '',
+        is_hide_dailog:'N',
       }
     },
     watch: {
@@ -278,7 +279,14 @@
 
       getScrollType(){
         return this.num > 1
-      }
+      },
+
+      is_hide_dailog(value){
+        if(value === 'N') {
+          storage.remove(this.containerId);
+          this.onJfbLoad();
+        }
+      },
 
     },
     created() {
@@ -319,6 +327,7 @@
           this.speed = Number(getContainerPropsValue(container, 'content.speed', 30));
         }
         else this.num = 1;
+        this.is_hide_dailog = getContainerPropsValue(container, 'content.is_hide_dailog', 'N');
       },
 
       handlePop(){
@@ -382,11 +391,12 @@
           clearTimeout(this.timer);
           this.timer = null
         }
+
         this.timer = setTimeout(()=>{
           //弹窗模式
           if(this.style === '3') {
             if(this.isPreview) {
-              this.getContent();
+              if(this.is_hide_dailog === 'N') this.getContent();
             }
             else {
               if(!storage.get(this.containerId)) this.getContent()