diff --git a/public/react/src/modules/courses/boards/TopicDetail.css b/public/react/src/modules/courses/boards/TopicDetail.css
index de3aeb69b..7500268bf 100644
--- a/public/react/src/modules/courses/boards/TopicDetail.css
+++ b/public/react/src/modules/courses/boards/TopicDetail.css
@@ -1,12 +1,15 @@
-.edu-class-container {
-  width: 1200px;
-  margin: 10px auto 20px;
-}
-#forum_index_list {
-  margin-top: 90px;
-  margin-bottom: 320px;
-}
-
-.uploadBtn {
-	margin-left: 0px;
+.edu-class-container {
+  width: 1200px;
+  margin: 10px auto 20px;
+}
+#forum_index_list {
+  margin-top: 90px;
+  margin-bottom: 320px;
+}
+#yslforum_index_list {
+    margin-top: 20px;
+    margin-bottom: 320px;
+}
+.uploadBtn {
+	margin-left: 0px;
 }
\ No newline at end of file
diff --git a/public/react/src/modules/courses/boards/TopicDetail.js b/public/react/src/modules/courses/boards/TopicDetail.js
index d60c34461..7d0e6d37d 100644
--- a/public/react/src/modules/courses/boards/TopicDetail.js
+++ b/public/react/src/modules/courses/boards/TopicDetail.js
@@ -526,7 +526,7 @@ class TopicDetail extends Component {
       const courseId=this.props.match.params.coursesId;
       const boardId = this.props.match.params.boardId
 	    return (
-        <div className="edu-back-white edu-class-container edu-position course-message topicDetail" id="forum_index_list"> {/* fl with100 */}
+        <div className="edu-back-white edu-class-container edu-position course-message topicDetail" id="yslforum_index_list"> {/* fl with100 */}
           <style>{`
             .topicDetail #forum_list .return_btn.no_mr {
               margin-right: 1px;
diff --git a/public/react/src/modules/courses/busyWork/CommonWorkPost.js b/public/react/src/modules/courses/busyWork/CommonWorkPost.js
index 60383988b..7f4020590 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkPost.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkPost.js
@@ -278,7 +278,7 @@ class CommonWorkPost extends Component{
   }
   // 附件相关 START
   handleChange = (info) => {
-    if (info.file.status === 'uploading') {
+    if (info.file.status === 'uploading' || info.file.status === 'done') {
       let fileList = info.fileList;
 
       this.setState({ fileList: appendFileSizeToUploadFileAll(fileList) });
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunWorkDetails.js b/public/react/src/modules/courses/shixunHomework/ShixunWorkDetails.js
index 508fc285e..d37aea5a7 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunWorkDetails.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunWorkDetails.js
@@ -71,13 +71,13 @@ class ShixunWorkDetails extends Component {
 					<div className="educontent">
 						<p className="clearfix mt20">
 							<a className="fl color-grey-9 btn colorgrey  hovercolorblue"
-								 onClick={()=>this.goback(1)}
+								 href={`/courses/${data&&data.course_id}/shixun_homeworks/${data&&data.homework_common_id}`}
 								 >
-								<span className={"color-grey-9"}>{data&&data.course_name}123</span>
+								<a className={"color-grey-9"} >{data&&data.course_name}</a>
 							</a>
 							<span className="color-grey-9 fl ml3 mr3">&gt;</span>
 								<a   className="btn colorgrey fl hovercolorblue grey"
-									onClick={this.goback}
+										 href={`/courses/${data&&data.course_id}/shixun_homeworks/${data&&data.homework_common_id}/list?tab=0`}
 									// to={"/courses/"+data&&data.course_id+"/"+this.state.shixuntypes+"/"+data&&data.homework_common_id}
 								>
 									<span className={"color-grey-9"}>实训作业</span>
diff --git a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunCustomsPass.js b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunCustomsPass.js
index 10ec2e40f..8ffa8a1dd 100644
--- a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunCustomsPass.js
+++ b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunCustomsPass.js
@@ -28,10 +28,10 @@ class ShixunCustomsPass extends Component {
 			datas.push({
 				customs:{position:item.position,subject:item.subject},
 				taskname:{name:item.username},
-				openingtime:moment(item.end_time).format('YYYY-MM-DD HH:mm:ss'),
+				openingtime:item.end_time===null?"无":item.end_time===undefined?"无":item.end_time===""?"无":moment(item.end_time).format('YYYY-MM-DD HH:mm:ss'),
 				evaluating: {final_score:item.final_score,all_score:item.all_score},
 				finishtime:item.copy_username,
-				elapsedtime:moment(item.copy_end_time).format('YYYY-MM-DD HH:mm:ss'),
+				elapsedtime:item.copy_end_time===null?"无":item.copy_end_time===undefined?"无":item.copy_end_time===""?"无":moment(item.copy_end_time).format('YYYY-MM-DD HH:mm:ss'),
 				empvalue:item.code_rate,
 				// adjustmentminute:asdasd
 			})
@@ -200,6 +200,9 @@ class ShixunCustomsPass extends Component {
 						</style>
 						{
 							data&&data.challenge_list.map((item,key)=>{
+								// console.log("203challenge_list下面的数据");
+								// console.log(item);
+								// console.log(JSON.stringify(item));
 								return(
 									<div key={key} className={"mb20"}>
 										<div className="font-16 color-dark-21 ml20 mr20">
@@ -213,46 +216,46 @@ class ShixunCustomsPass extends Component {
 															<span className={"font-14"}>{item.subject}</span>
 														</a>
 											  </span>
-												<span className="fr codeboxright">代码文件：{item.code_list[0].path}</span>
+												<span className="fr codeboxright">代码文件：{item.code_list.length===0?"无":item.code_list[0].path===undefined?"无":item.code_list[0].path}</span>
 											</p>
 
 										</div>
 
 
-										{item.code_list.map((ite,k)=>{
+										{item.code_list.length===0?"":item.code_list.map((ite,k)=>{
 											return(
-											<div className="font-16 color-dark-21 ml20 mr20" key={k}>
-											<div className=" mt15">
-											<p className="clearfix pt5 pb5 codebox">
-											<span className="fl">
-												<span className={"colorC8161D"}>{item.username}</span>
-												的代码文件
-											</span>
-											<span className="fr">
-												<span className={"color-green"}>{item.copy_username}</span>
-												的代码文件
-											</span>
-											</p>
-												<style>
-													{`
-														.borderccc{
-														 border:1px solid #ccc
-														}
-													`}
-												</style>
-											<div className="test-code mt20 borderccc">
-											<li className="clearfix">
-												<MonacoDiffEditor
-													height="500"
-													// language="javascript"
-													original={ite.origin_content}
-													value={ ite.target_content}
-													// options={options}
-												/>
-											</li>
-											</div>
-											</div>
-											</div>
+												<div className="font-16 color-dark-21 ml20 mr20" key={k}>
+													<div className=" mt15">
+														<p className="clearfix pt5 pb5 codebox">
+																		<span className="fl">
+																			<span className={"colorC8161D"}>{item.username}</span>
+																			的代码文件
+																		</span>
+															<span className="fr">
+																			<span className={"color-green"}>{item.copy_username}</span>
+																			的代码文件
+																		</span>
+														</p>
+														<style>
+															{`
+																					.borderccc{
+																					 border:1px solid #ccc
+																					}
+																				`}
+														</style>
+														<div className="test-code mt20 borderccc">
+															<li className="clearfix">
+																<MonacoDiffEditor
+																	height="500"
+																	// language="javascript"
+																	original={ite.origin_content}
+																	value={ ite.target_content}
+																	// options={options}
+																/>
+															</li>
+														</div>
+													</div>
+												</div>
 											)
 										})}
 									</div>
@@ -267,4 +270,4 @@ class ShixunCustomsPass extends Component {
 	}
 }
 
-export default ShixunCustomsPass;
\ No newline at end of file
+export default ShixunCustomsPass;