调整

public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js

@@ -230,9 +230,10 @@ class PackageConcent extends Component {
 															<div className=" item-head-blank"></div>
 
 															<div className=" item-head-price">
-																<span>￥{item.min_price}</span>
-																{item.max_price===null?<span>~</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>
 
 														</div>

public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js

@@ -119,6 +119,8 @@ class PackageIndexNEITaskDetails extends Component {
 		}).then((response) => {
 			if(response.data.status===0){
 				this.props.showSnackbar("提交成功");
+			}else{
+				this.props.showSnackbar(response.data.message);
 			}
 		}).catch((error) => {
 			console.log(error)
@@ -213,6 +215,8 @@ class PackageIndexNEITaskDetails extends Component {
 			if(response.data.status===0){
 				this.props.showSnackbar("报名成功");
 				this.getdatas()
+			}else{
+				this.props.showSnackbar(response.data.message);
 			}
 		}).catch((error) => {
 			console.log(error)
@@ -302,9 +306,10 @@ class PackageIndexNEITaskDetails extends Component {
 													</div>
 
 													<div className=" item-head-price mtf7">
-														<span>￥<span className={"font-24"}>{data&&data.min_price}</span></span>
-														 {data&&data.max_price===null?<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>
 
 												</div>
@@ -389,7 +394,7 @@ class PackageIndexNEITaskDetails extends Component {
 													<div className="ysldivhomediv1 homehove">
 														<a href={`/users/${item.login}`}><img className="div1img" src={item.avatar_url}/></a>
 														<div className="textall mt10" title={item.name}> <p className="ptext">{item.name}</p></div>
-														{this.props.current_user.login!=item.login?<a className="ContacttheTAs fl none" href={`/users/${item.login}/private_messages`}>
+														{this.props.current_user.login!=item.login?<a className="ContacttheTAs fl none" href={`/users/${this.props.current_user.login}/private_messages`}>
 															<img alt="头像" className="mr5" src={require('./newstwo.png')}/>联系TA
 														</a>:""}
 													</div>

public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js

@@ -214,27 +214,27 @@ class PackageIndexNEIBannerConcent extends Component {
 
 	 let {min_price,max_price}=this.state;
 
-	 if(min_price===undefined){
-		 this.setState({
-			 min_pricetype:true
-		 })
-	 }else{
-		 this.setState({
-			 min_pricetype:false
-		 })
-	 }
-
+	 // if(min_price===undefined){
+		//  this.setState({
+		// 	 min_pricetype:true
+		//  })
+	 // }else{
+		//  this.setState({
+		// 	 min_pricetype:false
+		//  })
+	 // }
 
-	 if(parseInt(min_price)===undefined||parseInt(min_price)===null||parseInt(min_price)===""){
 
-		 this.setState({
-			 min_pricetype:true
-		 })
-	 }else{
-		 this.setState({
-			 min_pricetype:false
-		 })
-	 }
+	 // if(parseInt(min_price)===undefined||parseInt(min_price)===null||parseInt(min_price)===""){
+	 //
+		//  this.setState({
+		// 	 min_pricetype:true
+		//  })
+	 // }else{
+		//  this.setState({
+		// 	 min_pricetype:false
+		//  })
+	 // }
 
 	 // if(parseInt(max_price)===undefined||parseInt(max_price)===null||parseInt(max_price)===""){
 	 //
@@ -322,22 +322,22 @@ class PackageIndexNEIBannerConcent extends Component {
 			return
 		}
 
-		if(min_price===undefined){
-			this.setState({
-				min_pricetype:true
-			})
-		}else{
-			this.setState({
-				min_pricetype:false
-			})
-		}
+		// if(min_price===undefined){
+		// 	this.setState({
+		// 		min_pricetype:true
+		// 	})
+		// }else{
+		// 	this.setState({
+		// 		min_pricetype:false
+		// 	})
+		// }
 
-		if(parseInt(min_price)===undefined||parseInt(min_price)===null||parseInt(min_price)===""){
-			this.setState({
-				min_pricetype:true
-			})
-			return
-		}
+		// if(parseInt(min_price)===undefined||parseInt(min_price)===null||parseInt(min_price)===""){
+		// 	this.setState({
+		// 		min_pricetype:true
+		// 	})
+		// 	return
+		// }
 
 		// if(parseInt(max_price)===undefined||parseInt(max_price)===null||parseInt(max_price)===""){
 		// 	this.setState({
@@ -785,7 +785,7 @@ class PackageIndexNEIBannerConcent extends Component {
 								suffix={
 									<span>¥</span>
 								}
-							/>
+								/><span className={"pagenoedits"}>不填，则表示可议价</span>
 								  {this.state.min_pricetype===true?<div className={"color-red ml100"}>不能为空</div>:""}
 								  {this.state.smallstype===true?<div className={"color-red ml100"}>不能小于零</div>:""}
 									{this.state.minmaxtype===true?<div className={"color-red ml100"}>最高费用不能小于最低费用</div>:""}

public/react/src/modules/projectPackages/packageconcnet.css

@@ -299,4 +299,9 @@
 }
 .touchSelect .ant-spin-dot-spin{
     margin-top: 30% !important;
+}
+
+.pagenoedits{
+    margin-left: 20px;
+    color: #ccc;
 }