|
@@ -222,6 +222,8 @@ import WeChatIcon from '@/assets/imgs/WeChat.png'
|
|
|
import { getCaptcha, loginUsername, loginPhone, loginEmail, getSmsCode, getEmailCode, resetPassword, getPasswordresetCode } from '@/api/auth.js'
|
|
import { getCaptcha, loginUsername, loginPhone, loginEmail, getSmsCode, getEmailCode, resetPassword, getPasswordresetCode } from '@/api/auth.js'
|
|
|
import { useAppStore } from '@/pinia/appStore'
|
|
import { useAppStore } from '@/pinia/appStore'
|
|
|
const appStore = useAppStore();
|
|
const appStore = useAppStore();
|
|
|
|
|
+import { useRoute } from 'vue-router'
|
|
|
|
|
+const route = useRoute()
|
|
|
// 正则表达式
|
|
// 正则表达式
|
|
|
const PHONE_REGEX = /^1[3-9]\d{9}$/;
|
|
const PHONE_REGEX = /^1[3-9]\d{9}$/;
|
|
|
const EMAIL_REGEX = /^[A-Za-z0-9+_.-]+@[A-Za-z0-9.-]+$/;
|
|
const EMAIL_REGEX = /^[A-Za-z0-9+_.-]+@[A-Za-z0-9.-]+$/;
|
|
@@ -444,7 +446,7 @@ const handlePasswordLogin = () => {
|
|
|
// 登录成功后,将token存储到localStorage
|
|
// 登录成功后,将token存储到localStorage
|
|
|
setToken(res.token);
|
|
setToken(res.token);
|
|
|
//刷新当前页
|
|
//刷新当前页
|
|
|
- window.location.reload();
|
|
|
|
|
|
|
+ // window.location.reload();
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
})
|
|
})
|
|
@@ -474,7 +476,7 @@ const handleSmsLogin = () => {
|
|
|
// 登录成功后,将token存储到localStorage
|
|
// 登录成功后,将token存储到localStorage
|
|
|
setToken(res.token);
|
|
setToken(res.token);
|
|
|
//刷新当前页
|
|
//刷新当前页
|
|
|
- window.location.reload();
|
|
|
|
|
|
|
+ // window.location.reload();
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
})
|
|
})
|
|
@@ -531,6 +533,15 @@ const handleResetPassword = () => {
|
|
|
|
|
|
|
|
const setToken = (token) => {
|
|
const setToken = (token) => {
|
|
|
appStore.UPDATE_TOKEN(token);
|
|
appStore.UPDATE_TOKEN(token);
|
|
|
|
|
+ //获取当前路由 ,路由是/learn-note
|
|
|
|
|
+ console.log(route.path)
|
|
|
|
|
+ if(
|
|
|
|
|
+ route.path.startsWith('/learn-note') ||
|
|
|
|
|
+ route.path.startsWith('/mibi-shop')
|
|
|
|
|
+ ){
|
|
|
|
|
+ // 刷新当前页
|
|
|
|
|
+ window.location.reload();
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|