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

---
 .../react/src/modules/courses/coursesPublic/Addcourses.js  | 2 +-
 .../src/modules/paths/PathDetail/DetailCardsEditAndAdd.js  | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/public/react/src/modules/courses/coursesPublic/Addcourses.js b/public/react/src/modules/courses/coursesPublic/Addcourses.js
index 749e4870c..99b7db945 100644
--- a/public/react/src/modules/courses/coursesPublic/Addcourses.js
+++ b/public/react/src/modules/courses/coursesPublic/Addcourses.js
@@ -314,7 +314,7 @@ class Addcourses extends Component{
                     <label className="panel-form-label fl">课堂邀请码：</label>
                     <Input type="text" className="input-60-40 fl mt5" name="invite_code"
                            placeholder="请输入5位课堂邀请码或6位分班邀请码"
-                           style={{ height: '30px'}}
+                           style={{width:'275px',height:'30px'}}
                            value={invite_code} onInput={this.inputjoinclassvalue}/>
                   </li>
 
diff --git a/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js b/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js
index 6e2ca0883..bfaaaacc7 100644
--- a/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js
+++ b/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js
@@ -140,17 +140,20 @@ class DetailCardsEditAndAdd extends Component{
   //打开选择实训弹框初始化tag标签和列表
   changeTag=(id,search)=>{
     this.setState({
-      hometypepvisible:true
+      hometypepvisible:true,
+			ChooseShixunListshixun_list:[],
+			page:1
     })
     let pathId=this.props.pathid;
     let {page}=this.state;
-    let url='/paths/'+pathId+'/choose_subject_shixun.json?page='+page
+		let url='/paths/'+pathId+'/choose_subject_shixun.json?page='+1
     if(search!="" && search!=undefined){
       url+="&search="+search;
     }
     if(id!=0){
       url+="&type="+id;
     }
+
     axios.get(url).then((result)=>{
       if(result.status===200){
         this.setState({

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

---
 .../react/src/modules/courses/coursesPublic/Addcourses.js   | 2 +-
 public/react/src/modules/tpm/NewHeader.js                   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/react/src/modules/courses/coursesPublic/Addcourses.js b/public/react/src/modules/courses/coursesPublic/Addcourses.js
index 99b7db945..b140508d4 100644
--- a/public/react/src/modules/courses/coursesPublic/Addcourses.js
+++ b/public/react/src/modules/courses/coursesPublic/Addcourses.js
@@ -314,7 +314,7 @@ class Addcourses extends Component{
                     <label className="panel-form-label fl">课堂邀请码：</label>
                     <Input type="text" className="input-60-40 fl mt5" name="invite_code"
                            placeholder="请输入5位课堂邀请码或6位分班邀请码"
-                           style={{width:'275px',height:'30px'}}
+                           style={{width:'275px'}}
                            value={invite_code} onInput={this.inputjoinclassvalue}/>
                   </li>
 
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index c1ad97276..8e48e8b0d 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -737,14 +737,14 @@ submittojoinclass=(value)=>{
                         <ul>
                           <li className="clearfix mb10">
                             <label className="panel-form-label fl">项目邀请码：</label>
-                            <Input type="text" className="input-60-40 fl" name="invite_code"
+                            <Input type="text" className="input-60-40 fl mt5" name="invite_code"
 																	 style={{width: '275px'}}
-                                   placeholder="请输入5位课堂邀请码或6位分班邀请码" value={tojoinclasstitle} onInput={this.inputjoinclassvalue}/>
+                                   placeholder="请输入5位项目邀请码或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"}}>请输入5位项目邀请码或6位分班邀请码</p>
 
                           <li className="clearfix ">
 

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

---
 .../paths/PathDetail/DetailCardsEditAndAdd.js | 85 ++++++++++---------
 1 file changed, 47 insertions(+), 38 deletions(-)

diff --git a/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js b/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js
index bfaaaacc7..e47fe5a0f 100644
--- a/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js
+++ b/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js
@@ -59,7 +59,8 @@ class DetailCardsEditAndAdd extends Component{
   AddShixunBox = () =>{
     this.setState({
       selectShixun:true,
-      patheditarry:[]
+      patheditarry:[],
+			page:1
     })
     this.changeTag(0,"");
   }
@@ -68,6 +69,7 @@ class DetailCardsEditAndAdd extends Component{
   cloasShixunBox =()=>{
     this.setState({
       selectShixun:false,
+			page:1,
       patheditarry:[]
     })
   }
@@ -103,7 +105,8 @@ class DetailCardsEditAndAdd extends Component{
         shixuns_listedit:newshixuns_listedit,
         shixuns_listeditlist:list,
         patheditarry:[],
-        selectShixun:false
+        selectShixun:false,
+				page:1,
       })
     }).catch((error) => {
       console.log(error)
@@ -141,8 +144,6 @@ class DetailCardsEditAndAdd extends Component{
   changeTag=(id,search)=>{
     this.setState({
       hometypepvisible:true,
-			ChooseShixunListshixun_list:[],
-			page:1
     })
     let pathId=this.props.pathid;
     let {page}=this.state;
@@ -156,6 +157,11 @@ class DetailCardsEditAndAdd extends Component{
 
     axios.get(url).then((result)=>{
       if(result.status===200){
+				this.setState({
+					ChooseShixunListshixun_list:[],
+					page:1
+				})
+
         this.setState({
           ChooseShixunList:result.data,
           hometypepvisible:false,
@@ -290,43 +296,46 @@ class DetailCardsEditAndAdd extends Component{
 
 
   contentViewScrolladd=(e)=>{
-
+   let {page}=this.state;
     //滑动到底判断
     if(e.currentTarget.scrollHeight-e.currentTarget.scrollTop===e.currentTarget.clientHeight){
       // console.log("到达底部");
-      this.setState({
-        hometypepvisible:true
-      })
-      let pathId=this.props.pathid;
-      let {search,page,type,ChooseShixunListshixun_list}=this.state;
-      let newpage=page+1;
-      let newChooseShixunListshixun_list=ChooseShixunListshixun_list;
-      let url='/paths/'+pathId+'/choose_subject_shixun.json?page='+newpage
-      if(search!="" && search!=undefined){
-        url+="&search="+search;
-      }
-      if(type!=0){
-        url+="&type="+type;
-      }
-      axios.get(url).then((result)=>{
-        if(result.status===200){
-          let list =result.data.shixun_list;
-
-          for(var i=0; i<list.length; i++){
-            newChooseShixunListshixun_list.push(list[i])
-          }
-          this.setState({
-            ChooseShixunList:result.data,
-            hometypepvisible:false,
-            type:type,
-            search:search,
-            page:newpage,
-            ChooseShixunListshixun_list:newChooseShixunListshixun_list
-          })
-        }
-      }).catch((error)=>{
-        console.log(error);
-      })
+			if(page!=1){
+				this.setState({
+					hometypepvisible:true
+				})
+				let pathId=this.props.pathid;
+				let {search,page,type,ChooseShixunListshixun_list}=this.state;
+				let newpage=page+1;
+				let newChooseShixunListshixun_list=ChooseShixunListshixun_list;
+				let url='/paths/'+pathId+'/choose_subject_shixun.json?page='+newpage
+				if(search!="" && search!=undefined){
+					url+="&search="+search;
+				}
+				if(type!=0){
+					url+="&type="+type;
+				}
+				axios.get(url).then((result)=>{
+					if(result.status===200){
+						let list =result.data.shixun_list;
+
+						for(var i=0; i<list.length; i++){
+							newChooseShixunListshixun_list.push(list[i])
+						}
+						this.setState({
+							ChooseShixunList:result.data,
+							hometypepvisible:false,
+							type:type,
+							search:search,
+							page:newpage,
+							ChooseShixunListshixun_list:newChooseShixunListshixun_list
+						})
+					}
+				}).catch((error)=>{
+					console.log(error);
+				})
+			}
+
     }
 
   }

From b75f5c0767c00d035e7b64eba92eadc6cd761285 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 11:54:09 +0800
Subject: [PATCH 4/8] 2

---
 public/react/src/modules/user/InterestpageMax.js |  2 +-
 public/react/src/modules/user/commontwo.css      | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/public/react/src/modules/user/InterestpageMax.js b/public/react/src/modules/user/InterestpageMax.js
index 17be9198e..8ed2580d7 100644
--- a/public/react/src/modules/user/InterestpageMax.js
+++ b/public/react/src/modules/user/InterestpageMax.js
@@ -273,7 +273,7 @@ class InterestpageMax extends Component {
 						{gouxuans4&&gouxuans4.map((item,key)=>{
 							return(
 								<div className={item.id<5?"ysldivhomediv12":"ysldivhomediv22"} onClick={()=>this.Clickteacher2(item.id)}>
-									{item.bool===true?<img src={gouxuan} className="yslgouxuanimg2"/>:<div className="yslgouxuanimg22"></div>}
+									{item.bool===true?<img src={gouxuan} className="yslgouxuanimg22x"/>:<div className="yslgouxuanimg22x"></div>}
 									<img className="div1img2" src={item.url}/>
 									<span className="textall2">{item.name}</span>
 								</div>
diff --git a/public/react/src/modules/user/commontwo.css b/public/react/src/modules/user/commontwo.css
index 36bbf248c..718139f36 100644
--- a/public/react/src/modules/user/commontwo.css
+++ b/public/react/src/modules/user/commontwo.css
@@ -168,14 +168,21 @@
     margin-left: 26px;
 
 }
-.yslgouxuanimg22{
+.div1img2xx{
+    width: 20px;
+    margin-left: 26px;
+
+}
+.yslgouxuanimg22x{
     width: 20px;
     height: 20px;
     margin-left: 75px;
 
 }
-.yslgouxuanimg2{
+.yslgouxuanimg2x{
     height: 20px;
+    width: 20px;
+    margin-left: 75px;
 }
 
 .yslbutondls{

From ffd13e728a82b0eb42aaedbb7a61452466027fff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Tue, 23 Jul 2019 12:08:32 +0800
Subject: [PATCH 5/8] =?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/App.js                       | 13 +++++----
 .../courses/coursesPublic/Addcourses.js       | 26 +++++++++++++----
 .../courses/coursesPublic/PathModal.js        | 13 +++++----
 .../paths/PathDetail/DetailCardsEditAndAdd.js | 28 +++++++++----------
 .../modules/tpm/TPMsettings/TPMsettings.js    | 10 ++++---
 .../src/modules/tpm/newshixuns/Newshixuns.js  | 12 +++++---
 6 files changed, 63 insertions(+), 39 deletions(-)

diff --git a/public/react/src/App.js b/public/react/src/App.js
index d7aa0a540..db6b6f43b 100644
--- a/public/react/src/App.js
+++ b/public/react/src/App.js
@@ -13,10 +13,11 @@ import '@icedesign/base/dist/ICEDesignBase.css';
 
 import '@icedesign/base/index.scss';
 
-import LoginDialog from './modules/login/LoginDialog'
-import Notcompletedysl from './modules/user/Notcompletedysl'
-import Trialapplicationysl from './modules/login/Trialapplicationysl'
-import Trialapplicationreview from './modules/user/Trialapplicationreview'
+import LoginDialog from './modules/login/LoginDialog';
+import Notcompletedysl from './modules/user/Notcompletedysl';
+import Trialapplicationysl from './modules/login/Trialapplicationysl';
+import Trialapplicationreview from './modules/user/Trialapplicationreview';
+import Addcourses from "./modules/courses/coursesPublic/Addcourses";
 import Trialapplication from './modules/login/Trialapplication'
 
 import NotFoundPage from './NotFoundPage'
@@ -41,6 +42,7 @@ import {initAxiosInterceptors} from './AppConfig'
 // ！！！tpi需要这个来加载css
 import {TPMIndexHOC} from './modules/tpm/TPMIndexHOC';
 
+
 const theme = createMuiTheme({
 	palette: {
 		primary: {
@@ -259,7 +261,7 @@ class App extends Component {
 
 
 	render() {
-	 // let {isRenders} = this.state;
+
 
 		return (
 			<LocaleProvider locale={zhCN}>
@@ -270,6 +272,7 @@ class App extends Component {
 					<Notcompletedysl {...this.props} {...this.state}></Notcompletedysl>
 					<Trialapplicationysl  {...this.props} {...this.state}></Trialapplicationysl>
 					<Trialapplicationreview  {...this.props} {...this.state}></Trialapplicationreview>
+				  <Addcourses {...this.props} {...this.state}/>
 					{/*{*/}
 					{/*	isRender === true?*/}
 					{/*		<LoginDialog></LoginDialog> : ""*/}
diff --git a/public/react/src/modules/courses/coursesPublic/Addcourses.js b/public/react/src/modules/courses/coursesPublic/Addcourses.js
index b140508d4..886ba2a0e 100644
--- a/public/react/src/modules/courses/coursesPublic/Addcourses.js
+++ b/public/react/src/modules/courses/coursesPublic/Addcourses.js
@@ -28,6 +28,20 @@ class Addcourses extends Component{
   }
 
   componentDidMount() {
+		axios.interceptors.response.use((response) => {
+			if (response != undefined)
+				if (response && response.data.status === 409) {
+					this.setState({
+						Addcoursestypes: true
+					})
+
+				}
+			return response;
+		}, (error) => {
+			//TODO 这里如果样式变了会出现css不加载的情况
+
+		});
+
 
     let {Addcoursestype}=this.props;
     this.setState({
@@ -102,7 +116,7 @@ class Addcourses extends Component{
 
 
   hidetojoinclass=()=>{
-    this.props.hideAddcoursestype();
+
     // console.log(this.props)
     this.setState({
       invite_code:undefined,
@@ -114,9 +128,10 @@ class Addcourses extends Component{
       Checkboxteachingtype:false,
       professor:null,
       assistant_professor:null,
-      student:null
+      student:null,
+			Addcoursestypes:false
     })
-
+		this.props.hideAddcoursestype();
   }
 
   submitasyn=(course_id)=>{
@@ -285,7 +300,8 @@ class Addcourses extends Component{
         loadtype,
         modalsType,
         modalsTopval,
-        modalSave
+        modalSave,
+			  Addcoursestypes
     }=this.state;
 		const antIcon = <Icon type="loading" style={{ fontSize: 24 }} spin />;
     return(
@@ -301,7 +317,7 @@ class Addcourses extends Component{
             keyboard={false}
             className={"HomeworkModal"}
             title="加入课堂"
-            visible={Addcoursestype}
+            visible={Addcoursestype===undefined?Addcoursestypes:Addcoursestype}
             closable={false}
             footer={null}
             destroyOnClose={true}
diff --git a/public/react/src/modules/courses/coursesPublic/PathModal.js b/public/react/src/modules/courses/coursesPublic/PathModal.js
index 824c50c78..10a298c90 100644
--- a/public/react/src/modules/courses/coursesPublic/PathModal.js
+++ b/public/react/src/modules/courses/coursesPublic/PathModal.js
@@ -91,7 +91,7 @@ class PathModal extends Component{
     this.setState({
       type:types,
       page:1,
-			newshixunmodallist:undefined
+			newshixunmodallist:[]
     })
     this.funshixunpathlist(Searchvalue,types,true,1)
   }
@@ -103,10 +103,11 @@ class PathModal extends Component{
     })
   }
   SenttotheSearch=(value)=>{
+		this.setState({
+			page:1,
+			newshixunmodallist:[]
+		})
     let{type}=this.state;
-    this.setState({
-      page:1,
-    })
     this.funshixunpathlist(value,type,true,1)
   }
 
@@ -269,7 +270,7 @@ class PathModal extends Component{
                 `}
               </style>
 
-              <div className="over210 pl20 pr20"
+							{ newshixunmodallist&&newshixunmodallist.length===0?"":<div className="over210 pl20 pr20"
                    onScroll={this.contentViewScrolledit}
                    style={{"Height":"204px"}}>
                   <Checkbox.Group style={{ width: '100%' }}  onChange={this.shixunhomeworkedit}>
@@ -298,7 +299,7 @@ class PathModal extends Component{
                       })
                     }
                   </Checkbox.Group>
-              </div>
+              </div>}
               { this.state.patheditarrytype===true?<span className={"color-red"}>{this.state.patheditarryvalue}</span>:""}
               <div className="mt20 marginauto clearfix edu-txt-center">
                 <a className="pop_close task-btn mr30 margin-tp26" onClick={this.hidecouseShixunModal}>取消</a>
diff --git a/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js b/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js
index e47fe5a0f..fc0a0fea9 100644
--- a/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js
+++ b/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js
@@ -142,11 +142,15 @@ class DetailCardsEditAndAdd extends Component{
 
   //打开选择实训弹框初始化tag标签和列表
   changeTag=(id,search)=>{
-    this.setState({
-      hometypepvisible:true,
-    })
-    let pathId=this.props.pathid;
-    let {page}=this.state;
+
+		this.setState({
+			ChooseShixunListshixun_list:[],
+			page:1,
+			hometypepvisible:true,
+		})
+
+		let pathId=this.props.pathid;
+
 		let url='/paths/'+pathId+'/choose_subject_shixun.json?page='+1
     if(search!="" && search!=undefined){
       url+="&search="+search;
@@ -157,11 +161,6 @@ class DetailCardsEditAndAdd extends Component{
 
     axios.get(url).then((result)=>{
       if(result.status===200){
-				this.setState({
-					ChooseShixunListshixun_list:[],
-					page:1
-				})
-
         this.setState({
           ChooseShixunList:result.data,
           hometypepvisible:false,
@@ -296,11 +295,10 @@ class DetailCardsEditAndAdd extends Component{
 
 
   contentViewScrolladd=(e)=>{
-   let {page}=this.state;
     //滑动到底判断
     if(e.currentTarget.scrollHeight-e.currentTarget.scrollTop===e.currentTarget.clientHeight){
       // console.log("到达底部");
-			if(page!=1){
+		debugger
 				this.setState({
 					hometypepvisible:true
 				})
@@ -334,7 +332,7 @@ class DetailCardsEditAndAdd extends Component{
 				}).catch((error)=>{
 					console.log(error);
 				})
-			}
+
 
     }
 
@@ -493,7 +491,7 @@ class DetailCardsEditAndAdd extends Component{
                       `
 		                  }
 	                  </style>
-                    <div className="over180 pl20 pr20"
+										{ChooseShixunListshixun_list && ChooseShixunListshixun_list.length===0?"": <div className="over180 pl20 pr20"
                          onScroll={this.contentViewScrolladd}
                       >
                       <Checkbox.Group style={{ width: '100%' }}   onChange={this.shixunhomeworkedit}>
@@ -520,7 +518,7 @@ class DetailCardsEditAndAdd extends Component{
                           })
                         }
                       </Checkbox.Group>
-                    </div>
+                    </div>}
                     <div className="mt20 marginauto clearfix edu-txt-center">
                       <a className="pop_close task-btn mr30 margin-tp26" onClick={this.cloasShixunBox}>取消</a>
                       <a className="task-btn task-btn-orange margin-tp26" id="submit_send_shixun"  onClick={this.clickShixunchoose}>确定</a>
diff --git a/public/react/src/modules/tpm/TPMsettings/TPMsettings.js b/public/react/src/modules/tpm/TPMsettings/TPMsettings.js
index 72bbbe3d0..ed1249f0d 100644
--- a/public/react/src/modules/tpm/TPMsettings/TPMsettings.js
+++ b/public/react/src/modules/tpm/TPMsettings/TPMsettings.js
@@ -392,10 +392,12 @@ export default class TPMsettings extends Component {
     let departmentsUrl = `/shixuns/departments.json`;
     axios.get(departmentsUrl).then((response) => {
       if (response.status === 200) {
-        this.setState({
-          departmentslist: response.data.shools_name
-        });
-      }
+				if (response.data.message === undefined) {
+					this.setState({
+						departmentslist: response.data.shools_name
+					});
+				}
+			}
     }).catch((error) => {
       console.log(error)
     });
diff --git a/public/react/src/modules/tpm/newshixuns/Newshixuns.js b/public/react/src/modules/tpm/newshixuns/Newshixuns.js
index 956e652c8..cb0f08c0f 100644
--- a/public/react/src/modules/tpm/newshixuns/Newshixuns.js
+++ b/public/react/src/modules/tpm/newshixuns/Newshixuns.js
@@ -251,9 +251,11 @@ class Newshixuns extends Component {
         let departmentsUrl = `/shixuns/departments.json`;
         axios.get(departmentsUrl).then((response) => {
             if (response.status === 200) {
-                this.setState({
-                    departmentslist: response.data.shools_name
-                });
+							if (response.data.message===undefined) {
+								this.setState({
+									departmentslist: response.data.shools_name
+								});
+							}
             }
         }).catch((error) => {
             console.log(error)
@@ -496,7 +498,9 @@ class Newshixuns extends Component {
         function fake() {
             let departmentsUrl = `/shixuns/departments.json?q=` + currentValue;
             axios.get(departmentsUrl).then((response) => {
-                callback(response.data.shools_name);
+							if (response.data.message===undefined) {
+								callback(response.data.shools_name);
+							}
             }).catch((error) => {
                 console.log(error)
             });

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

---
 .../src/modules/courses/new/CoursesNew.js     | 28 +++++++++++--------
 public/react/src/modules/tpm/NewHeader.js     |  8 +++---
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/public/react/src/modules/courses/new/CoursesNew.js b/public/react/src/modules/courses/new/CoursesNew.js
index eb1627e83..a8f50b030 100644
--- a/public/react/src/modules/courses/new/CoursesNew.js
+++ b/public/react/src/modules/courses/new/CoursesNew.js
@@ -290,11 +290,13 @@ class CoursesNew extends Component {
             search:value
         }).then((result)=>{
             // console.log(result.data)
-            this.setState({
-                searchlist:result.data.course_lists,
-                // course:value,
-                fetching:false
-            })
+					if (response.data.message===undefined) {
+						this.setState({
+							searchlist: result.data.course_lists,
+							// course:value,
+							fetching: false
+						})
+					}
             // this.props.form.setFieldsValue({
             //     course:value
             // })
@@ -343,13 +345,15 @@ class CoursesNew extends Component {
                 search: value
             }
         }).then((result)=>{
-            this.setState({
-                searchlistscholl:result.data.school_names,
-                scholl:value
-            })
-            this.props.form.setFieldsValue({
-                scholl:value
-            })
+					if (response.data.message===undefined) {
+						this.setState({
+							searchlistscholl: result.data.school_names,
+							scholl: value
+						})
+						this.props.form.setFieldsValue({
+							scholl: value
+						})
+					}
         }).catch((error)=>{
             console.log(error)
         })
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index 8e48e8b0d..28de997cd 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -534,10 +534,10 @@ submittojoinclass=(value)=>{
 
       <div className="newHeader" id="nHeader"  >
 
-              {/*<LoginDialog*/}
-                  {/*{...this.state}*/}
-                  {/*{...this.props}*/}
-              {/*/>*/}
+              <LoginDialog
+                  {...this.state}
+                  {...this.props}
+              />
 
         <div className="educontent clearfix">
           {/*<%= link_to image_tag("/images/educoder/logo.png", alt:"高校智能化教学与实训平台", className:"logoimg"), home_path %>*/}

From 6966a475f026a709193e22b098b6a15ef9d99c43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Tue, 23 Jul 2019 12:18:04 +0800
Subject: [PATCH 7/8] =?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                 | 7 ++++---
 public/react/src/modules/login/LoginDialog.js | 5 +++--
 public/react/src/modules/tpm/NewHeader.js     | 6 +++---
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js
index 0cc9fd687..5721c88a9 100644
--- a/public/react/src/AppConfig.js
+++ b/public/react/src/AppConfig.js
@@ -18,9 +18,10 @@ function locationurl(list){
 }
 
 // TODO 开发期多个身份切换
-const debugType =window.location.search.indexOf('debug=t') != -1 ? 'teacher' :
-        window.location.search.indexOf('debug=s') != -1 ? 'student' : 'admin'
-window._debugType = 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/login/LoginDialog.js b/public/react/src/modules/login/LoginDialog.js
index d587dc337..54fe17b9f 100644
--- a/public/react/src/modules/login/LoginDialog.js
+++ b/public/react/src/modules/login/LoginDialog.js
@@ -392,11 +392,12 @@ class LoginDialog extends Component {
         }
 
     	return (
-            <Dialog open={true} id="DialogID"
+			<Dialog open={true} id="DialogID"
               style={{ display: isRender==false? 'none' : ''}}
 							disableEscapeKeyDown={true}
               onClose={() => this.handleDialogClose()}
             >
+				{isRender===true?
             <div className={dialogBox}>
                   <div id="closeIcon" onClick={()=>{this.handleDialogClose()}}>
                       <i className="iconfont icon-shanchudiao"></i>
@@ -489,7 +490,7 @@ class LoginDialog extends Component {
 
                   </div>
                 </div>
-
+					:""}
             </Dialog>
 
     	);
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index 28de997cd..2455b0be4 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -534,12 +534,12 @@ submittojoinclass=(value)=>{
 
       <div className="newHeader" id="nHeader"  >
 
-              <LoginDialog
+				{isRender===true?<LoginDialog
                   {...this.state}
                   {...this.props}
-              />
+              />:""}
 
-        <div className="educontent clearfix">
+				<div className="educontent clearfix">
           {/*<%= link_to image_tag("/images/educoder/logo.png", alt:"高校智能化教学与实训平台", className:"logoimg"), home_path %>*/}
           <a href="/">
             <img alt="高校智能化教学与实训平台" className="logoimg" src={getImageUrl("images/educoder/headNavLogo.png?1526520218")}></img>

From 32fa240e08d4f0ead379b8bf50e525af6dfeadcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Tue, 23 Jul 2019 12:23:24 +0800
Subject: [PATCH 8/8] b

---
 public/react/src/modules/courses/new/CoursesNew.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/react/src/modules/courses/new/CoursesNew.js b/public/react/src/modules/courses/new/CoursesNew.js
index a8f50b030..136e50d6e 100644
--- a/public/react/src/modules/courses/new/CoursesNew.js
+++ b/public/react/src/modules/courses/new/CoursesNew.js
@@ -290,7 +290,7 @@ class CoursesNew extends Component {
             search:value
         }).then((result)=>{
             // console.log(result.data)
-					if (response.data.message===undefined) {
+					if (result.data.message===undefined) {
 						this.setState({
 							searchlist: result.data.course_lists,
 							// course:value,
@@ -345,7 +345,7 @@ class CoursesNew extends Component {
                 search: value
             }
         }).then((result)=>{
-					if (response.data.message===undefined) {
+					if (result.data.message===undefined) {
 						this.setState({
 							searchlistscholl: result.data.school_names,
 							scholl: value