From 36e133f74251fb8f6ff53180bda5750304e2a1bc Mon Sep 17 00:00:00 2001
From: Tianyi Pu <912396513@qq.com>
Date: Mon, 17 Jun 2024 12:00:54 +0100
Subject: [PATCH 01/13] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B5=EF=BC=8C=E4=BC=98=E5=8C=96=E8=8F=9C=E5=8D=95=E6=A0=8F?=
 =?UTF-8?q?=E5=A4=96=E8=A7=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front_end/package.json                      |  5 +-
 front_end/src/App.vue                       | 75 ++++++++++++++-------
 front_end/src/assets/language.svg           |  3 +
 front_end/src/components/LanguagePicker.vue | 26 ++++++-
 front_end/src/components/Login.vue          | 30 +++------
 front_end/src/i18n/index.ts                 | 14 +---
 front_end/src/i18n/locales/zh-cn.ts         | 33 +++++----
 front_end/src/main.ts                       |  2 +
 front_end/src/router/index.ts               |  5 ++
 front_end/src/store/index.ts                | 56 ++++++++-------
 front_end/src/views/SettingView.vue         | 39 +++++++++++
 11 files changed, 189 insertions(+), 99 deletions(-)
 create mode 100644 front_end/src/assets/language.svg
 create mode 100644 front_end/src/views/SettingView.vue

diff --git a/front_end/package.json b/front_end/package.json
index 4cdd7b2..ac89545 100644
--- a/front_end/package.json
+++ b/front_end/package.json
@@ -17,7 +17,7 @@
     "@types/js-cookie": "^3.0.3",
     "@types/lowdb": "^1.0.11",
     "@types/node": "^20.5.1",
-    "axios": "^0.21.1",
+    "axios": "^1.7.2",
     "echarts": "^5.5.0",
     "element-plus": "^2.2.32",
     "flag-icon-css": "^4.1.7",
@@ -29,6 +29,7 @@
     "markdown-it-mathjax3": "^4.3.2",
     "ms-toollib": "1.4.6-alpha",
     "pinia": "^2.1.7",
+    "pinia-plugin-persistedstate": "^3.2.1",
     "uuid": "^9.0.0",
     "vue": "^3.4.0",
     "vue-echarts": "^6.7.1",
@@ -46,4 +47,4 @@
     "vite-plugin-top-level-await": "^1.4.1",
     "vite-plugin-wasm": "^3.3.0"
   }
-}
\ No newline at end of file
+}
diff --git a/front_end/src/App.vue b/front_end/src/App.vue
index 5353267..85d383a 100644
--- a/front_end/src/App.vue
+++ b/front_end/src/App.vue
@@ -1,35 +1,52 @@
 <template>
     <!-- message的z索引为2015 -->
-    <el-menu style="position: fixed; width: 100%; height: 60px; top: 0; z-index: 2010;user-select: none;"
-        mode="horizontal" :router="true" :default-active="menu_index">
+    <el-menu style="position: fixed; width: 100%; z-index: 2010; user-select: none" mode="horizontal" :router="true"
+        :default-active="menu_index" :ellipsis="true" menu-trigger="click">
         <el-menu-item index="/">
-            <div class="logo" style="display: inline-flex;justify-content: center;align-items: center;">
-                <el-image style="width: 52px; height: 52px;display: inline-flex;" :src="logo_1" :fit="'cover'" />
-                <el-image style="width: 131px; height: 60px;display: inline-flex;" :src="logo_2" :fit="'cover'" />
+            <div class="logo" style=" display: inline-flex; justify-content: center; align-items: center">
+                <el-image style="width: 52px; height: 52px; padding-top: 4px; padding-bottom: 4px; display: inline-flex" :src="logo_1" :fit="'cover'" />
+                <el-image v-if="!local.menu_icon" style="width: 131px; height: 60px; display: inline-flex" :src="logo_2" :fit="'cover'" />
             </div>
         </el-menu-item>
-        <el-menu-item index="/ranking">
-            <div class="header">{{ $t('menu.ranking') }}</div>
-        </el-menu-item>
-        <el-menu-item index="/video">
-            <div class="header">{{ $t('menu.video') }}</div>
-        </el-menu-item>
-        <el-menu-item index="/world">
-            <div class="header">{{ $t('menu.world') }}</div>
-        </el-menu-item>
-        <el-menu-item index="/guide">
-            <div class="header">{{ $t('menu.guide') }}</div>
+        <el-menu-item v-for="item in menu_items" :index="'/' + item.index"
+            style="font-size: 18px; padding-left: 8px; padding-right: 8px">
+            <el-tooltip v-if="local.menu_icon" :content="$t(item.content)">
+                <el-icon style="margin-top: 21px; margin-bottom: 21px">
+                    <component :is="item.icon" style="width: 60px; height: 60px" />
+                </el-icon>
+            </el-tooltip>
+            <span v-else>
+                <el-icon>
+                    <component :is="item.icon" style="width: 60px; height: 60px" />
+                </el-icon>{{ $t(item.content) }}
+            </span>
         </el-menu-item>
-        <el-menu-item index="/score">
-            <div class="header">{{ $t('menu.score') }}</div>
+        <div style="flex-grow: 1" />
+        <el-menu-item :index="player_url" v-if="store.user.id != 0" @click="store.player = store.user"
+            style="font-size: 18px; padding-left: 8px; padding-right: 8px">
+            <el-tooltip v-if="local.menu_icon" :content="store.user.username">
+                <el-icon>
+                    <User style="width: 60px; height: 60px" />
+                </el-icon>
+            </el-tooltip>
+            <span v-else="local.menu_icon">
+                <el-icon>
+                    <User style="width: 60px; height: 60px" />
+                </el-icon>{{ store.user.username }}
+            </span>
         </el-menu-item>
-        <el-menu-item :index="player_url" :disabled="store.user.id == 0" @click="store.player = store.user;">
-            <div class="header">{{ $t('menu.profile') }}</div>
+        <el-menu-item index="/settings" style="font-size: 18px; padding-left: 8px; padding-right: 8px">
+            <el-tooltip :content="$t('menu.setting')">
+                <el-icon style="margin-top: 20px; margin-bottom: 20px">
+                    <Setting style="width: 60px; height: 60px" />
+                </el-icon>
+            </el-tooltip>
         </el-menu-item>
