From e9bb80ce02dd8787d5c6fa5cdeac651c1cc573b5 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Thu, 18 Jul 2019 15:28:39 +0800
Subject: [PATCH] css

---
 public/react/src/modules/user/account/AccountBasicEdit.js | 8 +++++++-
 public/react/src/modules/user/account/common.css          | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/public/react/src/modules/user/account/AccountBasicEdit.js b/public/react/src/modules/user/account/AccountBasicEdit.js
index 4d2511b38..0e0cd06ea 100644
--- a/public/react/src/modules/user/account/AccountBasicEdit.js
+++ b/public/react/src/modules/user/account/AccountBasicEdit.js
@@ -333,9 +333,12 @@ class AccountBasic extends Component {
               font-size: 14px;
             }
             .basicForm .saveBtn {
-              width: 120px;
+              width: 100px;
               margin-left: 100px;
             }
+            .basicForm .cancelBtn {
+              margin-left: 0px;
+            }
             .basicForm .ant-input-lg {
               height: 32px;
             }
@@ -583,6 +586,9 @@ class AccountBasic extends Component {
             {/* <Form.Item>
               <div className="clearfix mt30 mb30"> */}
                 <Button type="primary" onClick={this.handleSubmit} size="middle" className="saveBtn mr20 mt30">{"保存"}</Button>
+
+                {this.props.basicInfo.base_info_completed && 
+                  <Button type="" onClick={() => { this.props.history.push('/account/profile') }} size="middle" className="saveBtn cancelBtn mr20 mt30">{"取消"}</Button>}
               {/* </div>
             </Form.Item> */}
           </Form>
diff --git a/public/react/src/modules/user/account/common.css b/public/react/src/modules/user/account/common.css
index 90f45b6b0..d84686f59 100644
--- a/public/react/src/modules/user/account/common.css
+++ b/public/react/src/modules/user/account/common.css
@@ -66,7 +66,7 @@ button.ant-btn.ant-btn-primary.grayBtn {
     padding-bottom: 30px;
     margin-bottom:30px;
     margin-right:20px;
-    max-height:430px;
+    height:418px;
   }
   .accountInfo { 
     text-align: center;