Skip to content

S
self-support
Commit 699c230b authored by Facius's avatar Facius
Browse files
Options

fix: 代码合并遗漏

parent 9c6d9ebb
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 18 deletions
src/components/order/index.vue
View file @ 699c230b
...@@ -68,24 +68,26 @@ ...@@ -68,24 +68,26 @@
</view> </view>
</view> </view>
<view class="bottom-view"> <view class="bottom-view">
<view v-if="showCountTime" class="bottom-left-view"> <view>
<view :class="['bottom-tag-view', { timeout: timeout }]" <view v-if="showCountTime" class="bottom-left-view">
><text>{{ tagText }}</text></view <view :class="['bottom-tag-view', { timeout: timeout }]"
> ><text>{{ tagText }}</text></view
<u-count-down >
:timestamp="timestamp" <u-count-down
font-size="40" :timestamp="timestamp"
show-days font-size="40"
separator="zh" show-days
:color="timeout ? '#FA5A49' : '#FF930D'" separator="zh"
@change="handleChange" :color="timeout ? '#FA5A49' : '#FF930D'"
separator-color="#666666" @change="handleChange"
ref="order-count-down" separator-color="#666666"
></u-count-down> ref="order-count-down"
</view> ></u-count-down>
<view v-else-if="showTime"> </view>
<text>{{ timeTitle }}</text> <view v-else-if="showTime">
<text>{{ timeText }}</text> <text>{{ timeTitle }}</text>
<text>{{ timeText }}</text>
</view>
</view> </view>
<u-button <u-button
class="right-btn" class="right-btn"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment