From e07c0b2b3aaa94dbcc72e13bfb31952abef1d3bd Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期六, 27 七月 2024 14:08:07 +0800
Subject: [PATCH] fix 修复 代码生成同步点击取消报错问题
---
src/views/login.vue | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/src/views/login.vue b/src/views/login.vue
index a92f399..ca2903f 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -26,13 +26,16 @@
<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" />
</el-button>
<el-button circle title="MaxKey鐧诲綍" @click="doSocialLogin('maxkey')">
<svg-icon icon-class="maxkey" />
+ </el-button>
+ <el-button circle title="TopIam鐧诲綍" @click="doSocialLogin('topiam')">
+ <svg-icon icon-class="topiam" />
</el-button>
<el-button circle title="Gitee鐧诲綍" @click="doSocialLogin('gitee')">
<svg-icon icon-class="gitee" />
@@ -53,7 +56,7 @@
</el-form>
<!-- 搴曢儴 -->
<div class="el-login-footer">
- <span>Copyright 漏 2018-2023 鐤媯鐨勭嫯瀛怢i All Rights Reserved.</span>
+ <span>Copyright 漏 2018-2024 鐤媯鐨勭嫯瀛怢i All Rights Reserved.</span>
</div>
</div>
</template>
@@ -127,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;
@@ -182,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