移除 react-ga 和 web-vitals 依赖

移除xgplayer && 修复pnpm build 和 dev 报错
fixed: 底部导航栏悬浮bug
2025-06-11 01:54:09 +08:00 · 2024-02-20 14:56:48 +08:00 · 2024-02-20 14:54:17 +08:00 · 2024-01-09 09:32:46 +08:00 · 2024-01-08 16:14:56 +08:00 · 2024-01-08 12:28:43 +08:00
14 changed files with 193 additions and 211 deletions
--- a/.env.example
+++ b/.env.example
@ -1,2 +1 @@
-VITE_APP_URL=
-VITE_G_ID=
+VITE_APP_URL=
--- a/.gitignore
+++ b/.gitignore
@ -31,4 +31,6 @@ yarn.lock
 .env

 deploy-test.sh
-deploy-demo.sh
+deploy-demo.sh
+
+pnpm-lock.yaml
--- a/index.html
+++ b/index.html
@ -13,11 +13,6 @@
  <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": "frontend",
-  "private": true,
+  "name": "playedu-h5-interface",
+  "private": false,
  "version": "0.0.0",
  "type": "module",
  "scripts": {
@ -10,6 +10,7 @@
  },
  "dependencies": {
    "@reduxjs/toolkit": "^1.9.3",
+    "ahooks": "^3.7.10",
    "antd-mobile": "^5.31.1",
    "axios": "^1.3.4",
    "localforage": "^1.10.0",
@ -18,16 +19,14 @@
    "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",
-    "web-vitals": "^3.3.0"
+    "sort-by": "^1.2.0"
  },
  "devDependencies": {
-    "@types/react": "^18.0.28",
-    "@types/react-dom": "^18.0.11",
+    "@types/react": "^18.2.0",
+    "@types/react-dom": "^18.2.0",
    "@vitejs/plugin-legacy": "^4.1.1",
    "@vitejs/plugin-react-swc": "^3.0.0",
    "rollup-plugin-gzip": "^3.1.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,26 +1,12 @@
-import { Suspense, useEffect } from "react";
-import ReactGA from "react-ga";
-import { useLocation, useRoutes } from "react-router-dom";
+import { Suspense } from "react";
+import { 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/main.scss
+++ b/src/main.scss
@ -32,6 +32,13 @@ code {
  float: left;
  height: auto;
 }
+
+.float-left {
+  width: 100%;
+  height: auto;
+  float: left;
+}
+
 .main-header {
  position: relative;
  width: 100%;
--- 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: 96px 20px 55px 20px;
+  padding: 0px 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,5 +1,6 @@
 import { useEffect, useRef, useState } from "react";
-import { Dropdown, Skeleton, Tabs } from "antd-mobile";
+import { Dropdown, PullToRefresh, Skeleton, Tabs } from "antd-mobile";
+import { sleep } from "antd-mobile/es/utils/sleep";
 import { DropdownRef } from "antd-mobile/es/components/dropdown";
 import { user } from "../../api/index";
 import styles from "./index.module.scss";
@ -71,14 +72,15 @@ 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);
@ -265,61 +267,74 @@ const IndexPage = () => {
          </Dropdown.Item>
        </Dropdown>
      </div>
-      <div className={styles["list-box"]}>
-        {loading &&
-          Array.from({ length: 2 }).map((_, i) => (
-            <div
-              style={{
-                width: "100%",
-                height: 75,
-                display: "flex",
-                alignItems: "center",
-                marginBottom: 30,
-                marginTop: 30,
-              }}
-              key={i}
-            >
-              <Skeleton
-                animated
-                style={{
-                  width: 100,
-                  height: 75,
-                  borderRadius: 8,
-                  marginRight: 15,
-                }}
-              />
-              <div
-                style={{
-                  flex: 1,
-                  height: 75,
-                  display: "flex",
-                  flexDirection: "column",
-                  justifyContent: "space-between",
-                }}
-              >
-                <Skeleton animated style={{ width: "100%", height: 21 }} />
-                <Skeleton animated style={{ width: "100%", height: 24 }} />
-              </div>
-            </div>
-          ))}
-        {!loading && coursesList.length === 0 && <Empty></Empty>}
-        {!loading && coursesList.length > 0 && (
-          <>
-            {coursesList.map((item: any) => (
-              <div className={styles["item"]} key={item.id}>
-                <CoursesModel
-                  id={item.id}
-                  title={item.title}
-                  thumb={item.thumb}
-                  isRequired={item.is_required}
-                  record={learnCourseRecords[item.id]}
-                  hourCount={learnCourseHourCount[item.id]}
-                ></CoursesModel>
-              </div>
-            ))}
-            <Footer></Footer>
-          </>
-        )}
+      <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) => (
+                <div
+                  style={{
+                    width: "100%",
+                    height: 75,
+                    display: "flex",
+                    alignItems: "center",
+                    marginBottom: 30,
+                    marginTop: 30,
+                  }}
+                  key={i}
+                >
+                  <Skeleton
+                    animated
+                    style={{
+                      width: 100,
+                      height: 75,
+                      borderRadius: 8,
+                      marginRight: 15,
+                    }}
+                  />
+                  <div
+                    style={{
+                      flex: 1,
+                      height: 75,
+                      display: "flex",
+                      flexDirection: "column",
+                      justifyContent: "space-between",
+                    }}
+                  >
+                    <Skeleton animated style={{ width: "100%", height: 21 }} />
+                    <Skeleton animated style={{ width: "100%", height: 24 }} />
+                  </div>
+                </div>
+              ))}
+            {!loading && coursesList.length === 0 && <Empty></Empty>}
+            {!loading && coursesList.length > 0 && (
+              <>
+                {coursesList.map((item: any) => (
+                  <div className={styles["item"]} key={item.id}>
+                    <CoursesModel
+                      id={item.id}
+                      title={item.title}
+                      thumb={item.thumb}
+                      isRequired={item.is_required}
+                      record={learnCourseRecords[item.id]}
+                      hourCount={learnCourseHourCount[item.id]}
+                    ></CoursesModel>
+                  </div>
+                ))}
+                <Footer></Footer>
+              </>
+            )}
+          </div>{" "}
+        </PullToRefresh>
      </div>
    </div>
  );
