From 1a9984fb4b12fc7b3d2d2f4aefafcf1a11213637 Mon Sep 17 00:00:00 2001
From: ysl <904079904@qq.com>
Date: Sat, 22 Jun 2019 19:21:47 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../react/src/modules/login/EducoderLogin.js  |   6 +-
 .../src/modules/user/FindPasswordComponent.js | 762 +++++++++---------
 .../modules/user/LoginRegisterComponent.js    |   6 +-
 3 files changed, 387 insertions(+), 387 deletions(-)

diff --git a/public/react/src/modules/login/EducoderLogin.js b/public/react/src/modules/login/EducoderLogin.js
index df5b5f8b8..91e8fac3d 100644
--- a/public/react/src/modules/login/EducoderLogin.js
+++ b/public/react/src/modules/login/EducoderLogin.js
@@ -149,7 +149,7 @@ class EducoderLogin extends Component {
                                 "align-items": "center",
                                 "width": "100%",
                             }}>
-                                <div style={{"margin-top": "40px","height":"500px"}}>
+                                <div style={{"margin-top": "40px","height":"530px"}}>
                                     <LoginRegisterComponent {...this.props} {...this.state}
                                                             Setshowbool={this.Setshowbool} ></LoginRegisterComponent>
 
@@ -163,7 +163,7 @@ class EducoderLogin extends Component {
                                 "align-items": "center",
                                 "width": "100%",
                             }}>
-                                <div style={{"margin-top": "40px","height":"500px"}}>
+                                <div style={{"margin-top": "40px","height":"530px"}}>
                                     <FindPasswordComponent {...this.props} {...this.state}
                                                            Setshowbool={this.Setshowbool}></FindPasswordComponent>
 
@@ -171,7 +171,7 @@ class EducoderLogin extends Component {
                             </div>
 
                     }
