From cf9c4cad858baf6bbfed64dadba11b30eb0c1db1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Tue, 23 Jul 2019 17:20:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/AppConfig.js                 |  8 +++---
 .../courses/coursesPublic/Addcourses.js       |  2 +-
 public/react/src/modules/login/LoginDialog.js |  2 +-
 public/react/src/modules/tpm/NewHeader.js     | 26 +++++++++----------
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js
index 81dd855ea..467520507 100644
--- a/public/react/src/AppConfig.js
+++ b/public/react/src/AppConfig.js
@@ -18,10 +18,10 @@ function locationurl(list){
 }
 
 // TODO 开发期多个身份切换
-const debugType ="";
-// const debugType =window.location.search.indexOf('debug=t') != -1 ? 'teacher' :
-//   window.location.search.indexOf('debug=s') != -1 ? 'student' : 'admin'
-// window._debugType = debugType;
+// const debugType ="";
+const debugType =window.location.search.indexOf('debug=t') != -1 ? 'teacher' :
+  window.location.search.indexOf('debug=s') != -1 ? 'student' : 'admin'
+window._debugType = debugType;
 export function initAxiosInterceptors(props) {
 
     // TODO 避免重复的请求 https://github.com/axios/axios#cancellation
diff --git a/public/react/src/modules/courses/coursesPublic/Addcourses.js b/public/react/src/modules/courses/coursesPublic/Addcourses.js
index 39f2ac061..ab0a9eb56 100644
--- a/public/react/src/modules/courses/coursesPublic/Addcourses.js
+++ b/public/react/src/modules/courses/coursesPublic/Addcourses.js
@@ -62,7 +62,7 @@ class Addcourses extends Component{
 
   inputjoinclassvalue=(e)=>{
 		if(e.target.value.length>=7){
-			this.openNotification("只能输入小于7位数的邀请码!");
+			this.openNotification("请输入5位课堂邀请码或6位分班邀请码!");
 			return
 		}
     this.setState({
diff --git a/public/react/src/modules/login/LoginDialog.js b/public/react/src/modules/login/LoginDialog.js
index c6820d68f..7629eeef2 100644
--- a/public/react/src/modules/login/LoginDialog.js
+++ b/public/react/src/modules/login/LoginDialog.js
@@ -416,7 +416,7 @@ class LoginDialog extends Component {
                       <i className="iconfont icon-shanchudiao"></i>
                   </div>
 
-                  <div id="log_reg_content">
+                  <div id="log_reg_content" >
                     <ul className="log_nav clearfix">
                       <li className={login==0?'active':''} onClick={()=>{this.enter(0)}}>登录</li>
                       {/*<li className={speedy==0?'active':''}  onClick={()=>{this.register(0)}}>快捷登录</li>*/}
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index 9bc6d2c42..f8b0fc595 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -341,21 +341,21 @@ submittojoinclass=(value)=>{
     return
   }
   let newrolearr=rolearr;
-  if(value===1){
+  // if(value===1){
     if(tojoinclasstitle.length<6){
       this.setState({
         code_notice:true
       })
       return
     }
-  }else if(value===0){
-    if(tojoinclasstitle.length<5){
-      this.setState({
-        code_notice:true
-      })
-      return
-    }
-  }
+  // }else if(value===0){
+  //   if(tojoinclasstitle.length<5){
+  //     this.setState({
+  //       code_notice:true
+  //     })
+  //     return
+  //   }
+  // }
   if(tojoinclasstitle===""||tojoinclasstitle===undefined){
     this.setState({
       code_notice:true
@@ -477,8 +477,8 @@ submittojoinclass=(value)=>{
 
   inputjoinclassvalue=(e)=>{
     console.log(e.target.value.length);
-    if(e.target.value.length>=7){
-      this.openNotification("只能输入小于7位数的邀请码!");
+    if(e.target.value.length>=7||e.target.value.length<6){
+      this.openNotification("请输入6位项目邀请码!");
       return
     }
     this.setState({
@@ -811,12 +811,12 @@ submittojoinclass=(value)=>{
                             <label className="panel-form-label fl">项目邀请码：</label>
                             <Input type="text" className="input-60-40 fl mt5" name="invite_code"
 																	 style={{width: '275px'}}
-                                   placeholder="请输入5位项目邀请码或6位分班邀请码" value={tojoinclasstitle} onInput={this.inputjoinclassvalue}/>
+                                   placeholder="请输入6位项目邀请码" value={tojoinclasstitle} onInput={this.inputjoinclassvalue}/>
                           </li>
 
                           <p id="none_invite_code_notice"
                              className="color-orange none f12"
-                             style={{marginLeft: '90px',display:code_notice===true?'block':"none"}}>请输入5位项目邀请码或6位分班邀请码</p>
+                             style={{marginLeft: '90px',display:code_notice===true?'block':"none"}}>请输入6位项目邀请码</p>
 
                           <li className="clearfix ">