From b0ca5decbe3b9dce7b949a696dda966aada139d9 Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Mon, 25 Apr 2022 14:23:57 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=92=E6=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../goods/detail/components/SeckillPrice.vue  | 20 +++++++++++-------
 pages/goods/detail/components/SkuPopup.vue    |  9 ++++++--
 pages/goods/detail/index.vue                  |  4 ++--
 pages/seckill.vue                             | 21 +++++++++++--------
 4 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/pages/goods/detail/components/SeckillPrice.vue b/pages/goods/detail/components/SeckillPrice.vue
index 983283a..7483308 100644
--- a/pages/goods/detail/components/SeckillPrice.vue
+++ b/pages/goods/detail/components/SeckillPrice.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-04-12 17:33:42
  * @LastEditors: ch
- * @LastEditTime: 2022-04-24 19:01:45
+ * @LastEditTime: 2022-04-25 11:56:49
  * @Description: file content
 -->
 <template>
@@ -11,8 +11,9 @@
 			<view class="seckill--price-box" v-if="activityStatus === 'noStartActivity'">
 				<text class="seckill--price-icon">￥</text>
 				<text class="seckill--price">{{data.originalPrice}}</text>
+				<text class="seckill--price-icon">起</text>
 			</view>
-			<view class="seckill--price-box " v-else>
+			<view class="seckill--price-box" v-else>
 				<text class="seckill--price-icon">￥</text>
 				<text class="seckill--price">{{data.activityPrice}}</text>
 				<text class="seckill--price-org">￥{{data.originalPrice}}</text>
@@ -21,7 +22,7 @@
 				<view class="seckill--timer-title">
 					{{activityStatus === 'startActivity' ? '距结束仅剩' : '即将开始秒杀' }}
 				</view>
-				<view v-if="isDay" class="seckill--date">{{startDate}}开始</view>
+				<view v-if="!isDay" class="seckill--date">{{startDate}}开始</view>
 				<view v-else class="seckill--timer">
 					<view>{{hours}}</view>
 					<text>:</text>
