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 | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/src/views/login/components/login-form.vue b/src/views/login/components/login-form.vue
index b628dad..8656e4a 100644
--- a/src/views/login/components/login-form.vue
+++ b/src/views/login/components/login-form.vue
@@ -1,7 +1,7 @@
<template>
<div class="login-form-wrapper">
<div class="login-form-title">{{ $t('login.form.title') }}</div>
-<!-- <div class="login-form-sub-title">{{ $t('login.form.title') }}</div>-->
+ <!-- <div class="login-form-sub-title">{{ $t('login.form.title') }}</div>-->
<div class="login-form-error-msg">{{ errorMessage }}</div>
<a-form
ref="loginForm"
@@ -12,14 +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>
@@ -43,34 +40,34 @@
</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') }}
</a-button>
- <a-button type="text" long class="login-form-register-btn">
+ <!-- <a-button type="text" long class="login-form-register-btn">
{{ $t('login.form.register') }}
- </a-button>
+ </a-button> -->
</a-space>
</a-form>
</div>
</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';
@@ -80,15 +77,16 @@
const errorMessage = ref('');
const { loading, setLoading } = useLoading();
const userStore = useUserStore();
+ const modelStore = userModelState();
const loginConfig = useStorage('login-config', {
rememberPassword: true,
- email: '1750082535@qq.com', // 婕旂ず榛樿鍊�
- password: 'basic2024', // demo default value
+ email: '', // 婕旂ず榛樿鍊�
+ password: '', // demo default value
});
const userInfo = reactive({
- email: '1750082535@qq.com', // 婕旂ず榛樿鍊�
- password: 'basic2024', // demo default value
+ email: '', // 婕旂ず榛樿鍊�
+ password: '', // demo default value
});
const handleSubmit = async ({
@@ -103,27 +101,29 @@
setLoading(true);
try {
const rsaPassWord = rsaPsw(values.password) as string;
- console.log(values,'鐧诲綍淇℃伅');
- await userStore.login({
+ console.log(values, '鐧诲綍淇℃伅');
+ 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,
},
});
- Message.success(t('娆㈣繋鍥炴潵'));
+
+ const url = window.location.origin;
+ localStorage.setItem('httpUrl', url);
+ modelStore.getHrefUrl(url);
+ Message.success(t('鐧诲綍鎴愬姛'));
const { rememberPassword } = loginConfig.value;
const { email, password } = values;
// 瀹為檯鐢熶骇鐜闇�瑕佽繘琛屽姞瀵嗗瓨鍌ㄣ��
// The actual production environment requires encrypted storage.
loginConfig.value.email = rememberPassword ? email : '';
loginConfig.value.password = rememberPassword ? password : '';
-
-
} catch (err) {
errorMessage.value = (err as Error).message;
} finally {
--
Gitblit v1.8.0