diff --git a/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js b/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js index 88fbc330..a12ea841 100644 --- a/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js +++ b/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js @@ -229,8 +229,8 @@ class PackageIndexNEITaskDetails extends Component { render() { let {overtype,data}=this.state; - console.log(data&&data.creator.login) - console.log(this.props.current_user.login) + // console.log(data&&data.creator.login) + // console.log(this.props.current_user.login) return (
@@ -370,7 +370,7 @@ class PackageIndexNEITaskDetails extends Component { {/*发布者和竞选者状态show*/} - {this.state.setbiddingmantype===false?
+ {this.state.setbiddingmantype===false&&data&&data.published_at!=null?
{/*下面是头像*/}
diff --git a/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js b/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js index 1bf25f80..baa1b96a 100644 --- a/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js +++ b/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js @@ -29,6 +29,20 @@ function checkPhone(phone){ return false; } } + +function range(start, end) { + const result = []; + for (let i = start; i < end; i++) { + result.push(i); + } + return result; +} + +function disabledDateTime() { + return { + disabledMinutes: () => range(1, 30).concat(range(31, 60)), + }; +} class PackageIndexNEIBannerConcent extends Component { constructor(props) { super(props) @@ -170,29 +184,35 @@ class PackageIndexNEIBannerConcent extends Component { onChangeTimePicker = (value, dateString) => { - - if(moment(handleDateString(dateString))===undefined||moment(handleDateString(dateString))===null||moment(handleDateString(dateString))===""){ + if(value===null){ this.setState({ - deadline_attypes:true - }) - }else{ - this.setState({ - deadline_attypes:false - }) - } - if(moment(handleDateString(dateString)){ - - let {min_price,max_price}=this.state; - + setcheckout=(min_price,max_price)=>{ // if(min_price===undefined){ // this.setState({ // min_pricetype:true @@ -259,6 +276,7 @@ class PackageIndexNEIBannerConcent extends Component { } if(parseInt(max_price){ + let{max_price}=this.state; this.setState({ min_price:e.target.value }) - this.setcheckout() + this.setcheckout(e.target.value,max_price) } onChangemax_prices=(e)=>{ + let{min_price}=this.state; this.setState({ max_price:e.target.value }) - this.setcheckout() + this.setcheckout(min_price,e.target.value) } @@ -597,7 +617,7 @@ class PackageIndexNEIBannerConcent extends Component { }) } } - if(modalCancel===true){ + if(modalCancel===true||this.props.current_user.phone===null){ if(e.target.value===undefined||e.target.value===null||e.target.value===""){ this.setState({ contact_phonetype:true @@ -682,7 +702,6 @@ class PackageIndexNEIBannerConcent extends Component {

-
  • this.setcategory(undefined)}>全部
  • {this.state.categories.map((item,key)=>{ return(
  • this.setcategory(item.id)}>{item.name}
  • @@ -765,6 +784,7 @@ class PackageIndexNEIBannerConcent extends Component { format="YYYY-MM-DD HH:mm" placeholder="请选择任务的竞标截止日期" className={"fafas"} + disabledTime={disabledDateTime} value={this.state.deadline_at} onChange={this.onChangeTimePicker} /> @@ -780,7 +800,7 @@ class PackageIndexNEIBannerConcent extends Component { style={{"width": "260px"}} value={this.state.min_price} placeholder="支付多少费用(最低)" - onInput={this.onChangemin_prices} + onInput={(e)=>this.onChangemin_prices(e)} suffix={ ¥ } @@ -791,8 +811,7 @@ class PackageIndexNEIBannerConcent extends Component { style={{"width": "260px"}} value={this.state.max_price} placeholder="支付多少费用(最高)" - onInput={this.onChangemax_prices} - + onInput={(e)=>this.onChangemax_prices(e)} suffix={ ¥ } @@ -809,9 +828,9 @@ class PackageIndexNEIBannerConcent extends Component { this.onChangeContact_name(e)} /> {this.state.contact_nametype===true?
    不能为空
    :""}

    @@ -841,7 +860,7 @@ class PackageIndexNEIBannerConcent extends Component { style={{"width": "260px"}} value={this.state.contact_phone} placeholder="请输入手机号码" - onInput={this.onChangeContact_phone} + onInput={(e)=>this.onChangeContact_phone(e)} /> {this.state.contact_phonetype===true?
    不能为空
    :""} {this.state.contact_phonetypes===true?
    请输入正确的手机号
    :""} @@ -857,7 +876,7 @@ class PackageIndexNEIBannerConcent extends Component { enterButton={ getverificationcodes === undefined ? 重新发送 ({seconds}s): getverificationcodes === true ?获取验证码 :重新发送} onSearch={()=>this.getverificationcode()} - onInput={this.onChangeCode} + onInput={(e)=>this.onChangeCode(e)} /> {this.state.codeypes===true?
    验证码不能为空
    :""} {this.state.codeypesno===true?
    验证码不正确
    :""}