From fb445b4b4f21039385b42ec15be89e2e09f5c055 Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Wed, 12 Oct 2022 14:58:36 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=AF=B9=E6=8E=A5=E6=96=B0=E7=89=882.0?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=20=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/coupon-details/coupon-details.vue |  2 +-
 pages/tabBar/home/home.vue                    | 78 +++++++++----------
 pages/user/order_list/order_list.vue          |  2 +-
 3 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/pages/goods/coupon-details/coupon-details.vue b/pages/goods/coupon-details/coupon-details.vue
index eb3b875..9c1bdff 100644
--- a/pages/goods/coupon-details/coupon-details.vue
+++ b/pages/goods/coupon-details/coupon-details.vue
@@ -346,7 +346,7 @@
 								}
 							}
 						})
-						clearInterval(that.Timer);
+						// clearInterval(that.Timer);
 						return;
 					}
 					holdTime--;
diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue
index ffe3095..d363cb3 100644
--- a/pages/tabBar/home/home.vue
+++ b/pages/tabBar/home/home.vue
@@ -33,7 +33,7 @@
 		</view>
 		<!-- 顶部菜单 -->
 		<view v-for="(item,index) in homeCateList" :key="index">
-			<view class="height90 backcorltop mart50"  v-if="item.type == 1">
+			<view class="height90 backcorltop mart50" v-if="item.type == 1">
 				<view class="category-list">
 					<view class="category" style="width: 25%;" v-for="(row, index) in item.childCategory" :key="index"
 						@tap="toCategory(row)">
@@ -48,7 +48,7 @@
 			<image class="width100" mode="widthFix" :src="imagewxUrl+imgadres" v-if="item.type == 8"></image>
 
 			<!-- 顶部菜单 -->
-			<view class="category-list backcorfff" style="margin-top: -5px;"  v-if="item.type == 7">
+			<view class="category-list backcorfff" style="margin-top: -5px;" v-if="item.type == 7">
 				<view class="category" style="width: 20%;" v-for="(row, index) in item.childCategory" :key="index"
 					@tap="toCategory(row)">
 					<view class="img">
@@ -58,7 +58,7 @@
 				</view>
 			</view>
 			<!-- 消息 -->
-			<view class="height120 backcorfff"  v-if="item.type == 3">
+			<view class="height120 backcorfff" v-if="item.type == 3">
 				<view class="height20 width100"></view>
 				<view class="width92 message alijus">
 					<swiper circular="true" autoplay="true" display-multiple-items="2" :vertical="true">
@@ -79,40 +79,38 @@
 			</view>
 
 			<!-- 轮播图 -->
-			<view class="swiper mart20"  v-if="item.type == 2">
+			<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="backcorfff spcarea">
-					<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">
-					<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 class="width94 alijus mart20" v-if="item.type == 6 ">
+				<view class="backcorfff spcarea" v-for="(goods,index) in item.childDate" :key="index">
+					<image mode="widthFix" class="width100" :src="imageUrl+goods.couponImg"></image>
+					<view class="width96 fcor333 font15 fontwig6">{{goods.couponName}}</view>
+					<view class="width96 fcor999 font11">{{goods.salesEndTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}
+					</view>
+					<view class="width94 fcoreb5 font15 fontwig6">¥{{goods.salesPrice}}</view>
 				</view>
-				<view class="backcorfff spcarea">
-					<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="width94 alijus mart20" v-if="item.type == 9 ">
+				<view class="backcorfff spcarea" v-for="(goods,index) in item.childDate" :key="index">
+					<image mode="widthFix" class="width100" :src="imageUrl+goods.listImg"></image>
+					<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,14 +119,15 @@
 					惠享生活
 				</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="../../../static/img/home/home7.png" mode="widthFix" class="width31"></image>
-				<image src="../../../static/img/home/home5.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="imageUrl+item.childCategory[2].imgData" mode="widthFix" class="width31" @click="goGoodsList(imageUrl+item.childCategory[2].jumpUrl)"></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">
+			<!-- 	<view class="width90 mart20 alijusstart" v-if="item.type == 6">
 				<view class="width70 font18 fcor333">
 					{{item.name}}
 				</view>
@@ -506,20 +505,20 @@
 						uni.hideLoading();
 						that.findByLatAndLng(res.longitude, res.latitude);
 					},
-					fail: (err) => {
-						uni.hideLoading();
+					fail: (err) => {
+						uni.hideLoading();
 						if (err.errCode == 2) {
 							uni.showToast({
 								title: '请开启系统定位',
 								duration: 3000,
 								icon: 'none'
 							})
-						}else{
-							uni.showToast({
-								title: '定位失败,请重新进入小程序',
-								duration: 3000,
-								icon: 'none'
-							})
+						} else {
+							uni.showToast({
+								title: '定位失败,请重新进入小程序',
+								duration: 3000,
+								icon: 'none'
+							})
 						}
 					}
 				})
@@ -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
 				})
 			},
 			//拨打客服电话
diff --git a/pages/user/order_list/order_list.vue b/pages/user/order_list/order_list.vue
index 656a825..1723683 100644
--- a/pages/user/order_list/order_list.vue
+++ b/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"