合并冲突

This commit is contained in:
Gao xiaosong
2021-11-12 22:46:09 +08:00
parent b401dd207a
commit c2049a4e90

View File

@ -25,7 +25,7 @@
</tui-button> -->
<view class="grab bg-color-red" v-if="timeList[active].status === 1 && item.stock > 0" @click="goDetail">马上抢</view>
<view class="grab" v-if="timeList[active].status === 1 && item.stock <= 0">已售磬</view>
<view class="grab bg-color-red" v-if="timeList[active].status === 2">即将开始</view>
<view class="grab bg-color-red" v-if="timeList[active].status === 2" >即将开始</view>
<view class="grab bg-color-red" v-if="timeList[active].status === 0" >已结束</view>
</view>
</view>