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

---
 .../src/modules/courses/shixunHomework/Listofworks.js  | 10 +++++-----
 .../shixunHomework/TraineetraininginformationModal.js  |  8 ++++----
 .../courses/shixunHomework/Trainingjobsetting.js       | 10 ++++++----
 public/react/src/modules/login/Trialapplication.js     |  2 +-
 public/react/src/modules/tpm/NewHeader.js              |  2 +-
 5 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/public/react/src/modules/courses/shixunHomework/Listofworks.js b/public/react/src/modules/courses/shixunHomework/Listofworks.js
index 2a636aa70..2200c8e77 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworks.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworks.js
@@ -91,7 +91,7 @@ class Listofworks extends Component {
 			unlimited: 0,
 			unlimitedtwo: 1,
 			code_review: false,
-			boolgalist:false,
+			boolgalist:true,
 			columns: [
 				{
 					title: '序号',
@@ -556,7 +556,7 @@ class Listofworks extends Component {
 						align: 'center',
 						width:'96px',
 						render: (text, record) => (
-							record.submitstate === "未提交" ? "--" :
+							record.submitstate === "未提交" ? <span style={{color:'#9A9A9A'}}>--</span>:
 								<span>
                         <a style={this.props.isNotMember() === true ? this.state.mystyles : this.state.mystyle}
 													 onClick={() => this.Viewstudenttraininginformations(record)}>调分</a>
@@ -779,7 +779,7 @@ class Listofworks extends Component {
 				// console.log(JSON.stringify(result))
 				let datalist = [];
 				var game_list = result.data.game_list
-				var boolgalist=false;
+				var boolgalist=true;
 				for (var i = 0; i < game_list.length; i++) {
 
 					datalist.push({
@@ -790,8 +790,8 @@ class Listofworks extends Component {
 						complete_status: game_list[i].complete_status,
 					})
 
-					if(game_list[i].complete_status === 1){
-						boolgalist=true;
+					if(game_list[i].complete_status === 2 || game_list[i].complete_status===3){
+						boolgalist=false;
 					}
 
 				}
diff --git a/public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js b/public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js
index 89cc35470..8c7ad059e 100644
--- a/public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js
+++ b/public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js
@@ -210,12 +210,12 @@ class TraineetraininginformationModal extends Component {
                                  src={this.props.viewtrainingdata === undefined ? "" : "https://www.educoder.net/images/" + `${this.props.viewtrainingdata.image_url}`}
                                  width="70"/>
                     </div>
-                        <div className="fl  edu-back-white ml20  mt10">
+                        <div className="fl  edu-back-white ml20  mt15">
                             <li>{this.props.viewtrainingdata === undefined ? "" :this.props.viewtrainingdata.username}<span style={{"color":"#323232"}}> 通关：</span><span style={{"color": '#FF6800'}}>{this.props.viewtrainingdata === undefined ? "" :this.props.viewtrainingdata.complete_count}/{this.props.viewtrainingdata === undefined ? "" :this.props.viewtrainingdata.challenges_count}</span></li>
                             <li><span   style={{"color":"#989898"}} >完成效率：</span><span  style={{"color":"#4C4C4C"}}>{this.props.viewtrainingdata === undefined ? "" :this.props.viewtrainingdata.efficiency}</span></li>
                             <li><span style={{"color":"#989898"}}>通关时间：</span> <span style={{"color":"#4C4C4C"}}>{this.props.viewtrainingdata === undefined ? "":moment(this.props.viewtrainingdata.passed_time).format('YYYY-MM-DD HH:mm')==="Invalid date"?"--":moment(this.props.viewtrainingdata.passed_time).format('YYYY-MM-DD HH:mm')}</span> </li>
                         </div>
-                        <div className="fl  edu-back-white ml20  mt10">
+                        <div className="fl  edu-back-white ml20  mt15">
                             <li className="mt20"> <span style={{"color":"#989898"}}>课堂最高完成效率：</span> <span style={{"color":"#4C4C4C"}}>{this.props.viewtrainingdata === undefined ? "" :this.props.viewtrainingdata.max_efficiency} </span> </li>
                             <li><span style={{"color":"#989898"}}>总耗时:</span>  <span style={{"color":"#4C4C4C"}}> {this.props.viewtrainingdata === undefined ? "" :this.props.viewtrainingdata.total_spend_time}</span> </li>
 
@@ -223,7 +223,7 @@ class TraineetraininginformationModal extends Component {
                     </div>
                         {
                             this.props.game_list === undefined?"" : this.props.game_list.length<4?
-                              <div>
+                              <div className="edu-table edu-back-white ">
                             <style>
                                 {
                                     `  .ant-table-body{
@@ -243,7 +243,7 @@ class TraineetraininginformationModal extends Component {
                             />}
                               </div>
                               :
-                              <div>
+                              <div className="edu-table edu-back-white ">
                               <div className={"both"}></div>
                         {this.props.game_list === undefined ? "" : <Table
                             className="mt20"
diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
index bd24abb02..18d970b1f 100644
--- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
+++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
@@ -642,10 +642,10 @@ class Trainingjobsetting extends Component {
         if(e.target.value ==="允许补交"){
              if(this.state.end_time !== null && this.state.end_time!== undefined){
                  // console.log(this.state.end_time);
-                 var times = this.state.deadline.format('YYYY-MM-DD HH:mm');
+                 // var times = this.state.deadline.format('YYYY-MM-DD HH:mm');
                  this.setState({
-                     late_time:moment(handleDateString(times)).add(1, 'months'),
-                     late_times:moment(handleDateString(times)).add(1, 'months').format('YYYY-MM-DD HH:mm'),
+                     late_time:moment(handleDateString(this.state.deadline)).add(1, 'months'),
+                     late_times:moment(handleDateString(this.state.deadline)).add(1, 'months').format('YYYY-MM-DD HH:mm'),
                  })
              }
 
@@ -1184,10 +1184,12 @@ class Trainingjobsetting extends Component {
             } catch (e) {
 
             }
+            this.setState({
+                end_time:moment(handleDateString(dateString))
+            })
             // this.onChangedata('end_time', value, dateString);
             if(this.state.allowreplenishment === "允许补交"){
                 this.setState({
-                    end_time:moment(handleDateString(dateString)),
                     deadline:moment(handleDateString(dateString)).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'),
diff --git a/public/react/src/modules/login/Trialapplication.js b/public/react/src/modules/login/Trialapplication.js
index 8b93fe88c..e5bc75466 100644
--- a/public/react/src/modules/login/Trialapplication.js
+++ b/public/react/src/modules/login/Trialapplication.js
@@ -553,7 +553,7 @@ class Trialapplication extends Component {
 									<div className={"login_register_content"} style={
 										user_phone_binded === true ?
 											{
-												"width": "560px", "height": "304px",
+												"width": "560px", "height": "280px",
 												"border-radius": "15px",
 												"background": " #FFFFff",
 												"text-align": "center",
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index 294339b54..841687f20 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -170,7 +170,7 @@ class NewHeader extends Component {
       submitapplications:false,
       isRender:false,
       isRenders:false,
-      showTrial:false,
+      showTrial:true,
     }
     // console.log("176")
     // console.log(props);

From b23f4abade9c5eeb973a0c37a930a20113d6037e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Tue, 25 Jun 2019 14:14:18 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=20=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courses/graduation/tasks/GraduationTasksedit.js  |  8 ++++----
 .../courses/graduation/tasks/GraduationTasksnew.js   | 12 +++++++-----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
index 7404f69d6..c8cb7f832 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
@@ -304,7 +304,7 @@ class GraduationTasksedit extends Component{
 
               {description===undefined?"":<Form labelCol={{ span: 5 }} wrapperCol={{ span: 12 }} onSubmit={this.handleSubmit} >
                 {/*内容*/}
-                <div className="stud-class-set bor-bottom-greyE pd20 edu-back-white">
+                <div className="stud-class-set bor-bottom-greyE pt20 pl20 pr20 pb0 edu-back-white">
 
                   <Form.Item label="类型">
                     {getFieldDecorator('tasktype', {
@@ -323,13 +323,13 @@ class GraduationTasksedit extends Component{
                   <Form.Item label="任务标题"  >
                     {getFieldDecorator('name', {
                       rules: [{ required: true, message: "请输入标题" }],
-                    })(<Input placeholder="请输入任务名称，最大限制20个字符" value={name} onInput={this.changeTitle}  className="searchView searchViewAfter" style={{"width":"100%"}} maxLength="60" addonAfter={String(title_num)}/>)}
+                    })(<Input placeholder="请输入任务名称，最大限制60个字符" value={name} onInput={this.changeTitle}  className="searchView searchViewAfter" style={{"width":"100%"}} maxLength="60" addonAfter={String(title_num)}/>)}
                   </Form.Item>
                   <input type="hidden"  id='nametypes' />
                 </div>
 
 
-                <div className="stud-class-set pd20 coursenavbox edu-back-white">
+                <div className="stud-class-set pt20 pl20 pr20 pb0 coursenavbox edu-back-white">
                   <style>{`
                 .uploadBtn.ant-btn {
                   border: none;
@@ -348,7 +348,7 @@ class GraduationTasksedit extends Component{
               `}</style>
                   <Form.Item
                     label="内容"
-
+										style={{marginBottom:'0px'}}
                   >
                     {getFieldDecorator('description', {
                       rules: [{
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js
index fec4248df..be85e5087 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js
@@ -294,7 +294,7 @@ class GraduationTasksnew extends Component {
 									}
 								</style>
 								{/*内容*/}
-								<div className="stud-class-set bor-bottom-greyE pt20 pl20 pr20 edu-back-white">
+								<div className="stud-class-set bor-bottom-greyE pt20 pl20 pr20 pb25 edu-back-white">
 
 									<Form.Item label="类型" >
 										{getFieldDecorator('tasktype', {
@@ -309,12 +309,14 @@ class GraduationTasksnew extends Component {
 										<span className={"newcoursestitle"}>（选择确认后，无法修改）</span>
 									</Form.Item>
 
-									<Form.Item label="任务标题"  >
+									<Form.Item label="任务标题" >
 										{getFieldDecorator('name', {
-											rules: [{ required: true, message: "请输入标题" }],
-										})(<Input placeholder="请输入任务名称，最大限制60个字符" value={title_value} onInput={this.changeTitle}  className="searchView searchViewAfter mb20" style={{"width":"100%"}} maxLength="60" 	addonAfter={String(title_num)}/>)}
+											rules: [{required: true, message: "不能为空"}],
+										})(<Input placeholder="请输入任务名称，最大限制60个字符" value={title_value} onInput={this.changeTitle}
+															className="searchView searchViewAfter  h40" style={{"width": "100%"}} maxLength="60"
+															addonAfter={String(title_num)}/>)}
 									</Form.Item>
-									<input type="hidden" id='nametypes'/>
+									<input type="hidden" id='nametypes'  />
 								</div>