From 2dcf1c8d1630c5c37566bd46bfe84ec250b2a346 Mon Sep 17 00:00:00 2001
From: BTMuli <BT-Muli@outlook.com>
Date: Thu, 28 Dec 2023 16:03:01 +0800
Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20=E4=B8=BB=E9=A2=98?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E4=B8=8A=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                            |  7 +++++--
 src/components/overlay/to-namecard.vue |  2 +-
 src/pages/User/Gacha.vue               | 11 +----------
 src/pages/common/Achievements.vue      |  1 +
 src/pages/common/Config.vue            |  4 ----
 src/pages/common/Posts.vue             |  8 --------
 src/views/tw-character.vue             |  9 +--------
 src/views/tw-weapon.vue                | 11 ++---------
 8 files changed, 11 insertions(+), 42 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 2ad4d9b3..fe9c9fcc 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-app>
+  <v-app :theme="vuetifyTheme">
     <TSidebar v-if="isMain" />
     <v-main>
       <v-container :fluid="true" class="app-container">
@@ -13,7 +13,7 @@
 <script lang="ts" setup>
 import { app, event, fs, tauri, window as TauriWindow } from "@tauri-apps/api";
 import { storeToRefs } from "pinia";
-import { onBeforeMount, onMounted, ref } from "vue";
+import { computed, onBeforeMount, onMounted, ref } from "vue";
 import { useRouter } from "vue-router";
 
 import TBackTop from "./components/app/t-backTop.vue";
@@ -31,6 +31,9 @@ const userStore = storeToRefs(useUserStore());
 const isMain = ref<boolean>(false);
 const theme = ref<string>(appStore.theme);
 const router = useRouter();
