diff --git a/README/README-mock.md b/README/README-mock.md index 7f15804f..18d2b790 100644 --- a/README/README-mock.md +++ b/README/README-mock.md @@ -24,7 +24,7 @@ 取到上面的链接在浏览器中请求就可以得到如下结果。 - + diff --git a/client/containers/ProjectGroups/GroupList/GroupList.scss b/client/containers/ProjectGroups/GroupList/GroupList.scss index f4756b8f..576d2d90 100644 --- a/client/containers/ProjectGroups/GroupList/GroupList.scss +++ b/client/containers/ProjectGroups/GroupList/GroupList.scss @@ -14,7 +14,9 @@ white-space:nowrap; text-overflow:ellipsis; max-width: 150px; + vertical-align: bottom; } + color: #fff; font-size: 24px; } diff --git a/client/containers/User/LeftMenu.js b/client/containers/User/LeftMenu.js index bea84f33..37b9df58 100644 --- a/client/containers/User/LeftMenu.js +++ b/client/containers/User/LeftMenu.js @@ -11,7 +11,8 @@ const Option = AutoComplete.Option; console.log(state); return { curUid: state.login.uid + '', - curUserName: state.login.userName + curUserName: state.login.userName, + curUserRole: state.login.role } } ) @@ -28,7 +29,8 @@ class LeftMenu extends Component { static propTypes = { curUid: PropTypes.string, - curUserName: PropTypes.string + curUserName: PropTypes.string, + curUserRole: PropTypes.string } //延迟搜索 @@ -66,12 +68,14 @@ class LeftMenu extends Component { const menus = [{ title: '个人资料', path: `/user/profile/${this.props.curUid}` - }, { - title: '用户管理', - path: '/user/list' } ] - + if(this.props.curUserRole === 'admin'){ + menus.push({ + title: '用户管理', + path: '/user/list' + }) + } let content = menus.map((menu) => { return (
取到上面的链接在浏览器中请求就可以得到如下结果。
- +
参考自:Mock.js 官网