From aa4fdc4927d4e24d5c2fda0bb234b69e6b4c4bef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BA=E7=8B=A8?= <18119604035@163.com>
Date: Mon, 27 Mar 2023 14:52:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=AF=A6=E6=83=85=E5=AD=A6?=
 =?UTF-8?q?=E4=B9=A0=E8=AE=B0=E5=BD=95=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/course/compenents/hour.tsx |  9 +++----
 src/pages/course/index.tsx           | 37 ++++++++++++++++++----------
 2 files changed, 27 insertions(+), 19 deletions(-)

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<PropInterface> = ({
   record,
   progress,
 }) => {
-  const navigate = useNavigate();
+  // const navigate = useNavigate();
   const [visible, setVisible] = useState<boolean>(false);
   return (
     <div className={styles["item"]}>
@@ -57,7 +54,7 @@ export const HourCompenent: React.FC<PropInterface> = ({
             {progress !== 0 && (
               <>
                 <div className={styles["record"]}>
-                  上次学习到{durationFormat(Number(duration))}
+                  上次学习到{durationFormat(Number(record.duration || 0))}
                 </div>
                 <div
                   className={styles["link"]}
diff --git a/src/pages/course/index.tsx b/src/pages/course/index.tsx
index 603a269..0f4766d 100644
--- a/src/pages/course/index.tsx
+++ b/src/pages/course/index.tsx
@@ -14,7 +14,6 @@ const CoursePage = () => {
   const [hours, setHours] = useState<any>({});
   const [learnRecord, setLearnRecord] = useState<any>({});
   const [learnHourRecord, setLearnHourRecord] = useState<any>({});
-  const [progress, setprogresP] = useState(20);
 
   useEffect(() => {
     getDetail();
@@ -57,7 +56,7 @@ const CoursePage = () => {
                 {course.is_required === 0 && (
                   <div className={styles["active-type"]}>选修课</div>
                 )}
-                {progress === 100 && (
+                {learnRecord.progress === 100 && (
                   <div className={styles["success"]}>
                     <Image
                       width={24}
@@ -77,7 +76,7 @@ const CoursePage = () => {
             trailColor="#F6F6F6"
             size={90}
             strokeWidth={8}
-            percent={progress}
+            percent={learnRecord.progress}
             format={(percent) => `${percent}%`}
           />
         </div>
@@ -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}
                 ></HourCompenent>
               </div>
             ))}
@@ -112,14 +111,26 @@ const CoursePage = () => {
                 <div className={styles["chapter-name"]}>{item.name}</div>
                 {hours[item.id].map((it: any) => (
                   <div key={it.id} className={styles["hours-it"]}>
-                    <HourCompenent
-                      id={it.id}
-                      cid={item.course_id}
-                      title={it.title}
-                      record={it.rid}
-                      duration={it.duration}
-                      progress={0}
-                    ></HourCompenent>
+                    {learnHourRecord[it.id] && (
+                      <HourCompenent
+                        id={it.id}
+                        cid={item.course_id}
+                        title={it.title}
+                        record={learnHourRecord[it.id]}
+                        duration={it.duration}
+                        progress={learnHourRecord[it.id].progress}
+                      ></HourCompenent>
+                    )}
+                    {!learnHourRecord[it.id] && (
+                      <HourCompenent
+                        id={it.id}
+                        cid={item.course_id}
+                        title={it.title}
+                        record={null}
+                        duration={it.duration}
+                        progress={0}
+                      ></HourCompenent>
+                    )}
                   </div>
                 ))}
               </div>