Merge remote-tracking branch 'remotes/origin/developer' into developerB

# Conflicts:
#	pages/tabBar/home/home.vue

components/cm-module/productDetails/cm-activipopu.vue

@@ -112,7 +112,7 @@
 		box-sizing: border-box;
 		.ladder-main{
 			width: 100%;
-			height: 320rpx;
+			min-height: 240rpx;
 			border: 1px solid rgba(225,86,22,0.3);
 			border-radius: 10rpx;
 			.ladder-item{

components/cm-module/productDetails/cm-price.vue

@@ -91,7 +91,7 @@
 				<view class="tui-popup-box clearfix">
 					<template v-if="product.actStatus == 0  &&  product.ladderPriceFlag == 1">
 						<view class="tui-scrollview-box">
-							<view class="ladder-main">
+							<view class="ladder-main clearfix">
 								<view class="ladder-item">
 									<view class="ladder-item-td">起订量</view>
 									<view class="ladder-item-td">价格</view>
@@ -229,7 +229,7 @@
 		box-sizing: border-box;
 		.ladder-main{
 			width: 100%;
-			height: 320rpx;
+			min-height: 240rpx;
 			border: 1px solid rgba(225,86,22,0.3);
 			border-radius: 10rpx;
 			.ladder-item{

pages/tabBar/home/home.vue

@@ -671,6 +671,7 @@
 					padding: 0 15rpx;
 				}
 				.floor-item-act{
+					display: block;
 					width: 100%;
 					height: 68rpx;
 					text-align: center;