1.对接新版2.0页面 首页

pages/goods/coupon-details/coupon-details.vue

@@ -346,7 +346,7 @@
 								}
 							}
 						})
-						clearInterval(that.Timer);
+						// clearInterval(that.Timer);
 						return;
 					}
 					holdTime--;

pages/tabBar/home/home.vue

@@ -82,37 +82,35 @@
 			<view class="swiper mart20" v-if="item.type == 2">
 				<view class="swiper-box">
 					<swiper circular="true" autoplay="true" @change="swiperChange">
-						<swiper-item v-for="swiper in swiperList" :key="swiper.id">
+						<swiper-item v-for="swiper in item.childCategory" :key="swiper.id">
 							<image :src="imageUrl+swiper.imgData" @click="jumplottery(swiper)"></image>
 						</swiper-item>
 					</swiper>
 				</view>
 			</view>
-			<!-- 加油专区 -->
+			<!-- 加油专区 ,天天好券-->
-			<view class="width90 mart20 alijusstart"  v-if="item.type == 6" @click="goGoodsList(2)">
+			<view class="width90 mart20 alijusstart" v-if="item.type == 6 || item.type == 9" @click="goGoodsList(item.jumpUrl)">
 				<view class="width70 font18 fcor333">
 					{{item.name}}
 				</view>
 				<view class="width30 font14 fotrt fcor666">更多</view>
 			</view>
-			<view class="width94 alijus mart20" v-if="item.type == 6">
+			<view class="width94 alijus mart20" v-if="item.type == 6 ">
-				<view class="backcorfff spcarea">
+				<view class="backcorfff spcarea" v-for="(goods,index) in item.childDate" :key="index">
-					<image mode="widthFix" class="width100" src="../../../static/img/home/home3.png"></image>
+					<image mode="widthFix" class="width100" :src="imageUrl+goods.couponImg"></image>
-					<view class="width96 fcor333 font15 fontwig6">ETC加油券</view>
+					<view class="width96 fcor333 font15 fontwig6">{{goods.couponName}}</view>
-					<view class="width96 fcor999 font11">2020.09.21-2202.10.12</view>
+					<view class="width96 fcor999 font11">{{goods.salesEndTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}
-					<view class="width94 fcoreb5 font15 fontwig6">¥240</view>
 					</view>
-				<view class="backcorfff spcarea">
+					<view class="width94 fcoreb5 font15 fontwig6">¥{{goods.salesPrice}}</view>
-					<image mode="widthFix" class="width100" src="../../../static/img/home/home3.png"></image>
-					<view class="width96 fcor333 font15 fontwig6">ETC加油券</view>
-					<view class="width96 fcor999 font11">2020.09.21-2202.10.12</view>
-					<view class="width94 fcoreb5 font15 fontwig6">¥240</view>
 				</view>
-				<view class="backcorfff spcarea">
+			</view>
-					<image mode="widthFix" class="width100" src="../../../static/img/home/home3.png"></image>
+			<view class="width94 alijus mart20" v-if="item.type == 9 ">
-					<view class="width96 fcor333 font15 fontwig6">ETC加油券</view>
+				<view class="backcorfff spcarea" v-for="(goods,index) in item.childDate" :key="index">
-					<view class="width96 fcor999 font11">2020.09.21-2202.10.12</view>
+					<image mode="widthFix" class="width100" :src="imageUrl+goods.listImg"></image>
-					<view class="width94 fcoreb5 font15 fontwig6">¥240</view>
+					<view class="width96 fcor333 font15 fontwig6">{{goods.title}}</view>
+					<view class="width96 fcor999 font11" v-if="goods.effectiveTiem">{{goods.effectiveTiem | timeFormat('yyyy-mm-dd hh:mm:ss')}}
+					</view>
+					<view class="width94 fcoreb5 font15 fontwig6">¥{{goods.price}}</view>
 				</view>
 			</view>
 			<!-- 惠享生活 -->
@@ -121,11 +119,12 @@
 					惠享生活
 				</view>
 			</view>
-			<image class="width90 mart10" mode="widthFix" v-if="item.type == 5" :src="imagewxUrl+imgadres1"></image>
+			<image class="width90 mart10" mode="widthFix" v-if="item.type == 5"
+				:src="imageUrl+item.childCategory[0].imgData" @click="goGoodsList(imageUrl+item.childCategory[0].jumpUrl)"></image>
 			<view class="width90 alijusstart mart10" v-if="item.type == 5">
-				<image src="../../../static/img/home/home6.png" mode="widthFix" class="width31"></image>
+				<image :src="imageUrl+item.childCategory[1].imgData" mode="widthFix" class="width31" @click="goGoodsList(imageUrl+item.childCategory[1].jumpUrl)"></image>
-				<image src="../../../static/img/home/home7.png" mode="widthFix" class="width31"></image>
+				<image :src="imageUrl+item.childCategory[2].imgData" mode="widthFix" class="width31" @click="goGoodsList(imageUrl+item.childCategory[2].jumpUrl)"></image>
-				<image src="../../../static/img/home/home5.png" mode="widthFix" class="width31"></image>
+				<image :src="imageUrl+item.childCategory[3].imgData" mode="widthFix" class="width31" @click="goGoodsList(imageUrl+item.childCategory[3].jumpUrl)"></image>
 			</view>
 			<!-- 天天好券 -->
 			<!-- 	<view class="width90 mart20 alijusstart" v-if="item.type == 6">
@@ -514,7 +513,7 @@
 								duration: 3000,
 								icon: 'none'
 							})
-						}else{
+						} else {
 							uni.showToast({
 								title: '定位失败,请重新进入小程序',
 								duration: 3000,
@@ -839,7 +838,7 @@
 			//跳转菜单
 			toCategory(item) {
 				uni.navigateTo({
-					url: item.ext1
+					url: item.jumpUrl
 				})
 			},
 			//轮播跳转活动
@@ -860,7 +859,8 @@
 			//调整商品列表
 			goGoodsList(item) {
 				uni.navigateTo({
-					url: '/pages/goods/goods-list/goods-list?id=' + item
+					url: item
+					// '/pages/goods/goods-list/goods-list?id=' + item
 				})
 			},
 			//拨打客服电话

pages/user/order_list/order_list.vue

@@ -42,7 +42,7 @@
 						</view>
 					</view>
 
-					<view class="width96 height25 mart10">
+					<view class="width96 height40p mart10">
 						<view class="width70 flleft fotlt ">
 							<view class="font16 fontwig6 text1 fcor333 alijusstart">
 								<image src="../../../static/img/order5.png" class="marglerig"