fix:登录重定向到指定url问题
This commit is contained in:
parent
a6551f61a1
commit
336f7c0251
@ -79,6 +79,7 @@ import useUserStore from '@/store/modules/user'
|
||||
|
||||
const userStore = useUserStore()
|
||||
const router = useRouter()
|
||||
const route = useRoute()
|
||||
const { proxy } = getCurrentInstance()
|
||||
|
||||
const loginForm = ref({
|
||||
@ -86,13 +87,13 @@ const loginForm = ref({
|
||||
password: '',
|
||||
rememberMe: false,
|
||||
code: '',
|
||||
uuid: '',
|
||||
uuid: ''
|
||||
})
|
||||
|
||||
const loginRules = {
|
||||
username: [{ 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('')
|
||||
@ -101,8 +102,8 @@ const loading = ref(false)
|
||||
const captchaOnOff = ref('')
|
||||
// 注册开关
|
||||
const register = ref(false)
|
||||
const redirect = ref(undefined)
|
||||
|
||||
const redirect = ref()
|
||||
redirect.value = route.query.redirect
|
||||
proxy.getConfigKey('sys.account.captchaOnOff').then((response) => {
|
||||
captchaOnOff.value = response.data
|
||||
})
|
||||
@ -156,7 +157,7 @@ function getCookie() {
|
||||
loginForm.value = {
|
||||
username: username === undefined ? loginForm.value.username : username,
|
||||
password: password === undefined ? loginForm.value.password : decrypt(password),
|
||||
rememberMe: rememberMe === undefined ? false : Boolean(rememberMe),
|
||||
rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
|
||||
}
|
||||
}
|
||||
function onAuth(type) {
|
||||
|
||||
@ -29,16 +29,16 @@ const router = useRouter()
|
||||
const userStore = useUserStore()
|
||||
const loginForm = ref(undefined)
|
||||
const callbackQuery = ref(undefined)
|
||||
const redirect = ref(undefined)
|
||||
const redirect = ref()
|
||||
const authSource = ref('')
|
||||
const loading = ref(false)
|
||||
callbackQuery.value = getQueryObject()
|
||||
redirect.value = route.query.redirect
|
||||
authSource.value = route.query.authSource
|
||||
|
||||
const userInfo = computed(() => {
|
||||
return userStore.userInfo
|
||||
})
|
||||
// const userInfo = computed(() => {
|
||||
// return userStore.userInfo
|
||||
// })
|
||||
if (callbackQuery.value && callbackQuery.value.state != null) {
|
||||
loading.value = true
|
||||
// 调用action的登录方法
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user