Commit ad5e352d20a62e503b5a2fa5e6b22c4d10287fc8

Authored by taiyuan
2 parents 1ad9b5dd 06ea40f3

Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

packageA/pages/myGift/myGift.wxml
... ... @@ -55,7 +55,7 @@
55 55 <!-- 标题 -->
56 56 <view class="mgb10 ellipsis-2 lh taj">{{item.lbtitle}}</view>
57 57 <!-- 时间 -->
58   - <view class="date pdb20">兑换截止日期 {{filter.format_time(item.expdate,1)}}</view>
  58 + <view class="date pdb20" wx:if="{{item.lbtype==1}}">兑换截止日期 {{filter.format_time(item.expdate,1)}}</view>
59 59 <view catchtap="show_remark" data-index="{{index}}" wx:if="{{item.lbintro}}" class="date pdb20">活动说明</view>
60 60 </view>
61 61 <!-- 说明 -->
... ...