From ecbb557fef67be6cf55a057d482b0d015f09d65f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Tue, 3 Sep 2019 17:45:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=88=A0=E9=99=A4=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/user/FindPasswordComponent.js | 88 +++++++++----------
 .../modules/user/LoginRegisterComponent.js    | 87 +++++++++---------
 2 files changed, 86 insertions(+), 89 deletions(-)

diff --git a/public/react/src/modules/user/FindPasswordComponent.js b/public/react/src/modules/user/FindPasswordComponent.js
index b6e9dda22..415ff49b0 100644
--- a/public/react/src/modules/user/FindPasswordComponent.js
+++ b/public/react/src/modules/user/FindPasswordComponent.js
@@ -246,12 +246,12 @@ class LoginRegisterComponent extends Component {
 			})
 			return
 		}
-		if (this.state.codes === undefined|| this.state.codes.length ===0 || this.state.codes === "") {
-			this.setState({
-				Phonenumberisnotcosyzm:"验证码不能为空"
-			})
-			return
-		}
+		// if (this.state.codes === undefined|| this.state.codes.length ===0 || this.state.codes === "") {
+		// 	this.setState({
+		// 		Phonenumberisnotcosyzm:"验证码不能为空"
+		// 	})
+		// 	return
+		// }
 		var url = "/accounts/reset_password.json";
 		axios.post(url, {
 			login: this.state.login,
@@ -757,46 +757,42 @@ class LoginRegisterComponent extends Component {
 								</p>
 								: <div style={{height: "25px"}}></div>
 						}
-						<div className="yslbutondls">
-
-							<Input  className={Phonenumberisnotcosyzm && Phonenumberisnotcosyzm !== "" ?" mr5 font-14 color-grey-9 loginInputzhucheyslass bor-reds":" mr5 font-14 color-grey-9 loginInputzhuche"}
-								 type="text" autoComplete="off" style={{
-								width: "210px",
-								height: "38px",
-							}} placeholder="请输入验证码"
-										 onChange={this.codesonChange}
-										 value={codes}
-							>
-							</Input>
-							{
-								getverificationcodes === undefined ?
-									<Button className=" ml5 " disabled
-													style={{"width": "120px", "text-align": "center", "height": "45px",}}
-													size={"large"}>重新发送{seconds}s</Button>
-									: getverificationcodes === true ?
-									<Button className=" ml5 "
-													style={{"width": "120px", "text-align": "center", "height": "45px"}}
-													type="primary"
-													disabled={boolyzm}
-													onClick={() => this.getverificationcode()} size={"large"}>获取验证码</Button>
-									:
-									<Button className=" ml5 "
-													style={{"width": "120px", "text-align": "center", "height": "45px"}}
-													type="primary"
-													disabled={boolyzm}
-													onClick={() => this.getverificationcode()} size={"large"}>重新发送</Button>
-							}
-
-
-						</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 className="yslbutondls">*/}
+						{/*	<Input  className={Phonenumberisnotcosyzm && Phonenumberisnotcosyzm !== "" ?" mr5 font-14 color-grey-9 loginInputzhucheyslass bor-reds":" mr5 font-14 color-grey-9 loginInputzhuche"}*/}
+						{/*		 type="text" autoComplete="off" style={{*/}
+						{/*		width: "210px",*/}
+						{/*		height: "38px",*/}
+						{/*	}} placeholder="请输入验证码"*/}
+						{/*				 onChange={this.codesonChange}*/}
+						{/*				 value={codes}*/}
+						{/*	>*/}
+						{/*	</Input>*/}
+						{/*	{*/}
+						{/*		getverificationcodes === undefined ?*/}
+						{/*			<Button className=" ml5 " disabled*/}
+						{/*							style={{"width": "120px", "text-align": "center", "height": "45px",}}*/}
+						{/*							size={"large"}>重新发送{seconds}s</Button>*/}
+						{/*			: getverificationcodes === true ?*/}
+						{/*			<Button className=" ml5 "*/}
+						{/*							style={{"width": "120px", "text-align": "center", "height": "45px"}}*/}
+						{/*							type="primary"*/}
+						{/*							disabled={boolyzm}*/}
+						{/*							onClick={() => this.getverificationcode()} size={"large"}>获取验证码</Button>*/}
+						{/*			:*/}
+						{/*			<Button className=" ml5 "*/}
+						{/*							style={{"width": "120px", "text-align": "center", "height": "45px"}}*/}
+						{/*							type="primary"*/}
+						{/*							disabled={boolyzm}*/}
+						{/*							onClick={() => this.getverificationcode()} size={"large"}>重新发送</Button>*/}
+						{/*	}*/}
+						{/*</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>*/}
+						{/*}*/}
 
 						<Button  size={"large"} type="primary"
 										 style={{height:"46px", width: "100%",marginBottom:"26px"}}
diff --git a/public/react/src/modules/user/LoginRegisterComponent.js b/public/react/src/modules/user/LoginRegisterComponent.js
index 0b977904a..1bb242c63 100644
--- a/public/react/src/modules/user/LoginRegisterComponent.js
+++ b/public/react/src/modules/user/LoginRegisterComponent.js
@@ -424,13 +424,14 @@ class LoginRegisterComponent extends Component {
             }
         }
 
-        if (this.state.codes === undefined || this.state.codes == ""||this.state.codes.length===0) {
-            // this.openNotification(`请输入验证码`,2);
-            this.setState({
-                Phonenumberisnotcosyzm:"验证码不能为空",
-            })
-            return
-        } else if (this.state.passwords === undefined || this.state.passwords == "" ||this.state.passwords.length===0) {
+        // if (this.state.codes === undefined || this.state.codes == ""||this.state.codes.length===0) {
+        //     // this.openNotification(`请输入验证码`,2);
+        //     this.setState({
+        //         Phonenumberisnotcosyzm:"验证码不能为空",
+        //     })
+        //     return
+        // } else
+            if (this.state.passwords === undefined || this.state.passwords == "" ||this.state.passwords.length===0) {
             this.setState({
                 Phonenumberisnotcosymmm:"密码不能为空",
             })
@@ -1057,42 +1058,42 @@ class LoginRegisterComponent extends Component {
 
 
 
-                          <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>
+                          {/*<div className="yslbutondls " style={{display: "none"}}>*/}
+
+                          {/*    <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 style={{display: "none"}}>*/}
+                          {/*    {*/}
+                          {/*        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>*/}