jufubao-base 1.0.65 → 1.0.66-beta2

package/package.json

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

package/src/components/JfbBasePoster/JfbBasePoster.vue

@@ -23,7 +23,7 @@
 			<!--一分屏-->
 			<template v-if="posterType === '1'">
 				<view
-					v-if="isCarousel === false"
+					v-if="isCarousel === 1"
 					class="jfb-base-poster__one notCarousel"
 					:style="{
 						width: width + 'rpx',
@@ -126,7 +126,7 @@
         posterPosition: null,
         posterType: '1',//分屏模式
 				showType: '', //广告显示方式
-				isCarousel: true, //是否轮播图
+				isCarousel: 1, //是否轮播图
         carouselTime: 5,//轮播图轮播周期
 				useNumber: null, //广告使用张数
         height: 0, //广告高度
@@ -412,6 +412,7 @@
         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;

package/src/components/JfbBasePoster/MoreScreen.vue

@@ -2,7 +2,7 @@
 	<view class="sreen">
 		<view
 			class="sreen__box notCarousel"
-			v-if="config.isCarousel === false"
+			v-if="config.isCarousel === 1"
 		>
 			<view
 				v-for="(item,index) in list"
@@ -26,7 +26,7 @@
 				></image>
 			</view>
 		</view>
-		<view class="sreen__box carousel" v-if="config.isCarousel === true">
+		<view class="sreen__box carousel" v-else>
 			<xd-swiper-dot
 				:current="current"
 				:info="list"
@@ -78,7 +78,7 @@
 <script>
   import XdSwiperDot from "./XdSwiperDot";
   import XdSwiper from "@/components/XdSwiper/XdSwiper";
-  
+
   export default {
     components:{
       XdSwiperDot,
@@ -116,13 +116,13 @@
       },
 		},
     watch: {
-      config() {
+      config(value) {
         this.init()
       },
       content() {
         this.init();
       },
-			
+
     },
     created() {
       this.isPreview = this.$configProject.isPreview;
@@ -138,14 +138,14 @@
           this.width = Number(this.config.width);
           this.height = Number(this.config.height);
           this.padding = Number(this.config.padding);
-          
+
           //静态图显示
-          if(this.config.isCarousel === false) {
+          if(this.config.isCarousel === 1) {
             this.list = this.content
 					}
           //轮播图显示
           else {
-            let num = 4 * this.config.rows;
+            let num = this.config.cell * this.config.rows;
             let maxPage = Math.ceil(this.content.length / num);
             let arr = [];
             for(let i =1 ; i <= maxPage; i++) {
@@ -153,8 +153,6 @@
 						}
             this.list = arr;
 					}
-        
-        
         }, 100)
       },
       handleClick(item) {
@@ -214,7 +212,7 @@
 	.sreen {
 		width: calc(100% + 4px); /**防止宽度不够问**/
 		position: relative;
-		
+
 		& .carousel-mask {
 			position: absolute;
 			left: 0;
@@ -223,7 +221,7 @@
 			bottom: 0;
 			background: rgba(0, 0, 0, 0);
 		}
-		
+
 		&__box.notCarousel {
 			display: flex;
 			justify-content: flex-start;
@@ -231,7 +229,7 @@
 			flex-wrap: wrap;
 			overflow: hidden;
 			width: calc(100% + 20px); /**防止宽度不够问**/
-			
+
 			& > view {
 				display: flex;
 				justify-content: center;
@@ -241,7 +239,7 @@
 				overflow: hidden;
 			}
 		}
-		
+
 		&__box.carousel {
 			display: flex;
 			justify-content: flex-start;
@@ -249,7 +247,7 @@
 			flex-wrap: wrap;
 			overflow: hidden;
 		}
-		
+
 		& .sreen__box-list {
 			width: calc(100% + 20px); /**防止宽度不够问**/
 			display: flex;
@@ -257,7 +255,7 @@
 			align-items: flex-start;
 			flex-wrap: wrap;
 			overflow: hidden;
-			
+
 			& view {
 				display: flex;
 				justify-content: center;
@@ -265,17 +263,17 @@
 				flex-shrink: 0;
 				box-sizing: border-box;
 				overflow: hidden;
-				
+
 				&:nth-child(4n) {
 					margin-right: 0 !important;
 				}
-				
+
 				& > image {
-				
+
 				}
 			}
 		}
 	}
-	
-	
+
+
 </style>

package/src/components/JfbBasePosterEntry/JfbBasePosterEntry.vue

@@ -41,7 +41,7 @@
           ></image>
         </view>
       </view>
-      
+
     </view>
   </view>
 </template>
@@ -65,7 +65,7 @@
       return {
         noData: false,
         entry: null,
-  
+
         //style
         type:'1',
         width: 0,
@@ -80,7 +80,7 @@
           right: 0
         },
         list: [],
-        
+
         //测试数据
         test: {
           "content_id": "KpBbUKdj4aBejwe7Fh1ki",
@@ -146,7 +146,7 @@
             console.error(e)
           }
         }
