resolove conflict

This commit is contained in:
none 2023-03-28 14:12:59 +08:00
parent 842b7b1550
commit a6a1139ffe

View File

@ -115,15 +115,18 @@ const IndexPage = () => {
</div>
<div className={styles["info"]}>
<div className={styles["info-item"]}>
<span></span>
<strong> {stats.required_finished_hour_count || 0} </strong>
<span>/ {stats.required_hour_count || 0}</span>
<span></span>
<strong> {stats.required_finished_course_count || 0} </strong>
<span>/ {stats.required_course_count || 0}</span>
</div>
{stats.nun_required_hour_count > 0 && (
<div className={styles["info-item"]}>
<span></span>
<strong> {stats.nun_required_finished_hour_count || 0} </strong>
<span>/ {stats.nun_required_hour_count || 0}</span>
<span></span>
<strong>
{" "}
{stats.nun_required_finished_course_count || 0}{" "}
</strong>
<span>/ {stats.required_finished_course_count || 0}</span>
</div>
)}
</div>