提交 77391adb 编写于 作者: Mr.奇淼('s avatar Mr.奇淼(

整合登录 首次登陆白页问题修复

上级 d207b151
...@@ -30,7 +30,7 @@ export const user = { ...@@ -30,7 +30,7 @@ export const user = {
state.userInfo = {} state.userInfo = {}
state.token = "" state.token = ""
state.expiresAt = "" state.expiresAt = ""
router.push({ name: 'login' }) router.push({ name: 'login', replace: true })
} }
}, },
...@@ -46,7 +46,7 @@ export const user = { ...@@ -46,7 +46,7 @@ export const user = {
if (redirect) { if (redirect) {
router.push({ path: redirect, replace: true }) router.push({ path: redirect, replace: true })
} else { } else {
router.push({ name: 'dashboard', replace: true }) router.push({ path: '/layout/dashbord', replace: true })
} }
} }
} catch (err) { } catch (err) {
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<div class="fl-left left-mg-lg"> <div class="fl-left left-mg-lg">
<div>用户ID:{{userInfo.uuid}}</div> <div>用户ID:{{userInfo.uuid}}</div>
<div>用户昵称:{{userInfo.nickName}}</div> <div>用户昵称:{{userInfo.nickName}}</div>
<div>用户组:{{userInfo.authority.authorityName}}</div> <div>用户组:{{userInfo.authority&&userInfo.authority.authorityName}}</div>
</div> </div>
</el-row> </el-row>
</el-card> </el-card>
......
<template> <template>
<el-container class="layout-cont"> <el-container class="layout-cont">
<el-header class="header-cont"> <el-header class="header-cont">
<h1> <h1 class="fl-left">QMPlus gin-vue-admin</h1>
QMPlus gin-vue-admin <div class="fl-right right-box">
</h1> <el-dropdown>
<span class="el-dropdown-link">
<img :src="userInfo.headerImg" height="30" width="30" />
{{userInfo.nickName}}
<i class="el-icon-arrow-down"></i>
</span>
<el-dropdown-menu class="dropdown-group" slot="dropdown">
<el-dropdown-item>更多信息</el-dropdown-item>
<el-dropdown-item icon="el-icon-table-lamp" @click.native="LoginOut"> 登出</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
</el-header> </el-header>
<el-container> <el-container>
<el-aside class="main-cont main-left"> <el-aside class="main-cont main-left">
...@@ -29,17 +40,20 @@ ...@@ -29,17 +40,20 @@
<script> <script>
import Aside from '@/view/layout/aside' import Aside from '@/view/layout/aside'
import { mapGetters,mapMutations } from 'vuex'
export default { export default {
name: 'Layout', name: 'Layout',
components: { components: {
Aside Aside
}, },
methods: { methods: {
...mapMutations("user",['LoginOut']),
totalCollapse() { totalCollapse() {
this.$bus.emit('totalCollapse') this.$bus.emit('totalCollapse')
} }
}, },
computed: { computed: {
...mapGetters('user', ['userInfo']),
title() { title() {
return this.$route.meta.title || '当前页面' return this.$route.meta.title || '当前页面'
}, },
...@@ -51,13 +65,27 @@ export default { ...@@ -51,13 +65,27 @@ export default {
</script> </script>
<style lang="scss"> <style lang="scss">
$headerHigh: 52px; $headerHigh: 52px;
$mainHight: calc(100vh - 52px); $mainHight: calc(100vh - 52px);
.el-scrollbar__wrap{ .el-dropdown-link {
cursor: pointer;
}
.dropdown-group{
min-width: 100px;
}
.el-scrollbar__wrap {
padding-bottom: 17px; padding-bottom: 17px;
} }
.layout-cont { .layout-cont {
.right-box {
text-align: center;
vertical-align: middle;
img {
vertical-align: middle;
border:1px solid #ccc;
border-radius: 6px;
}
}
.menu-contorl { .menu-contorl {
line-height: 52px; line-height: 52px;
font-size: 20px; font-size: 20px;
...@@ -68,7 +96,7 @@ $mainHight: calc(100vh - 52px); ...@@ -68,7 +96,7 @@ $mainHight: calc(100vh - 52px);
.header-cont { .header-cont {
height: $headerHigh !important; height: $headerHigh !important;
background: #fff; background: #fff;
border-bottom:1px solid #ccc; border-bottom: 1px solid #ccc;
line-height: $headerHigh; line-height: $headerHigh;
} }
.main-cont { .main-cont {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册