diff --git a/public/react/src/modules/user/LoginRegisterComponent.js b/public/react/src/modules/user/LoginRegisterComponent.js index 03dbdb9e5..abacdc57c 100644 --- a/public/react/src/modules/user/LoginRegisterComponent.js +++ b/public/react/src/modules/user/LoginRegisterComponent.js @@ -23,6 +23,9 @@ const loginInputsyl = { class LoginRegisterComponent extends Component { constructor(props) { super(props) + + + // // console.log("LoginRegisterComponent"); // console.log("29"); // console.log(props.loginstatus); @@ -183,15 +186,6 @@ class LoginRegisterComponent extends Component { //是否验证通过 dragOkCallback = () => { console.log(this.state.logins); - if(this.state.logins===""||this.state.logins.length===0){ - this.setState({ - Phonenumberisnotco:"账号不能为空", - Phonenumberisnotcobool: true, - dragOk:false, - Whethertoverify:this.state.Whethertoverify===true?false:true, - }) - return - } this.Emailphonenumberverification(this.state.logins, 2) } @@ -199,10 +193,8 @@ class LoginRegisterComponent extends Component { //是否同意 onChange = (e) => { - this.setState({ Agreetotheterms: e.target.checked, - Phonenumberisnotcosyfwtk:undefined, }) } @@ -244,12 +236,30 @@ class LoginRegisterComponent extends Component { } //注册接口 postregistered = () => { + // if (this.state.logins === undefined || this.state.logins === "") { + // this.openNotification(`请输入登录手机号码或邮箱`,2); + // + // return + // } else if (this.state.dragOk === false) { + // this.openNotification(`请拖动滑块验证`,2); + // return + // } else if (this.state.codes === undefined || this.state.codes == "") { + // this.openNotification(`请输入验证码`,2); + // return + // } else if (this.state.passwords === undefined || this.state.passwords == "") { + // this.openNotification(`请输入密码`,2); + // return + // } else if (this.state.Agreetotheterms === false) { + // this.openNotification(`请同意服务协议条款`,2); + // return; + // } if (this.state.logins === undefined || this.state.logins === ""||this.state.logins.length===0) { this.setState({ Phonenumberisnotcos:"账号不能为空", }) return } else if (this.state.dragOk === false) { + // this.openNotification(`请拖动滑块完成验证`,2); this.setState({ Phonenumberisnotcosytdhk:"请拖动滑块完成验证", }) @@ -266,9 +276,7 @@ class LoginRegisterComponent extends Component { }) return } else if (this.state.Agreetotheterms === false) { - this.setState({ - Phonenumberisnotcosyfwtk:"请同意服务协议条款", - }) + this.openNotification(`请同意服务协议条款`,2); return; } var url = "/accounts/register.json"; @@ -284,13 +292,13 @@ class LoginRegisterComponent extends Component { Phonenumberisnotcosyzm:"验证码不正确", }) - return; + return; }else if(result.data.message==="验证码已失效"){ this.setState({ Phonenumberisnotcosyzm:"验证码不正确", }) - return; + return; } }else { this.setState({ @@ -612,11 +620,9 @@ class LoginRegisterComponent extends Component { dragOk, Whethertoverify, classpassbool, + Phonenumberisnotcosytdhk, Phonenumberisnotcosyzm, Phonenumberisnotcosymmm, - Phonenumberisnotcosytdhk, - Phonenumberisnotcosyfwtk, - Phonenumberisnotcobool, // 注册 readAgreement, } = this.state @@ -710,40 +716,19 @@ class LoginRegisterComponent extends Component { size={"large"}>登录 } - + { parseInt(tab[0])==1 &&
- { - Phonenumberisnotcos && Phonenumberisnotcos != "" ? + Phonenumberisnotcos && Phonenumberisnotcos !== "" ?

{Phonenumberisnotcos}

@@ -753,7 +738,7 @@ class LoginRegisterComponent extends Component { { Whethertoverify===false? @@ -764,7 +749,7 @@ class LoginRegisterComponent extends Component { { Whethertoverify===true? @@ -772,8 +757,8 @@ class LoginRegisterComponent extends Component { "" } { - Phonenumberisnotcosytdhk && Phonenumberisnotcosytdhk != "" ? -

+ Phonenumberisnotcosytdhk && Phonenumberisnotcosytdhk !== "" ? +

{Phonenumberisnotcosytdhk}

:
@@ -781,38 +766,44 @@ class LoginRegisterComponent extends Component { } -
- - - { - getverificationcodes === undefined ? - - : getverificationcodes === true ? - - : - - } +
+ + + + { + getverificationcodes === undefined ? + + : getverificationcodes === true ? + + : + + } +
+
+ { + Phonenumberisnotcosyzm && Phonenumberisnotcosyzm !== "" ? +

+ {Phonenumberisnotcosyzm} +

+ :
+ }
- { - Phonenumberisnotcosyzm && Phonenumberisnotcosyzm != "" ? -

- {Phonenumberisnotcosyzm} -

- :
- } + - }> { - Phonenumberisnotcosymmm && Phonenumberisnotcosymmm!== "" ? -

+ Phonenumberisnotcosymmm && Phonenumberisnotcosymmm !== "" ? +

{Phonenumberisnotcosymmm}

- : "" + :
} 我已阅读并同意服务协议条款 - { - Phonenumberisnotcosyfwtk && Phonenumberisnotcosyfwtk!== "" ? -

- {Phonenumberisnotcosyfwtk} -

- : "" - - } - diff --git a/public/react/src/modules/user/common.css b/public/react/src/modules/user/common.css index 0cbf13364..9d101044b 100644 --- a/public/react/src/modules/user/common.css +++ b/public/react/src/modules/user/common.css @@ -164,4 +164,85 @@ } .yslgouxuanimg2{ height: 20px; +} + +.yslbutondls{ + display: flex; + flex-direction:row; +} +。yslinpulsy input{ + +} +.loginInputzhuche{ + width: 100%; + background-color: #fff!important; + height: 45px !important; + padding: 5px; + +} +.loginInputzhucheyslass { + width: 100%; + background-color: #fff!important; + height: 45px !important; + padding: 5px; + +} +.loginInputzhucheyslass .ant-input{ + width: 100%; + background-color: #fff!important; + height: 45px !important; + padding: 5px; + position: relative; + right: 5px; + width: 103%; + border: 1px solid #FF0000!important; + border-radius: 4px; + border-top-left-radius: 4px; + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; + border-bottom-left-radius: 4px; +} +.loginInputzhucheyslass .ant-input:hover{ + border: 1px solid #FF0000!important; + +} +.loginInputzhuche .ant-input{ + width: 100%; + background-color: #fff!important; + height: 45px !important; + padding: 5px; + position: relative; + right: 5px; + width: 103%; +} + +.loginInputzhucheysl{ + width: 100%; + background-color: #fff!important; + height: 45px !important; + padding: 5px; + border-radius: 4px; + border-top-left-radius: 4px; + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; + border-bottom-left-radius: 4px; + +} +.loginInputzhucheysl .ant-input{ + width: 100%; + background-color: #fff!important; + height: 45px !important; + padding: 5px; + position: relative; + right: 5px; + width: 103%; + border: 1px solid #FF0000!important; + border-radius: 4px; + border-top-left-radius: 4px; + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; + border-bottom-left-radius: 4px; +} +.loginInputzhucheysl .ant-input:hover{ + border: 1px solid #FF0000!important; } \ No newline at end of file