From ff0ae974a1c561eaf2915988dac63cd066af189f Mon Sep 17 00:00:00 2001
From: yinbangzhong <zhongbangyin@126.com>
Date: 星期四, 12 九月 2024 09:23:44 +0800
Subject: [PATCH] bug fix
---
src/views/login/components/login-form.vue | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/src/views/login/components/login-form.vue b/src/views/login/components/login-form.vue
index a1259f6..8656e4a 100644
--- a/src/views/login/components/login-form.vue
+++ b/src/views/login/components/login-form.vue
@@ -12,11 +12,11 @@
>
<a-form-item
field="email"
- :rules="[{ required: true, message: '璇疯緭鍏ラ偖绠�' }]"
+ :rules="[{ required: true, message: '璇疯緭鍏ョ敤鎴峰悕' }]"
:validate-trigger="['change', 'blur']"
hide-label
>
- <a-input v-model="userInfo.email" placeholder="璇疯緭鍏ラ偖绠�">
+ <a-input v-model="userInfo.email" placeholder="璇疯緭鍏ョ敤鎴峰悕">
<template #prefix>
<icon-user />
</template>
@@ -40,14 +40,14 @@
</a-form-item>
<a-space :size="16" direction="vertical">
<div class="login-form-password-actions">
- <a-checkbox
+ <!-- <a-checkbox
checked="rememberPassword"
:model-value="loginConfig.rememberPassword"
@change="setRememberPassword as any"
>
{{ $t('login.form.rememberPassword') }}
- </a-checkbox>
- <a-link>{{ $t('login.form.forgetPassword') }}</a-link>
+ </a-checkbox> -->
+ <!-- <a-link>{{ $t("login.form.forgetPassword") }}</a-link> -->
</div>
<a-button type="primary" html-type="submit" long :loading="loading">
{{ $t('login.form.login') }}
@@ -61,13 +61,13 @@
</template>
<script lang="ts" setup>
- import { ref, reactive } from 'vue';
+ import { reactive, ref } from 'vue';
import { useRouter } from 'vue-router';
import { Message } from '@arco-design/web-vue';
import { ValidatedError } from '@arco-design/web-vue/es/form/interface';
import { useI18n } from 'vue-i18n';
import { useStorage } from '@vueuse/core';
- import { useUserStore } from '@/store';
+ import { useUserStore, userModelState } from '@/store';
import useLoading from '@/hooks/loading';
import type { LoginData } from '@/api/user';
import { rsaPsw } from '@/utils/ras';
@@ -77,6 +77,7 @@
const errorMessage = ref('');
const { loading, setLoading } = useLoading();
const userStore = useUserStore();
+ const modelStore = userModelState();
const loginConfig = useStorage('login-config', {
rememberPassword: true,
@@ -101,17 +102,21 @@
try {
const rsaPassWord = rsaPsw(values.password) as string;
console.log(values, '鐧诲綍淇℃伅');
- await userStore.login({
+ let goto = await userStore.login({
email: values.email,
password: rsaPassWord,
} as LoginData);
const { redirect, ...othersQuery } = router.currentRoute.value.query;
router.push({
- name: 'knowledgeLib',
+ name: goto,
query: {
...othersQuery,
},
});
+
+ const url = window.location.origin;
+ localStorage.setItem('httpUrl', url);
+ modelStore.getHrefUrl(url);
Message.success(t('鐧诲綍鎴愬姛'));
const { rememberPassword } = loginConfig.value;
const { email, password } = values;
--
Gitblit v1.8.0