Compare commits

...

11 Commits

Author SHA1 Message Date
xxx
96da44a884 移除 react-ga 依赖 2024-02-20 14:59:07 +08:00
xxx
39250531fb fixed: pnpm install 和 build 报错 2024-02-20 14:51:33 +08:00
xxx
490ea214b3 移除xgplayer 2024-02-20 14:29:44 +08:00
unknown
b0d0063fc1 重部署系统时部门storage存储优化以及error页面显示优化 2024-02-01 09:50:00 +08:00
unknown
8614d4ebaf 底部组件优化 2024-01-31 18:34:10 +08:00
unknown
46bb144f0a 退出登录优化 2024-01-26 10:53:44 +08:00
xxx
6e920d8ea1 移除hls.min.js 2024-01-08 16:14:11 +08:00
unknown
8154ee3130 登录封面替换 2024-01-08 12:02:31 +08:00
xxx
e056775fc0 Merge branch 'fix/1116' into dev 2023-11-16 14:57:44 +08:00
unknown
f5b4a70741 首页学习时间不显示天数 2023-11-16 14:57:38 +08:00
unknown
e1bca31883 课程详情tab优化 2023-11-16 14:55:26 +08:00
15 changed files with 58 additions and 75 deletions

View File

@ -1,2 +1 @@
VITE_APP_URL=
VITE_G_ID=
VITE_APP_URL=

4
.gitignore vendored
View File

@ -32,4 +32,6 @@ yarn.lock
deploy-test.sh
deploy-prod.sh
deploy-demo.sh
deploy-demo.sh
pnpm-lock.yaml

View File

@ -13,10 +13,5 @@
<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>
</body>
</html>

View File

@ -1,6 +1,6 @@
{
"name": "frontend",
"private": true,
"name": "playedu-pc-interface",
"private": false,
"version": "0.0.0",
"type": "module",
"scripts": {
@ -9,25 +9,26 @@
"preview": "vite preview"
},
"dependencies": {
"@ant-design/icons": "^5.3.0",
"@reduxjs/toolkit": "^1.9.3",
"add": "^2.0.6",
"antd": "^5.3.2",
"axios": "^1.3.4",
"dayjs": "^1.11.10",
"localforage": "^1.10.0",
"match-sorter": "^6.3.1",
"moment": "^2.29.4",
"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"
},
"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",

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,31 +1,13 @@
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}
</Suspense>
);
return <Suspense fallback={<LoadingPage />}>{views}</Suspense>;
};
export default App;

View File

@ -1,14 +1,21 @@
import axios, { Axios, AxiosResponse } from "axios";
import { message } from "antd";
import { getToken, clearToken } from "../../utils/index";
import {
getToken,
clearToken,
clearDepKey,
clearDepName,
} from "../../utils/index";
const GoLogin = () => {
clearToken();
clearDepName();
clearDepKey();
window.location.href = "/login";
};
const GoError = () => {
window.location.href = "/error";
const GoError = (status: number) => {
window.location.href = "/error?status=" + status;
};
export class HttpClient {
@ -56,13 +63,13 @@ export class HttpClient {
GoLogin();
} else if (status === 404) {
// 跳转到404页面
GoError();
GoError(404);
} else if (status === 403) {
// 跳转到无权限页面
GoError();
GoError(403);
} else if (status === 500) {
// 跳转到500异常页面
GoError();
GoError(500);
}
return Promise.reject(error.response);
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 64 KiB

View File

@ -33,6 +33,18 @@ body {
min-height: 100vh;
}
.layout-box {
display: flex;
flex-direction: column;
min-height: 100vh;
}
.footer-box {
flex: 1;
display: flex;
flex-direction: column-reverse;
}
.main-body {
width: 100%;
height: auto;

View File

@ -101,7 +101,7 @@
align-items: center;
position: relative;
.tab-item {
width: 64px;
min-width: 64px;
height: 48px;
margin-right: 50px;
transition: all 0.2s;
@ -114,7 +114,7 @@
}
}
.tit {
width: 64px;
width: 100%;
height: 40px;
font-size: 16px;
font-weight: 400;
@ -123,7 +123,7 @@
}
}
.tab-active-item {
width: 64px;
min-width: 64px;
height: 48px;
cursor: pointer;
margin-right: 50px;
@ -133,7 +133,7 @@
opacity: 0.8;
}
.tit {
width: 64px;
width: 100%;
height: 40px;
font-size: 16px;
font-weight: 500;

View File

@ -1,14 +1,17 @@
import { useState } from "react";
import { Button, Result } from "antd";
import { useNavigate } from "react-router-dom";
import { useNavigate, useLocation } from "react-router-dom";
import styles from "./index.module.scss";
const ErrorPage = () => {
const navigate = useNavigate();
const result = new URLSearchParams(useLocation().search);
const [status, setStatus] = useState(String(result.get("status") || "404"));
return (
<Result
status="404"
title="404"
title={status}
subTitle="您访问的页面不存在"
className={styles["main"]}
extra={

View File

@ -5,13 +5,15 @@ import LoadingPage from "../../loading";
const WithHeaderWithFooter = () => {
return (
<>
<div className="layout-box">
<Header></Header>
<Suspense fallback={<LoadingPage height="100vh" />}>
<Outlet />
</Suspense>
<Footer></Footer>
</>
<div className="footer-box">
<Footer></Footer>
</div>
</div>
);
};

View File

@ -5,12 +5,14 @@ import LoadingPage from "../../loading";
const WithoutHeaderWithFooter = () => {
return (
<>
<div className="layout-box">
<Suspense fallback={<LoadingPage height="100vh" />}>
<Outlet />
</Suspense>
<Footer></Footer>
</>
<div className="footer-box">
<Footer></Footer>
</div>
</div>
);
};

View File

@ -31,7 +31,7 @@ const loginUserSlice = createSlice({
stage.value.user = e.payload.user;
stage.value.departments = e.payload.departments;
stage.value.isLogin = true;
if (e.payload.departments.length > 0 && stage.value.currentDepId === 0) {
if (e.payload.departments.length > 0 && !getDepKey()) {
stage.value.currentDepId = e.payload.departments[0].id;
setDepName(e.payload.departments[0].name);
}