From 249c1656e0610085bf80e37cc10164667ffb2873 Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Tue, 23 Jul 2024 21:47:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=9B=A2=E8=B4=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/my/newTeamlDetail.vue                   | 54 ++++++++++---------
 .../components/u-count-down/u-count-down.vue  |  8 +--
 2 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/pages/my/newTeamlDetail.vue b/pages/my/newTeamlDetail.vue
index 52b6829..e6f6d97 100644
--- a/pages/my/newTeamlDetail.vue
+++ b/pages/my/newTeamlDetail.vue
@@ -3,7 +3,7 @@
 		<view class="header">
 			<view class="header-top" :style="backgroundStyle" @click="goNav('/my/vip/index')">
 				<image src="../../static/servicePackage/member_ba.png" mode="widthFix" v-if="!isVIP"></image>
-				<image src="../../static/activate2.png" mode="widthFix" v-if="isVIP"></image>
+				<!--<image src="../../static/activate2.png" mode="widthFix" v-if="isVIP"></image>-->
 			</view>
 			<view class="group-buy">
 				<view class="group-buy-left">
@@ -18,8 +18,7 @@
 				</view>
 				<view class="group-buy-right">
 					<view class="group-text">距结束仅剩</view>
-					<u-count-down :timestamp="endOfServiceTimer" separator-color="#20C675" color="#20C675"
-						font-size="13" separator-size="13" @change="onCountdownChange"></u-count-down>
+					<u-count-down :timestamp="endOfServiceTimer"  @change="onCountdownChange"></u-count-down>
 					<!-- <uni-countdown :show-day="false" :font-size="13" :day="day" :hour="hours" :minute="minutes" :second="seconds" /> -->
 					<!-- <view><span>08</span>:<span>08</span>:<span>08</span></view> -->
 				</view>
@@ -50,9 +49,9 @@
 			</view>
 		</view>
 		<view class="teamwork-plate" v-if="ordersData!=''&&newTime>0">
+			<view class="teamwork-list">{{mainData.buyGroupNum}}人在拼团，可直接参与</view>
 			<view class=" flex teamwork-line" v-for="(itema,index) in ordersData" :key="index">
 				<view>
-					<view>{{mainData.buyGroupNum}}人在拼团，可直接参与</view>
 					<view v-for="(itemL,indexL) in itema.orderList" :key="indexL" class="avatar">
 						<image style="width: 30px; height: 30px; border-radius:50%;" :src="itemL.avatar"></image>
 						<span>{{itemL.phone}}</span>
@@ -61,8 +60,7 @@
 				<view class="flex" style="align-items: center;">
 					<view class="teamwork-se">
 						<view>还差<span class="team-text">{{itema.lessNum}}人</span>拼成</view>
-						<view>剩余<u-count-down :timestamp="endOfServiceTimer" separator-color="#20C675" color="#20C675"
-						font-size="13" separator-size="13" @change="onCountdownChange"></u-count-down></view>
+						<view>剩余<u-count-down :timestamp="endOfServiceTimer"  @change="onCountdownChange"></u-count-down></view>
 					</view>
 					<view class="teamwork-button" :class="[newTime<=0?'hBtn':'aBtn']" @click="goumai(mainData,itema.groupNo)" v-if="mainData.isNewer!='1'&&newTime>0">去拼团</view>
 				</view>
@@ -258,6 +256,10 @@
 	}
 </script>
 <style scoped>
