From 1bf55a4a5459f4168caa686ee18e5fbaed221d3d 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 15:33:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=86=E9=A2=91=E6=92=AD=E6=94=BE=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E6=92=AD=E6=94=BE=E8=AE=B0=E5=BD=95=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=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 | 10 ++++--
 src/pages/course/index.tsx           | 52 ++++++++++++++++++++++------
 2 files changed, 50 insertions(+), 12 deletions(-)

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<PropInterface> = ({
@@ -20,6 +21,7 @@ export const HourCompenent: React.FC<PropInterface> = ({
   duration,
   record,
   progress,
+  onChange,
 }) => {
   // const navigate = useNavigate();
   const [visible, setVisible] = useState<boolean>(false);
@@ -30,7 +32,10 @@ export const HourCompenent: React.FC<PropInterface> = ({
         id={id}
         title={title}
         open={visible}
-        onCancel={() => setVisible(false)}
+        onCancel={() => {
+          setVisible(false);
+          onChange();
+        }}
       ></VideoModel>
       <div className={styles["left-item"]}>
         <i className="iconfont icon-icon-video"></i>
@@ -54,7 +59,8 @@ export const HourCompenent: React.FC<PropInterface> = ({
             {progress !== 0 && (
               <>
                 <div className={styles["record"]}>
-                  上次学习到{durationFormat(Number(record.duration || 0))}
+                  上次学习到
+                  {durationFormat(Number(record.finished_duration || 0))}
                 </div>
                 <div
                   className={styles["link"]}
diff --git a/src/pages/course/index.tsx b/src/pages/course/index.tsx
index 35ca0f2..61b9f92 100644
--- a/src/pages/course/index.tsx
+++ b/src/pages/course/index.tsx
@@ -70,15 +70,42 @@ const CoursePage = () => {
               </div>
             </div>
           </div>
-          <Progress
-            type="circle"
-            strokeColor="#FF4D4F"
-            trailColor="#F6F6F6"
-            size={90}
-            strokeWidth={8}
-            percent={learnRecord.progress}
-            format={(percent) => `${percent}%`}
-          />
+          {JSON.stringify(learnRecord) === "{}" &&
+            JSON.stringify(learnHourRecord) === "{}" && (
+              <Progress
+                type="circle"
+                strokeColor="#FF4D4F"
+                trailColor="#F6F6F6"
+                size={90}
+                strokeWidth={8}
+                percent={0}
+                format={(percent) => `${percent}%`}
+              />
+            )}
+          {JSON.stringify(learnRecord) === "{}" &&
+            JSON.stringify(learnHourRecord) !== "{}" && (
+              <Progress
+                type="circle"
+                strokeColor="#FF4D4F"
+                trailColor="#F6F6F6"
+                size={90}
+                strokeWidth={8}
+                percent={1}
+                format={(percent) => `${percent}%`}
+              />
+            )}
+          {JSON.stringify(learnRecord) !== "{}" &&
+            JSON.stringify(learnHourRecord) !== "{}" && (
+              <Progress
+                type="circle"
+                strokeColor="#FF4D4F"
+                trailColor="#F6F6F6"
+                size={90}
+                strokeWidth={8}
+                percent={learnRecord.progress}
+                format={(percent) => `${percent}%`}
+              />
+            )}
         </div>
         {course.short_desc && (
           <div className={styles["desc"]}>{course.short_desc}</div>
@@ -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()}
                   ></HourCompenent>
                 )}
                 {!learnHourRecord[item.id] && (
@@ -110,6 +141,7 @@ const CoursePage = () => {
                     record={null}
                     duration={item.duration}
                     progress={0}
+                    onChange={() => getDetail()}
                   ></HourCompenent>
                 )}
               </div>