From 1346ab3959ed67266a6ede165d38edb566c5cb10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=91=E6=B3=BD=E7=BD=91?= <”357099073@qq.com“>
Date: Tue, 27 May 2025 01:35:57 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E8=BF=94=E5=9B=9E=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/index/view/component/header-simple.php | 13 +++++++++--
 app/index/view/component/header.php        | 26 +++++++++++++---------
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/app/index/view/component/header-simple.php b/app/index/view/component/header-simple.php
index 5e34430..13cf8fa 100644
--- a/app/index/view/component/header-simple.php
+++ b/app/index/view/component/header-simple.php
@@ -626,8 +626,17 @@ $userInfo = [
                             time: 2000,
                             shade: 0.3
                         }, function () {
-                            // 强制刷新页面，不使用缓存
-                            window.location.href = window.location.href + '?t=' + new Date().getTime();
+                            // 获取当前页面URL，如果是从其他页面跳转来的，则返回上一页
+                            var currentUrl = window.location.href;
+                            var referrer = document.referrer;
+                            
+                            // 如果是从登录页面跳转来的，则返回上一页
+                            if (referrer && referrer.includes('/index/user/login')) {
+                                window.location.href = referrer;
+                            } else {
+                                // 否则刷新当前页面
+                                window.location.href = currentUrl + '?t=' + new Date().getTime();
+                            }
                         });
                     } else {
                         layer.msg(res.msg, {
diff --git a/app/index/view/component/header.php b/app/index/view/component/header.php
index ec6d978..38f6863 100644
--- a/app/index/view/component/header.php
+++ b/app/index/view/component/header.php
@@ -32,9 +32,7 @@ $userInfo = [
 ?>
 
 <!-- 添加一个隐藏的div来存储登录状态 -->
-<div id="loginStatus" style="display: none;" 
-    data-is-logged-in="{$isLoggedIn}" 
-    data-user-account="{$userAccount ?? ''}">
+<div id="loginStatus" style="display: none;" data-is-logged-in="{$isLoggedIn}" data-user-account="{$userAccount ?? ''}">
 </div>
 
 <div style="display: flex;flex-direction: column;">
@@ -377,7 +375,7 @@ $userInfo = [
 
 <script>
     // 在页面加载时立即执行
-    (function() {
+    (function () {
         // 检查是否已经刷新过
         if (sessionStorage.getItem('has_refreshed') === 'true') {
             return;
@@ -388,16 +386,16 @@ $userInfo = [
         if (userAccount) {
             // 同步到cookie
             document.cookie = "user_account=" + userAccount + "; path=/";
-            
+
             // 如果有其他必要的数据，也同步到cookie
             var userId = localStorage.getItem('user_id');
             var userName = localStorage.getItem('user_name');
             var userAvatar = localStorage.getItem('user_avatar');
-            
+
             if (userId) document.cookie = "user_id=" + userId + "; path=/";
             if (userName) document.cookie = "user_name=" + userName + "; path=/";
             if (userAvatar) document.cookie = "user_avatar=" + userAvatar + "; path=/";
-            
+
             // 刷新页面以应用新的cookie，并标记已刷新
             if (!document.cookie.includes('user_id')) {
                 sessionStorage.setItem('has_refreshed', 'true');
@@ -638,10 +636,18 @@ $userInfo = [
                             time: 2000,
                             shade: 0.3
                         }, function () {
-                            // 强制刷新页面，不使用缓存
-                            window.location.href = window.location.href + '?t=' + new Date().getTime();
+                            // 获取当前页面URL，如果是从其他页面跳转来的，则返回上一页
+                            var currentUrl = window.location.href;
+                            var referrer = document.referrer;
+
+                            // 如果是从登录页面跳转来的，则返回上一页
+                            if (referrer && referrer.includes('/index/user/login')) {
+                                window.location.href = referrer;
+                            } else {
+                                // 否则刷新当前页面
+                                window.location.href = currentUrl + '?t=' + new Date().getTime();
+                            }
                         });
-                    } else {
                         layer.msg(res.msg, {
                             icon: 2,
                             time: 2000