|
@@ -188,14 +188,14 @@ export default {
|
|
this.errorMessage = error.message || '授权失败,请重试'
|
|
this.errorMessage = error.message || '授权失败,请重试'
|
|
|
|
|
|
// 如果授权失败,跳转到登录页面
|
|
// 如果授权失败,跳转到登录页面
|
|
- setTimeout( async () => {
|
|
|
|
- let type = await this.getLogin();
|
|
|
|
- if(type == '1'){
|
|
|
|
- return;
|
|
|
|
- }else {
|
|
|
|
- this.$router.replace('/login2')
|
|
|
|
- }
|
|
|
|
- }, 2000)
|
|
|
|
|
|
+ // setTimeout( async () => {
|
|
|
|
+ let type = await this.getLogin();
|
|
|
|
+ if(type == '1'){
|
|
|
|
+ return;
|
|
|
|
+ }else {
|
|
|
|
+ this.$router.replace('/login2')
|
|
|
|
+ }
|
|
|
|
+ // }, 2000)
|
|
}
|
|
}
|
|
},
|
|
},
|
|
|
|
|
|
@@ -266,11 +266,13 @@ export default {
|
|
return null
|
|
return null
|
|
},
|
|
},
|
|
async getLogin() {
|
|
async getLogin() {
|
|
|
|
+ this.loading = true
|
|
const userid = await this.login()
|
|
const userid = await this.login()
|
|
let redirect_uri = Cookies.get('redirectUri')
|
|
let redirect_uri = Cookies.get('redirectUri')
|
|
if (!redirect_uri || redirect_uri === 'undefined') {
|
|
if (!redirect_uri || redirect_uri === 'undefined') {
|
|
redirect_uri = ''
|
|
redirect_uri = ''
|
|
}
|
|
}
|
|
|
|
+ this.Loading = false
|
|
console.log(redirect_uri)
|
|
console.log(redirect_uri)
|
|
if (userid) {
|
|
if (userid) {
|
|
if (redirect_uri) {
|
|
if (redirect_uri) {
|