diff --git a/src/components/ProtectedRoute.js b/src/components/ProtectedRoute.js
index cb9716f0..86996bb2 100755
--- a/src/components/ProtectedRoute.js
+++ b/src/components/ProtectedRoute.js
@@ -1,8 +1,8 @@
// src/components/ProtectedRoute.js - 弹窗拦截版本
import React, { useEffect, useRef } from 'react';
-import { Box, VStack, Spinner, Text } from '@chakra-ui/react';
import { useAuth } from '../contexts/AuthContext';
import { useAuthModal } from '../hooks/useAuthModal';
+import PageLoader from './Loading/PageLoader';
const ProtectedRoute = ({ children }) => {
const { isAuthenticated, isLoading, user } = useAuth();
@@ -22,26 +22,12 @@ const ProtectedRoute = ({ children }) => {
// 显示加载状态
if (isLoading) {
- return (
-
-
-
- 正在验证登录状态...
-
-
- );
+ return ;
}
- // 未登录时,渲染子组件 + 自动打开弹窗(通过 useEffect)
- // 弹窗会在 useEffect 中自动触发,页面正常显示
+ // 未登录时,显示加载状态 + 自动弹出认证弹窗(通过 useEffect)
if (!isAuthenticated || !user) {
- return children;
+ return ;
}
// 已登录,渲染子组件
diff --git a/src/components/ProtectedRouteRedirect.js b/src/components/ProtectedRouteRedirect.js
index 34d95b0a..1b459e09 100644
--- a/src/components/ProtectedRouteRedirect.js
+++ b/src/components/ProtectedRouteRedirect.js
@@ -2,28 +2,15 @@
// 未登录时跳转到首页,用于三级页面(详情页)
import React from 'react';
import { Navigate } from 'react-router-dom';
-import { Box, VStack, Spinner, Text } from '@chakra-ui/react';
import { useAuth } from '../contexts/AuthContext';
+import PageLoader from './Loading/PageLoader';
const ProtectedRouteRedirect = ({ children }) => {
const { isAuthenticated, isLoading, user } = useAuth();
// 显示加载状态
if (isLoading) {
- return (
-
-
-
- 正在验证登录状态...
-
-
- );
+ return ;
}
// 未登录,直接跳转到首页