Commit 64d6725c0e773b0cfe70b2c65336334a3ddc1201

Authored by 后端研发-苏明海
2 parents 4cfd8488 35edf676

Merge branch 'dev' into 'test'

增加配送方式显示

See merge request !1065
pages/user/order_detail/order_detail.wxml
... ... @@ -79,7 +79,8 @@
79 79 <view>配送方式</view>
80 80 <view wx:if="{{order.pt_status<4 && order.is_zsorder==4}}">
81 81 --
82   - </view>
  82 + </view>
  83 + <view wx:if="{{order.exp_type==2}}">同城配送</view>
83 84 <view wx:else>{{(order.shipping_name!=''&& order.shipping_name!=null) ?order.shipping_name:'自提'}}</view>
84 85 </view>
85 86 <view class="item">
... ...