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

---
 .../src/modules/user/FindPasswordComponent.js | 21 ++++++++++++++++---
 .../react/src/modules/user/MyEduCoderModal.js |  4 ++--
 public/react/src/modules/user/Notcompleted.js |  4 ++--
 public/react/src/modules/user/ReadPassword.js |  3 ++-
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/public/react/src/modules/user/FindPasswordComponent.js b/public/react/src/modules/user/FindPasswordComponent.js
index 8feabd068..a85bf124e 100644
--- a/public/react/src/modules/user/FindPasswordComponent.js
+++ b/public/react/src/modules/user/FindPasswordComponent.js
@@ -3,9 +3,13 @@ import React, {Component} from 'react';
 import {BrowserRouter as Router, Route, Link, Switch} from "react-router-dom";
 
 import {getImageUrl, DragValidator} from 'educoder';
-import DragValidatortwo from '../../../src/common/components/DragValidatortwo'
 
 import {Tabs, Input, Checkbox, Button, notification} from 'antd';
+
+import DragValidatortwo from '../../../src/common/components/DragValidatortwo'
+
+import ReadPassword from './ReadPassword';
+
 import axios from 'axios';
 import './common.css'
 
@@ -150,6 +154,9 @@ class LoginRegisterComponent extends Component {
 	}
 	//找回密码
 	Retrievepassword = () => {
+		this.setState({
+			modalsType:true
+		})
 		if (this.state.Phonenumberisnotcobool === false) {
 			if (this.state.login.length === 0) {
 				this.setState({
@@ -202,8 +209,11 @@ class LoginRegisterComponent extends Component {
 		}).then((result) => {
 			// console.log(result);
 			//登录成功，会生成session
-			this.openNotification("找回密码成功，请重新登入。");
-			window.location.href = "/login"
+			// this.openNotification("找回密码成功，请重新登入。");
+			// window.location.href = "/login"
+			this.setState({
+				modalsType:true
+			})
 		}).catch((error) => {
 
 		})
@@ -404,6 +414,11 @@ class LoginRegisterComponent extends Component {
 		return (
 
 			<div className="login_register_content" style={{height: "520px"}}>
+				<ReadPassword
+					modalsType={this.state.modalsType}
+					StudyMakeMoney={()=>this.StudyMakeMoney()}
+				/>
+
 				<Input type="text" name="username" value={"namename"}
 							 style={{height: '0', width: '0', border: 'none', display: "none"}}/>
 				<Input type="password" name="password" id="password" value={"123123123"}
diff --git a/public/react/src/modules/user/MyEduCoderModal.js b/public/react/src/modules/user/MyEduCoderModal.js
index ae068756d..b65838047 100644
--- a/public/react/src/modules/user/MyEduCoderModal.js
+++ b/public/react/src/modules/user/MyEduCoderModal.js
@@ -37,8 +37,8 @@ class MyEduCoderModal extends Component {
 				width="530px"
 			>
 				<div className="educouddiv">
-					<div className={"tabeltext-alignleft"}><p>欢迎使用EduCoder，您可以试用1天</p></div>
-					<div className={"tabeltext-alignleft"}><p>超过期限，需要经过管理员的授权审核</p></div>
+					<div className={"tabeltext-alignleft mt10"}><p>欢迎使用EduCoder，您可以试用1天</p></div>
+					<div className={"tabeltext-alignleft mt10"}><p>超过期限，需要经过管理员的授权审核</p></div>
 					<div className="clearfix mt30 edu-txt-center">
 						<a className="task-btn mr30" onClick={()=>this.modalCancel()}>先试试看</a>
 						<a className="task-btn task-btn-orange" onClick={()=>this.setDownload()}>立即申请授权</a>
diff --git a/public/react/src/modules/user/Notcompleted.js b/public/react/src/modules/user/Notcompleted.js
index ce33d711b..848eded48 100644
--- a/public/react/src/modules/user/Notcompleted.js
+++ b/public/react/src/modules/user/Notcompleted.js
@@ -34,8 +34,8 @@ class Notcompleted extends Component {
 				width="530px"
 			>
 				<div className="educouddiv">
-					<div className={"tabeltext-alignleft"}><p>您尚未完善个人资料</p></div>
-					<div className={"tabeltext-alignleft"}><p>请在完成资料后，提交试用申请</p></div>
+					<div className={"tabeltext-alignleft mt10"}><p>您尚未完善个人资料</p></div>
+					<div className={"tabeltext-alignleft mt10"}><p>请在完成资料后，提交试用申请</p></div>
 					<div className="clearfix mt30 edu-txt-center">
 						<a className="task-btn mr30" onClick={()=>this.modalCancel()}>取消</a>
 						<a className="task-btn task-btn-orange" onClick={()=>this.setDownload()}>立即完善资料</a>
diff --git a/public/react/src/modules/user/ReadPassword.js b/public/react/src/modules/user/ReadPassword.js
index ef09d794e..ac9a875f6 100644
--- a/public/react/src/modules/user/ReadPassword.js
+++ b/public/react/src/modules/user/ReadPassword.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import {getImageUrl} from 'educoder';
 import { Modal} from 'antd';
 import axios from 'axios';
-import 'common.css'
+import './common.css'
 //密码已重置，请重新登录
 class ReadPassword extends Component {
 
@@ -14,6 +14,7 @@ class ReadPassword extends Component {
 
 	setDownload=()=>{
 		//立即联系
+		this.props.StudyMakeMoney()
 	}
 
 

From 2c546f2bbb95bc41b28ed1a5650cf2a821d13cbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 19 Jul 2019 22:12:24 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=20=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/user/common.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/react/src/modules/user/common.css b/public/react/src/modules/user/common.css
index 307acd0f9..8902f5d4c 100644
--- a/public/react/src/modules/user/common.css
+++ b/public/react/src/modules/user/common.css
@@ -40,7 +40,7 @@
 
   .educouddiv {
     display: flex;
-    justify-content: center;
+   flex-direction: column;
   }