diff --git a/src/pages/course/compenents/hour.tsx b/src/pages/course/compenents/hour.tsx index 64ecdc5..9e2f918 100644 --- a/src/pages/course/compenents/hour.tsx +++ b/src/pages/course/compenents/hour.tsx @@ -11,6 +11,7 @@ interface PropInterface { duration: number; record: any; progress: number; + onChange: () => void; } export const HourCompenent: React.FC = ({ @@ -20,6 +21,7 @@ export const HourCompenent: React.FC = ({ duration, record, progress, + onChange, }) => { // const navigate = useNavigate(); const [visible, setVisible] = useState(false); @@ -30,7 +32,10 @@ export const HourCompenent: React.FC = ({ id={id} title={title} open={visible} - onCancel={() => setVisible(false)} + onCancel={() => { + setVisible(false); + onChange(); + }} >
@@ -54,7 +59,8 @@ export const HourCompenent: React.FC = ({ {progress !== 0 && ( <>
- 上次学习到{durationFormat(Number(record.duration || 0))} + 上次学习到 + {durationFormat(Number(record.finished_duration || 0))}
{
- `${percent}%`} - /> + {JSON.stringify(learnRecord) === "{}" && + JSON.stringify(learnHourRecord) === "{}" && ( + `${percent}%`} + /> + )} + {JSON.stringify(learnRecord) === "{}" && + JSON.stringify(learnHourRecord) !== "{}" && ( + `${percent}%`} + /> + )} + {JSON.stringify(learnRecord) !== "{}" && + JSON.stringify(learnHourRecord) !== "{}" && ( + `${percent}%`} + /> + )} {course.short_desc && (
{course.short_desc}
@@ -99,7 +126,11 @@ const CoursePage = () => { title={item.title} record={learnHourRecord[item.id]} duration={item.duration} - progress={learnHourRecord[item.id].progress} + progress={ + (learnHourRecord[item.id].finished_duration * 100) / + learnHourRecord[item.id].total_duration + } + onChange={() => getDetail()} > )} {!learnHourRecord[item.id] && ( @@ -110,6 +141,7 @@ const CoursePage = () => { record={null} duration={item.duration} progress={0} + onChange={() => getDetail()} > )}