--- a/src/pages/layouts/with-footer/index.module.scss
+++ b/src/pages/layouts/with-footer/index.module.scss
@ -0,0 +1,7 @@
+.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,15 +2,16 @@ 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/study/index.tsx
+++ b/src/pages/study/index.tsx
@ -1,5 +1,6 @@
 import { useState, useEffect } from "react";
-import { Skeleton } from "antd-mobile";
+import { PullToRefresh, Skeleton } from "antd-mobile";
+import { sleep } from "antd-mobile/es/utils/sleep";
 import styles from "./index.module.scss";
 import { course } from "../../api/index";
 import { Empty } from "../../components";
@ -17,14 +18,11 @@ const StudyPage = () => {
  }, []);

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

  const getCourses = () => {
-    if (loading) {
-      return;
-    }
-    setLoading(true);
    course
      .latestLearn()
      .then((res: any) => {
@ -61,87 +59,97 @@ const StudyPage = () => {
  return (
    <div className="main-body">
      <div className={styles["title"]}>最近学习</div>
-      <div className={styles["list-box"]}>
-        {loading &&
-          Array.from({ length: 2 }).map((_, i) => (
-            <div className={styles["item"]} key={i}>
-              <Skeleton
-                animated
-                style={{
-                  width: 100,
-                  height: 75,
-                  borderRadius: 8,
-                  marginRight: 15,
-                }}
-              />
-              <div className={styles["item-info"]}>
-                <Skeleton animated style={{ width: "100%", height: 21 }} />
-                <Skeleton animated style={{ width: "100%", height: 24 }} />
-              </div>
-            </div>
-          ))}
-        {!loading &&
-          courses.length === 0 &&
-          todayCourses.length === 0 &&
-          yesterdayCourses.length === 0 && <Empty></Empty>}
-        {!loading && (
-          <>
-            {todayCourses.length > 0 && (
-              <>
-                <div className={styles["label"]}>今日</div>
-                {todayCourses.map((item: any, index: number) => (
-                  <div key={index} style={{ width: "100%" }}>
-                    {item.course && (
-                      <CoursesModel
-                        id={item.course.id}
-                        title={item.course.title}
-                        thumb={item.course.thumb}
-                        isRequired={item.course.is_required}
-                        record={item.record}
-                      ></CoursesModel>
-                    )}
+      <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) => (
+                <div className={styles["item"]} key={i}>
+                  <Skeleton
+                    animated
+                    style={{
+                      width: 100,
+                      height: 75,
+                      borderRadius: 8,
+                      marginRight: 15,
+                    }}
+                  />
+                  <div className={styles["item-info"]}>
+                    <Skeleton animated style={{ width: "100%", height: 21 }} />
+                    <Skeleton animated style={{ width: "100%", height: 24 }} />
                  </div>
-                ))}
+                </div>
+              ))}
+            {!loading &&
+              courses.length === 0 &&
+              todayCourses.length === 0 &&
+              yesterdayCourses.length === 0 && <Empty></Empty>}
+            {!loading && (
+              <>
+                {todayCourses.length > 0 && (
+                  <>
+                    <div className={styles["label"]}>今日</div>
+                    {todayCourses.map((item: any, index: number) => (
+                      <div key={index} style={{ width: "100%" }}>
+                        {item.course && (
+                          <CoursesModel
+                            id={item.course.id}
+                            title={item.course.title}
+                            thumb={item.course.thumb}
+                            isRequired={item.course.is_required}
+                            record={item.record}
+                          ></CoursesModel>
+                        )}
+                      </div>
+                    ))}
+                  </>
+                )}
+                {yesterdayCourses.length > 0 && (
+                  <>
+                    <div className={styles["label"]}>昨日</div>
+                    {yesterdayCourses.map((item: any, index: number) => (
+                      <div key={index} style={{ width: "100%" }}>
+                        {item.course && (
+                          <CoursesModel
+                            id={item.course.id}
+                            title={item.course.title}
+                            thumb={item.course.thumb}
+                            isRequired={item.course.is_required}
+                            record={item.record}
+                          ></CoursesModel>
+                        )}
+                      </div>
+                    ))}
+                  </>
+                )}
+                {courses.length > 0 && (
+                  <>
+                    <div className={styles["label"]}>更早</div>
+                    {courses.map((item: any, index: number) => (
+                      <div key={index} style={{ width: "100%" }}>
+                        {item.course && (
+                          <CoursesModel
+                            id={item.course.id}
+                            title={item.course.title}
+                            thumb={item.course.thumb}
+                            isRequired={item.course.is_required}
+                            record={item.record}
+                          ></CoursesModel>
+                        )}
+                      </div>
+                    ))}
+                  </>
+                )}
              </>
            )}
-            {yesterdayCourses.length > 0 && (
-              <>
-                <div className={styles["label"]}>昨日</div>
-                {yesterdayCourses.map((item: any, index: number) => (
-                  <div key={index} style={{ width: "100%" }}>
-                    {item.course && (
-                      <CoursesModel
-                        id={item.course.id}
-                        title={item.course.title}
-                        thumb={item.course.thumb}
-                        isRequired={item.course.is_required}
-                        record={item.record}
-                      ></CoursesModel>
-                    )}
-                  </div>
-                ))}
-              </>
-            )}
-            {courses.length > 0 && (
-              <>
-                <div className={styles["label"]}>更早</div>
-                {courses.map((item: any, index: number) => (
-                  <div key={index} style={{ width: "100%" }}>
-                    {item.course && (
-                      <CoursesModel
-                        id={item.course.id}
-                        title={item.course.title}
-                        thumb={item.course.thumb}
-                        isRequired={item.course.is_required}
-                        record={item.record}
-                      ></CoursesModel>
-                    )}
-                  </div>
-                ))}
-              </>
-            )}
-          </>
-        )}
+          </div>
+        </PullToRefresh>
      </div>
    </div>
  );
--- a/src/reportWebVitals.ts
+++ b/src/reportWebVitals.ts
@ -1,15 +0,0 @@
-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;
Author	SHA1	Message	Date
xxx	387c930795	移除 react-ga 和 web-vitals 依赖	2024-02-20 14:56:48 +08:00
xxx	263a3abccb	移除xgplayer && 修复pnpm build 和 dev 报错	2024-02-20 14:54:17 +08:00
xxx	8a3bbd565b	fixed: 底部导航栏悬浮bug	2024-01-09 09:32:46 +08:00
xxx	f71df2a461	移除hls.min.js的依赖	2024-01-08 16:14:56 +08:00
unknown	5e054cdd54	下拉刷新	2024-01-08 12:28:43 +08:00