Merge branch 'dev_Ysm' of https://bdgit.educoder.net/Hjqreturn/educoder into topic_bank

public/react/src/modules/courses/new/CoursesNew.js

@@ -574,7 +574,7 @@ class CoursesNew extends Component {
 																	{this.props.match.params.coursesId === undefined ?"翻转课堂":dataname}
                                 </a>
                                 <span className="color-grey-9 fl ml3 mr3">&gt;</span>
-                                <WordsBtn className="fl cdefault">{this.props.match.params.coursesId === undefined ?"新建课堂":"编辑课堂"}</WordsBtn>
+                                <span className="fl cdefault">{this.props.match.params.coursesId === undefined ?"新建课堂":"编辑课堂"}</span>
                             </p>
 
 

public/react/src/modules/courses/new/Goldsubject.js

@@ -696,7 +696,7 @@ class Goldsubject extends Component {
 								<a className="btn colorgrey fl hovercolorblue " href={Whethertocreateanewclassroom===true?"/courses":this.props.current_user&&this.props.current_user.first_category_url}
 								>{Whethertocreateanewclassroom===true?"翻转课堂":name}</a>
 								<span className="color-grey-9 fl ml3 mr3">&gt;</span>
-								<WordsBtn className="fl cdefault">{Whethertocreateanewclassroom===true?"新建课堂":"编辑课堂"}</WordsBtn>
+								<span className="fl cdefault">{Whethertocreateanewclassroom===true?"新建课堂":"编辑课堂"}</span>
 							</p>
 
 							<div style={{width: '100%', height: '50px'}}>

public/react/src/modules/login/Trialapplication.js

@@ -305,7 +305,7 @@ class Trialapplication extends Component {
 			return;
 		}
 		// var telephone = $("#telephoneAdd.tianjia_phone").val();
-		var regph = /^[1][3,4,5,6,7,8][0-9]{9}$/;
+		var regph = /^[1][3,4,5,6,7,8,9][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]+$/;
 

public/react/src/modules/login/Trialapplicationysl.js

@@ -323,7 +323,7 @@ class Trialapplicationysl extends Component {
 			return;
 		}
 		// var telephone = $("#telephoneAdd.tianjia_phone").val();
-		var regph = /^[1][3,4,5,6,7,8][0-9]{9}$/;
+		var regph = /^[1][3,4,5,6,7,8,9][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]+$/;
 

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

@@ -375,7 +375,7 @@ class LoginRegisterComponent extends Component {
 			return;
 		}
 		// var telephone = $("#telephoneAdd.tianjia_phone").val();
-		var regph = /^[1][3,4,5,6,7,8][0-9]{9}$/;
+		var regph = /^[1][3,4,5,6,7,8,9][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]+$/;
 
@@ -438,7 +438,7 @@ class LoginRegisterComponent extends Component {
 			// 	return;
 			// }
 			// var telephone = $("#telephoneAdd.tianjia_phone").val();
-			var regph = /^[1][3,4,5,6,7,8][0-9]{9}$/;
+			var regph = /^[1][3,4,5,6,7,8,9][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]+$/;
 
@@ -500,7 +500,7 @@ class LoginRegisterComponent extends Component {
 				return
 			}
 		// var telephone = $("#telephoneAdd.tianjia_phone").val();
-		var regph = /^[1][3,4,5,6,7,8][0-9]{9}$/;
+		var regph = /^[1][3,4,5,6,7,8,9][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]+$/;
 

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

@@ -233,7 +233,7 @@ class LoginRegisterComponent extends Component {
             return;
         }
         // var telephone = $("#telephoneAdd.tianjia_phone").val();
-        var regph = /^[1][3,4,5,6,7,8][0-9]{9}$/;
+        var regph = /^[1][3,4,5,6,7,8,9][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]+$/;
 
@@ -700,7 +700,7 @@ class LoginRegisterComponent extends Component {
             return;
         }
         // var telephone = $("#telephoneAdd.tianjia_phone").val();
-        var regph = /^[1][3,4,5,6,7,8][0-9]{9}$/;
+        var regph = /^[1][3,4,5,6,7,8,9][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]+$/;
 
@@ -1103,16 +1103,15 @@ class LoginRegisterComponent extends Component {
                                         right: 12px;
                                         height: 20px;
                                     }
-                                      .ant-input{
+                                    .mymimasysl {
 																		border-right: none !important;
-																		height: 40px !important;
 																		}
                                     `
                               }
                           </style>
                           <Input  placeholder="输入8~16位密码，区分大小写"
                                   type={classpassbool===false?"text":"password"}
-                                  className={Phonenumberisnotcosymmm && Phonenumberisnotcosymmm !== "" ?"  font-14   color-grey-9 loginInputzhucheysl ":"  font-14   color-grey-9 loginInputzhuche"}
+                                  className={Phonenumberisnotcosymmm && Phonenumberisnotcosymmm !== "mymimasysl" ?"  font-14   color-grey-9 loginInputzhucheysl mymimasysl":"  font-14   color-grey-9 loginInputzhuche mymimasysl"}
                                   autoComplete="new-password"
                                   onClick={this.changeType}
                                   value={this.state.passwords} onChange={this.passwordonChanges}