From 682b2865ffadba1d8e00d053bdbfa8b9511a8fe1 Mon Sep 17 00:00:00 2001
From: zqylzcwcxy <347891134@qq.com>
Date: Wed, 22 Mar 2023 21:27:17 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:feat:=20feat(uni-countdown):=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9EshowTime=E5=AF=B9=E8=B1=A1=E5=8F=82=E6=95=B0-?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6=E6=97=B6=E5=88=86=E7=A7=92=E7=9A=84=E5=8D=95?=
 =?UTF-8?q?=E7=8B=AC=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../uni-countdown/uni-countdown.vue           | 92 +++++++++++--------
 1 file changed, 53 insertions(+), 39 deletions(-)

diff --git a/uni_modules/uni-countdown/components/uni-countdown/uni-countdown.vue b/uni_modules/uni-countdown/components/uni-countdown/uni-countdown.vue
index 5f63365e3..84e37f468 100644
--- a/uni_modules/uni-countdown/components/uni-countdown/uni-countdown.vue
+++ b/uni_modules/uni-countdown/components/uni-countdown/uni-countdown.vue
@@ -2,12 +2,12 @@
 	<view class="uni-countdown">
 		<text v-if="showDay" :style="[timeStyle]" class="uni-countdown__number">{{ d }}</text>
 		<text v-if="showDay" :style="[splitorStyle]" class="uni-countdown__splitor">{{dayText}}</text>
-		<text :style="[timeStyle]" class="uni-countdown__number">{{ h }}</text>
-		<text :style="[splitorStyle]" class="uni-countdown__splitor">{{ showColon ? ':' : hourText }}</text>
-		<text :style="[timeStyle]" class="uni-countdown__number">{{ i }}</text>
-		<text :style="[splitorStyle]" class="uni-countdown__splitor">{{ showColon ? ':' : minuteText }}</text>
-		<text :style="[timeStyle]" class="uni-countdown__number">{{ s }}</text>
-		<text v-if="!showColon" :style="[splitorStyle]" class="uni-countdown__splitor">{{secondText}}</text>
+		<text v-if="mergeShowTime.hour" :style="[timeStyle]" class="uni-countdown__number">{{ h }}</text>
+		<text v-if="mergeShowTime.hour" :style="[splitorStyle]" class="uni-countdown__splitor">{{ showColon ? ':' : hourText }}</text>
+		<text v-if="mergeShowTime.minute" :style="[timeStyle]" class="uni-countdown__number">{{ i }}</text>
+		<text v-if="mergeShowTime.minute" :style="[splitorStyle]" class="uni-countdown__splitor">{{ showColon ? ':' : minuteText }}</text>
+		<text v-if="mergeShowTime.second" :style="[timeStyle]" class="uni-countdown__number">{{ s }}</text>
+		<text v-if="!showColon&&mergeShowTime.second" :style="[splitorStyle]" class="uni-countdown__splitor">{{secondText}}</text>
 	</view>
 </template>
 <script>
@@ -43,6 +43,12 @@
 				type: Boolean,
 				default: true
 			},
+      showTime:{
+        type: Object,
+				default () {
+					return {}
+				}
+      },
 			showColon: {
 				type: Boolean,
 				default: true
@@ -58,10 +64,10 @@
 			color: {
 				type: String,
 				default: '#333'
-			},
-			fontSize: {
-				type: Number,
-				default: 14
+			},
+			fontSize: {
+				type: Number,
+				default: 14
 			},
 			splitorColor: {
 				type: String,
@@ -101,6 +107,14 @@
 			}
 		},
 		computed: {
+      mergeShowTime() {
+				return {
+					hour: true,
+					minute: true,
+					second: true,
+					...this.showTime
+				}
+			},
 			dayText() {
 				return t("uni-countdown.day")
 			},
@@ -116,23 +130,23 @@
 			timeStyle() {
 				const {
 					color,
-					backgroundColor,
+					backgroundColor,
 					fontSize
 				} = this
 				return {
 					color,
-					backgroundColor,
-					fontSize: `${fontSize}px`,
-					width: `${fontSize * 22 / 14}px`, // 按字体大小为 14px 时的比例缩放
- 					lineHeight: `${fontSize * 20 / 14}px`,
-					borderRadius: `${fontSize * 3 / 14}px`,
+					backgroundColor,
+					fontSize: `${fontSize}px`,
+					width: `${fontSize * 22 / 14}px`, // 按字体大小为 14px 时的比例缩放
+ 					lineHeight: `${fontSize * 20 / 14}px`,
+					borderRadius: `${fontSize * 3 / 14}px`,
 				}
 			},
-			splitorStyle() {
-				const { splitorColor, fontSize, backgroundColor } = this
-				return {
-					color: splitorColor,
-					fontSize: `${fontSize * 12 / 14}px`,
+			splitorStyle() {
+				const { splitorColor, fontSize, backgroundColor } = this
+				return {
+					color: splitorColor,
+					fontSize: `${fontSize * 12 / 14}px`,
 					margin: backgroundColor ? `${fontSize * 4 / 14}px` : ''
 				}
 			}
@@ -141,10 +155,10 @@
 			day(val) {
 				this.changeFlag()
 			},
-			hour(val) {
+			hour(val) {
 				this.changeFlag()
 			},
-			minute(val) {
+			minute(val) {
 				this.changeFlag()
 			},
 			second(val) {
@@ -214,15 +228,15 @@
 				this.d = day
 				this.h = hour
 				this.i = minute
-				this.s = second
+				this.s = second
 			},
 			startData() {
 				this.seconds = this.toSeconds(this.timestamp, this.day, this.hour, this.minute, this.second)
-				if (this.seconds <= 0) {
-					this.seconds = this.toSeconds(0, 0, 0, 0, 0)
+				if (this.seconds <= 0) {
+					this.seconds = this.toSeconds(0, 0, 0, 0, 0)
 					this.countDown()
 					return
-				}
+				}
 				clearInterval(this.timer)
 				this.countDown()
 				this.timer = setInterval(() => {
@@ -233,11 +247,11 @@
 					}
 					this.countDown()
 				}, 1000)
-			},
-			update(){
-				this.startData();
 			},
-			changeFlag() {
+			update(){
+				this.startData();
+			},
+			changeFlag() {
 				if (!this.syncFlag) {
 					this.seconds = this.toSeconds(this.timestamp, this.day, this.hour, this.minute, this.second)
 					this.startData();
@@ -248,24 +262,24 @@
 	}
 </script>
 <style lang="scss" scoped>
-	$font-size: 14px;
+	$font-size: 14px;
 
-	.uni-countdown {
+	.uni-countdown {
 		display: flex;
 		flex-direction: row;
 		justify-content: flex-start;
-		align-items: center;
+		align-items: center;
 
 		&__splitor {
 			margin: 0 2px;
-			font-size: $font-size;
-			color: #333;
+			font-size: $font-size;
+			color: #333;
 		}
 
-		&__number {
+		&__number {
 			border-radius: 3px;
 			text-align: center;
-			font-size: $font-size;
+			font-size: $font-size;
 		}
 	}
-</style>
+</style>