|
|
@@ -200,37 +200,39 @@ const loginForm = async (captcha?: any) => {
|
|
|
redata.captchaVerification = captcha.captchaVerification
|
|
|
}
|
|
|
//登录
|
|
|
- const res = await loginApi(redata)
|
|
|
+ try {
|
|
|
+ const res = await loginApi(redata)
|
|
|
|
|
|
- if (res) {
|
|
|
- // 是否记住我
|
|
|
- if (unref(remember)) {
|
|
|
- userStore.setLoginInfo({
|
|
|
- username: formData.username,
|
|
|
- password: formData.password
|
|
|
- })
|
|
|
- } else {
|
|
|
- userStore.setLoginInfo(undefined)
|
|
|
- }
|
|
|
- userStore.setRoleName(res.data.unique_auth)
|
|
|
- userStore.setRememberMe(unref(remember))
|
|
|
- userStore.setUserInfo(res.data)
|
|
|
- userStore.setToken(res.data.token)
|
|
|
- // 是否使用动态路由
|
|
|
- if (appStore.getDynamicRouter) {
|
|
|
- loading.close()
|
|
|
- getRole(res.data.menus)
|
|
|
- } else {
|
|
|
- await permissionStore.generateRoutes('static').catch(() => {})
|
|
|
- permissionStore.getAddRouters.forEach((route) => {
|
|
|
- addRoute(route as RouteRecordRaw) // 动态添加可访问路由表
|
|
|
- })
|
|
|
- permissionStore.setIsAddRouters(true)
|
|
|
- // console.log(permissionStore)
|
|
|
- push({ path: redirect.value || permissionStore.addRouters[0].path })
|
|
|
- loading.close()
|
|
|
+ if (res) {
|
|
|
+ // 是否记住我
|
|
|
+ if (unref(remember)) {
|
|
|
+ userStore.setLoginInfo({
|
|
|
+ username: formData.username,
|
|
|
+ password: formData.password
|
|
|
+ })
|
|
|
+ } else {
|
|
|
+ userStore.setLoginInfo(undefined)
|
|
|
+ }
|
|
|
+ userStore.setRoleName(res.data.unique_auth)
|
|
|
+ userStore.setRememberMe(unref(remember))
|
|
|
+ userStore.setUserInfo(res.data)
|
|
|
+ userStore.setToken(res.data.token)
|
|
|
+ // 是否使用动态路由
|
|
|
+ if (appStore.getDynamicRouter) {
|
|
|
+ getRole(res.data.menus)
|
|
|
+ } else {
|
|
|
+ await permissionStore.generateRoutes('static').catch(() => {})
|
|
|
+ permissionStore.getAddRouters.forEach((route) => {
|
|
|
+ addRoute(route as RouteRecordRaw) // 动态添加可访问路由表
|
|
|
+ })
|
|
|
+ permissionStore.setIsAddRouters(true)
|
|
|
+ // console.log(permissionStore)
|
|
|
+ push({ path: redirect.value || permissionStore.addRouters[0].path })
|
|
|
+ }
|
|
|
}
|
|
|
- } else {
|
|
|
+ } catch (error) {
|
|
|
+ console.log(error)
|
|
|
+ } finally {
|
|
|
loading.close()
|
|
|
}
|
|
|
}
|