From e56ff6fca06d744a83b23fba6af29ea39a6a0e28 Mon Sep 17 00:00:00 2001 From: al Date: Mon, 9 Sep 2024 17:37:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=88=90=E5=91=98=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- screeens/Search/index.jsx | 2 +- .../SpaceMember/AllSpaceMember/index.jsx | 39 +++++------------ .../SpaceMember/IronfanSpaceMember/index.jsx | 42 +++++-------------- .../SpaceMember/SuperFanSpaceMember/index.jsx | 40 +++++------------- screeens/SpaceSetting/SpaceSearch/index.jsx | 2 - 5 files changed, 32 insertions(+), 93 deletions(-) diff --git a/screeens/Search/index.jsx b/screeens/Search/index.jsx index 7e0bf6d..1e8c780 100644 --- a/screeens/Search/index.jsx +++ b/screeens/Search/index.jsx @@ -205,7 +205,7 @@ export default function Search({ navigation, route }) { }, { name: "微信价格", - desc: "10金币=¥1", + desc: "10金币=1元", upper_bound: 30000, lower_bound: 0, default: 24, diff --git a/screeens/SpaceSetting/SpaceMember/AllSpaceMember/index.jsx b/screeens/SpaceSetting/SpaceMember/AllSpaceMember/index.jsx index db5908d..fc1bb57 100644 --- a/screeens/SpaceSetting/SpaceMember/AllSpaceMember/index.jsx +++ b/screeens/SpaceSetting/SpaceMember/AllSpaceMember/index.jsx @@ -1,10 +1,4 @@ -import { - View, - Text, - FlatList, - RefreshControl, - Image as NativeImage, -} from "react-native"; +import { View, Text, FlatList, Image as NativeImage } from "react-native"; import React, { useState, useEffect } from "react"; import { useTailwind } from "tailwind-rn"; import Toast from "react-native-toast-message"; @@ -21,7 +15,7 @@ export default function AllSpaceMember({ zid }) { const tailwind = useTailwind(); const [offset, setOffset] = useState(0); const [more, setMore] = useState(1); - const [data, setData] = useState([]); + const [data, setData] = useState({ list: [], total: 0 }); const getData = async () => { if (zid === undefined || !more) return; const apiUrl = process.env.EXPO_PUBLIC_API_URL; @@ -45,6 +39,7 @@ export default function AllSpaceMember({ zid }) { body: JSON.stringify(body), } ); + console.log(JSON.stringify(body)); const _data = await _response.json(); if (_data.ret === -1) { Toast.show({ @@ -54,7 +49,11 @@ export default function AllSpaceMember({ zid }) { }); return; } - setData(_data.data.list); + setData((old) => ({ + ...old, + list: [...old.list, ..._data.data.list], + total: _data.data.total, + })); setOffset(_data.data.offset); setMore(_data.data.more); } catch (error) { @@ -66,16 +65,6 @@ export default function AllSpaceMember({ zid }) { getData(); }, []); - //下拉刷新 - const [refreshing, setRefreshing] = useState(false); - - //下拉刷新 - const handleRefresh = async () => { - setRefreshing(true); - await getData(); - setRefreshing(false); - }; - //单个成员组件 const renderItem = ({ item }) => { return ( @@ -141,17 +130,9 @@ export default function AllSpaceMember({ zid }) { return ( handleRefresh()} - /> - } onEndReached={() => getData()} ListEmptyComponent={} ListHeaderComponent={() => ( @@ -161,7 +142,7 @@ export default function AllSpaceMember({ zid }) { )} > - 空间总人数：{data?.length} + 空间总人数：{data?.total} )} diff --git a/screeens/SpaceSetting/SpaceMember/IronfanSpaceMember/index.jsx b/screeens/SpaceSetting/SpaceMember/IronfanSpaceMember/index.jsx index 0802872..1bef88f 100644 --- a/screeens/SpaceSetting/SpaceMember/IronfanSpaceMember/index.jsx +++ b/screeens/SpaceSetting/SpaceMember/IronfanSpaceMember/index.jsx @@ -1,10 +1,4 @@ -import { - View, - Text, - FlatList, - RefreshControl, - Image as NativeImage, -} from "react-native"; +import { View, Text, FlatList, Image as NativeImage } from "react-native"; import React, { useState, useEffect } from "react"; import { useTailwind } from "tailwind-rn"; import Toast from "react-native-toast-message"; @@ -21,7 +15,7 @@ export default function IronfanSpaceMember({ zid }) { const tailwind = useTailwind(); const [offset, setOffset] = useState(0); const [more, setMore] = useState(1); - const [data, setData] = useState([]); + const [data, setData] = useState({ list: [], total: 0 }); const getData = async () => { if (zid === undefined || !more) return; const apiUrl = process.env.EXPO_PUBLIC_API_URL; @@ -36,7 +30,7 @@ export default function IronfanSpaceMember({ zid }) { }; const signature = await generateSignature(body); const _response = await fetch( - `${apiUrl}/api/zone/member_list?signature=${signature}`, + `${apiUrl}/api/zone/member_list_v2?signature=${signature}`, { method: "POST", headers: { @@ -54,9 +48,14 @@ export default function IronfanSpaceMember({ zid }) { }); return; } - setData(_data.data.list); + setData((old) => ({ + ...old, + list: [...old.list, ..._data.data.list], + total: _data.data.total, + })); setOffset(_data.data.offset); setMore(_data.data.more); + console.log(_data); } catch (error) { console.error(error); } @@ -65,17 +64,6 @@ export default function IronfanSpaceMember({ zid }) { useEffect(() => { getData(); }, []); - - //下拉刷新 - const [refreshing, setRefreshing] = useState(false); - - //下拉刷新 - const handleRefresh = async () => { - setRefreshing(true); - await getData(); - setRefreshing(false); - }; - //单个成员组件 const renderItem = ({ item }) => { return ( @@ -141,17 +129,9 @@ export default function IronfanSpaceMember({ zid }) { return ( handleRefresh()} - /> - } onEndReached={() => getData()} ListEmptyComponent={} ListHeaderComponent={() => ( @@ -161,7 +141,7 @@ export default function IronfanSpaceMember({ zid }) { )} > - 铁粉总人数：{data?.length} + 铁粉总人数：{data?.total} )} diff --git a/screeens/SpaceSetting/SpaceMember/SuperFanSpaceMember/index.jsx b/screeens/SpaceSetting/SpaceMember/SuperFanSpaceMember/index.jsx index 86735bb..fdb8093 100644 --- a/screeens/SpaceSetting/SpaceMember/SuperFanSpaceMember/index.jsx +++ b/screeens/SpaceSetting/SpaceMember/SuperFanSpaceMember/index.jsx @@ -1,10 +1,4 @@ -import { - View, - Text, - FlatList, - RefreshControl, - Image as NativeImage, -} from "react-native"; +import { View, Text, FlatList, Image as NativeImage } from "react-native"; import React, { useState, useEffect } from "react"; import { useTailwind } from "tailwind-rn"; import Toast from "react-native-toast-message"; @@ -21,7 +15,7 @@ export default function SuperFanSpaceMember({ zid }) { const tailwind = useTailwind(); const [offset, setOffset] = useState(0); const [more, setMore] = useState(1); - const [data, setData] = useState([]); + const [data, setData] = useState({ list: [], total: 0 }); const getData = async () => { if (zid === undefined || !more) return; const apiUrl = process.env.EXPO_PUBLIC_API_URL; @@ -36,7 +30,7 @@ export default function SuperFanSpaceMember({ zid }) { }; const signature = await generateSignature(body); const _response = await fetch( - `${apiUrl}/api/zone/member_list?signature=${signature}`, + `${apiUrl}/api/zone/member_list_v2?signature=${signature}`, { method: "POST", headers: { @@ -54,7 +48,11 @@ export default function SuperFanSpaceMember({ zid }) { }); return; } - setData(_data.data.list); + setData((old) => ({ + ...old, + list: [...old.list, ..._data.data.list], + total: _data.data.total, + })); setOffset(_data.data.offset); setMore(_data.data.more); } catch (error) { @@ -66,16 +64,6 @@ export default function SuperFanSpaceMember({ zid }) { getData(); }, []); - //下拉刷新 - const [refreshing, setRefreshing] = useState(false); - - //下拉刷新 - const handleRefresh = async () => { - setRefreshing(true); - await getData(); - setRefreshing(false); - }; - //单个成员组件 const renderItem = ({ item }) => { return ( @@ -141,17 +129,9 @@ export default function SuperFanSpaceMember({ zid }) { return ( handleRefresh()} - /> - } onEndReached={() => getData()} ListEmptyComponent={} ListHeaderComponent={() => ( @@ -161,7 +141,7 @@ export default function SuperFanSpaceMember({ zid }) { )} > - 超粉总人数：{data?.length} + 超粉总人数：{data?.total} )} diff --git a/screeens/SpaceSetting/SpaceSearch/index.jsx b/screeens/SpaceSetting/SpaceSearch/index.jsx index c2ed471..7c268b2 100644 --- a/screeens/SpaceSetting/SpaceSearch/index.jsx +++ b/screeens/SpaceSetting/SpaceSearch/index.jsx @@ -18,7 +18,6 @@ import { generateSignature } from "../../../utils/crypto"; import formatTimestamp from "../../../utils/formatTimestamp"; export default function SpaceSearch({ navigation }) { const blurhash = "LcKUTa%gOYWBYRt6xuoJo~s8V@fk"; - const tailwind = useTailwind(); const insets = useSafeAreaInsets(); const [data, setData] = useState([]); @@ -77,7 +76,6 @@ export default function SpaceSearch({ navigation }) { //进入页面默认focus useEffect(() => { searchRef.current.focus(); - getData(); }, []); //搜索框文本变化时进行搜索 // useEffect(() => {