diff --git a/src/components/Login/LoginItem.js b/src/components/Login/LoginItem.js index cc32ec1d547a200f3aa32cd671f6305b05b46e47..0f45a7fddee20463eec7014b74928e445cae58f6 100644 --- a/src/components/Login/LoginItem.js +++ b/src/components/Login/LoginItem.js @@ -1,5 +1,6 @@ import React, { Component } from 'react'; import { Form, Input, Button, Row, Col } from 'antd'; +import { formatMessage } from 'umi/locale'; import omit from 'omit.js'; import styles from './index.less'; import ItemMap from './map'; @@ -9,7 +10,8 @@ const FormItem = Form.Item; class WrapFormItem extends Component { static defaultProps = { - buttonText: '获取验证码', + getCaptchaButtonText: formatMessage({ id: 'form.captcha' }), + getCaptchaSecondText: formatMessage({ id: 'form.captcha.second' }), }; constructor(props) { @@ -83,7 +85,8 @@ class WrapFormItem extends Component { defaultValue, rules, name, - buttonText, + getCaptchaButtonText, + getCaptchaSecondText, updateActive, type, ...restProps @@ -108,7 +111,7 @@ class WrapFormItem extends Component { size="large" onClick={this.onGetCaptcha} > - {count ? `${count} s` : buttonText} + {count ? `${count} ${getCaptchaSecondText}` : getCaptchaButtonText} diff --git a/src/components/Login/index.less b/src/components/Login/index.less index 995b68d27a2795e2371a963228e32023fd6d38b2..646b6631d2b771e6f09332e62f310230715e462b 100644 --- a/src/components/Login/index.less +++ b/src/components/Login/index.less @@ -13,6 +13,11 @@ } } + .getCaptcha { + display: block; + width: 100%; + } + .icon { font-size: 24px; color: rgba(0, 0, 0, 0.2); diff --git a/src/layouts/UserLayout.less b/src/layouts/UserLayout.less index 0e1ff2f053db3e695d71a20a572db125ef1e01bb..5eb257a442db44cc5abfbecdb8db76f94d8d08d6 100644 --- a/src/layouts/UserLayout.less +++ b/src/layouts/UserLayout.less @@ -32,7 +32,7 @@ } .content { - padding: 72px 0 24px 0; + padding: 32px 0 24px 0; } } diff --git a/src/locales/en-US.js b/src/locales/en-US.js index 3bb7a89bbfcf53433c43ab1717676953e0ff5944..fcc702c0269ec1f39effa1df60e95be5c9da46f7 100644 --- a/src/locales/en-US.js +++ b/src/locales/en-US.js @@ -20,6 +20,8 @@ export default { 'validation.date.required': 'Please select the start and end date', 'validation.goal.required': 'Please enter a description of the goal', 'validation.standard.required': 'Please enter a metric', + 'form.captcha': 'Get Captcha', + 'form.captcha.second': 'sec', 'form.optional': ' (optional) ', 'form.submit': 'Submit', 'form.save': 'Save', diff --git a/src/locales/pt-BR.js b/src/locales/pt-BR.js index 241600f53d47687124905b254901ce70afc65f91..f4677986c34bc7412380a137ca3b7aae81045628 100644 --- a/src/locales/pt-BR.js +++ b/src/locales/pt-BR.js @@ -16,6 +16,8 @@ export default { 'validation.phone-number.required': 'Por favor insira seu telefone!', 'validation.phone-number.wrong-format': 'Formato de telefone errado!', 'validation.verification-code.required': 'Por favor insira seu código de verificação!', + 'form.captcha': 'Get Captcha', + 'form.captcha.second': 'sec', 'form.email.placeholder': 'Email', 'form.password.placeholder': 'Senha', 'form.confirm-password.placeholder': 'Confirme a senha', diff --git a/src/locales/zh-CN.js b/src/locales/zh-CN.js index 376d3cb9a853c19fff4f400d30eeb9c77fdff5d7..d34cd2879c5d04e44f3c3c6a9a5b188e4e5fa43a 100644 --- a/src/locales/zh-CN.js +++ b/src/locales/zh-CN.js @@ -19,6 +19,8 @@ export default { 'validation.date.required': '请选择起止日期', 'validation.goal.required': '请输入目标描述', 'validation.standard.required': '请输入衡量标准', + 'form.captcha': '获取验证码', + 'form.captcha.second': '秒', 'form.optional': '(选填)', 'form.submit': '提交', 'form.save': '保存', diff --git a/src/locales/zh-TW.js b/src/locales/zh-TW.js index 56cef40de4087e6ca5c5079615ebb524f0adba0f..863dda85c5bda6480b55c622c8c507a09fecb4e6 100644 --- a/src/locales/zh-TW.js +++ b/src/locales/zh-TW.js @@ -19,6 +19,8 @@ export default { 'validation.date.required': '請選擇起止日期', 'validation.goal.required': '請輸入目標描述', 'validation.standard.required': '請輸入衡量標淮', + 'form.captcha': '獲取驗證碼', + 'form.captcha.second': '秒', 'form.optional': '(選填)', 'form.submit': '提交', 'form.save': '保存',