tongtong/vue3-element-admin
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #28 from cshaptx4869/patch-2

Browse Source 
refactor(userStore): ♻️ 优化user数据定义
This commit is contained in:
Ray Hao
2024-02-27 15:46:44 +08:00
committed by GitHub
parent 4a3742b41f bd290c2da0
commit e0f4c72925
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/store/modules/user.ts
View File

@@ -7,10 +7,10 @@ import { LoginData } from "@/api/auth/types";
import { UserInfo } from "@/api/user/types"; import { UserInfo } from "@/api/user/types";
export const useUserStore = defineStore("user", () => { export const useUserStore = defineStore("user", () => {
const user: UserInfo = { const user = ref<UserInfo>({
roles: [], roles: [],
perms: [], perms: [],
}; });
/** /**
* 登录 * 登录
@@ -45,7 +45,7 @@ export const useUserStore = defineStore("user", () => {
reject("getUserInfo: roles must be a non-null array!"); reject("getUserInfo: roles must be a non-null array!");
return; return;
} }
Object.assign(user, { ...data }); Object.assign(user.value, { ...data });
resolve(data); resolve(data);
}) })
.catch((error) => { .catch((error) => {

6
src/views/dashboard/index.vue
View File

@@ -209,11 +209,11 @@ const greetings = computed(() => {
if (hours >= 6 && hours < 8) { if (hours >= 6 && hours < 8) {
return "晨起披衣出草堂，轩窗已自喜微凉🌅！"; return "晨起披衣出草堂，轩窗已自喜微凉🌅！";
} else if (hours >= 8 && hours < 12) { } else if (hours >= 8 && hours < 12) {
return "上午好，" + useUserStore().user.nickname + "！"; return "上午好，" + userStore.user.nickname + "！";
} else if (hours >= 12 && hours < 18) { } else if (hours >= 12 && hours < 18) {
return "下午好，" + useUserStore().user.nickname + "！"; return "下午好，" + userStore.user.nickname + "！";
} else if (hours >= 18 && hours < 24) { } else if (hours >= 18 && hours < 24) {
return "晚上好，" + useUserStore().user.nickname + "！"; return "晚上好，" + userStore.user.nickname + "！";
} else if (hours >= 0 && hours < 6) { } else if (hours >= 0 && hours < 6) {
return "偷偷向银河要了一把碎星，只等你闭上眼睛撒入你的梦中，晚安🌛！"; return "偷偷向银河要了一把碎星，只等你闭上眼睛撒入你的梦中，晚安🌛！";
} }