From 9e517da0b746ee3c9191909953dbdd470a5875c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=87=E9=98=B3?= <3311118881@qq.com>
Date: Wed, 28 Aug 2024 13:54:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E6=94=B9=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/Article.ts               |  4 ++--
 src/api/Cate.ts                  |  4 ++--
 src/api/Comment.ts               | 23 ++++++++++++++++++++---
 src/api/Footprint.ts             | 17 +++++++++++++++++
 src/api/Project.ts               |  4 ++--
 src/api/Role.ts                  |  4 ++--
 src/api/Route.ts                 |  4 ++--
 src/api/Rss.ts                   |  1 -
 src/api/Swiper.ts                |  4 ++--
 src/api/Tag.ts                   |  4 ++--
 src/api/User.ts                  |  6 +++---
 src/api/Web.ts                   |  4 ++--
 src/components/Sidebar/index.tsx |  5 +++++
 src/pages/Article/index.tsx      |  2 +-
 src/pages/Footprint/index.tsx    |  9 +++++++++
 src/pages/Route/index.tsx        | 10 +++++++---
 src/types/app/footprint.d.ts     | 15 +++++++++++++++
 17 files changed, 93 insertions(+), 27 deletions(-)
 create mode 100644 src/api/Footprint.ts
 create mode 100644 src/pages/Footprint/index.tsx
 create mode 100644 src/types/app/footprint.d.ts

diff --git a/src/api/Article.ts b/src/api/Article.ts
index 62490e1..d321d8e 100644
--- a/src/api/Article.ts
+++ b/src/api/Article.ts
@@ -3,7 +3,7 @@ import { Article } from "@/types/app/article";
 
 // 新增文章
 export const addArticleDataAPI = (data: Article) =>
-  Request<Article>("POST", "/article", {data});
+  Request<Article>("POST", "/article", { data });
 
 // 删除文章
 export const delArticleDataAPI = (id: number) =>
@@ -11,7 +11,7 @@ export const delArticleDataAPI = (id: number) =>
 
 // 编辑文章
 export const editArticleDataAPI = (data: Article) =>
-  Request<Article>("PATCH", "/article", {data});
+  Request<Article>("PATCH", "/article", { data });
 
 // 获取文章
 export const getArticleDataAPI = (id?: number) => Request<Article>("GET", `/article/${id}`)
diff --git a/src/api/Cate.ts b/src/api/Cate.ts
index 17c3b8f..9c89ce5 100644
--- a/src/api/Cate.ts
+++ b/src/api/Cate.ts
@@ -3,13 +3,13 @@ import { Cate } from '@/types/app/cate'
 import { getListAPI } from '@/utils'
 
 // 新增分类
-export const addCateDataAPI = (data: Cate) => Request<Cate>("POST", "/cate", data)
+export const addCateDataAPI = (data: Cate) => Request<Cate>("POST", "/cate", { data })
 
 // 删除分类
 export const delCateDataAPI = (id: number) => Request<Cate>("DELETE", `/cate/${id}`)
 
 // 修改分类
-export const editCateDataAPI = (data: Cate) => Request<Cate>("PATCH", "/cate", data)
+export const editCateDataAPI = (data: Cate) => Request<Cate>("PATCH", "/cate", { data })
 
 // 获取分类
 export const getCateDataAPI = (id?: number) => Request<Cate>("GET", `/cate/${id}`)
diff --git a/src/api/Comment.ts b/src/api/Comment.ts
index ecf5c87..3ce5102 100644
--- a/src/api/Comment.ts
+++ b/src/api/Comment.ts
@@ -3,7 +3,7 @@ import { Comment } from '@/types/app/comment'
 import { getListAPI } from '@/utils'
 
 // 新增评论
-export const addCommentDataAPI = (data: Comment) => Request<Comment>("POST", "/comment", data)
+export const addCommentDataAPI = (data: Comment) => Request<Comment>("POST", "/comment", { data })
 
 // 删除评论
 export const delCommentDataAPI = (id: number) => Request<Comment>("DELETE", `/comment/${id}`)
