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

public/react/src/AppConfig.js

@@ -35,7 +35,7 @@ if (isDev) {
 // 老师
 //ebugType="teacher";
 // 学生
-// debugType="student";
+//debugType="student";
 
 window._debugType = debugType;
 export function initAxiosInterceptors(props) {

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

@@ -232,9 +232,11 @@ class ShixunHomeworkPage extends Component {
 								typelist={teacherdatapage === undefined ? [""] : teacherdatapage.homework_status}
 							/>
 							<a className="color-grey-9 fr font-16  summaryname  ml20 mr20" onClick={()=>this.gotohome()}>返回</a>
-							{teacherdatapage&&teacherdatapage.shixun_status>1?<a className="color-grey-9 fr font-16 mr20"
+							{teacherdatapage&&teacherdatapage.shixun_status>1?this.props.isAdmin()?<a className="color-grey-9 fr font-16 mr20"
 								 href={`/shixuns/${teacherdatapage === undefined ? "" : teacherdatapage.shixun_identifier}/challenges`}
-								 target={"_blank"}>实训详情</a>:""}
+								 target={"_blank"}>实训详情</a>: this.props.isStudent()?teacherdatapage&&teacherdatapage.time_status<5?<a className="color-grey-9 fr font-16 mr20"
+								 href={`/shixuns/${teacherdatapage === undefined ? "" : teacherdatapage.shixun_identifier}/challenges`}
+								 target={"_blank"}>实训详情</a>:"":"":""}
 
 
 						</div>
@@ -336,7 +338,7 @@ class ShixunHomeworkPage extends Component {
 											<a className="fr color-blue font-16"
 												 href={`/courses/${this.props.match.params.coursesId}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.main ===  1 ? "shixun_homeworks" :"shixun_homework"}/${teacherdatapage === undefined ? "" : teacherdatapage.id}/commitsummary/${this.props.match.params.homeworkid}`}>{teacherdatapage.commit_des}</a>
 									}
-									{teacherdatapage === undefined ? "" :teacherdatapage&&teacherdatapage.shixun_status>1?<Startshixuntask
+									{teacherdatapage === undefined ? "" :teacherdatapage&&teacherdatapage.shixun_status>1&&teacherdatapage&&teacherdatapage.time_status<5?<Startshixuntask
 										{...this.props}
 										data={teacherdatapage}
 									/>:""}

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

@@ -371,6 +371,7 @@ class ShixunhomeWorkItem extends Component{
 
 
 							{this.props.isStudent===true?this.props.course_identity===5?discussMessage&&discussMessage.shixun_status>1?
+                discussMessage.time_status<5?
 								<WordsBtn  style="blue" className="colorblue font-16 mr20 fr mt10">
 									{startbtn===false?
 										(discussMessage.task_operation[0] == '继续挑战' || discussMessage.task_operation[0] == '查看实战' ?
@@ -381,7 +382,7 @@ class ShixunhomeWorkItem extends Component{
 											<a className="btn colorblue" onClick={()=>this.taskoperationId(discussMessage.task_operation[1])}>
 												{discussMessage.task_operation[0]}
 											</a>):<a className="btn colorblue" >开启中</a>}
-								</WordsBtn>:"":"":""
+								</WordsBtn>:"":"":"":""
 							}
 
             </h6>

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

@@ -1208,7 +1208,7 @@ class ShixunHomework extends Component{
                 {this.props.isAdmin()?<Menu.Item key="0">未发布</Menu.Item>:""}
                 <Menu.Item key="1">提交中</Menu.Item>
                 <Menu.Item key="2">补交中</Menu.Item>
-                <Menu.Item key="5">评阅中</Menu.Item>
+                <Menu.Item key="5">已截止</Menu.Item>
               </Menu>
             </div>
             <div className="fr mt16 mb16 searchView">