[fix] 修复倒计时显示多余的【:】的问题

This commit is contained in:
zhengliming
2024-01-03 00:08:19 +08:00
parent 344f681181
commit c67be5adf8
@@ -9,9 +9,7 @@
<view class="tn-countdown__item__time" :class="[fontColorClass]" :style="[letterStyle]"> <view class="tn-countdown__item__time" :class="[fontColorClass]" :style="[letterStyle]">
{{ d }} {{ d }}
</view> </view>
</view>
<view <view
v-if="showHours && (hideZeroDay || (!hideZeroDay && d != '00'))"
class="tn-countdown__separator" class="tn-countdown__separator"
:style="{ :style="{
fontSize: separatorSize + 'rpx', fontSize: separatorSize + 'rpx',
@@ -19,8 +17,10 @@
paddingBottom: separator === 'en' ? '4rpx' : 0 paddingBottom: separator === 'en' ? '4rpx' : 0
}" }"
> >
{{ separator === 'en' ? ':' : '天'}} {{ separator === 'en' ? (showHours || showMinutes || showSeconds ? ':' : '') : '天'}}
</view> </view>
</view>
<view <view
v-if="showHours" v-if="showHours"
@@ -31,7 +31,6 @@
<view class="tn-countdown__item__time" :class="[fontColorClass]" :style="[letterStyle]"> <view class="tn-countdown__item__time" :class="[fontColorClass]" :style="[letterStyle]">
{{ h }} {{ h }}
</view> </view>
</view>
<view <view
v-if="showMinutes" v-if="showMinutes"
class="tn-countdown__separator" class="tn-countdown__separator"
@@ -43,6 +42,8 @@
> >
{{ separator === 'en' ? ':' : '时'}} {{ separator === 'en' ? ':' : '时'}}
</view> </view>
</view>
<view <view
v-if="showMinutes" v-if="showMinutes"
@@ -53,7 +54,6 @@
<view class="tn-countdown__item__time" :class="[fontColorClass]" :style="[letterStyle]"> <view class="tn-countdown__item__time" :class="[fontColorClass]" :style="[letterStyle]">
{{ m }} {{ m }}
</view> </view>
</view>
<view <view
v-if="showSeconds" v-if="showSeconds"
class="tn-countdown__separator" class="tn-countdown__separator"
@@ -65,9 +65,10 @@
> >
{{ separator === 'en' ? ':' : '分'}} {{ separator === 'en' ? ':' : '分'}}
</view> </view>
</view>
<view <view
v-if="showSeconds"
class="tn-countdown__item" class="tn-countdown__item"
:class="[backgroundColorClass]" :class="[backgroundColorClass]"
:style="[itemStyle]" :style="[itemStyle]"
@@ -75,9 +76,7 @@
<view class="tn-countdown__item__time" :class="[fontColorClass]" :style="[letterStyle]"> <view class="tn-countdown__item__time" :class="[fontColorClass]" :style="[letterStyle]">
{{ s }} {{ s }}
</view> </view>
</view>
<view <view
v-if="showSeconds && separator === 'cn'"
class="tn-countdown__separator" class="tn-countdown__separator"
:style="{ :style="{
fontSize: separatorSize + 'rpx', fontSize: separatorSize + 'rpx',
@@ -85,8 +84,13 @@
paddingBottom: separator === 'en' ? '4rpx' : 0 paddingBottom: separator === 'en' ? '4rpx' : 0
}" }"
> >
{{ separator === 'en' ? '' : '秒'}}
</view> </view>
</view>
</view>
</view> </view>
</template> </template>