Commit f1d93cc451c60ffb60fe6eeb9d55236363c9ff2d
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
Showing
1 changed file
with
3 additions
and
2 deletions
packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml
| ... | ... | @@ -84,9 +84,10 @@ |
| 84 | 84 | <view>{{order.addTimeFormat}}</view> |
| 85 | 85 | </view> |
| 86 | 86 | |
| 87 | - <view class="item" wx:if="{{order.order_prom_type!=5}}"> | |
| 87 | + <view class="item"> | |
| 88 | 88 | <view>配送方式</view> |
| 89 | - <view>{{(order.shipping_name!=''&& order.shipping_name!=null) ?order.shipping_name:'无'}}</view> | |
| 89 | + <view wx:if="{{order.exp_type == 0}}">{{order.shipping_name}}</view> | |
| 90 | + <view wx:if="{{order.exp_type == 1}}">自提</view> | |
| 90 | 91 | </view> |
| 91 | 92 | <view class="item"> |
| 92 | 93 | <view>买家留言</view> | ... | ... |