Forráskód Böngészése

菜单栏高亮,显示优化

yuwenjun1997 2 éve
szülő
commit
34e332de26

+ 2 - 2
src/api/caimei/home.js

@@ -3,6 +3,6 @@ import request from '@/utils/request'
 export function getDashboard() {
   return request({
     url: '/home/dashboard',
-    method: 'get',
+    method: 'get'
   })
-}
+}

+ 2 - 2
src/layout/components/Sidebar/SidebarItem.vue

@@ -69,8 +69,8 @@ export default {
       })
 
       // When there is only one child router, the child router is displayed by default
-      const useDefault = parent.meta ? parent.meta.useDefault : false
-      if (showingChildren.length === 1 && !useDefault) {
+      // const useDefault = parent.meta ? parent.meta.useDefault : false
+      if (showingChildren.length === 1) {
         return true
       }
 

+ 7 - 7
src/layout/components/Sidebar/index.vue

@@ -36,13 +36,13 @@ export default {
       if (meta.activeMenu) {
         return meta.activeMenu
       }
-      if (meta.hidden && route.redirectedFrom) {
-        return route.redirectedFrom
-      }
-      if (meta.hidden) {
-        const item = route.matched && route.matched.find((item) => item.redirect === route.path)
-        if (item) return item.path
-      }
+      // if (meta.hidden && route.redirectedFrom) {
+      //   return route.redirectedFrom
+      // }
+      // if (meta.hidden) {
+      //   const item = route.matched && route.matched.find((item) => item.redirect === route.path)
+      //   if (item) return item.path
+      // }
       return path
     },
     showLogo() {

+ 5 - 5
src/router/modules/finance.js

@@ -20,14 +20,14 @@ const financeRouter = {
           hidden: true,
           component: () => import('@/views/finance/receipt/list.vue'),
           name: 'ReceiptList',
-          meta: { title: '收款列表' }
+          meta: { title: '收款列表', activeMenu: '/finance/receipt' }
         },
         {
           path: 'detail',
           hidden: true,
           component: () => import('@/views/finance/receipt/detail.vue'),
           name: 'ReceiptDetail',
-          meta: { title: '收款详情', noCache: true }
+          meta: { title: '收款详情', noCache: true, activeMenu: '/finance/receipt' }
         }
       ]
     },
@@ -43,21 +43,21 @@ const financeRouter = {
           hidden: true,
           component: () => import('@/views/finance/receipt/users.vue'),
           name: 'ReceiptUserList',
-          meta: { title: '收款人权限' }
+          meta: { title: '收款人权限', activeMenu: '/finance/receipts' }
         },
         {
           path: 'user/edit',
           hidden: true,
           component: () => import('@/views/finance/receipt/user.vue'),
           name: 'ReceiptUserEdit',
-          meta: { title: '编辑收款人', noCache: true }
+          meta: { title: '编辑收款人', noCache: true, activeMenu: '/finance/receipts' }
         },
         {
           path: 'user/add',
           hidden: true,
           component: () => import('@/views/finance/receipt/user.vue'),
           name: 'ReceiptUserEdit',
-          meta: { title: '添加收款人', noCache: true }
+          meta: { title: '添加收款人', noCache: true, activeMenu: '/finance/receipts' }
         }
       ]
     }

+ 1 - 0
src/router/modules/keywordLibrary.js

@@ -35,6 +35,7 @@ const keywordLibraryRouter = {
       path: 'tag',
       name: 'TagMenu',
       redirect: '/library/tag/list',
+      alwaysShow: true,
       component: () => import('@/views/index'),
       meta: { title: '标签库', useDefault: true },
       children: [

+ 6 - 6
src/router/modules/product.js

@@ -20,21 +20,21 @@ const productRouter = {
           hidden: true,
           component: () => import('@/views/product/product/list.vue'),
           name: 'ProductList',
-          meta: { title: '商品列表' }
+          meta: { title: '商品列表', activeMenu: '/product/product' }
         },
         {
           path: 'edit',
           hidden: true,
           component: () => import('@/views/product/product/form.vue'),
           name: 'ProductEdit',
-          meta: { title: '编辑商品', noCache: true }
+          meta: { title: '编辑商品', noCache: true, activeMenu: '/product/product' }
         },
         {
           path: 'add',
           hidden: true,
           component: () => import('@/views/product/product/form.vue'),
           name: 'ProductEdit',
-          meta: { title: '添加商品', noCache: true }
+          meta: { title: '添加商品', noCache: true, activeMenu: '/product/product' }
         }
       ]
     },
