From b3cc2fcac574ba2ea8b981f7ceef05a1fc154616 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 22:35:02 +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

---
 public/react/src/modules/login/EducoderLogin.js         | 2 +-
 public/react/src/modules/user/FindPasswordComponent.js  | 8 +++-----
 public/react/src/modules/user/LoginRegisterComponent.js | 8 --------
 public/react/src/modules/user/ReadPassword.js           | 4 ++--
 4 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/public/react/src/modules/login/EducoderLogin.js b/public/react/src/modules/login/EducoderLogin.js
index 8e8bfd112..99f2b83d7 100644
--- a/public/react/src/modules/login/EducoderLogin.js
+++ b/public/react/src/modules/login/EducoderLogin.js
@@ -162,7 +162,7 @@ class EducoderLogin extends Component {
                                 <div>
 
                                     <LoginRegisterComponent {...this.props} {...this.state}
-                                                            Setshowbool={(e,name,pass)=>this.Setshowbool(e,name,pass)} ></LoginRegisterComponent>
+                                                            Setshowbool={(e)=>this.Setshowbool(e)} ></LoginRegisterComponent>
 
                                 </div>
 
diff --git a/public/react/src/modules/user/FindPasswordComponent.js b/public/react/src/modules/user/FindPasswordComponent.js
index 2d69e966b..0e4837dcb 100644
--- a/public/react/src/modules/user/FindPasswordComponent.js
+++ b/public/react/src/modules/user/FindPasswordComponent.js
@@ -41,6 +41,8 @@ class LoginRegisterComponent extends Component {
 			readonlyInput: true,
 			dragOk: false,
 			Whethertoverify:false,
+			modalsType:true,
+
 		}
 	}
 
@@ -154,9 +156,6 @@ class LoginRegisterComponent extends Component {
 	}
 	//找回密码
 	Retrievepassword = () => {
-		this.setState({
-			modalsType:true
-		})
 		if (this.state.Phonenumberisnotcobool === false) {
 			if (this.state.login.length === 0) {
 				this.setState({
@@ -409,7 +408,6 @@ class LoginRegisterComponent extends Component {
 
 	render() {
 		const {
-			activeKey,
 			// 登录
 			autoLogin,
 			// 注册
@@ -434,7 +432,7 @@ class LoginRegisterComponent extends Component {
 
 			<div className="login_register_content" style={{height: "520px"}}>
 				<ReadPassword
-					modalsTypes={this.state.modalsType}
+					modalsType={this.state.modalsType}
 					StudyMakeMoney={()=>this.StudyMakeMoney()}
 				/>
 
diff --git a/public/react/src/modules/user/LoginRegisterComponent.js b/public/react/src/modules/user/LoginRegisterComponent.js
index 2c485bda4..d30d23db5 100644
--- a/public/react/src/modules/user/LoginRegisterComponent.js
+++ b/public/react/src/modules/user/LoginRegisterComponent.js
@@ -33,7 +33,6 @@ class LoginRegisterComponent extends Component {
             // console.log(props.loginstatus);
             this.state = {
                 tab:["0"],
-                activeKey: 0,
                 classpass: "text",
                 // 登录
                 passopens: passoff,
@@ -67,7 +66,6 @@ class LoginRegisterComponent extends Component {
             // console.log(props.loginstatus);
             this.state = {
                 tab:["1"],
-                activeKey: '1',
                 classpass: "text",
                 // 登录
                 passopens: passoff,
@@ -111,12 +109,10 @@ class LoginRegisterComponent extends Component {
             this.state = {
                 tab:["0"],
             }
-            this.onTabChange('0');
         } else if (this.props.match.url === "/register") {
             this.state = {
                 tab:["1"],
             }
-            this.onTabChange('1');
         }
 
     }
@@ -132,7 +128,6 @@ class LoginRegisterComponent extends Component {
     }
 
 
-    ;
     StudyMakeMoney = () => { // 调用父组件方法
         this.props.Setshowbool(3);
         // this.props.Setlogins(3);
@@ -146,8 +141,6 @@ class LoginRegisterComponent extends Component {
     }
     onTabChange = (activeKey) => {
         console.log("onTabChange");
-        // console.log(activeKey);
-        // this.setState({activeKey})
     }
     // -------------------- LOGIN START
     //下次自动登入
@@ -608,7 +601,6 @@ class LoginRegisterComponent extends Component {
     }
     render() {
         const {
-            activeKey,
             // 登录
             autoLogin,
             classpass,
diff --git a/public/react/src/modules/user/ReadPassword.js b/public/react/src/modules/user/ReadPassword.js
index 27bd10d06..f62d08295 100644
--- a/public/react/src/modules/user/ReadPassword.js
+++ b/public/react/src/modules/user/ReadPassword.js
@@ -28,12 +28,12 @@ class ReadPassword extends Component {
 				destroyOnClose={true}
 				title="提示"
 				centered={true}
-				visible={this.props.modalsTypes===undefined?false:this.props.modalsTypes}
+				visible={this.props.modalsType===undefined?false:this.props.modalsType}
 				width="530px"
 			>
 				<div className="educouddiv">
 					<div><p>密码已重置，请重新登录</p></div>
-					<a className="task-btn task-btn-orange" onClick={this.setDownload()}>知道啦</a>
+					<a className="task-btn task-btn-orange" onClick={this.setDownload}>知道啦</a>
 				</div>
 			</Modal>
 		)