替换数据

EOEFANS · Jan 2, 2023 · 3b0af38 · 3b0af38
1 parent ef5cc21
commit 3b0af38
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 11 deletions.
diff --git a/index.html b/index.html
@@ -3,6 +3,7 @@
 
 <head>
   <meta charset="UTF-8" />
+  <meta name="referrer" content="no-referrer" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <title>eoefans-web</title>
 </head>

diff --git a/src/components/masonry/index.tsx b/src/components/masonry/index.tsx
@@ -3,6 +3,8 @@ import { Masonry as Masonic_masonry, useInfiniteLoader } from "masonic";
 import Image from "@components/image";
 import { FetchNewImages } from "@utils/faker/index";
 import { SingleRun } from "@utils/index";
+import { fetchVideos } from "@utils/fetch";
+import { nanoid } from "nanoid";
 export default function Masonry() {
   const [lists, setLists] = useState<
     {
@@ -16,14 +18,27 @@ export default function Masonry() {
     stopIndex: number,
     currentItems: any[]
   ) => {
-    const res = await FetchNewImages(stopIndex - startIndex);
+    // const res = await FetchNewImages(stopIndex - startIndex);
+    const res = await fetchVideos({
+        order: "view",
+        page: 1,
+      }),
+      data = res.data.result;
+
     setLists((lists) => {
-      console.log({
-        startIndex,
-        stopIndex,
-        currentNum: lists.length + res.length,
-      });
-      return [...lists, ...res];
+      // console.log({
+      //   startIndex,
+      //   stopIndex,
+      //   currentNum: lists.length + res.length,
+      // });
+      return [
+        ...lists,
+        ...data.map((item) => ({
+          image: item.face,
+          name: item.name,
+          id: nanoid(10),
+        })),
+      ];
     });
   };
   const fetchMoreItemsHandler = useCallback(SingleRun(fetchMoreItems), [

diff --git a/src/routers/read.tsx b/src/routers/read.tsx
@@ -1,3 +1,12 @@
+import getrealtiveTime from "@utils/time";
 export default function ReadPage() {
-  return <h1>这里是read路由页面</h1>;
+  const time = getrealtiveTime(1672570020000);
+  return (
+    <>
+      <h1>这里是read路由页面</h1>
+      <p>
+        <span>1672570020000->{time}</span>
+      </p>
+    </>
+  );
 }
diff --git a/src/utils/fetch/index.ts b/src/utils/fetch/index.ts
@@ -11,6 +11,8 @@ import { IFetchVideoParams, RFetchVideoRes } from "./fetchtype";
 /**
  * video视频数据获取接口
  */
-export function fetchVideos(params: IFetchVideoParams): RFetchVideoRes {
-  return videoJson;
+export function fetchVideos(
+  params: IFetchVideoParams
+): Promise<RFetchVideoRes> {
+  return Promise.resolve(videoJson);
 }
diff --git a/src/utils/time/index.ts b/src/utils/time/index.ts
@@ -5,5 +5,5 @@ dayJs.locale("zh-cn");
 dayJs.extend(realtiveTime);
 
 export default function getrealtiveTime(time: number): string {
-  return dayJs(time).toNow();
+  return dayJs(time).fromNow();
 }