@@ -665,6 +665,10 @@ class CoursesBanner extends Component {
{/*}*/}
+ {this.props.isStudent()?this.props.current_user&&this.props.current_user.course_is_end===true?"":
this.exitclass()}
+ > 永久退出课堂 :""}
+
{coursedata.switch_to_student === true ?
由教师/助教身份切换至学生
可进行提交作品、答题等操作
@@ -723,9 +727,7 @@ class CoursesBanner extends Component {
)
: ""}
- {this.props.isStudent()?this.props.current_user&&this.props.current_user.course_is_end===true?"": this.exitclass()}
- > 永久退出课堂 :""}
+
diff --git a/public/react/src/modules/courses/coursesPublic/OneSelfOrderModal.js b/public/react/src/modules/courses/coursesPublic/OneSelfOrderModal.js
index 3ef957042..9c57cc88c 100644
--- a/public/react/src/modules/courses/coursesPublic/OneSelfOrderModal.js
+++ b/public/react/src/modules/courses/coursesPublic/OneSelfOrderModal.js
@@ -51,22 +51,21 @@ class OneSelfOrderModal extends Component{
let course_groups = this.props.course_groups;
course_groups.map((item, key) => {
- console.log(item)
+
if (item.end_time === null) {
// if(this.props.starttimesend===undefined){
// item.end_time = moment(moment(handleDateString(this.props.staytime)).add(1, 'week')).format("YYYY-MM-DD HH:mm");
// }else{
// item.end_time = moment(handleDateString(this.props.starttimesend)).format("YYYY-MM-DD HH:mm");
// }
- item.end_time = moment(moment(handleDateString(this.props.staytime)).add(1, 'week')).format("YYYY-MM-DD HH:mm");
- newarr.push(item)
- } else {
if(this.props.starttimesend){
item.end_time = moment(moment(handleDateString(this.props.starttimesend))).format("YYYY-MM-DD HH:mm");
}else{
item.end_time = moment(moment(handleDateString(this.props.staytime)).add(1, 'week')).format("YYYY-MM-DD HH:mm");
}
newarr.push(item)
+ } else {
+ newarr.push(item)
}
})
this.setState({
@@ -109,15 +108,14 @@ class OneSelfOrderModal extends Component{
course_groups.map((item,key)=>{
if(item.end_time===null){
// item.end_time = moment(moment(handleDateString(this.props.staytime)).add(1, 'week')).format("YYYY-MM-DD HH:mm");
- item.end_time = moment(moment(handleDateString(this.props.staytime)).add(1, 'week')).format("YYYY-MM-DD HH:mm");
- newarr.push(item)
- }else{
if(this.props.starttimesend){
item.end_time = moment(moment(handleDateString(this.props.starttimesend))).format("YYYY-MM-DD HH:mm");
}else{
item.end_time = moment(moment(handleDateString(this.props.staytime)).add(1, 'week')).format("YYYY-MM-DD HH:mm");
}
newarr.push(item)
+ }else{
+ newarr.push(item)
}
})
this.setState({
@@ -401,7 +399,7 @@ class OneSelfOrderModal extends Component{
{/*{this.props.starttime}*/}
{this.props.modaltype===undefined||this.props.modaltype===2?
{/*{this.props.endtime}*/}
- 截止时间1
+ 截止时间
分班名称
- 截止时间2
+ 截止时间
}
{this.props.modaltype===undefined||this.props.modaltype===2
diff --git a/public/react/src/modules/paths/ShixunPathCard.js b/public/react/src/modules/paths/ShixunPathCard.js
index 66f236692..5afceaf30 100644
--- a/public/react/src/modules/paths/ShixunPathCard.js
+++ b/public/react/src/modules/paths/ShixunPathCard.js
@@ -43,7 +43,7 @@ class ShixunPathCard extends Component{