mirror of
https://github.com/PlayEdu/h5.git
synced 2025-07-27 14:19:33 +08:00
最近学习出现空数据和数据同时展示优化
This commit is contained in:
parent
b6902e00bc
commit
dabac610c2
@ -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 = () => {
|
||||
</div>
|
||||
</div>
|
||||
))}
|
||||
{!loading && courses.length === 0 && <Empty></Empty>}
|
||||
{!loading &&
|
||||
courses.length === 0 &&
|
||||
todayCourses.length === 0 &&
|
||||
yesterdayCourses.length === 0 && <Empty></Empty>}
|
||||
{!loading && (
|
||||
<>
|
||||
{todayCourses.length > 0 && (
|
||||
|
Loading…
x
Reference in New Issue
Block a user