众包移植完善

public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js

@@ -6,29 +6,29 @@ import moment from 'moment';
 import '../packageconcnet.css';
 
 const { Search } = Input;
-// let categorylist=[
+let categorylist=[
-// 	{name:"全部",value:undefined},
+	{name:"全部",value:undefined},
-// 	{name:"前端开发",value:"front"},
+	{name:"前端开发",value:"front"},
-// 	{name:"后端开发",value:"backend"},
+	{name:"后端开发",value:"backend"},
-// 	{name:"移动开发",value:"mobile"},
+	{name:"移动开发",value:"mobile"},
-// 	{name:"数据库",value:"database"},
+	{name:"数据库",value:"database"},
-// 	{name:"云计算和大数据",value:"cloud_compute_and_big_data"},
+	{name:"云计算和大数据",value:"cloud_compute_and_big_data"},
-// 	{name:"人工智能",value:"ai"},
+	{name:"人工智能",value:"ai"},
-// 	{name:"其他",value:"other"},
+	{name:"其他",value:"other"},
-// ]
+]
 //
-// function setcategorylist(val){
+function setcategorylist(val){
-// 	let vals=""
+	let vals=""
-// 	categorylist.some((item,key)=> {
+	categorylist.some((item,key)=> {
-// 			if (item.value === val) {
+			if (item.name === val) {
-// 				vals=item.name
+				vals=item.value
-// 				return true
+				return true
-// 			}
+			}
-// 		}
+		}
-// 	)
+	)
-//
+
-// 	return vals
+	return vals
-// }
+}
 
 
 