@@ -50,21 +50,21 @@ const productRouter = {
           hidden: true,
           component: () => import('@/views/product/classify/list.vue'),
           name: 'ClassifyList',
-          meta: { title: '分类列表' }
+          meta: { title: '分类列表', activeMenu: '/product/classify' }
         },
         {
           path: 'edit',
           hidden: true,
           component: () => import('@/views/product/classify/form.vue'),
           name: 'ClassifyEdit',
-          meta: { title: '编辑分类', noCache: true }
+          meta: { title: '编辑分类', noCache: true, activeMenu: '/product/classify' }
         },
         {
           path: 'add',
           hidden: true,
           component: () => import('@/views/product/classify/form.vue'),
           name: 'ClassifyEdit',
-          meta: { title: '添加分类', noCache: true }
+          meta: { title: '添加分类', noCache: true, activeMenu: '/product/classify' }
         }
       ]
     }

+ 9 - 9
src/router/modules/sys.js

@@ -22,21 +22,21 @@ const sysRouter = {
           hidden: true,
           component: () => import('@/views/sys/menus/list.vue'),
           name: 'SysMenuList',
-          meta: { title: '菜单列表' }
+          meta: { title: '菜单列表', activeMenu: '/sys/menus' }
         },
         {
           path: 'edit',
           hidden: true,
           component: () => import('@/views/sys/menus/form.vue'),
           name: 'SysMenuEdit',
-          meta: { title: '编辑菜单', noCache: true }
+          meta: { title: '编辑菜单', noCache: true, activeMenu: '/sys/menus' }
         },
         {
           path: 'add',
           hidden: true,
           component: () => import('@/views/sys/menus/form.vue'),
           name: 'SysMenuEdit',
-          meta: { title: '添加菜单', noCache: true }
+          meta: { title: '添加菜单', noCache: true, activeMenu: '/sys/menus' }
         }
       ]
     },
@@ -52,21 +52,21 @@ const sysRouter = {
           hidden: true,
           component: () => import('@/views/sys/roles/list.vue'),
           name: 'SysRoleList',
-          meta: { title: '角色列表' }
+          meta: { title: '角色列表', activeMenu: '/sys/roles' }
         },
         {
           path: 'edit',
           hidden: true,
           component: () => import('@/views/sys/roles/form.vue'),
           name: 'SysRoleEdit',
-          meta: { title: '编辑角色', noCache: true }
+          meta: { title: '编辑角色', noCache: true, activeMenu: '/sys/roles' }
         },
         {
           path: 'add',
           hidden: true,
           component: () => import('@/views/sys/roles/form.vue'),
           name: 'SysRoleEdit',
-          meta: { title: '添加角色', noCache: true }
+          meta: { title: '添加角色', noCache: true, activeMenu: '/sys/roles' }
         }
       ]
     },
@@ -82,21 +82,21 @@ const sysRouter = {
           hidden: true,
           component: () => import('@/views/sys/users/list.vue'),
           name: 'SysUserList',
-          meta: { title: '用户列表' }
+          meta: { title: '用户列表', activeMenu: '/sys/users' }
         },
         {
           path: 'add',
           hidden: true,
           component: () => import('@/views/sys/users/form.vue'),
           name: 'SysUserEdit',
-          meta: { title: '添加用户', noCache: true }
+          meta: { title: '添加用户', noCache: true, activeMenu: '/sys/users' }
         },
         {
           path: 'edit',
           hidden: true,
           component: () => import('@/views/sys/users/form.vue'),
           name: 'SysUserEdit',
-          meta: { title: '编辑用户', noCache: true }
+          meta: { title: '编辑用户', noCache: true, activeMenu: '/sys/users' }
         }
       ]
     },

+ 6 - 6
src/router/modules/webPage.js

@@ -20,21 +20,21 @@ const webPageRouter = {
           hidden: true,
           component: () => import('@/views/web/page/list.vue'),
           name: 'WebPageList',
-          meta: { title: '页面列表' }
+          meta: { title: '页面列表', activeMenu: '/web/page' }
         },
         {
           path: 'edit',
           hidden: true,
           component: () => import('@/views/web/page/form.vue'),
           name: 'WebPageEdit',
-          meta: { title: '编辑页面', noCache: true }
+          meta: { title: '编辑页面', noCache: true, activeMenu: '/web/page' }
         },
         {
           path: 'add',
           hidden: true,
           component: () => import('@/views/web/page/form.vue'),
           name: 'WebPageEdit',
-          meta: { title: '添加页面', noCache: true }
+          meta: { title: '添加页面', noCache: true, activeMenu: '/web/page' }
         }
       ]
     },
