From 60137fc05aeb5b30008f19890dd000fd5b779e49 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 15:08:07 +0800
Subject: [PATCH] b

---
 public/react/src/App.js                                   | 2 +-
 .../projectPackages/PackageIndex/PackageConcent.js        | 4 ++--
 .../PackageIndexNEITaskDetails.js                         | 6 +++---
 .../PackageIndexNEIBannerConcent.js                       | 4 ++--
 .../PackageIndexNewandEdit/PackageIndexNEISubmit.js       | 4 ++--
 .../src/modules/projectPackages/ProjectPackageIndex.js    | 8 ++++----
 public/react/src/modules/user/usersInfo/InfosPackage.js   | 6 ------
 7 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/public/react/src/App.js b/public/react/src/App.js
index e713cd0fd..6d1e2a521 100644
--- a/public/react/src/App.js
+++ b/public/react/src/App.js
@@ -304,7 +304,7 @@ class App extends Component {
 							{/*<Route path="/login" component={LoginRegisterPage}/>*/}
 
 							{/*众包创新*/}
-							<Route path={"/crowdsourcings"} component={ProjectPackages}/>
+							<Route path={"/crowdsourcing"} component={ProjectPackages}/>
 							{/*认证*/}
 							<Route path="/account" component={AccountPage}/>
 
diff --git a/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js b/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js
index cfc54bb98..921c3e555 100644
--- a/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js
+++ b/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js
@@ -158,7 +158,7 @@ class PackageConcent extends Component {
 																		enterButton={<span><Icon type="search" className="mr5"/> 搜索</span>}
 																		onSearch={ (value)=>this.setdatafuns(value)} />
 														<Button type="primary"  className="setissues fr" size={"large"}>
-															<a href="/crowdsourcings/new" >发布需求</a>
+															<a href="/crowdsourcing/new" >发布需求</a>
 														</Button>
 													</p>
 												</p>
@@ -224,7 +224,7 @@ class PackageConcent extends Component {
 
 															<div className=" item-head-title">
 																<a className={"fl mt3 font-20 font-bd color-dark maxwidth700 "}
-																	 href={"/crowdsourcings/"+item.id}
+																	 href={"/crowdsourcing/"+item.id}
 																	 title={item.title}
 																>{item.title}</a>
 															</div>
diff --git a/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js b/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js
index 4788a7dc1..bcd46dbb0 100644
--- a/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js
+++ b/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js
@@ -230,7 +230,7 @@ class PackageIndexNEITaskDetails extends Component {
 	}
 	goback = () => {
 		// window.history.go(-1)
-		window.location.href="/crowdsourcings";
+		window.location.href="/crowdsourcing";
 	}
 
 	render() {
@@ -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>
 
@@ -352,7 +352,7 @@ class PackageIndexNEITaskDetails extends Component {
 									 需求详情：
 
 										{data&&data.status==="pending"&&data&&data.operation.can_select_bidding_user===true?<div className="fr">
-											<a className="task-btn-nebules fr" href={`/crowdsourcings/${this.props.match.params.id}/edit`}>编辑</a>
+											<a className="task-btn-nebules fr" href={`/crowdsourcing/${this.props.match.params.id}/edit`}>编辑</a>
 											<a className="task-btn-nebules fr" onClick={this.deletePackages}>删除</a>
 										</div>:""}
 
diff --git a/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js b/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js
index e4926e02c..3caedebde 100644
--- a/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js
+++ b/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js
@@ -454,7 +454,7 @@ class PackageIndexNEIBannerConcent extends Component {
 				 if(type===true){
 					 this.props.setPublicationfun(response.data.id)
 				 }else{
-					 window.location.href="/crowdsourcings/"+response.data.id
+					 window.location.href="/crowdsourcing/"+response.data.id
 				 }
 				 this.setState({
 					 springtype:false
@@ -502,7 +502,7 @@ class PackageIndexNEIBannerConcent extends Component {
 				 if(type===true){
 					 this.props.setPublicationfun(response.data.id)
 				 }else{
-					 window.location.href="/crowdsourcings/"+response.data.id
+					 window.location.href="/crowdsourcing/"+response.data.id
 				 }
 				 this.setState({
 					 springtype:false
diff --git a/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEISubmit.js b/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEISubmit.js
index a64e222e4..9f287e90e 100644
--- a/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEISubmit.js
+++ b/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEISubmit.js
@@ -14,10 +14,10 @@ class PackageIndexNEISubmit extends Component {
 	}
 	setageload=(sum)=>{
 		if(sum===undefined){
-			window.location.href="/crowdsourcings/new"
+			window.location.href="/crowdsourcing/new"
 		}else{
 			// this.props.history.push("/project_packages/"+sum)
-			window.location.href="/crowdsourcings/"+sum
+			window.location.href="/crowdsourcing/"+sum
 		}
 
 	}
diff --git a/public/react/src/modules/projectPackages/ProjectPackageIndex.js b/public/react/src/modules/projectPackages/ProjectPackageIndex.js
index 6f2e32b8b..097e012e0 100644
--- a/public/react/src/modules/projectPackages/ProjectPackageIndex.js
+++ b/public/react/src/modules/projectPackages/ProjectPackageIndex.js
@@ -43,25 +43,25 @@ class ProjectPackageIndex extends Component {
 				<Switch>
 					{/*众包首页*/}
 
-					<Route path="/crowdsourcings/:id/edit"
+					<Route path="/crowdsourcing/:id/edit"
 								 render={
 									 (props) => (<PackageIndexNewandEdit {...this.props} {...props} {...this.state} />)
 								 }
 					></Route>
 
-					<Route path="/crowdsourcings/new"
+					<Route path="/crowdsourcing/new"
 								 render={
 									 (props) => (<PackageIndexNewandEdit {...this.props} {...props} {...this.state} />)
 								 }
 					></Route>
 
-					<Route path="/crowdsourcings/:id"
+					<Route path="/crowdsourcing/:id"
 								 render={
 									 (props) => (<PackageIndexNEITaskDetails {...this.props} {...props} {...this.state} />)
 								 }
 					></Route>
 
-					<Route path="/crowdsourcings"
+					<Route path="/crowdsourcing"
 								 render={
 									 (props) => (<PackageIndex {...this.props} {...props} {...this.state} />)
 								 }
diff --git a/public/react/src/modules/user/usersInfo/InfosPackage.js b/public/react/src/modules/user/usersInfo/InfosPackage.js
index 8222c951b..135f9f52e 100644
--- a/public/react/src/modules/user/usersInfo/InfosPackage.js
+++ b/public/react/src/modules/user/usersInfo/InfosPackage.js
@@ -183,12 +183,6 @@ class InfosCourse extends Component{
 							})
 						}
 					</div>
-					{
-						totalCount > 15 &&
-						<div className="mt30 mb50 edu-txt-center">
-							<Pagination showQuickJumper total={totalCount} onChange={this.changePage} pageSize={16} current={page}/>
-						</div>
-					}
 				</Spin>
 			</div>
 		)