+	.teamwork-list{
+		font-size: 30rpx;
+		padding: 10rpx 0;
+	}
 	.avatar{
 		display: flex;
 		flex-direction: row;
@@ -837,7 +839,7 @@
 	}
 	.header-bottom-title-num span:nth-child(2){
 		font-weight: bold;
-		color: #08A28A;
+		color: #f52b1b;
 	}
 	.header-bottom-title-num span:nth-child(3){
 		color: #848485;
@@ -913,32 +915,35 @@
 	padding: 30rpx 30rpx;
 	background: linear-gradient(to right, rgb(255, 117, 98), rgb(233, 71, 52));
 	display: flex;
-	justify-content: space-between;
 	}
 	.group_amount{
 	color: #fff;
+	display: flex;
+	align-items: flex-end; 
 	}
 	.group_amount span:nth-child(2){
-	font-size: 50rpx;
+	font-size: 80rpx;
 	font-weight: bold;
+	line-height:68rpx;
 	}
 	.group-rule{
 	display: flex;
 	flex-direction:column;
 	align-items: center;
+	margin-left: 10rpx;
 	}
 	.group-rule span:nth-child(1){
 	color: #fff;
-	font-size:22rpx;
+	font-size:24rpx;
 	text-decoration: line-through;
 	}
 	.group-rule span:nth-child(2){
 	text-align: center;
-	padding: 2rpx 15rpx;
+	padding: 1rpx 8rpx;
 	background:#fff;
 	color: #ed4b3e;
-	font-size: 24rpx;
-	border-radius: 3rpx;
+	font-size: 22rpx;
+	border-radius: 6rpx;
 	}
 	.group-buy-right{
 	width: 34%;
@@ -977,16 +982,16 @@
 	}
 	.teamwork-line{
 	display: flex;
-	padding: 15rpx 0;
+	padding:14rpx 12rpx;
 	justify-content: space-between;
 	}
 	.teamwork-button{
 	padding: 2rpx 15rpx;
 	/* background:#ed4b3e ; */
 	color:#fff;
-	height: 50rpx;
-	line-height: 50rpx;
-	margin-top: 15rpx;
+	height: 60rpx;
+	line-height: 58rpx;
+	margin-top: 10rpx;
 	border-radius: 6rpx;
 	margin-left: 15rpx;
 	}
@@ -994,12 +999,13 @@
 	color: #ed4b3e;
 	}
 	.teamwork-se{
+	width: 300rpx;
 	font-size: 24rpx;
-	text-align: center;
-	margin-top: 6rpx;
+	text-align: left;
+	padding: 2rpx 0;
 	}
 	.tewmwork-prompt{
-		font-size: 24rpx;
+		font-size: 22rpx;
 		color: #ed4b3e;
 		margin-top: 12rpx;
 	}
@@ -1010,10 +1016,10 @@
 	.tewmork-key span{
 		height: 30rpx;
 		line-height: 30rpx;
-		padding: 0 8rpx;
-		font-size: 20rpx;
-		border: 1px #ed4b3e solid ;
-		color: #ed4b3e;
+		padding: 4rpx 14rpx;
+		font-size: 22rpx;
+		background: linear-gradient(90deg, #feeaf4, #fef0f0, #fdf2ec);
+		color: #f52b1b;
 		border-radius: 6rpx;
 		margin-right: 6rpx;
 		margin-top: 6rpx;
diff --git a/uview-ui/components/u-count-down/u-count-down.vue b/uview-ui/components/u-count-down/u-count-down.vue
index 069d620..abdcc5f 100644
--- a/uview-ui/components/u-count-down/u-count-down.vue
+++ b/uview-ui/components/u-count-down/u-count-down.vue
@@ -107,17 +107,17 @@ export default {
 		// 字体颜色
 		color: {
 			type: String,
-			default: '#303133'
+			default: '#fff'
 		},
 		// 字体大小，单位rpx
 		fontSize: {
 			type: [Number, String],
-			default: 30
+			default:26
 		},
 		// 背景颜色
 		bgColor: {
 			type: String,
-			default: '#fff'
+			default: '#222222'
 		},
 		// 数字框高度，单位rpx
 		height: {
@@ -132,7 +132,7 @@ export default {
 		// 边框颜色
 		borderColor: {
 			type: String,
-			default: '#303133'
+			default: '#e83530'
 		},
 		// 是否显示秒
 		showSeconds: {