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

public/react/public/css/edu-all.css

@@ -11,10 +11,11 @@
     float: left;
     width: 97px;}
 .head-nav{
+    float: left;
     text-align: center;
     height: 60px;
     box-sizing: border-box;
-    min-width: 1000px;
+    min-width: 1200px;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;

public/react/src/AppConfig.js

@@ -20,16 +20,16 @@ function locationurl(list){
 
 // TODO 开发期多个身份切换
 let debugType =""
-// if (isDev) {
+if (isDev) {
-//   	const _search = window.location.search;
+  	const _search = window.location.search;
-//     let parsed = {};
+    let parsed = {};
-//     if (_search) {
+    if (_search) {
-//       parsed = queryString.parse(_search);
+      parsed = queryString.parse(_search);
-//   	}
+  	}
-//     debugType = window.location.search.indexOf('debug=t') != -1 ? 'teacher' :
+    debugType = window.location.search.indexOf('debug=t') != -1 ? 'teacher' :
-//         window.location.search.indexOf('debug=s') != -1 ? 'student' :
+        window.location.search.indexOf('debug=s') != -1 ? 'student' :
-//         window.location.search.indexOf('debug=a') != -1 ? 'admin' : parsed.debug || 'admin'
+        window.location.search.indexOf('debug=a') != -1 ? 'admin' : parsed.debug || 'admin'
-// }
+}
 window._debugType = debugType;
 export function initAxiosInterceptors(props) {
 

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

@@ -102,6 +102,8 @@ class LoginDialog extends Component {
         authCodeclass:'log-botton mt5',
         isRender: false,
         MyEduCoderModals:false,
+        Phonenumberisnotco:undefined,
+        Phonenumberisnotcobool:false,
 
       };
     }
@@ -112,26 +114,103 @@ class LoginDialog extends Component {
      register=(num) =>{
       this.setState({login:1,speedy:num,dialogBox:'dialogBox2'});
      }
+      inputOnBlur = (e, id) => {
+        this.Emailphonenumberverification(e.target.value, 1);
+      };
+     // 输入页面
+     loginChange = (e) =>{
+       var stirngt="";
+       if(e.target.value.length>0){
+         var str=  e.target.value.replace(/\s*/g,"")
+         stirngt=str;
+       }else{
+         stirngt=  e.target.value;
+       }
 
-     loginChange = () =>{
+       if (e.target.value.length === 0) {
-      let reg = /^(\w-*\.*)+@(\w-?)+(\.\w{2,})+$/;
+         this.setState({
-      let reg1 = /^1\d{10}$/;
+           loginValue: stirngt,
-      let reg2=/^[a-zA-z]\w{3,14}$/;
+           Phonenumberisnotco:undefined,
-      //      let reg3=/^[a-zA-Z0-9]+([.\-_\\]*[a-zA-Z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$/;
+         })
-      let value=this.refs.loginPassText.value;
-      let valuenum= value.length;
-      if(valuenum>0){
-          if(!reg.test(value)&&!reg1.test(value)&&!reg2.test(value)){
-            this.setState({regular:1})
-            return
        }else{
-          this.setState({loginValue:value})
+         this.setState({
-          this.setState({regular:0})
+           loginValue: stirngt,
+           Phonenumberisnotco:undefined,
+         })
        }
+      // let reg = /^(\w-*\.*)+@(\w-?)+(\.\w{2,})+$/;
+      // let reg1 = /^1\d{10}$/;
+      // let reg2=/^[a-zA-z]\w{3,14}$/;
+      // //      let reg3=/^[a-zA-Z0-9]+([.\-_\\]*[a-zA-Z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$/;
+      // let value=this.refs.loginPassText.value;
+      // let valuenum= value.length;
+      // if(valuenum>0){
+      //     if(!reg.test(value)&&!reg1.test(value)&&!reg2.test(value)){
+      //       this.setState({regular:1})
+      //       return
+      //   }else{
+      //     // this.setState({loginValue:value});
+      //     this.setState({regular:0});
+      //       var stirngt;
+      //       if(value.length>0){
+      //         var str= value.replace(/\s*/g,"")
+      //         stirngt=str;
+      //       }else{
+      //         stirngt=  value;
+      //       }
+      //       this.setState({
+      //         loginValue:stirngt,
+      //       });
+      //   }
+      // }else{
+        // this.setState({loginValue:value});
+        // var stirngt;
+        // if(value.length>0){
+        //   var str= value.replace(/\s*/g,"")
+        //   stirngt=str;
+        // }else{
+        //   stirngt=  value;
+        // }
+        // this.setState({
+        //   loginValue:stirngt,
+        // });
+      // }
+     };
+  //邮箱手机号验证
+  Emailphonenumberverification = (value, id) => {
+    var url = `/accounts/valid_email_and_phone.json`;
+    axios.get((url), {
+      params: {
+        login: value,
+        type: 1,
+      }
+    }).then((result) => {
+      if(result){
+        if(result.data.status===-2){
+            if(result.data.message==="该手机号码或邮箱已被注册"){
+              this.setState({
+                Phonenumberisnotco: undefined,
+                Phonenumberisnotcobool: false,
+              })
             }else {
-        this.setState({loginValue:value})
+              this.setState({
+                Phonenumberisnotco: result.data.message,
+                Phonenumberisnotcobool: true,
+              })
+            }
+            return;
+        }else {
+            this.setState({
+              Phonenumberisnotco: undefined,
+              Phonenumberisnotcobool: false,
+            })
+            return;
         }
       }
+    }).catch((error) => {
+
+    })
+  };
 
      passwordChange = () =>{
       let value =this.refs.passwordText.value;
@@ -411,7 +490,7 @@ class LoginDialog extends Component {
     window.location.href = url;
   };
     render() {
-      let{open,login,speedy,loginValue,regular,isGoing,isGoingValue,disabled,bottonclass,
+      let{open,login,speedy,loginValue,regular,isGoing,isGoingValue,disabled,bottonclass,Phonenumberisnotco,
         dialogBox,shortcutnum,disabledType,gaincode,authCodeType,authCodeclass, isRender}=this.state;
 
         if (isRender === undefined) {
@@ -457,11 +536,13 @@ class LoginDialog extends Component {
                           id="name_loggin_input"
                           ref="loginPassText"
                           onInput={this.loginChange}
+                          onBlur={(e) => this.inputOnBlur(e, 1)}
+                          value={this.state.loginValue}
                           name="username"
                           placeholder="请输入有效的手机号/邮箱号" ></input>
 
                           <div style={{height: '25px'}}><p className="color-orange edu-txt-left none" id="username_error_notice"
-                            style={{display: regular==0?'none':'block'}}>请输入有效的手机号/邮箱号</p></div>
+                            style={{display: Phonenumberisnotco===undefined?'none':'block'}}>{Phonenumberisnotco}</p></div>
 
                           <div>
                             <input type="password" id="password_loggin_input"

public/react/src/modules/tpm/NewHeader.js

@@ -713,6 +713,10 @@ submittojoinclass=(value)=>{
               ><a href={this.props.Headertop===undefined?"":this.props.Headertop.auth}>工程认证</a></li>
             </ul>
 
+
+          </div>
+				</div>
+
 				<style>
 					{
 						`
@@ -722,7 +726,7 @@ submittojoinclass=(value)=>{
 								top: -2px;
 								background: #fff;
 								z-index: 2;
-										right: -241px;
+								right: 185px;
 								}
 								`
 					}
@@ -771,10 +775,6 @@ submittojoinclass=(value)=>{
 					</div>
 				</div>
 
-          </div>
-				</div>
-
-
           {/*<span className="font-15 fr mt17">
 			      	<%= link_to '登录', signin_path, :className => "mr5" %>
 			      	<em className="vertical-line"></em>

public/react/src/modules/tpm/TPMIndexHOC.js

@@ -20,7 +20,7 @@ const versionNum = '0001';
 // let _url_origin = getUrl()
 let _url_origin='';
 if(window.location.port === "3007"){
-	_url_origin="https://newweb.educoder.net";
+	_url_origin="http://47.96.87.25:48080/";
 }
 
 // let _url_origin=`https://www.educoder.net`;

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

@@ -547,7 +547,7 @@ class LoginRegisterComponent extends Component {
         }).catch((error) => {
 
         })
-    }
+    };
     //短信验证
     SMSverification = () => {
         var url = `/accounts/get_verification_code.json`;

public/stylesheets/educoder/edu-all.css

@@ -15,7 +15,7 @@
     text-align: center;
     height: 60px;
     box-sizing: border-box;
-    min-width: 1000px;
+    min-width: 1200px;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;