Hjqreturn
/
pgfqe6ch8
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'educoder' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder

Browse Source
dev_aliyun
jingquan huang 6 years ago
parent 9e98d0ce69 64f5ef6dfc
commit dd98b08fd6
4 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File

2
public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js
Unescape View File

@ -253,7 +253,7 @@ class PackageConcent extends Component {
<span className=" item-group-text">{moment(item.deadline_at).endOf('day').fromNow()}竞标截止</span> <span className=" item-group-text">{moment(item.deadline_at).endOf('day').fromNow()}竞标截止</span>
</div> </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-icon"><i className="fa fa-user" ></i></span>
<span className=" item-group-text">{item.bidding_users_count}人竞标</span> <span className=" item-group-text">{item.bidding_users_count}人竞标</span>

13
public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js
Unescape View File

@ -119,7 +119,11 @@ class PackageIndexNEITaskDetails extends Component {
}).then((response) => { }).then((response) => {
if(response.data.status===0){ if(response.data.status===0){
this.props.showSnackbar("提交成功"); this.props.showSnackbar("提交成功");
}else{ this.setState({
setbiddingmantype:false
})
this.getdatas()
}else if(response.data.status===-1){
this.props.showSnackbar(response.data.message); this.props.showSnackbar(response.data.message);
} }
}).catch((error) => { }).catch((error) => {
@ -215,7 +219,7 @@ class PackageIndexNEITaskDetails extends Component {
if(response.data.status===0){ if(response.data.status===0){
this.props.showSnackbar("报名成功"); this.props.showSnackbar("报名成功");
this.getdatas() this.getdatas()
}else{ }else if(response.data.status===-1){
this.props.showSnackbar(response.data.message); this.props.showSnackbar(response.data.message);
} }
}).catch((error) => { }).catch((error) => {
@ -395,7 +399,8 @@ class PackageIndexNEITaskDetails extends Component {
{data&&data.bidding_users.map((item,key)=>{ {data&&data.bidding_users.map((item,key)=>{
return( 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> <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> <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`}> {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> <div style={{height: "20px"}}> </div>
{data&&data.bidding_users.map((item,key)=>{ {data&&data.bidding_users.map((item,key)=>{
return( 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"/>} {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> <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> <span className={item.bool===true?"textall mt10 color-blue":"textall mt10"} title={item.name}> <p className="ptext">{item.name}</p></span>

38
public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js
Unescape View File

@ -397,14 +397,14 @@ class PackageIndexNEIBannerConcent extends Component {
return return
} }
if(modalCancel===false){ // if(modalCancel===false){
if(this.props.current_user.phone===undefined||this.props.current_user.phone===null||this.props.current_user.phone===""){ // if(this.props.current_user.phone===undefined||this.props.current_user.phone===null||this.props.current_user.phone===""){
this.setState({ // this.setState({
current_userphonetype:true // current_userphonetype:true
}) // })
return // return
} // }
} // }
if(modalCancel===true||this.props.current_user.phone===null){ if(modalCancel===true||this.props.current_user.phone===null){
@ -618,17 +618,17 @@ class PackageIndexNEIBannerConcent extends Component {
onChangeContact_phone=(e)=>{ onChangeContact_phone=(e)=>{
let {modalCancel}=this.state; let {modalCancel}=this.state;
if(modalCancel===false){ // if(modalCancel===false){
if(this.props.current_user.phone===undefined||this.props.current_user.phone===null||this.props.current_user.phone===""){ // if(this.props.current_user.phone===undefined||this.props.current_user.phone===null||this.props.current_user.phone===""){
this.setState({ // this.setState({
current_userphonetype:true // current_userphonetype:true
}) // })
}else{ // }else{
this.setState({ // this.setState({
current_userphonetype:false // current_userphonetype:false
}) // })
} // }
} // }
if(modalCancel===true||this.props.current_user.phone===null){ if(modalCancel===true||this.props.current_user.phone===null){
if(e.target.value===undefined||e.target.value===null||e.target.value===""){ if(e.target.value===undefined||e.target.value===null||e.target.value===""){
this.setState({ this.setState({

4
public/react/src/modules/projectPackages/packageconcnet.css
Unescape View File

@ -310,6 +310,6 @@
text-align: center; text-align: center;
} }
.pd35{ .ml0{
padding-left: 35px; margin-left: 0px;
} }
Write Preview
Loading…
Cancel
Save