Merged
Merge Request #1067 · created by 后端研发-苏明海


Test


From test into qa

Merged by 后端研发-苏明海

1 participants

pages/user/order_detail/order_detail.wxml
... ... @@ -79,8 +79,9 @@
79 79 <view>配送方式</view>
80 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 85 </view>
85 86 <view class="item">
86 87 <view>买家留言</view>
... ...