From 1b41c1c00b20debd7d98bfb0004257a6fe6e0909 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Tue, 30 Jul 2019 14:46:17 +0800
Subject: [PATCH] b

---
 .../projectPackages/PackageIndex/PackageConcent.js |  1 +
 .../PackageIndexNEITaskDetails.js                  |  2 +-
 .../PackageIndexNEIBannerConcent.js                | 14 +++++++-------
 public/react/src/modules/tpm/NewHeader.js          |  3 ++-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js b/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js
index 7875c5c46..cfc54bb98 100644
--- a/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js
+++ b/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js
@@ -14,6 +14,7 @@ let categorylist=[
 	{name:"数据库",value:"database"},
 	{name:"云计算和大数据",value:"cloud_compute_and_big_data"},
 	{name:"人工智能",value:"ai"},
+	{name:"运维与测试",value:"devops_and_test"},
 	{name:"其他",value:"other"},
 ]
 //
diff --git a/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js b/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js
index c9fdebc05..4788a7dc1 100644
--- a/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js
+++ b/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="/crowdsourcing">众包创新</a>
+							 <a href="/crowdsourcings">众包创新</a>
 						 </Breadcrumb.Item>
 						 <Breadcrumb.Item><span className={"tabelcli"} title={data&&data.title}>{data&&data.title}</span></Breadcrumb.Item>
 
diff --git a/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js b/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js
index 335f9d27e..c9d49e542 100644
--- a/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js
+++ b/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js
@@ -407,7 +407,7 @@ class PackageIndexNEIBannerConcent extends Component {
 		// }
 
 
-		if(modalCancel===true||this.props.current_user.phone===null){
+		if(this.props.current_user&&this.props.current_user.phone===null||modalCancel===true){
 			if(contact_phone===undefined||contact_phone===null||contact_phone===""){
 				this.setState({
 					contact_phonetype:true
@@ -445,7 +445,7 @@ class PackageIndexNEIBannerConcent extends Component {
 				 min_price:parseInt(min_price),
 				 max_price:parseInt(max_price),
 				 contact_name: contact_name===null||contact_name===undefined?this.props.current_user.username:contact_name,
-				 contact_phone: contact_phone===undefined?this.props.current_user.phone:contact_phone,
+				 contact_phone: contact_phone===undefined?this.props.current_user&&this.props.current_user.phone:contact_phone,
 				 code:code,
 				 publish:types
 			 }
@@ -493,7 +493,7 @@ class PackageIndexNEIBannerConcent extends Component {
 				 min_price:parseInt(min_price),
 				 max_price:parseInt(max_price),
 				 contact_name:  contact_name===null||contact_name===undefined?this.props.current_user.username:contact_name,
-				 contact_phone: contact_phone===undefined?this.props.current_user.phone:contact_phone,
+				 contact_phone: contact_phone===undefined?this.props.current_user&&this.props.current_user.phone:contact_phone,
 				 code:code,
 				 publish:types
 			 }
@@ -629,7 +629,7 @@ class PackageIndexNEIBannerConcent extends Component {
 		// 		})
 		// 	}
 		// }
-		if(modalCancel===true||this.props.current_user.phone===null){
+		if(this.props.current_user&&this.props.current_user.phone===null||modalCancel===true){
 			if(e.target.value===undefined||e.target.value===null||e.target.value===""){
 				this.setState({
 					contact_phonetype:true
@@ -847,12 +847,12 @@ class PackageIndexNEIBannerConcent extends Component {
 								{this.state.contact_nametype===true?<div className={"color-red ml100"}>不能为空</div>:""}
 							</p>
 
-							{modalCancel===false&&this.props.current_user.phone!=null?<p className="clearfix mb20 shaiContent">
+							{this.props.current_user&&this.props.current_user.phone!=null&&modalCancel===false?<p className="clearfix mb20 shaiContent">
 								<span className="shaiTitle fl mt5 ml25">手机号：</span>
 								<Input
 									className={"fafafas fl"}
 									style={{"width": "260px"}}
-									value={this.state.phones===undefined?this.props.current_user.phone:this.state.phones}
+									value={this.state.phones===undefined?this.props.current_user&&this.props.current_user.phone:this.state.phones}
 									placeholder="请输入手机号"
 									disabled={true}
 								/>
@@ -861,7 +861,7 @@ class PackageIndexNEIBannerConcent extends Component {
 								</a>
 							</p>:""}
 							{/*{this.state.current_userphonetype===true?<div className={"color-red ml100"}>不能为空</div>:""}*/}
-							{modalCancel===true||this.props.current_user.phone===null?<p className="clearfix mb20 shaiContent">
+							{this.props.current_user&&this.props.current_user.phone===null||modalCancel===true?<p className="clearfix mb20 shaiContent">
 									<span className="shaiTitle mt5 fl">
 							    <span className="shaiTitle fl mt5 ml25">
 										{/*未注册才显示!*/}
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index 23330e779..1798bfca8 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -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.crowdsourcing_url}
-								href={'/crowdsourcings'}
+								href={'/crowdsourcing'}
 							>众包创新</a></li>
               <li className={`${activeForums === true ? 'active' : ''}`}><a href={this.props.Headertop===undefined?"":this.props.Headertop.topic_url}>交流问答</a></li>
               <li
@@ -816,6 +816,7 @@ submittojoinclass=(value)=>{
                 <li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/shixuns`}>我的实训</Link></li>
                 <li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/paths`}>我的实践课程</Link></li>
                 <li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/projects`}>我的项目</Link></li>
+								<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/projects`}>我的众包</Link></li>
                 <li><a href={`/account/profile`}>账号管理</a></li>
                 {/*<li><a onClick={()=>this.educoderlogin()} >登入测试接口</a></li>*/}
                 {/*<li><a onClick={()=>this.trialapplications()} >试用申请</a> </li>*/}