最近学习出现空数据和数据同时展示优化

This commit is contained in:
禺狨 2023-07-05 09:19:17 +08:00
parent b6902e00bc
commit dabac610c2

View File

@ -21,31 +21,41 @@ const StudyPage = () => {
}, []); }, []);
const getCourses = () => { const getCourses = () => {
if (loading) {
return;
}
setLoading(true); setLoading(true);
course.latestLearn().then((res: any) => { course
let data = res.data; .latestLearn()
let today: CourseModel[] = []; .then((res: any) => {
let yesterday: CourseModel[] = []; let data = res.data;
let box: CourseModel[] = []; let today: CourseModel[] = [];
if (data && data.length > 0) { let yesterday: CourseModel[] = [];
data.map((item: any) => { let box: CourseModel[] = [];
let time = moment(item.hour_record.updated_at) if (data && data.length > 0) {
.utcOffset(0) data.map((item: any) => {
.format("YYYY-MM-DD HH:mm:ss"); let time = moment(item.hour_record.updated_at)
if (moment(time).isSame(moment(), "day")) { .utcOffset(0)
today.push(item); .format("YYYY-MM-DD HH:mm:ss");
} else if (moment(time).isSame(moment().subtract(1, "day"), "day")) { if (moment(time).isSame(moment(), "day")) {
yesterday.push(item); today.push(item);
} else { } else if (
box.push(item); moment(time).isSame(moment().subtract(1, "day"), "day")
} ) {
}); yesterday.push(item);
} } else {
setTodayCourses(today); box.push(item);
setYesterdayCourses(yesterday); }
setCourses(box); });
setLoading(false); }
}); setTodayCourses(today);
setYesterdayCourses(yesterday);
setCourses(box);
setLoading(false);
})
.catch((e) => {
setLoading(false);
});
}; };
return ( return (
@ -70,7 +80,10 @@ const StudyPage = () => {
</div> </div>
</div> </div>
))} ))}
{!loading && courses.length === 0 && <Empty></Empty>} {!loading &&
courses.length === 0 &&
todayCourses.length === 0 &&
yesterdayCourses.length === 0 && <Empty></Empty>}
{!loading && ( {!loading && (
<> <>
{todayCourses.length > 0 && ( {todayCourses.length > 0 && (