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

public/react/src/modules/competition/comcss/competition.css

@@ -135,7 +135,7 @@
     background: #C3C1C1;
     height: 54px;
     width: 156px;
-    border-radius: 4px;
+    border-radius: 10px;
     display: flex;
     align-items: center;
     justify-content: center;

public/react/src/modules/competitions/Competitimain/Competitionsindex.css

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

public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css

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

public/react/src/modules/courses/busyWork/PublishRightnow.js

@@ -121,6 +121,12 @@ class PublishRightnow extends Component{
 				homework_ids: this.props.checkBoxValues,
 				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{
 			data={
 				homework_ids: this.props.checkBoxValues,

public/react/src/modules/courses/busyWork/commonWork.js

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