From 2d899ba5439da3714670ff097c7b424405b721b0 Mon Sep 17 00:00:00 2001 From: qitmac000249 Date: Thu, 27 Jul 2017 18:19:17 +0800 Subject: [PATCH 1/2] fix: style --- client/containers/User/index.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/containers/User/index.scss b/client/containers/User/index.scss index d33d83ef..4dad995c 100644 --- a/client/containers/User/index.scss +++ b/client/containers/User/index.scss @@ -90,7 +90,7 @@ } .ant-col-12{ .ant-input{ - width: 70%; + width: 60%; margin-right: 24px; } } From 296faec3beb887c63fb3f0d059bbca26496b8575 Mon Sep 17 00:00:00 2001 From: "wenbo.dong" Date: Thu, 27 Jul 2017 19:08:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?opti:=20=E4=B8=AA=E4=BA=BA=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E9=A1=B5=E6=A0=B7=E5=BC=8F=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/containers/User/LeftMenu.js | 6 ++--- client/containers/User/Profile.js | 26 ++++++++++----------- client/containers/User/index.scss | 37 ++++++++++++------------------ 3 files changed, 31 insertions(+), 38 deletions(-) diff --git a/client/containers/User/LeftMenu.js b/client/containers/User/LeftMenu.js index 7b919d6d..bea84f33 100644 --- a/client/containers/User/LeftMenu.js +++ b/client/containers/User/LeftMenu.js @@ -39,7 +39,7 @@ class LeftMenu extends Component { this.interval = setInterval(() => { if (this.searchSign === this._searchSign) { this.interval = clearInterval(this.interval) - axios.get('/user/search?q=' + value).then((res) => { + axios.get('/user/search?q=' + value).then((res) => { if (res.data.errcode === 0) { this.setState({ dataSource: res.data.data @@ -103,7 +103,7 @@ class LeftMenu extends Component { - + {content} @@ -111,4 +111,4 @@ class LeftMenu extends Component { } } -export default LeftMenu \ No newline at end of file +export default LeftMenu diff --git a/client/containers/User/Profile.js b/client/containers/User/Profile.js index ef276f50..859a0bbf 100644 --- a/client/containers/User/Profile.js +++ b/client/containers/User/Profile.js @@ -22,7 +22,7 @@ class Profile extends Component { } } - + } componentDidMount(){ @@ -51,7 +51,7 @@ class Profile extends Component { let value = this.state._userinfo[name]; let params = {uid: state.userinfo.uid} params[name] = value; - + axios.post('/user/update', params).then( (res)=>{ let data = res.data; if(data.errcode === 0){ @@ -66,7 +66,7 @@ class Profile extends Component { }else{ message.error(data.errmsg) } - + }, (err) => { message.error(err.message) } ) @@ -104,8 +104,8 @@ class Profile extends Component { password: password, old_password: old_password } - - + + axios.post('/user/change_password', params).then( (res)=>{ let data = res.data; if(data.errcode === 0){ @@ -114,11 +114,11 @@ class Profile extends Component { }else{ message.error(data.errmsg) } - + }, (err) => { message.error(err.message) } ) - + } render() { @@ -138,8 +138,8 @@ class Profile extends Component { userNameEditHtml =
- - + +
} @@ -154,8 +154,8 @@ class Profile extends Component { emailEditHtml =
- - + +
} @@ -182,8 +182,8 @@ class Profile extends Component { - - + + } diff --git a/client/containers/User/index.scss b/client/containers/User/index.scss index 4dad995c..758ed777 100644 --- a/client/containers/User/index.scss +++ b/client/containers/User/index.scss @@ -22,7 +22,7 @@ .user-list { box-shadow: 0 2px 4px 0 rgba(0,0,0,0.20); background: #FFF; - border-radius:5px; + border-radius:4px; margin-top: 15px; .search{ padding: 5px; @@ -34,13 +34,13 @@ } } .user-name{ - padding: 24px 10px; + padding: .24rem; // text-align: center; background-color: #34495e; color: white; font-size: 16px; - border-top-left-radius:5px; - border-top-right-radius: 5px; + border-top-left-radius: 4px; + border-top-right-radius: 4px; span{ margin-right: 5px; } @@ -51,8 +51,7 @@ .user-table { -webkit-box-flex: 1; padding: 24px; - margin-left: 15px; - border-radius:5px; + border-radius: 4px; box-shadow: 0 2px 4px 0 rgba(0,0,0,0.20); background: #FFF; margin-top: 15px; @@ -69,19 +68,18 @@ .user-profile { -webkit-box-flex: 1; margin-top: 15px; - margin-left: 15px; padding: 24px; box-shadow: 0 2px 4px 0 rgba(0,0,0,0.20); background: #FFF; - border-radius:5px; + border-radius: .04rem; .user-item { min-height:35px; line-height:35px; margin: 5px; margin-left: 0px; - margin-bottom:10px; + margin-bottom: 16px; border-bottom: 1px solid #f1f3f6; - padding-bottom: 10px; + padding-bottom: 16px; #old_password,#password,#verify_pass{ margin-top: 20px; } @@ -91,15 +89,15 @@ .ant-col-12{ .ant-input{ width: 60%; - margin-right: 24px; + margin-right: 16px; } } .ant-col-4{ color: rgba(0,0,0,0.85); - padding: 0px 10px; + padding: 0px 16px; text-indent: .7em; // background-color: #f1f3f6; - border-left: 5px solid #f1f3f6; + border-left: 4px solid #f1f3f6; margin-right: 30px; } .text{ @@ -110,16 +108,11 @@ color: #657289; cursor: pointer } - - // .edit-buttons{ - // margin:10px; - // } - - // .edit-button{ - // margin: 5px; - // } } } - + .user-nav { + border-bottom-left-radius: .04rem; + border-bottom-right-radius: .04rem; + } }