diff --git a/public/react/src/modules/courses/Resource/index.js b/public/react/src/modules/courses/Resource/index.js
index ce4fb8dc2..501176882 100644
--- a/public/react/src/modules/courses/Resource/index.js
+++ b/public/react/src/modules/courses/Resource/index.js
@@ -230,7 +230,8 @@ class Fileslists extends Component{
 						 filesId:list.id,
 						 name:list.name,
 						 course_is_public:result.data.data.course_is_public,
-						 isSpin:false
+						 isSpin:false,
+             page:page
 					 })
 				 }
 			 }
@@ -423,7 +424,7 @@ class Fileslists extends Component{
   onPressEnter = () => {
     let {searchValue}=this.state;
     let{pagesize,page,tagname,sort,sorttype,coursesecondcategoryid}=this.state;
-    this.getfileslist(pagesize,page,tagname,searchValue,sort,sorttype,coursesecondcategoryid);
+    this.getfileslist(pagesize,1,tagname,searchValue,sort,sorttype,coursesecondcategoryid);
   }
 
   onInputSearchChange = (e) => {
@@ -850,6 +851,7 @@ class Fileslists extends Component{
                 searchValue={ searchValue }
                 // searchtype={this.props.isAdmin||this.props.isStudent ?true:false}
                 onInputSearchChange={this.onInputSearchChange}
+                allowClearonChange={this.onInputSearchChange}
                 firstRowRight={
                   <React.Fragment>
                     {/*{this.props.isAdmin()?parseInt(this.props.match.params.main_id)===parseInt(this.props.coursesids)?<WordsBtn style="blue" onClick={()=>this.addDir()} className={"mr30 font-16"}>新建目录</WordsBtn>:"":""}*/}
diff --git a/public/react/src/modules/courses/boards/index.js b/public/react/src/modules/courses/boards/index.js
index 5cfbbeba3..ea49e862b 100644
--- a/public/react/src/modules/courses/boards/index.js
+++ b/public/react/src/modules/courses/boards/index.js
@@ -346,6 +346,7 @@ class Boards extends Component{
           title={boardName || "帖子列表"}
           searchValue={ searchValue }
           onInputSearchChange={this.onInputSearchChange}
+          allowClearonChange={this.onInputSearchChange}
           showSearchInput={messages.length >= 10}
           searchPlaceholder={ '请输入帖子名称进行搜索' }
           firstRowRight={
diff --git a/public/react/src/modules/courses/coursesPublic/NoneData.js b/public/react/src/modules/courses/coursesPublic/NoneData.js
index e039fd0d0..825ca5832 100644
--- a/public/react/src/modules/courses/coursesPublic/NoneData.js
+++ b/public/react/src/modules/courses/coursesPublic/NoneData.js
@@ -6,7 +6,8 @@ class NoneData extends Component{
     super(props)
   }
   render(){
-    const { style } = this.props;
+    const { style,searchtypes } = this.props;
+
     return(
       <div className="edu-tab-con-box clearfix edu-txt-center" style={ style || { width:"100%" }}>
         <style>
diff --git a/public/react/src/modules/courses/members/CourseGroupList.js b/public/react/src/modules/courses/members/CourseGroupList.js
index 48bc2efcd..f489dac0a 100644
--- a/public/react/src/modules/courses/members/CourseGroupList.js
+++ b/public/react/src/modules/courses/members/CourseGroupList.js
@@ -136,6 +136,7 @@ function CourseGroupList(props) {
                 title={"分班列表"}
                 searchValue={ searchValue }
                 onInputSearchChange={onInputSearchChange}
+                allowClearonChange={onInputSearchChange}
                 showSearchInput={total_count >= 10}
                 searchPlaceholder={ '请输入分班名称进行搜索' }
                 firstRowRight={
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index fee00d4eb..84a04687e 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -1,6 +1,6 @@
 import React, {Component} from "react";
 import CoursesListType from '../coursesPublic/CoursesListType';
-import {WordsBtn, ActionBtn, sortDirections} from 'educoder';
+import {WordsBtn, publicSearchs, sortDirections} from 'educoder';
 import {
 	Form,
 	Select,
@@ -65,6 +65,7 @@ class Listofworksstudentone extends Component {
 		//关卡得分final_score
 
 		this.state = {
+			searchtypes:false,
 			jobsettingsdata: undefined,
 			endTime: "2018/11/10 17:10:00",
 			type: "day",
@@ -2588,6 +2589,7 @@ class Listofworksstudentone extends Component {
 					challenges_count: result.data.challenges_count,
 					homework_status: result.data.homework_status,
 					answer_open_evaluation:result.data.answer_open_evaluation,
+					page:page
 				});
 				allow_lates=result.data.allow_late;
 				answer_open_evaluation=result.data.answer_open_evaluation;
@@ -2983,8 +2985,9 @@ class Listofworksstudentone extends Component {
 			loadingstate: true,
 			page: 1,
 			limit: 20,
+			searchtypes:true
 		})
-		this.Startsortingt(this.state.orders, this.state.course_groupyslstwo, this.state.checkedValuesineinfo, value, 1, 20, this.state.myorders);
+	 	this.Startsortingt(this.state.orders, this.state.course_groupyslstwo, this.state.checkedValuesineinfo, value, 1, 20, this.state.myorders);
 		// console.log(value)
 
 
@@ -3576,12 +3579,18 @@ class Listofworksstudentone extends Component {
 						</div>:
 						homework_status && homework_status.length === 0 ?
 							<div className="edu-back-white">
-								<NoneData></NoneData>
+								<NoneData
+									{...this.state}
+									{...this.props}
+								/>
 							</div>
 							:
 							homework_status && homework_status.length > 0 && homework_status[0] === "未发布" ?
 								<div className="edu-back-white">
-									<NoneData></NoneData>
+									<NoneData
+										{...this.state}
+										{...this.props}
+									/>
 								</div>
 								:
 								<div className={"educontent "}>
@@ -3664,15 +3673,16 @@ class Listofworksstudentone extends Component {
 													{/*}*/}
 													{/*</span>}*/}
 													<span className="search-newyslw fr ml20">
-										<Search
-											placeholder="请输入姓名或学号搜索"
-											id="subject_search_input"
-											autoComplete="off"
-											value={searchtext}
-											onKeyUp={(e) => this.onSearchKeywordKeyUpt(e)}
-											onInput={this.inputSearchValuest}
-											onSearch={this.searchValuest}
-										></Search>
+										{/*<Search*/}
+										{/*	placeholder="请输入姓名或学号搜索"*/}
+										{/*	id="subject_search_input"*/}
+										{/*	autoComplete="off"*/}
+										{/*	value={searchtext}*/}
+										{/*	// onKeyUp={(e) => this.onSearchKeywordKeyUpt(e)}*/}
+										{/*	onInput={this.inputSearchValuest}*/}
+										{/*	onSearch={this.searchValuest}*/}
+										{/*></Search>*/}
+										 {publicSearchs("请输入姓名或学号搜索",this.searchValuest,this.inputSearchValuest,this.inputSearchValuest)}
 										</span>
 												</div>
 												<span className="fl  mr10 color-grey-8 ">作品状态：</span>
@@ -3760,7 +3770,7 @@ class Listofworksstudentone extends Component {
 													<div className="mh650 edu-back-white">
 														<div className="edu-tab-con-box clearfix edu-txt-center">
 															<img className="edu-nodata-img mb20" src={getImageUrl("images/educoder/nodata.png")}/>
-															<p className="edu-nodata-p mb30">暂时还没有相关数据哦！</p>
+															<p className="edu-nodata-p mb30">{this.state.searchtypes===false?"暂时还没有相关数据哦！":"抱歉没有您要搜索的内容，请换个词语试试看"}</p>
 														</div>
 													</div>
 
@@ -3769,9 +3779,9 @@ class Listofworksstudentone extends Component {
 
 												<div className={"justify break_full_word new_li "} style={{minHeight: "480px"}}>
 													<style>{`
-              	          .ant-spin-nested-loading > div > .ant-spin .ant-spin-dot {
-																			top: 72%;}
-						                }
+              	          // .ant-spin-nested-loading > div > .ant-spin .ant-spin-dot {
+													// 						top: 72%;
+						              //   }
 						                .edu-table thead th,.edu-table tbody tr:last-child td{
 															border-bottom: none!important;
 															height: 58px;
@@ -3787,13 +3797,16 @@ class Listofworksstudentone extends Component {
 															}
 						              `}</style>
 													<div className="edu-table edu-back-white ant-tables ysltableo table1">
-														{datajs === undefined ? "" : <Table
-															dataSource={datajs}
-															columns={columns}
-															pagination={false}
-															onChange={this.table1handleChange}
-															loading={loadingstate}
-														/>}
+														<Spin tip="正在加载..." spinning={loadingstate}>
+															{datajs === undefined ? "" : <Table
+																dataSource={datajs}
+																columns={columns}
+																pagination={false}
+																onChange={this.table1handleChange}
+															  loading={false}
+															/>}
+														</Spin>
+
 													</div>
 												</div>
 										}
@@ -3898,12 +3911,18 @@ class Listofworksstudentone extends Component {
 								{
 									homework_status && homework_status.length && homework_status.length === 0 ?
 										<div className=" clearfix edu-back-white" style={{margin: "auto", minWidth: "1200px"}}>
-											<NoneData></NoneData>
+											<NoneData
+												{...this.state}
+												{...this.props}
+											/>
 										</div>
 										:
 										homework_status && homework_status.length > 0 && homework_status && homework_status[0] === "未发布" ?
 											<div className=" clearfix edu-back-white " style={{margin: "auto", minWidth: "1200px"}}>
-												<NoneData></NoneData>
+												<NoneData
+													{...this.state}
+													{...this.props}
+												/>
 											</div>
 											:
 
@@ -4029,7 +4048,7 @@ class Listofworksstudentone extends Component {
 																<div className="edu-tab-con-box clearfix edu-txt-center">
 																	<img className="edu-nodata-img mb20"
 																			 src={getImageUrl("images/educoder/nodata.png")}/>
-																	<p className="edu-nodata-p mb30">暂时还没有相关数据哦！</p>
+																	<p className="edu-nodata-p mb30">{this.state.searchtypes===false?"暂时还没有相关数据哦！":"抱歉没有您要搜索的内容，请换个词语试试看"}</p>
 																</div>
 															</div>
 
@@ -4069,12 +4088,18 @@ class Listofworksstudentone extends Component {
 								{
 									homework_status && homework_status.length === 0 ?
 										<div className=" clearfix edu-back-white" style={{margin: "auto", minWidth: "1200px"}}>
-											<NoneData></NoneData>
+											<NoneData
+												{...this.state}
+												{...this.props}
+											/>
 										</div>
 										:
 										homework_status && homework_status.length > 0 && homework_status && homework_status[0] === "未发布" ?
 											<div className=" clearfix edu-back-white" style={{margin: "auto", minWidth: "1200px"}}>
-												<NoneData></NoneData>
+												<NoneData
+													{...this.state}
+													{...this.props}
+												/>
 											</div>
 											:
 											<div className={"educontent mb20"}>
@@ -4226,9 +4251,9 @@ class Listofworksstudentone extends Component {
 															<div className={"justify break_full_word new_li"}
 																	 style={{minHeight: "480px"}}>
 																<style>{`
-              	          .ant-spin-nested-loading > div > .ant-spin .ant-spin-dot {
-																			top: 72%;}
-						                }
+              	          // .ant-spin-nested-loading > div > .ant-spin .ant-spin-dot {
+													// 						top: 72%;
+						              //   }
 						                .edu-table .ant-table-tbody > tr > td {
 														height: 58px;
 															}
@@ -4246,12 +4271,16 @@ class Listofworksstudentone extends Component {
 															}
 						              `}</style>
 																<div className="edu-table edu-back-white ysltableowss table4">
-																	{datas === undefined ? "" : <Table
-																		dataSource={datas}
-																		columns={columnsstu}
-																		pagination={false}
-																		loading={loadingstate}
-																	/>}
+																		{datas === undefined ? "" :
+																			<Spin tip="正在加载..." spinning={loadingstate}>
+																				<Table
+																				dataSource={datas}
+																				columns={columnsstu}
+																				pagination={false}
+																				loading={false}
+																			/>
+																			</Spin>
+																		}
 																</div>
 															</div>
 															{
@@ -4270,7 +4299,7 @@ class Listofworksstudentone extends Component {
 																<div className="edu-tab-con-box clearfix edu-txt-center">
 																	<img className="edu-nodata-img mb20"
 																			 src={getImageUrl("images/educoder/nodata.png")}/>
-																	<p className="edu-nodata-p mb30">暂时还没有相关数据哦！</p>
+																	<p className="edu-nodata-p mb30">{this.state.searchtypes===false?"暂时还没有相关数据哦！":"抱歉没有您要搜索的内容，请换个词语试试看"}</p>
 																</div>
 															</div>
 														</div>