列表

src/game_pages/list/index.tsx

@@ -35,7 +35,8 @@ const ListPage = () => {
     clearFilterOptions,
     initialFilterSearch,
     loadMoreMatches,
-    fetchGetGamesCount
+    fetchGetGamesCount,
+    updateDistanceQuickFilter
   } = store;
 
   const {
@@ -100,15 +101,15 @@ const ListPage = () => {
 
 
   // 监听距离和排序方式变化，自动调用接口
-  useEffect(() => {
-    // 只有当 distanceQuickFilter 有值时才调用接口
-    if (distanceQuickFilter?.distance !== undefined || distanceQuickFilter?.quick !== undefined) {
+  // useEffect(() => {
+  //   // 只有当 distanceQuickFilter 有值时才调用接口
+  //   if (distanceQuickFilter?.distanceFilter !== undefined || distanceQuickFilter?.order !== undefined) {
 
-      if (distanceQuickFilter?.quick !== "0") {
-        getMatchesData();
-      }
-    }
-  }, [distanceQuickFilter?.distance, distanceQuickFilter?.quick]);
+  //     // if (distanceQuickFilter?.quick !== "0") {
+  //       getMatchesData();
+  //     // }
+  //   }
+  // }, [distanceQuickFilter?.distanceFilter, distanceQuickFilter?.order]);
 
   // 获取位置信息
   const getLocation = async () => {
@@ -133,7 +134,7 @@ const ListPage = () => {
   }
 
   const refreshMatches = () => {
-    initialFilterSearch();
+    initialFilterSearch(true);
   };
 
   // const getLoadMoreMatches = () => {
@@ -194,16 +195,19 @@ const ListPage = () => {
     updateFilterOptions(params);
   };
 
-  const handleSearchChange = () => { };
+  const handleSearchChange = () => { }; 
 
   // 距离筛选
   const handleDistanceOrQuickChange = (name, value) => {
-    updateListPageState({
-      distanceQuickFilter: {
-        ...distanceQuickFilter,
-        [name]: value,
-      },
+    updateDistanceQuickFilter({
+      [name]: value,
     });
+    // updateListPageState({
+    //   distanceQuickFilter: {
+    //     ...distanceQuickFilter,
+    //     [name]: value,
+    //   },
+    // });
   };
 
   const handleSearchClick = () => {
@@ -262,10 +266,10 @@ const ListPage = () => {
               cityOptions={distanceData}
               quickOptions={quickFilterData}
               onChange={handleDistanceOrQuickChange}
-              cityName="distance"
-              quickName="quick"
-              cityValue={distanceQuickFilter?.distance}
-              quickValue={distanceQuickFilter?.quick}
+              cityName="distanceFilter"
+              quickName="order"
+              cityValue={distanceQuickFilter?.distanceFilter}
+              quickValue={distanceQuickFilter?.order}
             />
           </View>
 

src/game_pages/searchResult/index.tsx

@@ -23,13 +23,15 @@ const SearchResult = () => {
     updateFilterOptions, // 更新筛选条件
     clearFilterOptions,
     loadMoreMatches,
-    getMatchesData
+    getMatchesData,
+    initialFilterSearch,
+    updateDistanceQuickFilter
   } = useListStore() || {};
 
   const {
     isShowFilterPopup,
     distanceQuickFilter,
-    searchResultData,
+    data,
     recommendList,
     filterCount,
     filterOptions,
@@ -48,6 +50,8 @@ const SearchResult = () => {
     getMatchesData();
 
     return () => {
+      
+      initialFilterSearch()
       updateState({ 
         currentPage: '',
         isSearchResult: false
@@ -80,12 +84,15 @@ const SearchResult = () => {
 
   // 距离筛选
   const handleDistanceOrQuickChange = (name, value) => {
-    updateSearchPageState({
-      distanceQuickFilter: {
-        ...distanceQuickFilter,
-        [name]: value,
-      },
+    updateDistanceQuickFilter({
+      [name]: value,
     });
+    // updateSearchPageState({
+    //   distanceQuickFilter: {
+    //     ...distanceQuickFilter,
+    //     [name]: value,
+    //   },
+    // });
   };
 
   const refreshMatches = () => {
@@ -120,10 +127,10 @@ const SearchResult = () => {
             cityOptions={distanceData}
             quickOptions={quickFilterData}
             onChange={handleDistanceOrQuickChange}
-            cityName="distance"
-            quickName="quick"
-            cityValue={distanceQuickFilter?.distance}
-            quickValue={distanceQuickFilter?.quick}
+            cityName="distanceFilter"
+            quickName="order"
+            cityValue={distanceQuickFilter?.distanceFilter}
+            quickValue={distanceQuickFilter?.order}
           />
           {/* 筛选 icon */}
           <View
@@ -156,7 +163,7 @@ const SearchResult = () => {
 
         {/* 列表内容 */}
         <ListContainer
-          data={searchResultData}
+          data={data}
           recommendList={recommendList}
           loading={loading}
           error={error}