From 226cc79a9374f107c1d83387f03775344d9420de Mon Sep 17 00:00:00 2001
From: ld0104 <3037885725@qq.com>
Date: Mon, 14 Nov 2022 18:33:01 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=A6=9C=E5=8D=95=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E7=83=AD=E9=97=A8=E6=A6=9C=E5=8D=95=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=EF=BC=8C=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E4=BC=98?=
 =?UTF-8?q?=E6=83=A0=E5=88=B8UI=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/CountDown.vue              |  3 ++-
 components/CouponListWindow.vue       | 27 +++++++++++++++++++++++----
 pages/home/index.vue                  | 21 +++++++++++++--------
 pages/order/OrderSubmission/index.vue |  2 +-
 pages/shop/HotNewGoods/index.vue      |  6 ++++--
 5 files changed, 43 insertions(+), 16 deletions(-)

diff --git a/components/CountDown.vue b/components/CountDown.vue
index 26e607b..c163712 100644
--- a/components/CountDown.vue
+++ b/components/CountDown.vue
@@ -155,7 +155,8 @@ export default {
 			font-family: PingFang SC;
 			font-weight: 600;
 			color: #3A3A3C;
-			line-height: 38rpx;
+			line-height: 60rpx;
+			height: 60rpx;
 		}
 	}
 </style>
diff --git a/components/CouponListWindow.vue b/components/CouponListWindow.vue
index df9fb91..6fbbc38 100644
--- a/components/CouponListWindow.vue
+++ b/components/CouponListWindow.vue
@@ -17,11 +17,15 @@
 						<view class="coupon-left">
               <image class="left-bg" src="@/static/images/coupon-bg2.png" mode=""></image>
 							<view class="text-box">
-								<view class="money" style="padding-top: 0;">¥{{ coupon.couponPrice }}</view>
+								<view v-if="coupon.image.length>0" class="wrappers acea-row row-middle">
+									<image class="img" :src="img" mode="" v-for="(img,imgIndex) in coupon.image.slice(0,3)" :key="imgIndex"></image>
+								</view>
+								<view v-else class="money" style="padding-top: 28rpx;">¥{{ coupon.couponPrice }}</view>
 								<!-- <view class="money">7<text>折</text></view> -->
 								<view class="line"></view>
 								<view class="tip acea-row row-between">
-									<view class="">{{coupon.ctype?'仅限定品牌可用':'全部商品可用'}}</view>
+									<!-- <view class="">{{coupon.ctype?'仅限定品牌可用':'全部商品可用'}}</view> -->
+									<view class="">{{coupon.cname}}</view>
 									<view v-if="coupon.endTime === 0">不限时</view>
 									<view v-else>到期时间{{ coupon.endTime }}</view>
 								</view>
@@ -29,7 +33,7 @@
 						</view>
 						<view class="coupon-right acea-row row-center-column">
 							<!-- <image v-if="item.isUse === true" class="tag" src="@/static/images/gotCoupon-icon.png" mode=""></image> -->
-							<view class="type">{{'满减券' || '折扣券'}}</view>
+							<view class="type">{{coupon.image.length>0? (coupon.couponPrice+'元'):'满减券' || '折扣券'}}</view>
 							<view class="tip">满{{ coupon.useMinPrice }}可用</view>
 							<view class="iconfont icon-xuanzhong1 font-color-red" v-if="checked === coupon.id"></view>
 							<view class="iconfont icon-weixuanzhong" v-else></view>
