From 89e5c5a3fe8166372356eb7d16db7f09448502a5 Mon Sep 17 00:00:00 2001
From: BTMuli <BT-Muli@outlook.com>
Date: Thu, 25 May 2023 16:49:57 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20=E5=B8=83=E5=B1=80=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue          | 34 ++++++++++++++++++----------------
 src/assets/index.css |  7 -------
 2 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 8917f5a6..3528ec4a 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,20 +1,18 @@
 <template>
-  <v-layout>
-    <!-- 侧边栏菜单 -->
+  <v-app>
     <TSidebar v-if="isMain" />
-    <!-- 主体内容 -->
-    <v-main class="app-main">
-      <v-container fluid>
+    <v-main>
+      <v-container fluid class="app-container">
         <router-view />
       </v-container>
     </v-main>
-  </v-layout>
-  <TBackTop />
+    <TBackTop />
+  </v-app>
 </template>
 
 <script lang="ts" setup>
 // vue
-import { onMounted, ref } from "vue";
+import { onBeforeMount, onMounted, ref } from "vue";
 import TSidebar from "./components/main/t-sidebar.vue";
 import TBackTop from "./components/main/t-backTop.vue";
 // tauri
@@ -23,13 +21,10 @@ import { app, event, fs, window } from "@tauri-apps/api";
 import { useAppStore } from "./store/modules/app";
 
 const appStore = useAppStore();
-const isMain = ref(true as boolean);
+const isMain = ref(false as boolean);
 const theme = ref(appStore.theme as string);
 
-onMounted(async () => {
-  // 获取当前主题
-  document.documentElement.className = theme.value;
-  await listenOnTheme();
+onBeforeMount(async () => {
   // 获取当前窗口
   const win = window.getCurrent();
   isMain.value = win.label === "tauri-genshin";
@@ -40,6 +35,12 @@ onMounted(async () => {
   }
 });
 
+onMounted(async () => {
+  // 获取当前主题
+  document.documentElement.className = theme.value;
+  await listenOnTheme();
+});
+
 // 监听主题变化
 async function listenOnTheme () {
   await event.listen("readTheme", (e) => {
@@ -75,9 +76,10 @@ async function createDataDir () {
 }
 </script>
 <style lang="css">
-.app-main {
-    min-height: 100vh;
+.app-container {
+    padding: 0;
+    height: 100%;
+    overflow: auto;
     background: var(--page-bg);
-    backdrop-filter: blur(20px);
 }
 </style>
diff --git a/src/assets/index.css b/src/assets/index.css
index 7294e1db..3602f2a6 100644
--- a/src/assets/index.css
+++ b/src/assets/index.css
@@ -2,13 +2,6 @@
 @import url("themes/default.css");
 @import url("themes/dark.css");
 
-/*
- * @description 让滚动条在内侧显示
- * @since Alpha v0.1.0
- */
-html {
-  overflow: overlay;
-}
 /*
  * @description 侧边滚动条样式
  * @since Alpha v0.1.3