From 80546943ba5e58ed55478a04c8bc5c1a1d18097a Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Wed, 31 May 2023 11:00:20 +0800
Subject: [PATCH] 自提。物流在订单详情页面的显示优化

---
 packageD/pages/shop/order_detail/order_detail.wxml | 5 ++++-
 pages/user/order_detail/order_detail.wxml          | 6 ++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/packageD/pages/shop/order_detail/order_detail.wxml b/packageD/pages/shop/order_detail/order_detail.wxml
index c670adf..c792ebf 100644
--- a/packageD/pages/shop/order_detail/order_detail.wxml
+++ b/packageD/pages/shop/order_detail/order_detail.wxml
@@ -68,7 +68,10 @@
             <view wx:if="{{order.pt_status<4 && order.is_zsorder==4}}">
                 --
             </view>
-            <view wx:else>{{(order.shipping_name!=''&& order.shipping_name!=null) ?order.shipping_name:'自提'}}</view>
+            <view wx:if="{{order.exp_type==2}}">同城配送</view>
+            <view wx:elif="{{order.exp_type==1}}">自提</view>
+            <view wx:else >物流({{order.shipping_name}})</view>
+
         </view>
         <view class="item">
             <view>买家留言</view>
diff --git a/pages/user/order_detail/order_detail.wxml b/pages/user/order_detail/order_detail.wxml
index 22e512e..251af46 100644
--- a/pages/user/order_detail/order_detail.wxml
+++ b/pages/user/order_detail/order_detail.wxml
@@ -79,9 +79,11 @@
             <view>配送方式</view>
             <view wx:if="{{order.pt_status<4 && order.is_zsorder==4}}">
                 --
-            </view>           
+            </view>
+
             <view wx:if="{{order.exp_type==2}}">同城配送</view>
-            <view wx:else>{{(order.shipping_name!=''&& order.shipping_name!=null) ?"物流（"+order.shipping_name+')':'自提'}}</view>
+            <view wx:elif="{{order.exp_type==1}}">自提</view>
+            <view wx:else>物流({{order.shipping_name}})</view>
         </view>
         <view class="item">
             <view>买家留言</view>
--
libgit2 0.21.4