From f2bac17de29722b00a9560611ebb0286f273a651 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 19 Jul 2019 21:17:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/user/LoginRegisterComponent.js    | 162 ++++++++----------
 public/react/src/modules/user/common.css      |  81 +++++++++
 2 files changed, 154 insertions(+), 89 deletions(-)

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"}>登录</Button>
                         </div>
                     }
-									<style>
-										{
-											`
-											.loginInputzhuche{
-													width: 100%;
-													background-color: #fff!important;
-													height: 45px !important;
-													padding: 5px;
-
-												}
-										 .loginInputzhuche .ant-input{
-													width: 100%;
-													background-color: #fff!important;
-													height: 45px !important;
-													padding: 5px;
-													position: relative;
-													right: 5px;
-													width: 103%;
-												}
-												`
-										}
-									</style>
+
 
                     {
                         parseInt(tab[0])==1 &&
                         <div style={{width: '340px'}}>
-                            <Input className="loginInputsyl color-grey-9 loginInputzhuche" placeholder="请使用手机号/邮箱账号进行注册"
+                            <Input  placeholder="请使用手机号/邮箱账号进行注册"
+                                    className={Phonenumberisnotcos && Phonenumberisnotcos !== "" ?" color-grey-9 loginInputzhucheyslass bor-reds":" color-grey-9 loginInputzhuche"}
                                    value={this.state.logins}
                                    type="text" autoComplete="off"
-
                                    onChange={this.loginInputonChanges}
                                    style={{marginTop: '30px' , height: '38px',color:'#999999',fontSize:"14px"}}></Input>
                             {
-                                Phonenumberisnotcos && Phonenumberisnotcos != "" ?
+                                Phonenumberisnotcos && Phonenumberisnotcos !== "" ?
                                     <p className="color-red  mt5 mb5  " style={{width: " 100%", height: "20px"}}>
                                         <span className="fl" style={{textAlign:"left",width: " 100%"}}>{Phonenumberisnotcos}</span>
                                     </p>
@@ -753,7 +738,7 @@ class LoginRegisterComponent extends Component {
                             {
                                 Whethertoverify===false?
                                   <DragValidator
-                                    height={38} className="loginInput" successGreenColor="#29bd8b"
+                                    height={38}  successGreenColor="#29bd8b"
                                     style={{ height: '38px'}}
                                     dragOkCallback={this.dragOkCallback}
                                   ></DragValidator>
@@ -764,7 +749,7 @@ class LoginRegisterComponent extends Component {
                             {
                                 Whethertoverify===true?
                                 <DragValidatortwo
-                                  height={38} className="loginInput" successGreenColor="#29bd8b"
+                                  height={38}  successGreenColor="#29bd8b"
                                   style={{ height: '38px'}}
                                   dragOkCallback={this.dragOkCallback}
                                 ></DragValidatortwo>
@@ -772,8 +757,8 @@ class LoginRegisterComponent extends Component {
                                 ""
                             }
                             {
-                                Phonenumberisnotcosytdhk && Phonenumberisnotcosytdhk != "" ?
-                                  <p className="color-red  mt5 mb5  " style={{width: " 100%", height: "20px",textAlign:"left"}}>
+                                Phonenumberisnotcosytdhk && Phonenumberisnotcosytdhk !== "" ?
+                                  <p className="color-red  mt5 mb5  " style={{width: " 100%", height: "20px"}}>
                                       <span className="fl" style={{textAlign:"left",width: " 100%"}}>{Phonenumberisnotcosytdhk}</span>
                                   </p>
                                   : <div style={{height:"25px"}}></div>
@@ -781,38 +766,44 @@ class LoginRegisterComponent extends Component {
                             }
 
 
-                            <div className="">
-                                <Input className="fl mr5 font-14 color-grey-9 loginInputzhuche" name="codes" type="text" autoComplete="off" readonly
-                                       onfocus="this.removeAttribute('readonly')" style={{
-                                    width:'210px',
-                                    height:'38px',
-                                }} placeholder="请输入验证码"
-                                       onChange={this.codesonChange}
-                                       value={codes}
-                                >
-                                </Input>
-                                {
-                                    getverificationcodes === undefined ?
-                                        <Button className="fl ml5 font-14" disabled style={{"width": "120px","text-align":"center", "height": "45px",}}
-                                                size={"large"}>重新发送{seconds}s</Button>
-                                        : getverificationcodes === true ?
-                                        <Button className="fl ml5 font-14" type="primary" style={{"width": "120px","text-align":"center", "height": "45px",}}
-                                                onClick={() => this.getverificationcode()} size={"large"}>获取验证码</Button>
-                                        :
-                                        <Button className="fl ml5 font-14 " type="primary" style={{"width": "120px","text-align":"center", "height": "45px",}}
-                                                onClick={() => this.getverificationcode()} size={"large"}>重新发送</Button>
-                                }
+                            <div className="yslbutondls">
+
+                                    <Input
+                                      className={Phonenumberisnotcosyzm && Phonenumberisnotcosyzm !== "" ?" mr5 font-14 color-grey-9 loginInputzhucheyslass bor-reds":" mr5 font-14 color-grey-9 loginInputzhuche"}
+                                      name="codes" type="text" autoComplete="off" readonly
+                                      onfocus="this.removeAttribute('readonly')" style={{
+                                        width:'210px',
+                                        height:'38px',
+                                    }} placeholder="请输入验证码"
+                                      onChange={this.codesonChange}
+                                      value={codes}
+                                    >
+                                    </Input>
+                                    {
+                                        getverificationcodes === undefined ?
+                                          <Button className=" ml5 font-14" disabled style={{"width": "120px","text-align":"center", "height": "45px",}}
+                                                  size={"large"}>重新发送{seconds}s</Button>
+                                          : getverificationcodes === true ?
+                                          <Button className=" ml5 font-14" type="primary" style={{"width": "120px","text-align":"center", "height": "45px",}}
+                                                  onClick={() => this.getverificationcode()} size={"large"}>获取验证码</Button>
+                                          :
+                                          <Button className=" ml5 font-14 " type="primary" style={{"width": "120px","text-align":"center", "height": "45px",}}
+                                                  onClick={() => this.getverificationcode()} size={"large"}>重新发送</Button>
+                                    }
 
+                                </div>
+                            <div>
+                                {
+                                    Phonenumberisnotcosyzm && Phonenumberisnotcosyzm !== "" ?
+                                      <p className="color-red  mt5 mb5  " style={{width: " 100%", height: "20px"}}>
+                                          <span className="fl" style={{textAlign:"left",width: " 100%"}}>{Phonenumberisnotcosyzm}</span>
+                                      </p>
+                                      : <div style={{height:"25px"}}></div>
 
+                                }
                             </div>
-                            {
-                                Phonenumberisnotcosyzm && Phonenumberisnotcosyzm != "" ?
-                                  <p className="color-red  mt5 mb5  " style={{width: " 100%", height: "20px",textAlign:"left"}}>
-                                      <span className="fl" style={{textAlign:"left",width: " 100%"}}>{Phonenumberisnotcosyzm}</span>
-                                  </p>
-                                  : <div style={{height:"25px"}}></div>
 
-                            }
+
 
                             <style>
                                 {
@@ -824,8 +815,9 @@ class LoginRegisterComponent extends Component {
                                     `
                                 }
                             </style>
-                            <Input className="loginInput  font-14   color-grey-9 loginInputzhuche" placeholder="输入8~16位密码，区分大小写"
+                            <Input  placeholder="输入8~16位密码，区分大小写"
                                    type={classpassbool===false?"text":"password"}
+                                   className={Phonenumberisnotcosymmm && Phonenumberisnotcosymmm !== "" ?"  font-14   color-grey-9 loginInputzhucheysl ":"  font-14   color-grey-9 loginInputzhuche"}
                                    autoComplete="new-password"
                                    onClick={this.changeType}
                                    value={this.state.passwords} onChange={this.passwordonChanges}
@@ -834,11 +826,11 @@ class LoginRegisterComponent extends Component {
                                 </img>
                             }></Input>
                             {
-                                Phonenumberisnotcosymmm && Phonenumberisnotcosymmm!== "" ?
-                                  <p className="color-red  mt5 mb5  " style={{width: " 100%", height: "20px",textAlign:"left"}}>
+                                Phonenumberisnotcosymmm && Phonenumberisnotcosymmm !== "" ?
+                                  <p className="color-red  mt5 mb5  " style={{width: " 100%", height: "20px"}}>
                                       <span className="fl" style={{textAlign:"left",width: " 100%"}}>{Phonenumberisnotcosymmm}</span>
                                   </p>
-                                  : ""
+                                  : <div style={{height:"25px"}}></div>
 
                             }
                             <Checkbox onChange={this.onChange}
@@ -846,15 +838,7 @@ class LoginRegisterComponent extends Component {
                             ><span className="font-14 "  style={{
                                 color: '#676767',
                             }}>我已阅读并同意服务协议条款</span></Checkbox>
-                            {
-                                Phonenumberisnotcosyfwtk && Phonenumberisnotcosyfwtk!== "" ?
-                                  <p className="color-red  mt5 mb5  " style={{width: " 100%", height: "20px",textAlign:"left"}}>
-                                      <span className="fl" style={{textAlign:"left",width: " 100%"}}>{Phonenumberisnotcosyfwtk}</span>
-                                  </p>
-                                  : ""
-
-                            }
-                            <Button className="login_btn font-16" type="primary" style={{height:"46px"}} onClick={() => this.postregistered()}
+                            <Button className=" font-16" type="primary" style={{height:"46px", width: "100%",marginTop: "26px",}} onClick={() => this.postregistered()}
                                     size={"large"}>注册</Button>
 
 
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