@@ -141,32 +142,37 @@ export default {
 	position: relative;
 	display: flex;
 	justify-content: space-between;
-	padding: 0 20rpx 0 260rpx;
+	padding: 0 20rpx 0 27rpx;
 	background-image: url('@/static/goods/seckill.png');
 	background-repeat : no-repeat;
 	background-size: 100%;
 	&__start{
 		padding: 0 20rpx 0 108rpx;
 		background-image: url('@/static/goods/seckill_start.png');
+		.seckill--price-icon,.seckill--price{
+			color: $color-grey0;
+		}
 
 	}
 	&--price-box{
 		padding-top: 30rpx;
 	}
 	&--price-icon{
-		color: $color-grey0;
+		color: $color-yellow4;
 		font-weight: bold;
 		font-size: 32rpx;
 	}
 	&--price{
-		color: $color-grey0;
+		color: $color-yellow4;
 		font-weight: bold;
 		font-size: 50rpx;
+		margin-right: 10rpx;
+
 	}
 	&--price-org{
 		color: $color-grey0;
 		text-decoration: line-through;
-		margin-left: 15rpx;
+		margin-left: 6rpx;
 	}
 	&--timer-title{
 		margin: 20rpx 0 10rpx 0;
diff --git a/pages/goods/detail/components/SkuPopup.vue b/pages/goods/detail/components/SkuPopup.vue
index b7ea5f3..e57470e 100644
--- a/pages/goods/detail/components/SkuPopup.vue
+++ b/pages/goods/detail/components/SkuPopup.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-24 11:30:55
  * @LastEditors: ch
- * @LastEditTime: 2022-04-25 10:20:48
+ * @LastEditTime: 2022-04-25 14:16:35
  * @Description: file content
 -->
 <template>
@@ -11,7 +11,10 @@
 			<view class="product-info">
 				<image class="product-info--img" src="https://msb-edu-dev.oss-cn-beijing.aliyuncs.com/test/1.png"/>
 				<view>
-					<view class="product-info--price">￥{{curSku.sellPrice}}</view>
+					<view v-if="curSku.sellPrice" class="product-info--price">￥{{curSku.sellPrice}}</view>
+					<view v-else class="product-info--price">
+							￥{{activityStatus === 'startActivity' ? goodsInfo.productActivityVO.activityPrice : goodsInfo.startingPrice}}
+					</view>
 					<view class="product-info--sku">{{curSku.name}}</view>
 					<view>库存：{{curSku.stock}}</view>
 				</view>
@@ -171,6 +174,8 @@ export default {
 			// 设置当前点击选项选中
 			this.$set(item,'active', !active);
 			this.setDisabledItem(item, groupIndex);
+
+			this.$emit('input',this.curSku);
 			
 		},
 		/**
diff --git a/pages/goods/detail/index.vue b/pages/goods/detail/index.vue
index 8fdbb2a..7715d68 100644
--- a/pages/goods/detail/index.vue
+++ b/pages/goods/detail/index.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-23 17:27:21
  * @LastEditors: ch
- * @LastEditTime: 2022-04-24 21:57:07
+ * @LastEditTime: 2022-04-25 14:07:04
  * @Description: file content
 -->
 <template>
@@ -24,7 +24,7 @@
 		</view>
 		<view class="select">
 			<Service></Service>
-			<u-cell label="选择" :value="curSku.name" :border="false" isLink @click="onShowSkuPopup(1)"></u-cell>
+			<u-cell label="选择" :value="curSku.name || '请选择规格'" :border="false" isLink @click="onShowSkuPopup(1)"></u-cell>
 			<SkuPopup v-model="curSku" :visible.sync="showSkuPopup" :mode="skuMode" 
 				:goodsInfo="goods" :skuInfo="skuInfoData" :activityStatus="activityStatus">
 			</SkuPopup>
diff --git a/pages/seckill.vue b/pages/seckill.vue
index d21739c..a8f8d72 100644
--- a/pages/seckill.vue
+++ b/pages/seckill.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-21 18:08:07
  * @LastEditors: ch
- * @LastEditTime: 2022-04-24 17:11:09
+ * @LastEditTime: 2022-04-25 10:43:11
  * @Description: file content
 -->
 <template>
@@ -41,7 +41,7 @@
 				</view>
 			</view>
 		</view>
-		<u-loadmore :status="loadingStatus" color="#fff" iconColor="#fff" nomoreText="我也是有底线的啦~"/>
+		<u-loadmore :status="loadingStatus" color="#FF8384" iconColor="#FF8384" nomoreText="我也是有底线的啦~"/>
 
 	</view>
 </template>
@@ -123,7 +123,7 @@ page{
 	width: 750rpx;
 }
 .tab{
-	height:120rpx;
+	height:116rpx;
 	margin: 20rpx 18rpx 0;
 	background: linear-gradient(180deg, #FDDBAE 0%, #FEC793 25%, #FFB378 97%, #FFB378 100%);
 	display: flex;
@@ -132,6 +132,7 @@ page{
 	text-align: center;
 	position: relative;
 	padding: 0 30rpx;
+	border: 4rpx solid #FFB556;
 	&::after,&::before{
 		display: block;
 		content: '';
@@ -141,11 +142,12 @@ page{
 		transform: rotate(180deg);
 		background-size: 24rpx;
 		position: absolute;
-		right: 0;
-		top: -22rpx;
+		right: -4rpx;
+		top: -30rpx;
 	}
 	&::before{
-		left: 0;
+		left: -4rpx;
+		top: -23rpx;
 		transform: rotate(0deg);
 	}
 	&--item{
@@ -153,13 +155,14 @@ page{
 		line-height: 45rpx;
 		text{
 			color: #EF6817;
+			&.tab--time{
+				font-weight: bold;
+			}
 		}
 		&__active text{
 			color: #F53739;
 		}
-		&__active .tab--time{
-			font-weight: bold;
-		}
+		
 	}
 	&--time{
 		display: block;