@@ -50,21 +50,21 @@ const webPageRouter = {
           hidden: true,
           component: () => import('@/views/web/help/list.vue'),
           name: 'HelpPageList',
-          meta: { title: '帮助页' }
+          meta: { title: '帮助页', activeMenu: '/web/help' }
         },
         {
           path: 'edit',
           hidden: true,
           component: () => import('@/views/web/help/form.vue'),
           name: 'HelpPageEdit',
-          meta: { title: '编辑帮助页', noCache: true }
+          meta: { title: '编辑帮助页', noCache: true, activeMenu: '/web/help' }
         },
         {
           path: 'add',
           hidden: true,
           component: () => import('@/views/web/help/form.vue'),
           name: 'HelpPageEdit',
-          meta: { title: '添加帮助页', noCache: true }
+          meta: { title: '添加帮助页', noCache: true, activeMenu: '/web/help' }
         }
       ]
     }

+ 24 - 24
src/router/modules/wechat.js

@@ -29,21 +29,21 @@ const wechatRouter = {
               hidden: true,
               component: () => import('@/views/wechat/caimei/menus/list.vue'),
               name: 'WeChatCmMenuList',
-              meta: { title: '菜单列表' }
+              meta: { title: '菜单列表', activeMenu: '/wechat/caimei/menus' }
             },
             {
               path: 'edit',
               hidden: true,
               component: () => import('@/views/wechat/caimei/menus/form.vue'),
               name: 'WeChatCmMenuEdit',
-              meta: { title: '编辑菜单', noCache: true }
+              meta: { title: '编辑菜单', noCache: true, activeMenu: '/wechat/caimei/menus' }
             },
             {
               path: 'add',
               hidden: true,
               component: () => import('@/views/wechat/caimei/menus/form.vue'),
               name: 'WeChatCmMenuEdit',
-              meta: { title: '添加菜单', noCache: true }
+              meta: { title: '添加菜单', noCache: true, activeMenu: '/wechat/caimei/menus' }
             }
           ]
         },
@@ -59,21 +59,21 @@ const wechatRouter = {
               hidden: true,
               component: () => import('@/views/wechat/caimei/reply/list.vue'),
               name: 'WeChatCmReplyList',
-              meta: { title: '回复配置列表' }
+              meta: { title: '回复配置列表', activeMenu: '/wechat/caimei/reply' }
             },
             {
               path: 'edit',
               hidden: true,
               component: () => import('@/views/wechat/caimei/reply/form.vue'),
               name: 'WeChatCmReplyEdit',
-              meta: { title: '编辑回复配置', noCache: true }
+              meta: { title: '编辑回复配置', noCache: true, activeMenu: '/wechat/caimei/reply' }
             },
             {
               path: 'add',
               hidden: true,
               component: () => import('@/views/wechat/caimei/reply/form.vue'),
               name: 'WeChatCmReplyEdit',
-              meta: { title: '添加回复配置', noCache: true }
+              meta: { title: '添加回复配置', noCache: true, activeMenu: '/wechat/caimei/reply' }
             }
           ]
         },
@@ -89,21 +89,21 @@ const wechatRouter = {
               hidden: true,
               component: () => import('@/views/wechat/caimei/text/list.vue'),
               name: 'WeChatCmTextList',
-              meta: { title: '文本素材列表' }
+              meta: { title: '文本素材列表', activeMenu: '/wechat/caimei/text' }
             },
             {
               path: 'edit',
               hidden: true,
               component: () => import('@/views/wechat/caimei/text/form.vue'),
               name: 'WeChatCmTextEdit',
-              meta: { title: '编辑文本素材', noCache: true }
+              meta: { title: '编辑文本素材', noCache: true, activeMenu: '/wechat/caimei/text' }
             },
             {
               path: 'add',
               hidden: true,
               component: () => import('@/views/wechat/caimei/text/form.vue'),
               name: 'WeChatCmTextEdit',
-              meta: { title: '添加文本素材', noCache: true }
+              meta: { title: '添加文本素材', noCache: true, activeMenu: '/wechat/caimei/text' }
             }
           ]
         },
@@ -119,21 +119,21 @@ const wechatRouter = {
               hidden: true,
               component: () => import('@/views/wechat/caimei/article/list.vue'),
               name: 'WeChatCmArticleList',
-              meta: { title: '图文素材列表' }
+              meta: { title: '图文素材列表', activeMenu: '/wechat/caimei/article' }
             },
             {
               path: 'edit',
               hidden: true,
               component: () => import('@/views/wechat/caimei/article/form.vue'),
               name: 'WeChatCmArticleEdit',
-              meta: { title: '编辑图文素材', noCache: true }
+              meta: { title: '编辑图文素材', noCache: true, activeMenu: '/wechat/caimei/article' }
             },
             {
               path: 'add',
               hidden: true,
               component: () => import('@/views/wechat/caimei/article/form.vue'),
               name: 'WeChatCmArticleEdit',
-              meta: { title: '添加图文素材', noCache: true }
+              meta: { title: '添加图文素材', noCache: true, activeMenu: '/wechat/caimei/article' }
             }
           ]
         }
