电子商城测试版v4

src/pages/order/components/addressInfoDetail/index.tsx

@@ -37,6 +37,20 @@ type Param =  {
     }
 }
 
+//订单状态 
+const {
+    SaleorderstatusWaitingPrePayment,
+    SaleOrderStatusBooking,
+    SaleOrderStatusArranging,
+    SaleOrderStatusArranged,
+    SaleOrderStatusWaitingPayment,
+    SaleOrderStatusWaitingReceipt,
+    SaleOrderStatusAlreadyReceipt,
+    SaleOrderStatusComplete,
+    SaleOrderStatusRefund,
+    SaleOrderStatusCancel,
+} = ORDER_STATUS
+
 export default memo(forwardRef(({onSelect, onChangeShipmentMode, orderInfo, status = 2, disabled = false, onLogistics}: Param, ref) => {
     
     const [addressInfo, setAddressInfo] = useState<any>()
@@ -53,7 +67,7 @@ export default memo(forwardRef(({onSelect, onChangeShipmentMode, orderInfo, stat
     //打开地址列表
     const [showAddressList, setShowAddressList] = useState(false)
     const changeShow = () => {
-        if(receivingStatus == 2 && !logisticsShow)
+        if(receivingStatus == 2 && !logisticsShow && limitEdit())
             setShowAddressList(() => true)
     }
 
@@ -67,7 +81,8 @@ export default memo(forwardRef(({onSelect, onChangeShipmentMode, orderInfo, stat
     const {fetchData: shipmentModeFetchData} = EditSaleOrderShipmentModeApi()
     const onReceivingStatus = (value, e) => {
         e.stopPropagation()
-        changeReceivingStatus(value)
+        if(limitEdit()) changeReceivingStatus(value)
+        
     }
     const changeReceivingStatus = debounce(async (value) => {
         if(!orderInfo) return false
@@ -112,14 +127,18 @@ export default memo(forwardRef(({onSelect, onChangeShipmentMode, orderInfo, stat
         }
     }
 
-    //订单状态 
-    const {
-        SaleOrderStatusWaitingReceipt,
-        SaleOrderStatusAlreadyReceipt,
-        SaleOrderStatusComplete,
-        SaleOrderStatusRefund,
-        SaleOrderStatusCancel,
-    } = ORDER_STATUS
+    //根据订单状态判断是否可用修改
+    const limitEdit = () => {
+        let res = [
+            SaleorderstatusWaitingPrePayment.value,
+            SaleOrderStatusBooking.value,
+            SaleOrderStatusArranging.value,
+            SaleOrderStatusArranged.value,
+            SaleOrderStatusWaitingPayment.value,
+        ].includes(orderInfo?.status as number)
+        if(!res && status != 1) alert.none('该订单状态不能修改地址！')
+        return status == 1? true : res
+    }
 
 
     //根据订单状态判断是否显示物流

src/pages/order/index.tsx

@@ -13,6 +13,7 @@ import OrderBtns from "@/components/orderBtns";
 import Popup from "@/components/popup";
 import SearchInput from "@/components/searchInput";
 import ShopCart from "@/components/shopCart";
+import useLogin from "@/use/useLogin";
 import { Text, Textarea, View } from "@tarojs/components"
 import Taro, { useDidShow, usePullDownRefresh, useRouter } from "@tarojs/taro";
 import classnames from "classnames";
@@ -28,6 +29,7 @@ import Remark from "./components/remark";
 import styles  from './index.module.scss'
  
  export default () => {
+    useLogin()
     const [showDesc, setShowDesc] = useState(false)
     const router = useRouter()
     const orderId = useRef<number>(Number(router.params.id))
@@ -37,6 +39,8 @@ import styles  from './index.module.scss'
 
     //订单状态枚举
     const {
+        SaleOrderStatusTaking,
+        SaleOrderStatusWaitingDelivery,
         SaleOrderStatusWaitingReceipt, // 待收货
         SaleOrderStatusAlreadyReceipt, // 已收货
         SaleOrderStatusComplete, // 已完成
@@ -46,6 +50,7 @@ import styles  from './index.module.scss'
     } = ORDER_STATUS
 
     //获取订单详情
+    const firstOpen = useRef(true)
     const [orderDetail, setOrderDetail] = useState<any>() //获取到的原始数据
     const {fetchData: getOrderFetchData} = GetSaleOrderDetailApi()
     const getSaleOrderPreView = async () => {
@@ -53,7 +58,10 @@ import styles  from './index.module.scss'
             let res = await getOrderFetchData({id: orderId.current})
             setOrderDetail(res.data)
             setOrderRemark(res.data.remark)
-            if(res.data.status == SaleorderstatusWaitingPrePayment.value) toPay()
+            if(firstOpen.current) {
+                firstOpen.current = false
+                toPay()
+            }
         }
         Taro.stopPullDownRefresh()
         Taro.hideToast()       
@@ -115,7 +123,9 @@ import styles  from './index.module.scss'
             shipment_mode: orderDetail?.shipment_mode,
             id: orderDetail?.id,
             sale_mode: orderDetail?.sale_mode,
-            status: orderDetail?.status
+            status: orderDetail?.status,
+            take_goods_address: orderDetail?.take_goods_address,
+            take_goods_phone: orderDetail?.take_goods_phone
         }
        
     }, [orderDetail])
@@ -135,6 +145,8 @@ import styles  from './index.module.scss'
         setShowDesc(() => false)
     }, [])
     const noCanOpenDescList = useRef([
+        SaleOrderStatusTaking.value, //提货中
+        SaleOrderStatusWaitingDelivery.value, //待发货 
         SaleOrderStatusWaitingReceipt.value, // 待收货
         SaleOrderStatusAlreadyReceipt.value, // 已收货
         SaleOrderStatusComplete.value, // 已完成
@@ -142,7 +154,7 @@ import styles  from './index.module.scss'
         SaleOrderStatusCancel.value, // 已取消
     ])
     const descOpen = () => {
-        if(noCanOpenDescList.current.includes(orderDetail?.status)) return false
+        if(noCanOpenDescList.current.includes(orderDetail?.status)) return  alert.none('该订单状态不能修改备注')
         setShowDesc(() => true)
     }
 
@@ -167,7 +179,6 @@ import styles  from './index.module.scss'
 
     //获取底部按钮点击, 获取按钮状态
     const orderStateClick = useCallback((val) => {
-        console.log('123456789',val)
         if(val == 1 || val == 6) {
             //取消订单
             getSaleOrderPreView()