diff --git a/public/react/src/modules/courses/coursesPublic/PathModal.js b/public/react/src/modules/courses/coursesPublic/PathModal.js
index 3fbbd4af4..07ce55024 100644
--- a/public/react/src/modules/courses/coursesPublic/PathModal.js
+++ b/public/react/src/modules/courses/coursesPublic/PathModal.js
@@ -122,16 +122,20 @@ class PathModal extends Component{
 
   contentViewScrolledit=(e)=>{
     //滑动到底判断
+		const {shixunmodallist} = this.state;
 
     if(e.currentTarget.scrollHeight-e.currentTarget.scrollTop===e.currentTarget.clientHeight){
 
-      let {Searchvalue,type,page,shixunpathlist}=this.state;
-      let newpage=page+1
-      this.funshixunpathlist(Searchvalue,type,true,newpage)
-      this.setState({
-        page:newpage
-      })
-
+    	if(shixunmodallist.subject_list.length===0){
+					return;
+			}else{
+				let {Searchvalue,type,page,shixunpathlist}=this.state;
+				let newpage=page+1
+				this.funshixunpathlist(Searchvalue,type,true,newpage)
+				this.setState({
+					page:newpage
+				})
+			}
     }
 
   }
diff --git a/public/react/src/modules/courses/coursesPublic/ShixunModal.js b/public/react/src/modules/courses/coursesPublic/ShixunModal.js
index 1ae63da90..2a53cf104 100644
--- a/public/react/src/modules/courses/coursesPublic/ShixunModal.js
+++ b/public/react/src/modules/courses/coursesPublic/ShixunModal.js
@@ -100,17 +100,21 @@ class ShixunModal extends Component{
   }
 
   contentViewScrolledit=(e)=>{
-
+  const {shixunmodallist}=this.state;
     //滑动到底判断
-    if(e.currentTarget.scrollHeight-e.currentTarget.scrollTop===e.currentTarget.clientHeight){
-			let {Searchvalue,type,page}=this.state;
-			let newpage=page+1
-			this.setupdatalist(Searchvalue,type,true,newpage)
-			this.setState({
-				page:newpage
-			})
-    }
-
+    if(e.currentTarget.scrollHeight-e.currentTarget.scrollTop===e.currentTarget.clientHeight) {
+
+			if (shixunmodallist.shixun_list.length === 0) {
+				return;
+			} else {
+				let {Searchvalue, type, page} = this.state;
+				let newpage = page + 1
+				this.setupdatalist(Searchvalue, type, true, newpage)
+				this.setState({
+					page: newpage
+				})
+			}
+		}
   }
 
   //搜索
diff --git a/public/react/src/modules/courses/css/Courses.css b/public/react/src/modules/courses/css/Courses.css
index 47db2f595..b6388b1e7 100644
--- a/public/react/src/modules/courses/css/Courses.css
+++ b/public/react/src/modules/courses/css/Courses.css
@@ -477,9 +477,9 @@ a.white-btn.use_scope-btn:hover{
 }
 .pathInfobox li{
     margin-right: 20px;
-    height: 15px;
+    height: 20px;
     /*overflow: hidden;*/
-    line-height: 15px;
+    line-height: 20px;
 }
 .width70f{
     width: 70px;
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index ac4664b82..fef1bec75 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -1608,7 +1608,7 @@ class Listofworksstudentone extends Component {
 	}
 
 
-	paginationonChanges = (pageNumber) => {
+	paginationonChangestwo = (pageNumber) => {
 		this.setState({
 			page: pageNumber,
 			loadingstate: true,
@@ -2495,7 +2495,10 @@ class Listofworksstudentone extends Component {
 		// console.log(datajs);
 		// console.log("2202");
 		// console.log(this.props.isAdmin());
-
+	  // console.log("2498");
+		// console.log(data);
+		// console.log(datas);
+		// console.log(this.props.isAdmin());
 		return (
 			this.props.isAdmin() === true ?
 				(
@@ -2927,8 +2930,8 @@ class Listofworksstudentone extends Component {
 
 											<span className="fl color-grey-6 font-12">
 												<span
-													className="color-orange-tip">{teacherdata === undefined ? "" : teacherdata.commit_count === undefined ? "" : teacherdata.commit_count}</span>已交<span
-												className="ml10">{teacherdata === undefined ? "" : teacherdata.uncommit_count}</span><span>未交</span>
+													className="color-orange-tip">{teacherdata === undefined ? "0" : teacherdata.commit_count === undefined ? "0" : teacherdata.commit_count}</span>已交<span
+												className="ml10">{teacherdata === undefined ? "0" : teacherdata.uncommit_count}</span><span>未交</span>
 												{teacherdata === undefined ? "" : teacherdata.left_time === undefined ? "" : teacherdata.left_time === null ? "" :
 													<span className="ml20">{teacherdata.left_time.status}</span>
 												}
@@ -2969,6 +2972,12 @@ class Listofworksstudentone extends Component {
               	          .ant-spin-nested-loading > div > .ant-spin .ant-spin-dot {
 																			top: 72%;}
 						                }
+						                .edu-table .ant-table-tbody > tr > td {
+														height: 85px;
+															}
+														.edu-table .ant-table-thead > tr > th{
+																 	height: 85px;
+														 }
 						                	.ysltableow .ant-table-thead > tr > th{
 																 	height: 85px;
 														 }
@@ -3033,7 +3042,7 @@ class Listofworksstudentone extends Component {
 								}
 								<div className={"educontent mb20"}>
 
-									<div className="edu-back-white">
+									<div >
 										<style>
 											{
 												`
@@ -3054,6 +3063,12 @@ class Listofworksstudentone extends Component {
 										<style>
 											{
 												`
+												.edu-table .ant-table-tbody > tr > td {
+														height: 85px;
+															}
+														.edu-table .ant-table-thead > tr > th{
+																 	height: 85px;
+														 }
 													.ysltableows .ant-table-thead > tr > th{
 																 	height: 85px;
 														 }
@@ -3077,16 +3092,16 @@ class Listofworksstudentone extends Component {
 										</div>
 										{JSON.stringify(datas) !== "[]" ?
 											<div>
-												<div id="graduation_work_list" style={{
+												<div id="graduation_work_list" className="edu-back-white" style={{
 													padding: '20px 20px 10px 20px',
 													marginBottom: "10px"
 												}}>
 													<div className="clearfix">
 											<span className="fl color-grey-6 font-12">
 												<span className="color-orange-tip">
-													{teacherdata === undefined ? "" : teacherdata.commit_count === undefined ? "" : teacherdata.commit_count}
+													{teacherdata === undefined ? "0" : teacherdata.commit_count === undefined ? "0" : teacherdata.commit_count}
 												</span>已交
-												<span className="ml10">{teacherdata === undefined ? "" : teacherdata.uncommit_count}</span><span>未交</span>
+												<span className="ml10">{teacherdata === undefined ? "0" : teacherdata.uncommit_count}</span><span>未交</span>
 												{teacherdata === undefined ? "" : teacherdata.left_time === undefined ? "" : teacherdata.left_time === null ? "" :
 													<span className="ml20">{teacherdata.left_time.status}</span>}
 												{teacherdata === undefined ? "0" : teacherdata.left_time === undefined ? "0" : teacherdata.left_time === null ? "0" :
@@ -3181,6 +3196,12 @@ class Listofworksstudentone extends Component {
               	          .ant-spin-nested-loading > div > .ant-spin .ant-spin-dot {
 																			top: 72%;}
 						                }
+						                .edu-table .ant-table-tbody > tr > td {
+														height: 85px;
+															}
+														.edu-table .ant-table-thead > tr > th{
+																 	height: 85px;
+														 }
 						                			.ysltableowss .ant-table-thead > tr > th{
 																 	height: 85px;
 														 }
@@ -3203,9 +3224,9 @@ class Listofworksstudentone extends Component {
 												</div>
 												{
 													teacherdata && teacherdata.work_count && teacherdata.work_count > limit ?
-														<div className="edu-txt-center mt30">
+														<div className="edu-txt-center ysyslxh mt30">
 															<Pagination showQuickJumper current={page}
-																					onChange={this.paginationonChanges} pageSize={limit}
+																					onChange={this.paginationonChangestwo} pageSize={limit}
 																					total={teacherdata.work_count}></Pagination>
 														</div>
 														: ""
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
index 97bc651ea..511c40d61 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
@@ -783,7 +783,9 @@ class ShixunStudentWork extends Component {
 
 								<CheckboxGroup onChange={this.groupgroup}
 								               value={this.state.group_infolist}
-								               style={{paddingTop: '4px'}}>
+								               style={{paddingTop: '4px',float: 'left',
+																 maxWidth: '1020px'}}
+								  >
 									{data&&data.group_info === undefined ? "" : data&&data.group_info.map((item, key) => {
 										return (
 											<span key={key}>
diff --git a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
index 75a7c5ca1..977b459d4 100644
--- a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
+++ b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
@@ -195,7 +195,7 @@ class ShixunWorkModal extends Component{
 					// 	message:"提示",
 					// 	description: response.data.message
 					// });
-					this.props.history.replace(`/courses/${this.props.match.params.coursesId}/shixun_homeworks/${this.props.match.params.homeworkid}/student_work?tab=2`);
+					window.location.href=`/courses/${this.props.match.params.coursesId}/shixun_homeworks/${this.props.match.params.homeworkid}/student_work?tab=2`;
 				}else if(response.data.status === -1){
 					notification.open({
 						message:"提示",
diff --git a/public/react/src/modules/courses/shixunHomework/style.css b/public/react/src/modules/courses/shixunHomework/style.css
index a07c1152e..f2b0c39ed 100644
--- a/public/react/src/modules/courses/shixunHomework/style.css
+++ b/public/react/src/modules/courses/shixunHomework/style.css
@@ -50,4 +50,7 @@
   text-overflow:ellipsis;
   white-space:nowrap;
   cursor: default;
+}
+.ysyslxh{
+  background: #fafafa;
 }
\ No newline at end of file
diff --git a/public/react/src/search/SearchPage.js b/public/react/src/search/SearchPage.js
index 5b3d51d22..33a1a7852 100644
--- a/public/react/src/search/SearchPage.js
+++ b/public/react/src/search/SearchPage.js
@@ -252,7 +252,7 @@ class SearchPage extends Component{
 														{item.content.member_user_names === undefined || item.content.member_user_names===0?"": item.content.member_user_names.map((item7, key7) => {
 															return (
 																<div className={"df"}>
-																	<span style={{flex: '0 0 82px'}}>合作单位：</span>
+																	<span style={{flex: '0 0 82px'}}>合作团队：</span>
 																	<span className={key7>1?" tzbq ":" tzbqx"}
 																				dangerouslySetInnerHTML={{__html:item7}} />
 																</div>