From dabac610c23885953314024fd760b8343a42aba0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BA=E7=8B=A8?= <18119604035@163.com>
Date: Wed, 5 Jul 2023 09:19:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=80=E8=BF=91=E5=AD=A6=E4=B9=A0=E5=87=BA?=
=?UTF-8?q?=E7=8E=B0=E7=A9=BA=E6=95=B0=E6=8D=AE=E5=92=8C=E6=95=B0=E6=8D=AE?=
=?UTF-8?q?=E5=90=8C=E6=97=B6=E5=B1=95=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/study/index.tsx | 63 +++++++++++++++++++++++----------------
1 file changed, 38 insertions(+), 25 deletions(-)
diff --git a/src/pages/study/index.tsx b/src/pages/study/index.tsx
index aca8264..f327744 100644
--- a/src/pages/study/index.tsx
+++ b/src/pages/study/index.tsx
@@ -21,31 +21,41 @@ const StudyPage = () => {
}, []);
const getCourses = () => {
+ if (loading) {
+ return;
+ }
setLoading(true);
- course.latestLearn().then((res: any) => {
- let data = res.data;
- let today: CourseModel[] = [];
- let yesterday: CourseModel[] = [];
- let box: CourseModel[] = [];
- if (data && data.length > 0) {
- data.map((item: any) => {
- let time = moment(item.hour_record.updated_at)
- .utcOffset(0)
- .format("YYYY-MM-DD HH:mm:ss");
- if (moment(time).isSame(moment(), "day")) {
- today.push(item);
- } else if (moment(time).isSame(moment().subtract(1, "day"), "day")) {
- yesterday.push(item);
- } else {
- box.push(item);
- }
- });
- }
- setTodayCourses(today);
- setYesterdayCourses(yesterday);
- setCourses(box);
- setLoading(false);
- });
+ course
+ .latestLearn()
+ .then((res: any) => {
+ let data = res.data;
+ let today: CourseModel[] = [];
+ let yesterday: CourseModel[] = [];
+ let box: CourseModel[] = [];
+ if (data && data.length > 0) {
+ data.map((item: any) => {
+ let time = moment(item.hour_record.updated_at)
+ .utcOffset(0)
+ .format("YYYY-MM-DD HH:mm:ss");
+ if (moment(time).isSame(moment(), "day")) {
+ today.push(item);
+ } else if (
+ moment(time).isSame(moment().subtract(1, "day"), "day")
+ ) {
+ yesterday.push(item);
+ } else {
+ box.push(item);
+ }
+ });
+ }
+ setTodayCourses(today);
+ setYesterdayCourses(yesterday);
+ setCourses(box);
+ setLoading(false);
+ })
+ .catch((e) => {
+ setLoading(false);
+ });
};
return (
@@ -70,7 +80,10 @@ const StudyPage = () => {
))}
- {!loading && courses.length === 0 && }
+ {!loading &&
+ courses.length === 0 &&
+ todayCourses.length === 0 &&
+ yesterdayCourses.length === 0 && }
{!loading && (
<>
{todayCourses.length > 0 && (