From 9780e78abfadd02108f70e32c4dd919ddde63e01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=87=E9=98=B3?= <3311118881@qq.com> Date: Sat, 12 Oct 2024 14:29:38 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=B7=B2=E7=9F=A5=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/Article/index.tsx | 4 ++-- src/pages/Comment/index.tsx | 4 ++-- src/pages/Footprint/index.tsx | 4 ++-- src/pages/Wall/index.tsx | 7 +++---- src/pages/Wall/type.d.ts | 10 ---------- src/types/app/wall.d.ts | 13 ++++++++++++- 6 files changed, 21 insertions(+), 21 deletions(-) delete mode 100644 src/pages/Wall/type.d.ts diff --git a/src/pages/Article/index.tsx b/src/pages/Article/index.tsx index 40aebca..2fe3e6d 100644 --- a/src/pages/Article/index.tsx +++ b/src/pages/Article/index.tsx @@ -128,8 +128,8 @@ const ArticlePage = () => { key: values.title, cateIds: values.cateIds, tagId: values.tagId, - startDate: values?.createTime[0].valueOf() + '', - endDate: values?.createTime[1].valueOf() + '', + startDate: values.createTime && values.createTime[0].valueOf() + '', + endDate: values.createTime && values.createTime[1].valueOf() + '' } const { data } = await getArticleListAPI({ query }); diff --git a/src/pages/Comment/index.tsx b/src/pages/Comment/index.tsx index 4104bc7..b8f6e58 100644 --- a/src/pages/Comment/index.tsx +++ b/src/pages/Comment/index.tsx @@ -107,8 +107,8 @@ const CommentPage = () => { const query: FilterData = { key: values?.title, content: values?.content, - startDate: values?.createTime[0].valueOf() + '', - endDate: values?.createTime[1].valueOf() + '', + startDate: values.createTime && values.createTime[0].valueOf() + '', + endDate: values.createTime && values.createTime[1].valueOf() + '' } const { data } = await getCommentListAPI({ query }); diff --git a/src/pages/Footprint/index.tsx b/src/pages/Footprint/index.tsx index 5ff740d..f1f9772 100644 --- a/src/pages/Footprint/index.tsx +++ b/src/pages/Footprint/index.tsx @@ -149,8 +149,8 @@ const FootprintPage = () => { const onFilterSubmit = async (values: FilterForm) => { const query: FilterData = { key: values.address, - startDate: values?.createTime[0].valueOf() + '', - endDate: values?.createTime[1].valueOf() + '', + startDate: values.createTime && values.createTime[0].valueOf() + '', + endDate: values.createTime && values.createTime[1].valueOf() + '' } const { data } = await getFootprintListAPI({ query }); diff --git a/src/pages/Wall/index.tsx b/src/pages/Wall/index.tsx index 12090d5..f5ab772 100644 --- a/src/pages/Wall/index.tsx +++ b/src/pages/Wall/index.tsx @@ -4,8 +4,7 @@ import { ColumnsType } from 'antd/es/table'; import { getWallListAPI, delWallDataAPI, getWallCateListAPI } from '@/api/Wall'; import { titleSty } from '@/styles/sty'; import Title from '@/components/Title'; -import { Cate, Wall } from '@/types/app/wall'; -import { FilterForm, FilterWall } from './type'; +import type { Cate, Wall, FilterForm, FilterWall } from '@/types/app/wall'; import dayjs from 'dayjs'; const WallPage = () => { @@ -111,8 +110,8 @@ const WallPage = () => { const query: FilterWall = { key: values.content, cateId: values.cateId, - startDate: values?.createTime?.[0]?.valueOf()?.toString(), - endDate: values?.createTime?.[1]?.valueOf()?.toString(), + startDate: values.createTime && values.createTime[0].valueOf() + '', + endDate: values.createTime && values.createTime[1].valueOf() + '' } const { data } = await getWallListAPI({ query }); diff --git a/src/pages/Wall/type.d.ts b/src/pages/Wall/type.d.ts deleted file mode 100644 index 38ff922..0000000 --- a/src/pages/Wall/type.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -export interface FilterForm { - content?: string, - cateId?: number, - createTime: Date[] -} - -export interface FilterWall extends FilterData { - content?: string, - cateId?: number -} \ No newline at end of file diff --git a/src/types/app/wall.d.ts b/src/types/app/wall.d.ts index 4f4f3f9..f383b34 100644 --- a/src/types/app/wall.d.ts +++ b/src/types/app/wall.d.ts @@ -14,4 +14,15 @@ export interface Wall { content: string; auditStatus: number; createTime: string; - } \ No newline at end of file +} + +export interface FilterForm { + content?: string, + cateId?: number, + createTime: Date[] +} + +export interface FilterWall extends FilterData { + content?: string, + cateId?: number +} \ No newline at end of file