Commit 85705417 authored by RuoYi's avatar RuoYi

优化固定Header后顶部导航栏样式问题(I4XDN5)

parent 0a3fcfd9
...@@ -101,6 +101,10 @@ export default { ...@@ -101,6 +101,10 @@ export default {
width: calc(100% - 54px); width: calc(100% - 54px);
} }
.sidebarHide .fixed-header {
width: calc(100%);
}
.mobile .fixed-header { .mobile .fixed-header {
width: 100%; width: 100%;
} }
......
...@@ -12,6 +12,9 @@ const state = { ...@@ -12,6 +12,9 @@ const state = {
const mutations = { const mutations = {
TOGGLE_SIDEBAR: state => { TOGGLE_SIDEBAR: state => {
if (state.sidebar.hide) {
return false;
}
state.sidebar.opened = !state.sidebar.opened state.sidebar.opened = !state.sidebar.opened
state.sidebar.withoutAnimation = false state.sidebar.withoutAnimation = false
if (state.sidebar.opened) { if (state.sidebar.opened) {
......
...@@ -51,7 +51,7 @@ const user = { ...@@ -51,7 +51,7 @@ const user = {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
getInfo().then(res => { getInfo().then(res => {
const user = res.user const user = res.user
const avatar = ( user.avatar == "" || user.avatar == null ) ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar; const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar;
if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组 if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
commit('SET_ROLES', res.roles) commit('SET_ROLES', res.roles)
commit('SET_PERMISSIONS', res.permissions) commit('SET_PERMISSIONS', res.permissions)
......
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