@@ -12,10 +12,27 @@ export const delCommentDataAPI = (id: number) => Request<Comment>("DELETE", `/co
 export const auditCommentDataAPI = (id: number) => Request<Comment>("PATCH", `/comment/audit/${id}`)
 
 // 修改评论
-export const editCommentDataAPI = (data: Comment) => Request<Comment>("PATCH", "/comment", data)
+export const editCommentDataAPI = (data: Comment) => Request<Comment>("PATCH", "/comment", { data })
 
 // 获取评论
 export const getCommentDataAPI = (id?: number) => Request<Paginate<Comment>>("GET", `/comment/${id}`)
 
 // 获取评论列表
-export const getCommentListAPI = getListAPI<Comment>("/comment")
\ No newline at end of file
+export const getCommentListAPI = (data?: QueryData) => {
+    if (data?.pagination) {
+        return Request<Paginate<Comment[]>>("POST", `/comment/paging`, {
+            data: { ...data?.query },
+            params: {
+                sort: data.sort,
+                ...data.pagination
+            }
+        });
+    } else {
+        return Request<Comment[]>("POST", `/comment/list`, {
+            data: { ...data?.query },
+            params: {
+                sort: data?.sort
+            }
+        });
+    }
+};
\ No newline at end of file
diff --git a/src/api/Footprint.ts b/src/api/Footprint.ts
new file mode 100644
index 0000000..29576e8
--- /dev/null
+++ b/src/api/Footprint.ts
@@ -0,0 +1,17 @@
+import Request from '@/utils/request'
+import { Footprint } from '@/types/app/footprint'
+
+// 新增路由
+export const addFootprintDataAPI = (data: Footprint) => Request<Footprint>("POST", "/footprint", { data })
+
+// 删除路由
+export const delFootprintDataAPI = (id: number) => Request<Footprint>("DELETE", `/footprint/${id}`)
+
+// 修改路由
+export const editFootprintDataAPI = (data: Footprint) => Request<Footprint>("PATCH", "/footprint", { data })
+
+// 获取路由
+export const getFootprintDataAPI = (id?: number) => Request<Footprint>("GET", `/footprint/${id}`)
+
+// 获取路由列表
+export const getFootprintListAPI = () => Request<Footprint[]>("POST", "/footprint");
\ No newline at end of file
diff --git a/src/api/Project.ts b/src/api/Project.ts
index 51e8969..03ecf6e 100644
--- a/src/api/Project.ts
+++ b/src/api/Project.ts
@@ -8,10 +8,10 @@ export const getSystemDataAPI = () => Request<System>("GET", "/project/system")
 export const getWebDataAPI = () => Request<Web>("GET", "/project/web")
 
 // 修改网站配置信息
-export const editWebDataAPI = (data: Web) => Request<Web>("PATCH", "/project/web", data)
+export const editWebDataAPI = (data: Web) => Request<Web>("PATCH", "/project/web", { data })
 
 // 获取布局配置信息
 export const getLayoutDataAPI = () => Request<Layout>("GET", "/project/layout")
 
 // 修改布局配置信息
-export const editLayoutDataAPI = (data: Layout) => Request<Layout>("PATCH", "/project/layout", data)
\ No newline at end of file
+export const editLayoutDataAPI = (data: Layout) => Request<Layout>("PATCH", "/project/layout", { data })
\ No newline at end of file
diff --git a/src/api/Role.ts b/src/api/Role.ts
index b2dd035..59c8034 100644
--- a/src/api/Role.ts
+++ b/src/api/Role.ts
@@ -3,13 +3,13 @@ import { Role } from '@/types/app/role'
 import { Route } from '@/types/app/route'
 
 // 新增角色
-export const addRoleDataAPI = (data: Role) => Request<Role>("POST", "/role", data)
+export const addRoleDataAPI = (data: Role) => Request<Role>("POST", "/role", { data })
 
 // 删除角色
 export const delRoleDataAPI = (id: number) => Request<Role>("DELETE", `/role/${id}`)
 
 // 修改角色
-export const editRoleDataAPI = (data: Role) => Request<Role>("PATCH", "/role", data)
+export const editRoleDataAPI = (data: Role) => Request<Role>("PATCH", "/role", { data })
 
 // 获取角色
 export const getRoleDataAPI = (id: number) => Request<Role>("GET", `/role/${id}`)
diff --git a/src/api/Route.ts b/src/api/Route.ts
index f0a82f9..5a24ec9 100644
--- a/src/api/Route.ts
+++ b/src/api/Route.ts
@@ -2,13 +2,13 @@ import Request from '@/utils/request'
 import { Route } from '@/types/app/route'
 
 // 新增路由
-export const addRouteDataAPI = (data: Route) => Request<Route>("POST", "/route", data)
+export const addRouteDataAPI = (data: Route) => Request<Route>("POST", "/route", { data })
 
 // 删除路由
 export const delRouteDataAPI = (id: number) => Request<Route>("DELETE", `/route/${id}`)
 
 // 修改路由
-export const editRouteDataAPI = (data: Route) => Request<Route>("PATCH", "/route", data)
+export const editRouteDataAPI = (data: Route) => Request<Route>("PATCH", "/route", { data })
 
 // 获取路由
 export const getRouteDataAPI = (id?: number) => Request<Route>("GET", `/route/${id}`)
diff --git a/src/api/Rss.ts b/src/api/Rss.ts
index 0f5c1ae..57ed650 100644
--- a/src/api/Rss.ts
+++ b/src/api/Rss.ts
@@ -1,4 +1,3 @@
-import Request from '@/utils/request'
 import { Rss } from '@/types/app/rss';
 import { getListAPI } from '@/utils';
 
diff --git a/src/api/Swiper.ts b/src/api/Swiper.ts
index 8695067..05ef6e7 100644
--- a/src/api/Swiper.ts
+++ b/src/api/Swiper.ts
@@ -3,13 +3,13 @@ import { Swiper } from '@/types/app/swiper'
 import { getListAPI } from '@/utils'
 
 // 新增轮播图
-export const addSwiperDataAPI = (data: Swiper) => Request<Swiper>("POST", "/swiper", data)
+export const addSwiperDataAPI = (data: Swiper) => Request<Swiper>("POST", "/swiper", { data })
 
 // 删除轮播图
 export const delSwiperDataAPI = (id: number) => Request<Swiper>("DELETE", `/swiper/${id}`)
 
 // 修改轮播图
-export const editSwiperDataAPI = (data: Swiper) => Request<Swiper>("PATCH", "/swiper", data)
+export const editSwiperDataAPI = (data: Swiper) => Request<Swiper>("PATCH", "/swiper", { data })
 
 // 获取轮播图
 export const getSwiperDataAPI = (id?: number) => Request<Swiper>("GET", `/swiper/${id}`)
diff --git a/src/api/Tag.ts b/src/api/Tag.ts
index ca812dd..c0bf299 100644
--- a/src/api/Tag.ts
+++ b/src/api/Tag.ts
@@ -3,13 +3,13 @@ import { Tag } from '@/types/app/tag'
 import { getListAPI } from '@/utils'
 
 // 新增标签
-export const addTagDataAPI = (data: Tag) => Request<Tag>("POST", "/tag", data)
+export const addTagDataAPI = (data: Tag) => Request<Tag>("POST", "/tag", { data })
 
 // 删除标签
 export const delTagDataAPI = (id: number) => Request<Tag>("DELETE", `/tag/${id}`)
 
 // 修改标签
-export const editTagDataAPI = (data: Tag) => Request<Tag>("PATCH", "/tag", data)
+export const editTagDataAPI = (data: Tag) => Request<Tag>("PATCH", "/tag", { data })
 
 // 获取标签
 export const getTagDataAPI = (id?: number) => Request<Tag>("GET", `/tag/${id}`)
diff --git a/src/api/User.ts b/src/api/User.ts
index a1a22ce..f2216eb 100644
--- a/src/api/User.ts
+++ b/src/api/User.ts
@@ -2,13 +2,13 @@ import Request from '@/utils/request'
 import { LoginReturn, EditUser, Login, User, UserInfo } from '@/types/app/user'
 
 // 登录
-export const loginDataAPI = (data: Login) => Request<LoginReturn>("POST", "/user/login", data)
+export const loginDataAPI = (data: Login) => Request<LoginReturn>("POST", "/user/login", { data })
 
 // 获取用户信息
 export const getUserDataAPI = (id?: number) => Request<User>("GET", `/user/${id}`)
 
 // 修改用户信息
-export const editUserDataAPI = (data: UserInfo) => Request<UserInfo>("PATCH", "/user", data)
+export const editUserDataAPI = (data: UserInfo) => Request<UserInfo>("PATCH", "/user", { data })
 
 // 修改管理员密码
-export const editAdminPassAPI = (data: EditUser) => Request<UserInfo>("PATCH", "/user/admin", data)
\ No newline at end of file
+export const editAdminPassAPI = (data: EditUser) => Request<UserInfo>("PATCH", "/user/admin", { data })
\ No newline at end of file
diff --git a/src/api/Web.ts b/src/api/Web.ts
index ce743bc..e3e3c6a 100644
--- a/src/api/Web.ts
+++ b/src/api/Web.ts
@@ -3,13 +3,13 @@ import { Web, LinkType } from '@/types/app/web'
 import { getListAPI } from '@/utils'
 
 // 新增网站
-export const addLinkDataAPI = (data: Web) => Request<Web>("POST", "/link", data)
+export const addLinkDataAPI = (data: Web) => Request<Web>("POST", "/link", { data })
 
 // 删除网站
 export const delLinkDataAPI = (id: number) => Request<Web>("DELETE", `/link/${id}`)
 
 // 修改网站
-export const editLinkDataAPI = (data: Web) => Request<Web>("PATCH", "/link", data)
+export const editLinkDataAPI = (data: Web) => Request<Web>("PATCH", "/link", { data })
 
 // 获取网站
 export const getLinkDataAPI = (id?: number) => Request<Web>("GET", `/link/${id}`)
diff --git a/src/components/Sidebar/index.tsx b/src/components/Sidebar/index.tsx
index 175c20e..e03a9de 100644
--- a/src/components/Sidebar/index.tsx
+++ b/src/components/Sidebar/index.tsx
@@ -146,6 +146,11 @@ const Sidebar = ({ sidebarOpen, setSidebarOpen }: SidebarProps) => {
               to: "/user",
               path: "user",
               name: "用户管理"
+            },
+            {
+              to: "/footprint",
+              path: "footprint",
+              name: "足迹管理"
             }
           ]
         },
diff --git a/src/pages/Article/index.tsx b/src/pages/Article/index.tsx
index fba96d1..5eacbaf 100644
--- a/src/pages/Article/index.tsx
+++ b/src/pages/Article/index.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+import { useState, useEffect } from 'react';
 import { Table, Button, Tag, notification, Card, Popconfirm, Form, Input, Cascader, Select, DatePicker } from 'antd';
 import { titleSty } from '@/styles/sty'
 import Title from '@/components/Title';
diff --git a/src/pages/Footprint/index.tsx b/src/pages/Footprint/index.tsx
new file mode 100644
index 0000000..86936ac
--- /dev/null
+++ b/src/pages/Footprint/index.tsx
@@ -0,0 +1,9 @@
+export default () => {
+  return (
+    <>
+      <div>
+        <h1>Hello World!</h1>
+      </div>
+    </>
+  )
+}
\ No newline at end of file
diff --git a/src/pages/Route/index.tsx b/src/pages/Route/index.tsx
index 3b2bd61..5483348 100644
--- a/src/pages/Route/index.tsx
+++ b/src/pages/Route/index.tsx
@@ -12,7 +12,7 @@ const RoutePage = () => {
 
     const columns: ColumnsType<Route> = [
         { title: 'ID', dataIndex: 'id', key: 'id', align: 'center' },
-        { title: '路由名称', dataIndex: 'path', key: 'path' },
+        { title: '路径', dataIndex: 'path', key: 'path' },
         { title: '描述', dataIndex: 'description', key: 'description' },
         {
             title: '操作', key: 'action',
@@ -54,6 +54,10 @@ const RoutePage = () => {
     const onSubmit = async () => {
         setLoading(true);
         form.validateFields().then(async (values: Route) => {
+            console.log(111,route.id);
+            console.log(222,values);
+            
+            
             if (route.id) {
                 await editRouteDataAPI({ ...route, ...values });
                 message.success('🎉 编辑路由成功');
@@ -83,8 +87,8 @@ const RoutePage = () => {
                         size='large'
 
                     >
-                        <Form.Item label="路由名称" name="path" rules={[{ required: true, message: '路由名称不能为空' }]}>
-                            <Input placeholder="请输入路由名称" />
+                        <Form.Item label="路由路径" name="path" rules={[{ required: true, message: '路由路径不能为空' }]}>
+                            <Input placeholder="请输入路由路径" />
                         </Form.Item>
 
                         <Form.Item label="路由描述" name="description" rules={[{ required: true, message: '路由描述不能为空' }]}>
diff --git a/src/types/app/footprint.d.ts b/src/types/app/footprint.d.ts
new file mode 100644
index 0000000..55bdf8d
--- /dev/null
+++ b/src/types/app/footprint.d.ts
@@ -0,0 +1,15 @@
+export interface Footprint {
+    id: number;
+    title: string;
+    address: string;
+    content: string;
+    position: number[];
+    image: string[];
+    time: string;
+}
+
+export interface FilterFootprint {
+    key?: string | null;
+    startDate?: string | null;
+    endDate?: string | null;
+}