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

# Conflicts:
#	public/react/src/modules/login/Trialapplicationysl.js

public/react/src/modules/courses/coursesHome/coursesHome.js

@@ -114,14 +114,14 @@ class coursesHome extends Component{
                    onClick={ () => this.changeStatus("course_members_count")}>最热</a>
 
                 <div className="fr mr5 search-new">
-                    <Search
+                    {/* <Search
                     placeholder="课堂名称/教师姓名/学校名称"
                     id="subject_search_input"
                     value={search}
                     onInput={this.inputSearchValue}
                     onSearch={this.searchValue}
                     autoComplete="off"
-                    ></Search>
+                    ></Search> */}
                 </div>
 
             </div>

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

@@ -2203,8 +2203,48 @@ class Listofworksstudentone extends Component {
 	//
 	// }
 
+	daochushixunbaogao=()=>{
 
 
+	}
+
+
+
+	confirmysl(url){
+		axios.get(url).then((response) => {
+			if(response.data.status&&response.data.status===-1){
+
+			}else if(response.data.status&&response.data.status===-2){
+				if(response.data.messages === "100"){
+					// 已超出文件导出的上限数量（100 ），建议：
+
+					this.setState({
+						DownloadType:true,
+						DownloadMessageval:100
+					})
+				}else {
+					//因附件资料超过500M
+					this.setState({
+						DownloadType:true,
+						DownloadMessageval:500
+					})
+				}
+			}else {
+				this.props.showNotification(`正在下载中`);
+				window.open("/api"+url, '_blank');
+			}
+		}).catch((error) => {
+			console.log(error)
+		});
+	}
+
+
+	Downloadcal=()=>{
+		this.setState({
+			DownloadType:false,
+			DownloadMessageval:undefined
+		})
+	}
 	render() {
 		let {columns,course_groupysls,isAdmin, course_groupyslstwo, unlimited, unlimitedtwo, course_group_info, orders, task_status, checkedValuesine, searchtext, teacherlist, visible,visibles, game_list,columnsstu, limit,experience, boolgalist,viewtrainingdata, teacherdata, page, data, jobsettingsdata, styletable, datas, order, loadingstate,computeTimetype} = this.state;
 
@@ -2234,7 +2274,13 @@ class Listofworksstudentone extends Component {
 						updatas={() => this.isupdatas()}
 					/> : ""}
 
+					<DownloadMessageysl
+						{...this.props}
+						value={this.state.DownloadMessageval}
+						modalCancel={this.Downloadcal}
+						modalsType={this.state.DownloadType}
 
+					/>
 					{visibles === true ?
 						<div>
 							<style>

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

@@ -102,40 +102,8 @@ class ShixunHomeworkPage extends Component {
 		child.workshowmodel();
 	}
 	/// 确认是否下载
-	confirmysl(url){
-		axios.get(url).then((response) => {
-			if(response.data.status&&response.data.status===-1){
 
-			}else if(response.data.status&&response.data.status===-2){
-				if(response.data.messages === "100"){
-					// 已超出文件导出的上限数量（100 ），建议：
 
-					this.setState({
-						DownloadType:true,
-						DownloadMessageval:100
-					})
-				}else {
-					//因附件资料超过500M
-					this.setState({
-						DownloadType:true,
-						DownloadMessageval:500
-					})
-				}
-			}else {
-				this.props.showNotification(`正在下载中`);
-				window.open("/api"+url, '_blank');
-			}
-		}).catch((error) => {
-			console.log(error)
-		});
-	}
-
-	Downloadcal=()=>{
-		this.setState({
-			DownloadType:false,
-			DownloadMessageval:undefined
-		})
-	}
 	bindRef = ref => { this.child = ref }
 ///////////////教师截止
 
@@ -271,13 +239,13 @@ class ShixunHomeworkPage extends Component {
 						</div>
 					</div>
 
-					<DownloadMessageysl
-						{...this.props}
-						value={this.state.DownloadMessageval}
-						modalCancel={this.Downloadcal}
-						modalsType={this.state.DownloadType}
+					{/*<DownloadMessageysl*/}
+						{/*{...this.props}*/}
+						{/*value={this.state.DownloadMessageval}*/}
+						{/*modalCancel={this.Downloadcal}*/}
+						{/*modalsType={this.state.DownloadType}*/}
 
-					/>
+					{/*/>*/}
 
 					{parseInt(tab) === 0 ?<Listofworksstudentone    triggerRef={this.bindRef}  {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Listofworksstudentone>:""}
 					{parseInt(tab) === 1 ?<Workquestionandanswer   triggerRef={this.bindRef}  {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Workquestionandanswer>:""}

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

@@ -216,13 +216,13 @@ class Trialapplication extends Component {
 			this.setState({
 				isRenders: false
 			})
-			this.Cancel();
+			this.handleDialogClose()
 			window.location.href = "/";
 		} else {
 			this.setState({
 				isRenders: false
 			})
-			this.Cancel();
+			this.handleDialogClose()
 		}
 
 	}
@@ -277,14 +277,12 @@ class Trialapplication extends Component {
 					this.setState({
 						isRenders: false
 					})
-					this.Cancel();
-
+					this.handleDialogClose()
 				} else {
 					this.setState({
 						isRenders: false
 					})
-					this.Cancel();
-
+					this.handleDialogClose()
 				}
 			}
 		}).catch((error) => {

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

@@ -289,11 +289,12 @@ class Trialapplicationysl extends Component {
 			if(result !== undefined){
 				this.props.showNotification(`试用申请已提交，我们将尽快完成审核`);
 				// if (this.state.showTrial === false) {
+				window.location.href = "/";
 				this.setState({
 					isRenders: false
 				})
-				this.Cancel();
-				window.location.href = "/";
+				// this.Cancel();
+				this.handleDialogClose()
 				// } else {
 				// 	this.setState({
 				// 		isRenders: false

public/react/src/modules/tpm/shixuns/ShixunCardList.js

@@ -214,7 +214,7 @@ class ShixunCardList extends Component {
 							{/*enterButton*/}
 						{/*/>*/}
 
-            <Search
+            {/* <Search
               style={{ width: 300 }}
               className="fl"
               placeholder="请输入创建者/实训/关卡名称进行搜索"
@@ -222,7 +222,7 @@ class ShixunCardList extends Component {
               onInput={this.Input_searchs}
               onSearch={value => this.Input_search(value)}
               autoComplete="off"
-            ></Search>
+            ></Search> */}
 					</div>
 					<div className="fr">
 						<span className="fl color-grey-6 mr30 font-16 mt5" id="search_name">{