From da5463f0dbb1e078897e6ad376b268ea6d94c366 Mon Sep 17 00:00:00 2001 From: al Date: Sat, 7 Sep 2024 00:15:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=88=90=E5=91=98=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- screeens/Search/index.jsx | 50 ++++------ .../SpaceMember/AllSpaceMember/index.jsx | 2 +- .../SpaceMember/IronfanSpaceMember/index.jsx | 2 +- .../SpaceMember/SuperFanSpaceMember/index.jsx | 2 +- screeens/SpaceSetting/SpaceSearch/index.jsx | 95 ++++++++++++------- utils/storeInfo.js | 2 +- 6 files changed, 80 insertions(+), 73 deletions(-) diff --git a/screeens/Search/index.jsx b/screeens/Search/index.jsx index 1639ce3..697be7a 100644 --- a/screeens/Search/index.jsx +++ b/screeens/Search/index.jsx @@ -424,27 +424,13 @@ export default function Search({ navigation, route }) { } }, []); const handleChangeComprehensiveSliderValue = useCallback((value, item) => { - if (item.key == "age") { - setCurrentFiltersChangeValue((old) => ({ + setCurrentFiltersChangeValue((old) => { + let newCurrentFiltersChangeValue = { ...old, - age: value, - })); - } else if (item.key == "fans") { - setCurrentFiltersChangeValue((old) => ({ - ...old, - fans: value, - })); - } else if (item.key == "height") { - setCurrentFiltersChangeValue((old) => ({ - ...old, - height: value, - })); - } else if (item.key == "weight") { - setCurrentFiltersChangeValue((old) => ({ - ...old, - weight: value, - })); - } + }; + newCurrentFiltersChangeValue[item.key] = value; + return { ...old, ...newCurrentFiltersChangeValue }; + }); }, []); // 重置重置筛选值 @@ -962,12 +948,18 @@ export default function Search({ navigation, route }) { } onPress={ () => - setCurrentFiltersChangeValue((old) => ({ - ...old, - is_active_within_a_week: old.is_active_within_a_week + // setCurrentFiltersChangeValue((old) => ({ + // ...old, + // is_active_within_a_week: old.is_active_within_a_week + // ? 0 + // : 1, + // })) + handleChangeComprehensiveSliderValue( + currentFiltersChangeValue.is_active_within_a_week ? 0 : 1, - })) + item + ) // setFiltersValue((old) => ({ // ...old, // is_active_within_a_week: old.is_active_within_a_week @@ -995,15 +987,7 @@ export default function Search({ navigation, route }) { : currentFiltersChangeValue?.city } onChange={(value) => - setCurrentFiltersChangeValue((old) => { - let newValue = { ...old }; - if (item.key == "constellation") { - newValue.constellation = value; - } else { - newValue.city = value; - } - return newValue; - }) + handleChangeComprehensiveSliderValue(value, item) } /> )} diff --git a/screeens/SpaceSetting/SpaceMember/AllSpaceMember/index.jsx b/screeens/SpaceSetting/SpaceMember/AllSpaceMember/index.jsx index a37e37e..db5908d 100644 --- a/screeens/SpaceSetting/SpaceMember/AllSpaceMember/index.jsx +++ b/screeens/SpaceSetting/SpaceMember/AllSpaceMember/index.jsx @@ -152,7 +152,7 @@ export default function AllSpaceMember({ zid }) { onRefresh={() => handleRefresh()} /> } - ononEndReached={() => getData()} + onEndReached={() => getData()} ListEmptyComponent={} ListHeaderComponent={() => ( handleRefresh()} /> } - ononEndReached={() => getData()} + onEndReached={() => getData()} ListEmptyComponent={} ListHeaderComponent={() => ( handleRefresh()} /> } - ononEndReached={() => getData()} + onEndReached={() => getData()} ListEmptyComponent={} ListHeaderComponent={() => ( { - if (searchValue?.length != 6) { - setIsloading(false); - return; - } + // if (searchValue?.length != 6) { + // return; + // } if (/[^0-9]/.test(searchValue)) { - setIsloading(false); Toast.show({ type: "error", - text1: "请输入完整用户ID", + text1: "请输入正确的用户ID", topOffset: 60, }); return; } const apiUrl = process.env.EXPO_PUBLIC_API_URL; try { + setIsloading(true); const base = await baseRequest(); const body = { member_user_id: Number(searchValue), ...base, }; + console.log("vvvvvv", JSON.stringify(body)); + const signature = await generateSignature(body); const _response = await fetch( `${apiUrl}/api/zone/search_zone_member?signature=${signature}`, @@ -58,7 +60,6 @@ export default function SpaceSearch({ navigation }) { ); const _data = await _response.json(); if (_data.ret === -1) { - // console.log("_data", _data); setIsloading(false); Toast.show({ type: "error", @@ -68,10 +69,10 @@ export default function SpaceSearch({ navigation }) { return; } setData(_data.data.list); - setIsloading(false); } catch (error) { console.error(error); } + setIsloading(false); }; //进入页面默认focus useEffect(() => { @@ -79,21 +80,20 @@ export default function SpaceSearch({ navigation }) { getData(); }, []); //搜索框文本变化时进行搜索 - useEffect(() => { - if (!search) { - setData([]); - return; - } - let ignore = false; - getData(search); - return () => { - ignore = true; - }; - }, [search]); + // useEffect(() => { + // if (!search) { + // setData([]); + // return; + // } + // let ignore = false; + // // getData(search); + // return () => { + // ignore = true; + // }; + // }, [search]); const updateSearch = (search) => { setSearch(search); if (!search) return; - setIsloading(true); }; //单个成员组件 const RenderItem = ({ item }) => { @@ -225,22 +225,45 @@ export default function SpaceSearch({ navigation }) { color="white" onPress={() => navigation.goBack()} /> - <>} - searchIcon={() => <>} - showLoading={isloading} - onChangeText={updateSearch} - value={search} - /> + + <>} + showCancel={false} + searchIcon={() => <>} + showLoading={isloading} + onChangeText={updateSearch} + value={search} + /> + getData(search)} + > + + 搜索 + + + diff --git a/utils/storeInfo.js b/utils/storeInfo.js index ee19cd2..eed4124 100644 --- a/utils/storeInfo.js +++ b/utils/storeInfo.js @@ -29,7 +29,7 @@ export async function storeAppInfo() { if (Platform.OS === "android") { if (!notFirstTimeOpenApp) return ""; return Application.getAndroidId(); - } else { + } else if (Platform.OS === "ios") { return await Application.getIosIdForVendorAsync(); } }