bimwe/mini-programs
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/juguohong/20250816'

Browse Source
This commit is contained in:
李瑞
2025-09-14 12:22:25 +08:00
parent 6f0c0c30fa 6295b2b379
commit c5483700e5
4 changed files with 154 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/game_pages/list/index.tsx
View File

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

31
src/game_pages/searchResult/index.tsx
View File

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

202
src/store/listStore.ts
View File

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

11
types/list/types.ts
View File

@@ -27,8 +27,8 @@ export interface PageState {
isShowFilterPopup: boolean isShowFilterPopup: boolean
filterOptions: IFilterOptions filterOptions: IFilterOptions
distanceQuickFilter: { distanceQuickFilter: {
distance: string distanceFilter: string
quick: string order: string
} }
filterCount: number filterCount: number
pageOption: { pageOption: {
@@ -46,7 +46,7 @@ export interface ListPageState extends PageState {
// 搜索页状态 // 搜索页状态
export interface SearchPageState extends PageState { export interface SearchPageState extends PageState {
searchResultData: TennisMatch[] data: TennisMatch[]
suggestionList: string[] suggestionList: string[]
isShowSuggestion: boolean isShowSuggestion: boolean
searchHistory: {id: number, title: string}[] searchHistory: {id: number, title: string}[]
@@ -88,9 +88,12 @@ export interface ListActions {
searchSuggestion: (val: string) => Promise<void> searchSuggestion: (val: string) => Promise<void>
getSearchParams: () => Record<string, any> getSearchParams: () => Record<string, any>
loadMoreMatches: () => void loadMoreMatches: () => void
initialFilterSearch: () => void initialFilterSearch: (isSearchData?: boolean) => void
setListData: (payload: IPayload) => void setListData: (payload: IPayload) => void
fetchGetGamesCount: () => Promise<void> fetchGetGamesCount: () => Promise<void>
getCurrentPageState: () => { currentPageState: any; currentPageKey: string }
updateCurrentPageState: (payload: Record<string, any>) => void
updateDistanceQuickFilter: (payload: Record<string, any>) => void
} }
export interface IPayload { export interface IPayload {