From e6ba3fe70ef1faed71bb8e5dcf47e9087aa300c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Mon, 16 Mar 2020 21:33:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E4=BD=9C=E4=B8=9A=E3=80=81?=
 =?UTF-8?q?=E5=88=86=E7=BB=84=E3=80=81=E6=99=AE=E9=80=9A=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E7=AB=8B=E5=8D=B3=E5=8F=91=E5=B8=83=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/courses/busyWork/PublishRightnow.js | 13 ++++++++++---
 .../courses/coursesPublic/OneSelfOrderModal.js      |  2 +-
 .../modules/courses/poll/PollDetailTabForthRules.js |  2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/public/react/src/modules/courses/busyWork/PublishRightnow.js b/public/react/src/modules/courses/busyWork/PublishRightnow.js
index 95d71cb16..54e87a4c5 100644
--- a/public/react/src/modules/courses/busyWork/PublishRightnow.js
+++ b/public/react/src/modules/courses/busyWork/PublishRightnow.js
@@ -25,7 +25,9 @@ class PublishRightnow extends Component{
       Cancel:undefined,
       Saves:undefined,
       Topvalright:undefined,
-      modallate_time:undefined
+      modallate_time:undefined,
+      immediatelyopen:false,
+      starttimeslate_time:undefined
     }
   }
   open = (usingCheckBeforePost) => {
@@ -71,7 +73,8 @@ class PublishRightnow extends Component{
       Cancel:this.homeworkhide,
       Saves:this.homeworkstartend,
 			typs:showdatatypes ? "start" : "end",
-      modallate_time:showdatatypes?response.data.late_time:undefined,
+      immediatelyopen:true,
+      modallate_time:showdatatypes?this.state.starttimeslate_time:undefined,
     })
   }
   homeworkhide=()=>{
@@ -94,7 +97,8 @@ class PublishRightnow extends Component{
       addname:undefined,
       addnametype:false,
       addnametab:undefined,
-      modallate_time:undefined
+      modallate_time:undefined,
+      immediatelyopen:false
     })
   }
 
@@ -190,6 +194,7 @@ class PublishRightnow extends Component{
         this.setState({
           course_groups: response.data.course_groups,
 					starttimesend:response.data.end_time===undefined||response.data.end_time===null||response.data.end_time===""?undefined:response.data.end_time,
+          starttimeslate_time:response.data.late_time===undefined||response.data.late_time===null||response.data.late_time===""?undefined:response.data.late_time,
         })
       })
       .catch(function (error) {
@@ -263,6 +268,8 @@ class PublishRightnow extends Component{
 					starttimes={this.state.starttimes}
 					starttimesend={this.state.starttimesend}
 					typs={this.state.typs}
+          immediatelyopen={this.state.immediatelyopen}
+          modallate_time={this.state.starttimeslate_time}
 				/>:""}
         { showActionButton && <a href="javascript:void(0)" className="color-grey-9" onClick={this.homeworkstart}>{ showdatatypes   ? "立即发布" : "立即截止" }</a> }
       </div>
diff --git a/public/react/src/modules/courses/coursesPublic/OneSelfOrderModal.js b/public/react/src/modules/courses/coursesPublic/OneSelfOrderModal.js
index 60f2df553..6776cea0f 100644
--- a/public/react/src/modules/courses/coursesPublic/OneSelfOrderModal.js
+++ b/public/react/src/modules/courses/coursesPublic/OneSelfOrderModal.js
@@ -205,7 +205,7 @@ class OneSelfOrderModal extends Component{
 	}
 
 	propsSaves=(ds,endtime)=>{
-		debugger
+		 
 		this.setState({
 			endtimetype:false
 		})
diff --git a/public/react/src/modules/courses/poll/PollDetailTabForthRules.js b/public/react/src/modules/courses/poll/PollDetailTabForthRules.js
index 707c757fd..5e912524c 100644
--- a/public/react/src/modules/courses/poll/PollDetailTabForthRules.js
+++ b/public/react/src/modules/courses/poll/PollDetailTabForthRules.js
@@ -353,7 +353,7 @@ class PollDetailTabForthRules extends Component{
   render(){
     let {rules,course_group,flagPageEdit}=this.state
 		let isAdmin=this.props.isAdmin();
-    console.log(flagPageEdit)
+    // console.log(flagPageEdit)
     return(
       <div className="bor-top-greyE pt20">
         <p className="clearfix mb10">