-        <LanguagePicker/>
-        <div
-            style="margin-left: auto;margin-right: 16px;display: inline-flex;justify-content: center;align-items: center;">
-            <Menu @login="user_login" @logout="user_logout"></Menu>
+        <div style="font-size: 18px; padding-left: 8px; padding-right: 8px; padding-top: 14px; margin-bottom: 14px">
+            <LanguagePicker v-show="local.language_show" />
+        </div>
+        <div class="header">
+            <Login @login="user_login" @logout="user_logout"></Login>
         </div>
     </el-menu>
 
@@ -93,6 +110,14 @@ const never_show_notice = ref(false)
 // 主要是切换后的高亮
 const menu_index = ref()
 
+const menu_items = [
+    { index: "ranking", icon: "Trophy", content: "menu.ranking" },
+    { index: "video", icon: "VideoCameraFilled", content: "menu.video" },
+    { index: "world", icon: "Odometer", content: "menu.world" },
+    { index: "guide", icon: "Document", content: "menu.guide" },
+    { index: "score", icon: "Histogram", content: "menu.score" },
+];
+
 const notice = ref(`
 1、即日起开始删档公测，公测与开发同步进行。公测结束后，在正式上线之前会删除所有数据。
 2、相关意见、问题和建议请移步至此处[https://gitee.com/ee55/saolei_website/issues]发表。
@@ -174,6 +199,8 @@ body {
 
 .header {
     font-size: 18px;
+    margin: 0px;
+    padding-top: 21px;
 }
 
 
diff --git a/front_end/src/assets/language.svg b/front_end/src/assets/language.svg
new file mode 100644
index 0000000..296a92f
--- /dev/null
+++ b/front_end/src/assets/language.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg fill="#000000" width="800px" height="800px" viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg"><title>ionicons-v5-l</title><path d="M478.33,433.6l-90-218a22,22,0,0,0-40.67,0l-90,218a22,22,0,1,0,40.67,16.79L316.66,406H419.33l18.33,44.39A22,22,0,0,0,458,464a22,22,0,0,0,20.32-30.4ZM334.83,362,368,281.65,401.17,362Z"/><path d="M267.84,342.92a22,22,0,0,0-4.89-30.7c-.2-.15-15-11.13-36.49-34.73,39.65-53.68,62.11-114.75,71.27-143.49H330a22,22,0,0,0,0-44H214V70a22,22,0,0,0-44,0V90H54a22,22,0,0,0,0,44H251.25c-9.52,26.95-27.05,69.5-53.79,108.36-31.41-41.68-43.08-68.65-43.17-68.87a22,22,0,0,0-40.58,17c.58,1.38,14.55,34.23,52.86,83.93.92,1.19,1.83,2.35,2.74,3.51-39.24,44.35-77.74,71.86-93.85,80.74a22,22,0,1,0,21.07,38.63c2.16-1.18,48.6-26.89,101.63-85.59,22.52,24.08,38,35.44,38.93,36.1a22,22,0,0,0,30.75-4.9Z"/></svg>
+<!-- Source: https://www.svgrepo.com/svg/326688/language-outline -->
\ No newline at end of file
diff --git a/front_end/src/components/LanguagePicker.vue b/front_end/src/components/LanguagePicker.vue
index 90e95ef..a11d399 100644
--- a/front_end/src/components/LanguagePicker.vue
+++ b/front_end/src/components/LanguagePicker.vue
@@ -1,15 +1,26 @@
 <template>
-    <el-select v-model="i18n.global.locale.value" style="width: 100px">
-        <el-option v-for="item in options" :key="item.lang" :label="item.text" :value="item.lang" />
-    </el-select>
+    <el-dropdown @command="changeLanguage" trigger="click">
+        <el-image :src="logo_lang" style="width: 24px; height: 24px; margin-top: 18px"></el-image>
+        <template #dropdown>
+            <el-dropdown-item v-for="item in options" :command="item.lang">
+            {{ item.text }}
+        </el-dropdown-item>
+        </template>
+    </el-dropdown>
 </template>
 
 <script lang="ts" setup name="LanguagePicker">
 
+import { onBeforeMount } from 'vue';
 import i18n from '@/i18n';
 import { useI18n } from 'vue-i18n';
 const t = useI18n();
 
+import { useLocalStore } from '@/store';
+const local = useLocalStore();
+
+import logo_lang from "@/assets/language.svg";
+
 const options = [
     { lang: 'dev', text: 'dev' },
     { lang: 'zh-cn', text: '简体中文' },
@@ -17,4 +28,13 @@ const options = [
     { lang: 'en', text: 'English'}
 ]
 
+onBeforeMount(() => {
+    i18n.global.locale.value=local.language
+})
+
+const changeLanguage = (value: any) => {
+    i18n.global.locale.value = value
+    local.language = value
+}
+
 </script>
\ No newline at end of file
diff --git a/front_end/src/components/Login.vue b/front_end/src/components/Login.vue
index 5a13264..5402a01 100644
--- a/front_end/src/components/Login.vue
+++ b/front_end/src/components/Login.vue
@@ -1,24 +1,16 @@
 <template>
-    <div>
-        <span class="text-button" v-show="store.login_status != LoginStatus.IsLogin"
-            @click="init_refvalues(); store.login_status = LoginStatus.Login; login_visible = true; register_visible = false">
-            {{ $t('menu.login') }}
-        </span>
-        <div style="display:inline-block" v-show="store.login_status == LoginStatus.IsLogin">
-            {{ $t('menu.welcome', [user_name_show]) }}
-        </div>
-        <span style="width:12px; display:inline-block">
-        </span>|<span style="width:12px; display:inline-block">
-        </span>
-        <span class="text-button" v-show="store.login_status != LoginStatus.IsLogin"
-            @click="init_refvalues(); store.login_status = LoginStatus.Register; register_visible = true; login_visible = false">
-            {{ $t('menu.register') }}
-        </span>
-        <span class="text-button" v-show="store.login_status == LoginStatus.IsLogin" @click="logout();">
-            {{ $t('menu.logout') }}
-        </span>
-    </div>
     <el-dialog v-model="login_visible" :title="$t('login.title')" width="30%" align-center draggable :lock-scroll="false"
+    <el-button v-if="store.login_status != LoginStatus.IsLogin"
+        @click.stop="init_refvalues(); store.login_status = LoginStatus.Login; login_visible = true; register_visible = false">
+        {{ $t('menu.login') }}
+    </el-button>
+    <el-button v-if="store.login_status != LoginStatus.IsLogin"
+        @click.stop="init_refvalues(); store.login_status = LoginStatus.Register; register_visible = true; login_visible = false">
+        {{ $t('menu.register') }}
+    </el-button>
+    <el-button v-if="store.login_status == LoginStatus.IsLogin" @click.stop="logout();">
+        {{ $t('menu.logout') }}
+    </el-button>
         @close='() => { if (store.login_status !== LoginStatus.IsLogin) { store.login_status = LoginStatus.NotLogin; } }'>
         <el-form size="default">
             <el-form-item>
diff --git a/front_end/src/i18n/index.ts b/front_end/src/i18n/index.ts
index e7aff7f..842b10b 100644
--- a/front_end/src/i18n/index.ts
+++ b/front_end/src/i18n/index.ts
@@ -21,19 +21,7 @@ function getMessages (): Record<string, any> {
  * 获取默认语言
  */
 function getDefaultLocale () {
-    const languages = navigator.languages || [navigator.language]
-    for (const language of languages) {
-        if (/^zh(.?CN)?$/i.test(language)) {
-            // 简体中文，包括 zh 和 zh-CN
-            return zhCn.local
-        } else if (language == de.local) {
-            return de.local
-        } else if (language == en.local) {
-            return en.local
-        }
-    }
-    // 默认使用简体中文
-    return dev.local
+    return "dev"
 }
 
 /**
diff --git a/front_end/src/i18n/locales/zh-cn.ts b/front_end/src/i18n/locales/zh-cn.ts
index d0409f8..8c2f586 100644
--- a/front_end/src/i18n/locales/zh-cn.ts
+++ b/front_end/src/i18n/locales/zh-cn.ts
@@ -4,6 +4,7 @@ export const zhCn = {
     local: 'zh-cn',
     name: '简体中文',
     common: {
+        hide: '隐藏',
         level: {
             b: '初级',
             i: '中级',
@@ -15,19 +16,6 @@ export const zhCn = {
             ng: '无猜',
             dg: '递归'
         },
-        prop: {
-            action: '操作',
-            designator: '标识',
-            fileName: '文件名',
-            is: '岛',
-            level: '级别',
-            op: '空',
-            realName: '姓名',
-            status: '状态',
-            time: '用时',
-            timems: '用时',
-            upload_time: '上传时间',
-        },
         msg: {
             agreeTAC: '请同意用户协议！',
             confirmPasswordFail: '两次输入的密码不一致！',
@@ -43,7 +31,23 @@ export const zhCn = {
             invalidUsername: '用户名格式不正确！长度不超过20位。',
             logoutFail: '退出失败！',
             logoutSuccess: '退出成功！',
-        }
+        },
+        prop: {
+            action: '操作',
+            designator: '标识',
+            fileName: '文件名',
+            is: '岛',
+            level: '级别',
+            op: '空',
+            realName: '姓名',
+            sex: '性别',
+            status: '状态',
+            time: '用时',
+            timems: '用时',
+            upload_time: '上传时间',
+        },
+        show: '显示',
+        toDo: '敬请期待',
     },
     forgetPassword: {
         title: '找回密码',
@@ -76,6 +80,7 @@ export const zhCn = {
         login: '登录',
         logout: '退出',
         register: '注册',
+        setting: '设置',
         downloads: '软件下载',
         links: '友链',
         team: '团队'
diff --git a/front_end/src/main.ts b/front_end/src/main.ts
index e75ba43..3ae21db 100644
--- a/front_end/src/main.ts
+++ b/front_end/src/main.ts
@@ -5,6 +5,7 @@ import App from './App.vue'
 import router from './router'
 // import store from './store'
 import { createPinia } from 'pinia'
+import piniaPluginPersistedstate from 'pinia-plugin-persistedstate'
 import i18n from '@/i18n'
 import ElementPlus from 'element-plus'
 import 'element-plus/dist/index.css'
@@ -17,6 +18,7 @@ import 'highlight.js/styles/stackoverflow-light.css'
 
 const app = createApp(App)
 const pinia = createPinia()
+pinia.use(piniaPluginPersistedstate)
 
 app.config.globalProperties.$axios = $axios;
 
diff --git a/front_end/src/router/index.ts b/front_end/src/router/index.ts
index 34c2211..42a043a 100644
--- a/front_end/src/router/index.ts
+++ b/front_end/src/router/index.ts
@@ -32,6 +32,11 @@ const routes: Array<RouteRecordRaw> = [
     name: 'score',
     component: () => import('../views/ScoreRankView.vue')
   },
+  {
+    path: '/settings',
+    name: 'settings',
+    component: () => import('../views/SettingView.vue')
+  },
   {
     path: '/player/:id',
     name: 'player_id',
diff --git a/front_end/src/store/index.ts b/front_end/src/store/index.ts
index fa2d49b..9cc5452 100644
--- a/front_end/src/store/index.ts
+++ b/front_end/src/store/index.ts
@@ -2,30 +2,38 @@ import { LoginStatus } from "@/utils/common/structInterface"
 import { defineStore } from 'pinia'
 
 export const useUserStore = defineStore('user', {
-  state: () => ({
-      user: {
-        // 此id为用户的id从1开始，而不是数据库的自增id
-        id: 0,
-        username: "",
-        realname: "",
-        is_banned: false,
-        is_staff: false,
-        country: ""
-      },   // 真正的用户
-      // 访问谁的地盘不再具有记忆性。即点“我的地盘”，将永远是“我”的地盘
-      // 想要访问特定用户，可以用url
-      // 访问谁的地盘
-      player: {
-        // 此id为用户的id从1开始，而不是数据库的自增id
-        id: 0,
-        username: "",
-        realname: "",
-        is_banned: false,
-        country: ""
-      },
-      // 登录状态，全局维护
-      login_status: LoginStatus.Undefined,
+    state: () => ({
+        user: {
+            // 此id为用户的id从1开始，而不是数据库的自增id
+            id: 0,
+            username: "",
+            realname: "",
+            is_banned: false,
+            is_staff: false,
+            country: ""
+        },   // 真正的用户
+        // 访问谁的地盘不再具有记忆性。即点“我的地盘”，将永远是“我”的地盘
+        // 想要访问特定用户，可以用url
+        // 访问谁的地盘
+        player: {
+            // 此id为用户的id从1开始，而不是数据库的自增id
+            id: 0,
+            username: "",
+            realname: "",
+            is_banned: false,
+            country: ""
+        },
+        // 登录状态，全局维护
+        login_status: LoginStatus.Undefined,
     }
-  ),
+    ),
 })
 
+export const useLocalStore = defineStore('local', {
+    state: () => ({
+        language: "zh-cn",
+        language_show: true,
+        menu_icon: false,
+    }),
+    persist: true,
+})
\ No newline at end of file
diff --git a/front_end/src/views/SettingView.vue b/front_end/src/views/SettingView.vue
new file mode 100644
index 0000000..e41fdad
--- /dev/null
+++ b/front_end/src/views/SettingView.vue
@@ -0,0 +1,39 @@
+<template>
+    <el-descriptions title="通用设置">
+        <el-descriptions-item label="语言切换"><el-switch v-model="local.language_show" :active-text="$t('common.show')"
+                :inactive-text="$t('common.hide')"></el-switch></el-descriptions-item>
+        <el-descriptions-item label="菜单排版"><el-switch v-model="local.menu_icon" active-text="抽象"
+                inactive-text="默认"></el-switch></el-descriptions-item>
+    </el-descriptions>
+    <el-descriptions v-if="store.login_status == LoginStatus.IsLogin" title="个人信息">
+        <el-descriptions-item label="用户id">{{ store.user.id }}</el-descriptions-item>
+        <el-descriptions-item label="用户名">{{ store.user.username }}</el-descriptions-item>
+        <el-descriptions-item :label="$t('common.prop.realName')">{{ store.user.realname }}</el-descriptions-item>
+        <el-descriptions-item label="英文姓">{{ $t('common.toDo') }}</el-descriptions-item>
+        <el-descriptions-item label="英文名">{{ $t('common.toDo') }}</el-descriptions-item>
+        <el-descriptions-item :label="$t('common.prop.sex')">{{ $t('common.toDo') }}</el-descriptions-item>
+        <el-descriptions-item label="属地">{{ $t('common.toDo') }}</el-descriptions-item>
+        <el-descriptions-item label="出生年份">{{ $t('common.toDo') }}</el-descriptions-item>
+    </el-descriptions>
+    <el-descriptions v-if="store.login_status == LoginStatus.IsLogin" title="账号关联">
+        <el-table>
+
+        </el-table>
+    </el-descriptions>
+</template>
+
+<script lang="ts" setup name="UserSettings">
+
+import { useLocalStore, useUserStore } from '@/store';
+import { LoginStatus } from '@/utils/common/structInterface';
+import { useI18n } from 'vue-i18n';
+const store = useUserStore()
+const local = useLocalStore()
+const t = useI18n()
+</script>
+
+<style>
+.title {
+    font-size: var(--el-font-size-extra-large)
+}
+</style>
\ No newline at end of file

From 68a2624babf594fb0af517cb53a9d7042d78c481 Mon Sep 17 00:00:00 2001
From: Tianyi Pu <912396513@qq.com>
Date: Mon, 17 Jun 2024 12:07:21 +0100
Subject: [PATCH 02/13] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96LanguagePicker?=
 =?UTF-8?q?.vue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front_end/src/components/LanguagePicker.vue | 36 ++++++++++-----------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/front_end/src/components/LanguagePicker.vue b/front_end/src/components/LanguagePicker.vue
index a11d399..27d31d2 100644
--- a/front_end/src/components/LanguagePicker.vue
+++ b/front_end/src/components/LanguagePicker.vue
@@ -3,38 +3,36 @@
         <el-image :src="logo_lang" style="width: 24px; height: 24px; margin-top: 18px"></el-image>
         <template #dropdown>
             <el-dropdown-item v-for="item in options" :command="item.lang">
-            {{ item.text }}
-        </el-dropdown-item>
+                {{ item.text }}
+            </el-dropdown-item>
         </template>
     </el-dropdown>
 </template>
 
 <script lang="ts" setup name="LanguagePicker">
-
-import { onBeforeMount } from 'vue';
-import i18n from '@/i18n';
-import { useI18n } from 'vue-i18n';
+import { onBeforeMount } from "vue";
+import i18n from "@/i18n";
+import { useI18n } from "vue-i18n";
 const t = useI18n();
 
-import { useLocalStore } from '@/store';
+import { useLocalStore } from "@/store";
 const local = useLocalStore();
 
 import logo_lang from "@/assets/language.svg";
 
 const options = [
-    { lang: 'dev', text: 'dev' },
-    { lang: 'zh-cn', text: '简体中文' },
-    { lang: 'de', text: 'name'},
-    { lang: 'en', text: 'English'}
-]
+    { lang: "dev", text: "dev" },
+    { lang: "zh-cn", text: "简体中文" },
+    { lang: "de", text: "name" },
+    { lang: "en", text: "English" },
+];
 
 onBeforeMount(() => {
-    i18n.global.locale.value=local.language
-})
+    i18n.global.locale.value = local.language;
+});
 
 const changeLanguage = (value: any) => {
-    i18n.global.locale.value = value
-    local.language = value
-}
-
-</script>
\ No newline at end of file
+    i18n.global.locale.value = value;
+    local.language = value;
+};
+</script>

From a3cf684009c06251e4440c2ad297af5ed8051933 Mon Sep 17 00:00:00 2001
From: Tianyi Pu <912396513@qq.com>
Date: Tue, 18 Jun 2024 08:39:27 +0100
Subject: [PATCH 03/13] =?UTF-8?q?=E7=A6=81=E7=94=A8=E5=8F=B3=E4=B8=8A?=
 =?UTF-8?q?=E8=A7=92=E6=94=B6=E8=B5=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front_end/src/App.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/front_end/src/App.vue b/front_end/src/App.vue
index 85d383a..769985c 100644
--- a/front_end/src/App.vue
+++ b/front_end/src/App.vue
@@ -1,7 +1,7 @@
 <template>
     <!-- message的z索引为2015 -->
     <el-menu style="position: fixed; width: 100%; z-index: 2010; user-select: none" mode="horizontal" :router="true"
-        :default-active="menu_index" :ellipsis="true" menu-trigger="click">
+        :default-active="menu_index" :ellipsis="false" menu-trigger="click">
         <el-menu-item index="/">
             <div class="logo" style=" display: inline-flex; justify-content: center; align-items: center">
                 <el-image style="width: 52px; height: 52px; padding-top: 4px; padding-bottom: 4px; display: inline-flex" :src="logo_1" :fit="'cover'" />

From be6466c9f17a4140bb2e8e103ff5a5f155b5f239 Mon Sep 17 00:00:00 2001
From: Tianyi Pu <912396513@qq.com>
Date: Tue, 18 Jun 2024 08:40:25 +0100
Subject: [PATCH 04/13] =?UTF-8?q?ui=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front_end/src/App.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/front_end/src/App.vue b/front_end/src/App.vue
index 769985c..a5984a7 100644
--- a/front_end/src/App.vue
+++ b/front_end/src/App.vue
@@ -9,13 +9,13 @@
             </div>
         </el-menu-item>
         <el-menu-item v-for="item in menu_items" :index="'/' + item.index"
-            style="font-size: 18px; padding-left: 8px; padding-right: 8px">
+            style="font-size: 18px; padding-left: 8px; padding-right: 5px">
             <el-tooltip v-if="local.menu_icon" :content="$t(item.content)">
                 <el-icon style="margin-top: 21px; margin-bottom: 21px">
                     <component :is="item.icon" style="width: 60px; height: 60px" />
                 </el-icon>
             </el-tooltip>
-            <span v-else>
+            <span v-else style="padding-right: 5px">
                 <el-icon>
                     <component :is="item.icon" style="width: 60px; height: 60px" />
                 </el-icon>{{ $t(item.content) }}
@@ -23,13 +23,13 @@
         </el-menu-item>
         <div style="flex-grow: 1" />
         <el-menu-item :index="player_url" v-if="store.user.id != 0" @click="store.player = store.user"
-            style="font-size: 18px; padding-left: 8px; padding-right: 8px">
+            style="font-size: 18px; padding-left: 8px; padding-right: 5px">
             <el-tooltip v-if="local.menu_icon" :content="store.user.username">
-                <el-icon>
+                <el-icon style="margin-top: 21px; margin-bottom: 21px">
                     <User style="width: 60px; height: 60px" />
                 </el-icon>
             </el-tooltip>
-            <span v-else="local.menu_icon">
+            <span v-else style="padding-right: 5px">
                 <el-icon>
                     <User style="width: 60px; height: 60px" />
                 </el-icon>{{ store.user.username }}
@@ -42,7 +42,7 @@
                 </el-icon>
             </el-tooltip>
         </el-menu-item>
-        <div style="font-size: 18px; padding-left: 8px; padding-right: 8px; padding-top: 14px; margin-bottom: 14px">
+        <div style="font-size: 18px; padding-left: 8px; padding-right: 8px">
             <LanguagePicker v-show="local.language_show" />
         </div>
         <div class="header">

From a532fda085ab71f5a3d90898b80a99db5d7600b1 Mon Sep 17 00:00:00 2001
From: Tianyi Pu <912396513@qq.com>
Date: Tue, 18 Jun 2024 08:40:46 +0100
Subject: [PATCH 05/13] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96App.vue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front_end/src/App.vue | 80 +++++++++++++++++++------------------------
 1 file changed, 36 insertions(+), 44 deletions(-)

diff --git a/front_end/src/App.vue b/front_end/src/App.vue
index a5984a7..c91f29b 100644
--- a/front_end/src/App.vue
+++ b/front_end/src/App.vue
@@ -49,21 +49,17 @@
             <Login @login="user_login" @logout="user_logout"></Login>
         </div>
     </el-menu>
-
-
     <div class="common-layout">
         <el-container>
-            <div class="header_all" style="padding-top: 0;overflow: hidden;">
-                <div class="content" style="padding-top: 16px;">
+            <div class="header_all" style="padding-top: 0; overflow: hidden">
+                <div class="content" style="padding-top: 16px">
                     <router-view />
                 </div>
             </div>
-
-
-            <el-footer style="margin: auto;">
+            <el-footer style="margin: auto">
                 Copyright @ 2023　<a href="http://fff666.top">元扫雷网 fff666.top</a>　版权所有　<a
                     href="https://beian.miit.gov.cn/">苏ICP备2023056839号-1</a>
-                <span style="width:12px; display:inline-block"></span>
+                <span style="width: 12px; display: inline-block"></span>
                 <a href="https://beian.mps.gov.cn/#/query/webSearch?code=32020602001691" rel="noreferrer"
                     target="_blank">苏公网安备32020602001691</a>
             </el-footer>
@@ -76,7 +72,7 @@
         <template #footer>
             <span class="dialog-footer">
                 <el-checkbox v-model="never_show_notice">不再显示此对话框</el-checkbox>
-                <el-button type="primary" @click="handle_notice_close();">
+                <el-button type="primary" @click="handle_notice_close()">
                     确认
                 </el-button>
             </span>
@@ -84,31 +80,33 @@
     </el-dialog>
 </template>
 
-<script setup lang='ts'>
-import { ref, reactive, onMounted, computed } from 'vue'
+<script setup lang="ts">
+import { ref, reactive, onMounted, computed } from "vue";
 import Menu from "./components/Menu.vue";
-import LanguagePicker from './components/LanguagePicker.vue';
+import LanguagePicker from "./components/LanguagePicker.vue";
+import Login from "./components/Login.vue";
 // import { LoginStatus } from "@/utils/common/structInterface"
 import useCurrentInstance from "@/utils/common/useCurrentInstance";
-import { useUserStore } from './store'
-const store = useUserStore()
+import { useLocalStore, useUserStore } from "./store";
+const store = useUserStore();
+const local = useLocalStore();
 
-import { useI18n } from 'vue-i18n';
+import { useI18n } from "vue-i18n";
 const t = useI18n();
 
 const { proxy } = useCurrentInstance();
-import logo_1 from '@/assets/logo.png';
-import logo_2 from '@/assets/logo2.png';
+import logo_1 from "@/assets/logo.png";
+import logo_2 from "@/assets/logo2.png";
 
-import { useRouter } from 'vue-router'
-const router = useRouter()
+import { useRouter } from "vue-router";
+const router = useRouter();
 
 // const player_visible = ref(false)
-const notice_visible = ref(false)
-const never_show_notice = ref(false)
+const notice_visible = ref(false);
+const never_show_notice = ref(false);
 
 // 主要是切换后的高亮
-const menu_index = ref()
+const menu_index = ref();
 
 const menu_items = [
     { index: "ranking", icon: "Trophy", content: "menu.ranking" },
@@ -121,8 +119,7 @@ const menu_items = [
 const notice = ref(`
 1、即日起开始删档公测，公测与开发同步进行。公测结束后，在正式上线之前会删除所有数据。
 2、相关意见、问题和建议请移步至此处[https://gitee.com/ee55/saolei_website/issues]发表。
-`)
-
+`);
 
 onMounted(() => {
     const notice_hash = localStorage.getItem("notice") as String;
@@ -130,32 +127,31 @@ onMounted(() => {
         notice_visible.value = true;
     }
 
-
     console.log(`
   元扫雷网(fff666.top)开发团队，期待您的加入: 2234208506@qq.com
   `);
-    router.isReady().then(() => { menu_index.value = router.currentRoute.value.fullPath; })
-
-
-})
+    router.isReady().then(() => {
+        menu_index.value = router.currentRoute.value.fullPath;
+    });
+});
 
 const player_url = computed(() => {
-    return '/player/' + store.user.id;
-})
+    return "/player/" + store.user.id;
+});
 
 const user_login = () => {
     // player_visible.value = true;
     // tab_width.value = "14vw";
-}
+};
 
 const user_logout = () => {
     // console.log(router.currentRoute.value.fullPath);
     // 如果切在我的地盘，就切到主页
-    if (router.currentRoute.value.fullPath.slice(0, 7) == '/player') {
+    if (router.currentRoute.value.fullPath.slice(0, 7) == "/player") {
         menu_index.value = "/";
         proxy.$router.push("/");
     }
-}
+};
 
 // const goback_home = () => {
 //     router.push("/")
