1.优化首页

pages/tabBar/home/home.vue

@@ -46,37 +46,58 @@
 		<!-- /菜单 -->
 		<view class="height60 backcorfff"></view>
 		<imgGrid :list="imgList"></imgGrid>
-		
+
 		<!-- 赠券 -->
 		<view style="width: 91%;margin-left: 5%;">
 			<image class="mart30 width100" mode="widthFix" src="../../../static/img/headzq.png"></image>
 		</view>
-		<swiper v-if="list&&list.length>0" class="orange-content" :display-multiple-items="4" next-margin="'50rpx'">
+		<swiper class="orange-content" style="border: 2px solid #ff5836;" :display-multiple-items="productListleg">
-			<swiper-item class="swiper-hed" v-for="(item,index) in list" :key="index">
+			<swiper-item class="swiper-hed" v-for="pro in productList" :key="product.id">
-				<view class="swiper-item" @tap="tapList" :data-id="item.id" :data-index="index" style="height:80px;">
+				<view class="swiper-item" @tap="tapList" :data-id="pro.id">
-					<image class="img" :src="item.img" style="border-Radius:10rpx;}" mode="aspectFill"></image>
+					<image class="img" :src="imageUrl+pro.couponImg" mode="aspectFit">
-					<view class="subject fotct">{{item.subject}}</view>
+					</image>
+					<view class="fotct fcor333 font14 text1 mart10">￥{{pro.couponName}}</view>
+					<view class="subject fotct mart5">￥{{pro.discountPrice}}</view>
 				</view>
 			</swiper-item>
 		</swiper>
-		
+
 		<!-- 金币 -->
-		<view></view>
+		<view style="width: 90%;margin-left: 5%;">
-		<swiper v-if="list&&list.length>0" class="orange-content" :display-multiple-items="4" next-margin="'50rpx'">
+			<image class="mart30 width100" mode="widthFix" src="../../../static/img/jbhed.png"></image>
-			<swiper-item class="swiper-hed" v-for="(item,index) in list" :key="index">
+		</view>
-				<view class="swiper-item" @tap="tapList" :data-id="item.id" :data-index="index" style="height:80px;">
+		<!-- v-if="goldproductList&&goldproductList.length>0" -->
-					<image class="img" :src="item.img" style="border-Radius:10rpx;}" mode="aspectFill"></image>
+		<swiper class="orange-content" :display-multiple-items="goldproductListleg" next-margin="50rpx">
-					<view class="subject fotct">{{item.subject}}</view>
+			<swiper-item class="swiper-hed" v-for="(item,index) in goldproductList" :key="index">
+				<view class="swiper-item" @tap="tapList" :data-id="item.id">
+					<image class="img" :src="imageUrl+item.couponImg" mode="aspectFit"></image>
+					<view class="fotct fcor333 font14 text1 mart10">{{item.couponName}}</view>
+					<view class="subject fotct mart5">￥{{ item.discountPrice}}</view>
 				</view>
 			</swiper-item>
 		</swiper>
-		
+
+		<!-- 分期 -->
+		<view style="width: 90%;margin-left: 5%;">
+			<image class="mart30 width100" mode="widthFix" src="../../../static/img/fqhed.png"></image>
+		</view>
+		<swiper class="orange-content" :display-multiple-items="productListleg">
+			<swiper-item class="swiper-hed" v-for="pro in productList" :key="product.id">
+				<view class="swiper-item" @tap="tapList" :data-id="pro.id">
+					<image class="img" :src="imageUrl+pro.couponImg" mode="aspectFit">
+					</image>
+					<view class="fotct fcor333 font14 text1 mart10">￥{{pro.couponName}}</view>
+					<view class="subject fotct mart5">￥{{pro.discountPrice}}</view>
+				</view>
+			</swiper-item>
+		</swiper>
+
 		<!-- 广告图 -->
 		<!-- <view class="banner" @click="tao">
 			<image src="/static/img/banner.jpg"></image>
 		</view> -->
 		<!-- 商品列表 -->
-		<!-- 	<view class="goods-list">
+		<view class="goods-list">
 			<view class="title">
 				<image src="/static/img/hua.png"></image>
 				赠券专区
@@ -99,8 +120,8 @@
 					</view>
 				</view>
 			</view>
-		</view> -->
+		</view>
-		<!-- 
+
 		<view class="goods-list">
 			<view class="title">
 				<image src="/static/img/hua.png"></image>
@@ -131,7 +152,7 @@
 					</view>
 				</view>
 			</view>
-		</view> -->
+		</view>
 
 	</view>
 </template>
@@ -171,7 +192,9 @@
 				],
 				//猜你喜欢列表
 				productList: [],
+				productListleg: '',
 				goldproductList: [],
+				goldproductListleg: '',
 				loadingText: '正在加载...',
 				pageNum: 1,
 				pageSize: 6,
@@ -192,37 +215,6 @@
 						text: '美食'
 					}
 				],
-				list: [{
-						id: 1,
-						img: '/static/img/wenj.png',
-						subject: '104'
-					},
-					{
-						id: 1,
-						img: '/static/img/wenj.png',
-						subject: '123'
-					},
-					{
-						id: 1,
-						img: '/static/img/wenj.png',
-						subject: '112'
-					},
-					{
-						id: 1,
-						img: '/static/img/wenj.png',
-						subject: '221'
-					},
-					{
-						id: 1,
-						img: '/static/img/wenj.png',
-						subject: '343'
-					},
-					{
-						id: 1,
-						img: '/static/img/wenj.png',
-						subject: '123'
-					}
-				]
 			};
 		},
 
@@ -427,6 +419,7 @@
 				getCouponList(params).then(res => {
 					if (res.return_code == '000000') {
 						this.productList = res.return_data.list;
+						this.productListleg = res.return_data.total;
 					}
 				})
 			},
@@ -441,6 +434,7 @@
 				getCouponList(params).then(res => {
 					if (res.return_code == '000000') {
 						this.goldproductList = res.return_data.list;
+						this.goldproductListleg = res.return_data.total;
 					}
 				})
 			},
@@ -803,8 +797,8 @@
 	}
 
 	.goods-list {
+		background-color: #FFFFFF;
 
-		// background-color: #f4f4f4;
 		.title {
 			width: 100%;
 			display: flex;
@@ -890,6 +884,7 @@
 		position: relative;
 		box-sizing: border-box;
 	}
+
 	.orange-title {
 		display: flex;
 		justify-content: space-between;
@@ -911,11 +906,11 @@
 	}
 
 	.orange-content {
-		height: 110px;
+		height: 160px;
 		width: 90%;
 		margin-left: 5%;
-		border: 2px solid #ff5836;
+		border-radius: 0 0 10px 10px;
-		margin-top: -4px;
+		margin-top: -3px;
 		background-color: white;
 	}
 
@@ -924,7 +919,7 @@
 	}
 
 	.orange-content .swiper-item {
-		height: 140rpx;
+		height: 180rpx;
 		margin-left: 14rpx;
 		margin-top: 14rpx;
 	}
@@ -932,6 +927,7 @@
 	.orange-content .swiper-item .img {
 		width: 100%;
 		height: 100%;
+		// border-Radius:10rpx;
 	}
 
 	.orange-content .swiper-item .subject {