Commit 252adbfc2bfcbdd537abb4bcf24428688c5d7f86

Authored by zhangzzzz
1 parent e5678ff6

优化首页样式;

src/components/login/Login.css
@@ -28,6 +28,7 @@ @@ -28,6 +28,7 @@
28 line-height: 36px; 28 line-height: 36px;
29 font-weight: 700; 29 font-weight: 700;
30 color: #eda716; 30 color: #eda716;
  31 + margin: 0.67em 0 !important;
31 } 32 }
32 33
33 .header .logo h1 span { 34 .header .logo h1 span {
@@ -110,7 +111,7 @@ @@ -110,7 +111,7 @@
110 .loginForm_mode{ 111 .loginForm_mode{
111 position: absolute; 112 position: absolute;
112 width: 330px; 113 width: 330px;
113 - height: 380px; 114 + height: 320px;
114 padding: 0 27px; 115 padding: 0 27px;
115 /*top: 2%;*/ 116 /*top: 2%;*/
116 right: 5%; 117 right: 5%;
@@ -121,7 +122,7 @@ @@ -121,7 +122,7 @@
121 box-shadow: 2px 2px 3px rgba(214, 214, 214, .9); 122 box-shadow: 2px 2px 3px rgba(214, 214, 214, .9);
122 } 123 }
123 .loginForm_face{ 124 .loginForm_face{
124 - height: 487px; 125 + height: 437px;
125 } 126 }
126 127
127 .loginForm_face .normalLogin{ 128 .loginForm_face .normalLogin{
@@ -138,7 +139,7 @@ @@ -138,7 +139,7 @@
138 } 139 }
139 140
140 .loginMiddle { 141 .loginMiddle {
141 - height: 195px; 142 + height: 125px;
142 } 143 }
143 144
144 .loginTip { 145 .loginTip {
src/components/login/Login.js
@@ -3,20 +3,14 @@ import { LockOutlined, UserOutlined } from '@ant-design/icons'; @@ -3,20 +3,14 @@ import { LockOutlined, UserOutlined } from '@ant-design/icons';
3 import { Form } from '@ant-design/compatible'; 3 import { Form } from '@ant-design/compatible';
4 import '@ant-design/compatible/assets/index.css'; 4 import '@ant-design/compatible/assets/index.css';
5 import { Input, Button, Select, message, Radio } from 'antd-v4'; 5 import { Input, Button, Select, message, Radio } from 'antd-v4';
6 -import { FloatButton } from 'antd';  
7 -import commonConfig from '../../utils/config';  
8 -import * as commonServices from '../../services/services';  
9 -import * as commonFunc from '../../components/Common/commonFunc'; 6 +import commonConfig from '@/utils/config';
  7 +import * as commonServices from '@/services/services';
  8 +import * as commonFunc from '@/components/Common/commonFunc';
10 import logo from '@/assets/foot_logo.png'; 9 import logo from '@/assets/foot_logo.png';
11 -import * as commonUtils from '../../utils/utils'; 10 +import * as commonUtils from '@/utils/utils';
12 import styles from './Login.css'; 11 import styles from './Login.css';
13 import FaceDetect from '../FaceDetect'; 12 import FaceDetect from '../FaceDetect';
14 13
15 -  
16 -const AppComponent = () => {  
17 - return <FloatButton/>  
18 -}  
19 -  
20 const FormItem = Form.Item; 14 const FormItem = Form.Item;
21 const { Option } = Select; 15 const { Option } = Select;
22 16
@@ -370,7 +364,6 @@ class LoginForm extends Component { @@ -370,7 +364,6 @@ class LoginForm extends Component {
370 364
371 return ( 365 return (
372 <div className={styles.wraper}> 366 <div className={styles.wraper}>
373 - <AppComponent />  
374 <div className={styles.header}> 367 <div className={styles.header}>
375 <div className={styles.logo}> 368 <div className={styles.logo}>
376 <h1>{XiaoLingYang}<span>{WelcometoERP}</span></h1> 369 <h1>{XiaoLingYang}<span>{WelcometoERP}</span></h1>
@@ -416,14 +409,14 @@ class LoginForm extends Component { @@ -416,14 +409,14 @@ class LoginForm extends Component {
416 {/* rules: [{ required: true, message: pleaseInputPassword }],*/} 409 {/* rules: [{ required: true, message: pleaseInputPassword }],*/}
417 {/* })(<Input className={styles.loginInput} size="large" prefix={<LockOutlined className={styles.loginIcon} />} type="password" placeholder={pleaseInputPassword} />)}*/} 410 {/* })(<Input className={styles.loginInput} size="large" prefix={<LockOutlined className={styles.loginIcon} />} type="password" placeholder={pleaseInputPassword} />)}*/}
418 {/*</FormItem>*/} 411 {/*</FormItem>*/}
419 - <FormItem className={styles.loginTip}> 412 + {/* <FormItem className={styles.loginTip}>
420 <div className={styles.loginSelect}> 413 <div className={styles.loginSelect}>
421 {getFieldDecorator('companys', { 414 {getFieldDecorator('companys', {
422 initialValue: companysId, 415 initialValue: companysId,
423 rules: [{ required: true, message: chooseBranchCompany }], 416 rules: [{ required: true, message: chooseBranchCompany }],
424 })(<Select placeholder={chooseBranchCompany} size="large" dropdownStyle={dropdownStyle} onSelect={this.handleSelect}>{options}</Select>)} 417 })(<Select placeholder={chooseBranchCompany} size="large" dropdownStyle={dropdownStyle} onSelect={this.handleSelect}>{options}</Select>)}
425 </div> 418 </div>
426 - </FormItem> 419 + </FormItem> */}
427 </div> 420 </div>
428 <FormItem className={styles.loginBottom}> 421 <FormItem className={styles.loginBottom}>
429 <Button type="primary" htmlType="submit" className={styles.loginButton} loading={loginLoading}> 422 <Button type="primary" htmlType="submit" className={styles.loginButton} loading={loginLoading}>