diff --git a/src/pages/accountPage/index.tsx b/src/pages/accountPage/index.tsx index e4a4d6b..95c33dd 100644 --- a/src/pages/accountPage/index.tsx +++ b/src/pages/accountPage/index.tsx @@ -50,7 +50,7 @@ const AccountPage = () => { // 列表下拉刷新 const [refresherTriggeredStatus, setRefresherTriggeredStatus] = useState(false) const getRefresherRefresh = async() => { - pageNum.current.size = 1 + pageNum.current.page = 1 setRefresherTriggeredStatus(true) setSearch(val => ({ ...val, size: 10 })) } diff --git a/src/pages/addFabric/index.tsx b/src/pages/addFabric/index.tsx index c8a2155..bcaf6ea 100644 --- a/src/pages/addFabric/index.tsx +++ b/src/pages/addFabric/index.tsx @@ -349,7 +349,7 @@ const SearchPage = () => { } const getRefresherRefresh = async() => { - pageNum.current.size = 1 + pageNum.current.page = 1 setRefresherTriggeredStatus(true) setSearchField(val => ({ ...val, size: 10 })) } diff --git a/src/pages/customerManagement/index.tsx b/src/pages/customerManagement/index.tsx index 81059ce..77d4517 100644 --- a/src/pages/customerManagement/index.tsx +++ b/src/pages/customerManagement/index.tsx @@ -81,7 +81,7 @@ const CustomerManagement = () => { }, [orderData]) const getRefresherRefresh = async() => { - pageNum.current.size = 1 + pageNum.current.page = 1 setRefresherTriggeredStatus(true) setSearchField(val => ({ ...val, size: 10 })) } diff --git a/src/pages/customerPage/index.tsx b/src/pages/customerPage/index.tsx index b2621eb..886bde7 100644 --- a/src/pages/customerPage/index.tsx +++ b/src/pages/customerPage/index.tsx @@ -50,7 +50,7 @@ const CustomerPage = () => { // 列表下拉刷新 const [refresherTriggeredStatus, setRefresherTriggeredStatus] = useState(false) const getRefresherRefresh = async() => { - pageNum.current.size = 1 + pageNum.current.page = 1 setRefresherTriggeredStatus(true) setSearch(val => ({ ...val, size: 10 })) } diff --git a/src/pages/delivery/index.tsx b/src/pages/delivery/index.tsx index dd2770d..448728d 100644 --- a/src/pages/delivery/index.tsx +++ b/src/pages/delivery/index.tsx @@ -67,7 +67,7 @@ const Delivery: FC = () => { const [refresherTriggeredStatus, setRefresherTriggeredStatus] = useState(false) const getRefresherRefresh = async() => { - pageNum.current.size = 1 + pageNum.current.page = 1 setRefresherTriggeredStatus(true) setSearch(val => ({ ...val, size: 10 })) } diff --git a/src/pages/getColorCard/colorCardList/index.tsx b/src/pages/getColorCard/colorCardList/index.tsx index fabb191..c1afa9f 100644 --- a/src/pages/getColorCard/colorCardList/index.tsx +++ b/src/pages/getColorCard/colorCardList/index.tsx @@ -98,7 +98,7 @@ const ColorCardList = () => { const [refresherTriggeredStatus, setRefresherTriggeredStatus] = useState(false) // 下拉刷新 const getRefresherRefresh = async() => { - pageNum.current.size = 1 + pageNum.current.page = 1 setRefresherTriggeredStatus(true) setSearchField(val => ({ ...val, size: 10 })) } diff --git a/src/pages/getColorCard/index.tsx b/src/pages/getColorCard/index.tsx index 669d34b..b17b9e7 100644 --- a/src/pages/getColorCard/index.tsx +++ b/src/pages/getColorCard/index.tsx @@ -46,7 +46,7 @@ const GetColorCard = () => { const pageNum = useRef({ size: searchField.size, page: searchField.page }) const getRefresherRefresh = async() => { - pageNum.current.size = 1 + pageNum.current.page = 1 setRefresherTriggeredStatus(true) setSearchField(val => ({ ...val, size: 10 })) } diff --git a/src/pages/order/index.tsx b/src/pages/order/index.tsx index 2c19d78..8ecaf26 100644 --- a/src/pages/order/index.tsx +++ b/src/pages/order/index.tsx @@ -74,7 +74,7 @@ const Order = () => { } const getRefresherRefresh = async() => { - pageNum.current.size = 1 + pageNum.current.page = 1 setRefresherTriggeredStatus(true) setSearchField(val => ({ ...val, size: 10 })) } diff --git a/src/pages/refundPage/index.tsx b/src/pages/refundPage/index.tsx index ba767fa..ceda2fa 100644 --- a/src/pages/refundPage/index.tsx +++ b/src/pages/refundPage/index.tsx @@ -231,7 +231,7 @@ const RefundPage = () => { setStart(eq?.value?.start) setEnd(eq?.value?.end) setShowTime(false) - console.log(eq,6666) + console.log(eq, 6666) } const getOrderList = async() => { const res = await listFetchData({ @@ -279,12 +279,12 @@ const RefundPage = () => { getOrderList() } const getRefresherRefresh = async() => { - pageNum.current.size = 1 + pageNum.current.page = 1 setRefresherTriggeredStatus(true) setSearchField(val => ({ ...val, size: 10 })) getOrderList() } - useEffect(() => { + useEffect(() => { setSearchField(searchField) }, [searchField]) @@ -303,14 +303,14 @@ const RefundPage = () => { useEffect(() => { getOrderList() }, [searchField.size, - searchField.name, - searchField.status, - searchField.sale_start_time, - searchField.sale_end_time, + searchField.name, + searchField.status, + searchField.sale_start_time, + searchField.sale_end_time, searchField.sale_mode, searchField.return_type, - searchField.stage - ]) + searchField.stage, + ]) return ( diff --git a/src/pages/saleuserPage/index.tsx b/src/pages/saleuserPage/index.tsx index 296d921..5701065 100644 --- a/src/pages/saleuserPage/index.tsx +++ b/src/pages/saleuserPage/index.tsx @@ -50,7 +50,7 @@ const SaleUserPage = () => { // 列表下拉刷新 const [refresherTriggeredStatus, setRefresherTriggeredStatus] = useState(false) const getRefresherRefresh = async() => { - pageNum.current.size = 1 + pageNum.current.page = 1 setRefresherTriggeredStatus(true) setSearch(val => ({ ...val, size: 10 })) } diff --git a/src/pages/sampleCutting/index.tsx b/src/pages/sampleCutting/index.tsx index 7c066e5..2f7a1c6 100644 --- a/src/pages/sampleCutting/index.tsx +++ b/src/pages/sampleCutting/index.tsx @@ -47,7 +47,7 @@ const GetSampleCutting = () => { const pageNum = useRef({ size: searchField.size, page: searchField.page }) const getRefresherRefresh = async() => { - pageNum.current.size = 1 + pageNum.current.page = 1 setRefresherTriggeredStatus(true) setSearchField(val => ({ ...val, size: 10 })) } diff --git a/src/pages/sampleCutting/sampleCuttingList/index.tsx b/src/pages/sampleCutting/sampleCuttingList/index.tsx index 3ca4d42..2c550b8 100644 --- a/src/pages/sampleCutting/sampleCuttingList/index.tsx +++ b/src/pages/sampleCutting/sampleCuttingList/index.tsx @@ -121,7 +121,7 @@ const SampleCuttingList = () => { const [refresherTriggeredStatus, setRefresherTriggeredStatus] = useState(false) // 下拉刷新 const getRefresherRefresh = async() => { - pageNum.current.size = 1 + pageNum.current.page = 1 setRefresherTriggeredStatus(true) setSearchField(val => ({ ...val, size: 10 })) } @@ -134,7 +134,7 @@ const SampleCuttingList = () => { if (orderList.list.length < orderList.total) { pageNum.current.page++ const size = pageNum.current.size * pageNum.current.page - setSearchField({ ...searchField, size }) + setSearchField(prev => ({ ...prev, size })) } }, [orderList]) diff --git a/src/pages/takeDelivery/index.tsx b/src/pages/takeDelivery/index.tsx index 3fd8275..da208c8 100644 --- a/src/pages/takeDelivery/index.tsx +++ b/src/pages/takeDelivery/index.tsx @@ -68,7 +68,7 @@ const Delivery: FC = () => { const [refresherTriggeredStatus, setRefresherTriggeredStatus] = useState(false) const getRefresherRefresh = async() => { - pageNum.current.size = 1 + pageNum.current.page = 1 setRefresherTriggeredStatus(true) setSearch(val => ({ ...val, size: 10 })) } diff --git a/src/pages/user/index.tsx b/src/pages/user/index.tsx index 839e2c6..e2ec780 100644 --- a/src/pages/user/index.tsx +++ b/src/pages/user/index.tsx @@ -80,18 +80,18 @@ const feature: IconCardType[] = [ path: '/pages/customerManagement/index', jurisdiction: 'customer_list_page', }, - // { - // iconName: 'icon-lingquseka', - // name: '领取色卡', - // path: '/pages/getColorCard/index', - // jurisdiction: 'ignore', - // }, - // { - // iconName: 'icon-jianyang', - // name: '领取剪样', - // path: '/pages/sampleCutting/index', - // jurisdiction: 'ignore', - // }, + { + iconName: 'icon-lingquseka', + name: '领取色卡', + path: '/pages/getColorCard/index', + jurisdiction: 'ignore', + }, + { + iconName: 'icon-jianyang', + name: '领取剪样', + path: '/pages/sampleCutting/index', + jurisdiction: 'ignore', + }, ] const fabric: IconCardType[] = [