diff --git a/src/page/login/index.vue b/src/page/login/index.vue
index 80ef80b..8acfd37 100644
--- a/src/page/login/index.vue
+++ b/src/page/login/index.vue
@@ -7,9 +7,7 @@
@@ -91,12 +89,13 @@
handleLogin() {
const topUrl = getTopUrl();
const redirectUrl = "/oauth/redirect/";
- if (topUrl.includes(redirectUrl)) {
+ this.socialForm.source = getQueryString("source");
+ this.socialForm.code = getQueryString("code");
+ this.socialForm.state = getQueryString("state");
+ if (validatenull(this.socialForm.source) && topUrl.includes(redirectUrl)) {
let source = topUrl.split("?")[0];
source = source.split(redirectUrl)[1];
this.socialForm.source = source;
- this.socialForm.code = getQueryString("code");
- this.socialForm.state = getQueryString("state");
}
if (!validatenull(this.socialForm.source) && !validatenull(this.socialForm.code) && !validatenull(this.socialForm.state)) {
const loading = this.$loading({
diff --git a/src/page/login/thirdlogin.vue b/src/page/login/thirdlogin.vue
index d59ddf6..dd9fe9b 100644
--- a/src/page/login/thirdlogin.vue
+++ b/src/page/login/thirdlogin.vue
@@ -1,7 +1,7 @@
-
+
{{$t('login.github')}}
@@ -12,6 +12,18 @@
{{$t('login.gitee')}}
+
+
+
+
+
{{$t('login.wechat')}}
+
+
+
+
+
+
{{$t('login.qq')}}
+
@@ -23,7 +35,6 @@
methods: {
handleClick(source) {
window.location.href = `${website.authUrl}/${source}`;
- //openWindow(authUrl, source, 540, 540);
}
}
};
diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue
index d43174b..43f592d 100644
--- a/src/views/wel/index.vue
+++ b/src/views/wel/index.vue
@@ -27,7 +27,7 @@
@@ -463,6 +463,7 @@
password: '',
password2: '',
},
+ loading: false,
tenantMode: true,
accountBox: false,
activeNames: ['1', '2', '3', '5'],
@@ -501,14 +502,16 @@
this.$message.warning("两次密码输入不一致");
return;
}
+ this.loading = true;
registerGuest(this.form, this.userInfo.oauth_id).then(res => {
+ this.loading = false;
const data = res.data;
if (data.success) {
+ this.accountBox = false;
this.$alert("注册申请已提交,请耐心等待管理员通过!", '注册提示')
} else {
this.$message.error(data.msg || '提交失败');
}
- this.accountBox = false;
});
},
getTenant() {