列表

src/store/listStore.ts

@@ -31,8 +31,8 @@ const defaultFilterOptions: IFilterOptions = {
 
 // const defaultDistance = "all"; // 默认距离
 const defaultDistanceQuickFilter = {
-  distance: "",
-  quick: "0",
+  distanceFilter: "",
+  order: "0",
 };
 
 const defaultPageOption = {
@@ -73,7 +73,7 @@ const listPageStateDefaultValue = {
 const searchPageStateDefaultValue = {
   ...pageStateDefaultValue,
   // 搜索结果数据
-  searchResultData: [],
+  data: [],
   // 联想词
   suggestionList: [],
   // 是否显示联想词
@@ -154,7 +154,9 @@ export const useListStore = create<TennisStore>()((set, get) => ({
     const state = get();
     const currentPageState = state.isSearchResult ? state.searchPageState : state.listPageState;
     const filterOptions = currentPageState?.filterOptions || {};
+    // 全城和快捷筛选
     const distanceQuickFilter = currentPageState?.distanceQuickFilter || {};
+    const { distanceFilter, order } = distanceQuickFilter || {};
 
     const params = {
       pageOption: currentPageState?.pageOption,
@@ -164,8 +166,9 @@ export const useListStore = create<TennisStore>()((set, get) => ({
         ntrpMin: filterOptions?.ntrp?.[0],
         ntrpMax: filterOptions?.ntrp?.[1],
         dateRange: filterOptions?.dateRange,
+        distanceFilter: distanceFilter,
       },
-      order: distanceQuickFilter?.quick,
+      order: order,
       lat: state?.location?.latitude,
       lng: state?.location?.longitude,
     };
@@ -178,32 +181,45 @@ export const useListStore = create<TennisStore>()((set, get) => ({
     const { error, data, loading, count, isAppend = false } = payload;
     const isHasMoreData = count > 0;
 
+    const currentPageState = state.isSearchResult ? state.searchPageState : state.listPageState;
+    const currentData = currentPageState?.data || [];
+    const newData = isAppend ? [...currentData, ...(data || [])] : (data || []);
+    state.updateCurrentPageState({
+      data: newData,
+      isHasMoreData,
+    });
+
+    set({
+      error,
+      loading,
+    });
+
     if (state.isSearchResult) {
       // 更新搜索页状态
-      const currentData = state.searchPageState?.searchResultData || [];
-      const newData = isAppend ? [...currentData, ...(data || [])] : (data || []);
-      set({
-        searchPageState: {
-          ...state.searchPageState,
-          searchResultData: newData,
-          isHasMoreData,
-        },
-        error,
-        loading,
-      });
+      // const currentData = state.searchPageState?.data || [];
+      // const newData = isAppend ? [...currentData, ...(data || [])] : (data || []);
+      // set({
+      //   searchPageState: {
+      //     ...state.searchPageState,
+      //     data: newData,
+      //     isHasMoreData,
+      //   },
+      //   error,
+      //   loading,
+      // });
     } else {
       // 更新列表页状态
-      const currentData = state.listPageState?.data || [];
-      const newData = isAppend ? [...currentData, ...(data || [])] : (data || []);
-      set({
-        listPageState: {
-          ...state.listPageState,
-          data: newData,
-          isHasMoreData,
-        },
-        error,
-        loading,
-      });
+      // const currentData = state.listPageState?.data || [];
+      // const newData = isAppend ? [...currentData, ...(data || [])] : (data || []);
+      // set({
+      //   listPageState: {
+      //     ...state.listPageState,
+      //     data: newData,
+      //     isHasMoreData,
+      //   },
+      //   error,
+      //   loading,
+      // });
     }
   },
 
@@ -222,11 +238,11 @@ export const useListStore = create<TennisStore>()((set, get) => ({
       // 获取当前页面的距离筛选
       const state = get();
       const currentPageState = state.isSearchResult ? state.searchPageState : state.listPageState;
-      console.log("===当前页面状态:", state.isSearchResult, currentPageState);
+      console.log("===获取列表数据=当前页面状态:", state.isSearchResult, currentPageState);
       const distanceQuickFilter = currentPageState?.distanceQuickFilter || {};
 
       // 是否选择了智能排序
-      const isIntegrate = distanceQuickFilter?.quick === "0";
+      const isIntegrate = distanceQuickFilter?.order === "0";
       let fetchFn = getGamesList;
 
       if (isIntegrate) {
@@ -352,60 +368,64 @@ export const useListStore = create<TennisStore>()((set, get) => ({
     set({ error: null });
   },
 
+  getCurrentPageState: () => {
+    const state = get();
+    return {
+      currentPageState: state.isSearchResult ? state.searchPageState : state.listPageState,
+      currentPageKey: state.isSearchResult ? "searchPageState" : "listPageState",
+    };
+  },
+
+  // 更新当前页面状态
+  updateCurrentPageState: (payload: Record<string, any>) => {
+    const state = get();
+    const { currentPageState, currentPageKey } = state.getCurrentPageState();
+    set({
+      [currentPageKey]: { ...currentPageState, ...payload }
+    });
+  },
+
   // 更新综合筛选项
   updateFilterOptions: (payload: Record<string, any>) => {
     const state = get();
-    const currentPageState = state.isSearchResult ? state.searchPageState : state.listPageState;
+    const { currentPageState } = state.getCurrentPageState();
     const filterOptions = { ...currentPageState?.filterOptions, ...payload };
     const filterCount = Object.values(filterOptions).filter(Boolean).length;
-    
-    if (state.isSearchResult) {
-      set({
-        searchPageState: {
-          ...state.searchPageState,
-          filterOptions,
-          filterCount,
-          pageOption: defaultPageOption,
-        },
-      });
-    } else {
-      set({
-        listPageState: {
-          ...state.listPageState,
-          filterOptions,
-          filterCount,
-          pageOption: defaultPageOption,
-        },
-      });
-    }
+
+    state.updateCurrentPageState({
+      filterOptions,
+      filterCount,
+      pageOption: defaultPageOption,
+    });
     // 获取球局数量
     state.fetchGetGamesCount();
   },
 
+  // 更新距离和快捷筛选
+  updateDistanceQuickFilter: (payload: Record<string, any>) => {
+    const state = get();
+    const { currentPageState } = state.getCurrentPageState();
+    const { distanceQuickFilter } = currentPageState || {};
+    const newDistanceQuickFilter = { ...distanceQuickFilter, ...payload };
+    state.updateCurrentPageState({
+      distanceQuickFilter: newDistanceQuickFilter,
+      pageOption: defaultPageOption,
+    });
+
+    state.getMatchesData();
+    state.fetchGetGamesCount();
+  },
+
   // 清空综合筛选选项
   clearFilterOptions: () => {
     const state = get();
     const { getMatchesData, fetchGetGamesCount } = state;
-    
-    if (state.isSearchResult) {
-      set({
-        searchPageState: {
-          ...state.searchPageState,
-          filterOptions: defaultFilterOptions,
-          filterCount: 0,
-          pageOption: defaultPageOption,
-        },
-      });
-    } else {
-      set({
-        listPageState: {
-          ...state.listPageState,
-          filterOptions: defaultFilterOptions,
-          filterCount: 0,
-          pageOption: defaultPageOption,
-        },
-      });
-    }
+
+    state.updateCurrentPageState({
+      filterOptions: defaultFilterOptions,
+      filterCount: 0,
+      pageOption: defaultPageOption,
+    });
     getMatchesData();
     fetchGetGamesCount();
   },
@@ -424,52 +444,38 @@ export const useListStore = create<TennisStore>()((set, get) => ({
       page: (pageOption?.page || 1) + 1,
       pageSize: 20,
     };
-    
-    if (state.isSearchResult) {
-      set({
-        searchPageState: {
-          ...state.searchPageState,
-          pageOption: newPageOption,
-        },
-      });
-    } else {
-      set({
-        listPageState: {
-          ...state.listPageState,
-          pageOption: newPageOption,
-        },
-      });
-    }
+
+    state.updateCurrentPageState({
+      pageOption: newPageOption,
+    });
+
     // 加载更多时追加数据到现有数组
     state.fetchMatches({}, false, true);
   },
 
   // 初始化搜索条件 重新搜索
-  initialFilterSearch: async () => {
+  initialFilterSearch: async (isSearchData = false) => {
     const state = get();
     const { getMatchesData, fetchGetGamesCount } = state;
-    
+
     if (state.isSearchResult) {
       set({
         searchPageState: {
-          ...state.searchPageState,
-          distanceQuickFilter: defaultDistanceQuickFilter,
-          filterOptions: defaultFilterOptions,
-          pageOption: defaultPageOption,
+          ...searchPageStateDefaultValue
         },
       });
     } else {
       set({
         listPageState: {
-          ...state.listPageState,
-          distanceQuickFilter: defaultDistanceQuickFilter,
-          filterOptions: defaultFilterOptions,
-          pageOption: defaultPageOption,
+          ...listPageStateDefaultValue
         },
       });
     }
-    fetchGetGamesCount();
-    return await getMatchesData();
+    if (!isSearchData) {
+      return;
+    }
+    await fetchGetGamesCount();
+    await getMatchesData();
   },
 
   // 更新store数据
@@ -481,6 +487,7 @@ export const useListStore = create<TennisStore>()((set, get) => ({
 
   // 更新列表页状态中的特定字段
   updateListPageState: (payload: Record<string, any>) => {
+    console.log("===更新列表页状态:", payload);
     const state = get();
     set({
       listPageState: {
@@ -488,7 +495,6 @@ export const useListStore = create<TennisStore>()((set, get) => ({
         ...payload,
       },
     });
-    console.log("===更新列表页状态:", state);
   },
 
   // 更新搜索页状态中的特定字段