From 950625f880f4c6c805a05a0f356c71bcf21b3993 Mon Sep 17 00:00:00 2001
From: xingyy <64720302+Concur-max@users.noreply.github.com>
Date: Thu, 27 Feb 2025 15:00:46 +0800
Subject: [PATCH] 12

---
 app/components/x-van-select/index.vue | 12 +++++++----
 app/pages/profile/index.vue           |  2 +-
 app/plugins/i18n.ts                   | 29 ++++-----------------------
 nuxt.config.js                        |  3 +--
 4 files changed, 14 insertions(+), 32 deletions(-)

diff --git a/app/components/x-van-select/index.vue b/app/components/x-van-select/index.vue
index db990b8..c4cd32c 100644
--- a/app/components/x-van-select/index.vue
+++ b/app/components/x-van-select/index.vue
@@ -1,5 +1,9 @@
 <script setup>
 import { ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+const { t } = useI18n()
+
 const props = defineProps({
   modelValue: {
     type: [Number, String]
@@ -21,7 +25,7 @@ const props = defineProps({
 
   placeholder: {
     type: String,
-    default: '请选择'
+    default: () => t('components.form.pleaseSelect')
   },
 
   disabled: {
@@ -75,9 +79,9 @@ const openPopup=()=>{
           @confirm="onConfirm"
           @cancel="show = false"
           :default-index="columns.findIndex(x => x.value === modelValue)"
-          title="请选择"
-          confirm-button-text="确定"
-          cancel-button-text="取消"
+          :title="t('components.form.pleaseSelect')"
+          :confirm-button-text="t('components.dialog.confirm')"
+          :cancel-button-text="t('components.dialog.cancel')"
       />
     </van-popup>
   </div>
diff --git a/app/pages/profile/index.vue b/app/pages/profile/index.vue
index 149bb89..9cd81b8 100644
--- a/app/pages/profile/index.vue
+++ b/app/pages/profile/index.vue
@@ -81,7 +81,7 @@ fetchData()
     <!-- 设置选项 -->
     <div class="px-16px mb-20px">
       <van-cell-group inset>
-        <van-cell :title="$t('settings.language')" is-link @click="router.push('/profile/language')" />
+        <!-- 移除语言设置入口 -->
       </van-cell-group>
     </div>
 
diff --git a/app/plugins/i18n.ts b/app/plugins/i18n.ts
index 27c0273..1eb3555 100644
--- a/app/plugins/i18n.ts
+++ b/app/plugins/i18n.ts
@@ -34,32 +34,11 @@ export default defineNuxtPlugin(() => {
       return 'zh-CN'
     }
 
-    // 获取用户手动设置的语言或系统语言
-    const lang = localStorage.getItem('lang')
-    if (lang) {
-      // 用户手动设置了语言，优先使用
-      setLocale(lang as TypeLocale)
-      Locale.use(lang)
-    } else {
-      // 用户未手动设置语言，使用系统语言
-      const systemLang = getSystemLanguage()
-      setLocale(systemLang as TypeLocale)
-      Locale.use(systemLang)
-      
-      // 将系统语言保存到 localStorage，以便下次使用
-      localStorage.setItem('lang', systemLang)
-    }
+    // 使用系统语言
+    const systemLang = getSystemLanguage()
+    setLocale(systemLang as TypeLocale)
+    Locale.use(systemLang)
     
-    // 监听系统语言变化（当用户未手动设置语言时）
-    window.addEventListener('languagechange', () => {
-      // 只有当用户未手动设置语言时，才跟随系统语言变化
-      if (!localStorage.getItem('lang')) {
-        const systemLang = getSystemLanguage()
-        setLocale(systemLang as TypeLocale)
-        Locale.use(systemLang)
-      }
-    })
-
     // 监听语言变化，当语言变化时，如果有活跃的 WebSocket 连接，则重新连接
     watch(() => i18n.locale.value, (newLocale) => {
       // 如果 WebSocket 插件已加载并且有活跃连接
diff --git a/nuxt.config.js b/nuxt.config.js
index 13f4e9b..fea60f0 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -54,11 +54,10 @@ export default defineNuxtConfig({
     lazy: true,
     strategy: 'no_prefix',
     detectBrowserLanguage: {
-      useCookie: true,
+      useCookie: false,
       cookieKey: 'i18n_redirected',
       redirectOn: 'root',
       alwaysRedirect: true,
-      fallbackLocale: 'zh-CN'
     },
     defaultLocale: 'zh-CN',
     vueI18n: './i18n/i18n.config.ts',