Commit 0793d39d71282e14e96e8e317f0f49a6ff27ecf2
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into test
Showing
1 changed file
with
9 additions
and
1 deletions
components/diy_pregoods/diy_pregoods.wxml
| ... | ... | @@ -33,7 +33,7 @@ |
| 33 | 33 | |
| 34 | 34 | <block wx:if="{{aitem.start_time>newTime}}"> |
| 35 | 35 | <view class="rob"> |
| 36 | - <span class='s_top_kill' style="background-color: #ffe718">即将开始</span> | |
| 36 | + <span class='s_top_kill' style="background-color: #fdcb08">即将开始</span> | |
| 37 | 37 | </view> |
| 38 | 38 | </block> |
| 39 | 39 | |
| ... | ... | @@ -118,6 +118,14 @@ |
| 118 | 118 | </block> |
| 119 | 119 | |
| 120 | 120 | |
| 121 | + <block wx:if="{{aitem.start_time>newTime}}"> | |
| 122 | + <view class="rob"> | |
| 123 | + <view class="wo" style="background-color: #fdcb08">即将开始</view> | |
| 124 | + </view> | |
| 125 | + </block> | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 121 | 129 | </view> |
| 122 | 130 | </view> |
| 123 | 131 | </navigator> | ... | ... |