@@ -214,7 +214,7 @@ class PackageConcent extends Component {
 												<div className="project-package-item">
 
 													<div className="item-image">
-														<img src={"/images/educoder/project_packages/"+item.category+".png"}/>
+														<img src={"/images/educoder/project_packages/"+setcategorylist(item.category_name)+".png"}/>
 													</div>
 
 													<div className=" item-body">

public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js

@@ -252,7 +252,7 @@ class PackageIndexNEITaskDetails extends Component {
 					 <Breadcrumb separator={'>'} className={"fl"}>
 						 {/*<Breadcrumb.Item>{this.props.current_user.username}</Breadcrumb.Item>*/}
 						 <Breadcrumb.Item>
-							 <a href="/crowdsourcings">众包创新</a>
+							 <a href="/crowdsourcing">众包创新</a>
 						 </Breadcrumb.Item>
 						 <Breadcrumb.Item><span className={"tabelcli"} title={data&&data.title}>{data&&data.title}</span></Breadcrumb.Item>
 
@@ -281,7 +281,7 @@ class PackageIndexNEITaskDetails extends Component {
 												<div className="fl edu-back-white  ">
 													<a href={`/users/${data&&data.creator.login}`}>
 														<img alt="头像" className="radius mt10 ml5" height="70" id="nh_user_logo" name="avatar_image"
-																 src={data&&data.creator.avatar_url} width="70"/>
+																 src={data&&data.creator.image_url} width="70"/>
 													</a>
 													<div className=" edu-back-white pagemancenter mt10 ">
 														{data&&data.creator.name}
@@ -291,8 +291,8 @@ class PackageIndexNEITaskDetails extends Component {
 															 onMouseOver={this.setover}
 															 onMouseOut={this.setout}
 												    >
-														{overtype===false?<a className="ContacttheTA fl" target="_blank" href={`/users/${this.props.current_user&&this.props.current_user.login}/message_detail?user_id=${data&&data.creator.id}`}> <img alt="头像" class="mr5" src={require('./newsone.png')} />联系TA</a>:
+														{overtype===false?<a className="ContacttheTA fl" target="_blank" href={`/users/${data&&data.creator.login}/message_detail?user_id=${data&&data.creator.id}`}> <img alt="头像" class="mr5" src={require('./newsone.png')} />联系TA</a>:
-															<a className="ContacttheTAs fl" target="_blank" href={`/users/${this.props.current_user&&this.props.current_user.login}/message_detail?user_id=${data&&data.creator.id}`}> <img alt="头像" className="mr5"
+															<a className="ContacttheTAs fl" target="_blank" href={`/users/${data&&data.creator.login}/message_detail?user_id=${data&&data.creator.id}`}> <img alt="头像" className="mr5"
 																																	 src={require('./newstwo.png')}/>联系TA</a>}
 													</div>}
 												</div>
@@ -403,9 +403,9 @@ class PackageIndexNEITaskDetails extends Component {
 												return(
 													<div className="ysldivhomediv1s homehove" key={key}>
 														{item.status==="bidding_won"?<img src={gouxuan} className="yslgouxuanimg"/>:""}
-														<a href={`/users/${item.login}`}><img className="div1imgs" src={item.avatar_url}/></a>
+														<a href={`/users/${item.login}`}><img className="div1imgs" src={item.image_url}/></a>
 														<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/${item.login}/message_detail?user_id=${item.id}`}>
 															<img alt="头像" className="mr5" src={require('./newstwo.png')}/>联系TA
 														</a>:""}
 													</div>
@@ -451,7 +451,7 @@ class PackageIndexNEITaskDetails extends Component {
 												return(
 													<div className="ysldivhomediv1s" 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}`} target="_blank"><img className="div1imgs" src={item.avatar_url}/></a>
+														<a href={`/users/${item.login}`} target="_blank"><img className="div1imgs" src={item.image_url}/></a>
 														<span className={item.bool===true?"textall mt10 color-blue":"textall mt10"} title={item.name}> <p className="ptext">{item.name}</p></span>
 													</div>
 												)

public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js

@@ -709,7 +709,7 @@ class PackageIndexNEIBannerConcent extends Component {
 					<div className={"stud-class-set pd30a0 coursenavbox edu-back-white pb20"}>
 							<div className={"ant-row contentbox mdInForm "}>
 								<div className="ant-form-item-label mb10">
-									<label htmlFor="coursesNew_description" className="ant-form-item-required font-16">请选择需求类型</label>
+									<label htmlFor="coursesNew_description" className="ant-form-item-requireds font-16">请选择需求类型</label>
 								</div>
 
 								<p className="clearfix mb20 shaiContent" >
@@ -724,7 +724,7 @@ class PackageIndexNEIBannerConcent extends Component {
 								{this.state.categorytypes===true?<div className={"color-red"}>请选择类型</div>:""}
 
 							<div className="ant-form-item-label mb10">
-								<label htmlFor="coursesNew_description" className="ant-form-item-required font-16" >需求标题和详情</label>
+								<label htmlFor="coursesNew_description" className="ant-form-item-requireds font-16" >需求标题和详情</label>
 							</div>
 
 							<Input placeholder="请输入需求标题，示例：美食类APP开发，最大限制60个字符" maxLength="60" className="input-100-40s mt5 fafafas"
@@ -784,7 +784,7 @@ class PackageIndexNEIBannerConcent extends Component {
 					<div className={"stud-class-set padding30 coursenavbox edu-back-white"} style={{borderTop: '1px solid #EAEAEA'}} id={"publishtime"}>
 						<div className={"ant-row contentbox mdInForm "}>
 							<div className="ant-form-item-label mb10">
-								<label htmlFor="coursesNew_description" className="ant-form-item-required font-16">工期与预算</label>
+								<label htmlFor="coursesNew_description" className="ant-form-item-requireds font-16">工期与预算</label>
 							</div>
 							<p className="clearfix mb20 shaiContent">
 								<span className="shaiTitle fl mt5 ml10">竞标截止：</span>
@@ -833,14 +833,14 @@ class PackageIndexNEIBannerConcent extends Component {
 									{this.state.minmaxtype===true?<div className={"color-red ml100"}>最高费用不能小于最低费用</div>:""}
 							</p>
 							<div className="ant-form-item-label mb10">
-								<label htmlFor="coursesNew_description" className="ant-form-item-required font-16" >联系方式</label>
+								<label htmlFor="coursesNew_description" className="ant-form-item-requireds font-16" >联系方式</label>
 							</div>
 							<p className="clearfix mb20 shaiContent">
 								<span className="shaiTitle fl mt5 ml40">姓名：</span>
 								<Input
 									className={"fafafas"}
 									style={{"width": "260px"}}
-									value={this.state.contact_name===null||this.state.contact_name===undefined?this.props.current_user.username:this.state.contact_name}
+									value={this.state.contact_name===null||this.state.contact_name===undefined?this.props.current_user&&this.props.current_user.username:this.state.contact_name}
 									placeholder="请输入姓名"
 									onInput={(e)=>this.onChangeContact_name(e)}
 								/>

public/react/src/modules/projectPackages/packageconcnet.css

@@ -344,3 +344,17 @@
     color: #4CACFF!important
 }
 
+.ant-form-item-requireds::before {
+    display: inline-block;
+    margin-right: 4px;
+    color: #f5222d;
+    font-size: 14px;
+    font-family: SimSun,sans-serif;
+    line-height: 1;
+    content: '*';
+}
+
+*, *::before, *::after {
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+}