jufubao-base 1.0.134-beta9 → 1.0.135

package/src/components/JfbBaseNotice/JfbBaseNotice.vue

@@ -15,9 +15,12 @@
     <!-- #endif -->
     <view class="jfb-base-notice__body">
       <view class="jfb-base-notice__body-line"></view>
-      <view>
+      <view :style="{margin: marginUi}">
         <template v-if="style === '3' && isPreview">
-          <view class="jfb-base-notice__body-pop" :style="{backgroundColor:backgroundColor, color:warningColor}">弹窗模式方便编辑(占位)，在线上此模块不显</view>
+          <view
+            class="jfb-base-notice__body-pop"
+            :style="{backgroundColor:backgroundColor, color:warningColor}"
+          >弹窗模式方便编辑(占位)，在线上此模块不显</view>
         </template>
         <template v-if="style === '2'">
           <template v-if="contentList.length === 0 && isPreview">
@@ -28,8 +31,7 @@
               class="upAndDown"
               :style="{
                 backgroundColor:backgroundColor,
-                color:warningColor,
-                margin:scrollMarginUi,
+                color:warningColor
               }"
             >
               <view>
@@ -75,37 +77,36 @@
             >接口无数返回，请检查是否配置成功!</view>
           </template>
           <template v-else>
-            <view :style="{margin:marginUi}">
-              <view
-                class="jfb-base-notice__body-title"
-                :style="{
-                  fontSize: titleFontSize + 'rpx',
-                  background: bgc,
-                  color:textColor,
-                  borderRadius: titleRadius,
-                  padding: titlePadding,
-                  borderBottomColor: borderTitleColor,
-                  textAlign: textAlign,
-                }"
-                v-if="isTitle"
-              >{{title}}</view>
-              <view
-                class="jfb-base-notice__body-content"
-                :style="{
-                  background: bgc,
-                  color:textColor,
-                  borderRadius: contRadius,
-                  padding: paddingUi,
-                  lineHeight: '50rpx'
-                }"
-                v-if="content"
-              >
-                <xd-content-xss
-                  :key="contentKey"
-                  :html="content"
-                  :font-sizes="fontSize"
-                ></xd-content-xss>
-              </view>
+            <view
+              class="jfb-base-notice__body-title"
+              :style="{
+                fontSize: titleFontSize + 'rpx',
+                background: bgc,
+                color:textColor,
+                borderRadius: titleRadius,
+                padding: titlePadding,
+                paddingBottom:0,
+                borderBottomColor: borderTitleColor,
+                textAlign: textAlign
+              }"
+              v-if="isTitle"
+            >{{title}}</view>
+            <view
+              class="jfb-base-notice__body-content"
+              :style="{
+                background: bgc,
+                color:textColor,
+                borderRadius: contRadius,
+                padding: paddingUi,
+                lineHeight: '50rpx'
+              }"
+              v-if="content"
+            >
+              <xd-content-xss
+                :key="contentKey"
+                :html="content"
+                :font-sizes="fontSize"
+              ></xd-content-xss>
             </view>
           </template>
         </template>
@@ -208,20 +209,18 @@
         num: 1, //滚动记录数量
         timer: false,
         contentList: [],
-        scrollMargin:{},
 
         backgroundColor: '',
