From 857054179ce0a75b3c6486ab60d4e7ea52e8fc49 Mon Sep 17 00:00:00 2001 From: RuoYi <yzz_ivy@163.com> Date: 星期四, 17 三月 2022 09:42:39 +0800 Subject: [PATCH] 优化固定Header后顶部导航栏样式问题(I4XDN5) --- ruoyi-ui/src/store/modules/user.js | 2 +- ruoyi-ui/src/layout/index.vue | 4 ++++ ruoyi-ui/src/store/modules/app.js | 3 +++ 3 files changed, 8 insertions(+), 1 deletions(-) diff --git a/ruoyi-ui/src/layout/index.vue b/ruoyi-ui/src/layout/index.vue index 45844fd..9540aa4 100644 --- a/ruoyi-ui/src/layout/index.vue +++ b/ruoyi-ui/src/layout/index.vue @@ -101,6 +101,10 @@ width: calc(100% - 54px); } + .sidebarHide .fixed-header { + width: calc(100%); + } + .mobile .fixed-header { width: 100%; } diff --git a/ruoyi-ui/src/store/modules/app.js b/ruoyi-ui/src/store/modules/app.js index e506730..5a0ed6c 100644 --- a/ruoyi-ui/src/store/modules/app.js +++ b/ruoyi-ui/src/store/modules/app.js @@ -12,6 +12,9 @@ const mutations = { TOGGLE_SIDEBAR: state => { + if (state.sidebar.hide) { + return false; + } state.sidebar.opened = !state.sidebar.opened state.sidebar.withoutAnimation = false if (state.sidebar.opened) { diff --git a/ruoyi-ui/src/store/modules/user.js b/ruoyi-ui/src/store/modules/user.js index 2395319..75c0c57 100644 --- a/ruoyi-ui/src/store/modules/user.js +++ b/ruoyi-ui/src/store/modules/user.js @@ -51,7 +51,7 @@ return new Promise((resolve, reject) => { getInfo().then(res => { 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) { // 楠岃瘉杩斿洖鐨剅oles鏄惁鏄竴涓潪绌烘暟缁� commit('SET_ROLES', res.roles) commit('SET_PERMISSIONS', res.permissions) -- Gitblit v1.9.3