From f7f5221c37a932ed80e84de71551c7f4a9a04dd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=A8=9C?= <lnlnln629@163.com>
Date: Tue, 15 Apr 2025 19:43:54 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=BB=84=E4=BB=B6=E5=B1=9E=E6=80=A7=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CustomLoading/index.vue | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/components/CustomLoading/index.vue b/src/components/CustomLoading/index.vue
index 55aba19..1f50b21 100644
--- a/src/components/CustomLoading/index.vue
+++ b/src/components/CustomLoading/index.vue
@@ -6,7 +6,18 @@
     :element-loading-text="loadingText || `${$t('pageTipText.Loading')}...`"
     element-loading-background="rgba(122, 122, 122, 0.5)"></div>
 </template>
+<script lang="ts" setup>
+import { defineProps } from 'vue';
 
+defineProps({
+  loading: {
+    type: Boolean
+  },
+  loadingText: {
+    type: String
+  }
+});
+</script>
 <style>
 .customLoading {
   position: absolute;
-- 
Gitee


From e5b40f644d0b89027df7d912b607932d7453e91d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=A8=9C?= <lnlnln629@163.com>
Date: Tue, 15 Apr 2025 20:06:00 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E6=9B=B4=E6=94=B9?=
 =?UTF-8?q?=E8=B7=AF=E7=94=B1=E6=97=B6=E4=B8=8D=E8=A2=AB=E7=BC=93=E5=AD=98?=
 =?UTF-8?q?=E8=A6=86=E7=9B=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index d38fc96..830a0fc 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -11,21 +11,36 @@ import '@/styles/app.scss';
 import router from './router';
 
 const locale = computed(() => appStore.locale);
-
+// 新增路由状态标记
+const isManualNavigation = ref(false);
 onMounted(() => {
+  // 监听手动导航
+  router.beforeEach((to, from, next) => {
+    if (from.name === undefined && to.name !== 'root') {
+      isManualNavigation.value = true;
+    }
+    next();
+  });
   window.addEventListener('beforeunload', () => {
-    sessionStorage.setItem('beforeunload', '1');
+    if (!isManualNavigation.value) {
+      sessionStorage.setItem('routerName', router.currentRoute.value.name?.toString() || '');
+    }
+    sessionStorage.setItem('beforeunload', 'true');
   });
   // 监听页面刷新
   const beforeUnload = sessionStorage.getItem('beforeunload');
-  if (beforeUnload === '1') {
+  if (beforeUnload === 'true') {
+    if (!isManualNavigation.value) {
     const name = sessionStorage.getItem('routerName');
     if (name) {
       router.push(name); // 如果sessionStorage存在路由，去缓存的路由
     } else {
       router.push('/'); // 不存在存储，去主页
     }
+  }
     sessionStorage.removeItem('beforeunload'); // 清除标记
+    sessionStorage.removeItem('routerName');
+    isManualNavigation.value = false;
   }
 });
 </script>
-- 
Gitee