diff --git a/public/react/src/modules/user/account/AccountNav.js b/public/react/src/modules/user/account/AccountNav.js
index 1ebbf3355..b0038e43b 100644
--- a/public/react/src/modules/user/account/AccountNav.js
+++ b/public/react/src/modules/user/account/AccountNav.js
@@ -21,6 +21,58 @@ class AccountNav extends Component {
const isSecure = path.indexOf('secure') != -1
return (
+
{
basicInfo && basicInfo.id &&
diff --git a/public/react/src/modules/user/account/AccountSecure.js b/public/react/src/modules/user/account/AccountSecure.js
index 6cff4d901..29abf22e4 100644
--- a/public/react/src/modules/user/account/AccountSecure.js
+++ b/public/react/src/modules/user/account/AccountSecure.js
@@ -35,6 +35,9 @@ class AccountSecure extends Component {
// 获取验证码倒计时
remainTime=()=>{
+ this.setState({
+ seconds: 60
+ })
this.timer = setInterval(() => {
let { seconds } =this.state;
let s = parseInt(seconds)-1;
@@ -53,7 +56,7 @@ class AccountSecure extends Component {
// 获取验证码
getCode=(index)=>{
- let url=`/account/get_verification_code.json`
+ let url=`/accounts/get_verification_code.json`
let login = '';
let values=this.props.form.getFieldsValue();
if(index == 3){
@@ -199,9 +202,11 @@ class AccountSecure extends Component {
InputNewPassword=(rule,value,callback)=>{
const { form } = this.props;
- if (value.length<8 || value.length>12) {
- callback("请输入8-12个字符的新密码,区分大小写!");
- }else {
+ if (!value) {
+ callback("请输入8-16位字符的新密码,区分大小写!");
+ } else if (value.length<8 || value.length>16) {
+ callback("请输入8-16位字符的新密码,区分大小写!");
+ } else {
callback();
}
}
@@ -283,7 +288,7 @@ class AccountSecure extends Component {
:
未绑定
}
- 绑定手机号码,将获得500金币的奖励哟~,手机号码仅自己可见~
+ {basicInfo.phone ? '仅自己可见,可用手机号码登录EduCoder' : '绑定手机号码,将获得500金币的奖励哟~,手机号码仅自己可见~'}
{
updating != PHONE &&
@@ -305,10 +310,10 @@ class AccountSecure extends Component {
rules: [{
// initialValue: this.state.cityDefaultValue,
required: true,
- message: '请输入要绑定的手机号码',
+ message: `请输入要${basicInfo.phone ? '更换' : '绑定'}的手机号码`,
}],
})(
-
+
)}
@@ -442,10 +447,6 @@ class AccountSecure extends Component {
>
{getFieldDecorator('p_new', {
rules: [{
- // initialValue: this.state.cityDefaultValue,
- required: true,
- message: '请输入8~16位的新密码,区分大小写',
- },{
validator:this.InputNewPassword
}],
})(
diff --git a/public/react/src/modules/user/account/common.css b/public/react/src/modules/user/account/common.css
index 6d1207325..113b39e07 100644
--- a/public/react/src/modules/user/account/common.css
+++ b/public/react/src/modules/user/account/common.css
@@ -18,9 +18,7 @@
.flexRow {
display: flex;
}
-.color-green-light{
- color: #45E660!important;
-}
+
.mb15{margin-bottom: 15px!important;}
/* BUTTOn */
.ant-btn {
@@ -53,49 +51,3 @@ button.ant-btn.ant-btn-primary.grayBtn {
.basicForm .ant-form-item-label label {
color: #979797
} */
- .accountInfo {
- text-align: center;
- display: flex;
- flex-direction: column;
- align-items: center;
- }
- .accountInfo .name {
- color: #05101A;
- font-size: 24px;
- height: 36px;
- }
- .accountInfo .role {
- color: #666666;
- font-size: 14px;
- }
- .accountManagement .title {
- color: #05101A;
- font-size: 18px;
- font-weight: 400;
- padding: 10px 28px;
- margin-top: 6px;
- }
- .accountManagement .navItem {
- font-size: 16px;
- padding: 6px 0px;
- padding-left: 30px;
- border-left: 2px solid #fff;
- cursor: pointer;
- color:#4D4D4D;
- }
- .accountManagement .navItem i{
- margin-top: -4px;
- display: inline-block;
- margin-right: 7px;
- }
- .accountManagement .navItem i.status{
- margin-top: 1px;
- margin-right: 24px;
- }
- .accountManagement .navItem.active {
- border-left: 2px solid #4CACFF;
- background: #E6F3FF;
- }
- .accountManagement .navItem.active i:first-child{
- color:#4CACFF!important;
- }
\ No newline at end of file