diff --git a/src/pages/course/compenents/hour.tsx b/src/pages/course/compenents/hour.tsx index 4c8f2af..64ecdc5 100644 --- a/src/pages/course/compenents/hour.tsx +++ b/src/pages/course/compenents/hour.tsx @@ -1,9 +1,6 @@ -import React, { useState, useEffect } from "react"; -import { Image, Progress } from "antd"; +import React, { useState } from "react"; import { useNavigate } from "react-router-dom"; import styles from "./hour.module.scss"; -import mediaIcon from "../../../assets/images/commen/icon-medal.png"; -import { Navigate } from "react-router-dom"; import { durationFormat } from "../../../utils/index"; import { VideoModel } from "./video"; @@ -24,7 +21,7 @@ export const HourCompenent: React.FC = ({ record, progress, }) => { - const navigate = useNavigate(); + // const navigate = useNavigate(); const [visible, setVisible] = useState(false); return (
@@ -57,7 +54,7 @@ export const HourCompenent: React.FC = ({ {progress !== 0 && ( <>
- 上次学习到{durationFormat(Number(duration))} + 上次学习到{durationFormat(Number(record.duration || 0))}
{ const [hours, setHours] = useState({}); const [learnRecord, setLearnRecord] = useState({}); const [learnHourRecord, setLearnHourRecord] = useState({}); - const [progress, setprogresP] = useState(20); useEffect(() => { getDetail(); @@ -57,7 +56,7 @@ const CoursePage = () => { {course.is_required === 0 && (
选修课
)} - {progress === 100 && ( + {learnRecord.progress === 100 && (
{ trailColor="#F6F6F6" size={90} strokeWidth={8} - percent={progress} + percent={learnRecord.progress} format={(percent) => `${percent}%`} />
@@ -97,9 +96,9 @@ const CoursePage = () => { id={item.id} cid={item.course_id} title={item.title} - record={item.rid} + record={learnHourRecord[item.id]} duration={item.duration} - progress={progress} + progress={learnHourRecord[item.id].progress} >
))} @@ -112,14 +111,26 @@ const CoursePage = () => {
{item.name}
{hours[item.id].map((it: any) => (
- + {learnHourRecord[it.id] && ( + + )} + {!learnHourRecord[it.id] && ( + + )}
))}