From e81f721c38910e525c6d1b6b0b364434aebf5f5e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 07 二月 2024 21:06:25 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/locales/zh-TW/pages.ts | 6 +-
zy-asrs-flow/src/pages/User/Login/index.jsx | 59 ++++++++++++++++++++---------
zy-asrs-flow/src/locales/zh-CN/pages.ts | 6 +-
3 files changed, 47 insertions(+), 24 deletions(-)
diff --git a/zy-asrs-flow/src/locales/zh-CN/pages.ts b/zy-asrs-flow/src/locales/zh-CN/pages.ts
index 80bdfa0..8e867b0 100644
--- a/zy-asrs-flow/src/locales/zh-CN/pages.ts
+++ b/zy-asrs-flow/src/locales/zh-CN/pages.ts
@@ -1,12 +1,12 @@
export default {
'pages.layouts.userLayout.title': 'Vincent Admin',
'pages.login.accountLogin.tab': '璐︽埛瀵嗙爜鐧诲綍',
- 'pages.login.accountLogin.errorMessage': '閿欒鐨勭敤鎴峰悕鍜屽瘑鐮�(admin/ant.design)',
+ 'pages.login.accountLogin.errorMessage': '閿欒鐨勭敤鎴峰悕鍜屽瘑鐮�',
'pages.login.failure': '鐧诲綍澶辫触锛岃閲嶈瘯锛�',
'pages.login.success': '鐧诲綍鎴愬姛锛�',
- 'pages.login.username.placeholder': '鐢ㄦ埛鍚�: admin or user',
+ 'pages.login.username.placeholder': '鐢ㄦ埛鍚�:',
'pages.login.username.required': '鐢ㄦ埛鍚嶆槸蹇呭～椤癸紒',
- 'pages.login.password.placeholder': '瀵嗙爜: ant.design',
+ 'pages.login.password.placeholder': '瀵嗙爜:',
'pages.login.password.required': '瀵嗙爜鏄繀濉」锛�',
'pages.login.phoneLogin.tab': '鎵嬫満鍙风櫥褰�',
'pages.login.phoneLogin.errorMessage': '楠岃瘉鐮侀敊璇�',
diff --git a/zy-asrs-flow/src/locales/zh-TW/pages.ts b/zy-asrs-flow/src/locales/zh-TW/pages.ts
index 37000c0..1d92909 100644
--- a/zy-asrs-flow/src/locales/zh-TW/pages.ts
+++ b/zy-asrs-flow/src/locales/zh-TW/pages.ts
@@ -1,12 +1,12 @@
export default {
'pages.layouts.userLayout.title': 'Ant Design 鏄タ婀栧崁鏈�鍏峰奖闊垮姏鐨� Web 瑷▓瑕忕瘎',
'pages.login.accountLogin.tab': '璩埗瀵嗙⒓鐧婚寗',
- 'pages.login.accountLogin.errorMessage': '閷鐨勭敤鎴跺悕鍜屽瘑纰�(admin/ant.design)',
+ 'pages.login.accountLogin.errorMessage': '閷鐨勭敤鎴跺悕鍜屽瘑纰�',
'pages.login.failure': '鐧婚寗澶辨晽锛岃珛閲嶈│锛�',
'pages.login.success': '鐧婚寗鎴愬姛锛�',
- 'pages.login.username.placeholder': '鐢ㄦ埗鍚�: admin or user',
+ 'pages.login.username.placeholder': '鐢ㄦ埗鍚�:',
'pages.login.username.required': '鐢ㄦ埗鍚嶆槸蹇呭～闋咃紒',
- 'pages.login.password.placeholder': '瀵嗙⒓: ant.design',
+ 'pages.login.password.placeholder': '瀵嗙⒓:',
'pages.login.password.required': '瀵嗙⒓鏄繀濉爡锛�',
'pages.login.phoneLogin.tab': '鎵嬫铏熺櫥閷�',
'pages.login.phoneLogin.errorMessage': '椹楄瓑纰奸尟瑾�',
diff --git a/zy-asrs-flow/src/pages/User/Login/index.jsx b/zy-asrs-flow/src/pages/User/Login/index.jsx
index cb959d6..b2279d9 100644
--- a/zy-asrs-flow/src/pages/User/Login/index.jsx
+++ b/zy-asrs-flow/src/pages/User/Login/index.jsx
@@ -18,6 +18,7 @@
import React, { useState } from 'react';
import { flushSync } from 'react-dom';
import { createStyles } from 'antd-style';
+import { request } from '@umijs/max';
const useStyles = createStyles(({ token }) => {
return {
@@ -101,29 +102,51 @@
const handleSubmit = async (values) => {
try {
- // 鐧诲綍
- const msg = await login({ ...values, type });
- if (msg.status === 'ok') {
- const defaultLoginSuccessMessage = intl.formatMessage({
+ const r = await request('/api/login', {
+ baseURL: 'http://localhost:9090/wcs',
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json'
+ },
+ data: values
+ })
+ console.log(r);
+ if (r.code === 200) {
+ message.success(intl.formatMessage({
id: 'pages.login.success',
defaultMessage: '鐧诲綍鎴愬姛锛�',
- });
- message.success(defaultLoginSuccessMessage);
+ }));
await fetchUserInfo();
const urlParams = new URL(window.location.href).searchParams;
history.push(urlParams.get('redirect') || '/');
return;
}
- console.log(msg);
- // 濡傛灉澶辫触鍘昏缃敤鎴烽敊璇俊鎭�
- setUserLoginState(msg);
+ setUserLoginState({
+ status: r.code,
+ type: type,
+ })
+
+ // 鐧诲綍
+ // const msg = await login({ ...values, type });
+ // if (msg.status === 'ok') {
+ // const defaultLoginSuccessMessage = intl.formatMessage({
+ // id: 'pages.login.success',
+ // defaultMessage: '鐧诲綍鎴愬姛锛�',
+ // });
+ // message.success(defaultLoginSuccessMessage);
+ // await fetchUserInfo();
+ // const urlParams = new URL(window.location.href).searchParams;
+ // history.push(urlParams.get('redirect') || '/');
+ // return;
+ // }
+ // // 濡傛灉澶辫触鍘昏缃敤鎴烽敊璇俊鎭�
+ // setUserLoginState(msg);
} catch (error) {
- const defaultLoginFailureMessage = intl.formatMessage({
+ console.log(error);
+ message.error(intl.formatMessage({
id: 'pages.login.failure',
defaultMessage: '鐧诲綍澶辫触锛岃閲嶈瘯锛�',
- });
- console.log(error);
- message.error(defaultLoginFailureMessage);
+ }));
}
};
const { status, type: loginType } = userLoginState;
@@ -178,11 +201,11 @@
]}
/>
- {status === 'error' && loginType === 'account' && (
+ {status !== 200 && loginType === 'account' && (
<LoginMessage
content={intl.formatMessage({
id: 'pages.login.accountLogin.errorMessage',
- defaultMessage: '璐︽埛鎴栧瘑鐮侀敊璇�(admin/ant.design)',
+ defaultMessage: '璐︽埛鎴栧瘑鐮侀敊璇�',
})}
/>
)}
@@ -196,7 +219,7 @@
}}
placeholder={intl.formatMessage({
id: 'pages.login.username.placeholder',
- defaultMessage: '鐢ㄦ埛鍚�: admin or user',
+ defaultMessage: '鐢ㄦ埛鍚�:',
})}
rules={[
{
@@ -218,7 +241,7 @@
}}
placeholder={intl.formatMessage({
id: 'pages.login.password.placeholder',
- defaultMessage: '瀵嗙爜: ant.design',
+ defaultMessage: '瀵嗙爜:',
})}
rules={[
{
@@ -235,7 +258,7 @@
</>
)}
- {status === 'error' && loginType === 'mobile' && <LoginMessage content="楠岃瘉鐮侀敊璇�" />}
+ {status !== 200 && loginType === 'mobile' && <LoginMessage content="楠岃瘉鐮侀敊璇�" />}
{type === 'mobile' && (
<>
<ProFormText
--
Gitblit v1.9.1