2025-06-22 20:22:50 +08:00
22 changed files with 248 additions and 252 deletions
--- a/.env.example
+++ b/.env.example
@ -1 +1,2 @@
 VITE_APP_URL=
+VITE_G_ID=
--- a/.gitignore
+++ b/.gitignore
@ -32,5 +32,3 @@ yarn.lock

 deploy-test.sh
 deploy-demo.sh
-
-pnpm-lock.yaml
--- a/index.html
+++ b/index.html
@ -13,6 +13,11 @@
  <body>
    <div id="root"></div>
    <script type="module" src="/src/main.tsx"></script>
+    <script
+      crossorigin="anonymous"
+      integrity="sha512-oHrfR/z2wkuRuaHrdZ9NhoT/o/1kteub+QvmQgVzOKK7NTvIKQMvnY9+/RR0+eW311o4lAE/YzzLXXmP2XUvig=="
+      src="https://lib.baomitu.com/hls.js/1.1.4/hls.min.js"
+    ></script>
    <script type="text/javascript">
      if (
        typeof WeixinJSBridge == "object" &&
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
-  "name": "playedu-h5-interface",
-  "private": false,
+  "name": "frontend",
+  "private": true,
  "version": "0.0.0",
  "type": "module",
  "scripts": {
@ -10,7 +10,6 @@
  },
  "dependencies": {
    "@reduxjs/toolkit": "^1.9.3",
-    "ahooks": "^3.7.10",
    "antd-mobile": "^5.31.1",
    "axios": "^1.3.4",
    "localforage": "^1.10.0",
@ -19,19 +18,19 @@
    "prop-types": "^15.8.1",
    "react": "^18.2.0",
    "react-dom": "^18.2.0",
+    "react-ga": "^3.3.1",
    "react-redux": "^8.0.5",
    "react-router-dom": "^6.9.0",
    "redux": "^4.2.1",
-    "sort-by": "^1.2.0"
+    "sort-by": "^1.2.0",
+    "web-vitals": "^3.3.0"
  },
  "devDependencies": {
-    "@types/react": "^18.2.0",
-    "@types/react-dom": "^18.2.0",
-    "@vitejs/plugin-legacy": "^4.1.1",
+    "@types/react": "^18.0.28",
+    "@types/react-dom": "^18.0.11",
    "@vitejs/plugin-react-swc": "^3.0.0",
    "rollup-plugin-gzip": "^3.1.0",
    "sass": "^1.59.3",
-    "terser": "^5.19.4",
    "typescript": "^4.9.3",
    "vite": "^4.2.0"
  }
--- a/public/js/xg/hls.min.js
+++ b/public/js/xg/hls.min.js
--- a/public/js/xg/index.js
+++ b/public/js/xg/index.js
--- a/src/App.tsx
+++ b/src/App.tsx
@ -1,12 +1,26 @@
-import { Suspense } from "react";
-import { useRoutes } from "react-router-dom";
+import { Suspense, useEffect } from "react";
+import ReactGA from "react-ga";
+import { useLocation, useRoutes } from "react-router-dom";
 import routes from "./routes";
 import "./App.scss";
 import LoadingPage from "./pages/loading";

+const G_ID = import.meta.env.VITE_G_ID || "";
+if (G_ID) {
+  ReactGA.initialize(G_ID);
+}
+
 const App = () => {
  const Views = () => useRoutes(routes);

+  const location = useLocation();
+  useEffect(() => {
+    if (!G_ID) {
+      return;
+    }
+    ReactGA.pageview(location.pathname + location.search);
+  }, [location]);
+
  return (
    <Suspense fallback={<LoadingPage />}>
      <Views />
--- a/src/api/login.ts
+++ b/src/api/login.ts
@ -10,10 +10,3 @@ export function login(email: string, password: string) {
 export function logout() {
  return client.post("/api/v1/auth/logout", {});
 }
-
-export function loginLdap(email: string, password: string) {
-  return client.post("/api/v1/auth/login/ldap", {
-    username: email,
-    password: password,
-  });
-}
--- a/src/main.scss
+++ b/src/main.scss
@ -1,3 +1,5 @@
+@import "./assets/iconfont/iconfont.css";
+
 body {
  margin: 0;
 }
@ -32,13 +34,6 @@ code {
  float: left;
  height: auto;
 }
-
-.float-left {
-  width: 100%;
-  height: auto;
-  float: left;
-}
-
 .main-header {
  position: relative;
  width: 100%;
--- a/src/main.tsx
+++ b/src/main.tsx
@ -2,7 +2,6 @@ import ReactDOM from "react-dom/client";
 import { Provider } from "react-redux";
 import store from "./store";
 import { BrowserRouter } from "react-router-dom";
-import "./assets/iconfont/iconfont.css";
 import "./main.scss";
 import App from "./App";
 import AutoScorllTop from "./AutoTop";
--- a/src/pages/index/index.module.scss
+++ b/src/pages/index/index.module.scss
@ -107,7 +107,7 @@
  width: 100%;
  height: auto;
  box-sizing: border-box;
-  padding: 0px 20px 55px 20px;
+  padding: 96px 20px 55px 20px;
  text-align: left;
  overflow-x: hidden;
  overflow-y: auto;
--- a/src/pages/index/index.tsx
+++ b/src/pages/index/index.tsx
@ -1,6 +1,5 @@
 import { useEffect, useRef, useState } from "react";
-import { Dropdown, PullToRefresh, Skeleton, Tabs } from "antd-mobile";
-import { sleep } from "antd-mobile/es/utils/sleep";
+import { Dropdown, Skeleton, Tabs } from "antd-mobile";
 import { DropdownRef } from "antd-mobile/es/components/dropdown";
 import { user } from "../../api/index";
 import styles from "./index.module.scss";
@ -72,15 +71,14 @@ const IndexPage = () => {
  }, []);

  useEffect(() => {
-    setLoading(true);
    if (currentDepId === 0) {
-      setLoading(false);
      return;
    }
    getData();
  }, [currentDepId, categoryId]);

  const getData = () => {
+    setLoading(true);
    user.courses(currentDepId, categoryId).then((res: any) => {
      const records = res.data.learn_course_records;
      setLearnCourseRecords(records);
@ -267,17 +265,6 @@ const IndexPage = () => {
          </Dropdown.Item>
        </Dropdown>
      </div>
-      <div
-        className="float-left"
-        style={{ position: "relative", paddingTop: 96 }}
-      >
-        <PullToRefresh
-          onRefresh={async () => {
-            setLoading(true);
-            await sleep(700);
-            getData();
-          }}
-        >
      <div className={styles["list-box"]}>
        {loading &&
          Array.from({ length: 2 }).map((_, i) => (
@ -333,8 +320,6 @@ const IndexPage = () => {
            <Footer></Footer>
          </>
        )}
-          </div>{" "}
-        </PullToRefresh>
      </div>
    </div>
  );
--- a/src/pages/init/index.tsx
+++ b/src/pages/init/index.tsx
@ -24,7 +24,6 @@ export const InitPage = (props: Props) => {
    if (props.configData) {
      let config: SystemConfigStoreInterface = {
        //系统配置
-        "ldap-enabled": props.configData["ldap-enabled"],
        systemApiUrl: props.configData["system-api-url"],
        systemH5Url: props.configData["system-h5-url"],
        systemLogo: props.configData["system-logo"],
--- a/src/pages/layouts/with-footer/index.module.scss
+++ b/src/pages/layouts/with-footer/index.module.scss
@ -1,7 +0,0 @@
-.playedu-app {
-  width: 100vw;
-  height: 100vh;
-  overflow-y: auto;
-  overflow-x: hidden;
-  position: relative;
-}
--- a/src/pages/layouts/with-footer/index.tsx
+++ b/src/pages/layouts/with-footer/index.tsx
@ -2,16 +2,15 @@ import { Suspense } from "react";
 import { Outlet } from "react-router-dom";
 import LoadingPage from "../../loading";
 import { TabBarFooter } from "../../../components";
-import styles from "./index.module.scss";

 const WithoutHeaderWithoutFooter = () => {
  return (
-    <div className={styles["playedu-app"]}>
+    <>
      <Suspense fallback={<LoadingPage />}>
        <Outlet />
      </Suspense>
      <TabBarFooter></TabBarFooter>
-    </div>
+    </>
  );
 };

--- a/src/pages/login/index.tsx
+++ b/src/pages/login/index.tsx
@ -1,7 +1,7 @@
 import { useState, useEffect } from "react";
 import { Button, Toast, Input, Image } from "antd-mobile";
 import styles from "./index.module.scss";
-import { useDispatch, useSelector } from "react-redux";
+import { useDispatch } from "react-redux";
 import { useNavigate } from "react-router-dom";
 import { login, system, user } from "../../api/index";
 import { setToken } from "../../utils/index";
@ -19,7 +19,6 @@ const LoginPage = () => {
  const [email, setEmail] = useState("");
  const [password, setPassword] = useState("");
  const [bodyHeight, setBodyHeight] = useState(0);
-  const systemConfig = useSelector((state: any) => state.systemConfig.value);

  useEffect(() => {
    document.title = "登录";
@ -30,7 +29,7 @@ const LoginPage = () => {
  const loginSubmit = async (e: any) => {
    if (!email) {
      Toast.show({
-        content: "请输入邮箱或UID",
+        content: "请输入学员邮箱账号",
      });
      return;
    }
@ -48,19 +47,6 @@ const LoginPage = () => {
      return;
    }
    setLoading(true);
-    if (systemConfig["ldap-enabled"] === "1") {
-      try {
-        let res: any = await login.loginLdap(email, password);
-        setToken(res.data.token); //将token写入本地
-        await getSystemConfig(); //获取系统配置并写入store
-        await getUser(); //获取登录用户的信息并写入store
-        setLoading(false);
-        navigate("/member", { replace: true });
-      } catch (e) {
-        console.error("错误信息", e);
-        setLoading(false);
-      }
-    }else{
    try {
      let res: any = await login.login(email, password);
      setToken(res.data.token); //将token写入本地
@ -72,8 +58,6 @@ const LoginPage = () => {
      console.error("错误信息", e);
      setLoading(false);
    }
-    }
-    
  };

  const getUser = async () => {
@ -86,7 +70,6 @@ const LoginPage = () => {
    if (configRes.data) {
      let config: SystemConfigStoreInterface = {
        //系统配置
-        "ldap-enabled": configRes.data["ldap-enabled"],
        systemApiUrl: configRes.data["system-api-url"],
        systemH5Url: configRes.data["system-h5-url"],
        systemLogo: configRes.data["system-logo"],
@ -127,7 +110,7 @@ const LoginPage = () => {
        <div className={styles["input-box"]}>
          <Input
            className={styles["input-item"]}
-            placeholder="请输入邮箱或UID"
+            placeholder="请输入学员邮箱账号"
            value={email}
            onChange={(val) => {
              setEmail(val);
--- a/src/pages/member/index.tsx
+++ b/src/pages/member/index.tsx
@ -22,8 +22,10 @@ const MemberPage = () => {
      url: "",
    },
  ]);
+  const [learnTodayDay, setLearnTodayDay] = useState(0);
  const [learnTodayHour, setLearnTodayHour] = useState(0);
  const [learnTodayMin, setLearnTodayMin] = useState(0);
+  const [learnTotalDay, setLearnTotalDay] = useState(0);
  const [learnTotalHour, setLearnTotalHour] = useState(0);
  const [learnTotalMin, setLearnTotalMin] = useState(0);
  const user = useSelector((state: any) => state.loginUser.value.user);
@ -58,17 +60,19 @@ const MemberPage = () => {
      setStats(res.data.stats);
      let todayData = studyTimeFormat(res.data.stats.today_learn_duration);
      if (todayData) {
-        setLearnTodayHour(todayData[0]);
-        setLearnTodayMin(todayData[1]);
-        if (todayData[1] === 0 && todayData[2] > 0) {
+        setLearnTodayDay(todayData[0]);
+        setLearnTodayHour(todayData[1]);
+        setLearnTodayMin(todayData[2]);
+        if (todayData[2] === 0 && todayData[3] > 0) {
          setLearnTodayMin(1);
        }
      }
      let totalData = studyTimeFormat(res.data.stats.learn_duration);
      if (totalData) {
-        setLearnTotalHour(totalData[0]);
-        setLearnTotalMin(totalData[1]);
-        if (totalData[1] === 0 && totalData[2] > 0) {
+        setLearnTotalDay(totalData[0]);
+        setLearnTotalHour(totalData[1]);
+        setLearnTotalMin(totalData[2]);
+        if (totalData[2] === 0 && totalData[3] > 0) {
          setLearnTodayMin(1);
        }
      }
@ -187,6 +191,11 @@ const MemberPage = () => {
        <div className={styles["stats-content"]}>
          <div className={styles["stat-item"]}>
            <span className={styles["time"]}>
+              {learnTodayDay > 0 && (
+                <>
+                  <strong>{learnTodayDay} </strong>天
+                </>
+              )}
              <strong> {learnTodayHour} </strong>时
              <strong> {learnTodayMin} </strong>分
            </span>
@ -194,6 +203,11 @@ const MemberPage = () => {
          </div>
          <div className={styles["stat-item"]}>
            <span className={styles["time"]}>
+              {learnTotalDay > 0 && (
+                <>
+                  <strong>{learnTotalDay} </strong>天
+                </>
+              )}
              <strong> {learnTotalHour} </strong>时
              <strong> {learnTotalMin} </strong>分
            </span>
--- a/src/pages/study/index.tsx
+++ b/src/pages/study/index.tsx
@ -1,6 +1,5 @@
 import { useState, useEffect } from "react";
-import { PullToRefresh, Skeleton } from "antd-mobile";
-import { sleep } from "antd-mobile/es/utils/sleep";
+import { Skeleton } from "antd-mobile";
 import styles from "./index.module.scss";
 import { course } from "../../api/index";
 import { Empty } from "../../components";
@ -18,11 +17,14 @@ const StudyPage = () => {
  }, []);

  useEffect(() => {
-    setLoading(true);
    getCourses();
  }, []);

  const getCourses = () => {
+    if (loading) {
+      return;
+    }
+    setLoading(true);
    course
      .latestLearn()
      .then((res: any) => {
@ -59,14 +61,6 @@ const StudyPage = () => {
  return (
    <div className="main-body">
      <div className={styles["title"]}>最近学习</div>
-      <div className="float-left" style={{ position: "relative" }}>
-        <PullToRefresh
-          onRefresh={async () => {
-            setLoading(true);
-            await sleep(700);
-            getCourses();
-          }}
-        >
      <div className={styles["list-box"]}>
        {loading &&
          Array.from({ length: 2 }).map((_, i) => (
@ -149,8 +143,6 @@ const StudyPage = () => {
          </>
        )}
      </div>
-        </PullToRefresh>
-      </div>
    </div>
  );
 };
--- a/src/reportWebVitals.ts
+++ b/src/reportWebVitals.ts
@ -0,0 +1,15 @@
+import { ReportHandler } from 'web-vitals';
+
+const reportWebVitals = (onPerfEntry?: ReportHandler) => {
+  if (onPerfEntry && onPerfEntry instanceof Function) {
+    import('web-vitals').then(({ getCLS, getFID, getFCP, getLCP, getTTFB }) => {
+      getCLS(onPerfEntry);
+      getFID(onPerfEntry);
+      getFCP(onPerfEntry);
+      getLCP(onPerfEntry);
+      getTTFB(onPerfEntry);
+    });
+  }
+};
+
+export default reportWebVitals;
--- a/src/store/system/systemConfigSlice.ts
+++ b/src/store/system/systemConfigSlice.ts
@ -1,7 +1,6 @@
 import { createSlice } from "@reduxjs/toolkit";

 type SystemConfigStoreInterface = {
-  "ldap-enabled": string;
  systemApiUrl: string;
  systemPcUrl: string;
  systemH5Url: string;
@ -17,7 +16,6 @@ type SystemConfigStoreInterface = {
 };

 let defaultValue: SystemConfigStoreInterface = {
-  "ldap-enabled": "",
  systemApiUrl: "",
  systemPcUrl: "",
  systemH5Url: "",
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@ -54,6 +54,7 @@ export function changeAppUrl(str: string) {
 export function studyTimeFormat(dateStr: number) {
  var d = moment.duration(dateStr / 1000, "seconds");
  let value = [];
+  value.push(Math.floor(d.asDays()));
  value.push(d.hours());
  value.push(d.minutes());
  value.push(d.seconds());
--- a/vite.config.ts
+++ b/vite.config.ts
@ -1,22 +1,13 @@
 import { defineConfig } from "vite";
 import react from "@vitejs/plugin-react-swc";
 import gzipPlugin from "rollup-plugin-gzip";
-import legacy from "@vitejs/plugin-legacy";

 // https://vitejs.dev/config/
 export default defineConfig({
  server: {
    host: "0.0.0.0",
  },
-  plugins: [
-    react(),
-    legacy({
-      targets: ["chrome 52"],
-      additionalLegacyPolyfills: ["regenerator-runtime/runtime"],
-      renderLegacyChunks: true,
-      modernPolyfills: true,
-    }),
-  ],
+  plugins: [react()],
  build: {
    rollupOptions: {
      plugins: [gzipPlugin()],