From 319b37fe98d04df1e3af0f0d956ab42cb057680c Mon Sep 17 00:00:00 2001
From: LiuHao <liuhaoai545@gmail.com>
Date: 星期二, 20 六月 2023 19:15:58 +0800
Subject: [PATCH] 合并 ts
---
src/views/login.vue | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/views/login.vue b/src/views/login.vue
index af98f01..709b0ce 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -38,10 +38,10 @@
</el-form-item>
<div style="display: flex;justify-content: flex-end;flex-direction: row;">
<el-button circle>
- <svg-icon icon-class="qq" @click="doSocialLogin('QQ')" />
+ <svg-icon icon-class="qq" @click="doSocialLogin('qq')" />
</el-button>
<el-button circle>
- <svg-icon icon-class="wechat" @click="doSocialLogin('Wechat')" />
+ <svg-icon icon-class="wechat" @click="doSocialLogin('wechat')" />
</el-button>
<el-button circle>
<svg-icon icon-class="gitee" @click="doSocialLogin('gitee')" />
@@ -65,8 +65,8 @@
import { encrypt, decrypt } from '@/utils/jsencrypt';
import { useUserStore } from '@/store/modules/user';
import { LoginData, TenantVO } from '@/api/types';
-import { ElForm, FormRules } from 'element-plus';
import { to } from 'await-to-js';
+import { HttpStatus } from "@/enums/RespEnum";
const userStore = useUserStore();
const router = useRouter();
@@ -80,7 +80,7 @@
uuid: ''
});
-const loginRules: FormRules = {
+const loginRules: ElFormRules = {
tenantId: [{ required: true, trigger: "blur", message: "璇疯緭鍏ユ偍鐨勭鎴风紪鍙�" }],
username: [{ required: true, trigger: 'blur', message: '璇疯緭鍏ユ偍鐨勮处鍙�' }],
password: [{ required: true, trigger: 'blur', message: '璇疯緭鍏ユ偍鐨勫瘑鐮�' }],
@@ -98,12 +98,12 @@
// 娉ㄥ唽寮�鍏�
const register = ref(false);
const redirect = ref(undefined);
-const loginRef = ref(ElForm);
+const loginRef = ref<ElFormInstance>();
// 绉熸埛鍒楄〃
const tenantList = ref<TenantVO[]>([]);
const handleLogin = () => {
- loginRef.value.validate(async (valid: boolean, fields: any) => {
+ loginRef.value?.validate(async (valid: boolean, fields: any) => {
if (valid) {
loading.value = true;
// 鍕鹃�変簡闇�瑕佽浣忓瘑鐮佽缃湪 cookie 涓缃浣忕敤鎴峰悕鍜屽瘑鐮�
@@ -120,7 +120,6 @@
Cookies.remove('rememberMe');
}
// 璋冪敤action鐨勭櫥褰曟柟娉�
- // prittier-ignore
const [err] = await to(userStore.login(loginForm.value));
if (!err) {
await router.push({ path: redirect.value || '/' });
@@ -183,7 +182,7 @@
*/
const doSocialLogin = (type: string) => {
authBinding(type).then((res: any) => {
- if (res.code === 200) {
+ if (res.code === HttpStatus.SUCCESS) {
window.location.href = res.msg;
} else {
ElMessage.error(res.msg);
--
Gitblit v1.9.3