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

dev_auth
杨树林 6 years ago
commit abc82fe9bc

@ -125,7 +125,7 @@
height: 100%; height: 100%;
z-index: 10000; z-index: 10000;
display: none; display: none;
background: rgba(51, 51, 51,0.7); background: rgba(0,0,0,0.33);
text-align: center; text-align: center;
line-height: 170px; line-height: 170px;
color: #fff; color: #fff;

@ -329,7 +329,7 @@
height: 100%; height: 100%;
z-index: 10000; z-index: 10000;
display: none; display: none;
background: rgba(51, 51, 51,0.7); background: rgba(0,0,0,0.33);
text-align: center; text-align: center;
line-height: 416px; line-height: 416px;
color: #fff; color: #fff;

@ -121,6 +121,12 @@ class PublishRightnow extends Component{
homework_ids: this.props.checkBoxValues, homework_ids: this.props.checkBoxValues,
end_time: endtime==="Invalid date"?undefined:endtime, end_time: endtime==="Invalid date"?undefined:endtime,
} }
}else if(this.props.islist===true){
data={
homework_ids: this.props.checkBoxValues,
group_ids: group_ids,
end_time:endtime,
}
}else{ }else{
data={ data={
homework_ids: this.props.checkBoxValues, homework_ids: this.props.checkBoxValues,

@ -432,6 +432,7 @@ class commonWork extends Component{
<PublishRightnow ref="publishModalRef" showActionButton={true} {...this.props} checkBoxValues={checkBoxValues} <PublishRightnow ref="publishModalRef" showActionButton={true} {...this.props} checkBoxValues={checkBoxValues}
showActionButton={false} showActionButton={false}
isPublish={true} isPublish={true}
islist={true}
isPublishtype={1} isPublishtype={1}
doWhenSuccess={this.doWhenSuccess} fromListPage={true}></PublishRightnow> doWhenSuccess={this.doWhenSuccess} fromListPage={true}></PublishRightnow>
{ {

Loading…
Cancel
Save