From 1e2dc16a995dcd1a221192d47d53c1b00b02ae1e Mon Sep 17 00:00:00 2001
From: WXD-SEASON\season <season.su@yolipai.com>
Date: Mon, 29 May 2023 15:12:57 +0800
Subject: [PATCH] 119893开发

---
 packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js | 12 +++++++++++-
 packageD/pages/shop/order_detail/order_detail.js      | 13 +++++++++++--
 pages/user/order_detail/order_detail.js               | 10 +++++++++-
 pages/user/order_list/order_list.wxml                 | 25 ++++++++++++++++++++-----
 4 files changed, 51 insertions(+), 9 deletions(-)

diff --git a/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js b/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js
index 31cd6c0..da9ecc7 100644
--- a/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js
+++ b/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js
@@ -82,7 +82,17 @@ Page({
                     r.order_status_detail="待支付"; r.pay_btn=1;
                 }
                 if (r.order_status == 1 && r.pay_status == 1 && r.shipping_status== 0)
-                   r.order_status_detail = "待发货";
+                {
+                  //自提的话
+                  if (r.exp_type==1)
+                  {
+                   r.order_status_detail = "待自提";
+                  }
+                  else
+                  {
+                    r.order_status_detail = "待发货";
+                  }
+                }
                
                 if (r.order_status == 1 && r.pay_status == 1 && r.shipping_status == 1){
                     r.order_status_detail = "待收货";r.receive_btn=1;
diff --git a/packageD/pages/shop/order_detail/order_detail.js b/packageD/pages/shop/order_detail/order_detail.js
index 3024a05..31d8e8f 100644
--- a/packageD/pages/shop/order_detail/order_detail.js
+++ b/packageD/pages/shop/order_detail/order_detail.js
@@ -46,8 +46,17 @@ Page({
                 if (r.order_status == 0 && r.pay_status==0 ){
                     r.order_status_detail="待支付"; r.pay_btn=1;
                 }
-                if (r.order_status == 1 && r.pay_status == 1 && r.shipping_status== 0)
-                   r.order_status_detail = "待发货";
+                if (r.order_status == 1 && r.pay_status == 1 && r.shipping_status== 0){
+                   //自提的话
+                   if (r.exp_type==1)
+                   {
+                    r.order_status_detail = "待自提";
+                   }
+                   else
+                   {
+                     r.order_status_detail = "待发货";
+                   }
+                  }
                
                 if (r.order_status == 1 && r.pay_status == 1 && r.shipping_status == 1){
                     r.order_status_detail = "待收货";r.receive_btn=1;
diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js
index 76707b0..4ee64b8 100644
--- a/pages/user/order_detail/order_detail.js
+++ b/pages/user/order_detail/order_detail.js
@@ -80,7 +80,15 @@ Page({
                     r.order_status_detail="待支付"; r.pay_btn=1;
                 }
                 if (r.order_status == 1 && r.pay_status == 1 && r.shipping_status== 0)
-                   r.order_status_detail = "待发货";
+                //自提的话
+                   if (r.exp_type==1)
+                   {
+                    r.order_status_detail = "待自提";
+                   }
+                   else
+                   {
+                     r.order_status_detail = "待发货";
+                   }
                
                 if (r.order_status == 1 && r.pay_status == 1 && r.shipping_status == 1){
                     r.order_status_detail = "待收货";r.receive_btn=1;
diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml
index f338b31..93c921b 100644
--- a/pages/user/order_list/order_list.wxml
+++ b/pages/user/order_list/order_list.wxml
@@ -71,8 +71,14 @@
 				</block>
 
 				<block wx:if="{{!(item.is_all_return_status==0 || item.is_all_return_status==1)}}">
-					<view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==0)}}">待发货</view>
-					<view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==1)}}">待收货</view>
+					<view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==0)}}">
+            <block wx:if="{{item.exp_type==1}}">待自提</block>
+            <block wx:else>待发货</block>
+          </view>
+					<view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==1)}}">
+            <block wx:if="{{item.exp_type==1}}">待自提</block>
+            <block wx:else>待发货</block>
+          </view>
 					<view wx:if="{{(item.order_status==2)}}" class="flex-center">待评价<view class="lin"></view>
 						<image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData_"  data-index="{{index}}"   data-order_id="{{item.order_id}}"></image>
           </view>
@@ -92,8 +98,14 @@
 				<view wx:if="{{item.is_back ==1 && item.pay_status ==1}}">已退款</view>
 				<view wx:elif="{{item.is_back == 0 && item.pay_status ==1 && item.team_status == 0}}">已支付,待成团</view>
 				<view wx:if="{{(item.order_status==0&&item.pay_status==0)}}">未支付</view>
-				<view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==0 && item.team_status == 2)}}">待发货</view>
-				<view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==1 && item.team_status == 2)}}">待收货</view>
+				<view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==0 && item.team_status == 2)}}">
+          <block wx:if="{{item.exp_type==1}}">待自提</block>
+            <block wx:else>待发货</block>
+        </view>
+				<view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==1 && item.team_status == 2)}}">
+          <block wx:if="{{item.exp_type==1}}">待自提</block>
+            <block wx:else>待发货</block>
+        </view>
 				<view wx:if="{{(item.order_status==2)}}" class="flex-center">待评价<view class="lin"></view>      
 					<image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData_"  data-index="{{index}}"   data-order_id="{{item.order_id}}"></image>
         </view>
@@ -109,7 +121,10 @@
 				<view wx:if="{{item.pt_status==1 && item.pt_prom_id>0}}">组团中</view>
 				<view wx:if="{{(item.order_status==0&&item.pay_status==0)}}">未支付</view>
 				<block wx:if="{{!(item.is_all_return_status==0 || item.is_all_return_status==1)}}">
-					<view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==0)}}">待发货</view>
+					<view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==0)}}">
+            <block wx:if="{{item.exp_type==1}}">待自提</block>
+            <block wx:else>待发货</block>
+          </view>
 					<view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==1)}}">待收货</view>
 					<view wx:if="{{(item.order_status==2)}}" class="flex-center">待评价<view class="lin"></view>
 						<image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData_"  data-index="{{index}}"   data-order_id="{{item.order_id}}"></image>
--
libgit2 0.21.4