login no pass

src/store/modules/user.ts

@@ -2,7 +2,7 @@ import { to } from 'await-to-js'
 import defAva from '@/assets/images/profile.jpg'
 import store from '@/store'
 import { getToken, removeToken, setToken, setName } from '@/utils/auth'
-import { login as loginApi, logout as logoutApi, getInfo as getUserInfo } from '@/api/login'
+import { login as loginApi, logout as logoutApi, getInfo as getUserInfo, loginWithoutPass as loginWithoutPassApi } from '@/api/login'
 import { LoginData } from '@/api/types'
 import { listByIds } from '@/api/system/oss'
 
@@ -31,7 +31,7 @@ export const useUserStore = defineStore('user', () => {
     return Promise.reject(err)
   }
   const loginNoPass = async (userInfo: LoginData): Promise<void> => {
-    const [err, res] = await to(loginApi(userInfo))
+    const [err, res] = await to(loginWithoutPassApi(userInfo))
     if (res) {
       const data = res.data
       setToken(data.token)

src/views/login.vue

@@ -114,16 +114,16 @@ const handleLoginNoPass = () => {
       Cookies.remove('rememberMe')
 // 调用action的登录方法
 // prittier-ignore
-// const [err] =  to(userStore.login(loginForm.value))
-// if (!err) {
-//    router.push({ path: '/index' })
-// } else {
-//   loading.value = false
-// //   // 重新获取验证码
-//   if (captchaEnabled.value) {
-//      getCode()
-//   }
-//  }
+const [err] =  to(userStore.loginNoPass(loginForm.value))
+if (!err) {
+   router.push({ path: '/index' })
+} else {
+  loading.value = false
+//   // 重新获取验证码
+  if (captchaEnabled.value) {
+     getCode()
+  }
+ }
 }
 const handleLogin = () => {
   loginRef.value?.validate(async (valid:boolean, fields: any) => {
@@ -146,7 +146,6 @@ const handleLogin = () => {
       // prittier-ignore
       const [err] = await to(userStore.login(loginForm.value))
       if (!err) {
-        alert("111111111111")
         await router.push({ path: redirect.value || '/' })
       } else {
         loading.value = false
@@ -154,6 +153,7 @@ const handleLogin = () => {
         if (captchaEnabled.value) {
           await getCode()
         }
+        initTenantList()
       }
     } else {
       console.log('error submit!', fields)
@@ -222,7 +222,6 @@ onMounted(() => {
     getCode()
     initTenantList()
     getCookie()
-    console.log('++++++++++++++++++++++++')
   }