From 625616cc0ec9b8d45e3d6da0c43d99acf7b09b16 Mon Sep 17 00:00:00 2001
From: xuan <w1359774872@gmail.com>
Date: Tue, 22 Nov 2022 14:59:04 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(=E8=B4=AD=E7=89=A9=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2):=20=E5=8F=96=E6=B6=88=E7=AD=9B=E9=80=89=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E7=9A=84=E5=88=86=E9=A1=B5=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/shopping/index.tsx | 25 +++----------------------
 1 file changed, 3 insertions(+), 22 deletions(-)

diff --git a/src/pages/shopping/index.tsx b/src/pages/shopping/index.tsx
index 3fa50a8..c45f4fc 100644
--- a/src/pages/shopping/index.tsx
+++ b/src/pages/shopping/index.tsx
@@ -40,8 +40,6 @@ export const Shopping: FC = memo(() => {
 
 interface SearchOptions {
   short_name_or_phone?: string
-  page?: number
-  size?: number
 }
 
 const ShoppingCartContainer: FC = () => {
@@ -65,11 +63,7 @@ const ShoppingCartContainer: FC = () => {
 
   const { fetchData, state } = ShoppingCartListApi()
 
-  const [searchOptions, setSearchOptions] = useState<SearchOptions>({
-    
-    page: 1,
-    size: 10,
-  })
+  const [searchOptions, setSearchOptions] = useState<SearchOptions>({})
 
   useDidShow(() => {
     // 第二次进入该页面时触发
@@ -90,8 +84,7 @@ const ShoppingCartContainer: FC = () => {
   // 输入了搜索关键字
   const getSearchData = useCallback(e => {
     console.log('getSearchData===>',e);
-    pageNum.current.page = 1
-    setSearchOptions(prev => ({ ...prev, short_name_or_phone: e, size: 10 }))
+    setSearchOptions({ short_name_or_phone: e })
   }, [])
 
   const [shoppingCartData, setShoppingCartData] = useState<{
@@ -99,17 +92,6 @@ const ShoppingCartContainer: FC = () => {
     total: number
   }>({ list: [], total: 0 })
 
-  //上拉加载数据
-  const pageNum = useRef({ size: searchOptions.size, page: searchOptions.page })
-  // 上拉加载
-  const getScrollToLower = useCallback(() => {
-    if (shoppingCartData.list.length < shoppingCartData.total) {
-      pageNum.current.page!++
-      const size = pageNum.current.size! * pageNum.current.page!
-      setSearchOptions((e) => ({ ...e, size }))
-      console.log(searchOptions, 11111)
-    }
-  }, [shoppingCartData])
 
   //数据加载状态
   const statusMore = useMemo(() => {
@@ -230,7 +212,6 @@ const ShoppingCartContainer: FC = () => {
 
   // 下拉刷新
   const handleRefresh = async () => {
-    pageNum.current.page = 1
     setRefreshStatus(true)
     const res = await fetchData(getFilterData(searchOptions))
     if (res.success) {
@@ -258,7 +239,7 @@ const ShoppingCartContainer: FC = () => {
       </View>
       <View className={classnames('flex-item', 'flex-col', styles['shopping--context'])}>
         <View id='shoppingListContainer' className={classnames(styles.shopping__list__container, 'flex-item')} style={{ height: listHeightRef.current }}>
-          <InfiniteScroll statusMore={statusMore} refresherEnabled={true} selfOnRefresherRefresh={handleRefresh} refresherTriggered={refreshStatus} selfonScrollToLower={getScrollToLower}>
+          <InfiniteScroll statusMore={statusMore} refresherEnabled={true} selfOnRefresherRefresh={handleRefresh} refresherTriggered={refreshStatus}>
             {
             !!shoppingCartData?.list?.length &&
               shoppingCartData?.list?.map((item, index) => {