wenyongda/ZRAdmin-vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：登录重定向到指定url问题

Browse Source
This commit is contained in:
不做码农 2022-09-30 06:58:22 +08:00
parent a6551f61a1
commit 336f7c0251
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/views/login.vue
View File

@ -79,6 +79,7 @@ import useUserStore from '@/store/modules/user'
const userStore = useUserStore() const userStore = useUserStore()
const router = useRouter() const router = useRouter()
const route = useRoute()
const { proxy } = getCurrentInstance() const { proxy } = getCurrentInstance()
const loginForm = ref({ const loginForm = ref({
@ -86,13 +87,13 @@ const loginForm = ref({
password: '', password: '',
rememberMe: false, rememberMe: false,
code: '', code: '',
uuid: '', uuid: ''
}) })
const loginRules = { const loginRules = {
username: [{ required: true, trigger: 'blur', message: '请输入您的账号' }], username: [{ required: true, trigger: 'blur', message: '请输入您的账号' }],
password: [{ required: true, trigger: 'blur', message: '请输入您的密码' }], password: [{ required: true, trigger: 'blur', message: '请输入您的密码' }],
code: [{ required: true, trigger: 'change', message: '请输入验证码' }], code: [{ required: true, trigger: 'change', message: '请输入验证码' }]
} }
const codeUrl = ref('') const codeUrl = ref('')
@ -101,8 +102,8 @@ const loading = ref(false)
const captchaOnOff = ref('') const captchaOnOff = ref('')
// 注册开关 // 注册开关
const register = ref(false) const register = ref(false)
const redirect = ref(undefined) const redirect = ref()
redirect.value = route.query.redirect
proxy.getConfigKey('sys.account.captchaOnOff').then((response) => { proxy.getConfigKey('sys.account.captchaOnOff').then((response) => {
captchaOnOff.value = response.data captchaOnOff.value = response.data
}) })
@ -156,7 +157,7 @@ function getCookie() {
loginForm.value = { loginForm.value = {
username: username === undefined ? loginForm.value.username : username, username: username === undefined ? loginForm.value.username : username,
password: password === undefined ? loginForm.value.password : decrypt(password), password: password === undefined ? loginForm.value.password : decrypt(password),
rememberMe: rememberMe === undefined ? false : Boolean(rememberMe), rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
} }
} }
function onAuth(type) { function onAuth(type) {

8
src/views/socialLogin.vue
View File

@ -29,16 +29,16 @@ const router = useRouter()
const userStore = useUserStore() const userStore = useUserStore()
const loginForm = ref(undefined) const loginForm = ref(undefined)
const callbackQuery = ref(undefined) const callbackQuery = ref(undefined)
const redirect = ref(undefined) const redirect = ref()
const authSource = ref('') const authSource = ref('')
const loading = ref(false) const loading = ref(false)
callbackQuery.value = getQueryObject() callbackQuery.value = getQueryObject()
redirect.value = route.query.redirect redirect.value = route.query.redirect
authSource.value = route.query.authSource authSource.value = route.query.authSource
const userInfo = computed(() => { // const userInfo = computed(() => {
return userStore.userInfo // return userStore.userInfo
}) // })
if (callbackQuery.value && callbackQuery.value.state != null) { if (callbackQuery.value && callbackQuery.value.state != null) {
loading.value = true loading.value = true
// 调用action的登录方法 // 调用action的登录方法