-                    <div style={{"height":"250px",
+                    <div style={{"height":"180px",
                         "display": "flex",
                         "justify-content": "center",
                         "align-items": "center",
diff --git a/public/react/src/modules/user/FindPasswordComponent.js b/public/react/src/modules/user/FindPasswordComponent.js
index ae2b427d8..e7380c12f 100644
--- a/public/react/src/modules/user/FindPasswordComponent.js
+++ b/public/react/src/modules/user/FindPasswordComponent.js
@@ -9,315 +9,315 @@ import './common.css'
 
 const TabPane = Tabs.TabPane
 const loginInputsyl = {
-    "width": " 100%",
-    "height": "40px",
+	"width": " 100%",
+	"height": "40px",
 }
 
 //父组件 EducoderLogin.js
 class LoginRegisterComponent extends Component {
-    constructor(props) {
-        super(props)
-        this.state = {
-            login: "",
-            password: "",
-            passwords: "",
-            seconds: 60,
-            codes: "",
-            getverificationcodes: true,
-            Phonenumberisnotco: undefined,
-            Phonenumberisnotcobool: false,
-            s: 'text',
-            classpass: "text",
-            readonlyInput: true,
-        }
-    }
-
-
-    openNotification = (messge) => {
-        notification.open({
-            message: "提示",
-            description:
-            messge,
-            onClick: () => {
-                console.log('Notification Clicked!');
-            },
-        });
-    };
-    StudyMakeMoney = () => { // 调用父组件方法
-        this.props.Setshowbool();
-
-    }
-
-    // 点击表单后，改变type
-    changeType = () => {
-        this.setState({classpass: 'password'});
-    }
-    changeTypey = () => {
-
-    }
-    //倒计时
-    getverificationcode = () => {
-        if (this.state.Phonenumberisnotcobool === false ||this.state.Phonenumberisnotcobool === undefined) {
-            if (this.state.login&&this.state.login.length === 0) {
-                this.openNotification("请输入手机号或邮箱");
-                return
-            } else {
-                this.openNotification("请输入正确的手机号或邮箱");
-            }
-            return;
-        }
-        if (this.state.getverificationcodes === true) {
-            this.setState({
-                getverificationcodes: undefined,
-            })
-            let timer = setInterval(() => {
-                this.setState((preState) => ({
-                    seconds: preState.seconds - 1,
-                }), () => {
-                    if (this.state.seconds == 0) {
-                        clearInterval(timer);
-                        this.setState({
-                            getverificationcodes: false,
-                            seconds: 60,
-                        })
-                    }
-                });
-            }, 1000)
-            this.SMSverification();
-        } else {
-            this.setState({
-                getverificationcodes: undefined,
-            })
-            let timer = setInterval(() => {
-                this.setState((preState) => ({
-                    seconds: preState.seconds - 1,
-                }), () => {
-                    if (this.state.seconds == 0) {
-                        clearInterval(timer);
-                        this.setState({
-                            getverificationcodes: false,
-                            seconds: 60,
-
-                        })
-                    }
-                });
-            }, 1000)
-            this.SMSverification();
-        }
-    }
-    //短信验证
-    SMSverification = () => {
-        var url = `/accounts/get_verification_code.json`;
-        axios.get((url), {
-            params: {
-                login: this.state.login,
-                type: 2,
-            }
-        }).then((result) => {
-            //验证有问题{"status":1,"message":"success"}
-            console.log(result);
-
-
-        }).catch((error) => {
-            console.log(error);
-
-        })
-    }
-
-    cancelReadOnly = () => {
-        this.setState({
-            readonlyInput: false,
-        })
-    }
-    //找回密码
-    Retrievepassword = () => {
-        if (this.state.Phonenumberisnotcobool === false) {
-            if (this.state.login.length === 0) {
-                this.openNotification("请输入手机号或邮箱");
-                return
-            }
-            this.openNotification("请输入正确的手机号或邮箱");
-            return;
-        }
-
-        if (this.state.login === undefined || this.state.login == "") {
-            this.openNotification(`请输入登录手机号码或邮箱`);
-            return
-        } else if (this.state.password === undefined || this.state.password == "") {
-            this.openNotification(`请输入密码`);
-            return
-        } else if (this.state.passwords === undefined || this.state.passwords == "") {
-            this.openNotification(`请输入密码`);
-            return
-        } else if (this.state.password !== this.state.passwords) {
-            this.openNotification(`两次密码不相同`);
-            return
-        } else if (this.state.codes === undefined || this.state.codes == "") {
-            this.openNotification(`请输入验证码`);
-            return
-        }
-        var url = "/accounts/reset_password.json";
-        axios.post(url, {
-            login: this.state.login,
-            code: this.state.codes,
-            new_password: this.state.password,
-            new_password_confirmation: this.state.passwords,
-        }).then((result) => {
-            // console.log(result);
-            //登录成功，会生成session
-            this.openNotification("找回密码成功，请重新登入。");
-            window.location.href = "/login"
-        }).catch((error) => {
-
-        })
-
-
-    }
-    openNotification = (messge) => {
-        notification.open({
-            message: "提示",
-            description:
-            messge,
-            onClick: () => {
-                console.log('Notification Clicked!');
-            },
-        });
-    };
-    loginInputonChange = (e) => {
-        // console.log(e.target.value);
-        this.setState({
-            login: e.target.value,
-        })
-
-
-    }
-    loginInputonChanges = (e) => {
-        // console.log(e.target.value);
-        this.setState({
-            password: e.target.value,
-        })
-
-
-    }
-    loginInputonChangess = (e) => {
-        // console.log(e.target.value);
-        this.setState({
-            passwords: e.target.value,
-        })
-
-
-    }
-    //获取code
-    codesonChange = (e) => {
-        this.setState({
-            codes: e.target.value
-        })
-    }
-    inputOnBlur = (e) => {
-        this.isCorrectname(e.target.value);
-        // this.Emailphonenumberverification(e.target.value, id);
-    }
-    isCorrectname = (value) => {
-        console.log(value.length);
-        if (value.length === 0) {
-            this.setState({
-                Phonenumberisnotco: undefined,
-                Phonenumberisnotcobool: false,
-            })
-            return;
-        }
-        // var telephone = $("#telephoneAdd.tianjia_phone").val();
-        var regph = /^[1][3,4,5,6,7,8][0-9]{9}$/;
-        // var email = $("#add_email.tianjia_email").val();
-        var regemail = /^\w+((-\w+)|(\.\w+))*\@[A-Za-z0-9]+((\.|-)[A-Za-z0-9]+)*\.[A-Za-z0-9]+$/;
-
-        // [1]手机号开头必须是1    [3,4,5,6,7,8] 第二位是3-8中的一个 [0-9]{9} 后边9位可以是0-9的任意数字。
-        var stringdata = undefined;
-        if (!regph.test(value)) {
-            stringdata = "手机号格式不正确";
-            this.setState({
-                Phonenumberisnotco: stringdata,
-                Phonenumberisnotcobool: false,
-            })
-        } else {
-            this.setState({
-                Phonenumberisnotco: undefined,
-                Phonenumberisnotcobool: true,
-            })
-            return
-        }
-
-        if (!regemail.test(value)) {
-            if ((value.indexOf("@") != -1) === true) {
-                stringdata = "邮箱格式不正确";
-            } else {
-                stringdata = "手机号格式不正确";
-
-            }
-            this.setState({
-                Phonenumberisnotco: stringdata,
-                Phonenumberisnotcobool: false,
-            })
-
-            this.Emailphonenumberverification(value)
-            return
-        } else {
-            this.setState({
-                Phonenumberisnotco: undefined,
-                Phonenumberisnotcobool: true,
-            })
-            return
-        }
-    }
-    //邮箱手机号验证
-    Emailphonenumberverification = (value) => {
-        var url = `/accounts/valid_email_and_phone.json`;
-        axios.get((url), {
-            params: {
-                login: value,
-                type: 2,
-            }
-        }).then((result) => {
-            //验证有问题{"status":1,"message":"success"}
-            // console.log(result);
-            this.openNotification("验证码已发送，请注意查收!",2);
-
-
-        }).catch((error) => {
-            console.log(error);
-            // this.setState({
-            //     login:"",
-            //     logins:"",
-            // })
-        })
-    }
-
-    render() {
-        const {
-            activeKey,
-            // 登录
-            autoLogin,
-            // 注册
-            readAgreement, dragOk,
-            login,
-            password,
-            passwords,
-            classpass,
-            seconds,
-            getverificationcodes,
-            Phonenumberisnotco,
-            readonlyInput,
-            codes,
-        } = this.state
-        // height: 346px;
-        return (
-
-            <div className="login_register_content" style={{height: "482px"}}>
-                <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"}
-                       style={{height: '0', width: '0', border: 'none', display: "none"}}/>
-                <style>{`
+	constructor(props) {
+		super(props)
+		this.state = {
+			login: "",
+			password: "",
+			passwords: "",
+			seconds: 60,
+			codes: "",
+			getverificationcodes: true,
+			Phonenumberisnotco: undefined,
+			Phonenumberisnotcobool: false,
+			s: 'text',
+			classpass: "text",
+			readonlyInput: true,
+		}
+	}
+
+
+	openNotification = (messge) => {
+		notification.open({
+			message: "提示",
+			description:
+			messge,
+			onClick: () => {
+				console.log('Notification Clicked!');
+			},
+		});
+	};
+	StudyMakeMoney = () => { // 调用父组件方法
+		this.props.Setshowbool();
+
+	}
+
+	// 点击表单后，改变type
+	changeType = () => {
+		this.setState({classpass: 'password'});
+	}
+	changeTypey = () => {
+
+	}
+	//倒计时
+	getverificationcode = () => {
+		if (this.state.Phonenumberisnotcobool === false || this.state.Phonenumberisnotcobool === undefined) {
+			if (this.state.login && this.state.login.length === 0) {
+				this.openNotification("请输入手机号或邮箱");
+				return
+			} else {
+				this.openNotification("请输入正确的手机号或邮箱");
+			}
+			return;
+		}
+		if (this.state.getverificationcodes === true) {
+			this.setState({
+				getverificationcodes: undefined,
+			})
+			let timer = setInterval(() => {
+				this.setState((preState) => ({
+					seconds: preState.seconds - 1,
+				}), () => {
+					if (this.state.seconds == 0) {
+						clearInterval(timer);
+						this.setState({
+							getverificationcodes: false,
+							seconds: 60,
+						})
+					}
+				});
+			}, 1000)
+			this.SMSverification();
+		} else {
+			this.setState({
+				getverificationcodes: undefined,
+			})
+			let timer = setInterval(() => {
+				this.setState((preState) => ({
+					seconds: preState.seconds - 1,
+				}), () => {
+					if (this.state.seconds == 0) {
+						clearInterval(timer);
+						this.setState({
+							getverificationcodes: false,
+							seconds: 60,
+
+						})
+					}
+				});
+			}, 1000)
+			this.SMSverification();
+		}
+	}
+	//短信验证
+	SMSverification = () => {
+		var url = `/accounts/get_verification_code.json`;
+		axios.get((url), {
+			params: {
+				login: this.state.login,
+				type: 2,
+			}
+		}).then((result) => {
+			//验证有问题{"status":1,"message":"success"}
+			console.log(result);
+
+
+		}).catch((error) => {
+			console.log(error);
+
+		})
+	}
+
+	cancelReadOnly = () => {
+		this.setState({
+			readonlyInput: false,
+		})
+	}
+	//找回密码
+	Retrievepassword = () => {
+		if (this.state.Phonenumberisnotcobool === false) {
+			if (this.state.login.length === 0) {
+				this.openNotification("请输入手机号或邮箱");
+				return
+			}
+			this.openNotification("请输入正确的手机号或邮箱");
+			return;
+		}
+
+		if (this.state.login === undefined || this.state.login == "") {
+			this.openNotification(`请输入登录手机号码或邮箱`);
+			return
+		} else if (this.state.password === undefined || this.state.password == "") {
+			this.openNotification(`请输入密码`);
+			return
+		} else if (this.state.passwords === undefined || this.state.passwords == "") {
+			this.openNotification(`请输入密码`);
+			return
+		} else if (this.state.password !== this.state.passwords) {
+			this.openNotification(`两次密码不相同`);
+			return
+		} else if (this.state.codes === undefined || this.state.codes == "") {
+			this.openNotification(`请输入验证码`);
+			return
+		}
+		var url = "/accounts/reset_password.json";
+		axios.post(url, {
+			login: this.state.login,
+			code: this.state.codes,
+			new_password: this.state.password,
+			new_password_confirmation: this.state.passwords,
+		}).then((result) => {
+			// console.log(result);
+			//登录成功，会生成session
+			this.openNotification("找回密码成功，请重新登入。");
+			window.location.href = "/login"
+		}).catch((error) => {
+
+		})
+
+
+	}
+	openNotification = (messge) => {
+		notification.open({
+			message: "提示",
+			description:
+			messge,
+			onClick: () => {
+				console.log('Notification Clicked!');
+			},
+		});
+	};
+	loginInputonChange = (e) => {
+		// console.log(e.target.value);
+		this.setState({
+			login: e.target.value,
+		})
+
+
+	}
+	loginInputonChanges = (e) => {
+		// console.log(e.target.value);
+		this.setState({
+			password: e.target.value,
+		})
+
+
+	}
+	loginInputonChangess = (e) => {
+		// console.log(e.target.value);
+		this.setState({
+			passwords: e.target.value,
+		})
+
+
+	}
+	//获取code
+	codesonChange = (e) => {
+		this.setState({
+			codes: e.target.value
+		})
+	}
+	inputOnBlur = (e) => {
+		this.isCorrectname(e.target.value);
+		// this.Emailphonenumberverification(e.target.value, id);
+	}
+	isCorrectname = (value) => {
+		console.log(value.length);
+		if (value.length === 0) {
+			this.setState({
+				Phonenumberisnotco: undefined,
+				Phonenumberisnotcobool: false,
+			})
+			return;
+		}
+		// var telephone = $("#telephoneAdd.tianjia_phone").val();
+		var regph = /^[1][3,4,5,6,7,8][0-9]{9}$/;
+		// var email = $("#add_email.tianjia_email").val();
+		var regemail = /^\w+((-\w+)|(\.\w+))*\@[A-Za-z0-9]+((\.|-)[A-Za-z0-9]+)*\.[A-Za-z0-9]+$/;
+
+		// [1]手机号开头必须是1    [3,4,5,6,7,8] 第二位是3-8中的一个 [0-9]{9} 后边9位可以是0-9的任意数字。
+		var stringdata = undefined;
+		if (!regph.test(value)) {
+			stringdata = "手机号格式不正确";
+			this.setState({
+				Phonenumberisnotco: stringdata,
+				Phonenumberisnotcobool: false,
+			})
+		} else {
+			this.setState({
+				Phonenumberisnotco: undefined,
+				Phonenumberisnotcobool: true,
+			})
+			return
+		}
+
+		if (!regemail.test(value)) {
+			if ((value.indexOf("@") != -1) === true) {
+				stringdata = "邮箱格式不正确";
+			} else {
+				stringdata = "手机号格式不正确";
+
+			}
+			this.setState({
+				Phonenumberisnotco: stringdata,
+				Phonenumberisnotcobool: false,
+			})
+
+			this.Emailphonenumberverification(value)
+			return
+		} else {
+			this.setState({
+				Phonenumberisnotco: undefined,
+				Phonenumberisnotcobool: true,
+			})
+			return
+		}
+	}
+	//邮箱手机号验证
+	Emailphonenumberverification = (value) => {
+		var url = `/accounts/valid_email_and_phone.json`;
+		axios.get((url), {
+			params: {
+				login: value,
+				type: 2,
+			}
+		}).then((result) => {
+			//验证有问题{"status":1,"message":"success"}
+			// console.log(result);
+			this.openNotification("验证码已发送，请注意查收!", 2);
+
+
+		}).catch((error) => {
+			console.log(error);
+			// this.setState({
+			//     login:"",
+			//     logins:"",
+			// })
+		})
+	}
+
+	render() {
+		const {
+			activeKey,
+			// 登录
+			autoLogin,
+			// 注册
+			readAgreement, dragOk,
+			login,
+			password,
+			passwords,
+			classpass,
+			seconds,
+			getverificationcodes,
+			Phonenumberisnotco,
+			readonlyInput,
+			codes,
+		} = this.state
+		// height: 346px;
+		return (
+
+			<div className="login_register_content" style={{height: "520px"}}>
+				<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"}
+							 style={{height: '0', width: '0', border: 'none', display: "none"}}/>
+				<style>{`
 
               .login_section .section_header {
                 margin-bottom: 16px;
@@ -339,15 +339,14 @@ class LoginRegisterComponent extends Component {
           `}</style>
 
 
-
-                <div className="login_section">
-                    <div className="section_header">
-                        找回密码
-                    </div>
-                    <div style={{width: '340px'}}>
-                        <style>
-                            {
-                                `
+				<div className="login_section">
+					<div className="section_header font-18" style={{color:"#05101A"}}>
+						找回密码
+					</div>
+					<div style={{width: '340px'}}>
+						<style>
+							{
+								`
                                 .ant-input {
 																		font-family: "Monospaced Number", "Chinese Quote", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial, sans-serif;
 																		-webkit-box-sizing: border-box;
@@ -372,73 +371,74 @@ class LoginRegisterComponent extends Component {
 																		transition: all .3s;
 																}
 																	`
-                            }
-                        </style>
-                        <Input style={loginInputsyl} type="text" autoComplete="off" onClick={this.changeTypey}
-															 className={"loginInputzhuche"}
-                               placeholder="输入注册手机号或邮箱" value={this.state.login} onBlur={(e) => this.inputOnBlur(e)}
-                               onChange={this.loginInputonChange} style={{marginTop: '10px',height: "38px"}}></Input>
-                        {
-                            Phonenumberisnotco && Phonenumberisnotco != "" ?
-                                <p className="color-red  mt5 mb5" style={{width: " 100%", height: "20px"}}>
-                                    <span className="fl" style={{textAlign:"center",width: " 100%"}}>{Phonenumberisnotco}</span>
-                                </p>
-                                : <div style={{height: "25px"}}></div>
-                        }
-                        <DragValidator
-                            height={38}  successGreenColor="#45E15F"
-                            style={{height:"38px",width:"100%"}}
-                            dragOkCallback={this.dragOkCallback}
-                        ></DragValidator>
-                        <Input type={classpass}
-															 className={"loginInputzhuche"}
-                               onClick={this.changeType} autoComplete="new-password"  onChange={this.loginInputonChanges}
-                               value={this.state.password}   style={{width:"100%",height:"38px",marginTop:'25px'}}  placeholder="输入8~16位密码，区分大小写"></Input>
-                        <Input  type={classpass}
-																className={"loginInputzhuche"}
-                               onClick={this.changeType} autoComplete="new-password"
-                               onChange={this.loginInputonChangess} value={this.state.passwords}
-                               style={{height:"38px",marginTop:'25px',width:"100%"}}
-                               placeholder="再次输入新密码"></Input>
-
-                        <div className={"mt25"}>
-                            <Input className="fl mr5 loginInputzhuche" type="text" autoComplete="off" style={{
-                                width: "210px",
-                                height: "38px",
-                            }} placeholder="请输入验证码"
-                                   onChange={this.codesonChange}
-                                   value={codes}
-                            >
-                            </Input>
-                            {
-                                getverificationcodes === undefined ?
-                                    <Button className="fl ml5 " disabled
-                                            style={{"width": "120px", "text-align": "center", "height": "45px",}}
-                                            size={"large"}>重新发送{seconds}s</Button>
-                                    : getverificationcodes === true ?
-                                    <Button className="fl ml5 "
-                                            style={{"width": "120px", "text-align": "center", "height": "45px"}}
-                                            type="primary"
-                                            onClick={() => this.getverificationcode()} size={"large"}>获取验证码</Button>
-                                    :
-                                    <Button className="fl ml5 "
-                                            style={{"width": "120px", "text-align": "center", "height": "45px"}}
-                                            type="primary"
-                                            onClick={() => this.getverificationcode()} size={"large"}>重新发送</Button>
-                            }
-
-
-                        </div>
-
-                        <Button className="login_btn" size={"large"} type="primary"
-                                style={{height:"46px"}}
-                                onClick={this.Retrievepassword}>完成</Button>
-                    </div>
-                </div>
-
-            </div>
-        );
-    }
+							}
+						</style>
+						<Input style={loginInputsyl} type="text" autoComplete="off" onClick={this.changeTypey}
+									 className={"loginInputzhuche"}
+									 placeholder="输入注册手机号或邮箱" value={this.state.login} onBlur={(e) => this.inputOnBlur(e)}
+									 onChange={this.loginInputonChange} style={{marginTop: '10px', height: "38px"}}></Input>
+						{
+							Phonenumberisnotco && Phonenumberisnotco != "" ?
+								<p className="color-red  mt5 mb5" style={{width: " 100%", height: "20px"}}>
+									<span className="fl" style={{textAlign: "center", width: " 100%"}}>{Phonenumberisnotco}</span>
+								</p>
+								: <div style={{height: "25px"}}></div>
+						}
+						<DragValidator
+							height={38} successGreenColor="#45E15F"
+							style={{height: "38px", width: "100%"}}
+							dragOkCallback={this.dragOkCallback}
+						></DragValidator>
+						<Input type={classpass}
+									 className={"loginInputzhuche"}
+									 onClick={this.changeType} autoComplete="new-password" onChange={this.loginInputonChanges}
+									 value={this.state.password} style={{width: "100%", height: "38px", marginTop: '25px'}}
+									 placeholder="输入8~16位密码，区分大小写"></Input>
+						<Input type={classpass}
+									 className={"loginInputzhuche"}
+									 onClick={this.changeType} autoComplete="new-password"
+									 onChange={this.loginInputonChangess} value={this.state.passwords}
+									 style={{height: "38px", marginTop: '25px', width: "100%"}}
+									 placeholder="再次输入新密码"></Input>
+
+						<div className={"mt25"}>
+							<Input className="fl mr5 loginInputzhuche" type="text" autoComplete="off" style={{
+								width: "210px",
+								height: "38px",
+							}} placeholder="请输入验证码"
+										 onChange={this.codesonChange}
+										 value={codes}
+							>
+							</Input>
+							{
+								getverificationcodes === undefined ?
+									<Button className="fl ml5 " disabled
+													style={{"width": "120px", "text-align": "center", "height": "45px",}}
+													size={"large"}>重新发送{seconds}s</Button>
+									: getverificationcodes === true ?
+									<Button className="fl ml5 "
+													style={{"width": "120px", "text-align": "center", "height": "45px"}}
+													type="primary"
+													onClick={() => this.getverificationcode()} size={"large"}>获取验证码</Button>
+									:
+									<Button className="fl ml5 "
+													style={{"width": "120px", "text-align": "center", "height": "45px"}}
+													type="primary"
+													onClick={() => this.getverificationcode()} size={"large"}>重新发送</Button>
+							}
+
+
+						</div>
+
+						<Button className="login_btn" size={"large"} type="primary"
+										style={{height: "46px"}}
+										onClick={this.Retrievepassword}>完成</Button>
+					</div>
+				</div>
+
+			</div>
+		);
+	}
 }
 
 export default (LoginRegisterComponent);
diff --git a/public/react/src/modules/user/LoginRegisterComponent.js b/public/react/src/modules/user/LoginRegisterComponent.js
index 587d77375..addd0e81b 100644
--- a/public/react/src/modules/user/LoginRegisterComponent.js
+++ b/public/react/src/modules/user/LoginRegisterComponent.js
@@ -548,13 +548,13 @@ class LoginRegisterComponent extends Component {
         // console.log(activeKey);
         return (
 
-            <div className="login_register_content" style={  parseInt(tab[0])==0?{height: "346px"} :{height: "462px"}}>
+            <div className="login_register_content" style={  parseInt(tab[0])==0?{height: "346px"} :{height: "490px"}}>
 
 
                 <div>
                     <Menu mode="horizontal" selectedKeys={tab} onClick={this.changeTab}>
-                        <Menu.Item key="0">登录</Menu.Item>
-                        <Menu.Item key="1">注册</Menu.Item>
+                        <Menu.Item key="0" className="font-18"  style={{color:"#05101A"}}> 登录</Menu.Item>
+                        <Menu.Item key="1" className="font-18"  style={{color:"#05101A"}}>注册</Menu.Item>
                     </Menu>
 
                     {

From 66e4a5522b36fe33f428c7c613e2346ce3e3ba17 Mon Sep 17 00:00:00 2001
From: ysl <904079904@qq.com>
Date: Sat, 22 Jun 2019 19:37:46 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/user/LoginRegisterComponent.js      | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/public/react/src/modules/user/LoginRegisterComponent.js b/public/react/src/modules/user/LoginRegisterComponent.js
index addd0e81b..030103ea2 100644
--- a/public/react/src/modules/user/LoginRegisterComponent.js
+++ b/public/react/src/modules/user/LoginRegisterComponent.js
@@ -212,8 +212,8 @@ class LoginRegisterComponent extends Component {
                     Phonenumberisnotcos: undefined,
                     Phonenumberisnotcobool: true,
                 })
+                this.Emailphonenumberverification(value, id)
             }
-            this.Emailphonenumberverification(value, id)
             return
         }
 
@@ -222,8 +222,11 @@ class LoginRegisterComponent extends Component {
                 stringdata = "邮箱格式不正确";
             } else {
                 stringdata = "手机号格式不正确";
-
-            }
+                if (!regph.test(value)) {
+                    // 这里先判断是不是手机号然后在判断是不是邮箱然后又判断是不是手机号，如果不是手机号就是账号
+                    stringdata=undefined;
+                }
+                }
             if (id === 1) {
                 this.setState({
                     Phonenumberisnotco: stringdata,
@@ -234,8 +237,8 @@ class LoginRegisterComponent extends Component {
                     Phonenumberisnotcos: stringdata,
                     Phonenumberisnotcobool: false,
                 })
+                this.Emailphonenumberverification(value, id)
             }
-            this.Emailphonenumberverification(value, id)
             return
         } else {
             if (id === 1) {
@@ -248,8 +251,8 @@ class LoginRegisterComponent extends Component {
                     Phonenumberisnotcos: undefined,
                     Phonenumberisnotcobool: true,
                 })
+                this.Emailphonenumberverification(value, id)
             }
-            this.Emailphonenumberverification(value, id)
             return
         }
     }

From 97189e671faa0a4ff38258d7212bbed8c92c40b1 Mon Sep 17 00:00:00 2001
From: ysl <904079904@qq.com>
Date: Sat, 22 Jun 2019 19:41:20 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/courses/coursesDetail/CoursesBanner.js    | 2 +-
 public/react/src/modules/user/LoginRegisterComponent.js   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
index 3176602bd..cf28a498e 100644
--- a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
+++ b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
@@ -53,7 +53,7 @@ class CoursesBanner extends Component {
 
 			this.onloadupdatabanner()
       this.setState({
-        user_phone_binded :this.props.user_phone_binded,
+        user_phone_binded :this.props.current_user.user_phone_binded,
       })
     }
 	onloadupdatabanner=()=>{
diff --git a/public/react/src/modules/user/LoginRegisterComponent.js b/public/react/src/modules/user/LoginRegisterComponent.js
index 030103ea2..c5a2175a9 100644
--- a/public/react/src/modules/user/LoginRegisterComponent.js
+++ b/public/react/src/modules/user/LoginRegisterComponent.js
@@ -222,10 +222,10 @@ class LoginRegisterComponent extends Component {
                 stringdata = "邮箱格式不正确";
             } else {
                 stringdata = "手机号格式不正确";
-                if (!regph.test(value)) {
-                    // 这里先判断是不是手机号然后在判断是不是邮箱然后又判断是不是手机号，如果不是手机号就是账号
-                    stringdata=undefined;
-                }
+                // if (!regph.test(value)) {
+                //     // 这里先判断是不是手机号然后在判断是不是邮箱然后又判断是不是手机号，如果不是手机号就是账号
+                //     stringdata=undefined;
+                // }
                 }
             if (id === 1) {
                 this.setState({

From a4675215deda263f0a6c2bca8689ae57a7cfc846 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Sat, 22 Jun 2019 19:44:06 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/login/Trialapplication.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/react/src/modules/login/Trialapplication.js b/public/react/src/modules/login/Trialapplication.js
index 9285bd1f0..77abca50c 100644
--- a/public/react/src/modules/login/Trialapplication.js
+++ b/public/react/src/modules/login/Trialapplication.js
@@ -12,7 +12,7 @@ import {broadcastChannelPostMessage} from 'educoder'
 import {Tabs, Input, Checkbox, Button, notification, Menu} from 'antd';
 
 
-//试用申请页面
+//试用申请
 class Trialapplication extends Component {
 	// isRender控制弹出窗口显示
 	constructor(props) {