From 4745a3b2804301403431d168fb98b6991a25ae73 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Thu, 25 Jul 2019 10:00:55 +0800
Subject: [PATCH] 40px

---
 .../modules/user/account/AccountBasicEdit.js  |  6 ++--
 .../src/modules/user/account/AccountSecure.js |  6 ++--
 .../react/src/modules/user/account/common.css | 30 +++++++++++++++++++
 3 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/public/react/src/modules/user/account/AccountBasicEdit.js b/public/react/src/modules/user/account/AccountBasicEdit.js
index 9a37f866e..1755ca365 100644
--- a/public/react/src/modules/user/account/AccountBasicEdit.js
+++ b/public/react/src/modules/user/account/AccountBasicEdit.js
@@ -448,9 +448,7 @@ class AccountBasic extends Component {
             .basicForm .cancelBtn {
               margin-left: 0px;
             }
-            .basicForm .ant-input-lg {
-              height: 32px;
-            }
+
             .basicForm .ant-form-item-label {
               width: 100px;
               padding-right: 10px;
@@ -576,6 +574,7 @@ class AccountBasic extends Component {
                 <Form.Item
                 label=""
                 className="formItemInline fl"
+                style={{ 'margin-top': '3px'}}
                 // style={{display:identity && identity=="student" ? "block":"none"}}
               >
                 {getFieldDecorator('student_No', {
@@ -680,6 +679,7 @@ class AccountBasic extends Component {
             <Form.Item
               label="院系/部门"
               className="formItemInline mb0"
+              style={{ 'margin-top': '10px'}}
             >
               {getFieldDecorator('org2', {
                 rules: [{
diff --git a/public/react/src/modules/user/account/AccountSecure.js b/public/react/src/modules/user/account/AccountSecure.js
index 29abf22e4..e5b03e36b 100644
--- a/public/react/src/modules/user/account/AccountSecure.js
+++ b/public/react/src/modules/user/account/AccountSecure.js
@@ -335,7 +335,7 @@ class AccountSecure extends Component {
                 </Button>
               </Form.Item>
 
-              <div className="mb20" style={{ marginLeft: '118px' }}>
+              <div className="mb20" style={{ marginLeft: '204px' }}>
                 <Button type="primary" onClick={this.onPhoneSubmit}>确定</Button>
                 <Button type="primary grayBtn" style={{ marginLeft: '20px'}} onClick={this.hideUpdating}>取消</Button>
               </div>
@@ -398,7 +398,7 @@ class AccountSecure extends Component {
                 { !secondsFlag ? "获取验证码":`重新发送${seconds}s`}</Button>
               </Form.Item>
 
-              <div className="mb20" style={{ marginLeft: '118px' }}>
+              <div className="mb20" style={{ marginLeft: '204px' }}>
                 <Button type="primary" onClick={this.onEmailSubmit}>确定</Button>
                 <Button type="primary grayBtn" style={{ marginLeft: '20px'}} onClick={this.hideUpdating}>取消</Button>
               </div>
@@ -471,7 +471,7 @@ class AccountSecure extends Component {
                 )}
               </Form.Item>
 
-              <div className="mb20" style={{ marginLeft: '118px' }}>
+              <div className="mb20" style={{ marginLeft: '204px' }}>
                 <Button type="primary" onClick={this.onPasswordSubmit}>确定</Button>
                 <Button type="primary grayBtn" style={{ marginLeft: '20px'}} onClick={this.hideUpdating}>取消</Button>
               </div>
diff --git a/public/react/src/modules/user/account/common.css b/public/react/src/modules/user/account/common.css
index 113b39e07..908948710 100644
--- a/public/react/src/modules/user/account/common.css
+++ b/public/react/src/modules/user/account/common.css
@@ -51,3 +51,33 @@ button.ant-btn.ant-btn-primary.grayBtn {
     .basicForm .ant-form-item-label label {
       color: #979797
     } */
+
+
+.basicForm .ant-select-show-search {
+  height: 40px;
+}
+.basicForm .ant-select-auto-complete.ant-select .ant-input {
+  height: 40px;
+}
+.basicForm .ant-select-search__field__mirror {
+  height: 40px;
+}
+.basicForm .ant-input-lg {
+  height: 40px;
+}
+.basicForm .ant-select-selection--single {
+  height: 40px;
+}
+.basicForm .ant-select-auto-complete.ant-select .ant-select-selection--single {
+  height: 40px
+}
+.basicForm .ant-input-affix-wrapper {
+  height: 40px;
+}
+/* 职业 */
+.basicForm .ant-select-selection-selected-value {
+  line-height: 38px
+}
+.basicForm input {
+  height: 40px;
+}
\ No newline at end of file