@@ -167,32 +163,28 @@ const handle_notice_close = () => {
         localStorage.setItem("notice", hash_code(notice.value) + "");
     }
     notice_visible.value = false;
-}
+};
 
 const hash_code = function (t: string) {
-    var hash = 0, i, chr;
+    var hash = 0,
+        i,
+        chr;
     if (t.length === 0) return hash;
     for (i = 0; i < t.length; i++) {
         chr = t.charCodeAt(i);
-        hash = ((hash << 5) - hash) + chr;
+        hash = (hash << 5) - hash + chr;
         hash |= 0; // 32bit integer
     }
     return hash;
 };
-
-
-
-
 </script>
 
-
-<style lang='less'>
+<style lang="less">
 body {
     overflow-y: scroll;
     margin: 0;
 }
 
-
 .logo:hover {
     cursor: pointer;
 }

From 3f19a5bb67e2f02cc610ed08dc2f84aa3885eb0a Mon Sep 17 00:00:00 2001
From: Tianyi Pu <912396513@qq.com>
Date: Tue, 18 Jun 2024 08:41:07 +0100
Subject: [PATCH 06/13] =?UTF-8?q?=E9=87=8D=E6=8E=92=E8=AF=AD=E8=A8=80?=
 =?UTF-8?q?=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front_end/src/components/LanguagePicker.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/front_end/src/components/LanguagePicker.vue b/front_end/src/components/LanguagePicker.vue
