diff --git a/web/src/utils/http/index.ts b/web/src/utils/http/index.ts index 291e1287..bff83cd0 100644 --- a/web/src/utils/http/index.ts +++ b/web/src/utils/http/index.ts @@ -30,7 +30,7 @@ export const http = createAlova({ console.log(json) const message = resolveResError( code, - json?.message && json.message.trim() !== '' ? json.message : statusText + (typeof json?.message === 'string' && json.message.trim()) || statusText ) const noAlert = meta?.noAlert if (!noAlert) { diff --git a/web/src/views/login/IndexView.vue b/web/src/views/login/IndexView.vue index ed195593..4de22e8f 100644 --- a/web/src/views/login/IndexView.vue +++ b/web/src/views/login/IndexView.vue @@ -65,7 +65,7 @@ async function handleLogin() { await addDynamicRoutes() useRequest(user.info()).onSuccess(({ data }) => { - userStore.set(data) + userStore.set(data as any) }) if (query.redirect) { const path = query.redirect as string @@ -78,25 +78,21 @@ async function handleLogin() { loging.value = false } -watch( - () => isLogin, - async () => { - if (isLogin) { - console.log(isLogin) - await addDynamicRoutes() - useRequest(user.info()).onSuccess(({ data }) => { - userStore.set(data) - }) - if (query.redirect) { - const path = query.redirect as string - Reflect.deleteProperty(query, 'redirect') - await router.push({ path, query }) - } else { - await router.push('/') - } +watch(isLogin, async () => { + if (isLogin) { + await addDynamicRoutes() + useRequest(user.info()).onSuccess(({ data }) => { + userStore.set(data as any) + }) + if (query.redirect) { + const path = query.redirect as string + Reflect.deleteProperty(query, 'redirect') + await router.push({ path, query }) + } else { + await router.push('/') } } -) +})