From 75884305a0d0e116e9fe4f3eca3c6941adc01bc4 Mon Sep 17 00:00:00 2001 From: zuiidea Date: Thu, 29 Dec 2016 22:34:05 +0800 Subject: [PATCH] :sleepy: --- src/components/layout/bread.jsx | 6 ++---- src/models/app.js | 1 - src/models/dashboard.js | 4 +++- src/routes/dashboard.js | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/components/layout/bread.jsx b/src/components/layout/bread.jsx index 8dcf4cd..912930d 100644 --- a/src/components/layout/bread.jsx +++ b/src/components/layout/bread.jsx @@ -20,8 +20,6 @@ const getPathSet = function (menuArray, parentPath) { } getPathSet(menu) -console.log(pathSet) - function Bread({ location }) { let pathNames = [] location.pathname.substr(1).split('/').map((item, key) => { @@ -32,8 +30,8 @@ function Bread({ location }) { } }) const breads = pathNames.map((item, key) => { - if(item=='-'){ - item='Dashboard' + if(!(item in pathSet)){ + item='Dashboard' } return ( diff --git a/src/models/app.js b/src/models/app.js index b069f95..2bb81ee 100644 --- a/src/models/app.js +++ b/src/models/app.js @@ -74,7 +74,6 @@ export default { *changeTheme({ payload }, {put}) { - console.log("changeTheme"); yield put({ type: 'handleChangeTheme' }) diff --git a/src/models/dashboard.js b/src/models/dashboard.js index c0cfbd0..d9a7325 100644 --- a/src/models/dashboard.js +++ b/src/models/dashboard.js @@ -183,7 +183,9 @@ export default { completed:[], browser:[], cpu:{}, - user:{}, + user:{ + avatar: 'http://img.hb.aicdn.com/bc442cf0cc6f7940dcc567e465048d1a8d634493198c4-sPx5BR_fw236' + }, }, subscriptions : { setup({dispatch}) { diff --git a/src/routes/dashboard.js b/src/routes/dashboard.js index e6737bd..9b47ca1 100644 --- a/src/routes/dashboard.js +++ b/src/routes/dashboard.js @@ -23,7 +23,7 @@ const bodyStyle = { } function Dashboard({dashboard,dispatch}) { - console.log({dashboard,dispatch}); + const {weather, sales, quote, numbers, recentSales, comments, completed, browser, cpu, user} = dashboard const numberCards = numbers.map((item, key) =>