Commit 8e113846 authored by lijin's avatar lijin

优化页面样式

parent b0e89c51
...@@ -734,7 +734,7 @@ export default { ...@@ -734,7 +734,7 @@ export default {
} }
.aside { .aside {
background-color: #f5f7fa; /* background-color: #f5f7fa; */
border-right: 1px solid #e6e6e6; border-right: 1px solid #e6e6e6;
} }
......
...@@ -40,10 +40,34 @@ ...@@ -40,10 +40,34 @@
<el-menu-item index="/tools/uploadYoutube">Youtube视频上传</el-menu-item> <el-menu-item index="/tools/uploadYoutube">Youtube视频上传</el-menu-item>
<el-menu-item index="/tools/YoutubeVideoManage">Youtube视频管理</el-menu-item> <el-menu-item index="/tools/YoutubeVideoManage">Youtube视频管理</el-menu-item>
</el-submenu> </el-submenu>
<!-- 头像菜单 - 放在最右边 -->
<div class="avatar-container">
<el-dropdown trigger="click">
<div class="avatar-wrapper">
<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">
<i class="el-icon-caret-bottom"/>
</div>
<el-dropdown-menu slot="dropdown" class="user-dropdown">
<router-link class="inlineBlock" to="/">
<el-dropdown-item>
Home
</el-dropdown-item>
</router-link>
<el-dropdown-item divided>
<span style="display:block;" @click="logout">LogOut</span>
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
</el-menu> </el-menu>
</div> </div>
<!-- 面包屑导航 -->
<div class="breadcrumb-container">
<breadcrumb />
</div>
<div class="main-container"> <div class="main-container">
<navbar/> <!-- <navbar/> -->
<app-main/> <app-main/>
</div> </div>
</div> </div>
...@@ -52,13 +76,16 @@ ...@@ -52,13 +76,16 @@
<script> <script>
import { Navbar, Sidebar, AppMain } from './components' import { Navbar, Sidebar, AppMain } from './components'
import ResizeMixin from './mixin/ResizeHandler' import ResizeMixin from './mixin/ResizeHandler'
import { mapGetters } from 'vuex'
import Breadcrumb from '@/components/Breadcrumb'
export default { export default {
name: 'Layout', name: 'Layout',
components: { components: {
Navbar, Navbar,
Sidebar, Sidebar,
AppMain AppMain,
Breadcrumb
}, },
data() { data() {
return { return {
...@@ -67,6 +94,9 @@ export default { ...@@ -67,6 +94,9 @@ export default {
}, },
mixins: [ResizeMixin], mixins: [ResizeMixin],
computed: { computed: {
...mapGetters([
'avatar'
]),
sidebar() { sidebar() {
return this.$store.state.app.sidebar return this.$store.state.app.sidebar
}, },
...@@ -89,6 +119,11 @@ export default { ...@@ -89,6 +119,11 @@ export default {
handleSelect(key) { handleSelect(key) {
console.log('选中菜单:', key); console.log('选中菜单:', key);
// 此处添加路由跳转或业务逻辑 // 此处添加路由跳转或业务逻辑
},
logout() {
this.$store.dispatch('FedLogOut').then(() => {
location.reload() // 为了重新实例化vue-router对象 避免bug
})
} }
} }
} }
...@@ -118,6 +153,12 @@ export default { ...@@ -118,6 +153,12 @@ export default {
.horizontal-menu { .horizontal-menu {
box-shadow: 0 2px 12px 0 rgba(0,0,0,0.1); box-shadow: 0 2px 12px 0 rgba(0,0,0,0.1);
} }
.breadcrumb-container {
padding: 0px 20px;
background-color: #fff;
box-shadow: 0 1px 4px rgba(0,21,41,.08);
}
.el-menu--horizontal { .el-menu--horizontal {
display: flex; display: flex;
...@@ -127,4 +168,38 @@ export default { ...@@ -127,4 +168,38 @@ export default {
.el-submenu .el-menu-item { .el-submenu .el-menu-item {
min-width: 120px; min-width: 120px;
} }
.el-menu--horizontal {
display: flex;
justify-content: center;
position: relative;
}
/* 头像菜单样式 */
.avatar-container {
position: absolute;
right: 20px;
height: 60px;
display: flex;
align-items: center;
.avatar-wrapper {
cursor: pointer;
position: relative;
.user-avatar {
width: 40px;
height: 40px;
border-radius: 10px;
}
.el-icon-caret-bottom {
position: absolute;
right: -20px;
top: 25px;
font-size: 12px;
color: #fff;
}
}
}
</style> </style>
...@@ -2,27 +2,10 @@ ...@@ -2,27 +2,10 @@
<el-menu class="navbar" mode="horizontal"> <el-menu class="navbar" mode="horizontal">
<!-- <hamburger :toggle-click="toggleSideBar" :is-active="sidebar.opened" class="hamburger-container"/>--> <!-- <hamburger :toggle-click="toggleSideBar" :is-active="sidebar.opened" class="hamburger-container"/>-->
<!-- <breadcrumb />--> <!-- <breadcrumb />-->
<el-dropdown class="avatar-container" trigger="click">
<div class="avatar-wrapper">
<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">
<i class="el-icon-caret-bottom"/>
</div>
<el-dropdown-menu slot="dropdown" class="user-dropdown">
<router-link class="inlineBlock" to="/">
<el-dropdown-item>
Home
</el-dropdown-item>
</router-link>
<el-dropdown-item divided>
<span style="display:block;" @click="logout">LogOut</span>
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</el-menu> </el-menu>
</template> </template>
<script> <script>
import { mapGetters } from 'vuex'
import Breadcrumb from '@/components/Breadcrumb' import Breadcrumb from '@/components/Breadcrumb'
import Hamburger from '@/components/Hamburger' import Hamburger from '@/components/Hamburger'
...@@ -32,19 +15,10 @@ export default { ...@@ -32,19 +15,10 @@ export default {
Hamburger Hamburger
}, },
computed: { computed: {
...mapGetters([
'sidebar',
'avatar'
])
}, },
methods: { methods: {
toggleSideBar() { toggleSideBar() {
this.$store.dispatch('ToggleSideBar') this.$store.dispatch('ToggleSideBar')
},
logout() {
this.$store.dispatch('FedLogOut').then(() => {
location.reload() // 为了重新实例化vue-router对象 避免bug
})
} }
} }
} }
...@@ -67,29 +41,7 @@ export default { ...@@ -67,29 +41,7 @@ export default {
top: 16px; top: 16px;
color: red; color: red;
} }
.avatar-container {
height: 50px;
display: inline-block;
position: absolute;
right: 35px;
.avatar-wrapper {
cursor: pointer;
margin-top: 5px;
position: relative;
line-height: initial;
.user-avatar {
width: 40px;
height: 40px;
border-radius: 10px;
}
.el-icon-caret-bottom {
position: absolute;
right: -20px;
top: 25px;
font-size: 12px;
}
}
}
} }
</style> </style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment