From 696868c4a229fd32afe9449ac2e179ac5938ea10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Sat, 13 Jul 2019 14:56:37 +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

---
 .../projectPackages/PackageIndex/PackageConcent.js    |  6 +++---
 .../PackageIndexNEITaskDetails.js                     | 11 ++++++-----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js b/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js
index aa048dc8..4e63fb8e 100644
--- a/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js
+++ b/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js
@@ -230,9 +230,9 @@ class PackageConcent extends Component {
 															<div className=" item-head-blank"></div>
 
 															<div className=" item-head-price">
-																{item.min_price===null?<span>￥{item.min_price}</span>:""}
-																{item.max_price===null||item.min_price===null?<span>~</span>:""}
-																{item.max_price===null?<span>￥{item.max_price}</span>:""}
+																{item.min_price===null?"":<span>￥{item.min_price}</span>}
+																{item.max_price===null||item.min_price===null?"":<span>~</span>}
+																{item.max_price===null?"":<span>￥{item.max_price}</span>}
 																{item.min_price===null&&item.max_price===null?<span>可议价</span>:""}
 															</div>
 
diff --git a/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js b/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js
index 20693711..49335460 100644
--- a/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js
+++ b/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js
@@ -281,10 +281,11 @@ class PackageIndexNEITaskDetails extends Component {
 														{data&&data.creator.name}
 													</div>
 
-													{data&&data.creator?this.props.current_user.login===data&&data.creator.login?"":<div className=" edu-back-white  ml5 mt10 "
+													{/*{data&&data.creator?this.props.current_user.login===data&&data.creator.login?"":*/}
+														{data&&data.operation.can_bidding===true?<div className=" edu-back-white  ml5 mt10 "
 															 onMouseOver={this.setover}
 															 onMouseOut={this.setout}
-												>
+												    >
 														{overtype===false?<a className="ContacttheTA fl" href={`/users/${this.props.current_user.login}/private_messages`}> <img alt="头像" class="mr5" src={require('./newsone.png')} />联系TA</a>:
 															<a className="ContacttheTAs fl" href={`/users/${this.props.current_user.login}/private_messages`}> <img alt="头像" className="mr5"
 																																	 src={require('./newstwo.png')}/>联系TA</a>}
@@ -306,9 +307,9 @@ class PackageIndexNEITaskDetails extends Component {
 													</div>
 
 													<div className=" item-head-price mtf7">
-														 {data&&data.min_price===null?<span>￥<span className={"font-24"}>{data&&data.min_price}</span></span>:""}
-														 {data&&data.max_price===null||data&&data.min_price===null?<span>~</span>:""}
-														 {data&&data.max_price===null?<span>￥<span className={"font-24"}>{data&&data.max_price}</span></span>:""}
+														 {data&&data.min_price===null?"":<span>￥<span className={"font-24"}>{data&&data.min_price}</span></span>}
+														 {data&&data.max_price===null||data&&data.min_price===null?"":<span>~</span>}
+														 {data&&data.max_price===null?"":<span>￥<span className={"font-24"}>{data&&data.max_price}</span></span>}
 													   {data&&data.min_price===null&&data&&data.max_price===null?<span>可议价</span>:""}
 													</div>