Loki
/
zsw-farm-bxg
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

合并冲突

zyh
Gao xiaosong 3 years ago
parent
b401dd207a
commit
c2049a4e90
1 changed files with 1 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      components/t-goods-item/t-goods-item.vue

2
components/t-goods-item/t-goods-item.vue
Unescape View File

@ -25,7 +25,7 @@
</tui-button> --> </tui-button> -->
<view class="grab bg-color-red" v-if="timeList[active].status === 1 && item.stock > 0" @click="goDetail">马上抢</view> <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" 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 class="grab bg-color-red" v-if="timeList[active].status === 0" >已结束</view>
</view> </view>
</view> </view>

Write Preview
Loading…
Cancel
Save