diff --git a/src/components/Result/index.less b/src/components/Result/index.less index 6cebc9da637a125ef2d3421e0645fe0e23a8ba17..68652a9ebea4c0b103d68ff7f00d6ba4c89cb5a9 100644 --- a/src/components/Result/index.less +++ b/src/components/Result/index.less @@ -24,24 +24,28 @@ color: @heading-color; font-weight: 500; line-height: 32px; - margin-bottom: 8px; + margin-bottom: 16px; } .description { font-size: 14px; color: @text-color-secondary; - margin-bottom: 16px; + margin-bottom: 24px; } .extra { background: rgba(245, 245, 245, 0.5); padding: 16px 40px; - margin-bottom: 24px; + margin-top: 24px; border-radius: @border-radius-sm; text-align: left; } - .actions button:not(:last-child) { - margin-right: 8px; + .actions { + margin-top: 32px; + + button:not(:last-child) { + margin-right: 8px; + } } } diff --git a/src/layouts/UserLayout.less b/src/layouts/UserLayout.less index 1a66afc5810d5bc99a9e26ee216c4da7fbd8abc6..e245a390646bd7378fa9708cfa34cd33e8b6726a 100644 --- a/src/layouts/UserLayout.less +++ b/src/layouts/UserLayout.less @@ -1,13 +1,13 @@ @import "~antd/lib/style/themes/default.less"; .container { - background: @background-color-base; - background-image: url('https://gw.alipayobjects.com/zos/rmsportal/bOjjckIwLKuWCswKAghg.svg'); + background: #f0f2f5; + background-image: url('https://gw.alipayobjects.com/zos/rmsportal/TVYTbAXWheQpRcWDaDMu.svg'); width: 100%; min-height: 100%; background-repeat: no-repeat; background-position: center; - background-size: 85%; + background-size: 100%; padding: 110px 0 144px 0; position: relative; } @@ -27,7 +27,7 @@ .logo { height: 44px; vertical-align: top; - margin-right: 12px; + margin-right: 16px; } .title { @@ -39,7 +39,7 @@ } .desc { - font-size: @font-size-lg; + font-size: @font-size-base; color: @text-color-secondary; margin-top: 12px; margin-bottom: 40px; diff --git a/src/routes/User/Login.js b/src/routes/User/Login.js index 3866513004de9bedd2e5037a77a101379011e6b3..dc441ea10aa75dbc2c6f63ee751f452e00a39088 100644 --- a/src/routes/User/Login.js +++ b/src/routes/User/Login.js @@ -63,7 +63,7 @@ export default class Login extends Component { renderMessage = (message) => { return ( } placeholder="admin" /> @@ -105,6 +106,7 @@ export default class Login extends Component { }], })( } type="password" placeholder="888888" @@ -128,6 +130,7 @@ export default class Login extends Component { }], })( } placeholder="手机号" /> @@ -167,10 +170,10 @@ export default class Login extends Component { valuePropName: 'checked', initialValue: true, })( - 自动登录 + 自动登录 )} 忘记密码 - diff --git a/src/routes/User/Login.less b/src/routes/User/Login.less index c6a1d63da2f69f0c402d8b1c86ca3c5f06131b0c..fb318b91aed4127ca6d2ad9f07983a7e4af5a2d1 100644 --- a/src/routes/User/Login.less +++ b/src/routes/User/Login.less @@ -17,7 +17,7 @@ } .ant-form-item { - margin-bottom: 16px; + margin-bottom: 24px; } } @@ -35,7 +35,13 @@ .submit { width: 100%; - margin-top: 16px; + margin-top: 24px; + } + + :global { + .ant-form-item-control { + line-height: 22px; + } } } @@ -75,7 +81,7 @@ .other { text-align: left; - margin-top: 32px; + margin-top: 24px; .register { float: right; diff --git a/src/routes/User/Register.js b/src/routes/User/Register.js index 58d60f1b20da7e4d354861f249c092e5a187c2f3..0f9d49cf58291fac50c6f9e8c5b9b9949556c096 100644 --- a/src/routes/User/Register.js +++ b/src/routes/User/Register.js @@ -34,7 +34,7 @@ export default class Register extends Component { componentWillReceiveProps(nextProps) { if (nextProps.register.status === 'ok') { - this.props.dispatch(routerRedux.push('/')); + this.props.dispatch(routerRedux.push('/user/register-result')); } } @@ -154,7 +154,7 @@ export default class Register extends Component { type: 'email', message: '邮箱地址格式错误!', }], })( - + )} @@ -176,6 +176,7 @@ export default class Register extends Component { }], })( @@ -191,24 +192,25 @@ export default class Register extends Component { }], })( )} - - + + {getFieldDecorator('prefix', { initialValue: '86', })( - )} - + {getFieldDecorator('mobile', { rules: [{ required: true, message: '请输入手机号!', @@ -230,12 +232,14 @@ export default class Register extends Component { }], })( )} 使用已有账户登录 diff --git a/src/routes/User/Register.less b/src/routes/User/Register.less index d538f738d9419e935ed521732502f5bfcd23c6cf..a0afad7526b74a7be6e682c160f83c536effe438 100644 --- a/src/routes/User/Register.less +++ b/src/routes/User/Register.less @@ -6,39 +6,30 @@ :global { .ant-form-item { - margin-bottom: 16px; + margin-bottom: 24px; } } h3 { font-size: 16px; - margin-bottom: 16px; + margin-bottom: 20px; } .mobileGroup { :global { .ant-form-item { margin-bottom: 0; - display: table-cell; vertical-align: top; - &:first-child { - width: 20%; - - .ant-select-selection { - border-right-width: 0; - border-top-right-radius: 0; - border-bottom-right-radius: 0; - } + &:first-child .ant-select-selection { + border-right-width: 0; + border-top-right-radius: 0; + border-bottom-right-radius: 0; } - &:last-child { - width: 80%; - - .ant-input { - border-top-left-radius: 0; - border-bottom-left-radius: 0; - } + &:last-child .ant-input { + border-top-left-radius: 0; + border-bottom-left-radius: 0; } } } @@ -55,6 +46,7 @@ .login { float: right; + line-height: @btn-height-lg; } } diff --git a/src/routes/User/RegisterResult.js b/src/routes/User/RegisterResult.js index 99efe2928457e11bdf30ee9083d61879d42de09f..77e4e8a44aaebe61b1898ede744e1a4207c57943 100644 --- a/src/routes/User/RegisterResult.js +++ b/src/routes/User/RegisterResult.js @@ -5,19 +5,17 @@ import Result from '../../components/Result'; const actions = (
- - + +
); export default () => ( -
- -
+ );