Commit 04dc9e7ceb47f344ece5ce3f16d57744dbad6d5f

Authored by 后端研发-苏明海
2 parents 64d6725c 099dc89a

Merge branch 'dev' into 'test'

订单详情显示优化

See merge request !1066
pages/user/order_detail/order_detail.wxml
@@ -81,7 +81,7 @@ @@ -81,7 +81,7 @@
81 -- 81 --
82 </view> 82 </view>
83 <view wx:if="{{order.exp_type==2}}">同城配送</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 wx:else>{{(order.shipping_name!=''&& order.shipping_name!=null) ?"物流("+order.shipping_name+')':'自提'}}</view>
85 </view> 85 </view>
86 <view class="item"> 86 <view class="item">
87 <view>买家留言</view> 87 <view>买家留言</view>