From e1bca318836e7d05a7fe17c396864624b5fef321 Mon Sep 17 00:00:00 2001 From: unknown <18119604035@163.com> Date: Thu, 16 Nov 2023 14:55:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=AF=A6=E6=83=85tab?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/course/index.module.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/course/index.module.scss b/src/pages/course/index.module.scss index 38ecc86..6667024 100644 --- a/src/pages/course/index.module.scss +++ b/src/pages/course/index.module.scss @@ -101,7 +101,7 @@ align-items: center; position: relative; .tab-item { - width: 64px; + min-width: 64px; height: 48px; margin-right: 50px; transition: all 0.2s; @@ -114,7 +114,7 @@ } } .tit { - width: 64px; + width: 100%; height: 40px; font-size: 16px; font-weight: 400; @@ -123,7 +123,7 @@ } } .tab-active-item { - width: 64px; + min-width: 64px; height: 48px; cursor: pointer; margin-right: 50px; @@ -133,7 +133,7 @@ opacity: 0.8; } .tit { - width: 64px; + width: 100%; height: 40px; font-size: 16px; font-weight: 500; From f5b4a707411937fc7833ac5f051d7fbcf562c276 Mon Sep 17 00:00:00 2001 From: unknown <18119604035@163.com> Date: Sat, 7 Oct 2023 17:53:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=AD=A6=E4=B9=A0?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=A4=A9=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/index/index.tsx | 28 ++++------------------------ src/utils/index.ts | 1 - 2 files changed, 4 insertions(+), 25 deletions(-) diff --git a/src/pages/index/index.tsx b/src/pages/index/index.tsx index 1c9548e..7d4a6b6 100644 --- a/src/pages/index/index.tsx +++ b/src/pages/index/index.tsx @@ -298,27 +298,17 @@ const IndexPage = () => { {studyTimeFormat(stats.today_learn_duration)[0] || 0}{" "} - 天 - - )} - {studyTimeFormat(stats.today_learn_duration)[1] !== 0 && ( - <> - - {" "} - {studyTimeFormat(stats.today_learn_duration)[1] || - 0}{" "} - 小时 )} {" "} - {studyTimeFormat(stats.today_learn_duration)[2] || 0}{" "} + {studyTimeFormat(stats.today_learn_duration)[1] || 0}{" "} 分钟 {" "} - {studyTimeFormat(stats.today_learn_duration)[3] || 0}{" "} + {studyTimeFormat(stats.today_learn_duration)[2] || 0}{" "} 秒 @@ -331,27 +321,17 @@ const IndexPage = () => { {studyTimeFormat(stats.learn_duration || 0)[0] || 0}{" "} - 天 - - )} - {studyTimeFormat(stats.learn_duration || 0)[1] !== 0 && ( - <> - - {" "} - {studyTimeFormat(stats.learn_duration || 0)[1] || - 0}{" "} - 小时 )} {" "} - {studyTimeFormat(stats.learn_duration || 0)[2] || 0}{" "} + {studyTimeFormat(stats.learn_duration || 0)[1] || 0}{" "} 分钟 {" "} - {studyTimeFormat(stats.learn_duration || 0)[3] || 0}{" "} + {studyTimeFormat(stats.learn_duration || 0)[2] || 0}{" "} 秒 diff --git a/src/utils/index.ts b/src/utils/index.ts index 8bf5bef..87cf250 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -28,7 +28,6 @@ export function durationFormat(dateStr: number) { export function studyTimeFormat(dateStr: number) { var d = moment.duration(dateStr / 1000, "seconds"); let value = []; - value.push(Math.floor(d.asDays())); value.push(d.hours()); value.push(d.minutes()); value.push(d.seconds());