Merge remote-tracking branch 'origin/master'

public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js

@@ -1156,7 +1156,6 @@ class Listofworksstudentone extends Component {
 		this.setState({
 			data: datalist,
 			datas: datalists,
-			teacherlist: teacherlist,
 			teacherlists: teacherlists,
 			loadingstate: false,
 			styletable: styletable,

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

@@ -42,11 +42,32 @@ class LoginRegisterComponent extends Component {
 			dragOk: false,
 			Whethertoverify:false,
 			modalsType:false,
-
+			pciphone:true,
 		}
 	}
 
+	//判断是否是手机端
+	IsPC=()=> {
+		var userAgentInfo = navigator.userAgent;
+		var Agents = ["Android", "iPhone",
+			"SymbianOS", "Windows Phone",
+			"iPad", "iPod"];
+		var flag = true;//这个意思是说自己的是pc 端
+		for (var v = 0; v < Agents.length; v++) {
+			if (userAgentInfo.indexOf(Agents[v]) > 0) {
+				flag = false;
+				break;
+			}
+		}
+		return flag;
+	}
+	componentDidMount = () => {
+		let pcipns=this.IsPC();
+     this.setState({
+			 pciphone:pcipns,
+		 })
 
+	}
 	openNotification = (messge) => {
 		notification.open({
 			message: "提示",
@@ -170,13 +191,16 @@ class LoginRegisterComponent extends Component {
 			})
 			return
 		}
-		if (this.state.dragOk === false) {
+		if(this.state.pciphone===true){
-			// this.openNotification(`请拖动滑块完成验证`,2);
+			if (this.state.dragOk === false) {
-			this.setState({
+				// this.openNotification(`请拖动滑块完成验证`,2);
-				Phonenumberisnotcosytdhk:"请拖动滑块完成验证",
+				this.setState({
-			})
+					Phonenumberisnotcosytdhk:"请拖动滑块完成验证",
-			return
+				})
+				return
+			}
 		}
+
 		if (this.state.password === undefined || this.state.password.length ===0 || this.state.password === "") {
 			this.setState({
 				Phonenumberisnotcosmmm:"密码不能为空",
@@ -379,9 +403,8 @@ class LoginRegisterComponent extends Component {
 			return
 		}
 	}
-	//是否验证通过
+
-	dragOkCallback = () => {
+	inputOnBlurzhuche = (e)=>{
-		console.log(this.state.login);
 		if(this.state.login===""||this.state.login.length===0){
 			this.setState({
 				Phonenumberisnotco: "账号不能为空",
@@ -394,7 +417,28 @@ class LoginRegisterComponent extends Component {
 		this.setState({
 			Phonenumberisnotcosytdhk:undefined,
 		})
-		this.Emailphonenumberverification(this.state.login)
+		this.Emailphonenumberverification(e.target.value)
+	}
+	//是否验证通过
+	dragOkCallback = () => {
+		console.log(this.state.login);
+		if(this.state.pciphone===false) {
+
+			if (this.state.login === "" || this.state.login.length === 0) {
+				this.setState({
+					Phonenumberisnotco: "账号不能为空",
+					Phonenumberisnotcobool: true,
+					dragOk: false,
+					Whethertoverify: this.state.Whethertoverify === true ? false : true,
+				})
+				return
+			}
+			this.setState({
+				Phonenumberisnotcosytdhk: undefined,
+			})
+			this.Emailphonenumberverification(this.state.login)
+
+		}
 
 	}
 	//邮箱手机号验证
@@ -454,6 +498,7 @@ class LoginRegisterComponent extends Component {
 			readonlyInput,
 			codes,
 			Whethertoverify,
+			pciphone,
 		} = this.state
 		// height: 346px;
 		return (
@@ -528,6 +573,7 @@ class LoginRegisterComponent extends Component {
 						<Input style={loginInputsyl} type="text" autoComplete="off" onClick={this.changeTypey}
 									 className={Phonenumberisnotco && Phonenumberisnotco !== "" ?" color-grey-9 loginInputzhucheyslass bor-reds":" color-grey-9 loginInputzhuche"}
 									 placeholder="输入注册手机号或邮箱" value={this.state.login}
+									 onBlur={(e) => this.inputOnBlurzhuche(e)}
 									 onChange={this.loginInputonChange} style={{marginTop: '10px', height: "38px"}}></Input>
 						{
 							Phonenumberisnotco && Phonenumberisnotco !== "" ?
@@ -538,7 +584,7 @@ class LoginRegisterComponent extends Component {
 						}
 
 						{
-							Whethertoverify===false?
+							Whethertoverify===false&&pciphone===true?
 								<DragValidator
 									height={38} successGreenColor="#29bd8b"
 									style={{height: "38px", width: "100%"}}
@@ -549,7 +595,7 @@ class LoginRegisterComponent extends Component {
 
 						}
 						{
-							Whethertoverify===true?
+							Whethertoverify===true&&pciphone===true?
 								<DragValidatortwo
 									height={38} successGreenColor="#29bd8b"
 									style={{height: "38px", width: "100%"}}

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

@@ -60,6 +60,7 @@ class LoginRegisterComponent extends Component {
                 Phonenumberisnotcodmm:undefined,
                 Phonenumberisnotcobool: false,
                 Whethertoverify:false,
+                pciphone:true,
 
             }
         }
@@ -94,11 +95,27 @@ class LoginRegisterComponent extends Component {
                 Phonenumberisnotcobool: false,
                 Phonenumberisnotcodmm:undefined,
                 Whethertoverify:false,
+                pciphone:true,
 
             }
         }
     }
 
+    //判断是否是手机端
+     IsPC=()=> {
+        var userAgentInfo = navigator.userAgent;
+        var Agents = ["Android", "iPhone",
+            "SymbianOS", "Windows Phone",
+            "iPad", "iPod"];
+        var flag = true;//这个意思是说自己的是pc 端
+        for (var v = 0; v < Agents.length; v++) {
+            if (userAgentInfo.indexOf(Agents[v]) > 0) {
+                flag = false;
+                break;
+            }
+        }
+        return flag;
+    }
 // 点击表单后，改变type
     changeType = () => {
         this.setState({classpass: 'password'});
@@ -106,17 +123,21 @@ class LoginRegisterComponent extends Component {
     componentDidMount = () => {
         // console.log("componentDidUpdate");
         // console.log(this.props);
+        let pcipns=this.IsPC();
         if (this.props.match.url === "/login") {
             console.log("11111111111111111111111111");
             this.state = {
                 tab:["0"],
+                pciphone:pcipns,
             }
         } else if (this.props.match.url === "/register") {
             this.state = {
                 tab:["1"],
+                pciphone:pcipns,
             }
         }
 
+
     }
     openNotification = (messge,type) => {
         // type  1 成功提示绿色 2提醒颜色黄色 3错误提示红色
@@ -286,17 +307,20 @@ class LoginRegisterComponent extends Component {
         //     this.openNotification(`请同意服务协议条款`,2);
         //     return;
         // }
+        if(this.state.pciphone===true){
+            if (this.state.dragOk === false) {
+                // this.openNotification(`请拖动滑块完成验证`,2);
+                this.setState({
+                    Phonenumberisnotcosytdhk:"请拖动滑块完成验证",
+                })
+                return
+            }
+        }
         if (this.state.logins === undefined || this.state.logins === ""||this.state.logins.length===0) {
             this.setState({
                 Phonenumberisnotcos:"账号不能为空",
             })
             return
-        } else if (this.state.dragOk === false) {
-            // this.openNotification(`请拖动滑块完成验证`,2);
-            this.setState({
-                Phonenumberisnotcosytdhk:"请拖动滑块完成验证",
-            })
-            return
         } else if (this.state.codes === undefined || this.state.codes == ""||this.state.codes.length===0) {
             // this.openNotification(`请输入验证码`,2);
             this.setState({
@@ -557,6 +581,11 @@ class LoginRegisterComponent extends Component {
         this.isCorrectname(e.target.value, id);
         // this.Emailphonenumberverification(e.target.value, id);
     }
+    inputOnBlurzhuche = (e, id) => {
+        if(this.state.pciphone===false) {
+            this.Emailphonenumberverification(e.target.value, id);
+        }
+    }
     //获取登入密码
     passwordonChange = (e) => {
         // console.log(e.target.value);
@@ -673,6 +702,7 @@ class LoginRegisterComponent extends Component {
             Phonenumberisnotcodmm,
             // 注册
             readAgreement,
+            pciphone,
         } = this.state
         // height: 346px;
         if (this.state.seconds === 0) {
@@ -780,6 +810,7 @@ class LoginRegisterComponent extends Component {
                                    value={this.state.logins}
                                    type="text" autoComplete="off"
                                    onChange={this.loginInputonChanges}
+                                    onBlur={(e) => this.inputOnBlurzhuche(e, 2)}
                                    style={{marginTop: '30px' , height: '38px',color:'#999999',fontSize:"14px"}}></Input>
                             {
                                 Phonenumberisnotcos && Phonenumberisnotcos !== "" ?
@@ -790,7 +821,7 @@ class LoginRegisterComponent extends Component {
 
                             }
                             {
-                                Whethertoverify===false?
+                                Whethertoverify===false&&pciphone===true?
                                   <DragValidator
                                     height={38}  successGreenColor="#29bd8b"
                                     style={{ height: '38px'}}
@@ -801,7 +832,7 @@ class LoginRegisterComponent extends Component {
 
                             }
                             {
-                                Whethertoverify===true?
+                                Whethertoverify===true&&pciphone===true?
                                 <DragValidatortwo
                                   height={38}  successGreenColor="#29bd8b"
                                   style={{ height: '38px'}}