+const vuetifyTheme = computed(() => {
+  return appStore.theme === "dark" ? "dark" : "light";
+});
 
 onBeforeMount(async () => {
   // 获取当前窗口
diff --git a/src/components/overlay/to-namecard.vue b/src/components/overlay/to-namecard.vue
index de80168b..4c09e6ee 100644
--- a/src/components/overlay/to-namecard.vue
+++ b/src/components/overlay/to-namecard.vue
@@ -88,7 +88,7 @@ watch(
   () => props.data,
   () => {
     if (props.data) {
-      console.log(JSON.stringify(props.data.desc));
+      console.log(JSON.stringify(props.data));
     }
   },
 );
diff --git a/src/pages/User/Gacha.vue b/src/pages/User/Gacha.vue
index 1ef34017..e05810db 100644
--- a/src/pages/User/Gacha.vue
+++ b/src/pages/User/Gacha.vue
@@ -2,13 +2,7 @@
   <ToLoading v-model="loading" :title="loadingTitle" :subtitle="loadingSub" />
   <div class="gacha-top-bar">
     <div class="gacha-top-title">祈愿记录</div>
-    <v-select
-      v-model="uidCur"
-      class="gacha-top-select"
-      :items="selectItem"
-      variant="outlined"
-      :theme="vuetifyTheme"
-    />
+    <v-select v-model="uidCur" class="gacha-top-select" :items="selectItem" variant="outlined" />
     <div class="gacha-top-btns">
       <v-btn prepend-icon="mdi-refresh" class="gacha-top-btn" @click="confirmRefresh">刷新</v-btn>
       <v-btn prepend-icon="mdi-import" class="gacha-top-btn" @click="handleImportBtn()">
@@ -79,9 +73,6 @@ const selectItem = ref<string[]>([]);
 const uidCur = ref<string>("");
 const gachaListCur = ref<TGApp.Sqlite.GachaRecords.SingleTable[]>([]);
 const tab = ref<string>("");
-const vuetifyTheme = computed(() => {
-  return appStore.theme === "dark" ? "dark" : "light";
-});
 
 onMounted(async () => {
   loadingTitle.value = "正在获取祈愿 UID 列表";
diff --git a/src/pages/common/Achievements.vue b/src/pages/common/Achievements.vue
index 47dcdff2..ab3bebb5 100644
--- a/src/pages/common/Achievements.vue
+++ b/src/pages/common/Achievements.vue
@@ -631,6 +631,7 @@ async function setAchiDB(achievement: TGApp.Sqlite.Achievement.SingleTable): Pro
   height: 80px;
   border: 1px solid var(--common-shadow-2);
   border-radius: 10px 50px 50px 10px;
+  background-color: var(--box-bg-1);
   background-position: right;
   background-repeat: no-repeat;
   cursor: pointer;
diff --git a/src/pages/common/Config.vue b/src/pages/common/Config.vue
index f03013cf..1734e42e 100644
--- a/src/pages/common/Config.vue
+++ b/src/pages/common/Config.vue
@@ -79,7 +79,6 @@
           label="首页显示组件"
           :multiple="true"
           :chips="true"
-          :theme="vuetifyTheme"
         />
         <template #append>
           <v-btn class="config-btn" @click="submitHome"> 确定</v-btn>
@@ -210,9 +209,6 @@ const userInfo = computed(() => {
     avatar: "/source/UI/lumine.webp",
   };
 });
-const vuetifyTheme = computed(() => {
-  return appStore.theme === "dark" ? "dark" : "light";
-});
 
 // load version
 onMounted(async () => {
diff --git a/src/pages/common/Posts.vue b/src/pages/common/Posts.vue
index 70ad0b17..5e81912e 100644
--- a/src/pages/common/Posts.vue
+++ b/src/pages/common/Posts.vue
@@ -6,7 +6,6 @@
         v-model="curGameLabel"
         class="post-switch-item"
         :items="gameItem"
-        :theme="vuetifyTheme"
         variant="outlined"
         label="游戏"
       />
@@ -14,7 +13,6 @@
         v-model="curForumLabel"
         class="post-switch-item"
         :items="forumItem"
-        :theme="vuetifyTheme"
         variant="outlined"
         label="频道"
       />
@@ -22,7 +20,6 @@
         v-model="curSortLabel"
         class="post-switch-item"
         :items="sortItem"
-        :theme="vuetifyTheme"
         variant="outlined"
         label="排序"
       />
@@ -196,11 +193,6 @@ const gameList = {
   大别野: 5,
 };
 
-// 主题
-const vuetifyTheme = computed(() => {
-  return appStore.theme === "dark" ? "dark" : "light";
-});
-
 // 渲染参数
 const curForumLabel = ref<string>("酒馆");
 const forumItem = ref<string[]>(["酒馆", "攻略", "同人图", "COS", "硬核"]);
diff --git a/src/views/tw-character.vue b/src/views/tw-character.vue
index 7f66c293..3661f68f 100644
--- a/src/views/tw-character.vue
+++ b/src/views/tw-character.vue
@@ -46,7 +46,7 @@
     <TwcMaterials :data="data.materials" />
     <TwcSkills :data="data.skills" />
     <TwcConstellations :data="data.constellation" />
-    <v-expansion-panels :theme="vuetifyTheme" class="twc-text-item">
+    <v-expansion-panels class="twc-text-item">
       <v-expansion-panel>
         <template #title><span class="twc-text-title">资料</span></template>
         <template #text>
@@ -101,7 +101,6 @@ import TwcConstellations from "../components/wiki/twc-constellations.vue";
 import TwcMaterials from "../components/wiki/twc-materials.vue";
 import TwcSkills from "../components/wiki/twc-skills.vue";
 import { getWikiData } from "../data";
-import { useAppStore } from "../store/modules/app";
 
 // 路由数据
 const id = <string>useRoute().params.id;
@@ -111,12 +110,6 @@ const loadingEmpty = ref<boolean>(false);
 const loadingTitle = ref<string>("正在加载");
 const loadingSub = ref<string>();
 
-// 主题
-const appStore = useAppStore();
-const vuetifyTheme = computed(() => {
-  return appStore.theme === "dark" ? "dark" : "light";
-});
-
 // 数据
 const data = ref<TGApp.App.Character.WikiItem>();
 const box = computed(() => {
diff --git a/src/views/tw-weapon.vue b/src/views/tw-weapon.vue
index 78b97d16..69318e38 100644
--- a/src/views/tw-weapon.vue
+++ b/src/views/tw-weapon.vue
@@ -17,7 +17,7 @@
       </div>
     </div>
     <TwcMaterials :data="data.materials" />
-    <v-expansion-panels :theme="vuetifyTheme" class="tww-affix">
+    <v-expansion-panels class="tww-affix">
       <v-expansion-panel expand-icon="mdi-menu-down">
         <template #title>
           <span class="tww-text-title">{{ data.affix.Name }}-精炼 {{ select }}</span>
@@ -30,7 +30,7 @@
         </template>
       </v-expansion-panel>
     </v-expansion-panels>
-    <v-expansion-panels :theme="vuetifyTheme" class="tww-story">
+    <v-expansion-panels class="tww-story">
       <v-expansion-panel
         expand-icon="mdi-menu-down"
         v-for="(story, index) in data.story"
@@ -59,7 +59,6 @@ import TItembox, { TItemBoxData } from "../components/main/t-itembox.vue";
 import ToLoading from "../components/overlay/to-loading.vue";
 import TwcMaterials from "../components/wiki/twc-materials.vue";
 import { getWikiData } from "../data";
-import { useAppStore } from "../store/modules/app";
 import { parseHtmlText } from "../utils/toolFunc";
 
 // 路由数据
@@ -70,12 +69,6 @@ const loadingEmpty = ref<boolean>(false);
 const loadingTitle = ref<string>("正在加载");
 const loadingSub = ref<string>();
 
-// 主题
-const appStore = useAppStore();
-const vuetifyTheme = computed(() => {
-  return appStore.theme === "dark" ? "dark" : "light";
-});
-
 // 数据
 const data = ref<TGApp.App.Weapon.WikiItem>();
 const box = computed(() => {