From f3425493ed4e77ea683930e314e46cb51f5151a2 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 26 十一月 2024 15:29:22 +0800
Subject: [PATCH] update 优化 全代码规范化处理
---
src/views/login.vue | 18 +++++-------------
1 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/src/views/login.vue b/src/views/login.vue
index 3616d09..71d5dcd 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" />
@@ -97,7 +97,7 @@
// 娉ㄥ唽寮�鍏�
const register = ref(false);
-const redirect = ref(undefined);
+const redirect = ref('/');
const loginRef = ref<ElFormInstance>();
// 绉熸埛鍒楄〃
const tenantList = ref<TenantVO[]>([]);
@@ -105,7 +105,7 @@
watch(
() => router.currentRoute.value,
(newRoute: any) => {
- redirect.value = newRoute.query && newRoute.query.redirect;
+ redirect.value = newRoute.query && decodeURIComponent(newRoute.query.redirect);
},
{ immediate: true }
);
@@ -176,7 +176,7 @@
* 鑾峰彇绉熸埛鍒楄〃
*/
const initTenantList = async () => {
- const { data } = await getTenantList();
+ const { data } = await getTenantList(false);
tenantEnabled.value = data.tenantEnabled === undefined ? true : data.tenantEnabled;
if (tenantEnabled.value) {
tenantList.value = data.voList;
@@ -186,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