From c67be5adf8804d81fe47ed391fb383d9db053a1e Mon Sep 17 00:00:00 2001
From: zhengliming <zhengliming@imlianai.com>
Date: Wed, 3 Jan 2024 00:08:19 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E4=BF=AE=E5=A4=8D=E5=80=92=E8=AE=A1?=
 =?UTF-8?q?=E6=97=B6=E6=98=BE=E7=A4=BA=E5=A4=9A=E4=BD=99=E7=9A=84=E3=80=90?=
 =?UTF-8?q?:=E3=80=91=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tn-count-down/tn-count-down.vue           | 110 +++++++++---------
 1 file changed, 57 insertions(+), 53 deletions(-)

diff --git a/tuniao-ui/components/tn-count-down/tn-count-down.vue b/tuniao-ui/components/tn-count-down/tn-count-down.vue
index cd31e69..521e2e0 100644
--- a/tuniao-ui/components/tn-count-down/tn-count-down.vue
+++ b/tuniao-ui/components/tn-count-down/tn-count-down.vue
@@ -9,18 +9,18 @@
       <view class="tn-countdown__item__time" :class="[fontColorClass]" :style="[letterStyle]">
         {{ d }}
       </view>
+	  <view
+	    class="tn-countdown__separator"
+	    :style="{
+	      fontSize: separatorSize + 'rpx',
+	      color: separatorColor,
+	      paddingBottom: separator === 'en' ? '4rpx' : 0
+	    }"
+	  >
+	    {{ separator === 'en' ? (showHours || showMinutes || showSeconds ? ':' : '')  : '天'}}
+	  </view>
     </view>
-    <view 
-      v-if="showHours && (hideZeroDay || (!hideZeroDay && d != '00'))"
-      class="tn-countdown__separator"
-      :style="{
-        fontSize: separatorSize + 'rpx',
-        color: separatorColor,
-        paddingBottom: separator === 'en' ? '4rpx' : 0
-      }"
-    >
-      {{ separator === 'en' ? ':' : '天'}}
-    </view>
+    
     
     <view
       v-if="showHours"
@@ -31,18 +31,19 @@
       <view class="tn-countdown__item__time" :class="[fontColorClass]" :style="[letterStyle]">
         {{ h }}
       </view>
+	  <view
+	    v-if="showMinutes"
+	    class="tn-countdown__separator"
+	    :style="{
+	      fontSize: separatorSize + 'rpx',
+	      color: separatorColor,
+	      paddingBottom: separator === 'en' ? '4rpx' : 0
+	    }"
+	  >
+	    {{ separator === 'en' ? ':' : '时'}}
+	  </view>
     </view>
-    <view 
-      v-if="showMinutes"
-      class="tn-countdown__separator"
-      :style="{
-        fontSize: separatorSize + 'rpx',
-        color: separatorColor,
-        paddingBottom: separator === 'en' ? '4rpx' : 0
-      }"
-    >
-      {{ separator === 'en' ? ':' : '时'}}
-    </view>
+    
     
     <view
       v-if="showMinutes"
@@ -53,40 +54,43 @@
       <view class="tn-countdown__item__time" :class="[fontColorClass]" :style="[letterStyle]">
         {{ m }}
       </view>
+		  <view
+			v-if="showSeconds"
+			class="tn-countdown__separator"
+			:style="{
+			  fontSize: separatorSize + 'rpx',
+			  color: separatorColor,
+			  paddingBottom: separator === 'en' ? '4rpx' : 0
+			}"
+		  >
+			{{ separator === 'en' ? ':' : '分'}}
+		</view>
     </view>
-    <view 
-      v-if="showSeconds"
-      class="tn-countdown__separator"
-      :style="{
-        fontSize: separatorSize + 'rpx',
-        color: separatorColor,
-        paddingBottom: separator === 'en' ? '4rpx' : 0
-      }"
-    >
-      {{ separator === 'en' ? ':' : '分'}}
+   
+	  
+	  <view
+	    class="tn-countdown__item"
+	    :class="[backgroundColorClass]"
+	    :style="[itemStyle]"
+	  >
+	    <view class="tn-countdown__item__time" :class="[fontColorClass]" :style="[letterStyle]">
+	      {{ s }}
+	    </view>
+			<view
+			  class="tn-countdown__separator"
+			  :style="{
+				fontSize: separatorSize + 'rpx',
+				color: separatorColor,
+				paddingBottom: separator === 'en' ? '4rpx' : 0
+			  }"
+			>
+			  {{ separator === 'en' ? '' : '秒'}}
+			</view>
+	  </view>
     </view>
     
-    <view
-      v-if="showSeconds"
-      class="tn-countdown__item"
-      :class="[backgroundColorClass]"
-      :style="[itemStyle]"
-    >
-      <view class="tn-countdown__item__time" :class="[fontColorClass]" :style="[letterStyle]">
-        {{ s }}
-      </view>
-    </view>
-    <view 
-      v-if="showSeconds && separator === 'cn'"
-      class="tn-countdown__separator"
-      :style="{
-        fontSize: separatorSize + 'rpx',
-        color: separatorColor,
-        paddingBottom: separator === 'en' ? '4rpx' : 0
-      }"
-    >
-      秒
-    </view>
+   
+    
   </view>
 </template>