diff --git a/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js b/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js index c1422416..c9ffc870 100644 --- a/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js +++ b/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js @@ -253,7 +253,7 @@ class PackageConcent extends Component { <span className=" item-group-text">{moment(item.deadline_at).endOf('day').fromNow()}竞标截止</span> </div> - <div className=" item-group item-other-bidding pd35"> + <div className=" item-group item-other-bidding ml0"> <span className=" item-group-icon"><i className="fa fa-user" ></i></span> <span className=" item-group-text">{item.bidding_users_count}人竞标</span> diff --git a/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js b/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js index 25edbe6c..059ba4ae 100644 --- a/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js +++ b/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js @@ -119,7 +119,11 @@ class PackageIndexNEITaskDetails extends Component { }).then((response) => { if(response.data.status===0){ this.props.showSnackbar("提交成功"); - }else{ + this.setState({ + setbiddingmantype:false + }) + this.getdatas() + }else if(response.data.status===-1){ this.props.showSnackbar(response.data.message); } }).catch((error) => { @@ -215,7 +219,7 @@ class PackageIndexNEITaskDetails extends Component { if(response.data.status===0){ this.props.showSnackbar("报名成功"); this.getdatas() - }else{ + }else if(response.data.status===-1){ this.props.showSnackbar(response.data.message); } }).catch((error) => { @@ -395,7 +399,8 @@ class PackageIndexNEITaskDetails extends Component { {data&&data.bidding_users.map((item,key)=>{ return( - <div className="ysldivhomediv1 homehove"> + <div className="ysldivhomediv1 homehove" key={key}> + {item.status==="bidding_won"?<img src={gouxuan} className="yslgouxuanimg"/>:""} <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/${this.props.current_user.login}/private_messages`}> @@ -442,7 +447,7 @@ class PackageIndexNEITaskDetails extends Component { <div style={{height: "20px"}}> </div> {data&&data.bidding_users.map((item,key)=>{ return( - <div className="ysldivhomediv1" onClick={()=>this.Clickteacher2(item.id)}> + <div className="ysldivhomediv1" onClick={()=>this.Clickteacher2(item.id)} key={key}> {item.bool===true?<img src={gouxuan} className="yslgouxuanimg"/>:<img src={weigouxuan} className="yslgouxuanimg"/>} <a href={`/users/${item.login}`}><img className="div1img" src={item.avatar_url}/></a> <span className={item.bool===true?"textall mt10 color-blue":"textall mt10"} title={item.name}> <p className="ptext">{item.name}</p></span> diff --git a/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js b/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js index 56ccd3de..17adfbac 100644 --- a/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js +++ b/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js @@ -397,14 +397,14 @@ class PackageIndexNEIBannerConcent extends Component { return } - if(modalCancel===false){ - if(this.props.current_user.phone===undefined||this.props.current_user.phone===null||this.props.current_user.phone===""){ - this.setState({ - current_userphonetype:true - }) - return - } - } + // if(modalCancel===false){ + // if(this.props.current_user.phone===undefined||this.props.current_user.phone===null||this.props.current_user.phone===""){ + // this.setState({ + // current_userphonetype:true + // }) + // return + // } + // } if(modalCancel===true||this.props.current_user.phone===null){ @@ -618,17 +618,17 @@ class PackageIndexNEIBannerConcent extends Component { onChangeContact_phone=(e)=>{ let {modalCancel}=this.state; - if(modalCancel===false){ - if(this.props.current_user.phone===undefined||this.props.current_user.phone===null||this.props.current_user.phone===""){ - this.setState({ - current_userphonetype:true - }) - }else{ - this.setState({ - current_userphonetype:false - }) - } - } + // if(modalCancel===false){ + // if(this.props.current_user.phone===undefined||this.props.current_user.phone===null||this.props.current_user.phone===""){ + // this.setState({ + // current_userphonetype:true + // }) + // }else{ + // this.setState({ + // current_userphonetype:false + // }) + // } + // } if(modalCancel===true||this.props.current_user.phone===null){ if(e.target.value===undefined||e.target.value===null||e.target.value===""){ this.setState({ diff --git a/public/react/src/modules/projectPackages/packageconcnet.css b/public/react/src/modules/projectPackages/packageconcnet.css index 329de857..c9a9ec0c 100644 --- a/public/react/src/modules/projectPackages/packageconcnet.css +++ b/public/react/src/modules/projectPackages/packageconcnet.css @@ -310,6 +310,6 @@ text-align: center; } -.pd35{ - padding-left: 35px; +.ml0{ + margin-left: 0px; } \ No newline at end of file