jufubao-base 1.0.233 → 1.0.234

package/package.json

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

package/src/components/JfbBasePosterType/FourScreen.vue

@@ -29,6 +29,7 @@
 			</view>
 		</view>
 		<view class="sreen__box carousel" v-if="config['isCarousel'] === true">
+
 			<xd-swiper-dot
 				:current="current"
 				:info="list"
@@ -172,8 +173,10 @@
         return parseInt(this.config.titleStyle.lineHeight)+'rpx'
       },
       notCarouselComp(){
+        let rowMaxHeight = this.height * this.config.row;
+        let trueDataHeight = Math.ceil(this.content.length/this.config.column) * this.height;
         return {
-          height: this.height * this.config.row  + 'px'
+          height: Math.min(rowMaxHeight, trueDataHeight)  + 'px'
         }
       },
       getIndexHeigth(){
@@ -181,18 +184,15 @@
         return (this.config['mode'] === 'normal'?0:48) * this.$rpxNum;
       },
       getContHeight() {
-        let realRow = this.config['row'];
-
+        //当只有一屏时候需要判断是否满屏
         if(this.list.length === 1) {
-          this.list[0] = this.list[0].splice(0,5);
-          realRow = Math.ceil(this.list[0].length/this.config.column);
+          let trueRow =  Math.ceil(this.list[0].length/this.config.column);
+          return this.height * Math.min(this.config.row,trueRow);
         }
-        //数量小于等于1,2行
-        if(realRow < 3) {
-          return this.height * realRow;
-        }
-        return this.height * this.config['row'];
+        //多屏幕情况
+        return this.height * this.config.row;
       },
+
       boxHeight(){
         return  this.height + this.$rpxNum * this.text;
       }