jufubao-base 1.0.134-beta6 → 1.0.134-beta7

package/package.json

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

package/src/components/JfbBaseConDialog/Attr.js

@@ -66,9 +66,9 @@ export default {
       {
         label: '是否隐藏弹框(仅预览模式生效):',
         ele: 'xd-radio',
-        valueKey: 'is_show_dailog',
+        valueKey: 'is_hide_dailog',
         groupKey:'content',
-        value: data.is_show_dailog || '',
+        value: data['is_hide_dailog'] || 'N',
         placeholder: '请选择是否隐藏弹框',
         className: 'input60',
         list: [

package/src/components/JfbBaseConDialog/JfbBaseConDialog.vue

@@ -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;
@@ -137,6 +147,7 @@ export default {
       this.distribution_method = getContainerPropsValue(value, "content.distribution_method", "homed");
       this.type = getContainerPropsValue(value, "content.type", 1);
       this.time = Number(getContainerPropsValue(value, "content.time", 3));
+      this.is_preview_hide_dailog = getContainerPropsValue(value, "content.is_hide_dailog", 'N') === 'Y';
     },
 
     //领取优惠券
@@ -171,6 +182,7 @@ export default {
     },
 
     getResult() {
+      debugger
       jfbRootExec("getCouponResult", {
         vm: this,
         data: {
@@ -269,6 +281,8 @@ export default {
         this.couponOther = other;
         if(res.can_take === "Y" && res.has_times === "Y" && list.length > 0){
           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{
@@ -295,7 +309,7 @@ export default {
 
       //预览模式
       if(this.isPreview) {
-        this.getDialogList();
+        if(!this.is_preview_hide_dailog) this.getDialogList();
         return;
       }
 

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,6 +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: '静态显示',

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()