Merge pull request #6 from PlayEdu/dev

Dev

src/compenents/header/index.tsx

@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from "react";
 import styles from "./index.module.scss";
-import { Modal, Button, Dropdown } from "antd";
+import { Modal, Button, Dropdown, Image } from "antd";
 import type { MenuProps } from "antd";
 import { useDispatch, useSelector } from "react-redux";
 import { Link, useNavigate, useLocation } from "react-router-dom";
@@ -217,9 +217,11 @@ export const Header: React.FC = () => {
               <div className="d-flex" style={{ cursor: "pointer" }}>
                 {user && user.name && (
                   <>
-                    <img
+                    <Image
+                      loading="lazy"
                       style={{ width: 36, height: 36, borderRadius: "50%" }}
                       src={user.avatar}
+                      preview={false}
                     />
                     <span className="ml-8 c-admin">{user.name}</span>
                   </>

src/compenents/user-info/index.tsx

@@ -101,6 +101,7 @@ export const UserInfoModel: React.FC<PropInterface> = ({ open, onCancel }) => {
               <div className="d-flex">
                 {avatar && (
                   <Image
+                    loading="lazy"
                     width={60}
                     height={60}
                     style={{ borderRadius: "50%" }}

src/pages/course/video.tsx

@@ -181,6 +181,7 @@ const CoursePalyPage = () => {
       setPlayingTime(0);
       setPlayendedStatus(true);
       playTimeUpdate(parseInt(window.player.video.currentTime), true);
+      exitFullscreen();
       window.player && window.player.destroy();
     });
     setLoading(false);
@@ -214,6 +215,18 @@ const CoursePalyPage = () => {
     }
   };
 
+  const exitFullscreen = () => {
+    let de: any;
+    de = document;
+    if (de.fullscreenElement !== null) {
+      de.exitFullscreen();
+    } else if (de.mozCancelFullScreen) {
+      de.mozCancelFullScreen();
+    } else if (de.webkitCancelFullScreen) {
+      de.webkitCancelFullScreen();
+    }
+  };
+
   return (
     <div className={styles["video-mask"]}>
       <div className={styles["top-cont"]}>

src/pages/index/compenents/courses-model.tsx

@@ -29,6 +29,7 @@ export const CoursesModel: React.FC<PropInterface> = ({
     >
       <div className={styles["top-content"]}>
         <Image
+          loading="lazy"
           width={120}
           height={90}
           style={{ borderRadius: 10 }}
@@ -65,7 +66,13 @@ export const CoursesModel: React.FC<PropInterface> = ({
         )}
         {progress >= 100 && (
           <div className={styles["success"]}>
-            <Image width={24} height={24} src={mediaIcon} preview={false} />
+            <Image
+              loading="lazy"
+              width={24}
+              height={24}
+              src={mediaIcon}
+              preview={false}
+            />
             <span className="ml-8">恭喜你学完此课程!</span>
           </div>
         )}

src/pages/init/index.tsx

@@ -22,6 +22,26 @@ export const InitPage = (props: Props) => {
   const [showHeader, setShowHeader] = useState<boolean>(true);
   const [showNoHeader, setShowNoHeader] = useState<boolean>(false);
   const [showFooter, setShowFooter] = useState<boolean>(true);
+  const [init, setInit] = useState<boolean>(false);
+  useEffect(() => {
+    if (pathname) {
+      if (pathname === "/login") {
+        setShowNoHeader(true);
+        setShowHeader(false);
+        setShowFooter(false);
+      } else if (!params.hourId) {
+        setShowNoHeader(false);
+        setShowHeader(true);
+        setShowFooter(true);
+      } else {
+        setShowNoHeader(false);
+        setShowHeader(false);
+        setShowFooter(false);
+      }
+    }
+  }, [pathname, params]);
+
+  useEffect(() => {
     if (props.loginData) {
       dispatch(loginAction(props.loginData));
     }
@@ -53,34 +73,19 @@ export const InitPage = (props: Props) => {
       };
       dispatch(saveConfigAction(config));
     }
-
+    setInit(true);
-  useEffect(() => {
+  }, [props]);
-    setShowHeader(true);
-    setShowNoHeader(false);
-    setShowFooter(true);
-    if (pathname === "/login") {
-      setShowNoHeader(true);
-      setShowHeader(false);
-      setShowFooter(false);
-    } else if (!params.hourId) {
-      setShowNoHeader(false);
-      setShowHeader(true);
-      setShowFooter(true);
-    } else {
-      setShowNoHeader(false);
-      setShowHeader(false);
-      setShowFooter(false);
-    }
-  }, [pathname, params]);
 
   return (
     <>
+      {init && (
         <div>
           {showNoHeader && <NoHeader></NoHeader>}
           {showHeader && <Header></Header>}
           <Outlet />
           {showFooter && <Footer></Footer>}
         </div>
+      )}
     </>
   );
 };

src/pages/latest-learn/index.tsx

@@ -56,6 +56,7 @@ const LatestLearnPage = () => {
                 >
                   <div style={{ width: 120 }}>
                     <Image
+                      loading="lazy"
                       src={item.course.thumb}
                       width={120}
                       height={90}
@@ -91,6 +92,7 @@ const LatestLearnPage = () => {
                           {item.record.progress >= 10000 && (
                             <>
                               <Image
+                                loading="lazy"
                                 width={24}
                                 height={24}
                                 src={mediaIcon}