From f31ee9534b05734cb5965a92b3e1890e8f5250c7 Mon Sep 17 00:00:00 2001 From: king <2229249788@qq.com> Date: Thu, 10 Aug 2023 11:59:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A7=81=E9=9D=A2=E4=BC=9A?= =?UTF-8?q?=E5=BC=80=E5=A7=8B=E7=BB=93=E6=9D=9F=EF=BC=8C=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=8A=A0=E8=BD=BD=E7=8A=B6=E6=80=81=EF=BC=8C?= =?UTF-8?q?=E5=A4=B1=E6=95=88=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA=EF=BC=8C?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=E8=BF=87=E6=9C=9F=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + pnpm-lock.yaml | 7 + src/api/course.ts | 2 +- src/api/meeting.ts | 21 ++- src/components/button/MyButton.tsx | 1 - .../dateTimePicker/dateTimePicker.tsx | 34 ++++ src/components/dateTimePicker/index.scss | 0 src/components/dateTimePicker/utils.ts | 104 +++++++++++ src/components/lineChart/lineChart.tsx | 7 +- src/components/video/video.tsx | 58 +++--- .../videoInfo/components/catalogue.tsx | 6 +- .../business/videoInfo/components/course.tsx | 45 +++-- .../business/videoInfo/components/hours.tsx | 7 +- src/pages/business/videoInfo/videoInfo.tsx | 9 +- src/pages/index/components/videoList.tsx | 1 - .../manage/courseAdmin/components/search.tsx | 5 +- .../courseAdmin/courseAdmin.module.scss | 6 +- src/pages/manage/courseAdmin/courseAdmin.tsx | 2 +- src/pages/manage/meetings/meetings.tsx | 15 +- .../spotMeeting/spotMeeting.module.scss | 15 +- src/pages/manage/spotMeeting/spotMeeting.tsx | 165 +++++++++++------- src/static/img/failure.png | Bin 0 -> 17651 bytes 22 files changed, 386 insertions(+), 125 deletions(-) create mode 100644 src/components/dateTimePicker/dateTimePicker.tsx create mode 100644 src/components/dateTimePicker/index.scss create mode 100644 src/components/dateTimePicker/utils.ts create mode 100644 src/static/img/failure.png diff --git a/package.json b/package.json index 2c24713..ed57342 100644 --- a/package.json +++ b/package.json @@ -53,6 +53,7 @@ "@tarojs/runtime": "3.6.8", "@tarojs/shared": "3.6.8", "@tarojs/taro": "3.6.8", + "dayjs": "^1.11.9", "react": "^18.0.0", "react-dom": "^18.0.0", "react-refresh": "^0.11.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index eba5acf..eae9f48 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -50,6 +50,9 @@ dependencies: '@tarojs/taro': specifier: 3.6.8 version: 3.6.8(@types/react@18.0.0) + dayjs: + specifier: ^1.11.9 + version: 1.11.9 react: specifier: ^18.0.0 version: 18.0.0 @@ -6117,6 +6120,10 @@ packages: whatwg-url: 12.0.1 dev: true + /dayjs@1.11.9: + resolution: {integrity: sha512-QvzAURSbQ0pKdIye2txOzNaHmxtUBXerpY0FJsFXUMKbIZeFm5ht1LS/jFsrncjnmtv8HsG0W2g6c0zUjZWmpA==} + dev: false + /debug@2.6.9: resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==} peerDependencies: diff --git a/src/api/course.ts b/src/api/course.ts index 131f8c3..0927db7 100644 --- a/src/api/course.ts +++ b/src/api/course.ts @@ -10,7 +10,7 @@ export interface CourseAllParam { page: number page_size: number title?: string - dep_id: null | number + dep_id: number } export const courseApi = { diff --git a/src/api/meeting.ts b/src/api/meeting.ts index 6612c92..502ad75 100644 --- a/src/api/meeting.ts +++ b/src/api/meeting.ts @@ -12,6 +12,10 @@ export interface Meeting { estimate_start_time: number; /** 现场会标题 */ name: string; + status: 0 + | 1 // 已开始 + | 2 // 进行中 + | 3 // 结束中 } export const meetingAPi = { @@ -22,12 +26,21 @@ export const meetingAPi = { return request(`/api/v1/meetings/meeting/${id}`, "GET") }, setList(page: number, page_size: number) { - return request<{data:Meeting[],total:number}>(`/api/v1/meetings/meeting?page=${page}&page_size=${page_size}`, "GET") + return request<{ + data: Meeting[], + total: number + }>(`/api/v1/meetings/meeting?page=${page}&page_size=${page_size}`, "GET") }, exists() { return request('/api/v1/meetings/exists', "GET") }, - del(id:number){ - return request(`/api/v1/meetings/meeting/${id}`,"DELETE") - } + del(id: number) { + return request(`/api/v1/meetings/meeting/${id}`, "DELETE") + }, + start(id: number) { + return request(`/api/v1/meetings/meeting/${id}/start`, "PUT") + }, + end(id: number) { + return request(`/api/v1/meetings/meeting/${id}/end`, "PUT") + }, } diff --git a/src/components/button/MyButton.tsx b/src/components/button/MyButton.tsx index 7b4e37a..92013f2 100644 --- a/src/components/button/MyButton.tsx +++ b/src/components/button/MyButton.tsx @@ -43,7 +43,6 @@ const MyButton: FC = (props) => { return (