Commit 950d69da4e2f203ffe9c2e0d592a7db1d8343fa5
Merge branch 'test' into 'qa'
Test See merge request !1067
Showing
1 changed file
with
3 additions
and
2 deletions
pages/user/order_detail/order_detail.wxml
| @@ -79,8 +79,9 @@ | @@ -79,8 +79,9 @@ | ||
| 79 | <view>配送方式</view> | 79 | <view>配送方式</view> |
| 80 | <view wx:if="{{order.pt_status<4 && order.is_zsorder==4}}"> | 80 | <view wx:if="{{order.pt_status<4 && order.is_zsorder==4}}"> |
| 81 | -- | 81 | -- |
| 82 | - </view> | ||
| 83 | - <view wx:else>{{(order.shipping_name!=''&& order.shipping_name!=null) ?order.shipping_name:'自提'}}</view> | 82 | + </view> |
| 83 | + <view wx:if="{{order.exp_type==2}}">同城配送</view> | ||
| 84 | + <view wx:else>{{(order.shipping_name!=''&& order.shipping_name!=null) ?"物流（"+order.shipping_name+')':'自提'}}</view> | ||
| 84 | </view> | 85 | </view> |
| 85 | <view class="item"> | 86 | <view class="item"> |
| 86 | <view>买家留言</view> | 87 | <view>买家留言</view> |