jufubao-base 1.0.64-beta301 → 1.0.64-beta303

package/package.json

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

package/src/components/JfbBaseNotice/JfbBaseNotice.vue

@@ -47,7 +47,10 @@
                   autoplay
                 >
                   <swiper-item v-for="(item) in contentList" :key="item.content_id">
-                    <view>{{item.title}}</view>
+                    <view class="content-list">
+                      {{item.title}}
+                      <text v-if="contentList&&contentList.length>0">{{contentList.length}}个</text>
+                    </view>
                   </swiper-item>
                 </swiper>
                 <xd-notice-bar v-else :key="speedKey" scrollable :speed="speed" background-color="rgba(0,0,0,0)">
@@ -395,6 +398,11 @@
 
   .jfb-base-notice {
     &__body{
+      .content-list {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+      }
       &-line {
         height: 0px;
         overflow: hidden;

package/src/components/JfbBasePoster/JfbBasePoster.vue

@@ -64,6 +64,7 @@
 							:current="current"
 							:width=" width + 'rpx'"
 							:height="height + 'rpx'"
+              :interval="carouselTime"
 							@onClickItem="handleClick"
 							@animationfinish="handleAnimationfinish"
 						>
@@ -102,7 +103,7 @@
   import XdSwiper from "@/components/XdSwiper/XdSwiper";
   import MoreScreen from "./MoreScreen";
   import XdSwiperDot from "./XdSwiperDot";
-	
+
   export default {
     name: "JfbBasePoster",
     components: {
@@ -117,7 +118,7 @@
       return {
         selfMask: true,
         params: {},
-				
+
 				//Swiper 配置
         mode:'round', //default 、round 、nav 、dot, indexes
         current: 0,
@@ -145,7 +146,7 @@
 				},
 				isPreview: false,
 				noData:false,
-				
+
 				test: {
           "content_id": "KpBbUKdj4aBejwe7Fh1ki",
           "position_id": "QCk3PmoyQmOWRP1SxnYR3",
@@ -205,7 +206,7 @@
       dotStyleData(){
         let alpha = 1;
         if(this.posterType === '1') alpha = 0.6;
-        
+
 				let selectedColor = `rgba(${color(this.mainColor).alpha(alpha).array().join(',')})`;
 				console.log('selectedColor',selectedColor, this.mode, this.posterType);
         let style = {
@@ -308,11 +309,11 @@
 				}
         return temp
 			},
-      handleAnimationfinish(e) {  
+      handleAnimationfinish(e) {
         this.currentImage = this.info[e.detail.current]['image_background_url']
         if(this.isSupport==='Y' && this.rows===1 && this.isCarousel===2) {
           this.$xdRoot.$emit("setLayoutPageBg", this.info[e.detail.current]['image_background_url']);
-        }    
+        }
         this.current = e.detail.current;
       },
       handleClick(item) {
@@ -368,26 +369,26 @@
       	return list.map((item,index) => {
           return {
             ...item,
-            image_background_url: getServiceUrl(item.image_background_url),
-            image_url: getServiceUrl(item.image_url)
+            image_background_url: item.image_background_url?getServiceUrl(item.image_background_url):'',
+            image_url: item.image_url?getServiceUrl(item.image_url):''
           }
         })
 			},
       handleOne(list){
         this.info = this.handleImage(list);
         let current = this.current || 0;
-        this.currentImage = this.info[current]['image_background_url']        
+        this.currentImage = this.info[current]['image_background_url']
         if(this.isSupport==='Y' && this.rows===1 && this.isCarousel===2) {
           this.$xdRoot.$emit("setLayoutPageBg", this.currentImage);
         }
 			},
-   
+
 			getDefualtValue(key){
         if (key === 'margin') {
           return {top: 0, bottom: 0, left: 0, right: 0}
         }
 			},
-			
+
       /**
        * @description 监听事件变化
        * @param container {object} 业务组件对象自己
@@ -397,7 +398,7 @@
         if (this.poster.type) {
           this.posterType = this.poster.type
         }
-        if(this.poster.position) { 
+        if(this.poster.position) {
           this.posterPosition = this.poster.position
 				}
         this.radius = getContainerPropsValue(container, 'content.radius', 0);
@@ -405,13 +406,13 @@
         this.rows = getContainerPropsValue(container, 'content.rows', 1);
         this.isSupport = getContainerPropsValue(container, 'content.isSupport', 'Y');
         this.mS = getContainerPropsValue(container, 'content.margin', this.getDefualtValue('margin'));
-        
+
         //content
         this.mode = getContainerPropsValue(container, 'content.dot_type', 'dot');
         this.isCarousel = getContainerPropsValue(container, 'content.isCarousel', 1);
         this.carouselTime = Number(getContainerPropsValue(container, 'content.carouselTime', 5)) * 1000;
         this.useNumber = getContainerPropsValue(container, 'content.number', 1);
-        
+
         if(this.poster.size) {
           this.width = this.poster.size.width;
           this.height = this.poster.size.height;
@@ -429,11 +430,11 @@
           },
         })
           .then(res => {
-            
+
             if(res.list.length === 0 && this.isPreview) {
               res.list = this.getTestData();
 						}
-            
+
             if (this.posterType === '1') this.handleOne(res.list);
             if (this.posterType === '2') this.handleOne(res.list);
             if (this.posterType === '3') this.handleOne(res.list);
@@ -445,12 +446,22 @@
             console.error(error)
           })
       },
-			
+
+      destroyed() {
+        this.$xdRoot.$emit('setLayoutPageBg',null)
+      },
+
+      onJfbShow(){
+        if(this.isSupport==='Y' && this.rows===1 && this.isCarousel===2) {
+          this.$xdRoot.$emit("setLayoutPageBg", this.currentImage);
+        }
+      },
+
       onJfbUpdate(data) {
         this.onJfbLoad(this.params);
       }
-      
-      
+
+
     }
   }
 
@@ -474,19 +485,19 @@
 			justify-content: center;
 			align-items: center;
 			overflow: hidden;
-			
-			
+
+
 			& > view {
 				width: 100%;
 				height: 100%;
 				box-sizing: border-box;
-				
+
 				& > image {
-				
+
 				}
 			}
 		}
-	
+
 		&__one.carousel {
 			position: relative;
 			box-sizing: border-box;
@@ -494,7 +505,7 @@
 			justify-content: center;
 			align-items: center;
 			overflow: hidden;
-			
+
 			& .carousel-mask {
 				position: absolute;
 				left: 0;
@@ -504,6 +515,6 @@
 				background: rgba(0,0,0,0);
 			}
 		}
-		
+
   }
 </style>