index 27d31d2..9a88d22 100644
--- a/front_end/src/components/LanguagePicker.vue
+++ b/front_end/src/components/LanguagePicker.vue
@@ -21,10 +21,10 @@ const local = useLocalStore();
 import logo_lang from "@/assets/language.svg";
 
 const options = [
-    { lang: "dev", text: "dev" },
     { lang: "zh-cn", text: "简体中文" },
-    { lang: "de", text: "name" },
     { lang: "en", text: "English" },
+    { lang: "de", text: "name" },
+    { lang: "dev", text: "dev" },
 ];
 
 onBeforeMount(() => {

From 1e4d4b5c405e20f0c62f75a27a5ba922452cb505 Mon Sep 17 00:00:00 2001
From: Tianyi Pu <912396513@qq.com>
Date: Tue, 18 Jun 2024 08:46:08 +0100
Subject: [PATCH 07/13] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96App.vue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front_end/src/App.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/front_end/src/App.vue b/front_end/src/App.vue
index c91f29b..573edbe 100644
--- a/front_end/src/App.vue
+++ b/front_end/src/App.vue
@@ -3,9 +3,11 @@
     <el-menu style="position: fixed; width: 100%; z-index: 2010; user-select: none" mode="horizontal" :router="true"
         :default-active="menu_index" :ellipsis="false" menu-trigger="click">
         <el-menu-item index="/">
-            <div class="logo" style=" display: inline-flex; justify-content: center; align-items: center">
-                <el-image style="width: 52px; height: 52px; padding-top: 4px; padding-bottom: 4px; display: inline-flex" :src="logo_1" :fit="'cover'" />
-                <el-image v-if="!local.menu_icon" style="width: 131px; height: 60px; display: inline-flex" :src="logo_2" :fit="'cover'" />
+            <div class="logo" style="display: inline-flex; justify-content: center; align-items: center">
+                <el-image style="width: 52px; height: 52px; padding-top: 4px; padding-bottom: 4px; display: inline-flex"
+                    :src="logo_1" :fit="'cover'" />
+                <el-image v-if="!local.menu_icon" style="width: 131px; height: 60px; display: inline-flex" :src="logo_2"
+                    :fit="'cover'" />
             </div>
         </el-menu-item>
         <el-menu-item v-for="item in menu_items" :index="'/' + item.index"

From 085da8e30a67ac2f7aef0bfa712a0a4de8b8a731 Mon Sep 17 00:00:00 2001
From: Tianyi Pu <912396513@qq.com>
Date: Tue, 18 Jun 2024 09:06:19 +0100
Subject: [PATCH 08/13] Update Login.vue

---
 front_end/src/components/Login.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/front_end/src/components/Login.vue b/front_end/src/components/Login.vue
index 5402a01..a389ebd 100644
--- a/front_end/src/components/Login.vue
+++ b/front_end/src/components/Login.vue
@@ -1,5 +1,4 @@
 <template>
-    <el-dialog v-model="login_visible" :title="$t('login.title')" width="30%" align-center draggable :lock-scroll="false"
     <el-button v-if="store.login_status != LoginStatus.IsLogin"
         @click.stop="init_refvalues(); store.login_status = LoginStatus.Login; login_visible = true; register_visible = false">
         {{ $t('menu.login') }}
@@ -11,6 +10,8 @@
     <el-button v-if="store.login_status == LoginStatus.IsLogin" @click.stop="logout();">
         {{ $t('menu.logout') }}
     </el-button>
+    <el-dialog v-model="login_visible" :title="$t('login.title')" width="30%" align-center draggable
+        :lock-scroll="false"
         @close='() => { if (store.login_status !== LoginStatus.IsLogin) { store.login_status = LoginStatus.NotLogin; } }'>
         <el-form size="default">
             <el-form-item>

From ac32f216f8e126601f7bf16f388acdb28e1ebb33 Mon Sep 17 00:00:00 2001
From: Tianyi Pu <912396513@qq.com>
Date: Tue, 18 Jun 2024 09:08:15 +0100
Subject: [PATCH 09/13] Update index.ts

---
 front_end/src/i18n/index.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/front_end/src/i18n/index.ts b/front_end/src/i18n/index.ts
index 842b10b..372191b 100644
--- a/front_end/src/i18n/index.ts
+++ b/front_end/src/i18n/index.ts
@@ -3,7 +3,6 @@ import { dev } from '@/i18n/locales/dev'
 import { zhCn } from '@/i18n/locales/zh-cn'
 import { de } from '@/i18n/locales/de'
 import { en } from './locales/en'
-import { LocaleConfig } from '@/i18n/config'
 
 /**
  * 获取所有语言

From 0cfe0cf482ff1aabc1be115af241e430baafe742 Mon Sep 17 00:00:00 2001
From: Tianyi Pu <912396513@qq.com>
Date: Tue, 18 Jun 2024 09:08:37 +0100
Subject: [PATCH 10/13] Update SettingView.vue

---
 front_end/src/views/SettingView.vue | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/front_end/src/views/SettingView.vue b/front_end/src/views/SettingView.vue
index e41fdad..f043848 100644
--- a/front_end/src/views/SettingView.vue
+++ b/front_end/src/views/SettingView.vue
@@ -30,10 +30,5 @@ import { useI18n } from 'vue-i18n';
 const store = useUserStore()
 const local = useLocalStore()
 const t = useI18n()
-</script>
 
-<style>
-.title {
-    font-size: var(--el-font-size-extra-large)
-}
-</style>
\ No newline at end of file
+</script>
\ No newline at end of file

From f3966e55d33aa7cb8c97624f4485ef612d1837d5 Mon Sep 17 00:00:00 2001
From: Tianyi Pu <912396513@qq.com>
Date: Tue, 18 Jun 2024 09:15:37 +0100
Subject: [PATCH 11/13] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96Login.vue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front_end/src/components/Login.vue | 65 +++++++++++++++++-------------
 1 file changed, 37 insertions(+), 28 deletions(-)

diff --git a/front_end/src/components/Login.vue b/front_end/src/components/Login.vue
index a389ebd..6bc2e50 100644
--- a/front_end/src/components/Login.vue
+++ b/front_end/src/components/Login.vue
@@ -11,11 +11,11 @@
         {{ $t('menu.logout') }}
     </el-button>
     <el-dialog v-model="login_visible" :title="$t('login.title')" width="30%" align-center draggable
-        :lock-scroll="false"
-        @close='() => { if (store.login_status !== LoginStatus.IsLogin) { store.login_status = LoginStatus.NotLogin; } }'>
+        :lock-scroll="false" @close='closeLogin'>
         <el-form size="default">
             <el-form-item>
-                <el-input v-model="user_name" :placeholder="$t('login.username')" prefix-icon="User" maxlength="20"></el-input>
+                <el-input v-model="user_name" :placeholder="$t('login.username')" prefix-icon="User"
+                    maxlength="20"></el-input>
             </el-form-item>
             <el-form-item>
                 <el-input v-model="user_password" :placeholder="$t('login.password')" maxlength="20" show-password
@@ -23,7 +23,8 @@
             </el-form-item>
             <el-form-item>
                 <div style="display: flex;">
-                    <el-input v-model.trim="valid_code" :placeholder="$t('login.captcha')" prefix-icon="Key" class="code"></el-input>
+                    <el-input v-model.trim="valid_code" :placeholder="$t('login.captcha')" prefix-icon="Key"
+                        class="code"></el-input>
                     &nbsp;
                     <ValidCode ref="refValidCode" :identifyCode="identifyCodeLog" />
                 </div>
@@ -42,21 +43,21 @@
                 style="cursor: pointer;color: blue;">{{ $t('login.forgetPassword') }}</div>
         </el-form>
     </el-dialog>
-    <el-dialog v-model="register_visible" :title="$t('register.title')" width="30%" align-center draggable :lock-scroll="false"
-        @close='() => { if (store.login_status !== LoginStatus.IsLogin) { store.login_status = LoginStatus.NotLogin; } }'>
+    <el-dialog v-model="register_visible" :title="$t('register.title')" width="30%" align-center draggable
+        :lock-scroll="false" @close='closeLogin'>
         <el-form size="default">
             <el-form-item>
                 <el-input v-model.trim="user_name_reg" :placeholder="$t('register.username')" prefix-icon="User"
                     maxlength="20" show-word-limit id="register_user_name_form"></el-input>
             </el-form-item>
             <el-form-item>
-                <el-input v-model="user_email_reg" :placeholder="$t('register.email')" prefix-icon="Message" type="email"
-                    id="register_email_form"></el-input>
+                <el-input v-model="user_email_reg" :placeholder="$t('register.email')" prefix-icon="Message"
+                    type="email" id="register_email_form"></el-input>
             </el-form-item>
             <el-form-item>
                 <div style="display: flex">
-                    <el-input v-model.trim="valid_code_reg" :placeholder="$t('register.captcha')" prefix-icon="Key" class="code"
-                        maxlength="4"></el-input>
+                    <el-input v-model.trim="valid_code_reg" :placeholder="$t('register.captcha')" prefix-icon="Key"
+                        class="code" maxlength="4"></el-input>
                     &nbsp;
                     <!-- <ValidCode2 :identifyCode="identifyCodeReg" ref="refValidCode2" /> -->
                     <ValidCode :identifyCode="identifyCodeReg" ref="refValidCode2" />
@@ -66,19 +67,21 @@
                 </div>
             </el-form-item>
             <el-form-item>
-                <el-input v-model.trim="user_email_valid_code_reg" :placeholder="$t('register.emailCode')" prefix-icon="Key"
-                    maxlength="6" :disabled="valid_code_reg.length < 4" id="register_email_valid_code_form"></el-input>
+                <el-input v-model.trim="user_email_valid_code_reg" :placeholder="$t('register.emailCode')"
+                    prefix-icon="Key" maxlength="6" :disabled="valid_code_reg.length < 4"
+                    id="register_email_valid_code_form"></el-input>
             </el-form-item>
             <el-form-item>
-                <el-input v-model="user_password_reg" :placeholder="$t('register.password')" show-password prefix-icon="Lock"
-                    minlength="6" maxlength="20" id="register_user_password_form"></el-input>
+                <el-input v-model="user_password_reg" :placeholder="$t('register.password')" show-password
+                    prefix-icon="Lock" minlength="6" maxlength="20" id="register_user_password_form"></el-input>
             </el-form-item>
             <el-form-item>
-                <el-input v-model="user_password2_reg" :placeholder="$t('register.confirmPassword')" show-password prefix-icon="Lock"
-                    minlength="6" maxlength="20"></el-input>
+                <el-input v-model="user_password2_reg" :placeholder="$t('register.confirmPassword')" show-password
+                    prefix-icon="Lock" minlength="6" maxlength="20"></el-input>
             </el-form-item>
             <el-checkbox v-model="checkout_user_agreement" name="checkoutSecret">{{ $t('register.agreeTo') }}
-                <a target="_blank" :href="AXIOS_BASE_URL + '/agreement.html'">{{ $t('register.termsAndConditions') }}</a>
+                <a target="_blank" :href="AXIOS_BASE_URL + '/agreement.html'">{{ $t('register.termsAndConditions')
+                    }}</a>
             </el-checkbox>
 
             <el-form-item>
@@ -91,16 +94,17 @@
             </el-form-item>
         </el-form>
     </el-dialog>
-    <el-dialog v-model="retrieve_visible" :title="$t('forgetPassword.title')" width="30%" align-center draggable :lock-scroll="false"
-        @close='() => { if (store.login_status !== LoginStatus.IsLogin) { store.login_status = LoginStatus.NotLogin; } }'>
+    <el-dialog v-model="retrieve_visible" :title="$t('forgetPassword.title')" width="30%" align-center draggable
+        :lock-scroll="false" @close='closeLogin'>
         <el-form size="default">
             <el-form-item>
-                <el-input v-model="user_email_reg" :placeholder="$t('forgetPassword.email')" prefix-icon="Message" type="email"></el-input>
+                <el-input v-model="user_email_reg" :placeholder="$t('forgetPassword.email')" prefix-icon="Message"
+                    type="email"></el-input>
             </el-form-item>
             <el-form-item>
                 <div style="display: flex">
-                    <el-input v-model="valid_code_reg" :placeholder="$t('forgetPassword.captcha')" prefix-icon="Key" class="code"
-                        maxlength="4"></el-input>
+                    <el-input v-model="valid_code_reg" :placeholder="$t('forgetPassword.captcha')" prefix-icon="Key"
+                        class="code" maxlength="4"></el-input>
                     &nbsp;
                     <!-- <ValidCode2 :identifyCode="identifyCodeReg" ref="refValidCode2" /> -->
                     <ValidCode :identifyCode="identifyCodeReg" ref="refValidCode2" />
@@ -110,16 +114,16 @@
                 </div>
             </el-form-item>
             <el-form-item>
-                <el-input v-model="user_email_valid_code_reg" :placeholder="$t('forgetPassword.emailCode')" prefix-icon="Key"
-                    :disabled="valid_code_reg.length < 4" maxlength="6"></el-input>
+                <el-input v-model="user_email_valid_code_reg" :placeholder="$t('forgetPassword.emailCode')"
+                    prefix-icon="Key" :disabled="valid_code_reg.length < 4" maxlength="6"></el-input>
             </el-form-item>
             <el-form-item>
-                <el-input v-model="user_password_reg" :placeholder="$t('forgetPassword.password')" show-password prefix-icon="Lock"
-                    minlength="6" maxlength="20"></el-input>
+                <el-input v-model="user_password_reg" :placeholder="$t('forgetPassword.password')" show-password
+                    prefix-icon="Lock" minlength="6" maxlength="20"></el-input>
             </el-form-item>
             <el-form-item>
-                <el-input v-model="user_password2_reg" :placeholder="$t('forgetPassword.confirmPassword')" show-password prefix-icon="Lock"
-                    minlength="6" maxlength="20"></el-input>
+                <el-input v-model="user_password2_reg" :placeholder="$t('forgetPassword.confirmPassword')" show-password
+                    prefix-icon="Lock" minlength="6" maxlength="20"></el-input>
             </el-form-item>
             <el-form-item>
                 <div style="color: red;">{{ $t(hint_message) }}</div>
@@ -241,6 +245,11 @@ onMounted(() => {
     };
 })
 
+const closeLogin = () => {
+    if (store.login_status !== LoginStatus.IsLogin) {
+        store.login_status = LoginStatus.NotLogin;
+    }
+}
 
 const login = async () => {
     // 先用cookie尝试登录，可能登不上

From 6badab4ae84b64c0ebda06e6c144dd5d3e841c31 Mon Sep 17 00:00:00 2001
From: Tianyi Pu <912396513@qq.com>
Date: Tue, 18 Jun 2024 13:05:35 +0100
Subject: [PATCH 12/13] Update Login.vue

---
 front_end/src/components/Login.vue | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/front_end/src/components/Login.vue b/front_end/src/components/Login.vue
index 6bc2e50..85567a9 100644
--- a/front_end/src/components/Login.vue
+++ b/front_end/src/components/Login.vue
@@ -1,10 +1,8 @@
 <template>
-    <el-button v-if="store.login_status != LoginStatus.IsLogin"
-        @click.stop="init_refvalues(); store.login_status = LoginStatus.Login; login_visible = true; register_visible = false">
+    <el-button v-if="store.login_status != LoginStatus.IsLogin" @click.stop="openLogin">
         {{ $t('menu.login') }}
     </el-button>
-    <el-button v-if="store.login_status != LoginStatus.IsLogin"
-        @click.stop="init_refvalues(); store.login_status = LoginStatus.Register; register_visible = true; login_visible = false">
+    <el-button v-if="store.login_status != LoginStatus.IsLogin" @click.stop="openRegister">
         {{ $t('menu.register') }}
     </el-button>
     <el-button v-if="store.login_status == LoginStatus.IsLogin" @click.stop="logout();">
@@ -245,6 +243,20 @@ onMounted(() => {
     };
 })
 
+const openLogin = () => {
+    init_refvalues();
+    store.login_status = LoginStatus.Login;
+    login_visible.value = true;
+    register_visible.value = false;
+}
+
+const openRegister = () => {
+    init_refvalues();
+    store.login_status = LoginStatus.Register;
+    register_visible.value = true;
+    login_visible.value = false;
+}
+
 const closeLogin = () => {
     if (store.login_status !== LoginStatus.IsLogin) {
         store.login_status = LoginStatus.NotLogin;

From b18e8cece674e54245fd11c50758d9da1709c32b Mon Sep 17 00:00:00 2001
From: Tianyi Pu <912396513@qq.com>
Date: Tue, 18 Jun 2024 13:06:49 +0100
Subject: [PATCH 13/13] cursor: pointer

---
 front_end/src/components/LanguagePicker.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/front_end/src/components/LanguagePicker.vue b/front_end/src/components/LanguagePicker.vue
index 9a88d22..70e0276 100644
--- a/front_end/src/components/LanguagePicker.vue
+++ b/front_end/src/components/LanguagePicker.vue
@@ -1,6 +1,6 @@
 <template>
     <el-dropdown @command="changeLanguage" trigger="click">
-        <el-image :src="logo_lang" style="width: 24px; height: 24px; margin-top: 18px"></el-image>
+        <el-image :src="logo_lang" style="width: 24px; height: 24px; margin-top: 18px; cursor: pointer"></el-image>
         <template #dropdown>
             <el-dropdown-item v-for="item in options" :command="item.lang">
                 {{ item.text }}