diff --git a/Cunkebao/app/components/AuthProvider.tsx b/Cunkebao/app/components/AuthProvider.tsx
index fe5f9c4b..c0291fd8 100644
--- a/Cunkebao/app/components/AuthProvider.tsx
+++ b/Cunkebao/app/components/AuthProvider.tsx
@@ -148,6 +148,9 @@ export function AuthProvider({ children }: AuthProviderProps) {
 
   const handleLogout = () => {
     safeLocalStorage.removeItem("token")
+    safeLocalStorage.removeItem("token_expired")
+    safeLocalStorage.removeItem("s2_accountId")
+    safeLocalStorage.removeItem("userInfo")
     safeLocalStorage.removeItem("user")
     setToken(null)
     setUser(null)
diff --git a/Cunkebao/app/login/page.tsx b/Cunkebao/app/login/page.tsx
index 41410b7e..37c93913 100644
--- a/Cunkebao/app/login/page.tsx
+++ b/Cunkebao/app/login/page.tsx
@@ -154,8 +154,8 @@ export default function LoginPage() {
   }
 
   useEffect(() => {
-    // 检查是否已登录，如果已登录则跳转到首页
-    if (isAuthenticated) {
+    // 检查是否已登录，如果已登录且不在登录页面，则跳转到首页
+    if (isAuthenticated && window.location.pathname === '/login') {
       router.push("/")
     }
   }, [isAuthenticated, router])