From 81114d3eef4e41f064574066d6a99b98275e547a Mon Sep 17 00:00:00 2001
From: master1lan <278457198@qq.com>
Date: Sun, 15 Jan 2023 19:44:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=A0=B9=E6=8D=AEtag?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 readme.md                        |  8 +++-----
 src/routers/layout/nav/index.tsx |  6 +++---
 src/routers/layout/nav/tools.ts  |  1 -
 src/routers/video/index.tsx      | 12 +++++++-----
 src/utils/fetch/index.ts         |  1 -
 5 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/readme.md b/readme.md
index 2496016..9354666 100644
--- a/readme.md
+++ b/readme.md
@@ -30,21 +30,19 @@ $ npm run preview
 
 ## 已完成功能
 
-- [x] 二创图 feed 流
 - [x] 滚动加载
 - [x] 基础 tag 栏展示
 - [x] tag 栏用户自定义排序
-- [x] 视频接口测通
 - [x] tag 栏放缩动画
+- [x] 根据tag栏进行重新查询
 
 ## TODO
 
 ### 急急急
 
-- [ ] 总体 layout 布局
-- [ ] 总体 font-family，各种 layout 下 font-size 等全局属性的设定
-- [ ] 理解完视频接口的 q 等属性特点
 - [ ] UI 设计
+- [ ] 搜索功能
+- [ ] 图片加载序列
 
 ### 现在还没定论的
 
diff --git a/src/routers/layout/nav/index.tsx b/src/routers/layout/nav/index.tsx
index 721bf40..9f15edb 100644
--- a/src/routers/layout/nav/index.tsx
+++ b/src/routers/layout/nav/index.tsx
@@ -165,11 +165,11 @@ const NavTagChipItem: FC<NavQueryItemType> = memo((props) => {
         dispatch(handerAddTag(props));
       }
     };
-  //todo 修改颜色
+  //todo 修改颜色,我感觉这个颜色应该会蛮难写的
   return (
     <Button
-      variant='contained'
-      color={clicked ? "secondary" : "primary"}
+      variant={clicked ? "contained" : "outlined"}
+      color='info'
       onClick={handerclick}
       sx={{
         wordBreak: "keep-all",
diff --git a/src/routers/layout/nav/tools.ts b/src/routers/layout/nav/tools.ts
index b921168..b14b873 100644
--- a/src/routers/layout/nav/tools.ts
+++ b/src/routers/layout/nav/tools.ts
@@ -215,4 +215,3 @@ export const router_nav_list = router_list.map((item) => ({
   id: nanoid(3),
   cancelable: false,
 })) as NavRouterItemType[];
-//todo 增加新的tag
diff --git a/src/routers/video/index.tsx b/src/routers/video/index.tsx
index f20c452..ca4cadc 100644
--- a/src/routers/video/index.tsx
+++ b/src/routers/video/index.tsx
@@ -10,15 +10,17 @@ export default function VideoPage() {
       ?.queryString as ValueOf<Pick<VideoRouterMasonryType, "tname">>,
     copyright = activeTags.find((item) => item.queryType === "copyright")
       ?.queryString as ValueOf<Pick<VideoRouterMasonryType, "copyright">>,
+    order = activeTags.find((item) => item.queryType === "order")
+      ?.queryString as ValueOf<Pick<VideoRouterMasonryType, "order">>,
     q = activeTags
       .filter((item) => item.queryType === "q")
-      .reduceRight((pre, cur) => {
-        return `${cur.queryString}+${pre}`;
-      }, "");
+      .reduceRight((pre, cur, index, arr) => {
+        return `${cur.queryString}${index < arr.length - 1 ? "+" : ""}${pre}`;
+      }, ""),
+    props = { tname, copyright, order, q };
   return (
     <>
-      <VideoMasonry tname={tname} copyright={copyright} />
+      <VideoMasonry {...props} />
     </>
   );
 }
-//todo 重新写q
diff --git a/src/utils/fetch/index.ts b/src/utils/fetch/index.ts
index b41bf17..80bad69 100644
--- a/src/utils/fetch/index.ts
+++ b/src/utils/fetch/index.ts
@@ -18,7 +18,6 @@ export function fetchVideos(
   ${params.tname ? `&tname=${params.tname}` : ""}`
     .replace(/\s+/g, "")
     .trim();
-  console.log({ fetchUrl });
   return fetch(fetchUrl, {
     method: "GET",
     headers: {