diff --git a/package.json b/package.json index f616e4f..0bb60e5 100644 --- a/package.json +++ b/package.json @@ -45,6 +45,8 @@ "jest": "^27.4.3", "jest-resolve": "^27.4.2", "jest-watch-typeahead": "^1.0.0", + "keepalive-for-react": "^5.0.7", + "keepalive-for-react-router": "^5.0.7", "lenis": "^1.3.19", "mime": "^4.0.7", "mini-css-extract-plugin": "^2.4.5", @@ -57,7 +59,6 @@ "postcss-preset-env": "^7.0.1", "prompts": "^2.4.2", "react": "^19.1.0", - "react-activation": "^0.13.4", "react-app-polyfill": "^3.0.0", "react-countup": "^6.5.3", "react-dev-utils": "^12.0.1", diff --git a/src/Routes.tsx b/src/Routes.tsx index b22900e..27cfa03 100644 --- a/src/Routes.tsx +++ b/src/Routes.tsx @@ -1,9 +1,6 @@ import Home from "@/pages/Home/index"; import MainLayout from "@/layouts/MainLayout"; import { Navigate, createBrowserRouter } from "react-router-dom"; -import { lazy, Suspense } from "react"; -import { KeepAlive } from "react-activation"; - import TermsOfUse from "@/pages/Others/TermsOfUse"; import PrivacyPolicy from "@/pages/Others/PrivacyPolicy"; @@ -35,219 +32,115 @@ const routes = createBrowserRouter([ path: "/", element: , children: [ - { index: true, element: }, + { index: true, element: }, // 关于银泰 { path: "about", element: ( - + ), }, { path: "about/overview", - element: ( - - - - - - ), + element: , }, { path: "about/history", - element: ( - - - - - - ), + element: , }, { path: "about/founder", - element: ( - - - - - - ), + element: , }, // 集团业务 { path: "business", element: ( - - - + ), }, { path: "business/commercial-group", - element: ( - - - - - - ), + element: , }, { path: "business/commercial-group/:detailType", - element: ( - - - - - - ), + element: , }, { path: "business/base-group", - element: ( - - - - - - ), + element: , }, { path: "business/realty-group", - element: ( - - - - - - ), + element: , }, { path: "business/invest-group", - element: ( - - - - - - ), + element: , }, { path: "business/ruijing-group", - element: ( - - - - - - ), + element: , }, // 社会责任 { path: "social", element: ( - - - + ), }, { path: "social/sustainability", - element: ( - - - - - - ), + element: , }, { path: "social/foundation", - element: ( - - - - - - ), + element: , }, // 新闻中心 { path: "news", element: ( - - - + ), }, { path: "news/public", - element: ( - - - - - - ), + element: , }, { path: "news/media", - element: ( - - - - - - ), + element: , }, { path: "news/detail/:id", - element: ( - - - - - - ), + element: , }, // 加入银泰 { path: "join", element: ( - - - + ), }, { path: "join/culture", - element: ( - - - - - - ), + element: , }, { path: "join/campus", - element: ( - - - - - - ), + element: , }, { path: "join/campus/detail/:id", @@ -259,21 +152,15 @@ const routes = createBrowserRouter([ // 物业服务 { path: "/property-service", - element: ( - - - - - - ), + element: , }, // 搜索 - { path: "/search", element: }, + { path: "/search", element: }, // 使用条款 隐私保护 审计举报 网站地图 - { path: "/terms-of-use", element: }, - { path: "/privacy-policy", element: }, - { path: "/audit-report", element: }, - { path: "/site-map", element: }, + { path: "/terms-of-use", element: }, + { path: "/privacy-policy", element: }, + { path: "/audit-report", element: }, + { path: "/site-map", element: }, { path: "/contact-us", element: }, ], }, diff --git a/src/layouts/MainLayout.tsx b/src/layouts/MainLayout.tsx index 7e3adc7..dc8ce37 100644 --- a/src/layouts/MainLayout.tsx +++ b/src/layouts/MainLayout.tsx @@ -1,8 +1,7 @@ -import { Outlet } from "react-router-dom"; import Header from "./Header"; import Footer from "./Footer"; import useHashScroll from "@/hooks/useHashScroll"; -import { AliveScope } from "react-activation"; +import KeepAliveRouteOutlet from "keepalive-for-react-router"; export default function MainLayout() { useHashScroll() @@ -11,9 +10,7 @@ export default function MainLayout() {
- - - +