jufubao-base 1.0.63-beta212 → 1.0.63-beta214

package/package.json

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

package/src/components/JfbBaseNotice/JfbBaseNotice.vue

@@ -20,11 +20,17 @@
       }"
     >
       <template v-if="style === '3' && isPreview">
-        <view class="jfb-base-notice__body-pop">弹窗模式方便编辑(占位)，在线上此模块不显</view>
+        <view
+          class="jfb-base-notice__body-pop"
+          :style="{backgroundColor:backgroundColor, color:warningColor}"
+        >弹窗模式方便编辑(占位)，在线上此模块不显</view>
       </template>
       <template v-if="style === '2'">
         <template v-if="!content && isPreview">
-          <view class="jfb-base-notice__body-pop" style="color:red">接口无数返回，请检查是否配置成功!</view>
+          <view
+            class="jfb-base-notice__body-pop"
+            :style="{backgroundColor:backgroundColor, color:warningColor}"
+          >接口无数返回，请检查是否配置成功!</view>
         </template>
         <view v-else class="jfb-base-notice__body-scroll">
           <xd-notice-bar
@@ -43,7 +49,10 @@
       </template>
       <template v-if="style === '1'">
         <template v-if="!content && isPreview">
-          <view class="jfb-base-notice__body-pop" style="color:red">接口无数返回，请检查是否配置成功!</view>
+          <view
+            class="jfb-base-notice__body-pop"
+            :style="{backgroundColor:backgroundColor, color:warningColor}"
+          >接口无数返回，请检查是否配置成功!</view>
         </template>
         <template v-else>
           <view
@@ -92,6 +101,7 @@
   import extsMixins from "@/mixins/extsMixins"
   import { getContainerPropsValue } from "@/utils/xd.base";
   import storage from "@/common/storage";
+  import Color from "color";
   const color = require('color');
   export default {
     name: "JfbBaseNotice",
@@ -108,14 +118,14 @@
         textAlign: 'left', //标题对其方式
         noData: false,
         style: '1', //显示内容（静态/弹窗/滚动）
-        
-        
+
+
         bgc: '', //背景颜色
         textColor: '', //文字颜色
         content : '', //内容
         contentKey: 'contentKey',
         borderTitleColor: '#fff',
-        
+
         margin: {
           top: 0,
           left: 0,
@@ -133,13 +143,15 @@
         titleFontSize: 26,
         time: 3, //小时
         isPreview: false,
-  
+
         //滚动
         speed: 30, //滚动速度
         speedKey: 'speedKey',
         num: 1, //滚动记录数量
         timer: false,
         contentList: [],
+
+        backgroundColor: '',
       }
     },
     watch: {
@@ -151,7 +163,7 @@
         setTimeout(() => {
           if (this.$configProject['isPreview']) this.onJfbLoad()
         }, 400)
-        
+
       },
       num(){
         if (this.timer) {
@@ -161,7 +173,7 @@
         setTimeout(() => {
           if (this.$configProject['isPreview']) this.onJfbLoad()
         }, 400)
-       
+
       },
       style() {
         if(this.$configProject['isPreview']) this.onJfbLoad()
@@ -174,7 +186,7 @@
         setTimeout(()=>{
           this.speedKey = Date.now()
         }, 400)
-       
+
       }
     },
     computed:{
@@ -194,14 +206,15 @@
       titleRadius() {
         return `${this.radius}rpx ${this.radius}rpx 0rpx 0rpx `
       },
-  
+
     },
     created() {
+      this.backgroundColor = Color(this.warningColor).alpha(0.2).toString();
       this.isPreview = this.$configProject['isPreview'];
       this.init(this.container);
     },
     methods: {
-      
+
       /**
        * @description 监听事件变化
        * @param container {object} 业务组件对象自己
@@ -222,14 +235,14 @@
         if (this.fontSize === 26) this.titleFontSize = 36;
         if (this.fontSize === 36) this.titleFontSize = 44;
         this.isTitle = getContainerPropsValue(container, 'content.isTitle', false);
-        
+
         if(this.style === '2') {
           this.num = getContainerPropsValue(container, 'content.num', 1);
           this.speed = Number(getContainerPropsValue(container, 'content.speed', 30));
         }
         else this.num = 1;
       },
-      
+
       handlePop(){
         console.log('this.time', this.time * 60 + '分钟');
         storage.set(this.containerId, 1, this.time);
@@ -242,7 +255,7 @@
           cancel: false,
         });
       },
-      
+
       getContent(){
         jfbRootExec('getListNewsContent', {
           vm: this,
@@ -261,16 +274,16 @@
                 this.handlePop()
               }
             }
-            
+
             else if(this.style === '2') {
               console.log('getContent',res.list)
               if(res.list.length > 0) {
                 this.contentList = res.list;
                 this.speedKey = Date.now()
               }
-              
+
             }
-      
+
             //静态显示
             else {
               if (res.list.length > 0) {
@@ -280,13 +293,13 @@
               }
               this.noData = res.list.length > 0;
             }
-      
+
           })
           .catch(error => {
             console.error(error)
           })
       },
-  
+
       onJfbLoad() {
         //弹窗模式
         if(this.style === '3') {
@@ -297,19 +310,19 @@
             if(!storage.get(this.containerId)) this.getContent()
           }
         }
-        
+
         else {
           this.getContent()
         }
-        
-    
+
+
       },
-  
+
       onJfbUpdate(data) {
         storage.remove(this.containerId);
         this.getContent()
       }
-      
+
     }
   }
 
@@ -326,7 +339,9 @@
         }
       }
       &-pop {
+        min-height: 60rpx;
         text-align: center;
+        line-height: 60rpx;
         color: #666;
         font-size: unit(24, rpx);
         padding:unit(20, rpx);
@@ -334,7 +349,7 @@
       &-title {
         border-bottom: 1px solid #fff;
       }
-  
+
       &-content {
         padding: unit(8, rpx) unit(10, rpx);
       }

package/src/components/JfbBaseVideo/XdVideo.vue

@@ -174,7 +174,7 @@
 <style scoped lang="less">
 .video-box {
   view.noImageUrl {
-    background: #333;
+    background: rgba(0,0,0,.6);
   }
   view.thumb {
     height: 100%;