huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2024-11-26 17:21:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

【修复】钉钉登录时，重定向后 type 丢失导致报错的问题

Browse Source
This commit is contained in:
YunaiV 2022-11-12 13:27:46 +08:00
parent 3cd256f7f2
commit 7093ed3997
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
yudao-ui-admin/src/views/login.vue
View File

@ -258,7 +258,8 @@ export default {
// 设置登录中 // 设置登录中
this.loading = true; this.loading = true;
// 计算 redirectUri // 计算 redirectUri
const redirectUri = location.origin + '/social-login?type=' + socialTypeEnum.type + '&redirect=' + (this.redirect || "/"); // 重定向不能丢 const redirectUri = location.origin + '/social-login?'
+ encodeURIComponent('type=' + socialTypeEnum.type + '&redirect=' + (this.redirect || "/")); // 重定向不能丢
// const redirectUri = 'http://127.0.0.1:48080/api/gitee/callback'; // const redirectUri = 'http://127.0.0.1:48080/api/gitee/callback';
// const redirectUri = 'http://127.0.0.1:48080/api/dingtalk/callback'; // const redirectUri = 'http://127.0.0.1:48080/api/dingtalk/callback';
// 进行跳转 // 进行跳转

19
yudao-ui-admin/src/views/socialLogin.vue
View File

@ -104,24 +104,19 @@ export default {
state: undefined, state: undefined,
}; };
}, },
// watch: {
// $route: {
// handler: function(route) {
// this.redirect = route.query && route.query.redirect;
// },
// immediate: true
// }
// },
created() { created() {
this.getCookie(); this.getCookie();
// 验证码开关 // 验证码开关
this.captchaEnable = getCaptchaEnable(); this.captchaEnable = getCaptchaEnable();
// 重定向地址 // 重定向地址
this.redirect = this.$route.query.redirect ? decodeURIComponent(this.$route.query.redirect) : undefined; this.redirect = this.getUrlValue('redirect');
// 社交登录相关 // 社交登录相关
this.type = this.$route.query.type; this.type = this.getUrlValue('type');
this.code = this.$route.query.code; this.code = this.$route.query.code;
this.state = this.$route.query.state; this.state = this.$route.query.state;
// 尝试登录一下
this.loading = true;
this.$store.dispatch("SocialLogin", { this.$store.dispatch("SocialLogin", {
code: this.code, code: this.code,
state: this.state, state: this.state,
@ -183,6 +178,10 @@ export default {
}); });
} }
}); });
},
getUrlValue(key) {
const url = new URL(decodeURIComponent(location.href));
return url.searchParams.get(key);
} }
} }
}; };