From deb85bd81cf9c856dd27b74b448ca9b73efe76ae Mon Sep 17 00:00:00 2001
From: qitmac000249 <xilli.yu@Qunar.com>
Date: Thu, 27 Jul 2017 15:17:46 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=BC=B9=E5=87=BA=E6=A1=86=E6=96=87=E6=9C=AC=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/containers/User/List.js    |  2 +-
 client/containers/User/Profile.js |  4 ++--
 client/containers/User/index.scss |  5 +++++
 config.json                       | 20 ++++++++++++++++++++
 4 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 config.json

diff --git a/client/containers/User/List.js b/client/containers/User/List.js
index 2ae46fe5..15567696 100755
--- a/client/containers/User/List.js
+++ b/client/containers/User/List.js
@@ -108,7 +108,7 @@ class List extends Component {
           <span>            
             <Link to={"/user/profile/" + item._id} >查看</Link>
             <span className="ant-divider" />
-            <Popconfirm placement="leftTop" title="确认删除此用户?"  onConfirm={() => {this.confirm(item._id)}} okText="Yes" cancelText="No">
+            <Popconfirm title="确认删除此用户?"  onConfirm={() => {this.confirm(item._id)}} okText="确定" cancelText="取消">
               <a href="#">删除</a>
             </Popconfirm>
           </span>
diff --git a/client/containers/User/Profile.js b/client/containers/User/Profile.js
index 3a256867..7030d60f 100644
--- a/client/containers/User/Profile.js
+++ b/client/containers/User/Profile.js
@@ -138,8 +138,8 @@ class Profile extends Component {
       userNameEditHtml = <div>
         <Input value={_userinfo.username} name="username" onChange={this.changeUserinfo} placeholder="用户名"  />
         <ButtonGroup className="edit-buttons" >
-          <Button size={'small'} className="edit-button" onClick={() => { this.handleEdit('usernameEdit', false) }} >Cancel</Button>
-          <Button size={'small'} className="edit-button" onClick={ () => { this.updateUserinfo('username')} } type="primary">OK</Button>
+          <Button  className="edit-button" onClick={() => { this.handleEdit('usernameEdit', false) }} >Cancel</Button>
+          <Button  className="edit-button" onClick={ () => { this.updateUserinfo('username')} } type="primary">OK</Button>
         </ButtonGroup>
       </div>
     }
diff --git a/client/containers/User/index.scss b/client/containers/User/index.scss
index 75cbbb3b..5bbb3b9b 100644
--- a/client/containers/User/index.scss
+++ b/client/containers/User/index.scss
@@ -87,6 +87,11 @@
       #old_password{
         margin-top: 0px;
       }
+      .ant-col-12{
+        .ant-input{
+          width: 70%;
+        }
+      }
       .ant-col-4{
         color: black;
         padding: 0px 10px;
diff --git a/config.json b/config.json
new file mode 100644
index 00000000..be5bd2aa
--- /dev/null
+++ b/config.json
@@ -0,0 +1,20 @@
+{
+"port": "3000",
+"webhost": "yapi.local.qunar.com",
+"adminAccount": "admin@admin.com",
+"db": {
+"servername": "10.86.40.194",
+"DATABASE": "yapi",
+"port": 27017,
+"user": "test1",
+"pass": "test1"
+},
+"mail": {
+"host": "smtp.163.com",
+"port": 465,
+"auth": {
+"user": "hellosean1025@163.com",
+"pass": "helloqunar123"
+}
+}
+}
\ No newline at end of file