|
|
@@ -106,7 +106,7 @@ const redirect = ref(undefined)
|
|
|
const loginRef = ref<FormInstance>()
|
|
|
// 租户列表
|
|
|
const tenantList = ref<TenantVO[]>([])
|
|
|
-const handleLoginNoPass = () => {
|
|
|
+const handleLoginNoPass = async () => {
|
|
|
loading.value = true
|
|
|
Cookies.remove('tenantId')
|
|
|
Cookies.remove('username')
|
|
|
@@ -114,15 +114,12 @@ const handleLoginNoPass = () => {
|
|
|
Cookies.remove('rememberMe')
|
|
|
// 调用action的登录方法
|
|
|
// prittier-ignore
|
|
|
-const [err] = to(userStore.loginNoPass(loginForm.value))
|
|
|
+const [err] = await to(userStore.loginNoPass(loginForm.value))
|
|
|
if (!err) {
|
|
|
router.push({ path: '/index' })
|
|
|
} else {
|
|
|
loading.value = false
|
|
|
-// // 重新获取验证码
|
|
|
- if (captchaEnabled.value) {
|
|
|
- getCode()
|
|
|
- }
|
|
|
+ router.push({ path: '/login' })
|
|
|
}
|
|
|
}
|
|
|
const handleLogin = () => {
|
|
|
@@ -203,6 +200,8 @@ const initTenantList = async () => {
|
|
|
}
|
|
|
|
|
|
onMounted(() => {
|
|
|
+ getCode()
|
|
|
+ initTenantList()
|
|
|
var href = window.location.href
|
|
|
var endIndex = href.indexOf('?')
|
|
|
var nameIndex = href.indexOf('name')
|
|
|
@@ -218,9 +217,10 @@ onMounted(() => {
|
|
|
}
|
|
|
handleLoginNoPass()
|
|
|
|
|
|
- }else{
|
|
|
- getCode()
|
|
|
- initTenantList()
|
|
|
+ }
|
|
|
+ else{
|
|
|
+ // getCode()
|
|
|
+ // initTenantList()
|
|
|
getCookie()
|
|
|
}
|
|
|
|