-        
+
         //外部链接
         if(item.redirect_type === 'URL') {
           let reg = /^(http:\/\/|https:\/\/|\/\/)+.+$/;
@@ -179,9 +179,10 @@
             console.error(e)
           }
           //#endif
-          
+
         }
       },
+
       getTestData() {
         let temp = [];
         for (let i = 0; i < this.useNumber; i++) {
@@ -193,7 +194,7 @@
         }
         return temp
       },
-      
+
       onJfbLoad(options) {
         this.params = options;
         jfbRootExec('getListPosterContent', {
@@ -209,7 +210,7 @@
             if (res.list.length === 0 && this.$configProject.isPreview) {
               res.list = this.getTestData();
             }
-            
+
             let list = res.list.map(item=>{
               return {
                 ...item,
@@ -222,7 +223,7 @@
                 typeEmpty: true
               })
             }
-            
+
             this.list = list;
             this.noData = this.list.length === 0;
           })
@@ -239,7 +240,7 @@
         this.radius = getContainerPropsValue(container, 'content.radius', '0');
         this.padding = getContainerPropsValue(container, 'content.padding', '0');
         this.margin = getContainerPropsValue(container, 'content.margin', { top: 0, bottom: 0, left: 0, right: 0});
-       
+
         this.entry = getContainerPropsValue(container, 'content.entry', null);
         if(this.entry !== null) {
           this.width = this.entry.size.width;
@@ -247,11 +248,11 @@
           this.type = this.entry.type;
         }
       },
-      
+
       onJfbUpdate() {
         this.onJfbLoad(this.params)
       },
-      
+
     }
   }
 
@@ -267,26 +268,26 @@
         display: flex;
         align-items: center;
         flex-wrap: wrap;
-        
+
         & > view {
           overflow: hidden;
           display: flex;
           justify-content: center;
           align-items: center;
-          
+
           & > image {
             width: 100%;
             height: auto;
           }
         }
-  
+
         &.one {
           justify-content: center;
           & > view:first-child {
             margin-top: 0!important;
           }
         }
-  
+
         &.two {
           justify-content: center;
           & > view:nth-child(1), & > view:nth-child(2){

package/src/components/JfbBaseVideo/JfbBaseVideo.vue

@@ -17,6 +17,7 @@
       <view class="float"></view>
       <view class="video" v-if="video !== null">
         <xd-video
+          :key="videoKey"
           :margin="margin"
           :poster="videoSetting"
           :video="video"
@@ -55,7 +56,8 @@
         videoSetting: null,
         margin:{},
         radius:0,
-        $vm: {}
+        $vm: {},
+        videoKey : Date.now()
       }
     },
 		computed: {
@@ -125,6 +127,7 @@
             if(res && res.list &&  res.list.length > 0) {
               this.video = res.list[0];
             }
+            this.videoKey = Date.now()
           })
           .catch(error => {
             this.$xdLog.catch(error)

package/src/components/JfbBaseVideo/XdVideo.vue

@@ -14,7 +14,7 @@
       :style="{borderRadius: radius + 'rpx'}"
     >
       <image :src="imageUrl" v-if="imageUrl" />
-      <view @click="handlePlay()">
+      <view v-if="videoUrl" @click="handlePlay()">
         <xd-font-icon
           :icon="iconFont"
           size="100"