Commit 693df79c3b7ae1323bac9d6436cc7425b25efee4
Merge branch 'test' into 'qa'
Test See merge request !485
Showing
1 changed file
with
1 additions
and
1 deletions
packageA/pages/quan_list/quan_list.wxml
| ... | ... | @@ -21,7 +21,7 @@ |
| 21 | 21 | <view wx:if="{{item.endtype==0}}">有效期 |
| 22 | 22 | <text wx:if="{{item.starttype==1}}">{{filters.format_time(getcurday+3600*24*item.startdays)}}</text> |
| 23 | 23 | <text wx:if="{{item.starttype==0 && item.use_start_time>0}}"> {{filters.format_time(item.use_start_time)}}</text>至 |
| 24 | - <text wx:if="{{item.use_start_time>0}}"> {{filters.format_time(item.use_end_time)}}</text><text wx:else>不限</text> | |
| 24 | + <text wx:if="{{item.use_end_time>0}}"> {{filters.format_time(item.use_end_time)}}</text><text wx:else>不限</text> | |
| 25 | 25 | </view> |
| 26 | 26 | <view wx:else>有效期 <text wx:if="{{item.starttype==1}}">{{filters.format_time(getcurday+3600*24*item.startdays)}}至</text> <text wx:if="{{item.days>0}}">{{filters.format_time(getcurday+3600*24*item.days)}}</text><text wx:else>不限</text></view> |
| 27 | 27 | <view>每人限领：<text wx:if="{{item.everyone_num>0}}">{{item.everyone_num}}</text><text wx:else>不限</text></view> | ... | ... |