From 726f225b860ef634b4e15da99a1f01bd53a2a7c2 Mon Sep 17 00:00:00 2001
From: "wenbo.dong" <wenbo.dong@qunar.com>
Date: Mon, 28 Aug 2017 18:12:13 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E9=A1=B9=E7=9B=AE=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E9=A1=B5=E9=9D=A2=E7=9A=84=E9=9D=A2=E5=8C=85=E5=B1=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/components/Breadcrumb/Breadcrumb.js   |  2 +-
 client/components/Breadcrumb/Breadcrumb.scss |  6 +++++
 client/components/Intro/Intro.scss           |  6 ++---
 client/containers/Project/Project.js         | 23 +++++++++++++++-----
 client/styles/mixin.scss                     |  8 +++----
 5 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/client/components/Breadcrumb/Breadcrumb.js b/client/components/Breadcrumb/Breadcrumb.js
index 785ab881..947a5f69 100644
--- a/client/components/Breadcrumb/Breadcrumb.js
+++ b/client/components/Breadcrumb/Breadcrumb.js
@@ -25,7 +25,7 @@ export default class BreadcrumbNavigation extends Component {
     console.log(this.props.breadcrumb);
     const getItem = this.props.breadcrumb.map((item, index) => {
       console.log(item);
-      if (item.fref) {
+      if (item.href) {
         return (<Breadcrumb.Item key={index}><Link to={item.href}>{item.name}</Link></Breadcrumb.Item>);
       } else {
         return (<Breadcrumb.Item key={index}>{item.name}</Breadcrumb.Item>);
diff --git a/client/components/Breadcrumb/Breadcrumb.scss b/client/components/Breadcrumb/Breadcrumb.scss
index 221763a6..795dc29a 100644
--- a/client/components/Breadcrumb/Breadcrumb.scss
+++ b/client/components/Breadcrumb/Breadcrumb.scss
@@ -7,6 +7,12 @@
     color: #fff;
     padding-left: 40px;
   }
+  .ant-breadcrumb a {
+    color: #fff;
+    &:hover {
+      color: $color-blue
+    }
+  }
   .ant-breadcrumb > span:last-child {
     color: #fff;
     font-weight: normal;
diff --git a/client/components/Intro/Intro.scss b/client/components/Intro/Intro.scss
index 362ddbc3..4a6976b9 100644
--- a/client/components/Intro/Intro.scss
+++ b/client/components/Intro/Intro.scss
@@ -1,6 +1,6 @@
-$imgUrl : "../../../static/image/";
-$color-grey : #E5E5E5;
-$color-blue : #108ee9;
+$imgUrl: "../../../static/image/";
+$color-grey: #E5E5E5;
+$color-blue: #2395f1;
 $color-white: #fff;
 
 .intro-container{
diff --git a/client/containers/Project/Project.js b/client/containers/Project/Project.js
index 59410755..6744235f 100644
--- a/client/containers/Project/Project.js
+++ b/client/containers/Project/Project.js
@@ -2,7 +2,9 @@ import React, { Component } from 'react'
 import { connect } from 'react-redux';
 import PropTypes from 'prop-types'
 import { Route, Switch, Redirect, matchPath } from 'react-router-dom';
-import { Subnav } from '../../components/index'
+import { Subnav } from '../../components/index';
+import { fetchGroupMsg } from '../../reducer/modules/group';
+import { setBreadcrumb } from  '../../reducer/modules/user';
 import { getProject } from '../../reducer/modules/project';
 import Interface from './Interface/Interface.js'
 import Activity from './Activity/Activity.js'
@@ -16,7 +18,9 @@ import Setting from './Setting/Setting.js'
     }
   },
   {
-    getProject
+    getProject,
+    fetchGroupMsg,
+    setBreadcrumb
   }
 )
 
@@ -26,15 +30,24 @@ export default class Project extends Component {
     match: PropTypes.object,
     curProject: PropTypes.object,
     getProject: PropTypes.func,
-    location: PropTypes.object
+    location: PropTypes.object,
+    fetchGroupMsg: PropTypes.func,
+    setBreadcrumb: PropTypes.func
   }
 
   constructor(props) {
     super(props)
   }
 
-  componentWillMount() {
-    this.props.getProject(this.props.match.params.id)
+  async componentWillMount() {
+    await this.props.getProject(this.props.match.params.id);
+    const groupMsg = await this.props.fetchGroupMsg(this.props.curProject.group_id);
+    this.props.setBreadcrumb([{
+      name: groupMsg.payload.data.data.group_name,
+      href: '/group/'+groupMsg.payload.data.data._id
+    }, {
+      name: this.props.curProject.name
+    }]);
   }
 
   render() {
diff --git a/client/styles/mixin.scss b/client/styles/mixin.scss
index 23800ec8..7f2ca606 100644
--- a/client/styles/mixin.scss
+++ b/client/styles/mixin.scss
@@ -1,9 +1,9 @@
-$color-white : #fff;
+$color-white: #fff;
 $color-bg-gray: #ececec;
-$color-blue : #108ee9;
+$color-blue: #2395f1;
 $color-blue-deeper: #34495E;
-$color-grey-deep : #929aac;
-$color-black-light : #404040;
+$color-grey-deep: #929aac;
+$color-black-light: #404040;
 $color-bg-dark: #202d3a;            // 背景色 - header 用的深蓝色
 $box-shadow-panel: 0 2px 4px 0 rgba(0, 0, 0, 0.2);
 

From db971d5734b69112196d271f5a97abe07050a995 Mon Sep 17 00:00:00 2001
From: zwjamnsss <zwjamnsss@gmail.com>
Date: Mon, 28 Aug 2017 19:31:22 +0800
Subject: [PATCH 2/2] fix: projectId

---
 .../Project/Interface/InterfaceCol/InterfaceColContent.js       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/containers/Project/Interface/InterfaceCol/InterfaceColContent.js b/client/containers/Project/Interface/InterfaceCol/InterfaceColContent.js
index fde1ca91..395601f9 100644
--- a/client/containers/Project/Interface/InterfaceCol/InterfaceColContent.js
+++ b/client/containers/Project/Interface/InterfaceCol/InterfaceColContent.js
@@ -82,7 +82,7 @@ export default class InterfaceColContent extends Component {
       render: (path, record) => {
         return (
           <Tooltip title="跳转到对应接口">
-            <a href={`/project/2909/interface/api/${record.interface_id}`}>{path || 'fdsf'}</a>
+            <a href={`/project/${record.project_id}/interface/api/${record.interface_id}`}>{path || 'fdsf'}</a>
           </Tooltip>
         )
       }