Merge branch 'developerB' into developerA

components/cm-module/pageTemplate/templateH.vue

@@ -1,9 +1,9 @@
 <template>
 	<view class="section_page_main clearfix">
 		<view class="recommend-list">
-			<swiper class="tui-banner-swiper" :autoplay="false" :interval="5000" :duration="500" :circular="true" @change="swiperChange">
+			<swiper class="tui-banner-swiper" :autoplay="true" :interval="5000" :duration="500" :circular="true" @change="swiperChange">
 				<swiper-item v-for="(product,index) in productList" :key="index">
-					<view class="floor-item ad_04 clearfix" v-for="(item, idx) in floorData.floorImageList" v-if="idx < 4" :key="idx" @click.stop="navToDetailPage(item)">
+					<view class="floor-item ad_04 clearfix" v-for="(item, idx) in product" :key="idx" @click.stop="navToDetailPage(item)">
 						<image class="item-img tui-skeleton-fillet" :src="item.image" mode="aspectFill"></image>
 						<view class="floor-item_tag" v-if="item.listType == 2">
 							<text>{{ item.label }}</text>
@@ -141,7 +141,6 @@
 		data() {
 			return{
 				shopId:0,
-				floorData:{},
 				productList:[],
 				current:100,
 				swiperCurrent:0,
@@ -179,8 +178,6 @@
 						this.productList.push(data.floorImageList.slice(i, i + this.pageSize));
 					}
 				}
-				this.floorData = data
-				// console.log(this.floorData)
 			},
 			PromotionsFormat(promo){//促销活动类型数据处理
 				if(promo!=null){

pages/goods/product.vue

@@ -140,36 +140,38 @@
 				<tui-bottom-popup :radius="true" :show="popupShow" @close="hidePopup()">
 					<view class="tui-popup-box clearfix">
 						<view class="title">商品参数</view>
-						<view class="content">
-							<view class="content-tr">
-								<view class="content-td">起订量</view>
-								<view class="content-th">{{product.minBuyNumber}}</view>
-							</view>
-							<view class="content-tr">
-								<view class="content-td">品牌</view>
-								<view class="content-th">{{product.brandName == null? '其他' : product.brandName}}</view>
-							</view>
-							<view class="content-tr">
-								<view class="content-td">分类</view>
-								<view class="content-th">{{product.typeName == null? '暂无' : product.typeName}}</view>
-							</view>
-							<view class="content-tr">
-								<view class="content-td">包装规格</view> 
-								<view class="content-th">{{product.unit}}</view>
-							</view>
-							<view class="content-tr">
-								<view class="content-td">商品编码</view>
-								<view class="content-th">{{product.productCode}}</view>
-							</view>
-							<view class="content-tr">
-								<view class="content-td">库存</view>
-								<view class="content-th">{{product.stock}}</view>
-							</view>
-							<view class="content-tr" v-if="product.parametersList.length>0" v-for="(item, index) in product.parametersList" :key="index">
-								<view class="content-td">{{item.paramsName}}</view>
-								<view class="content-th">{{item.paramsContent}}</view>
-							</view>
-						</view>
+						<div class="tui-popup-main">
+							<scroll-view class="tui-popup-scroll"  scroll-y="true">
+								<view class="content-tr">
+									<view class="content-td">起订量</view>
+									<view class="content-th">{{product.minBuyNumber}}</view>
+								</view>
+								<view class="content-tr">
+									<view class="content-td">品牌</view>
+									<view class="content-th">{{product.brandName == null? '其他' : product.brandName}}</view>
+								</view>
+								<view class="content-tr">
+									<view class="content-td">分类</view>
+									<view class="content-th">{{product.typeName == null? '暂无' : product.typeName}}</view>
+								</view>
+								<view class="content-tr">
+									<view class="content-td">包装规格</view> 
+									<view class="content-th">{{product.unit}}</view>
+								</view>
+								<view class="content-tr">
+									<view class="content-td">商品编码</view>
+									<view class="content-th">{{product.productCode}}</view>
+								</view>
+								<view class="content-tr">
+									<view class="content-td">库存</view>
+									<view class="content-th">{{product.stock}}</view>
+								</view>
+								<view class="content-tr" v-if="product.parametersList.length>0" v-for="(item, index) in product.parametersList" :key="index">
+									<view class="content-td">{{item.paramsName}}</view>
+									<view class="content-th">{{item.paramsContent}}</view>
+								</view>
+							</scroll-view>
+						</div>
 						<view class="tui-right-flex tui-popup-btn" :style="{ paddingBottom :isIphoneX ? '68rpx' : '0rpx' }">
 							<view class="tui-flex-1">
 								<view class="tui-button" @click="hidePopup()">收起</view>
@@ -1709,30 +1711,34 @@
 			width: 100%;
 			height: 88rpx;
 		}
-		.content{
+		.tui-popup-main{
 			width: 100%;
-			height: auto;
 			float: left;
-			.content-tr{
+			.tui-popup-scroll{
 				width: 100%;
-				height: 58rpx;
-				line-height: 58rpx;
-				display: flex;
-				.content-td{
-					display: flex;
-					flex: 3;
-					font-size: $font-size-26;
-					color: #999999;
+				height: 500rpx;
+				.content-tr{
+					width: 100%;
+					min-height: 58rpx;
 					line-height: 58rpx;
-					text-align: left;
-				}
-				.content-th{
 					display: flex;
-					flex: 7;
-					font-size: $font-size-26;
-					color: #333333;
-					line-height: 58rpx;
-					text-align: left;
+					.content-td{
+						display: flex;
+						flex: 3;
+						font-size: $font-size-26;
+						color: #999999;
+						line-height: 58rpx;
+						text-align: left;
+					}
+					.content-th{
+						display: flex;
+						flex: 7;
+						font-size: $font-size-26;
+						color: #333333;
+						line-height: 58rpx;
+						text-align: left;
+						padding-left: 10rpx;
+					}
 				}
 			}
 		}