diff --git a/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js b/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js index 0ee1324e..aa048dc8 100644 --- a/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js +++ b/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js @@ -230,9 +230,10 @@ class PackageConcent extends Component {
- ¥{item.min_price} - {item.max_price===null?~:""} + {item.min_price===null?¥{item.min_price}:""} + {item.max_price===null||item.min_price===null?~:""} {item.max_price===null?¥{item.max_price}:""} + {item.min_price===null&&item.max_price===null?可议价:""}
diff --git a/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js b/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js index 2f015471..16017f75 100644 --- a/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js +++ b/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 {
- {data&&data.min_price} - {data&&data.max_price===null?~:""} + {data&&data.min_price===null?{data&&data.min_price}:""} + {data&&data.max_price===null||data&&data.min_price===null?~:""} {data&&data.max_price===null?{data&&data.max_price}:""} + {data&&data.min_price===null&&data&&data.max_price===null?可议价:""}
@@ -389,7 +394,7 @@ class PackageIndexNEITaskDetails extends Component {

{item.name}

- {this.props.current_user.login!=item.login? + {this.props.current_user.login!=item.login? 头像联系TA :""}
diff --git a/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js b/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js index c476d554..ac9d8b6f 100644 --- a/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js +++ b/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={ ¥ } - /> + />不填,则表示可议价 {this.state.min_pricetype===true?
不能为空
:""} {this.state.smallstype===true?
不能小于零
:""} {this.state.minmaxtype===true?
最高费用不能小于最低费用
:""} diff --git a/public/react/src/modules/projectPackages/packageconcnet.css b/public/react/src/modules/projectPackages/packageconcnet.css index 5aa823b1..c0bdea8d 100644 --- a/public/react/src/modules/projectPackages/packageconcnet.css +++ b/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; } \ No newline at end of file