From 2079ccceaf5471c35df9946913658338cb5f81f4 Mon Sep 17 00:00:00 2001
From: caicai8 <1149225589@qq.com>
Date: Mon, 2 Mar 2020 17:11:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=B7=E6=96=B0=E5=90=8E404=E7=9A=84?=
 =?UTF-8?q?=E5=8E=9F=E5=9B=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/forge/Main/CoderRootDirectory.js      |  1 +
 public/react/src/forge/Main/Detail.js         | 11 ++++++-----
 public/react/src/forge/Main/IndexItem.js      | 19 ++++++++++++-------
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/public/react/src/forge/Main/CoderRootDirectory.js b/public/react/src/forge/Main/CoderRootDirectory.js
index 34b0478c7..5ab3666e6 100644
--- a/public/react/src/forge/Main/CoderRootDirectory.js
+++ b/public/react/src/forge/Main/CoderRootDirectory.js
@@ -65,6 +65,7 @@ class CoderRootDirectory extends Component{
     const { current_user } = this.props;
     const { projectsId } = this.props.match.params;
     const { state } = this.props.history.location;
+    console.log(this.props);
     const url = `/${state}/${projectsId}/entries.json`;
     axios.get((url),{
       params:{
diff --git a/public/react/src/forge/Main/Detail.js b/public/react/src/forge/Main/Detail.js
index 4651b5a3e..39387cbeb 100644
--- a/public/react/src/forge/Main/Detail.js
+++ b/public/react/src/forge/Main/Detail.js
@@ -293,6 +293,7 @@ class Detail extends Component{
     const { isManager , isDeveloper } = this.props;
     const { projectsId } = this.props.match.params;
 
+    const { state } = this.props.history.location;
     return(
       <div>
         <div className="detailHeader-wrapper">
@@ -308,11 +309,11 @@ class Detail extends Component{
             </div>
             <div className="f-wrap-between">
               <ul className="headerMenu-wrapper">
-                <li className={(url.indexOf("coder")>0 || urlFlag)? "active" : ""}><Link to={`/projects/${projectsId}/coder`}><img alt="" src={img_1} width="18" />代码</Link></li>
-                <li className={url.indexOf("orders")>0 ? "active" : ""}><Link to={`/projects/${projectsId}/orders`}><img alt="" src={img_2} width="12" />工单{projectDetail&&projectDetail.issues_count===0?"":projectDetail&&projectDetail.issues_count===0?projectDetail.issues_count:""}</Link></li>
-                <li className={url.indexOf("merge")>0 ? "active" : ""}><Link to={`/projects/${projectsId}/merge`}><img alt="" src={img_3} width="13" />合并请求{projectDetail&&projectDetail.pull_requests_count===0?"":projectDetail&&projectDetail.pull_requests_count===0?projectDetail.pull_requests_count:""}</Link></li>
-                <li className={url.indexOf("version")>0 ? "active" : ""}><Link to={`/projects/${projectsId}/version`}><img alt="" src={img_4} width="16" />版本发布</Link></li>
-                <li className={url.indexOf("trends")>0 ? "active" : ""}><Link to={`/projects/${projectsId}/trends`}><img alt="" src={img_6} width="16" />动态</Link></li>
+                <li className={(url.indexOf("coder")>0 || urlFlag)? "active" : ""}><Link to={{pathname:`/projects/${projectsId}/coder`,state}}><img alt="" src={img_1} width="18" />代码</Link></li>
+                <li className={url.indexOf("orders")>0 ? "active" : ""}><Link to={{pathname:`/projects/${projectsId}/orders`,state}}><img alt="" src={img_2} width="12" />工单{projectDetail&&projectDetail.issues_count===0?"":projectDetail&&projectDetail.issues_count===0?projectDetail.issues_count:""}</Link></li>
+                <li className={url.indexOf("merge")>0 ? "active" : ""}><Link to={{pathname:`/projects/${projectsId}/merge`,state}}><img alt="" src={img_3} width="13" />合并请求{projectDetail&&projectDetail.pull_requests_count===0?"":projectDetail&&projectDetail.pull_requests_count===0?projectDetail.pull_requests_count:""}</Link></li>
+                <li className={url.indexOf("version")>0 ? "active" : ""}><Link to={{pathname:`/projects/${projectsId}/version`,state}}><img alt="" src={img_4} width="16" />版本发布</Link></li>
+                <li className={url.indexOf("trends")>0 ? "active" : ""}><Link to={{pathname:`/projects/${projectsId}/trends`,state}}><img alt="" src={img_6} width="16" />动态</Link></li>
                 {
                   isManager &&
                     <li className={url.indexOf("setting")>0 ? "active" : ""}><Link to={`/projects/${projectsId}/setting`}><img alt="" src={img_7} width="19" />仓库设置</Link></li>
diff --git a/public/react/src/forge/Main/IndexItem.js b/public/react/src/forge/Main/IndexItem.js
index 6415d6afe..c8dfe5d2f 100644
--- a/public/react/src/forge/Main/IndexItem.js
+++ b/public/react/src/forge/Main/IndexItem.js
@@ -5,10 +5,19 @@ import '../css/index.css'
 import './list.css';
 import img_parise from '../Images/parise.png';
 class IndexItem extends Component{
-  
+  // constructor(props){
+  //   super(props);
+  // }
+
+  TurnToDetail=(login,url)=>{
+    this.props.history.push({
+      pathname:url,
+      state:login
+    })
+  }
   render(){ 
     const { projects } = this.props;
-
+    // item.author.login
     const renderList = (
       projects && projects.length >0 ? projects.map((item,key)=>{
         return(
@@ -16,11 +25,7 @@ class IndexItem extends Component{
             <img className="p-r-photo" alt="" src={getImageUrl(`images/${item.author && item.author.image_url}`)} ></img>
             <div className="p-r-Infos">
               <div className="p-r-name">
-                <Link to={{
-                  pathname: `/projects/${item.identifier}/coder`,
-                  state: `${item.author && item.author.login}`,
-                  }} className="hide-1 font-16 color-grey-3" style={{whiteSpace:"wrap"}}>{item.name}</Link>
-                
+                <a onClick={()=>this.TurnToDetail(`${item.author && item.author.login}`,`/projects/${item.identifier}/coder`)} className="hide-1 font-16 color-grey-3" style={{whiteSpace:"wrap"}}>{item.name}</a>
               </div>
               <div className="p-r-content">
                 <p className="break_word task-hide flex1" style={{maxHeight:"40px"}}>{item.description}</p>