From b4dd5a6b46622053f87a7caf0148133aa9e1fb48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A6=BA=E7=8B=A8?= <18119604035@163.com> Date: Mon, 17 Jul 2023 17:06:30 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=BC=93=E5=8A=A0=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/internal/httpClient.ts | 3 ++ src/routes/index.tsx | 57 +++++++++++++++++++++------------- 2 files changed, 38 insertions(+), 22 deletions(-) diff --git a/src/api/internal/httpClient.ts b/src/api/internal/httpClient.ts index dd615ad..0b29793 100644 --- a/src/api/internal/httpClient.ts +++ b/src/api/internal/httpClient.ts @@ -52,10 +52,13 @@ export class HttpClient { GoLogin(); } else if (status === 404) { // 跳转到404页面 + GoLogin(); } else if (status === 403) { // 跳转到无权限页面 + GoLogin(); } else if (status === 500) { // 跳转到500异常页面 + GoLogin(); } return Promise.reject(error.response); } diff --git a/src/routes/index.tsx b/src/routes/index.tsx index fd4c4c0..f44e6f8 100644 --- a/src/routes/index.tsx +++ b/src/routes/index.tsx @@ -2,29 +2,45 @@ import { lazy } from "react"; import { RouteObject } from "react-router-dom"; import { login, system } from "../api"; -import InitPage from "../pages/init"; import { getToken } from "../utils"; import KeepAlive from "../compenents/keep-alive"; - +// 页面加载 +import InitPage from "../pages/init"; import LoginPage from "../pages/login"; import HomePage from "../pages/home"; -import DashboardPage from "../pages/dashboard"; -import ChangePasswordPage from "../pages/change-password"; -import ResourceCategoryPage from "../pages/resource/resource-category"; -import ResourceImagesPage from "../pages/resource/images"; -import ResourceVideosPage from "../pages/resource/videos"; -import CoursePage from "../pages/course/index"; -import CourseUserPage from "../pages/course/user"; -import MemberPage from "../pages/member"; -import MemberImportPage from "../pages/member/import"; -import MemberLearnPage from "../pages/member/learn"; -import MemberDepartmentProgressPage from "../pages/member/departmentUser"; -import SystemConfigPage from "../pages/system/config"; -import SystemAdministratorPage from "../pages/system/administrator"; -import SystemAdminrolesPage from "../pages/system/adminroles"; -import DepartmentPage from "../pages/department"; -import TestPage from "../pages/test"; -import ErrorPage from "../pages/error"; +//首页 +const DashboardPage = lazy(() => import("../pages/dashboard")); +//修改密码页面 +const ChangePasswordPage = lazy(() => import("../pages/change-password")); +//资源管理相关 +const ResourceCategoryPage = lazy( + () => import("../pages/resource/resource-category") +); +const ResourceImagesPage = lazy(() => import("../pages/resource/images")); +const ResourceVideosPage = lazy(() => import("../pages/resource/videos")); +//课程相关 +const CoursePage = lazy(() => import("../pages/course/index")); +const CourseUserPage = lazy(() => import("../pages/course/user")); +//学员相关 +const MemberPage = lazy(() => import("../pages/member")); +const MemberImportPage = lazy(() => import("../pages/member/import")); +const MemberLearnPage = lazy(() => import("../pages/member/learn")); +const MemberDepartmentProgressPage = lazy( + () => import("../pages/member/departmentUser") +); +//系统相关 +const SystemConfigPage = lazy(() => import("../pages/system/config")); +const SystemAdministratorPage = lazy( + () => import("../pages/system/administrator") +); +const SystemAdminrolesPage = lazy(() => import("../pages/system/adminroles")); +//部门页面 +const DepartmentPage = lazy(() => import("../pages/department")); +//测试 +const TestPage = lazy(() => import("../pages/test")); +//错误页面 +const ErrorPage = lazy(() => import("../pages/error")); + import PrivateRoute from "../compenents/private-route"; // const LoginPage = lazy(() => import("../pages/login")); @@ -51,9 +67,6 @@ if (getToken()) { }); }); } else { - if (window.location.pathname !== "/login") { - window.location.href = "/login"; - } RootPage = ; }