From b829ba4aa0617d1d7c0559f859e1357f3ae6f0b3 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 03 十一月 2023 18:36:11 +0800
Subject: [PATCH] fix 修复 websocket 初始化无法连接进程死掉问题(vue代理问题)
---
src/views/login.vue | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/views/login.vue b/src/views/login.vue
index 2ec77e7..e5c73fa 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -100,6 +100,10 @@
// 绉熸埛鍒楄〃
const tenantList = ref<TenantVO[]>([]);
+watch(() => router.currentRoute.value, (newRoute: any) => {
+ redirect.value = newRoute.query && newRoute.query.redirect;
+}, { immediate: true });
+
const handleLogin = () => {
loginRef.value?.validate(async (valid: boolean, fields: any) => {
if (valid) {
@@ -121,6 +125,7 @@
const [err] = await to(userStore.login(loginForm.value));
if (!err) {
await router.push({ path: redirect.value || '/' });
+ loading.value = false;
} else {
loading.value = false;
// 閲嶆柊鑾峰彇楠岃瘉鐮�
@@ -153,10 +158,10 @@
const password = localStorage.getItem('password');
const rememberMe = localStorage.getItem('rememberMe');
loginForm.value = {
- tenantId: tenantId === undefined ? String(loginForm.value.tenantId) : tenantId,
- username: username === undefined ? String(loginForm.value.username) : username,
- password: password === undefined ? String(loginForm.value.password) : String(password),
- rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
+ tenantId: tenantId === null ? String(loginForm.value.tenantId) : tenantId,
+ username: username === null ? String(loginForm.value.username) : username,
+ password: password === null ? String(loginForm.value.password) : String(password),
+ rememberMe: rememberMe === null ? false : Boolean(rememberMe)
} as LoginData;
}
--
Gitblit v1.9.3