From aa498d7db5411faf1551a479c08d760aa7a51613 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Mon, 24 Jun 2019 14:51:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courses/coursesPublic/Startshixuntask.js  |  3 +-
 .../shixunHomework/Trainingjobsetting.js      | 77 ++++++++++++++-----
 public/react/src/modules/tpm/NewHeader.js     |  4 +-
 3 files changed, 60 insertions(+), 24 deletions(-)

diff --git a/public/react/src/modules/courses/coursesPublic/Startshixuntask.js b/public/react/src/modules/courses/coursesPublic/Startshixuntask.js
index e643d9608..9cf44c9a7 100644
--- a/public/react/src/modules/courses/coursesPublic/Startshixuntask.js
+++ b/public/react/src/modules/courses/coursesPublic/Startshixuntask.js
@@ -103,7 +103,8 @@ class Startshixuntask extends Component{
 			hidestartshixunsreplacevalue,
 			startshixunCombattype,
 			shixunsmessage,
-			startbtn
+			startbtn,
+			isSpin
 		} = this.state;
 
 		return(
diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
index a15fd16b1..a1896da66 100644
--- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
+++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
@@ -637,7 +637,8 @@ class Trainingjobsetting extends Component {
 
     //允许补交
     onChanges = (e) => {
-        // debugger
+        console.log("640");
+        console.log(this.state.end_time);
         if(e.target.value ==="允许补交"){
              if(this.state.end_time !== null && this.state.end_time!== undefined){
                  // console.log(this.state.end_time);
@@ -955,26 +956,55 @@ class Trainingjobsetting extends Component {
 
 
 
-    disabledEndDate = (end_time) => {
-        const publish_time = this.state.publish_time;
-        if (!end_time || !publish_time) {
+    // disabledEndDate = (end_time) => {
+    //     const publish_time = this.state.publish_time;
+    //     if (!end_time || !publish_time) {
+    //         return false;
+    //     }
+    //     return end_time.valueOf() <= publish_time.valueOf();
+    //
+    // }
+    // disabledEndDates = (end_time) => {
+    //     const publish_time = this.state.end_time
+    //     if (!end_time || !publish_time) {
+    //         return false;
+    //     }
+    //     console.log("end_time.valueOf()")
+    //     // console.log(end_time.valueOf());
+    //     // console.log(publish_time.valueOf());
+    //     return end_time.valueOf() <= publish_time.valueOf();
+    //
+    //
+    // }
+
+    disabledStartDatestart= (startValue) => {
+        const endValue = this.state.end_time
+
+        if (!startValue || !endValue) {
             return false;
         }
-        return end_time.valueOf() <= publish_time.valueOf();
+        return startValue.valueOf() > endValue.valueOf();
+    };
+    disabledEndDateend = (endValue) => {
+        const startValue = this.state.publish_time;
+        if (!endValue || !startValue) {
+            return false;
+        }
+        return endValue.valueOf() <= startValue.valueOf();
+    };
 
-    }
-    disabledEndDates = (end_time) => {
-        const publish_time = this.state.end_time
-        if (!end_time || !publish_time) {
+
+    disabledEndDateendd = (endsValue) => {
+        const endValues = this.state.end_time
+
+        if (!endsValue|| !endValues) {
             return false;
         }
-        console.log("end_time.valueOf()")
-        // console.log(end_time.valueOf());
-        // console.log(publish_time.valueOf());
-        return end_time.valueOf() <= publish_time.valueOf();
+        return endsValue.valueOf() <= endValues.valueOf();
+    };
+
 
 
-    }
     onChangedata = (field, value, dateString) => {
         this.setState({
             [field]: handleDateString(dateString),
@@ -1085,7 +1115,10 @@ class Trainingjobsetting extends Component {
             // console.log(value);
             console.log(dateString);
             // console.log(handleDateString(dateString));
-            this.onChangedata('publish_time', value, dateString);
+            // this.onChangedata('publish_time', value, dateString);
+            this.setState({
+                publish_time:moment(handleDateString(dateString))
+            })
             if(this.state.allowreplenishment === "允许补交") {
                 this.setState({
                     end_time:moment(handleDateString(dateString)).add(1, 'months'),
@@ -1144,11 +1177,13 @@ class Trainingjobsetting extends Component {
             } catch (e) {
 
             }
-            this.onChangedata('end_time', value, dateString);
+            // this.onChangedata('end_time', value, dateString);
             if(this.state.allowreplenishment === "允许补交"){
                 this.setState({
-                    late_time:moment(handleDateString(dateString)).add(1, 'months'),
-                    late_times:moment(handleDateString(dateString)).add(1, 'months').format('YYYY-MM-DD HH:mm'),
+                    end_time:moment(handleDateString(dateString)).add(1, 'months'),
+                    deadline:moment(handleDateString(dateString)).add(1, 'months').format('YYYY-MM-DD HH:mm'),
+                    late_time:moment(handleDateString(dateString)).add(2, 'months'),
+                    late_times:moment(handleDateString(dateString)).add(2, 'months').format('YYYY-MM-DD HH:mm'),
                 })
             }
 
@@ -1647,7 +1682,7 @@ class Trainingjobsetting extends Component {
                                                     <DatePicker
                                                         showToday={false}
                                                         id={"publishtimeid"}
-                                                        disabledDate={this.disabledDateTime}
+                                                        disabledDate={this.disabledStartDatestart}
                                                         disabledTime={disabledDateTime}
                                                         className={borreds}
                                                         showTime={{ format: 'HH:mm' }}
@@ -1679,7 +1714,7 @@ class Trainingjobsetting extends Component {
                                                     <DatePicker
                                                         showToday={false}
                                                         id={"end_timeid"}
-                                                        disabledDate={this.disabledDateTime}
+                                                        disabledDate={this.disabledEndDateend}
                                                         disabledTime={disabledDateTime}
                                                         showTime={{ format: 'HH:mm' }}
                                                         className={borredss}
@@ -1760,7 +1795,7 @@ class Trainingjobsetting extends Component {
                                     <DatePicker
                                         showToday={false}
                                         id={"late_timeid"}
-                                        disabledDate={this.disabledEndDates}
+                                        disabledDate={this.disabledEndDateendd}
                                         disabledTime={disabledDateTime}
                                         format="YYYY-MM-DD HH:mm"
                                         value={late_time && moment(late_time, dataformat)}
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index ef629e27c..1620d19fb 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -606,8 +606,8 @@ submittojoinclass=(value)=>{
     // join_course_url: "https://www.educoder.net/courses/join_course_multi_role"
     // join_project_url: "https://www.educoder.net/applied_project/applied_project_info"
     //    rolearr:["",""],
-    console.log("618");
-    console.log(user_phone_binded);
+    // console.log("618");
+    // console.log(user_phone_binded);
     return (
 
       <div className="newHeader" id="nHeader">