From fd7cd7809775795660746382c637f268cd076e2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Sat, 26 Oct 2019 10:21:27 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AB=8B=E5=8D=B3=E5=8F=91=E5=B8=83=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../competitions/Competitimain/Competitionsindex.css        | 2 +-
 .../competitions/Competitioncommon/CompetitionCommon.css    | 2 +-
 .../react/src/modules/courses/busyWork/PublishRightnow.js   | 6 ++++++
 public/react/src/modules/courses/busyWork/commonWork.js     | 1 +
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/public/react/src/modules/competitions/Competitimain/Competitionsindex.css b/public/react/src/modules/competitions/Competitimain/Competitionsindex.css
index 689a11d09..fd87643a4 100644
--- a/public/react/src/modules/competitions/Competitimain/Competitionsindex.css
+++ b/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;
diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css
index 0bef787ea..077b58ef4 100644
--- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css
+++ b/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;
diff --git a/public/react/src/modules/courses/busyWork/PublishRightnow.js b/public/react/src/modules/courses/busyWork/PublishRightnow.js
index ff0a1bbd3..7425f6276 100644
--- a/public/react/src/modules/courses/busyWork/PublishRightnow.js
+++ b/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,
diff --git a/public/react/src/modules/courses/busyWork/commonWork.js b/public/react/src/modules/courses/busyWork/commonWork.js
index d07513c50..a0f73c9ee 100644
--- a/public/react/src/modules/courses/busyWork/commonWork.js
+++ b/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>
           {