@@ -80,9 +84,24 @@
 		left: 16rpx;
 	}
 	.text-box {
-		padding-top: 28rpx;
+		// padding-top: 28rpx;
 		padding-left: 32rpx;
 		padding-right: 30rpx;
+		.wrappers{
+			padding: 0 15rpx;
+			box-sizing: content-box;
+			height: 100%;
+			.img{
+				width: 110rpx;
+				height: 110rpx;
+				border-radius: 16rpx;
+				margin:12rpx 37rpx 12rpx 0;
+				background-color: #fff;
+			}
+			.img:nth-child(3){
+				margin-right: 0;
+			}
+		}
 	}
 }
 .icon-weixuanzhong {
diff --git a/pages/home/index.vue b/pages/home/index.vue
index e335ca9..c406714 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -113,11 +113,11 @@
 					<view class="text">秒杀专区</view>
 					<CountDown :isDay="true" :dayText="' 天 '" :hourText="' 时 '" :minuteText="' 分 '" :secondText="' 秒'" :datatime="timeList[seckillActive].stop"></CountDown>
 				</view>
-				<view class="">
-					<navigator url="/pages/activity/activity/index">
-						<text>更多活动</text>
-					</navigator>
-					<view class="jiantou-right"></view>
+				<view class="" hover-class="none">
+						<view class="hoverClass acea-row row-middle" hover-class="none" @click="goActivity">
+							更多活动
+						</view>
+						<!-- <view class="jiantou-right"></view> -->
 				</view>
 			</view>
 			<view class="seconds-list acea-row" v-if="seckillList.length>0">
@@ -668,6 +668,11 @@
 				}
 				
 			},
+			goActivity(){
+				this.$yrouter.push({
+				  path: "/pages/activity/activity/index",
+				});
+			},
 			goComDetail(item){
 				let id=item.id
 				this.$yrouter.push({
@@ -1184,7 +1189,7 @@
 			text-align: center;
 			margin-right: 18rpx;
 		}
-		text::after {
+		.hoverClass::after {
 			content: '';
 			display: inline-block;
 			width: 0;
@@ -1193,9 +1198,9 @@
 			border-left: 10rpx solid #2DB5AE;
 			border-bottom: 6rpx solid transparent;
 			border-right: 0rpx solid transparent;
-			margin: 0 20rpx 4rpx 8rpx;
+			margin: 0 20rpx 0 8rpx;
 		}
-		text{
+		.hoverClass{
 			font-size: 24rpx;
 			color: #2DB5AE;
 		}
diff --git a/pages/order/OrderSubmission/index.vue b/pages/order/OrderSubmission/index.vue
index 8168b1e..471da71 100644
--- a/pages/order/OrderSubmission/index.vue
+++ b/pages/order/OrderSubmission/index.vue
@@ -74,7 +74,7 @@
 			<view class="item acea-row row-between-wrapper" @click="couponTap">
 				<view class="coupon-info acea-row row-between-wrapper">
 					<view>{{ usableCoupon.couponTitle || '选择优惠券' }}</view>
-					<view class="coupon-value" v-if="usableCoupon.couponTitle">-¥{{usableCoupon.couponPrice}}</view>
+					<view class="coupon-value" v-if="usableCoupon.cname">-¥{{usableCoupon.couponPrice}}</view>
 				</view>
 			  <image src="../../../static/images/right.png" mode=""></image>
 			</view>
diff --git a/pages/shop/HotNewGoods/index.vue b/pages/shop/HotNewGoods/index.vue
index f234730..a7e1e53 100644
--- a/pages/shop/HotNewGoods/index.vue
+++ b/pages/shop/HotNewGoods/index.vue
@@ -122,7 +122,7 @@ export default {
   data: function() {
     return {
 			banner: [],
-			classifyType: 0,
+			classifyType: -1,
 			classifyList: [],
 			mouthList: [],
 			mouthIndex: 0,
@@ -206,10 +206,11 @@ export default {
 				}else{
 					// this.form.hotListId = this.classifyList[this.classifyType].id;
 					this.form.hotListId = '';
-					this.subclassList = this.classifyList[this.classifyType].cateDtos;
+					this.subclassList = this.classifyList[0].cateDtos;
 					this.subclass = this.subclassList[0];
 					// this.form.cateId = this.subclass.cateId;
 					this.form.cateId = ' ';
+					this.classifyType=0
 					this.getHotList();
 				}
 				
@@ -233,6 +234,7 @@ export default {
 		},
 		// 榜单
 		changeClassify(i) {
+			
 			if(this.classifyType == i) return
 			this.classifyType = i;
 			this.form.hotListId = this.classifyList[this.classifyType].id;