Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder

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({
@@ -221,8 +228,9 @@ class LoginRegisterComponent extends Component {
 						return;
 					}
 				}else {
-					this.openNotification("找回密码成功，请重新登入。");
+					this.setState({
-					window.location.href = "/login"
+						modalsType:true
+					})
 				}
 			}
 		}).catch((error) => {

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 mt10"}><p>欢迎使用EduCoder，您可以试用1天</p></div>
-					<div className={"tabeltext-alignleft"}><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>

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 mt10"}><p>您尚未完善个人资料</p></div>
-					<div className={"tabeltext-alignleft"}><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>

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()
 	}
 
 

public/react/src/modules/user/common.css

@@ -40,7 +40,7 @@
 
   .educouddiv {
     display: flex;
-    justify-content: center;
+   flex-direction: column;
   }