Merge branch 'master' into deploy

This commit is contained in:
Zheng Jie
2021-03-03 12:05:52 +08:00

View File

@@ -46,6 +46,7 @@ import { encrypt } from '@/utils/rsaEncrypt'
import Config from '@/settings' import Config from '@/settings'
import { getCodeImg } from '@/api/login' import { getCodeImg } from '@/api/login'
import Cookies from 'js-cookie' import Cookies from 'js-cookie'
import qs from 'qs'
import Background from '@/assets/images/background.jpg' import Background from '@/assets/images/background.jpg'
export default { export default {
name: 'Login', name: 'Login',
@@ -73,7 +74,12 @@ export default {
watch: { watch: {
$route: { $route: {
handler: function(route) { handler: function(route) {
this.redirect = route.query && route.query.redirect if (route.query) {
const data = route.query
this.redirect = data.redirect
delete data.redirect
this.redirect = this.redirect + '&' + qs.stringify(data, { indices: false })
}
}, },
immediate: true immediate: true
} }