m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

b

Browse Source
dev_forum
杨树明 6 years ago
parent 2ac2bbf5d8
commit 275fb7e21c
7 changed files with 32 additions and 34 deletions
Show Stats Download Patch File Download Diff File

2
public/react/src/AppConfig.js
Unescape View File

@ -41,7 +41,7 @@ export function initAxiosInterceptors(props) {
// proxy = "http://testbdweb.trustie.net" // proxy = "http://testbdweb.trustie.net"
// proxy = "http://testbdweb.educoder.net" // proxy = "http://testbdweb.educoder.net"
// proxy = "https://testeduplus2.educoder.net" // proxy = "https://testeduplus2.educoder.net"
proxy="http://47.96.87.25:48080/" proxy="http://47.96.87.25:48080"
// 在这里使用requestMap控制，避免用户通过双击等操作发出重复的请求； // 在这里使用requestMap控制，避免用户通过双击等操作发出重复的请求；

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

@ -157,7 +157,7 @@ class PackageConcent extends Component {
enterButton={<span><Icon type="search" className="mr5"/> 搜索</span>} enterButton={<span><Icon type="search" className="mr5"/> 搜索</span>}
onSearch={ (value)=>this.setdatafuns(value)} /> onSearch={ (value)=>this.setdatafuns(value)} />
<Button type="primary" className="setissues fr" size={"large"}> <Button type="primary" className="setissues fr" size={"large"}>
<a href="/crowdsourcing/new" >发布需求</a> <a href="/crowdsourcings/new" >发布需求</a>
</Button> </Button>
</p> </p>
</p> </p>
@ -223,7 +223,7 @@ class PackageConcent extends Component {
<div className=" item-head-title"> <div className=" item-head-title">
<a className={"fl mt3 font-20 font-bd color-dark maxwidth700 "} <a className={"fl mt3 font-20 font-bd color-dark maxwidth700 "}
href={"/crowdsourcing/"+item.id} href={"/crowdsourcings/"+item.id}
title={item.title} title={item.title}
>{item.title}</a> >{item.title}</a>
</div> </div>

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

@ -229,7 +229,8 @@ class PackageIndexNEITaskDetails extends Component {
} }
goback = () => { goback = () => {
window.history.go(-1) // window.history.go(-1)
window.location.href="/crowdsourcings";
} }
render() { render() {
@ -251,7 +252,7 @@ class PackageIndexNEITaskDetails extends Component {
<Breadcrumb separator={'>'} className={"fl"}> <Breadcrumb separator={'>'} className={"fl"}>
{/*<Breadcrumb.Item>{this.props.current_user.username}</Breadcrumb.Item>*/} {/*<Breadcrumb.Item>{this.props.current_user.username}</Breadcrumb.Item>*/}
<Breadcrumb.Item> <Breadcrumb.Item>
<a href="/crowdsourcing">众包创新</a> <a href="/crowdsourcings">众包创新</a>
</Breadcrumb.Item> </Breadcrumb.Item>
<Breadcrumb.Item><span className={"tabelcli"} title={data&&data.title}>{data&&data.title}</span></Breadcrumb.Item> <Breadcrumb.Item><span className={"tabelcli"} title={data&&data.title}>{data&&data.title}</span></Breadcrumb.Item>
@ -351,7 +352,7 @@ class PackageIndexNEITaskDetails extends Component {
需求详情： 需求详情：
{data&&data.status==="pending"&&data&&data.operation.can_select_bidding_user===true?<div className="fr"> {data&&data.status==="pending"&&data&&data.operation.can_select_bidding_user===true?<div className="fr">
<a className="task-btn-nebules fr" href={`/crowdsourcing/${this.props.match.params.id}/edit`}>编辑</a> <a className="task-btn-nebules fr" href={`/crowdsourcings/${this.props.match.params.id}/edit`}>编辑</a>
<a className="task-btn-nebules fr" onClick={this.deletePackages}>删除</a> <a className="task-btn-nebules fr" onClick={this.deletePackages}>删除</a>
</div>:""} </div>:""}
@ -393,16 +394,16 @@ class PackageIndexNEITaskDetails extends Component {
</div> </div>
</div> </div>
<div className={"ysllogin_register_contents ysllogin_register_contentss edu-back-white "} style={{borderTop: '1px solid rgb(234, 234, 234)'}}> <div className={"ysllogin_register_contentss edu-back-white "} style={{borderTop: '1px solid rgb(234, 234, 234)'}}>
<div className="ysllogin_section"> <div className="ysllogin_sections">
<div className="ysldivhome2"> <div className="ysldivhome2s">
<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 homehove" key={key}> <div className="ysldivhomediv1s homehove" key={key}>
{item.status==="bidding_won"?<img src={gouxuan} className="yslgouxuanimg"/>:""} {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="div1imgs" 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&&this.props.current_user.login!=item.login?<a className="ContacttheTAs fl none" target="_blank" href={`/users/${this.props.current_user&&this.props.current_user.login}/message_detail?user_id=${item.id}`}> {this.props.current_user&&this.props.current_user.login!=item.login?<a className="ContacttheTAs fl none" target="_blank" href={`/users/${this.props.current_user&&this.props.current_user.login}/message_detail?user_id=${item.id}`}>
<img alt="头像" className="mr5" src={require('./newstwo.png')}/>联系TA <img alt="头像" className="mr5" src={require('./newstwo.png')}/>联系TA
@ -442,15 +443,15 @@ class PackageIndexNEITaskDetails extends Component {
</div> </div>
</div> </div>
</div> </div>
<div className={"ysllogin_register_contents ysllogin_register_contentss edu-back-white "} style={{borderTop: '1px solid rgb(234, 234, 234)'}}> <div className={"ysllogin_register_contentss edu-back-white "} style={{borderTop: '1px solid rgb(234, 234, 234)'}}>
<div className="ysllogin_section"> <div className="ysllogin_sections">
<div className="ysldivhome2"> <div className="ysldivhome2s">
<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)} key={key}> <div className="ysldivhomediv1s" 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}`} target="_blank"><img className="div1img" src={item.avatar_url}/></a> <a href={`/users/${item.login}`} target="_blank"><img className="div1imgs" 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>
</div> </div>
) )

21
public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/pds.css
Unescape View File

@ -1,4 +1,4 @@
.ysldivhome2{ .ysldivhome2s{
display: flex; display: flex;
flex-flow: row wrap; flex-flow: row wrap;
align-content:stretch; align-content:stretch;
@ -6,20 +6,17 @@
margin-bottom: 20px; margin-bottom: 20px;
} }
.ysllogin_register_contents{
display: flex;
margin-top: 20px;
/*justify-content: center;*/
background: #fff;
}
.ysllogin_register_contentss{ .ysllogin_register_contentss{
margin-top:0px !important; margin-top:0px !important;
padding-top: 10px; padding-top: 10px;
padding-bottom: 10px; padding-bottom: 10px;
display: flex;
margin-top: 20px;
/*justify-content: center;*/
background: #fff;
} }
.ysldivhomediv1{ .ysldivhomediv1s{
width: 80px; width: 80px;
height: 130px; height: 130px;
display: flex; display: flex;
@ -33,10 +30,10 @@
margin-left: 64px; margin-left: 64px;
} }
.yslgouxuanimg2{ .yslgouxuanimg2s{
height: 20px; height: 20px;
} }
.div1img{ .div1imgs{
display: flex; display: flex;
justify-content:center; justify-content:center;
width: 80px; width: 80px;
@ -53,7 +50,7 @@
.ptext{ .ptext{
width: 80px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; width: 80px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis;
} }
.ysllogin_section { .ysllogin_sections {
display: flex; display: flex;
align-items: center; align-items: center;
flex-direction: column; flex-direction: column;

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

@ -454,7 +454,7 @@ class PackageIndexNEIBannerConcent extends Component {
if(type===true){ if(type===true){
this.props.setPublicationfun(response.data.id) this.props.setPublicationfun(response.data.id)
}else{ }else{
window.location.href="/crowdsourcing/"+response.data.id window.location.href="/crowdsourcings/"+response.data.id
} }
this.setState({ this.setState({
springtype:false springtype:false
@ -502,7 +502,7 @@ class PackageIndexNEIBannerConcent extends Component {
if(type===true){ if(type===true){
this.props.setPublicationfun(response.data.id) this.props.setPublicationfun(response.data.id)
}else{ }else{
window.location.href="/crowdsourcing/"+response.data.id window.location.href="/crowdsourcings/"+response.data.id
} }
this.setState({ this.setState({
springtype:false springtype:false
@ -836,7 +836,7 @@ class PackageIndexNEIBannerConcent extends Component {
<label htmlFor="coursesNew_description" className="ant-form-item-required font-16" >联系方式</label> <label htmlFor="coursesNew_description" className="ant-form-item-required font-16" >联系方式</label>
</div> </div>
<p className="clearfix mb20 shaiContent"> <p className="clearfix mb20 shaiContent">
<span className="shaiTitle fl mt5 ml38">姓名：</span> <span className="shaiTitle fl mt5 ml40">姓名：</span>
<Input <Input
className={"fafafas"} className={"fafafas"}
style={{"width": "260px"}} style={{"width": "260px"}}

4
public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEISubmit.js
Unescape View File

@ -14,10 +14,10 @@ class PackageIndexNEISubmit extends Component {
} }
setageload=(sum)=>{ setageload=(sum)=>{
if(sum===undefined){ if(sum===undefined){
window.location.href="/crowdsourcing/new" window.location.href="/crowdsourcings/new"
}else{ }else{
// this.props.history.push("/project_packages/"+sum) // this.props.history.push("/project_packages/"+sum)
window.location.href="/crowdsourcing/"+sum window.location.href="/crowdsourcings/"+sum
} }
} }

2
public/react/src/modules/tpm/NewHeader.js
Unescape View File

@ -718,7 +718,7 @@ submittojoinclass=(value)=>{
<li className=""><a href={this.props.Headertop===undefined?"":this.props.Headertop.moop_cases_url}>教学案例</a></li> <li className=""><a href={this.props.Headertop===undefined?"":this.props.Headertop.moop_cases_url}>教学案例</a></li>
<li className=""><a <li className=""><a
// href={this.props.Headertop===undefined?"":this.props.Headertop.crowdsourcing_url} // href={this.props.Headertop===undefined?"":this.props.Headertop.crowdsourcing_url}
href={'/crowdsourcing'} href={'/crowdsourcings'}
>众包创新</a></li> >众包创新</a></li>
<li className={`${activeForums === true ? 'active' : ''}`}><a href={this.props.Headertop===undefined?"":this.props.Headertop.topic_url}>交流问答</a></li> <li className={`${activeForums === true ? 'active' : ''}`}><a href={this.props.Headertop===undefined?"":this.props.Headertop.topic_url}>交流问答</a></li>
<li <li

Write Preview
Loading…
Cancel
Save