diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d8dd739..41542e6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,5 +1,9 @@ lockfileVersion: '6.0' +settings: + autoInstallPeers: true + excludeLinksFromLockfile: false + dependencies: dc-admin: specifier: 'link:' @@ -5303,7 +5307,3 @@ packages: resolution: {integrity: sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==} engines: {node: '>=12.20'} dev: true - -settings: - autoInstallPeers: true - excludeLinksFromLockfile: false diff --git a/src/lang/index.ts b/src/lang/index.ts index fb2f358..cf6e876 100644 --- a/src/lang/index.ts +++ b/src/lang/index.ts @@ -1,11 +1,11 @@ import { createI18n } from "vue-i18n"; import zhCN from "@/lang/modules/zhCN"; import enUS from "@/lang/modules/enUS"; -import pinia from "@/store/index"; -import { storeToRefs } from "pinia"; -import { useThemeConfig } from "@/store/modules/theme-config"; -const themeStore = useThemeConfig(pinia); -const { language } = storeToRefs(themeStore); +// import pinia from "@/store/index"; +// import { storeToRefs } from "pinia"; +// import { useThemeConfig } from "@/store/modules/theme-config"; +// const themeStore = useThemeConfig(pinia); +// const { language } = storeToRefs(themeStore); /* 这里必须是messages名称 */ const messages = { "zh-CN": zhCN, @@ -15,7 +15,7 @@ const messages = { const i18n = createI18n({ legacy: false, // Composition API模式需要设为false globalInjection: true, // 全局生效: $ - locale: language.value, // 默认语言 + locale: "zh-CN", // 默认语言 messages // 数据源 }); diff --git a/src/main.ts b/src/main.ts index 5924220..ecd58a1 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,21 +1,26 @@ import { createApp } from "vue"; import "@/style.css"; import App from "@/App.vue"; +// arco-design import ArcoVue from "@arco-design/web-vue"; +// vue-router import router from "@/router/index"; +// pinia import pinia from "@/store/index"; -import "virtual:svg-icons-register"; +// arco-css import "@arco-design/web-vue/dist/arco.css"; // 额外引入图标库 import ArcoVueIcon from "@arco-design/web-vue/es/icon"; +// 注册全局svg +import "virtual:svg-icons-register"; // 引入i18n import i18n from "@/lang/index"; const app = createApp(App); app.use(ArcoVue, { componentPrefix: "arco" }); -app.use(i18n); -app.use(ArcoVueIcon); app.use(pinia); +app.use(ArcoVueIcon); app.use(router); +app.use(i18n); app.mount("#app"); diff --git a/src/store/modules/theme-config.ts b/src/store/modules/theme-config.ts index b425621..df014b8 100644 --- a/src/store/modules/theme-config.ts +++ b/src/store/modules/theme-config.ts @@ -25,8 +25,5 @@ export const useThemeConfig = defineStore("theme-config", { this.language = data; } }, - persist: { - key: "theme-config", - storage: localStorage - } + persist: true }); diff --git a/src/store/modules/user-info.ts b/src/store/modules/user-info.ts index c308548..0417697 100644 --- a/src/store/modules/user-info.ts +++ b/src/store/modules/user-info.ts @@ -25,8 +25,5 @@ export const useUserInfoStore = defineStore("user-info", { this.token = ""; } }, - persist: { - key: "user-info", - storage: localStorage - } + persist: true });