@@ -158,21 +158,21 @@ const wechatRouter = {
               hidden: true,
               component: () => import('@/views/wechat/hehe/menus/list.vue'),
               name: 'WeChatHeMenuList',
-              meta: { title: '菜单列表' }
+              meta: { title: '菜单列表', activeMenu: '/wechat/hehe/menus' }
             },
             {
               path: 'edit',
               hidden: true,
               component: () => import('@/views/wechat/hehe/menus/form.vue'),
               name: 'WeChatHeMenuEdit',
-              meta: { title: '编辑菜单' }
+              meta: { title: '编辑菜单', activeMenu: '/wechat/hehe/menus' }
             },
             {
               path: 'add',
               hidden: true,
               component: () => import('@/views/wechat/hehe/menus/form.vue'),
               name: 'WeChatHeMenuEdit',
-              meta: { title: '添加菜单' }
+              meta: { title: '添加菜单', activeMenu: '/wechat/hehe/menus' }
             }
           ]
         },
@@ -188,21 +188,21 @@ const wechatRouter = {
               hidden: true,
               component: () => import('@/views/wechat/hehe/reply/list.vue'),
               name: 'WeChatHeReplyList',
-              meta: { title: '回复配置列表' }
+              meta: { title: '回复配置列表', activeMenu: '/wechat/hehe/reply' }
             },
             {
               path: 'edit',
               hidden: true,
               component: () => import('@/views/wechat/hehe/reply/form.vue'),
               name: 'WeChatHeReplyEdit',
-              meta: { title: '编辑回复配置' }
+              meta: { title: '编辑回复配置', activeMenu: '/wechat/hehe/reply' }
             },
             {
               path: 'add',
               hidden: true,
               component: () => import('@/views/wechat/hehe/reply/form.vue'),
               name: 'WeChatHeReplyEdit',
-              meta: { title: '添加回复配置' }
+              meta: { title: '添加回复配置', activeMenu: '/wechat/hehe/reply' }
             }
           ]
         },
@@ -218,21 +218,21 @@ const wechatRouter = {
               hidden: true,
               component: () => import('@/views/wechat/hehe/text/list.vue'),
               name: 'WeChatHeTextList',
-              meta: { title: '文本素材列表' }
+              meta: { title: '文本素材列表', activeMenu: '/wechat/hehe/text' }
             },
             {
               path: 'edit',
               hidden: true,
               component: () => import('@/views/wechat/hehe/text/form.vue'),
               name: 'WeChatHeTextEdit',
-              meta: { title: '编辑文本素材' }
+              meta: { title: '编辑文本素材', activeMenu: '/wechat/hehe/text' }
             },
             {
               path: 'add',
               hidden: true,
               component: () => import('@/views/wechat/hehe/text/form.vue'),
               name: 'WeChatHeTextEdit',
-              meta: { title: '添加文本素材' }
+              meta: { title: '添加文本素材', activeMenu: '/wechat/hehe/text' }
             }
           ]
         },
@@ -248,21 +248,21 @@ const wechatRouter = {
               hidden: true,
               component: () => import('@/views/wechat/hehe/article/list.vue'),
               name: 'WeChatHeArticleList',
-              meta: { title: '图文素材列表' }
+              meta: { title: '图文素材列表', activeMenu: '/wechat/hehe/article' }
             },
             {
               path: 'edit',
               hidden: true,
               component: () => import('@/views/wechat/hehe/article/form.vue'),
               name: 'WeChatHeArticleEdit',
-              meta: { title: '编辑图文素材' }
+              meta: { title: '编辑图文素材', activeMenu: '/wechat/hehe/article' }
             },
             {
               path: 'add',
               hidden: true,
               component: () => import('@/views/wechat/hehe/article/form.vue'),
               name: 'WeChatHeArticleEdit',
-              meta: { title: '添加图文素材' }
+              meta: { title: '添加图文素材', activeMenu: '/wechat/hehe/article' }
             }
           ]
         }

+ 0 - 2
src/store/modules/permission.js

@@ -33,8 +33,6 @@ export function filterAsyncRoutes(routes, menus) {
       if (!tmp.hidden) {
         tmp.meta.title = meun.title
         tmp.sort = meun.sort
-      } else {
-        tmp.meta.hidden = true
       }
       if (meun.icon) {
         tmp.meta.icon = meun.icon

+ 1 - 1
src/views/dashboard/index.vue

@@ -66,10 +66,10 @@ import { getDashboard } from '@/api/caimei/home'
 import CountTo from 'vue-count-to'
 
 export default {
+  name: 'Dashboard',
   components: {
     CountTo
   },
-  name: 'Dashboard',
   data() {
     return {
       users: 0,