From c206ab5b4a38f99bec4ee34d7b01bbabc83fa120 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 19 六月 2024 14:29:44 +0800
Subject: [PATCH] update 优化 三方登录不同域名问题 采用新方案
---
src/views/login.vue | 15 ++++-----------
1 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/src/views/login.vue b/src/views/login.vue
index 060703b..ca2903f 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -26,7 +26,7 @@
<img :src="codeUrl" class="login-code-img" @click="getCode" />
</div>
</el-form-item>
- <el-checkbox v-model="loginForm.rememberMe" style="margin: 0px 0px 25px 0px">璁颁綇瀵嗙爜</el-checkbox>
+ <el-checkbox v-model="loginForm.rememberMe" style="margin: 0 0 25px 0">璁颁綇瀵嗙爜</el-checkbox>
<el-form-item style="float: right">
<el-button circle title="寰俊鐧诲綍" @click="doSocialLogin('wechat')">
<svg-icon icon-class="wechat" />
@@ -130,7 +130,8 @@
// 璋冪敤action鐨勭櫥褰曟柟娉�
const [err] = await to(userStore.login(loginForm.value));
if (!err) {
- await router.push({ path: redirect.value || '/' });
+ const redirectUrl = redirect.value || '/';
+ await router.push(redirectUrl);
loading.value = false;
} else {
loading.value = false;
@@ -185,20 +186,12 @@
}
};
-//妫�娴嬬鎴烽�夋嫨妗嗙殑鍙樺寲
-watch(
- () => loginForm.value.tenantId,
- () => {
- localStorage.setItem('tenantId', String(loginForm.value.tenantId));
- }
-);
-
/**
* 绗笁鏂圭櫥褰�
* @param type
*/
const doSocialLogin = (type: string) => {
- authBinding(type).then((res: any) => {
+ authBinding(type, loginForm.value.tenantId).then((res: any) => {
if (res.code === HttpStatus.SUCCESS) {
// 鑾峰彇鎺堟潈鍦板潃璺宠浆
window.location.href = res.data;
--
Gitblit v1.9.3