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])