From 84fa518cc6973c26d2e006b57d3e5570d4625075 Mon Sep 17 00:00:00 2001
From: liuwh <hugeinfo123>
Date: Mon, 06 Apr 2020 19:04:25 +0800
Subject: [PATCH] 修改
---
src/pages/login/login.jsx | 102 ++++++++++++++++++++++++++++++--------------------
1 files changed, 61 insertions(+), 41 deletions(-)
diff --git a/src/pages/login/login.jsx b/src/pages/login/login.jsx
index 4a6a87b..8d6150e 100644
--- a/src/pages/login/login.jsx
+++ b/src/pages/login/login.jsx
@@ -8,6 +8,9 @@
import React, { ReactNode, ReactEventHandler, Component } from 'react';
import { Form, Icon, Input, Button, Checkbox, message } from 'antd';
import './login.scss';
+
+import logo from '../../img/logo.png';
+
import fetch from '../../api/request';
class NormalLoginForm extends React.Component {
@@ -33,8 +36,9 @@
btnLoading: true
});
fetch({
- url: `hik-common/api/opus/user/loginTest`,
- params: {
+ url: `api/account/login`,
+ method: 'POST',
+ data: {
...values
}
}).then(res => {
@@ -50,18 +54,21 @@
};
handleRes = (res) => {
- let loginUser = {};
- let curPosIndex = window.localStorage.getItem('curPosIndex');
- curPosIndex = (curPosIndex || curPosIndex == {}) || 0;
- loginUser = res.user[curPosIndex];
- window.localStorage.setItem('user', res);
+ // 将token放入缓存
window.localStorage.setItem('token', res.token);
- window.localStorage.setItem('curPosIndex', curPosIndex);
- window.localStorage.setItem('loginUser', JSON.stringify(loginUser));
- message.success('登录成功', () => {
- this.props.history.push({ pathname: "/index" });
+
+ fetch({
+ url: `api/resource/getResource`,
+ }).then(res => {
+ console.log('res', res);
+ if (res) {
+ window.localStorage.setItem('menu', JSON.stringify(res));
+ message.success('登录成功');
+ this.props.history.push({ pathname: "/index" });
+ }
})
+
}
@@ -70,42 +77,55 @@
const { btnLoading } = this.state;
return (
<div className="login-main">
- <Form onSubmit={this.handleSubmit} className="login-form">
- <Form.Item>
- {getFieldDecorator('loginName', {
- rules: [{ required: true, message: '请输入账号!' }],
- })(
- <Input
- prefix={<Icon type="user" style={{ color: 'rgba(0,0,0,.25)' }} />}
- placeholder="请输入账号"
- />,
- )}
- </Form.Item>
- <Form.Item>
- {getFieldDecorator('passWord', {
- rules: [{ required: true, message: '请输入密码!' }],
- initialValue: 'psw'
- })(
- <Input
- prefix={<Icon type="lock" style={{ color: 'rgba(0,0,0,.25)' }} />}
- type="password"
- placeholder="请输入密码"
- />,
- )}
- </Form.Item>
- <Form.Item>
- {/* {getFieldDecorator('remember', {
+ <div className="login-div">
+ <div className="login-div-top">
+ <img className="login-div-top-img" src={logo} />
+ </div>
+ <div className="login-div-content">
+ <div className="login-div-content-div">
+ <div className="login-div-content-div-title">登录OA云平台</div>
+ <Form onSubmit={this.handleSubmit} className="login-form">
+ <Form.Item className="login-div-content-form-flex" >
+ {getFieldDecorator('account', {
+ rules: [{ required: true, message: '请输入账号!' }],
+ })(
+ <Input
+ style={{ width: '32vh', height: '5vh', margin: '12px' }}
+ prefix={<Icon type="user" style={{ color: 'rgba(0,0,0,.25)' }} />}
+ placeholder="请输入账号"
+ />,
+ )}
+ </Form.Item>
+ <Form.Item className="login-div-content-form-flex">
+ {getFieldDecorator('credential', {
+ rules: [{ required: true, message: '请输入密码!' }],
+ initialValue: 'admin'
+ })(
+ <Input
+ style={{ width: '32vh', height: '5vh', margin: '12px' }}
+ prefix={<Icon type="lock" style={{ color: 'rgba(0,0,0,.25)' }} />}
+ type="password"
+ placeholder="请输入密码"
+ />,
+ )}
+ </Form.Item>
+ <Form.Item className="login-div-content-form-flex">
+ {/* {getFieldDecorator('remember', {
valuePropName: 'checked',
initialValue: true,
})(<Checkbox>记住</Checkbox>)}
<a className="login-form-forgot" href="">
忘记密码
</a> */}
- <Button type="primary" htmlType="submit" className="login-form-button" loading={btnLoading}>
- 登录
- </Button>
- </Form.Item>
- </Form>
+ <Button type="primary" htmlType="submit" className="login-form-button" loading={btnLoading}>登录</Button>
+ </Form.Item>
+ </Form>
+
+ </div>
+ </div>
+ <div className="login-div-bottom">2011 10215489广州恒巨信息科技有限公司 版权所有 - 粤ICP备10215489号</div>
+ </div>
+
</div>
);
}
--
Gitblit v1.8.0