From 4f39f03b1993d7d8020493443280c45978d85f22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= <792998983@qq.com>
Date: Thu, 2 Sep 2021 17:20:26 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=AF=E7=94=B1?=
 =?UTF-8?q?=E7=9A=84issue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.js                               |  5 ++---
 src/AppConfig.js                         |  4 ++--
 src/forge/Activity/ActivityItem.js       |  2 +-
 src/forge/Index.js                       | 18 +++++++++++++++---
 src/forge/Main/IndexItem.js              |  2 +-
 src/forge/Notice/Notify.jsx              |  3 ++-
 src/forge/Order/Milepostitem.js          |  4 ++--
 src/forge/users/GeneralView/Activity.jsx |  4 ++--
 src/modules/search/index.jsx             |  7 ++-----
 9 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/src/App.js b/src/App.js
index aae03b9de..8926349c9 100644
--- a/src/App.js
+++ b/src/App.js
@@ -105,7 +105,7 @@ class App extends Component {
 			occupation: 0,
 			mygetHelmetapi: null,
 			pathType: null,
-			pathName: '',
+			pathName: null,
 		}
 	}
 
@@ -175,7 +175,6 @@ class App extends Component {
 			const msg = `${event.type}: ${event.message}`;
 		});
 
-
 	}
 
 	componentWillUnmount() {
@@ -317,7 +316,7 @@ class App extends Component {
 								}
 							/>
 
-							{/*项目*/}
+							{/*新建项目等*/}
 							<Route
 								path={"/projects"}
 								render={
diff --git a/src/AppConfig.js b/src/AppConfig.js
index 5849a85f6..825a2a3be 100644
--- a/src/AppConfig.js
+++ b/src/AppConfig.js
@@ -11,9 +11,9 @@ broadcastChannelOnmessage('refreshPage', () => {
 })
 
 function locationurl(list) {
-  if (window.location.port !== "3007") {
+  // if (window.location.port !== "3007") {
   window.location.href = list
-  }
+  // }
 }
 // TODO 开发期多个身份切换
 let debugType = ""
diff --git a/src/forge/Activity/ActivityItem.js b/src/forge/Activity/ActivityItem.js
index 978498b22..baa5a2cb0 100644
--- a/src/forge/Activity/ActivityItem.js
+++ b/src/forge/Activity/ActivityItem.js
@@ -14,7 +14,7 @@ class ActivityItem extends Component {
           {/* 如果是版本发布 */}
           {item.trend_type === "VersionRelease" ?
           <p className="itemLine">
-            <Link to={`/${owner}/${projectsId}/version`} className="color-blue font-16">{item.name}</Link>
+            <Link to={`/${owner}/${projectsId}/releases`} className="color-blue font-16">{item.name}</Link>
             <span className="activity_type">{item.trend_type}</span>
           </p >
           :
diff --git a/src/forge/Index.js b/src/forge/Index.js
index 2423f0007..4ccbfe2ed 100644
--- a/src/forge/Index.js
+++ b/src/forge/Index.js
@@ -12,8 +12,13 @@ import Loadable from "react-loadable";
 import Loading from "../Loading";
 import { ImageLayerOfCommentHOC } from "../modules/page/layers/ImageLayerOfCommentHOC";
 
+//404页面
+const Shixunnopage = Loadable({
+  loader: () => import('./modules/404/Shixunnopage'),
+  loading: Loading,
+})
 const ProjectNew = Loadable({
-  loader: () => import("./New/Index"), 
+  loader: () => import("./New/Index"),
   loading: Loading,
 });
 const ProjectIndex = Loadable({
@@ -29,8 +34,8 @@ const ProjectIndex = Loadable({
 
 class Index extends Component {
 
-  componentDidUpdate=()=>{
-    this.props.history.listen(()=>{
+  componentDidUpdate = () => {
+    this.props.history.listen(() => {
       if (document.body.scrollTop || document.documentElement.scrollTop > 0) {
         window.scrollTo(0, 0)
       }
@@ -70,6 +75,13 @@ class Index extends Component {
               <ProjectIndex {...this.props} {...props} />
             )}
           ></Route>
+          <Route path="/projects" component={Shixunnopage} />
+          <Route
+            path="/"
+            render={(props) => (
+              <ProjectIndex {...this.props} {...props} />
+            )}
+          ></Route>
         </Switch>
       </div>
     );
diff --git a/src/forge/Main/IndexItem.js b/src/forge/Main/IndexItem.js
index ec985ecc2..2265ac20d 100644
--- a/src/forge/Main/IndexItem.js
+++ b/src/forge/Main/IndexItem.js
@@ -28,7 +28,7 @@ class IndexItem extends Component {
                   <img className="p-r-photo" alt="" src={item.author && item.author.image_url} ></img>
                 </a>
                 :
-                <Link to={item.author && item.author.login} className="show-user-link">
+                <Link to={`/${item.author && item.author.login}`} className="show-user-link">
                   <img className="p-r-photo" alt="" src={getImageUrl(`/${item.author && item.author.image_url}`)} ></img>
                 </Link>
               }
diff --git a/src/forge/Notice/Notify.jsx b/src/forge/Notice/Notify.jsx
index 96b9e6876..313739089 100644
--- a/src/forge/Notice/Notify.jsx
+++ b/src/forge/Notice/Notify.jsx
@@ -80,9 +80,10 @@ function Notify(props){
             <ul className="notifyList">
               {
                 list.map((i,k)=>{
+                  console.log(i);
                   return(
                     <li i={k}>
-                      <Link to={`/${i.login}`}><img src={getImageUrl(`/${i.applied_user && i.applied_user.image_url}`)} alt="" className="notifyImg"/></Link>
+                      <Link to={`/${i.applied_user && i.applied_user.login}`}><img src={getImageUrl(`/${i.applied_user && i.applied_user.image_url}`)} alt="" className="notifyImg" /></Link>
                       <div className="notifyFlex">
                         <p className="notifyInfos">
                           <Link to={`/${i.applied_user && i.applied_user.login}`} className="font-15 mr20">{i.applied_user && i.applied_user.name}</Link>
diff --git a/src/forge/Order/Milepostitem.js b/src/forge/Order/Milepostitem.js
index 48bf65c11..d79c66fea 100644
--- a/src/forge/Order/Milepostitem.js
+++ b/src/forge/Order/Milepostitem.js
@@ -31,7 +31,7 @@ class OrderItem extends Component {
                   <div className="milepostwidth">
                     <div className="grid-item width100">
                       <i className="iconfont icon-lubiaosignpost3 font-12 mr3"></i>
-                      <Link to={`/projects/${owner}/${projectsId}/milestones/${item.id}`} className="font-16">{item.name}</Link>
+                      <Link to={`/${owner}/${projectsId}/milestones/${item.id}`} className="font-16">{item.name}</Link>
                     </div>
                   </div>
                 </div>
@@ -65,7 +65,7 @@ class OrderItem extends Component {
                     <div className="milepostleft">
                       <div className="grid-item ml15 color-grey-9">
                         <i className="iconfont icon-bianji3 font-14 mr5"></i>
-                        <Link to={`/projects/${owner}/${projectsId}/milestones/${item.id}/edit`} className="color-grey-9">编辑</Link>
+                        <Link to={`/${owner}/${projectsId}/milestones/${item.id}/edit`} className="color-grey-9">编辑</Link>
                       </div>
                       <div className="grid-item ml15 color-grey-9">
                         <i className="iconfont icon-yiguanbi1 font-14 mr5"></i>
diff --git a/src/forge/users/GeneralView/Activity.jsx b/src/forge/users/GeneralView/Activity.jsx
index ce09e885f..cefb45847 100644
--- a/src/forge/users/GeneralView/Activity.jsx
+++ b/src/forge/users/GeneralView/Activity.jsx
@@ -11,10 +11,10 @@ function Activity({list}) {
         list.map((i,k)=>{
           return(
             <li>
-              <Link to={``}><img src={getImageUrl(`/system/lets/letter_avatars/2/D/169_162_140/120.png`)} alt="" className="aImg"/></Link>
+              <Link to={`/${i.user_login}`}><img src={getImageUrl(`/system/lets/letter_avatars/2/D/169_162_140/120.png`)} alt="" className="aImg"/></Link>
               <div className="aInfos">
                 <AlignCenter>
-                  <Link to={``} className="name">{i.user_name}</Link>
+                  <Link to={`/${i.user_login}`} className="name">{i.user_name}</Link>
                   <span className="time">{i.action_time}</span>
                   {i.priority && TagInfo(`${i.priority}`,"")}
                   {i.issue_status && <span className="status">{i.issue_status}</span> }
diff --git a/src/modules/search/index.jsx b/src/modules/search/index.jsx
index 483309d7f..3afd1ae5f 100644
--- a/src/modules/search/index.jsx
+++ b/src/modules/search/index.jsx
@@ -10,11 +10,6 @@ import './index.scss';
 const { Search } = Input;
 const { TabPane } = Tabs;
 
-// const https = 'http://192.168.0.77:8081';       //曾伟内网后台
-// const https = 'http://192.168.31.104:8081'; //曾伟外网后台
-// const https='http://106.75.31.211:58081';
-const https = 'https://test-statistics.trustie.net';
-
 const GlobalSearch = ({ location, showNotification, history }) => {
 
   const size = 10;
@@ -58,6 +53,8 @@ const GlobalSearch = ({ location, showNotification, history }) => {
   }
 
   function searchDataList() {
+    let chromesettingArray = JSON.parse(localStorage.getItem('chromesetting'));
+    let https = chromesettingArray.common.search || 'https://statistics.trustie.net';
     const url = https + '/search';
     if (!term) {
       // showNotification('请输入关键字');

From 24c4c746cdb0daa9116f9e0666e56b7d8ec76fbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= <792998983@qq.com>
Date: Fri, 3 Sep 2021 09:23:12 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?=E8=B7=AF=E7=94=B1=E5=8F=8A=E4=BF=AE=E6=94=B9issue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.js                                  |  7 +---
 src/forge/Activity/ActivityItem.js          |  2 +-
 src/forge/DevOps/About.jsx                  |  2 +-
 src/forge/DevOps/Dispose.jsx                |  2 +-
 src/forge/DevOps/Dispose/List.jsx           |  2 +-
 src/forge/DevOps/Index.jsx                  | 22 +++++------
 src/forge/DevOps/Infos.jsx                  |  2 +-
 src/forge/DevOps/Manage/Params.jsx          |  2 +-
 src/forge/DevOps/Mould.jsx                  |  2 +-
 src/forge/DevOps/Structure.jsx              |  2 +-
 src/forge/DevOps/disposePipeline.jsx        |  2 +-
 src/forge/DevOps/opsDetail.jsx              |  2 +-
 src/forge/Index.js                          |  5 ++-
 src/forge/Main/CoderDepot.jsx               |  2 +-
 src/forge/Main/CoderRootIndex.js            |  2 +-
 src/forge/Main/Detail.js                    | 19 +++++-----
 src/forge/Main/DetailTop.js                 |  2 +-
 src/forge/Main/sub/DetailBanner.jsx         | 12 +++---
 src/forge/Order/OrderItem.js                |  2 +-
 src/forge/Order/order_form.js               |  6 +--
 src/forge/Settings/Branch.js                |  2 +-
 src/forge/Settings/BranchRule.jsx           |  2 +-
 src/forge/Settings/CollaboratorGroup.jsx    |  2 +-
 src/forge/Settings/Index.js                 | 42 ++++++++++-----------
 src/forge/Settings/Webhooks/Index.jsx       |  6 +--
 src/forge/Settings/Webhooks/New.jsx         |  8 ++--
 src/forge/Team/Group/GroupDetailSetting.jsx | 16 ++++----
 src/forge/Team/Group/GroupDetails.jsx       |  2 +-
 src/forge/Team/Group/GroupForm.jsx          |  6 +--
 src/forge/Team/Index.jsx                    |  8 ++--
 src/forge/Team/RightBox.jsx                 |  8 ++--
 src/forge/Team/Sub/Detail.jsx               | 12 +++---
 src/forge/Team/Sub/SubDetail.jsx            | 10 ++---
 src/forge/Team/TeamGroupItems.jsx           |  6 +--
 src/forge/users/CIList.jsx                  |  2 +-
 src/forge/users/Index.jsx                   | 19 +---------
 36 files changed, 117 insertions(+), 133 deletions(-)

diff --git a/src/App.js b/src/App.js
index 8926349c9..5bda37165 100644
--- a/src/App.js
+++ b/src/App.js
@@ -251,7 +251,7 @@ class App extends Component {
 	};
 
 	render() {
-		const { mygetHelmetapi, pathType } = this.state;
+		const { mygetHelmetapi, pathType} = this.state;
 		let personal = mygetHelmetapi && mygetHelmetapi.personal;
 		return (
 			<Provider store={store}>
@@ -308,9 +308,6 @@ class App extends Component {
 							<Route exact path="/explore"
 								render={
 									(props) => (
-										personal && personal.length > 0 ?
-											<InfosIndex {...this.props} {...props} />
-											:
 											<ProjectIndex {...this.props} {...props} />
 									)
 								}
@@ -341,7 +338,7 @@ class App extends Component {
 												return (<OrganizeIndex {...props} {...this.props} {...this.state} />)
 											}
 										}>
-									</Route> : pathType === '404' ? <Route path="/nopage" component={Shixunnopage} /> :
+									</Route> : pathType === '404' ? <Route path="/" component={Shixunnopage} /> :
 										<Route exact path="/"
 											render={
 												(props) => (
diff --git a/src/forge/Activity/ActivityItem.js b/src/forge/Activity/ActivityItem.js
index baa5a2cb0..2b1ad3c8c 100644
--- a/src/forge/Activity/ActivityItem.js
+++ b/src/forge/Activity/ActivityItem.js
@@ -21,7 +21,7 @@ class ActivityItem extends Component {
           // 如果是任务
           item.trend_type === "Issue" ?
             <p className="itemLine">
-              <Link to={`/${owner}/${projectsId}/issues/${item.trend_id}/detail`} className="color-blue font-16">{item.name}</Link>
+              <Link to={`/${owner}/${projectsId}/issues/${item.trend_id}`} className="color-blue font-16">{item.name}</Link>
               <span className="activity_type">{item.trend_type}</span>
             </p >
             :
diff --git a/src/forge/DevOps/About.jsx b/src/forge/DevOps/About.jsx
index a01271150..31ced2204 100644
--- a/src/forge/DevOps/About.jsx
+++ b/src/forge/DevOps/About.jsx
@@ -149,7 +149,7 @@ function About(props, ref) {
     axios.post(url).then(result=>{
       setIsSpining(false);
       if(result && result.data.status === 0){
-        props.history.push(`/${owner}/${projectsId}/devops/dispose`);
+        props.history.push(`/${owner}/${projectsId}/devops`);
         // 需要将顶部的open_devops修改
         let { changeOpenDevops } = props;
         changeOpenDevops && changeOpenDevops(true);
diff --git a/src/forge/DevOps/Dispose.jsx b/src/forge/DevOps/Dispose.jsx
index 4771816b9..1e08cdab0 100644
--- a/src/forge/DevOps/Dispose.jsx
+++ b/src/forge/DevOps/Dispose.jsx
@@ -96,7 +96,7 @@ function Dispose(props){
           setVisible(false);
           if(result && result.data){
             props.showNotification("流水线新增成功，请进行工作流配置！");
-            props.history.push(`/${owner}/${projectsId}/devops/dispose/${result.data.id}`);
+            props.history.push(`/${owner}/${projectsId}/devops/${result.data.id}`);
           }else{
             props.showNotification("流水线新增失败，请稍后再试！");
           }
diff --git a/src/forge/DevOps/Dispose/List.jsx b/src/forge/DevOps/Dispose/List.jsx
index 18755e089..297c5556d 100644
--- a/src/forge/DevOps/Dispose/List.jsx
+++ b/src/forge/DevOps/Dispose/List.jsx
@@ -117,7 +117,7 @@ function List({ list, operate , projectsId , owner , showModal , deleteFunc }){
         return(
           <span>
             { operate ? 
-              <Link to={`/${owner}/${projectsId}/devops/dispose/${item.id}`} className="mr10 color-grey-6">
+              <Link to={`/${owner}/${projectsId}/devops/${item.id}`} className="mr10 color-grey-6">
               <i className="iconfont icon-zaibianji font-13 mr3"></i>编辑</Link> :""
             }
             { operate ? 
diff --git a/src/forge/DevOps/Index.jsx b/src/forge/DevOps/Index.jsx
index 0878425ab..3302f603a 100644
--- a/src/forge/DevOps/Index.jsx
+++ b/src/forge/DevOps/Index.jsx
@@ -36,11 +36,7 @@ export default ((props)=>{
   return(
     <WhiteBack className="opsPanel">
       <Switch {...props}>
-        <Route path="/:owner/:projectsId/devops/dispose/:disposeId"
-          render={
-            (p) => (<New {...props} {...p}/>)
-          }
-        ></Route>
+        
         <Route path="/:owner/:projectsId/devops/params"
           render={
             (p) => (<Params {...props} {...p}/>)
@@ -51,24 +47,26 @@ export default ((props)=>{
             (p) => (<Mould {...props} {...p}/>)
           }
         ></Route>
-        <Route path="/:owner/:projectsId/devops/dispose/new"
+        <Route path="/:owner/:projectsId/devops/new"
           render={
             (p) => (<New {...props} {...p}/>)
           }
         ></Route>
-        <Route path="/:owner/:projectsId/devops/dispose"
-          render={
-            (p) => (<Dispose {...props} {...p}/>)
-          }
-        ></Route>
+        
         <Route path="/:owner/:projectsId/devops/list/:branch"
           render={
             (p) => (<Stucture {...props} {...p}/>)
           }
         ></Route>
+        <Route path="/:owner/:projectsId/devops/:disposeId"
+          render={
+            (p) => (<New {...props} {...p}/>)
+          }
+        ></Route>
+        {/* 原本的两种合为一个 */}
         <Route path="/:owner/:projectsId/devops"
           render={
-            (p) => (<About {...props} {...p}/>)
+            (p) =>{return( p.location.state.open_devops?<Dispose {...props} {...p}/>:<About {...props} {...p}/>)}
           }
         ></Route>
       </Switch>
diff --git a/src/forge/DevOps/Infos.jsx b/src/forge/DevOps/Infos.jsx
index c51fc87df..99029cdef 100644
--- a/src/forge/DevOps/Infos.jsx
+++ b/src/forge/DevOps/Infos.jsx
@@ -26,7 +26,7 @@ export default ((props)=>{
   return(
     <div className="disposePanel">
       <Banner>
-        { permission !=="Reporter" && <Link to={`/${owner}/${props.match.params.projectsId}/devops/dispose`}>工作流配置</Link>}
+        { permission !=="Reporter" && <Link to={`/${owner}/${props.match.params.projectsId}/devops`}>工作流配置</Link>}
       </Banner>
       <Div>
         <Dispost {...props}/>
diff --git a/src/forge/DevOps/Manage/Params.jsx b/src/forge/DevOps/Manage/Params.jsx
index e63d2f1ef..6df62dd47 100644
--- a/src/forge/DevOps/Manage/Params.jsx
+++ b/src/forge/DevOps/Manage/Params.jsx
@@ -104,7 +104,7 @@ function Params(props){
       <Banner>
         <FlexAJ>
           <span className="font-18">工作流 - 参数管理</span>
-          <Link to={`/${owner}/${projectsId}/devops/dispose`} className="font-14 color-grey-9 ml20">返回</Link>
+          <Link to={`/${owner}/${projectsId}/devops`} className="font-14 color-grey-9 ml20">返回</Link>
         </FlexAJ>
       </Banner>
       <Div className="disposeList">
diff --git a/src/forge/DevOps/Mould.jsx b/src/forge/DevOps/Mould.jsx
index bf70d760c..204fd161d 100644
--- a/src/forge/DevOps/Mould.jsx
+++ b/src/forge/DevOps/Mould.jsx
@@ -126,7 +126,7 @@ function Mould(props){
     <div>
       <New wrappedComponentRef={(f) => childRef.current = f} ref={childRef} visible={visible} onCancel={()=>setVisible(false)} onOk={onOk}></New>
       <Banner>
-        <FlexAJ><span>工作流 - 模板管理</span><Link to={`/${owner}/${projectsId}/devops/dispose`} className="font-14 color-grey-9">返回</Link></FlexAJ>
+        <FlexAJ><span>工作流 - 模板管理</span><Link to={`/${owner}/${projectsId}/devops`} className="font-14 color-grey-9">返回</Link></FlexAJ>
       </Banner>
       <Div className="disposeList">
         <FlexAJ>
diff --git a/src/forge/DevOps/Structure.jsx b/src/forge/DevOps/Structure.jsx
index ff98b5a9b..99040d386 100644
--- a/src/forge/DevOps/Structure.jsx
+++ b/src/forge/DevOps/Structure.jsx
@@ -290,7 +290,7 @@ function Structure(props,ref){
       <Banner>
         <FlexAJ>
           <span>构建列表</span>
-          <Link to={`/${owner}/${projectsId}/devops/dispose`} className="font-15 color-grey-9">返回</Link>
+          <Link to={`/${owner}/${projectsId}/devops`} className="font-15 color-grey-9">返回</Link>
         </FlexAJ>
       </Banner>
       <Div>
diff --git a/src/forge/DevOps/disposePipeline.jsx b/src/forge/DevOps/disposePipeline.jsx
index 808ecc004..deabc1495 100644
--- a/src/forge/DevOps/disposePipeline.jsx
+++ b/src/forge/DevOps/disposePipeline.jsx
@@ -275,7 +275,7 @@ function disposePipeline(props){
       ...params
     }).then(result=>{
       if(result){
-        props.history.push(`/${owner}/${projectsId}/devops/dispose`);
+        props.history.push(`/${owner}/${projectsId}/devops`);
       }
       setLoading(false);
     }).catch(error=>{
diff --git a/src/forge/DevOps/opsDetail.jsx b/src/forge/DevOps/opsDetail.jsx
index df265f15e..1944dfe61 100644
--- a/src/forge/DevOps/opsDetail.jsx
+++ b/src/forge/DevOps/opsDetail.jsx
@@ -87,7 +87,7 @@ export default (props) => {
           </AlignCenter>
           <Link
             style={{ color: "#ddd" }}
-            to={`/${owner}/${projectId}/devops/dispose`}
+            to={`/${owner}/${projectId}/devops`}
           >
             <i className="iconfont icon-yiguanbi font-15 mr5"></i>退出
           </Link>
diff --git a/src/forge/Index.js b/src/forge/Index.js
index 4ccbfe2ed..1508660e9 100644
--- a/src/forge/Index.js
+++ b/src/forge/Index.js
@@ -14,7 +14,7 @@ import { ImageLayerOfCommentHOC } from "../modules/page/layers/ImageLayerOfComme
 
 //404页面
 const Shixunnopage = Loadable({
-  loader: () => import('./modules/404/Shixunnopage'),
+  loader: () => import('../modules/404/Shixunnopage'),
   loading: Loading,
 })
 const ProjectNew = Loadable({
@@ -42,6 +42,7 @@ class Index extends Component {
     })
   }
   render() {
+    
     return (
       <div className="newMain clearfix">
         <Switch {...this.props}>
@@ -75,7 +76,7 @@ class Index extends Component {
               <ProjectIndex {...this.props} {...props} />
             )}
           ></Route>
-          <Route path="/projects" component={Shixunnopage} />
+
           <Route
             path="/"
             render={(props) => (
diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx
index dd6e8c8a7..bea7aadb1 100644
--- a/src/forge/Main/CoderDepot.jsx
+++ b/src/forge/Main/CoderDepot.jsx
@@ -352,7 +352,7 @@ function CoderDepot(props){
                         </Link>
                       </AlignCenter>
                       <AlignCenter className="mr20">
-                        <Link to={`/${owner}/${projectsId}/tag`} className="color-grey-9">
+                        <Link to={`/${owner}/${projectsId}/tags`} className="color-grey-9">
                           <i className="iconfont icon-biaoqian3 font-16 color-grey-9 mr3"></i>
                           <span className="color-grey-6 mr3">{projectDetail && projectDetail.tags && projectDetail.tags.total_count}个</span>标签
                         </Link>
diff --git a/src/forge/Main/CoderRootIndex.js b/src/forge/Main/CoderRootIndex.js
index c6c7b8dad..d754d525d 100644
--- a/src/forge/Main/CoderRootIndex.js
+++ b/src/forge/Main/CoderRootIndex.js
@@ -132,7 +132,7 @@ class CoderRootIndex extends Component{
               () => (<CoderRootVersion {...this.props} {...this.state} />)
             }
           ></Route>
-          <Route path="/:owner/:projectsId/tag"
+          <Route path="/:owner/:projectsId/tags"
             render={
               () => (<CoderRootTag {...this.props} {...this.state} />)
             }
diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js
index f70f22668..a2ca67b97 100644
--- a/src/forge/Main/Detail.js
+++ b/src/forge/Main/Detail.js
@@ -153,8 +153,8 @@ function checkPathname(projectsId, owner, pathname) {
       name = "milestones"
     } else if (url.indexOf("/activity") > -1) {
       name = "activity"
-    } else if (url.indexOf("/setting") > -1) {
-      name = "setting"
+    } else if (url.indexOf("/settings") > -1) {
+      name = "settings"
     } else if (url.indexOf(`/devops`) > -1) {
       name = "devops"
     } else if (url.indexOf(`/source`) > -1) {
@@ -625,17 +625,12 @@ class Detail extends Component {
                   }
                 ></Route>
                 {/* 仓库设置 */}
-                <Route path="/:owner/:projectsId/setting"
+                <Route path="/:owner/:projectsId/settings"
                   render={
                     (props) => (<Setting {...this.props} {...props} {...this.state} {...common} />)
                   }
                 ></Route>
-                {/* 任务详情 */}
-                <Route path="/:owner/:projectsId/issues/:orderId/detail"
-                  render={
-                    (props) => (<OrderDetail {...this.props} {...this.state} {...props} {...common} />)
-                  }
-                ></Route>
+               
                 {/*修改里程碑*/}
                 <Route path="/:owner/:projectsId/milestones/:meilid/edit"
                   render={
@@ -683,6 +678,12 @@ class Detail extends Component {
                   render={
                     (props) => (<OrdercopyDetail  {...this.props} {...props} {...this.state} {...common} />)
                   }
+                ></Route>
+                 {/* 任务详情 */}
+                 <Route path="/:owner/:projectsId/issues/:orderId"
+                  render={
+                    (props) => (<OrderDetail {...this.props} {...this.state} {...props} {...common} />)
+                  }
                 ></Route>
                 {/* 动态 */}
                 <Route path="/:owner/:projectsId/activity"
diff --git a/src/forge/Main/DetailTop.js b/src/forge/Main/DetailTop.js
index 7a0f69988..8806f12d3 100644
--- a/src/forge/Main/DetailTop.js
+++ b/src/forge/Main/DetailTop.js
@@ -20,7 +20,7 @@ class DetailTop extends Component {
               <i className="iconfont icon-fenzhi1 font-18 mr3"></i>
               <span>{(coderCount && coderCount.branches_count) || 0}</span>个分支
             </Link>
-            <Link to={`/${owner}/${projectsId}/tag`} className={pathname.indexOf("/tag") > 0 ? "active" : ""}>
+            <Link to={`/${owner}/${projectsId}/tags`} className={pathname.indexOf("/tags") > 0 ? "active" : ""}>
               <i className="iconfont icon-biaoqian3 font-18 mr3"></i>
               <span>{(coderCount && coderCount.tags_count) || 0}</span>个标签
             </Link>
diff --git a/src/forge/Main/sub/DetailBanner.jsx b/src/forge/Main/sub/DetailBanner.jsx
index 03b55db71..7f8fddc07 100644
--- a/src/forge/Main/sub/DetailBanner.jsx
+++ b/src/forge/Main/sub/DetailBanner.jsx
@@ -16,6 +16,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
       setMenuName(list);
     }
   },[list]);
+  console.log('open_devops:'+open_devops)
   return(
     <div className="f-wrap-between mt15">
       {
@@ -77,7 +78,8 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
                   {
                     item.menu_name === "devops" && platform ? 
                     <li className={pathname==="devops" ? "active" : ""}>
-                      <Link to={{ pathname: `/${owner}/${projectsId}/devops${open_devops ? `/dispose`:""}`, state }}>
+                      {/* <Link to={{ pathname: `/${owner}/${projectsId}/devops${open_devops ? `/dispose`:""}`, state }}> */}
+                      <Link to={{ pathname: `/${owner}/${projectsId}/devops`, state:{...state,open_devops} }}>
                         <i className="iconfont icon-gongzuoliu font-13 mr8"></i>工作流(beta版)
                         {projectDetail && projectDetail.ops_count ? <span>{projectDetail.ops_count}</span> : ""} 
                       </Link>
@@ -114,10 +116,10 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
                     </li>
                   }
                   {
-                    item.menu_name === "setting" &&
-                    <li className={pathname === "setting" ? "active" : ""}>
-                      <Link to={`/${owner}/${projectsId}/setting`}>
-                        <i className={url && url.indexOf("/setting") > 0 ? "iconfont icon-cangku color-grey-3 mr5 font-14":"iconfont icon-cangku color-grey-6 font-14 mr5"}></i>
+                    item.menu_name === "settings" &&
+                    <li className={pathname === "settings" ? "active" : ""}>
+                      <Link to={`/${owner}/${projectsId}/settings`}>
+                        <i className={url && url.indexOf("/settings") > 0 ? "iconfont icon-cangku color-grey-3 mr5 font-14":"iconfont icon-cangku color-grey-6 font-14 mr5"}></i>
                         <span>仓库设置</span>
                       </Link>
                     </li>
diff --git a/src/forge/Order/OrderItem.js b/src/forge/Order/OrderItem.js
index 2f9ac1852..531d8e5ce 100644
--- a/src/forge/Order/OrderItem.js
+++ b/src/forge/Order/OrderItem.js
@@ -51,7 +51,7 @@ class OrderItem extends Component {
         {current_user && current_user.login && checkbox}
         <div className="flex-1">
           <p className="mb10 df" style={{alignItems:"center"}}>
-            <Link to={`/${owner}/${projectsId}/issues/${item.id}/detail`} target="_blank" title={item.name} className="hide-1 font-16 color-grey-3 lineh-30 mr10" style={{maxWidth:"370px"}}>{item.name}</Link>
+            <Link to={`/${owner}/${projectsId}/issues/${item.id}`} target="_blank" title={item.name} className="hide-1 font-16 color-grey-3 lineh-30 mr10" style={{maxWidth:"370px"}}>{item.name}</Link>
             {TagInfo(item.priority,"mr10")}
           </p>
           <p className="color-grey-6 font-12">
diff --git a/src/forge/Order/order_form.js b/src/forge/Order/order_form.js
index 22b8155ba..6515dde86 100644
--- a/src/forge/Order/order_form.js
+++ b/src/forge/Order/order_form.js
@@ -165,7 +165,7 @@ class order_form extends Component {
           }).then((result) => {
             if (result && result.data.id) {
               this.props.showNotification("任务创建成功！");
-              this.props.history.push(`/${owner}/${projectsId}/issues/${result.data.id}/detail`);
+              this.props.history.push(`/${owner}/${projectsId}/issues/${result.data.id}`);
               this.setState({
                 description: "",
                 isSpin: false,
@@ -191,7 +191,7 @@ class order_form extends Component {
             ...values,
           }).then((result) => {
             if (result) {
-              this.props.history.push(`/${owner}/${projectsId}/issues/${orderId}/detail`);
+              this.props.history.push(`/${owner}/${projectsId}/issues/${orderId}`);
               this.props.showNotification("任务更新成功！");
               const { getDetail } = this.props;
               getDetail && getDetail();
@@ -371,7 +371,7 @@ class order_form extends Component {
                     type="default"
                     className="ml30"
                     onClick={()=>
-                      this.props.history.push(form_type === "new" ? `/${owner}/${projectsId || orderId}/issues` : `/${owner}/${projectsId}/issues/${orderId}/detail`)}
+                      this.props.history.push(form_type === "new" ? `/${owner}/${projectsId || orderId}/issues` : `/${owner}/${projectsId}/issues/${orderId}`)}
                   >
                     <span className="plr10">取消</span>
                   </Button>
diff --git a/src/forge/Settings/Branch.js b/src/forge/Settings/Branch.js
index 1570e6a6f..ed3728a22 100644
--- a/src/forge/Settings/Branch.js
+++ b/src/forge/Settings/Branch.js
@@ -88,7 +88,7 @@ export default ((props)=>{
 
   // 跳转
   function settingRule(protectBranch){
-    props.history.push(`/${owner}/${projectsId}/setting/branch/${protectBranch}`);
+    props.history.push(`/${owner}/${projectsId}/settings/branch/${protectBranch}`);
   }
 
   // 翻页
diff --git a/src/forge/Settings/BranchRule.jsx b/src/forge/Settings/BranchRule.jsx
index 90b00abe8..d131372f5 100644
--- a/src/forge/Settings/BranchRule.jsx
+++ b/src/forge/Settings/BranchRule.jsx
@@ -290,7 +290,7 @@ export default Form.create()(
             <Cancel
               className="ml30"
               onClick={() => {
-                history.push(`/${owner}/${projectsId}/setting/branch`);
+                history.push(`/${owner}/${projectsId}/settings/branch`);
               }}
             >
               取消
diff --git a/src/forge/Settings/CollaboratorGroup.jsx b/src/forge/Settings/CollaboratorGroup.jsx
index 4002d4cde..5c38b1aa7 100644
--- a/src/forge/Settings/CollaboratorGroup.jsx
+++ b/src/forge/Settings/CollaboratorGroup.jsx
@@ -78,7 +78,7 @@ function CollaboratorGroup({ newGroupId, owner, projectsId , setAddOperation })
       dataIndex: "name",
       render: (value, item) => {
         if(item.is_admin || item.is_member){
-          return <Link to={`/${owner}/group/${item.id}`}>{value}</Link>;
+          return <Link to={`/${owner}/teams/${item.id}`}>{value}</Link>;
         }else{
           return <span>{value}</span>;
         }
diff --git a/src/forge/Settings/Index.js b/src/forge/Settings/Index.js
index a610080d0..89b4f88b2 100644
--- a/src/forge/Settings/Index.js
+++ b/src/forge/Settings/Index.js
@@ -49,25 +49,25 @@ class Index extends Component {
     const { projectsId , owner } = this.props.match.params;
     const { pathname } = this.props.history.location;
 
-    const flag = pathname === `/${owner}/${projectsId}/setting`;
+    const flag = pathname === `/${owner}/${projectsId}/settings`;
     return (
       <Box className="ProjectListIndex">
         <Short>
           <ul className="list-l-Menu">
             <li className={flag ? "active" : ""}>
               <p>
-                <Link to={`/${owner}/${projectsId}/setting`} className="w-100">
+                <Link to={`/${owner}/${projectsId}/settings`} className="w-100">
                   <i className="iconfont icon-huabanfuben font-18 mr10"></i>基本设置
                 </Link>
               </p>
             </li>
             <li
               className={
-                pathname.indexOf("setting/collaborator") > -1 ? "active" : ""
+                pathname.indexOf("settings/collaborator") > -1 ? "active" : ""
               }
             >
               <p>
-                <Link to={`/${owner}/${projectsId}/setting/collaborator`} className="w-100">
+                <Link to={`/${owner}/${projectsId}/settings/collaborator`} className="w-100">
                   <i className="iconfont icon-chengyuan font-18 mr10"></i>
                   协作者管理
                 </Link>
@@ -75,11 +75,11 @@ class Index extends Component {
             </li>
             <li
               className={
-                pathname.indexOf("setting/webhooks") > -1 ? "active" : ""
+                pathname.indexOf("settings/webhooks") > -1 ? "active" : ""
               }
             >
               <p>
-                <Link to={`/${owner}/${projectsId}/setting/webhooks`} className="w-100">
+                <Link to={`/${owner}/${projectsId}/settings/webhooks`} className="w-100">
                   <i className="iconfont icon-a-xuanzhongwebhookicon font-18 mr10 color-grey-9"></i>
                   Webhooks
                 </Link>
@@ -87,21 +87,21 @@ class Index extends Component {
             </li>
             <li
               className={
-                pathname.indexOf("setting/branch") > -1 ? "active" : ""
+                pathname.indexOf("settings/branch") > -1 ? "active" : ""
               }
             >
               <p>
-                <Link to={`/${owner}/${projectsId}/setting/branch`} className="w-100">
+                <Link to={`/${owner}/${projectsId}/settings/branch`} className="w-100">
                 <i className="iconfont icon-fenzhi font-20 mr10"></i>
                   分支设置
                 </Link>
               </p>
             </li>
             <li
-              className={pathname.indexOf("setting/tags") > -1 ? "active" : ""}
+              className={pathname.indexOf("lables") > -1 ? "active" : ""}
             >
               <p>
-                <Link to={`/${owner}/${projectsId}/setting/tags`} className="w-100">
+                <Link to={`/${owner}/${projectsId}/lables`} className="w-100">
                   <i className="iconfont icon-biaoqian3 font-18 mr10 color-grey-6"></i>
                   项目标签
                 </Link>
@@ -110,7 +110,7 @@ class Index extends Component {
 
             {/* <li
               className={
-                pathname.indexOf("setting/manage") > -1 ? "active" : ""
+                pathname.indexOf("settings/manage") > -1 ? "active" : ""
               }
             >
               <p>
@@ -127,64 +127,64 @@ class Index extends Component {
             <Switch {...this.props}>
               {/* webhooks */}
               <Route
-                path="/:owner/:projectsId/setting/webhooks/new"
+                path="/:owner/:projectsId/settings/webhooks/new"
                 render={(props) => (
                   <WebhookNew {...this.props} {...props} {...this.state} />
                 )}
               ></Route>
               <Route
-                path="/:owner/:projectsId/setting/webhooks/:id"
+                path="/:owner/:projectsId/settings/webhooks/:id"
                 render={(props) => (
                   <WebhookNew {...this.props} {...props} {...this.state} />
                 )}
               ></Route>
               <Route
-                path="/:owner/:projectsId/setting/webhooks"
+                path="/:owner/:projectsId/settings/webhooks"
                 render={(props) => (
                   <Webhook {...this.props} {...props} {...this.state} />
                 )}
               ></Route>
               {/* 协作者 */}
               <Route
-                path="/:owner/:projectsId/setting/collaborator"
+                path="/:owner/:projectsId/settings/collaborator"
                 render={(props) => (
                   <Collaborator {...this.props} {...props} {...this.state} />
                 )}
               ></Route>
               {/* 修改仓库信息 */}
               <Route
-                path="/:owner/:projectsId/setting/tags"
+                path="/:owner/:projectsId/lables"
                 render={(props) => (
                   <Tags {...this.props} {...props} {...this.state} />
                 )}
               ></Route>
               <Route
-                path="/:owner/:projectsId/setting/branch/:branch"
+                path="/:owner/:projectsId/settings/branch/:branch"
                 render={(props) => (
                   <BranchNew {...this.props} {...props} {...this.state} />
                 )}
               ></Route>
               <Route
-                path="/:owner/:projectsId/setting/branch"
+                path="/:owner/:projectsId/settings/branch"
                 render={(props) => (
                   <Branch {...this.props} {...props } {...this.state} />
                 )}
               ></Route>
               <Route
-                path="/:owner/:projectsId/setting/manage/new"
+                path="/:owner/:projectsId/settings/manage/new"
                 render={(props) => (
                   <ManageNew {...this.props} {...props} {...this.state} />
                 )}
               ></Route>
               <Route
-                path="/:owner/:projectsId/setting/manage"
+                path="/:owner/:projectsId/settings/manage"
                 render={(props) => (
                   <Manage {...this.props} {...props} {...this.state} />
                 )}
               ></Route>
               {/* 修改仓库信息 */}
               <Route
-                path="/:owner/:projectsId/setting"
+                path="/:owner/:projectsId/settings"
                 render={(props) => (
                   <Setting {...this.props} {...props} {...this.state} />
                 )}
diff --git a/src/forge/Settings/Webhooks/Index.jsx b/src/forge/Settings/Webhooks/Index.jsx
index f3f5e26a3..57df13b47 100644
--- a/src/forge/Settings/Webhooks/Index.jsx
+++ b/src/forge/Settings/Webhooks/Index.jsx
@@ -62,7 +62,7 @@ function Index(props) {
     if(total >= 20){
       return props.showNotification("webhooks数量已到上限！请删除暂不使用的webhooks以进行添加操作");
     }
-    props.history.push(`/${owner}/${projectsId}/setting/webhooks/new`)
+    props.history.push(`/${owner}/${projectsId}/settings/webhooks/new`)
   }
 
   return(
@@ -90,9 +90,9 @@ function Index(props) {
               return(
                 <List.Item key={k}>
                   <i className="iconfont icon-a-xuanzhongwebhookicon color-grey-d mr12 font-17"></i>
-                  <Link to={`/${owner}/${projectsId}/setting/webhooks/${i.id}`} className="webName">{i.url}</Link>
+                  <Link to={`/${owner}/${projectsId}/settings/webhooks/${i.id}`} className="webName">{i.url}</Link>
                   <span>
-                    <Button ghost type={"primary"} onClick={()=>{props.history.push(`/${owner}/${projectsId}/setting/webhooks/${i.id}`)}}>编辑</Button>
+                    <Button ghost type={"primary"} onClick={()=>{props.history.push(`/${owner}/${projectsId}/settings/webhooks/${i.id}`)}}>编辑</Button>
                     <Button ghost className="ml20" type="danger" onClick={()=>{deleteFunc(i.id,i.url)}}>删除</Button>
                   </span>
                 </List.Item>
diff --git a/src/forge/Settings/Webhooks/New.jsx b/src/forge/Settings/Webhooks/New.jsx
index 18b64b989..d90934f04 100644
--- a/src/forge/Settings/Webhooks/New.jsx
+++ b/src/forge/Settings/Webhooks/New.jsx
@@ -111,7 +111,7 @@ function New({ form , match , showNotification , history }) {
           }).then(result=>{
             if(result){
               showNotification("webhook更新成功！");
-              history.push(`/${owner}/${projectsId}/setting/webhooks`);
+              history.push(`/${owner}/${projectsId}/settings/webhooks`);
             }
           }).catch(error=>{})
         }else{
@@ -125,7 +125,7 @@ function New({ form , match , showNotification , history }) {
           }).then(result=>{
             if(result && result.data && result.data.id){
               showNotification("webhook新建成功！");
-              history.push(`/${owner}/${projectsId}/setting/webhooks`);
+              history.push(`/${owner}/${projectsId}/settings/webhooks`);
             }
           }).catch(error=>{})
         }
@@ -157,7 +157,7 @@ function New({ form , match , showNotification , history }) {
       axios.delete(url).then(result=>{
         if(result){
           showNotification("webhook删除成功！");
-          history.push(`/${owner}/${projectsId}/setting/webhooks`);
+          history.push(`/${owner}/${projectsId}/settings/webhooks`);
         }
       }).catch(error=>{})
     }
@@ -180,7 +180,7 @@ function New({ form , match , showNotification , history }) {
         subTitle={`删除后未来事件将不会推送至此Webhook地址：${data && data.url}`}
       />
       <Banner>
-        <Link to={`/${owner}/${projectsId}/setting/webhooks`} className="color-blue">Webhooks</Link>
+        <Link to={`/${owner}/${projectsId}/settings/webhooks`} className="color-blue">Webhooks</Link>
         <i className="iconfont icon-youjiantou ml5 mr5 font-12"></i>
         <span>{id ? "更新" : "添加"}Webhook</span>
       </Banner>
diff --git a/src/forge/Team/Group/GroupDetailSetting.jsx b/src/forge/Team/Group/GroupDetailSetting.jsx
index e8be37228..168ba6ff4 100644
--- a/src/forge/Team/Group/GroupDetailSetting.jsx
+++ b/src/forge/Team/Group/GroupDetailSetting.jsx
@@ -26,18 +26,18 @@ export default (props)=>{
   
   function returnActive (pathname){
     let a = 0;
-    if(pathname === `/${OIdentifier}/group/${groupId}/setting/member`){
+    if(pathname === `/${OIdentifier}/teams/${groupId}/setting/member`){
       a = 1;
-    }else if(pathname === `/${OIdentifier}/group/${groupId}/setting/project`){
+    }else if(pathname === `/${OIdentifier}/teams/${groupId}/setting/project`){
       a = 2;
     }
     return a;
   }
   const active = returnActive(pathname);
   const array = {list:[
-    {name:'基本设置',icon:"icon-base",href:`/${OIdentifier}/group/${groupId}/setting`},
-    {name:'团队成员管理',icon:"icon-zuzhichengyuan",href:`/${OIdentifier}/group/${groupId}/setting/member`},
-    {name:'团队项目管理',icon:"icon-zuzhixiangmu",href:`/${OIdentifier}/group/${groupId}/setting/project`},
+    {name:'基本设置',icon:"icon-base",href:`/${OIdentifier}/teams/${groupId}/setting`},
+    {name:'团队成员管理',icon:"icon-zuzhichengyuan",href:`/${OIdentifier}/teams/${groupId}/setting/member`},
+    {name:'团队项目管理',icon:"icon-zuzhixiangmu",href:`/${OIdentifier}/teams/${groupId}/setting/project`},
   ],
     active
   }
@@ -51,19 +51,19 @@ export default (props)=>{
           <WhiteBack style={{border:'1px solid #eee'}}>
             <Switch>
               <Route
-                path="/:OIdentifier/group/:groupId/setting/project"
+                path="/:OIdentifier/teams/:groupId/setting/project"
                 render={() => (
                   <Project {...props} />
                 )}
               ></Route>
               <Route
-                path="/:OIdentifier/group/:groupId/setting/member"
+                path="/:OIdentifier/teams/:groupId/setting/member"
                 render={() => (
                   <Member {...props} />
                 )}
               ></Route>
               <Route
-                path="/:OIdentifier/group/:groupId/setting"
+                path="/:OIdentifier/teams/:groupId/setting"
                 render={() => (
                   <Common {...props} />
                 )}
diff --git a/src/forge/Team/Group/GroupDetails.jsx b/src/forge/Team/Group/GroupDetails.jsx
index b35132bcf..ba5693865 100644
--- a/src/forge/Team/Group/GroupDetails.jsx
+++ b/src/forge/Team/Group/GroupDetails.jsx
@@ -119,7 +119,7 @@ export default ((props) => {
               <div className="g-tip">
                 <p>管理员团队对 <span>所有仓库</span> 具有操作权限，且对组织具有 <span>管理员权限</span>。 </p>
                 <p>此外，该团队拥有了 <span>创建仓库</span>  的权限：成员可以在组织中创建新的仓库。 </p>
-                {group.is_admin ? <Button type="primary" onClick={()=>props.history.push(`/${OIdentifier}/group/${groupId}/setting`)}><span className="color-white">团队设置</span></Button> : ""}
+                {group.is_admin ? <Button type="primary" onClick={()=>props.history.push(`/${OIdentifier}/teams/${groupId}/setting`)}><span className="color-white">团队设置</span></Button> : ""}
               </div>
             </div>
             :
diff --git a/src/forge/Team/Group/GroupForm.jsx b/src/forge/Team/Group/GroupForm.jsx
index 29fe28582..dad9b64b9 100644
--- a/src/forge/Team/Group/GroupForm.jsx
+++ b/src/forge/Team/Group/GroupForm.jsx
@@ -90,7 +90,7 @@ export default Form.create()(
             }).then(result => {
               if (result && result.data) {
                 showNotification("基本设置更新成功！");
-                history.push(`/${OIdentifier}/group/${groupId}`);
+                history.push(`/${OIdentifier}/teams/${groupId}`);
               }
             }).catch(error => { })
           } else {
@@ -101,7 +101,7 @@ export default Form.create()(
             }).then(result => {
               if (result && result.data) {
                 showNotification("团队创建成功！");
-                history.push(`/${OIdentifier}/group/${result.data.id}`);
+                history.push(`/${OIdentifier}/teams/${result.data.id}`);
               }
             }).catch(error => { })
           }
@@ -154,7 +154,7 @@ export default Form.create()(
 
     function cancelEdit(){
       if(groupId){
-        history.push(`/${OIdentifier}/group/${groupId}`);
+        history.push(`/${OIdentifier}/teams/${groupId}`);
       }else{
         history.push(`/${OIdentifier}`);
       }
diff --git a/src/forge/Team/Index.jsx b/src/forge/Team/Index.jsx
index 4dfa85f4d..7076d5a91 100644
--- a/src/forge/Team/Index.jsx
+++ b/src/forge/Team/Index.jsx
@@ -38,28 +38,28 @@ export default withRouter(CNotificationHOC()(SnackbarHOC()(TPMIndexHOC(
         <Switch>
           {/* 组织团队-设置 */}
           <Route
-            path="/:OIdentifier/group/:groupId/setting"
+            path="/:OIdentifier/teams/:groupId/setting"
             render={(p) => {
               return <SubDetailIndex {...props} {...p}/>
             }}
           ></Route>
           {/* 组织团队-新建 */}
           <Route
-            path="/:OIdentifier/group/new"
+            path="/:OIdentifier/teams/new"
             render={(p) => {
               return <GroupNew {...props} {...p}/>
             }}
           ></Route>
           {/* 组织团队-子级（包含组织团队列表） */}
           <Route
-            path="/:OIdentifier/group"
+            path="/:OIdentifier/teams"
             render={(p) => {
               return <DetailIndex {...props}  {...p}/>
             }}
           ></Route>
           {/* 组织成员 */}
           <Route
-            path="/:OIdentifier/member"
+            path="/:OIdentifier/members"
             render={(p) => {
               return <DetailIndex {...props}  {...p}/>
             }}
diff --git a/src/forge/Team/RightBox.jsx b/src/forge/Team/RightBox.jsx
index 57239d38f..c20048c1e 100644
--- a/src/forge/Team/RightBox.jsx
+++ b/src/forge/Team/RightBox.jsx
@@ -67,7 +67,7 @@ function RightBox({ OIdentifier , history , admin }) {
     <div className="list-r">
       {
         memberData && memberData.organization_users && memberData.organization_users.length>0 ?
-        <Box name="组织成员" count={memberData && memberData.total_count} url={`/${OIdentifier}/member`}>
+        <Box name="组织成员" count={memberData && memberData.total_count} url={`/${OIdentifier}/members`}>
           {
             memberData.organization_users.map((item,key)=>{
               return(
@@ -87,8 +87,8 @@ function RightBox({ OIdentifier , history , admin }) {
       <Box 
         name="组织团队" 
         count={groupData && groupData.total_count} 
-        bottom={admin && <Button type={'primary'} onClick={()=>history.push(`/${OIdentifier}/group/new`)}>新建团队</Button>}
-        url={`/${OIdentifier}/group`}
+        bottom={admin && <Button type={'primary'} onClick={()=>history.push(`/${OIdentifier}/teams/new`)}>新建团队</Button>}
+        url={`/${OIdentifier}/teams`}
       >
         {
           groupData && groupData.teams && groupData.teams.length>0? 
@@ -99,7 +99,7 @@ function RightBox({ OIdentifier , history , admin }) {
                 <div>
                   {
                     (item.is_admin || item.is_member) ?
-                    <Link to={`/${OIdentifier}/group/${item.id}`}><ColorListName>{item.name}</ColorListName></Link>
+                    <Link to={`/${OIdentifier}/teams/${item.id}`}><ColorListName>{item.name}</ColorListName></Link>
                     :
                     <ColorListName>{item.name}</ColorListName>
                   }
diff --git a/src/forge/Team/Sub/Detail.jsx b/src/forge/Team/Sub/Detail.jsx
index 6919d3d5e..f591c864f 100644
--- a/src/forge/Team/Sub/Detail.jsx
+++ b/src/forge/Team/Sub/Detail.jsx
@@ -43,7 +43,7 @@ function Detail(props){
       }else{
         setFlag(true);
       }
-      if(pathname.indexOf(`/${OIdentifier}/group`)>-1 || pathname.indexOf(`/${OIdentifier}/member`)>-1){
+      if(pathname.indexOf(`/${OIdentifier}/teams`)>-1 || pathname.indexOf(`/${OIdentifier}/members`)>-1){
         setButtonflagFlag(true);
       }else{
         setButtonflagFlag(false);
@@ -88,8 +88,8 @@ function Detail(props){
               :""}
               {buttonflag && 
                 <span className="subNavs">
-                  <Link to={`/${OIdentifier}/member`} className={pathname ===`/${OIdentifier}/member` ? "active":""}><span>组织成员</span>{detail.num_users && <lable>{detail.num_users}</lable>}</Link>
-                  <Link to={`/${OIdentifier}/group`} className={pathname ===`/${OIdentifier}/group` ? "active":""}><span>组织团队</span>{detail.num_teams &&<lable>{detail.num_teams}</lable>}</Link>
+                  <Link to={`/${OIdentifier}/members`} className={pathname ===`/${OIdentifier}/members` ? "active":""}><span>组织成员</span>{detail.num_users && <lable>{detail.num_users}</lable>}</Link>
+                  <Link to={`/${OIdentifier}/teams`} className={pathname ===`/${OIdentifier}/teams` ? "active":""}><span>组织团队</span>{detail.num_teams &&<lable>{detail.num_teams}</lable>}</Link>
                 </span>
               }
             </React.Fragment>
@@ -112,21 +112,21 @@ function Detail(props){
 
         {/* 组织团队-详情 */}
         <Route
-          path="/:OIdentifier/group/:groupId"
+          path="/:OIdentifier/teams/:groupId"
           render={(p) => {
             return <GroupDetails {...props} {...p} group={detail}/>
           }}
         ></Route>
         {/* 组织成员 */}
         <Route
-          path="/:OIdentifier/member"
+          path="/:OIdentifier/members"
           render={(p) => {
             return <Member {...props} {...p} organizeDetail={detail}/>
           }}
         ></Route>
         {/* 组织团队 */}
         <Route
-          path="/:OIdentifier/group"
+          path="/:OIdentifier/teams"
           render={(p) => {
             return <Group {...props} {...p} organizeDetail={detail}/>
           }}
diff --git a/src/forge/Team/Sub/SubDetail.jsx b/src/forge/Team/Sub/SubDetail.jsx
index 94ac6a2a0..b4f1d0363 100644
--- a/src/forge/Team/Sub/SubDetail.jsx
+++ b/src/forge/Team/Sub/SubDetail.jsx
@@ -22,7 +22,7 @@ export default ((props)=>{
   // 设置页面：顶部不需要设置按钮了
   useEffect(()=>{
     if(pathname){
-      if(pathname.indexOf(`/${OIdentifier}/group/${groupId}/setting`)>-1){
+      if(pathname.indexOf(`/${OIdentifier}/teams/${groupId}/setting`)>-1){
         setFlag(false);
       }else{
         setFlag(true);
@@ -55,12 +55,12 @@ export default ((props)=>{
       {
         detail && 
         <Cards
-          src={`/${OIdentifier}/group/${groupId}`}
+          src={`/${OIdentifier}/teams/${groupId}`}
           title={detail.nickname||detail.name}
           rightBtn={
             flag && <span className="subNavs">
-              <Link to={`/${OIdentifier}/member`} className={pathname ===`/${OIdentifier}/member` ? "active":""}><span>组织成员</span>{detail.num_users && <lable>{detail.num_users}</lable>}</Link>
-              <Link to={`/${OIdentifier}/group`} className={pathname ===`/${OIdentifier}/group` ? "active":""}><span>组织团队</span>{detail.num_teams &&<lable>{detail.num_teams}</lable>}</Link>
+              <Link to={`/${OIdentifier}/members`} className={pathname ===`/${OIdentifier}/members` ? "active":""}><span>组织成员</span>{detail.num_users && <lable>{detail.num_users}</lable>}</Link>
+              <Link to={`/${OIdentifier}/teams`} className={pathname ===`/${OIdentifier}/teams` ? "active":""}><span>组织团队</span>{detail.num_teams &&<lable>{detail.num_teams}</lable>}</Link>
             </span>
           }
           desc={!flag && detail.description}
@@ -69,7 +69,7 @@ export default ((props)=>{
       <Switch {...props}>
         {/* 组织团队-设置 */}
         <Route
-          path="/:OIdentifier/group/:groupId/setting"
+          path="/:OIdentifier/teams/:groupId/setting"
           render={(p) => {
             return <GroupSetting {...props} {...p}/>
           }}
diff --git a/src/forge/Team/TeamGroupItems.jsx b/src/forge/Team/TeamGroupItems.jsx
index 78085b773..7b7188783 100644
--- a/src/forge/Team/TeamGroupItems.jsx
+++ b/src/forge/Team/TeamGroupItems.jsx
@@ -53,7 +53,7 @@ function TeamGroupItems({organizeDetail,limit, count , history}){
   }
   // 团队设置
   function toGroupSetting(id){
-    history.push(`/${organizeDetail && organizeDetail.name}/group/${id}/setting`);
+    history.push(`/${organizeDetail && organizeDetail.name}/teams/${id}/setting`);
   }
   // 解散团队
   function disMissGroup(id){
@@ -77,7 +77,7 @@ function TeamGroupItems({organizeDetail,limit, count , history}){
                   <p className="g-head">
                     {
                       (item.is_admin || item.is_member) ?
-                      <Link to={`/${organizeDetail.name}/group/${item.id}`} className="color-grey-3 font-16">{item.nickname}</Link>
+                      <Link to={`/${organizeDetail.name}/teams/${item.id}`} className="color-grey-3 font-16">{item.nickname}</Link>
                       :
                       <span className="color-grey-3 font-16">{item.nickname}</span>
                     }
@@ -94,7 +94,7 @@ function TeamGroupItems({organizeDetail,limit, count , history}){
                           k < count ? <Link to={`/${i.login}`}><ImgContent title={i.name} key={k} src={getImageUrl(`/${i.image_url}`)}/></Link> 
                           : 
                           k === count ? 
-                          <Link to={`/${organizeDetail && organizeDetail.name}/group/${item.id}`} className="moreMember" title="查看更多" ><i className="iconfont icon-zhunbeizhong"></i></Link>
+                          <Link to={`/${organizeDetail && organizeDetail.name}/teams/${item.id}`} className="moreMember" title="查看更多" ><i className="iconfont icon-zhunbeizhong"></i></Link>
                           :""
                         )
                       })
diff --git a/src/forge/users/CIList.jsx b/src/forge/users/CIList.jsx
index 9953fa7b4..f45404126 100644
--- a/src/forge/users/CIList.jsx
+++ b/src/forge/users/CIList.jsx
@@ -62,7 +62,7 @@ function CIList(props){
                 return(
                   <li key={key}>
                     <span>
-                      <Link to={`/${item.author && item.author.login}/${item.identifier}${ item.open_devops ? "/devops/dispose":""}`}>{item.name}</Link>
+                      <Link to={`/${item.author && item.author.login}/${item.identifier}${ item.open_devops ? "/devops":""}`}>{item.name}</Link>
                       { item.open_devops ? 
                         <span className="authTag green ml20">已激活</span>
                         :
diff --git a/src/forge/users/Index.jsx b/src/forge/users/Index.jsx
index 7e209113e..66c86ea3f 100644
--- a/src/forge/users/Index.jsx
+++ b/src/forge/users/Index.jsx
@@ -10,11 +10,6 @@ const Infos = Loadable({
   loader: () => import("./Infos"),
   loading: Loading,
 });
-//forge项目
-// const Projects = Loadable({
-//   loader: () => import('../Index'),
-//   loading: Loading,
-// })
 // forge项目详情
 const ProjectDetail = Loadable({
   loader: () => import("../Main/Detail"),
@@ -25,20 +20,10 @@ export default withRouter(
 
     // 个人中心新增的二级目录都需在此添加一次。将项目放组织和个人名下后，此处根据二级目录作判断，
     let secondRouter = '';
-    let firstRouter = '';
     if (props.location.pathname) {
-      firstRouter =props.location.pathname.split('/')[1];
       secondRouter = props.location.pathname.split('/')[2];
     }
-    // 如果是explore，把所有路由相关的都改成当前登录人；
-    let changePathProps={...props};
-    if(firstRouter==='explore'){
-      let login=props.current_user.login;
-      changePathProps.match.path=`/${login}`;
-      changePathProps.match.url=`/${login}`;
-      changePathProps.location.pathname=`/${login}`;
-      changePathProps.history.location.pathname=`/${login}`;
-    }
+    
     let userRouterArr = ['statistics', 'projects', 'notice', 'devops', 'organizes', 'info', 'watchers', 'fan_users', 'password'];
     return (
       <Switch>
@@ -51,7 +36,7 @@ export default withRouter(
         ></Route> : <Route
           path="/:username"
           render={(p) => (
-            <Infos {...changePathProps} {...p} />
+            <Infos {...props} {...p} />
           )}
         ></Route>}
 

From a5bdf26f96c820d31f56ee101cceb29a03016227 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= <792998983@qq.com>
Date: Fri, 3 Sep 2021 11:38:22 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=AF=E7=94=B1issue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.js                                  | 20 +++++++++++---------
 src/forge/Main/CoderDepot.jsx               |  2 +-
 src/forge/Main/CoderRootIndex.js            |  2 +-
 src/forge/Main/Detail.js                    |  4 ++--
 src/forge/Main/DetailTop.js                 |  2 +-
 src/forge/Main/sub/DetailBanner.jsx         |  1 -
 src/forge/Order/OrderItem.js                |  2 +-
 src/forge/Settings/Index.js                 | 12 ++++++------
 src/forge/Team/Index.jsx                    | 21 +++++++++++----------
 src/forge/Team/Setting/TeamSettingGroup.jsx |  4 ++--
 src/forge/Team/TeamGroup.jsx                |  4 ++--
 src/forge/Team/TeamGroupItems.jsx           |  3 ++-
 src/forge/users/Infos.js                    |  4 ++--
 13 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/src/App.js b/src/App.js
index 5bda37165..af5532ad5 100644
--- a/src/App.js
+++ b/src/App.js
@@ -118,7 +118,7 @@ class App extends Component {
 		this.unlisten = this.props.history.listen((location) => {
 			let newPathname = location.pathname.split('/')[1];
 			if (this.state.pathName !== newPathname) {
-				this.setState({ pathType: '' });
+				// this.setState({ pathType: '' });
 				newPathname && this.getPathnameType(newPathname);
 			}
 		});
@@ -313,6 +313,16 @@ class App extends Component {
 								}
 							/>
 
+
+							{/* 组织 */}
+							<Route path={"/organize"}
+								render={
+									(props) => {
+										return (<OrganizeIndex {...props} {...this.props} {...this.state} />)
+									}
+								}>
+							</Route>
+							
 							{/*新建项目等*/}
 							<Route
 								path={"/projects"}
@@ -353,14 +363,6 @@ class App extends Component {
 							}
 
 
-							{/* 组织 */}
-							<Route path={"/organize"}
-								render={
-									(props) => {
-										return (<OrganizeIndex {...props} {...this.props} {...this.state} />)
-									}
-								}>
-							</Route>
 
 							{/* 个人主页 */}
 							<Route path="/:username"
diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx
index 3769a3d5a..fe9bdbd0c 100644
--- a/src/forge/Main/CoderDepot.jsx
+++ b/src/forge/Main/CoderDepot.jsx
@@ -347,7 +347,7 @@ function CoderDepot(props){
                         }
                       </div>
                       <AlignCenter className="mr20">
-                        <Link to={`/${owner}/${projectsId}/branchs`} className="color-grey-9">
+                        <Link to={`/${owner}/${projectsId}/branches`} className="color-grey-9">
                           <i className="iconfont icon-fenzhi2 font-18 color-grey-9 mr3"></i>
                           <span className="color-grey-6 mr3">{projectDetail && projectDetail.branches && projectDetail.branches.total_count}个</span>分支
                         </Link>
diff --git a/src/forge/Main/CoderRootIndex.js b/src/forge/Main/CoderRootIndex.js
index d754d525d..0fb30c4e1 100644
--- a/src/forge/Main/CoderRootIndex.js
+++ b/src/forge/Main/CoderRootIndex.js
@@ -137,7 +137,7 @@ class CoderRootIndex extends Component{
               () => (<CoderRootTag {...this.props} {...this.state} />)
             }
           ></Route>
-          <Route path="/:owner/:projectsId/branchs"
+          <Route path="/:owner/:projectsId/branches"
             render={
               () => (<CoderRootBranch {...this.props} {...this.state} />)
             }
diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js
index a2ca67b97..99b3803b5 100644
--- a/src/forge/Main/Detail.js
+++ b/src/forge/Main/Detail.js
@@ -544,7 +544,7 @@ class Detail extends Component {
                         {
                           forked_count > 0 ?
                             platform ?
-                              <Link className="detail_tag_btn_count" to={{ pathname: `/${owner}/${projectsId}/fork_users`, state }}>
+                              <Link className="detail_tag_btn_count" to={{ pathname: `/${owner}/${projectsId}/members`, state }}>
                                 {forked_count}
                               </Link>
                               :
@@ -739,7 +739,7 @@ class Detail extends Component {
                     (props) => (<PraiseUsers {...this.props} {...props} {...this.state} {...common} />)
                   }
                 ></Route>
-                <Route path="/:owner/:projectsId/fork_users"
+                <Route path="/:owner/:projectsId/members"
                   render={
                     (props) => (<ForkUsers {...this.props} {...props} {...this.state} {...common} />)
                   }
diff --git a/src/forge/Main/DetailTop.js b/src/forge/Main/DetailTop.js
index 8806f12d3..ecd5ab9f5 100644
--- a/src/forge/Main/DetailTop.js
+++ b/src/forge/Main/DetailTop.js
@@ -16,7 +16,7 @@ class DetailTop extends Component {
               <i className="iconfont icon-tijiaojilu font-20 mr3 font-bd"></i>
               <span>{(coderCount && coderCount.commits_count) || 0}</span>个提交
             </Link>
-            <Link to={`/${owner}/${projectsId}/branchs`} className={pathname.indexOf("/branchs") > 0 ? "active" : ""}>
+            <Link to={`/${owner}/${projectsId}/branches`} className={pathname.indexOf("/branches") > 0 ? "active" : ""}>
               <i className="iconfont icon-fenzhi1 font-18 mr3"></i>
               <span>{(coderCount && coderCount.branches_count) || 0}</span>个分支
             </Link>
diff --git a/src/forge/Main/sub/DetailBanner.jsx b/src/forge/Main/sub/DetailBanner.jsx
index 7f8fddc07..abce4003a 100644
--- a/src/forge/Main/sub/DetailBanner.jsx
+++ b/src/forge/Main/sub/DetailBanner.jsx
@@ -16,7 +16,6 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
       setMenuName(list);
     }
   },[list]);
-  console.log('open_devops:'+open_devops)
   return(
     <div className="f-wrap-between mt15">
       {
diff --git a/src/forge/Order/OrderItem.js b/src/forge/Order/OrderItem.js
index 4d1b0cb9b..081788641 100644
--- a/src/forge/Order/OrderItem.js
+++ b/src/forge/Order/OrderItem.js
@@ -89,7 +89,7 @@ class OrderItem extends Component {
           <li style={{color:`${item.done_ratio === "100%"?"#28BD6C":"#F73030"}`}}>{item.done_ratio || "--"}</li>
           <li>
             <div className="milepostleft">
-              <Link to={`/${owner}/${projectsId}/issues/${item.id}/detail`}><i className="iconfont icon-pinglun1 mr3 font-16"></i>{item.journals_count}</Link>
+              <Link to={`/${owner}/${projectsId}/issues/${item.id}`}><i className="iconfont icon-pinglun1 mr3 font-16"></i>{item.journals_count}</Link>
               {
                 user_admin_or_member ?
                 <div style={{ display: orderid === item.id && isdisplay ? 'flex' : 'none' }}>
diff --git a/src/forge/Settings/Index.js b/src/forge/Settings/Index.js
index 89b4f88b2..92b60aaf6 100644
--- a/src/forge/Settings/Index.js
+++ b/src/forge/Settings/Index.js
@@ -63,11 +63,11 @@ class Index extends Component {
             </li>
             <li
               className={
-                pathname.indexOf("settings/collaborator") > -1 ? "active" : ""
+                pathname.indexOf("settings/collaborators") > -1 ? "active" : ""
               }
             >
               <p>
-                <Link to={`/${owner}/${projectsId}/settings/collaborator`} className="w-100">
+                <Link to={`/${owner}/${projectsId}/settings/collaborators`} className="w-100">
                   <i className="iconfont icon-chengyuan font-18 mr10"></i>
                   协作者管理
                 </Link>
@@ -98,10 +98,10 @@ class Index extends Component {
               </p>
             </li>
             <li
-              className={pathname.indexOf("lables") > -1 ? "active" : ""}
+              className={pathname.indexOf("settings/lables") > -1 ? "active" : ""}
             >
               <p>
-                <Link to={`/${owner}/${projectsId}/lables`} className="w-100">
+                <Link to={`/${owner}/${projectsId}/settings/lables`} className="w-100">
                   <i className="iconfont icon-biaoqian3 font-18 mr10 color-grey-6"></i>
                   项目标签
                 </Link>
@@ -146,14 +146,14 @@ class Index extends Component {
               ></Route>
               {/* 协作者 */}
               <Route
-                path="/:owner/:projectsId/settings/collaborator"
+                path="/:owner/:projectsId/settings/collaborators"
                 render={(props) => (
                   <Collaborator {...this.props} {...props} {...this.state} />
                 )}
               ></Route>
               {/* 修改仓库信息 */}
               <Route
-                path="/:owner/:projectsId/lables"
+                path="/:owner/:projectsId/settings/lables"
                 render={(props) => (
                   <Tags {...this.props} {...props} {...this.state} />
                 )}
diff --git a/src/forge/Team/Index.jsx b/src/forge/Team/Index.jsx
index 7076d5a91..1a3bfde99 100644
--- a/src/forge/Team/Index.jsx
+++ b/src/forge/Team/Index.jsx
@@ -36,11 +36,11 @@ export default withRouter(CNotificationHOC()(SnackbarHOC()(TPMIndexHOC(
     return (
       <div className="newMain">
         <Switch>
-          {/* 组织团队-设置 */}
+          {/* 新建组织 */}
           <Route
-            path="/:OIdentifier/teams/:groupId/setting"
+            path="/organize/new"
             render={(p) => {
-              return <SubDetailIndex {...props} {...p}/>
+              return <New {...props}  {...p}/>
             }}
           ></Route>
           {/* 组织团队-新建 */}
@@ -50,6 +50,13 @@ export default withRouter(CNotificationHOC()(SnackbarHOC()(TPMIndexHOC(
               return <GroupNew {...props} {...p}/>
             }}
           ></Route>
+          {/* 组织团队-设置 */}
+          <Route
+            path="/:OIdentifier/teams/:groupId/setting"
+            render={(p) => {
+              return <SubDetailIndex {...props} {...p}/>
+            }}
+          ></Route>
           {/* 组织团队-子级（包含组织团队列表） */}
           <Route
             path="/:OIdentifier/teams"
@@ -64,13 +71,7 @@ export default withRouter(CNotificationHOC()(SnackbarHOC()(TPMIndexHOC(
               return <DetailIndex {...props}  {...p}/>
             }}
           ></Route>
-          {/* 新建组织 */}
-          <Route
-            path="/organize/new"
-            render={(p) => {
-              return <New {...props}  {...p}/>
-            }}
-          ></Route>
+          
 
           {/* 组织详情（包含组织设置） */}
           <Route
diff --git a/src/forge/Team/Setting/TeamSettingGroup.jsx b/src/forge/Team/Setting/TeamSettingGroup.jsx
index 006d579cf..8ebdb4af3 100644
--- a/src/forge/Team/Setting/TeamSettingGroup.jsx
+++ b/src/forge/Team/Setting/TeamSettingGroup.jsx
@@ -3,11 +3,11 @@ import { WhiteBack , Banner } from '../../Component/layout';
 import GroupItems from '../TeamGroupItems';
 
 const limit = 8;
-function TeamSettingGroup({organizeDetail,history}){
+function TeamSettingGroup({organizeDetail,history,current_user}){
   return(
     <WhiteBack>
       <Banner>组织团队管理</Banner>
-      <GroupItems limit={limit} organizeDetail={organizeDetail} count={4} history={history}/>
+      <GroupItems limit={limit} organizeDetail={organizeDetail} count={4} history={history} current_user={current_user}/>
     </WhiteBack>
   )
 }
diff --git a/src/forge/Team/TeamGroup.jsx b/src/forge/Team/TeamGroup.jsx
index 38725e7d1..1920caed6 100644
--- a/src/forge/Team/TeamGroup.jsx
+++ b/src/forge/Team/TeamGroup.jsx
@@ -3,11 +3,11 @@ import { Banner } from '../Component/layout';
 import GroupItems from './TeamGroupItems';
 
 const limit = 14;
-function TeamGroup({organizeDetail,history}){
+function TeamGroup({organizeDetail,history,current_user}){
   return(
     <div style={{background:"#fff",marginBottom:"30px",border:'1px solid #eee'}}>
       <Banner>组织团队</Banner>
-      <GroupItems limit={limit} organizeDetail={organizeDetail} count={7} history={history}/>
+      <GroupItems limit={limit} organizeDetail={organizeDetail} count={7} history={history} current_user={current_user}/>
     </div>
   )
 }
diff --git a/src/forge/Team/TeamGroupItems.jsx b/src/forge/Team/TeamGroupItems.jsx
index 7b7188783..5a9558180 100644
--- a/src/forge/Team/TeamGroupItems.jsx
+++ b/src/forge/Team/TeamGroupItems.jsx
@@ -17,7 +17,7 @@ const ImgContent = styled.img`{
   border-radius:50%;
   margin:5px 10px;
 }`
-function TeamGroupItems({organizeDetail,limit, count , history}){
+function TeamGroupItems({organizeDetail,limit, count , history ,current_user}){
   const [ page , setPage ] = useState(1);
   const [ isSpin , setIsSpin ] = useState(true);
   const [ total , setTotal ] = useState(0);
@@ -48,6 +48,7 @@ function TeamGroupItems({organizeDetail,limit, count , history}){
     axios.delete(url).then(result =>{
       if(result && result.data){
         getData();
+        history.push(`/${current_user && current_user.login}`);
       }
     }).catch(error=>{})
   }
diff --git a/src/forge/users/Infos.js b/src/forge/users/Infos.js
index 44bf2f39d..0e56aaef2 100644
--- a/src/forge/users/Infos.js
+++ b/src/forge/users/Infos.js
@@ -282,7 +282,7 @@ class Infos extends Component {
                 <Menu selectedKeys={[menuKey]} mode={`horizontal`} className="infosRightMenu">
                   <Menu.Item key="0"><Link to={`/${user && user.login}`}><i className="iconfont icon-gailan"></i>概览</Link></Menu.Item>
                   <Menu.Item key="1"><Link to={`/${user && user.login}/statistics`}><i className="iconfont icon-shujutongji"></i>数据统计</Link></Menu.Item>
-                  <Menu.Item key="2"><Link to={`/${user && user.login}/projects/common`}><i className="iconfont icon-xiangmu"></i>项目</Link></Menu.Item>
+                  <Menu.Item key="2"><Link to={`/${user && user.login}/projects`}><i className="iconfont icon-xiangmu"></i>项目</Link></Menu.Item>
                   {
                     current_user && user && user.login === current_user.login ?
                     <Menu.Item key="3">
@@ -338,7 +338,7 @@ class Infos extends Component {
                     }}
                   ></Route>
                   <Route
-                    path="/:username/projects/:project_type"
+                    path="/:username/projects"    // /:project_type
                     render={() => {
                       return <InfosUser {...this.props} {...this.state} />;
                     }}