From e85e830689e1cbc90db18b94edd696a4ed67898a Mon Sep 17 00:00:00 2001
From: BTMuli <BT-Muli@outlook.com>
Date: Mon, 13 Mar 2023 16:39:39 +0800
Subject: [PATCH] =?UTF-8?q?fix(font):=20=E5=8E=BB=E6=8E=89=E5=85=A8?=
 =?UTF-8?q?=E5=B1=80=E5=AD=97=E4=BD=93=EF=BC=8C=E5=A7=91=E4=B8=94=E5=86=99?=
 =?UTF-8?q?=E4=BA=86=E4=B8=AA=20global-font?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/fonts/index.css   |  9 +++++++--
 src/components/t-sidebar.vue |  7 ++++++-
 src/pages/Achievements.vue   | 10 ++++++++--
 src/pages/Config.vue         |  8 ++++----
 src/pages/Dev.vue            |  2 +-
 src/pages/Home.vue           |  1 +
 src/pages/News.vue           |  9 +++++----
 src/store/modules/app.ts     |  2 --
 8 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/src/assets/fonts/index.css b/src/assets/fonts/index.css
index 785ff281..117a33b4 100644
--- a/src/assets/fonts/index.css
+++ b/src/assets/fonts/index.css
@@ -3,7 +3,12 @@
 	font-family: "Genshin";
 	src: url("./Genshin.ttf") format("truetype");
 }
