From 801cb5ba539a0be601552c2029ba1321ae599724 Mon Sep 17 00:00:00 2001 From: huangwentao Date: Wed, 24 Aug 2022 23:26:54 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=201.=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80=E5=88=9D=E5=A7=8B=E5=8C=96=E7=9A=84?= =?UTF-8?q?=E6=97=B6=E5=80=99=EF=BC=8C=E6=8B=BF=E4=B8=8D=E5=88=B0=E8=AF=AD?= =?UTF-8?q?=E8=A8=80=E5=80=BC=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=822.=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=9F=E4=BA=A7=E7=8E=AF=E5=A2=83=E5=88=A0?= =?UTF-8?q?=E9=99=A4console=E5=92=8Cdebugger=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + src/i18n/index.ts | 4 +- src/store/modules/user.ts | 112 +++++++++++++++++++------------------- src/views/home/index.vue | 8 ++- vite.config.ts | 10 ++++ yarn.lock | 32 ++++++++--- 6 files changed, 99 insertions(+), 68 deletions(-) diff --git a/package.json b/package.json index 26da7b5..83a0793 100644 --- a/package.json +++ b/package.json @@ -60,6 +60,7 @@ "stylelint-config-recommended-vue": "^1.4.0", "stylelint-config-standard": "^27.0.0", "stylelint-order": "^5.0.0", + "terser": "^5.15.0", "typescript": "^4.6.3", "unplugin-auto-import": "^0.11.1", "unplugin-vue-components": "^0.22.4", diff --git a/src/i18n/index.ts b/src/i18n/index.ts index f35e1bb..71ac9b4 100644 --- a/src/i18n/index.ts +++ b/src/i18n/index.ts @@ -13,7 +13,7 @@ export function loadLang() { export const i18n = createI18n({ // globalInjection: true, - // legacy: false, + legacy: false, locale: 'zh-cn', fallbackLocale: 'zh-cn', messages: loadLang(), @@ -23,7 +23,7 @@ export function setLang(locale?: string) { if (locale) { localStorage.setItem('lang', locale); } - i18n.global.locale = locale || localStorage.getItem('lang') || ''; + i18n.global.locale.value = locale || localStorage.getItem('lang') || ''; } setLang(); diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 674932b..8a6c80f 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -6,62 +6,62 @@ import { watch } from 'vue'; const { VITE_TOKEN_KEY } = import.meta.env; const token = useCookies().get(VITE_TOKEN_KEY as string); -// interface StoreUser { -// token: string; -// info: Record; -// } +interface StoreUser { + token: string; + info: Record; +} -// export const useUserStore = defineStore({ -// id: 'app-user', -// state: (): StoreUser => ({ -// token: token, -// info: {}, -// }), -// getters: { -// getUserInfo(): any { -// return this.info || {}; -// }, -// }, -// actions: { -// setInfo(info: any) { -// this.info = info ? info : ''; -// }, -// login() { -// return new Promise((resolve) => { -// const { data } = loginPassword(); -// watch(data, () => { -// this.setInfo(data.value); -// // useCookies().set(VITE_TOKEN_KEY as string, data.value.token); -// resolve(data.value); -// }); -// }); -// }, -// }, -// }); -export const useUserStore = defineStore('app-user', () => { - const Token = ref(token); - const info = ref>({}); - const setInfo = (info: any) => { - info.value = info ? info : ''; - }; - const getUserInfo = () => { - return info || {}; - }; - const login = () => { - return new Promise((resolve) => { - const { data } = loginPassword(); - watch(data, () => { - setInfo(data.value); - // useCookies().set(VITE_TOKEN_KEY as string, data.value.token); - resolve(data.value); +export const useUserStore = defineStore({ + id: 'app-user', + state: (): StoreUser => ({ + token: token, + info: {}, + }), + getters: { + getUserInfo(): any { + return this.info || {}; + }, + }, + actions: { + setInfo(info: any) { + this.info = info ? info : ''; + }, + login() { + return new Promise((resolve) => { + const { data } = loginPassword(); + watch(data, () => { + this.setInfo(data.value); + // useCookies().set(VITE_TOKEN_KEY as string, data.value.token); + resolve(data.value); + }); }); - }); - }; - return { - Token, - info, - setInfo, - login, - getUserInfo, - }; + }, + }, }); +// export const useUserStore = defineStore('app-user', () => { +// const Token = ref(token); +// const info = ref>({}); +// const setInfo = (info: any) => { +// info.value = info ? info : ''; +// }; +// const getUserInfo = () => { +// return info || {}; +// }; +// const login = () => { +// return new Promise((resolve) => { +// const { data } = loginPassword(); +// watch(data, () => { +// setInfo(data.value); +// // useCookies().set(VITE_TOKEN_KEY as string, data.value.token); +// resolve(data.value); +// }); +// }); +// }; +// return { +// Token, +// info, +// setInfo, +// login, +// getUserInfo, +// }; +// }); diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 2a71e24..da2456e 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -13,7 +13,7 @@ -
+
@@ -30,14 +30,16 @@