diff --git a/api/public.js b/api/public.js index 2a7d30c..f3fc6e9 100644 --- a/api/public.js +++ b/api/public.js @@ -18,8 +18,6 @@ export const handleLogout = async () => { position: "top", }); return; - } else { - console.error(error); } } catch (error) { console.error(error); diff --git a/app/layout.js b/app/layout.js index e81165e..615261e 100644 --- a/app/layout.js +++ b/app/layout.js @@ -33,13 +33,13 @@ export const viewport = { }; export default function RootLayout({ children }) { return ( - + {metadata.title} - -
+ +
{withAuth({children})} {/* {children} */}
diff --git a/app/login/page.js b/app/login/page.js index 23e60cd..d8edbb6 100644 --- a/app/login/page.js +++ b/app/login/page.js @@ -197,11 +197,12 @@ function Login({ handleLogin }) { } }; return ( -
+
+
+
); } diff --git a/app/space/page.js b/app/space/page.js index ab38325..0b34c37 100644 --- a/app/space/page.js +++ b/app/space/page.js @@ -30,7 +30,7 @@ export default function Space() { const [activeIndex, setActiveIndex] = useState(0); const [dataList, setDataList] = useState([]); // const [spacePost, setSpacePost] = useState([]); - const [hasMore, setHasMore] = useState(true); + const [hasMore, setHasMore] = useState(1); const [scrollHeight, setScrollHeight] = useState(0); const [offset, setOffset] = useState(0); const [loading, setLoading] = useState(false); @@ -39,7 +39,7 @@ export default function Space() { // 获取屏幕高度 // const scrollHeight = 600; useEffect(() => { - setScrollHeight(window.innerHeight - 57); + setScrollHeight(window.innerHeight - 57 - 44); // const handleResize = () => { // setScrollHeight(window.innerHeight - 126); // }; @@ -67,10 +67,10 @@ export default function Space() { // setDataList([]); }; const getSpaceList = async () => { - setLoading(true); + // setLoading(true); try { const data = await requireAPI("POST", "/api/zone/list_by_visitor_mid"); - setLoading(false); + // setLoading(false); if (data.ret === -1) { Toast.show({ icon: "fail", @@ -90,13 +90,16 @@ export default function Space() { } }; const getSpacePosts = async (offset) => { - setLoading(true); + // setLoading(true); try { - const data = - await requireAPI("POST", "/api/zone_moment/list_by_visitor_mid", { + const data = await requireAPI( + "POST", + "/api/zone_moment/list_by_visitor_mid", + { body: { offset, limit: 4 }, - }); - setLoading(false); + } + ); + // setLoading(false); if (data.ret === -1) { Toast.show({ icon: "fail", @@ -106,9 +109,10 @@ export default function Space() { return; } //在末尾添加元素以展示查看更多卡片 + setHasMore(data.data.more); + setOffset(data.data.offset); if (data.data.list.length !== 0) { const finalData = [...data.data.list]; - setOffset(offset + 1); return finalData; } } catch (error) { @@ -120,13 +124,13 @@ export default function Space() { const append = await getSpacePosts(offset); if (append) { setDataList((val) => [...val, ...append]); - setHasMore(append.length > 0); + // setHasMore(append.length > 0); } } return (
{!loading ? ( -
+ //
+ + //
+ <> {dataList?.length > 0 ? ( -
    +
    +
      {dataList?.map((item) => (
    • @@ -209,6 +217,7 @@ export default function Space() {
+
) : (
)} -
+ ) : (
- {!dataList?.length && ( + {/* {!dataList?.length && (
- )} + )} */}
)} diff --git a/components/Photos/index.js b/components/Photos/index.js index eb7fe80..7fb22d1 100644 --- a/components/Photos/index.js +++ b/components/Photos/index.js @@ -7,7 +7,7 @@ import { faAngleUp, faClose, faSave } from "@fortawesome/free-solid-svg-icons"; import { saveFile } from "@/utils/tools/handleFuns"; import { useRouter } from "next/navigation"; import baseRequest from "@/utils/baseRequest"; -export default function Photos({ isUnlocked, mediaAmount, media, type }) { +export default function Photos({ isUnlocked, mediaAmount, media, type, data }) { const [seeAllPhotos, setSeeAllPhotos] = useState(false); const [currentPhotos, setCurrentPhotos] = useState([]); const [photos, setPhotos] = useState([]); @@ -185,7 +185,7 @@ export default function Photos({ isUnlocked, mediaAmount, media, type }) { }} > { -
+
1?"min-h-[24vw]":"min-h-[38vw]"}`}> {data.media_component && (