From e6035fd0b1e7622c4042863c0126c536ed52e149 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, 24 Sep 2019 17:22:55 +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

---
 public/react/src/AppConfig.js                 |  2 +-
 .../shixunHomework/Trainingjobsetting.js      | 44 ++++++++++++++++---
 2 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js
index cd466a85a..025db7f5c 100644
--- a/public/react/src/AppConfig.js
+++ b/public/react/src/AppConfig.js
@@ -44,7 +44,7 @@ export function initAxiosInterceptors(props) {
 			// proxy = "https://testeduplus2.educoder.net"
 			//proxy="http://47.96.87.25:48080"
 			proxy="https://pre-newweb.educoder.net"
-			// proxy="https://test-newweb.educoder.net"
+			proxy="https://test-newweb.educoder.net"
 
     // 在这里使用requestMap控制，避免用户通过双击等操作发出重复的请求；
     // 如果需要支持重复的请求，考虑config里面自定义一个allowRepeat参考来控制
diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
index 5133d1ba7..25360eec4 100644
--- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
+++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
@@ -2117,7 +2117,24 @@ class Trainingjobsetting extends Component {
                     loadtype={loadtype}
                     modalSave={modalSave}
                 ></Modals>
-                <div   className={"educontent "}>
+
+                <div   className={"educontent"}>
+                    {
+                        !flagPageEdit && this.props.isAdmin() === true ?
+                          ""
+                        :
+                          <style>
+                              {
+                                  `
+                                  .yskspickers
+                        .ant-input, .ant-input .ant-input-suffix{
+                            background-color: #fff !important;
+                        }
+									     	`
+                              }
+                          </style>
+                    }
+
                     <div className="edu-back-white" style={{paddingTop: "20px"}}>
                         {/*发布设置*/}
                         <div className="stud-class-set bor-bottom-greyE edu-back-white">
@@ -2155,7 +2172,7 @@ class Trainingjobsetting extends Component {
                                             <div className="clearfix mb5 ml15">
                                                 <span className="font-16  fl mt3" style={{"color":"#999999"}}>发布时间：</span>
                                                 <Tooltip placement="bottom" title={this.props.isSuperAdmin() ? "" : !flagPageEditstwo === true && publish_timebool === true?"发布时间已过，则不能修改": ""}>
-                                                <div className="fl">
+                                                <div className="fl yskspickers">
                                                     <DatePicker
                                                         showToday={false}
                                                         id={"publishtimeid"}
@@ -2188,7 +2205,7 @@ class Trainingjobsetting extends Component {
                                             <div className="clearfix ml15 mb5">
                                                 <span className=" fl mt3 font-16" style={{"color":"#999999"}}>截止时间：</span>
                                                 <Tooltip placement="bottom" title={this.props.isSuperAdmin() ? "" : !flagPageEditsthrees === true&&end_timebool===true?"截止时间已过，则不能修改": ""}>
-                                                <div className="fl">
+                                                <div className="fl yskspickers">
                                                     <DatePicker
                                                         showToday={false}
                                                         id={"end_timeid"}
@@ -2261,7 +2278,7 @@ class Trainingjobsetting extends Component {
                                             `
                                         }
                                     </style>
-                                    <InputNumber disabled={!flagPageEditsfor || !whethertopay} min={0} max={1000} className="mr10 h40 color-grey-9"
+                                    <InputNumber disabled={!whethertopay} min={0} max={1000} className="mr10 h40 color-grey-9"
                                                  onChange={this.changeTopicName}
                                                  style={{"color":"#999999","height": "40px"}}
                                                  value={this.state.latededuction}/>
@@ -2269,8 +2286,21 @@ class Trainingjobsetting extends Component {
                                     <span className="ml15 color-grey-c" style={{"text-align":"left","font-size":"14px"}}>(延时提交作品时，学生成绩将被扣减的分值)</span>
                                     {/*{latepenaltytype===true?<div className={"color-red ml40"}></div>:""}*/}
                                 </div>
-
-                                <div className={"h20 mb20 "}>
+                                {
+                                    whethertopay&& whethertopay === true ?
+                                      <style>
+                                          {
+                                              `
+                                        .yskspickerss
+                                        .ant-input, .ant-input .ant-input-suffix{
+                                            background-color: #fff !important;
+                                        }
+									     	                 `
+                                          }
+                                      </style>
+                                      :""
+                                }
+                                <div className={"h20 mb20 yskspickerss"}>
                                     <span  style={{"width": "100px","color":"#999999"}}>结束时间：</span>
                                     <DatePicker
                                         showToday={false}
@@ -2286,7 +2316,7 @@ class Trainingjobsetting extends Component {
                                         onOk={this.ontimeonokthree}
                                         showTime={{ format: 'HH:mm' }}
                                         width={"210px"}
-                                        disabled={!flagPageEditsfor || !whethertopay}
+                                        disabled={ !whethertopay}
                                         dropdownClassName="hideDisable"
                                         className={handclass}
                                     />