From fe0d7c7432a6da49f0bf49275bd13ed1e400192d Mon Sep 17 00:00:00 2001
From: czm <2192718639@qq.com>
Date: Thu, 23 Jun 2022 10:48:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E7=BB=84=E4=BB=B6=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/components/addressInfoDetail/index.tsx  | 15 ++-------------
 src/pages/order/index.tsx                         |  1 +
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/pages/order/components/addressInfoDetail/index.tsx b/src/pages/order/components/addressInfoDetail/index.tsx
index 86ceb2d..46cc399 100644
--- a/src/pages/order/components/addressInfoDetail/index.tsx
+++ b/src/pages/order/components/addressInfoDetail/index.tsx
@@ -58,7 +58,7 @@ export default memo(forwardRef(({onSelect, onChangeShipmentMode, orderInfo, stat
     //打开地址列表
     const [showAddressList, setShowAddressList] = useState(false)
     const changeShow = () => {
-        if(receivingStatus == 2 && !logisticsShow && !disabledSelect)
+        if(receivingStatus == 2 && !logisticsShow)
             setShowAddressList(() => true)
     }
 
@@ -72,7 +72,6 @@ export default memo(forwardRef(({onSelect, onChangeShipmentMode, orderInfo, stat
     const {fetchData: shipmentModeFetchData} = EditSaleOrderShipmentModeApi()
     const onReceivingStatus = (value, e) => {
         e.stopPropagation()
-        if(!disabledSelect) return false
         changeReceivingStatus(value)
     }
     const changeReceivingStatus = debounce(async (value) => {
@@ -127,21 +126,11 @@ export default memo(forwardRef(({onSelect, onChangeShipmentMode, orderInfo, stat
         SaleOrderStatusCancel,
     } = ORDER_STATUS
 
-    //禁用
-    const disabledSelect = useMemo(() => {
-        let statusList = [
-            SaleOrderStatusWaitingReceipt.value,
-            SaleOrderStatusAlreadyReceipt.value,
-            SaleOrderStatusComplete.value,
-            SaleOrderStatusRefund.value,
-            SaleOrderStatusCancel.value,
-        ]
-        return (statusList.includes(orderInfo?.status!)||disabled)
-    }, [orderInfo, disabled])
 
     //根据订单状态判断是否显示物流
     const logisticsShowList = [SaleOrderStatusWaitingReceipt.value, SaleOrderStatusAlreadyReceipt.value, SaleOrderStatusComplete.value, SaleOrderStatusRefund.value, SaleOrderStatusCancel.value]
     const logisticsShow = useMemo(() => {
+        console.log('aa:',orderInfo?.status)
         return logisticsShowList.includes(orderInfo?.status as number) 
     }, [orderInfo])
 
diff --git a/src/pages/order/index.tsx b/src/pages/order/index.tsx
index e706a52..388a4e2 100644
--- a/src/pages/order/index.tsx
+++ b/src/pages/order/index.tsx
@@ -101,6 +101,7 @@ import styles  from './index.module.scss'
             shipment_mode: orderDetail?.shipment_mode,
             id: orderDetail?.id,
             sale_mode: orderDetail?.sale_mode,
+            status: orderDetail?.status
         }
        
     }, [orderDetail])