-        is_hide_dailog:'N',
       }
     },
     watch: {
-      container(value,oloValue) {
-        if(JSON.stringify(value) === JSON.stringify(oloValue)) return;
+      container(value) {
         this.init(this.container);
         if (this.$configProject['isPreview']) this.onJfbLoad()
       },
       num(){
         if (this.$configProject['isPreview']) this.onJfbLoad()
+
       },
       style() {
         if(this.$configProject['isPreview']) this.onJfbLoad()
@@ -239,35 +238,13 @@
     },
     computed:{
       marginUi() {
-        let str = `${this.checkValue(this.margin.top, 20)}rpx`;
-        str = `${str} ${this.checkValue(this.margin.right, 20)}rpx`;
-        str = `${str} ${this.checkValue(this.margin.bottom, 20)}rpx`;
-        str = `${str} ${this.checkValue(this.margin.left, 20)}rpx`;
-        return str
+        return `${this.margin.top || 0}rpx ${this.margin.right || 0}rpx ${this.margin.bottom || 0}rpx ${this.margin.left || 0}rpx`
       },
       paddingUi() {
-        let str = `${this.checkValue(this.padding.top, 20)}rpx`;
-        str = `${str} ${this.checkValue(this.padding.right, 20)}rpx`;
-        str = `${str} ${this.checkValue(this.padding.bottom, 20)}rpx`;
-        str = `${str} ${this.checkValue(this.padding.left, 20)}rpx`;
-        return str
-      },
-
-      scrollMarginUi(){
-        let str = `${this.checkValue(this.scrollMargin.top, 0)}rpx`;
-        str = `${str} ${this.checkValue(this.scrollMargin.right, 0)}rpx`;
-        str = `${str} ${this.checkValue(this.scrollMargin.bottom, 0)}rpx`;
-        str = `${str} ${this.checkValue(this.scrollMargin.left, 0)}rpx`;
-        return str
+        return `${this.padding.top||8}rpx ${this.padding.right || 10}rpx ${this.padding.bottom || 8}rpx ${this.padding.left || 10}rpx`
       },
-
-
       titlePadding() {
-        let str = `${this.checkValue(this.padding.top, 20)}rpx`;
-        str = `${str} ${this.checkValue(this.padding.right, 20)}rpx`;
-        str = `${str} ${this.checkValue(this.padding.bottom, 20)}rpx`;
-        str = `${str} ${this.checkValue(this.padding.left, 20)}rpx`;
-        return str
+        return `${this.padding.top*(3/5)}rpx ${this.padding.right || 10}rpx ${this.padding.bottom * (3 / 5)}rpx ${this.padding.left || 10}rpx`
       },
       contRadius(){
         if(this.isTitle) return `0rpx 0rpx ${this.radius}rpx ${this.radius}rpx`;
@@ -279,14 +256,7 @@
 
       getScrollType(){
         return this.num > 1
-      },
-
-      is_hide_dailog(value){
-        if(value === 'N') {
-          storage.remove(this.containerId);
-          this.onJfbLoad();
-        }
-      },
+      }
 
     },
     created() {
@@ -300,6 +270,7 @@
         this.showUp = type;
       },
 
+
       /**
        * @description 监听事件变化
        * @param container {object} 业务组件对象自己
@@ -314,7 +285,6 @@
         this.borderTitleColor = color(this.bgc).lighten(.15).hex();
         this.margin = getContainerPropsValue(container, 'content.margin', {top: 0, left: 0, bottom: 0, right: 0});
         this.padding = getContainerPropsValue(container, 'content.padding', {top: 8, left: 10, bottom: 8, right: 10});
-        this.scrollMargin =  getContainerPropsValue(container, 'content.scrollMargin', {});
         this.radius = getContainerPropsValue(container, 'content.radius', 0);
         this.fontSize = Number(getContainerPropsValue(container, 'content.fontSize', '20'));
         if (this.fontSize === 20) this.titleFontSize = 28;
@@ -327,7 +297,6 @@
           this.speed = Number(getContainerPropsValue(container, 'content.speed', 30));
         }
         else this.num = 1;
-        this.is_hide_dailog = getContainerPropsValue(container, 'content.is_hide_dailog', 'N');
       },
 
       handlePop(){
@@ -353,6 +322,8 @@
           },
         })
           .then(res => {
+            //res = {"list":[{"content_id":"YSjVvl2X6f5qYW5G7NNNr","category_id":"KNCYuDPWmmb4jUaBEOvbz","partner_id":0,"site_id":"","title":"东北地区暴雪影响","content":"<p>尊敬的用户您好！因受东北地区暴雪影响，部分订单暂停发货或包裹运输会有延迟，我们将在预警恢复后尽快安排发货，请您耐心等待，给您带来不便敬请谅解！<\/p>","sort":1,"status":"","start_time":1699200000,"end_time":1699804800,"op_user_id":"","created_time":0,"updated_time":0,"code":"","code_name":""},{"content_id":"YSjVvl2X6f5qYW5G7NNNr1","category_id":"KNCYuDPWmmb4jUaBEOvbz","partner_id":0,"site_id":"","title":"东北地区暴雪影响","content":"<p>尊敬的用户您好！因受东北地区暴雪影响，部分订单暂停发货或包裹运输会有延迟，我们将在预警恢复后尽快安排发货，请您耐心等待，给您带来不便敬请谅解！<\/p>","sort":1,"status":"","start_time":1699200000,"end_time":1699804800,"op_user_id":"","created_time":0,"updated_time":0,"code":"","code_name":""}],"request_id":"2d3b6e0f1cb184c5"};
+
             //弹窗显示
             if (this.style === '3') {
               if (res.list.length > 0) {
@@ -387,16 +358,18 @@
       },
 
       onJfbLoad() {
+        let delay = 500;
+        if(!this.isPreview)  delay = 10;
+
         if(this.timer){
           clearTimeout(this.timer);
           this.timer = null
         }
-
         this.timer = setTimeout(()=>{
           //弹窗模式
           if(this.style === '3') {
             if(this.isPreview) {
-              if(this.is_hide_dailog === 'N') this.getContent();
+              this.getContent();
             }
             else {
               if(!storage.get(this.containerId)) this.getContent()
@@ -407,7 +380,7 @@
           else {
             this.getContent()
           }
-        }, 500)
+        }, delay)
       },
 
       onJfbUpdate(data) {
@@ -424,7 +397,6 @@
   @import "./JfbBaseNoticeLess.less";
 
   .jfb-base-notice {
-    min-height: 72rpx!important;
     &__body{
       .content-list {
         display: flex;
@@ -432,7 +404,7 @@
         align-items: center;
       }
       &-line {
-        height: 1px;
+        height: 0px;
         overflow: hidden;
         width: 100%;
       }
@@ -474,16 +446,16 @@
         }
       }
       &-pop {
-        min-height: 60rpx;
+        min-height: 30rpx;
         text-align: center;
-        line-height: 60rpx;
+        line-height: 30rpx;
         color: #666;
         font-size: unit(24, rpx);
         padding:unit(20, rpx);
       }
       &-title {
         border-bottom: 1px solid #fff;
-        line-height: 1.5rem;
+        line-height: 2rem;
       }
 
       &-content {

package/src/components/JfbBaseNotice/JfbBaseNoticeLess.less

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

package/src/components/JfbBaseNoticeBottom/JfbBaseNoticeBottomLess.less

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

package/src/components/JfbBaseNoticeTop/JfbBaseNoticeTopLess.less

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