Merge remote-tracking branch 'origin/master'

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=()=>{

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",

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) {

public/react/src/modules/user/FindPasswordComponent.js

@@ -312,7 +312,7 @@ class LoginRegisterComponent extends Component {
 		// height: 346px;
 		return (
 
-            <div className="login_register_content" style={{height: "482px"}}>
+			<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"}
@@ -339,9 +339,8 @@ class LoginRegisterComponent extends Component {
           `}</style>
 
 
-
 				<div className="login_section">
-                    <div className="section_header">
+					<div className="section_header font-18" style={{color:"#05101A"}}>
 						找回密码
 					</div>
 					<div style={{width: '340px'}}>
@@ -393,7 +392,8 @@ class LoginRegisterComponent extends Component {
 						<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>
+									 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"

public/react/src/modules/user/LoginRegisterComponent.js

@@ -212,8 +212,8 @@ class LoginRegisterComponent extends Component {
                     Phonenumberisnotcos: undefined,
                     Phonenumberisnotcobool: true,
                 })
-            }
                 this.Emailphonenumberverification(value, id)
+            }
             return
         }
 
@@ -222,7 +222,10 @@ class LoginRegisterComponent extends Component {
                 stringdata = "邮箱格式不正确";
             } else {
                 stringdata = "手机号格式不正确";
-
+                // if (!regph.test(value)) {
+                //     // 这里先判断是不是手机号然后在判断是不是邮箱然后又判断是不是手机号，如果不是手机号就是账号
+                //     stringdata=undefined;
+                // }
                 }
             if (id === 1) {
                 this.setState({
@@ -234,8 +237,8 @@ class LoginRegisterComponent extends Component {
                     Phonenumberisnotcos: stringdata,
                     Phonenumberisnotcobool: false,
                 })
-            }
                 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)
+            }
             return
         }
     }
@@ -548,13 +551,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="0" className="font-18"  style={{color:"#05101A"}}> 登录</Menu.Item>
-                        <Menu.Item key="1">注册</Menu.Item>
+                        <Menu.Item key="1" className="font-18"  style={{color:"#05101A"}}>注册</Menu.Item>
                     </Menu>
 
                     {