From bf9529ef2fe319852c52eae10d0218d17e1300e2 Mon Sep 17 00:00:00 2001 From: eoao Date: Wed, 10 Dec 2025 23:09:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E5=8A=A8=E5=88=B7?= =?UTF-8?q?=E6=96=B0=E9=82=AE=E4=BB=B6=E5=A4=B1=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mail-vue/src/init/init.js | 3 ++- mail-vue/src/views/login/index.vue | 4 ++-- mail-worker/src/service/user-service.js | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/mail-vue/src/init/init.js b/mail-vue/src/init/init.js index 3d0bc10..79e6b78 100644 --- a/mail-vue/src/init/init.js +++ b/mail-vue/src/init/init.js @@ -38,7 +38,8 @@ export async function init() { document.title = setting.title; if (user) { - accountStore.currentAccountId = user.accountId; + accountStore.currentAccountId = user.account.accountId; + accountStore.currentAccount = user.account; userStore.user = user; const routers = permsToRouter(user.permKeys); diff --git a/mail-vue/src/views/login/index.vue b/mail-vue/src/views/login/index.vue index b7fc4dd..6c3ecbe 100644 --- a/mail-vue/src/views/login/index.vue +++ b/mail-vue/src/views/login/index.vue @@ -390,10 +390,10 @@ const submit = () => { } async function saveToken(token) { - console.log(token) localStorage.setItem('token', token) const user = await loginUserInfo(); - accountStore.currentAccountId = user.accountId; + accountStore.currentAccountId = user.account.accountId; + accountStore.currentAccount = user.account; userStore.user = user; const routers = permsToRouter(user.permKeys); routers.forEach(routerData => { diff --git a/mail-worker/src/service/user-service.js b/mail-worker/src/service/user-service.js index 2d7468b..bb14a98 100644 --- a/mail-worker/src/service/user-service.js +++ b/mail-worker/src/service/user-service.js @@ -35,7 +35,7 @@ const userService = { user.userId = userRow.userId; user.sendCount = userRow.sendCount; user.email = userRow.email; - user.accountId = account.accountId; + user.account = account; user.name = account.name; user.permKeys = permKeys; user.role = roleRow