From b2b883b0eda63eaa8a5b85ed6f25cd983dbf801a Mon Sep 17 00:00:00 2001
From: ld0104 <3037885725@qq.com>
Date: Thu, 10 Nov 2022 18:27:14 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E5=88=B8=E4=B8=AD=E5=BF=83=EF=BC=8C?=
 =?UTF-8?q?=E6=88=91=E7=9A=84=E5=88=B8=E5=8C=85=E5=A2=9E=E5=8A=A0=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E4=B8=93=E7=94=A8=E5=88=B8=EF=BC=8C=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E6=A6=9C=E5=8D=95=E8=B7=B3=E8=BD=AC=E7=83=AD=E9=97=A8=E6=A6=9C?=
 =?UTF-8?q?=E5=8D=95=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/css/style.css                   |  3 ++-
 assets/css/style.less                  |  3 ++-
 pages/activity/activity/index.vue      |  7 +++---
 pages/home/index.vue                   | 35 +++++++++++++++-----------
 pages/user/coupon/GetCoupon/index.vue  | 30 +++++++++++++++++++---
 pages/user/coupon/UserCoupon/index.vue | 31 ++++++++++++++++++++---
 6 files changed, 82 insertions(+), 27 deletions(-)

diff --git a/assets/css/style.css b/assets/css/style.css
index f665d16..5bc8403 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -301,13 +301,14 @@ page {
   z-index: 1;
 }
 .coupon-list .item .coupon-left .text-box {
-  padding-top: 46rpx;
+  /* padding-top: 46rpx; */
   padding-left: 46rpx;
   padding-right: 22rpx;
   position: relative;
   z-index: 2;
 }
 .coupon-list .item .coupon-left .text-box .money {
+  padding-top: 46rpx;
   font-size: 92rpx;
   font-family: Futura;
   font-weight: 600;
diff --git a/assets/css/style.less b/assets/css/style.less
index 8064b44..a0224f5 100644
--- a/assets/css/style.less
+++ b/assets/css/style.less
@@ -478,12 +478,13 @@ page {
 }
 
 .coupon-list .item .coupon-left .text-box {
-  padding-top: 46rpx;
+  // padding-top: 46rpx;
   padding-left: 46rpx;
   padding-right: 22rpx;
   position: relative;
   z-index: 2;
   .money {
+	padding-top: 46rpx;
     font-size: 92rpx;
     font-family: Futura;
     font-weight: 600;
diff --git a/pages/activity/activity/index.vue b/pages/activity/activity/index.vue
index 1d883ab..4051e8c 100644
--- a/pages/activity/activity/index.vue
+++ b/pages/activity/activity/index.vue
@@ -27,7 +27,7 @@
 		
 		<view class="activity-content">
 			<!-- <view class="top-nav-box" :style="(activityType !== 0?'height: 104rpx;':'')+(navStyle?'position: fixed;top:'+CustomBar+'px;left: 0;':'')"> -->
-				<view class="top-nav-box" :style="(activityType !== 0?'':'')+(navStyle?'position: fixed;top:'+CustomBar+'px;left: 0;':'')">
+				<view class="top-nav-box" :style="(navStyle?'position: fixed;top:'+CustomBar+'px;left: 0;':'')">
 				<view class="activity-type-box acea-row row-center">
 					<view class="item" @click="setActivityType(0)">
 						<view :class="'title ' + (activityType === 0? 'active' : '')">秒杀专区</view>
@@ -45,7 +45,8 @@
 					<view :class="'tab ' + (tabType === 1 ? 'active' : '')" @click="setTabType(1)">{{activityType==0?'下期预告':'已参与'}}</view>
 				</view>
 			</view>
-			<view class="list-box" :style="navStyle?(activityType !== 0?'padding-top:104rpx':'padding-top:186rpx'):''">
+			<view class="list-box" :style="navStyle?'padding-top:186rpx':''">
+				<!-- <view class="list-box" :style="navStyle?(activityType !== 0?'padding-top:104rpx':'padding-top:186rpx'):''"> -->
 				<view class="countdown-box acea-row row-between-wrapper" v-if="activityType === 0 && tabType === 0 && timeList[seckillActive].stop">
 					<view class="acea-row row-middle">
 						<view class="text">{{timeList[seckillActive].status == 2 ? timeList[seckillActive].time + '即将开始' : '本轮结束仅剩'}}</view>
@@ -92,7 +93,7 @@
 		<!-- 提示弹窗 -->
 		<view class="mask" @touchmove.stop.prevent :hidden="active === false && isShowRule === false" @click="close">
 				<view class="bargainTip" style="padding-bottom: 0;" :class="isShowRule === true ? 'on' : ''">
-					<view class="rule-content" v-html="timeList.rule"></view>
+						<view class="rule-content" v-html="timeList[0].rule"></view>
 				</view>
 		</view>
 	</view>
diff --git a/pages/home/index.vue b/pages/home/index.vue
index eae9e74..d444cb9 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -757,22 +757,27 @@
 			//     },
 			//   })
 			// },
+			// goGoodsCon(item) {
+			// 	if(item.isIntegral === 1) {
+			// 		this.$yrouter.push({
+			// 		  path: '/pages/shop/IntegralGoodsCon/index',
+			// 		  query: {
+			// 		    id: item.id,
+			// 		  },
+			// 		})
+			// 	} else {
+			// 		this.$yrouter.push({
+			// 			path: '/pages/shop/GoodsCon/index',
+			// 			query: {
+			// 				id: item.id,
+			// 			},
+			// 		})
+			// 	}
+			// },
 			goGoodsCon(item) {
-				if(item.isIntegral === 1) {
-					this.$yrouter.push({
-					  path: '/pages/shop/IntegralGoodsCon/index',
-					  query: {
-					    id: item.id,
-					  },
-					})
-				} else {
-					this.$yrouter.push({
-						path: '/pages/shop/GoodsCon/index',
-						query: {
-							id: item.id,
-						},
-					})
-				}
+				this.$yrouter.push({
+					path: '/pages/shop/HotNewGoods/index',
+				})
 				
 			},
 			// goGoodsPromotion() {
diff --git a/pages/user/coupon/GetCoupon/index.vue b/pages/user/coupon/GetCoupon/index.vue
index f7c3a2d..ab9804f 100644
--- a/pages/user/coupon/GetCoupon/index.vue
+++ b/pages/user/coupon/GetCoupon/index.vue
@@ -35,12 +35,16 @@
 				<view class="coupon-left">
 					<image class="left-bg" src="@/static/images/coupon-bg2.png" mode=""></image>
 					<view class="text-box">
-						<view class="money">¥{{ item.couponPrice }}</view>
+						<view v-if="item.image.length>0" class="wrapper acea-row row-middle">
+							<image class="img" :src="img" mode="" v-for="(img,imgIndex) in item.image.slice(0,3)" :key="imgIndex"></image>
+						</view>
+						<view v-else class="money">¥{{ item.couponPrice }}</view>
+						<!-- <view class="money">¥{{ item.couponPrice }}</view> -->
 						<!-- <view class="money">7<text>折</text></view> -->
 						<view class="line"></view>
-						<view class="tip acea-row row-between">
+						<view class="tip acea-row row-middle row-between">
 							<!-- <view class="">{{item.ctype?'仅限定品牌可用':'全部商品可用'}}</view> -->
-							<view class="">全部商品可用</view>
+							<view class="">{{item.cname}}</view>
 							<view v-if="item.endTime === 0">不限时</view>
 							<view v-else>{{ item.startTime }}-{{ item.endTime }}</view>
 						</view>
@@ -48,7 +52,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">{{(item.image.length>0?(item.couponPrice)+'元' :'满减券') || '折扣券'}}</view>
 					<view class="tip">满{{ item.useMinPrice }}可用</view>
 					<!-- <view v-if="item._msg == '已过期'" class="btn btn-fail">不可用</view> -->
 					<view v-if="item.isUse === true" class="btn btn-white" @click="goBrands">去使用</view>
@@ -201,6 +205,24 @@ export default {
 </script>
 
 <style lang="less" scoped>
+	.coupon-list{
+		.wrapper{
+			padding: 0 15rpx;
+			box-sizing: content-box;
+			height: 100%;
+			.img{
+				width: 110rpx;
+				height: 110rpx;
+				border-radius: 16rpx;
+				margin:33rpx 37rpx 14rpx 0;
+				background-color: #fff;
+			}
+			.img:nth-child(3){
+				margin-right: 0;
+			}
+		}
+	}
+	
 	.header {
 		.tab-title {
 			font-size: 32rpx;
diff --git a/pages/user/coupon/UserCoupon/index.vue b/pages/user/coupon/UserCoupon/index.vue
index c9c6d46..3989b32 100644
--- a/pages/user/coupon/UserCoupon/index.vue
+++ b/pages/user/coupon/UserCoupon/index.vue
@@ -35,11 +35,14 @@
 						<image v-if="item._msg == '已过期'" class="left-bg" src="@/static/images/coupon-bg3.png" mode=""></image>
 						<image v-else class="left-bg" src="@/static/images/coupon-bg2.png" mode=""></image>
 						<view class="text-box">
-							<view class="money">¥{{ item.couponPrice }}</view>
+							<view v-if="item.image.length>0" class="wrapper acea-row row-middle">
+								<image class="img" :src="img" mode="" v-for="(img,imgIndex) in item.image.slice(0,3)" :key="imgIndex"></image>
+							</view>
+							<view v-else class="money">¥{{ item.couponPrice }}</view>
 							<!-- <view class="money">7<text>折</text></view> -->
 							<view class="line"></view>
 							<view class="tip acea-row row-between">
-								<view class="">全部商品可用</view>
+								<view class="">{{item.cname}}</view>
 								<view v-if="item.endTime === 0">不限时</view>
 								<view v-else>{{navType===0? item.startTime : item.useStartTime }}-{{navType===0? item.endTime:item.useEndTime}}</view>
 							</view>
@@ -51,7 +54,7 @@
 						<image v-else-if="item.isUse" class="tag" src="../../../../static/images/gotCoupon-icon.png" mode="">
 						<image v-else-if="item._msg=='可使用'" class="tag" src="../../../../static/images/gotCoupon-icon.png" mode="">
 						</image>
-						<view :class="'type '+(item._msg == '已过期'?'col-fail':'')">{{'满减券' || '折扣券'}}</view>
+						<view :class="'type '+(item._msg == '已过期'?'col-fail':'')">{{(item.image.length>0?(item.couponPrice)+'元' :'满减券') || '折扣券'}}</view>
 						<view :class="'tip '+(item._msg == '已过期'?'col-fail':'')">满{{ item.useMinPrice }}可用</view>
 						<view v-if="item._msg == '已过期'" class="btn btn-fail">不可用</view>
 						<view v-else class="btn" @click="getCoupon(item.id,index)">{{navType===0 && item.isUse? '已领取' : (navType===0 ?'立刻领取' :'去使用')}}</view>
@@ -133,6 +136,9 @@
 		},
 		methods: {
 			setType(i) {
+				uni.showLoading({
+					title:''
+				})
 				if (this.navType == i) return;
 				this.navType = i;
 				this.couponsList=[];
@@ -216,6 +222,7 @@
 						this.loading = false
 					})
 				}
+				uni.hideLoading();
 			},
 			// getUseCoupons: function(i) {
 			// 	if (this.loading) return //阻止下次请求（false可以进行请求）；
@@ -252,6 +259,24 @@
 </script>
 
 <style lang="less" scoped>
+	.coupon-list{
+		.wrapper{
+			padding: 0 15rpx;
+			box-sizing: content-box;
+			height: 100%;
+			.img{
+				width: 110rpx;
+				height: 110rpx;
+				border-radius: 16rpx;
+				margin:33rpx 37rpx 14rpx 0;
+				background-color: #fff;
+			}
+			.img:nth-child(3){
+				margin-right: 0;
+			}
+		}
+	}
+	
 	.header {
 		.tab-title {
 			font-size: 32rpx;