diff --git a/public/react/src/modules/courses/Video/Live.js b/public/react/src/modules/courses/Video/Live.js
index 5a808633f..66221fc3c 100644
--- a/public/react/src/modules/courses/Video/Live.js
+++ b/public/react/src/modules/courses/Video/Live.js
@@ -10,10 +10,10 @@ import tencent from './images/tencent.png';
import WeiBaiTong from './images/WeiBaiTong.png';
import douyu from './images/douyu.jpg';
class Live extends Component{
-
+
render(){
const { liveData , lives , successFunc , pageSize , changePage , page } = this.props;
-
+
return(
EduCoder支持所有第三方直播平台,特别推荐:
@@ -37,7 +37,7 @@ class Live extends Component{
(简明手册)
-
+
(简明手册)
@@ -51,11 +51,11 @@ class Live extends Component{
{
lives.map((item,key)=>{
return(
- successFunc()}
>
)
@@ -74,7 +74,7 @@ class Live extends Component{
//
//
//
- }
+ }
)
}
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
index 5c12fe3b9..1e99756ed 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
@@ -128,7 +128,7 @@ class ShixunhomeWorkItem extends Component{
stopPro = (event) => {
event.stopPropagation()
}
-
+
editname = (name,id,event) => {
this.setState({
ModalsRenametype:true,
@@ -373,8 +373,8 @@ class ShixunhomeWorkItem extends Component{
{this.props.isAdmin?this.stopPro(event)} className={discussMessage&&discussMessage.shixun_status>1?this.props.isAdminOrCreator()?" newhomepagePostSettingname fr":" homepagePostSettingbox fr":" newwidthSettin fr"} style={{"right":"-2px","top":"6px","display":"block"}}>
- {discussMessage&&discussMessage.shixun_status>1?实训详情:
- 实训详情
+ {discussMessage&&discussMessage.shixun_status>1?进入学习:
+ 进入学习
}
@@ -388,26 +388,27 @@ class ShixunhomeWorkItem extends Component{
discussMessage.time_status<5?
{startbtn===false?
- (discussMessage.task_operation[0] == '继续挑战' || discussMessage.task_operation[0] == '查看实战' ?
+ (discussMessage.task_operation[0] == '进入学习' || discussMessage.task_operation[0] == '进入学习' ?
- {discussMessage.task_operation[0]}
+ {/*{discussMessage.task_operation[0]}*/}
+ 进入学习
:
this.taskoperationId(discussMessage.task_operation[1])}>
- {discussMessage.task_operation[0]}
- ):开启中}
+ 进入学习
+ ):进入中}
:"":"":"":""
}
- { this.props.isAdmin?this.hrefjumpskip("/courses/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+discussMessage.homework_id+"/list?tab=0")} className="btn colorblue font-16 fontweight400 mr20 fr">作品详情:""}
+ { this.props.isAdmin?this.hrefjumpskip("/courses/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+discussMessage.homework_id+"/list?tab=0")} className="btn colorblue font-16 fontweight400 mr20 fr">作品列表:""}
{
- this.props.isStudent? this.hrefjumpskip("/courses/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+discussMessage.homework_id+"/list?tab=0")} className="btn colorblue font-16 fontweight400 mr20 fr mt2">作品详情:""
+ this.props.isStudent? this.hrefjumpskip("/courses/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+discussMessage.homework_id+"/list?tab=0")} className="btn colorblue font-16 fontweight400 mr20 fr mt2">作品列表:""
}
{
this.props.isNotMember===true? this.props.discussMessage.private_icon===true?""
- :this.hrefjumpskip("/courses/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+discussMessage.homework_id+"/list?tab=0")} className="btn colorblue font-16 fontweight400 mr20 fr">作品详情:""
+ :this.hrefjumpskip("/courses/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+discussMessage.homework_id+"/list?tab=0")} className="btn colorblue font-16 fontweight400 mr20 fr">作品列表:""
}
@@ -440,9 +441,9 @@ class ShixunhomeWorkItem extends Component{
{ 所属目录:{discussMessage.upper_category_name}
}
}
-
-
-
+
+
+
{/* { discussMessage.replies_count != 0 && {discussMessage.replies_count} 回复 }
{ discussMessage.praise_num != 0 && {discussMessage.praise_num} 点赞 }