From 64fd381f0abff41e8d352b1625bdc7c8c85efc6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 2 Aug 2019 22:07:13 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/tpm/TPMsettings/TPMsettings.js     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/public/react/src/modules/tpm/TPMsettings/TPMsettings.js b/public/react/src/modules/tpm/TPMsettings/TPMsettings.js
index 6550888f6..910ea5882 100644
--- a/public/react/src/modules/tpm/TPMsettings/TPMsettings.js
+++ b/public/react/src/modules/tpm/TPMsettings/TPMsettings.js
@@ -1391,13 +1391,13 @@ export default class TPMsettings extends Component {
 											})
 										}
 									</Select>
-									<p
-										className="edu-txt-left font-12"
-										style={{display:operateauthority?"block":'none'}}
-									>
-										列表中没有？
-										<a className="color-blue" onClick={this.post_apply}>申请新建</a>
-									</p>
+									{/*<p*/}
+										{/*className="edu-txt-left font-12"*/}
+										{/*style={{display:operateauthority?"block":'none'}}*/}
+									{/*>*/}
+										{/*列表中没有？*/}
+										{/*<a className="color-blue" onClick={this.post_apply}>申请新建</a>*/}
+									{/*</p>*/}
 
 									<Modal
 										keyboard={false}

From 391ad04a93d8b452b198ae296ca544b5183dac59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 2 Aug 2019 22:17:23 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js b/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js
index ac498b4ee..60394d52b 100644
--- a/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js
+++ b/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js
@@ -409,7 +409,7 @@ class PackageIndexNEITaskDetails extends Component {
 												return(
 													<div className="ysldivhomediv1s homehove" key={key}>
 														{item.status==="bidding_won"?<img src={gouxuan} className="yslgouxuanimg"/>:""}
-														<a href={`/users/${item.login}`}><img className="div1imgs" src={getImageUrl("images/"+item.image_url)}/></a>
+														<a className={item.status==="bidding_won"?"":"mt20"} href={`/users/${item.login}`}><img className="div1imgs" src={getImageUrl("images/"+item.image_url)}/></a>
 														<div className="textall mt10" title={item.name}> <p className="ptext">{item.name}</p></div>
 														{this.props.current_user&&this.props.current_user.login!=item.login?<a className="ContacttheTAs fl none" target="_blank" href={`/messages/${this.props.current_user&&this.props.current_user.login}/message_detail?target_ids=${item.id}`}>
 															<img alt="头像" className="mr5" src={require('./newstwo.png')}/>联系TA

From 398f92b3135efe6f13e7ccb3ec157e15110e8fb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 2 Aug 2019 23:16:38 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/message/js/MessagSub.js      | 2 +-
 public/react/src/modules/message/js/MessagePrivate.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/react/src/modules/message/js/MessagSub.js b/public/react/src/modules/message/js/MessagSub.js
index 394e04f6d..6daa56c9e 100644
--- a/public/react/src/modules/message/js/MessagSub.js
+++ b/public/react/src/modules/message/js/MessagSub.js
@@ -544,7 +544,7 @@ class MessagSub extends Component{
 													 	`
 													 }
 												 </style>
-												 <p className="color-grey-6 break_word_firefox yslspansk markdown-body" style={{wordBreak: "break-word"}} dangerouslySetInnerHTML={{__html: markdownToHTML(item.content).replace(/▁/g, "▁▁▁")}} ></p>
+												 <p className="color-grey-6 break_word_firefox yslspansk markdown-body mt10" style={{wordBreak: "break-word"}} dangerouslySetInnerHTML={{__html: markdownToHTML(item.content).replace(/▁/g, "▁▁▁")}} ></p>
 											 </div>
 
 											 <span className={item.new_tiding===true?"new-point fr mr40 mt22":""}></span>
diff --git a/public/react/src/modules/message/js/MessagePrivate.js b/public/react/src/modules/message/js/MessagePrivate.js
index 036ae99aa..e75578298 100644
--- a/public/react/src/modules/message/js/MessagePrivate.js
+++ b/public/react/src/modules/message/js/MessagePrivate.js
@@ -179,7 +179,7 @@ class MessagePrivate extends Component{
 													<span className="color-grey-c mr20">[{item.message_count}{"条"}]</span>
 													<span className="color-grey-c">{moment(item.send_time).fromNow()}</span>
 												</p>
-												<span className="color-grey-6 break_word_firefox  markdown-body" 	dangerouslySetInnerHTML={{__html: markdownToHTML(item.content).replace(/▁/g, "▁▁▁")}}	></span>
+												<div className="color-grey-6 break_word_firefox  markdown-body mt10" 	dangerouslySetInnerHTML={{__html: markdownToHTML(item.content).replace(/▁/g, "▁▁▁")}}	></div>
 
 											</div>
 											{item.unread === true ?<span className="new-point fr mt22"></span>:""}

From e2bc8c2235bb207e7f28b0dfcd205982c6d00948 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 2 Aug 2019 23:25:41 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/message/js/MessagSub.js      | 4 ++--
 public/react/src/modules/message/js/MessagePrivate.js | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/public/react/src/modules/message/js/MessagSub.js b/public/react/src/modules/message/js/MessagSub.js
index 6b29485d8..9beebdf68 100644
--- a/public/react/src/modules/message/js/MessagSub.js
+++ b/public/react/src/modules/message/js/MessagSub.js
@@ -487,10 +487,10 @@ class MessagSub extends Component{
 			 <div className="bor-top-greyE mycenter">
 				 {/*这里可以进行数据处理*/}
 				 <div className="myw100baifenbi">
-				 <Spin size="large" className="myw100baifenbi" spinning={isSpin}>
+				 <Spin size="large" className="myw100baifenbi mt10" spinning={isSpin}>
 
 					 {
-						 data===undefined?
+						 data===undefined?"":data.length===0?
 							 <div className="edu-tab-con-box clearfix edu-txt-center">
 								 <img className="edu-nodata-img mb20"  src={getImageUrl("images/educoder/nodata.png")}/>
 								 <p className="edu-nodata-p mb20">暂无数据哦~</p>
diff --git a/public/react/src/modules/message/js/MessagePrivate.js b/public/react/src/modules/message/js/MessagePrivate.js
index e75578298..ec7c20121 100644
--- a/public/react/src/modules/message/js/MessagePrivate.js
+++ b/public/react/src/modules/message/js/MessagePrivate.js
@@ -160,14 +160,13 @@ class MessagePrivate extends Component{
 			<Spin size="large" className="myw100baifenbi" spinning={isSpin}>
 
 					{
-						data===undefined?
+						data===undefined?"":data.length===0?
 							<div className="edu-tab-con-box clearfix edu-txt-center">
 								<img className="edu-nodata-img mb20"  src={getImageUrl("images/educoder/nodata.png")}/>
 								<p className="edu-nodata-p mb20">暂无数据哦~</p>
 							</div>
 							:data.map((item,key)=>{
 								return(
-
 										<div className="private-item clearfix df" key={key} onClick={()=>this.smyJump(3,item.target.id)}>
 											<a className="fl mr10 private_message_a" onMouseDown={()=>this.myCome(item)}>
 												<img onMouseDown={()=>this.myCome(item)} src={getImageUrl("images/"+item.target.image_url)} className="radius myimgw48 myimgh48"/>
@@ -184,7 +183,6 @@ class MessagePrivate extends Component{
 											</div>
 											{item.unread === true ?<span className="new-point fr mt22"></span>:""}
 										</div>
-
 								)
 							})}
 				</Spin>

From 912689704e2fa48b267793459dadc24a6324fee2 Mon Sep 17 00:00:00 2001
From: jingquan huang <huang.jingquan@163.com>
Date: Sat, 3 Aug 2019 10:38:13 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E8=AF=84=E6=B5=8B=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BD=93=E5=89=8D=E8=AF=84=E6=B5=8B=E6=97=B6?=
 =?UTF-8?q?=E6=9C=80=E5=A4=A7=E6=89=A7=E8=A1=8C=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/myshixuns_controller.rb                  | 2 +-
 db/migrate/20190803014642_add_exec_time_to_evaluation.rb | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)
 delete mode 100644 db/migrate/20190803014642_add_exec_time_to_evaluation.rb

diff --git a/app/controllers/myshixuns_controller.rb b/app/controllers/myshixuns_controller.rb
index fe31c4fe2..ef368b367 100644
--- a/app/controllers/myshixuns_controller.rb
+++ b/app/controllers/myshixuns_controller.rb
@@ -265,7 +265,7 @@ class MyshixunsController < ApplicationController
       # params[:evaluate] 实训评测时更新必须给的参数，需要依据该参数做性能统计，其它类型的更新可以跳过
       # 自动保存的时候evaluate为0；点评测的时候为1
       if params[:evaluate] == 1
-        exec_time = @game.challenge.pluck(:exec_time)
+        exec_time = @game.challenge.try(:exec_time)
         @sec_key = generate_identifier(EvaluateRecord, 12)
         record = EvaluateRecord.create!(:user_id => current_user.id, :shixun_id => @myshixun.shixun_id, :game_id => game_id,
                                         :identifier => @sec_key, :exec_time => exec_time)
diff --git a/db/migrate/20190803014642_add_exec_time_to_evaluation.rb b/db/migrate/20190803014642_add_exec_time_to_evaluation.rb
deleted file mode 100644
index 9f2af8b29..000000000
--- a/db/migrate/20190803014642_add_exec_time_to_evaluation.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddExecTimeToEvaluation < ActiveRecord::Migration[5.2]
-  def change
-    add_column :evaluate_records, :exec_time, :integer
-  end
-end

From 56bb46bae00aa8bd8099648cf0ddd0f5b27b17bc Mon Sep 17 00:00:00 2001
From: jingquan huang <huang.jingquan@163.com>
Date: Sat, 3 Aug 2019 11:49:12 +0800
Subject: [PATCH 6/6] 500

---
 app/controllers/myshixuns_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/myshixuns_controller.rb b/app/controllers/myshixuns_controller.rb
index ef368b367..c36ad09b6 100644
--- a/app/controllers/myshixuns_controller.rb
+++ b/app/controllers/myshixuns_controller.rb
@@ -265,7 +265,7 @@ class MyshixunsController < ApplicationController
       # params[:evaluate] 实训评测时更新必须给的参数，需要依据该参数做性能统计，其它类型的更新可以跳过
       # 自动保存的时候evaluate为0；点评测的时候为1
       if params[:evaluate] == 1
-        exec_time = @game.challenge.try(:exec_time)
+        exec_time = game.challenge.try(:exec_time)
         @sec_key = generate_identifier(EvaluateRecord, 12)
         record = EvaluateRecord.create!(:user_id => current_user.id, :shixun_id => @myshixun.shixun_id, :game_id => game_id,
                                         :identifier => @sec_key, :exec_time => exec_time)