Merge pull request #40 from cikezhu/main

去除多余的代码/修改记录位置的方式/修复IOS14登录页显示bug

src/App.vue

@@ -7,9 +7,6 @@ import store from './store'
 const { global: globalTheme } = useTheme()
 globalTheme.name.value = localStorage.getItem('theme') || 'light'
 
-// 路由
-const route = useRoute()
-
 // 提示框
 const $toast = useToast()
 

src/main.ts

@@ -30,9 +30,6 @@ app.use(vuetify)
   })
   .use(VuetifyUseDialog).mount('#app')
 
-// 记录和恢复滚动位置
-const scrollPositions: { [key: string]: number } = {} // 用于存储每个路由的滚动位置
-
 // 路由导航守卫
 router.beforeEach((to, from, next) => {
   const isAuthenticated = store.state.auth.token !== null
@@ -41,24 +38,11 @@ router.beforeEach((to, from, next) => {
     next('/login')
   }
   else {
-    // 只有 meta 中 keepAlive 为 true 的情况下才记录滚动位置
-    if (from.meta.keepAlive)
-      scrollPositions[from.fullPath] = window.scrollY
-
     startNProgress()
     next()
   }
 })
 
 router.afterEach((to) => {
-  // 只有 meta 中 keepAlive 为 true 的情况下才恢复滚动位置
-  if (to.meta.keepAlive) {
-    const savedPosition = scrollPositions[to.fullPath]
-    if (savedPosition !== undefined) {
-      setTimeout(() => {
-        window.scrollTo(0, savedPosition)
-      }, 0)
-    }
-  }
   doneNProgress()
 })

src/pages/login.vue

@@ -130,7 +130,7 @@ onMounted(() => {
         <VCardItem class="justify-center mb-7">
           <template #prepend>
             <div class="d-flex pe-0">
-              <VImg :src="logo" width="64" />
+              <VImg :src="logo" width="64" height="64" />
             </div>
           </template>
 

src/router/index.ts

@@ -2,8 +2,11 @@ import { createRouter, createWebHistory } from 'vue-router'
 
 const router = createRouter({
   history: createWebHistory(import.meta.env.BASE_URL),
-  scrollBehavior() {
-    // 始终滚动到顶部
+  scrollBehavior(to, from, savedPosition) {
+    // 如果页面有缓存那么恢复其位置, 否则始终滚动到顶部
+    if (to.meta.keepAlive && savedPosition)
+      return savedPosition
+    // console.log('top: 0')
     return { top: 0 }
   },
   routes: [