-
-* {
+/* 全局字体样式 */
+.global-font {
+	font-family: "Genshin", sans-serif;
+}
+/* 常见卡片样式 */
+.common-card {
+	margin-bottom: 10px;
 	font-family: "Genshin", sans-serif;
 }
diff --git a/src/components/t-sidebar.vue b/src/components/t-sidebar.vue
index 39c70d9b..932017e6 100644
--- a/src/components/t-sidebar.vue
+++ b/src/components/t-sidebar.vue
@@ -2,7 +2,7 @@
 	<!-- todo 侧边栏宽度调整 -->
 	<v-navigation-drawer permanent :rail="rail">
 		<!-- todo 选中没有高亮 -->
-		<v-list>
+		<v-list class="sideList">
 			<!-- 第一个图标，负责返回上一个页面 -->
 			<!-- todo 如果没有上一个页面，则灰色不可点击 -->
 			<v-list-item @click="back">
@@ -83,6 +83,11 @@ function magicClick() {
 </script>
 
 <style lang="css">
+.sideList {
+	font-family: "Genshin", serif;
+	/* 磨砂 */
+	backdrop-filter: blur(10px);
+}
 .sideIcon {
 	width: 24px;
 	height: 24px;
diff --git a/src/pages/Achievements.vue b/src/pages/Achievements.vue
index 463a9949..e87f9fd8 100644
--- a/src/pages/Achievements.vue
+++ b/src/pages/Achievements.vue
@@ -3,11 +3,16 @@
 	<v-app-bar app>
 		<template v-slot:prepend>
 			<!-- 标题 -->
-			<v-card-text class="text-h5">{{ title }}</v-card-text>
+			<v-card-text class="text-h5;global-font">{{ title }}</v-card-text>
 		</template>
 		<template v-slot:append>
 			<!-- 导入按钮 -->
-			<v-btn @click="importJson" prepend-icon="mdi-import" class="bg-green-accent-2"> 导入 </v-btn>
+			<v-btn
+				@click="importJson"
+				prepend-icon="mdi-import"
+				class="bg-green-accent-2;global-font;global-font;"
+				title="导入"
+			/>
 			<!-- 导出按钮 -->
 			<v-btn @click="exportJson" prepend-icon="mdi-export" class="ms-2 bg-green-accent-2">
 				导出
@@ -286,6 +291,7 @@ async function exportJson() {
 	overflow: auto;
 	height: 840px;
 	border-bottom: 2px solid #e6e6e6;
+	font-family: Genshin, "serif";
 }
 /*左侧系列*/
 .left-wrap {
diff --git a/src/pages/Config.vue b/src/pages/Config.vue
index 9a867d9b..65f19972 100644
--- a/src/pages/Config.vue
+++ b/src/pages/Config.vue
@@ -1,8 +1,8 @@
 <template>
-	<v-card style="margin-bottom: 10px">
+	<v-card class="common-card">
 		<v-card-title>配置</v-card-title>
 	</v-card>
-	<v-card style="margin-bottom: 10px">
+	<v-card class="common-card">
 		<v-list>
 			<v-list-item @click="openMergeData" prepend-icon="mdi-folder">
 				<v-list-item-title>打开用户数据目录</v-list-item-title>
@@ -18,7 +18,7 @@
 			</v-list-item>
 		</v-list>
 	</v-card>
-	<v-card style="margin-bottom: 10px">
+	<v-card class="common-card">
 		<v-list>
 			<v-list-item>
 				<v-list-item-title>咨讯页渲染模式</v-list-item-title>
@@ -37,7 +37,7 @@
 			</v-list-item>
 		</v-list>
 	</v-card>
-	<v-card style="margin-bottom: 10px">
+	<v-card class="common-card">
 		<v-list>
 			<v-list-item prepend-icon="mdi-folder">
 				<v-list-item-title>本地应用数据路径</v-list-item-title>
diff --git a/src/pages/Dev.vue b/src/pages/Dev.vue
index 8cc823c0..9bb55de9 100644
--- a/src/pages/Dev.vue
+++ b/src/pages/Dev.vue
@@ -1,6 +1,6 @@
 <template>
 	<h1>开发</h1>
-	<v-card>
+	<v-card class="common-card">
 		<v-list>
 			<v-list-item @click="devInit" prepend-icon="mdi-refresh">
 				<v-list-item-title>初始化开发</v-list-item-title>
diff --git a/src/pages/Home.vue b/src/pages/Home.vue
index 1d58058d..4d53efbd 100644
--- a/src/pages/Home.vue
+++ b/src/pages/Home.vue
@@ -119,6 +119,7 @@ function toOuter(url: string, title: string) {
 
 <style lang="css">
 .pool-cards {
+	font-family: Genshin, serif;
 	display: flex;
 	flex-direction: column;
 	align-items: center;
diff --git a/src/pages/News.vue b/src/pages/News.vue
index 80814e5a..4c0633a2 100644
--- a/src/pages/News.vue
+++ b/src/pages/News.vue
@@ -1,8 +1,8 @@
 <template>
-	<v-tabs v-model="tab" align-tabs="start">
-		<v-tab value="notice">公告</v-tab>
-		<v-tab value="activity">活动</v-tab>
-		<v-tab value="news">咨讯</v-tab>
+	<v-tabs v-model="tab" align-tabs="start" class="global-font">
+		<v-tab value="notice" title="公告" />
+		<v-tab value="activity" title="活动" />
+		<v-tab value="news" title="新闻" />
 	</v-tabs>
 	<v-window v-model="tab">
 		<v-window-item value="notice">
@@ -230,6 +230,7 @@ async function getPost(post_id: string): Promise<ResponsePost> {
 
 <style lang="css">
 .cards-grid {
+	font-family: Genshin, serif;
 	display: grid;
 	grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));
 	grid-gap: 20px;
diff --git a/src/store/modules/app.ts b/src/store/modules/app.ts
index 647b395a..e4dd54a1 100644
--- a/src/store/modules/app.ts
+++ b/src/store/modules/app.ts
@@ -64,8 +64,6 @@ const useAppStore = defineStore({
 		async init() {
 			// 初始化加载状态
 			this.loading = false;
-			// 初始化侧边栏设置
-			this.sidebar = true;
 			// 初始化咨讯页渲染模式
 			this.structureRender = true;
 			// 初始化用户数据路径