修改菜单排序，修改根据用户角色查询菜单

app/public/adminMenu.js

@@ -1,17 +1,9 @@
 'use strict';
 module.exports = [
-  {
-    title: '站点配置',
-    path: '/wokes/webconfig',
-    id: '2-3',
-    icons: 'el-icon-user-solid',
-    parentId: '2',
-    module: '@wokes',
-  },
   {
     title: '内容管理',
-    path: '3',
-    id: '3',
+    path: '1',
+    id: '1',
     icons: 'el-icon-user-solid',
     parentId: '',
     module: '@wokes',
@@ -19,55 +11,56 @@ module.exports = [
   {
     title: '菜单管理',
     path: '/wokes/menu',
-    id: '3-1',
+    id: '1-1',
     icons: 'el-icon-user-solid',
-    parentId: '3',
+    parentId: '1',
     module: '@wokes',
   },
   {
     title: '栏目管理',
     path: '/wokes/column',
-    id: '3-2',
+    id: '1-2',
     icons: 'el-icon-user-solid',
-    parentId: '3',
+    parentId: '1',
     module: '@wokes',
   },
   {
     title: '文章管理',
     path: '/wokes/content',
-    id: '3-3',
+    id: '1-3',
     icons: 'el-icon-user-solid',
-    parentId: '3',
+    parentId: '1',
     module: '@wokes',
   },
   {
     title: '单页管理',
     path: '/wokes/pages',
-    id: '3-4',
+    id: '1-4',
     icons: 'el-icon-user-solid',
-    parentId: '3',
+    parentId: '1',
     module: '@wokes',
   },
   {
     title: '文件管理',
     path: '/wokes/files',
-    id: '3-5',
+    id: '1-5',
     icons: 'el-icon-user-solid',
-    parentId: '3',
+    parentId: '1',
     module: '@wokes',
   },
   {
     title: '资源管理',
     path: '/wokes/resource',
-    id: '3-6',
+    id: '1-6',
     icons: 'el-icon-user-solid',
-    parentId: '3',
+    parentId: '1',
     module: '@wokes',
   },
+  // 系统管理
   {
     title: '系统管理',
-    path: '1',
-    id: '1',
+    path: '2',
+    id: '2',
     icons: 'el-icon-user-solid',
     parentId: '',
     module: '@gaf',
@@ -75,47 +68,48 @@ module.exports = [
   {
     title: '系统用户',
     path: '/gaf/user',
-    id: '1-1',
+    id: '2-1',
     icons: 'el-icon-user-solid',
-    parentId: '1',
+    parentId: '2',
     module: '@gaf',
   },
   {
     title: '系统角色',
     path: '/gaf/role',
-    id: '1-2',
+    id: '2-2',
     icons: 'el-icon-user-solid',
-    parentId: '1',
+    parentId: '2',
     module: '@gaf',
   },
   {
     title: '用户授权',
     path: '/gaf/userpower',
-    id: '1-3',
+    id: '2-3',
     icons: 'el-icon-user-solid',
-    parentId: '1',
+    parentId: '2',
     module: '@gaf',
   },
   {
     title: '角色授权',
     path: '/gaf/rolepower',
-    id: '1-4',
+    id: '2-4',
     icons: 'el-icon-user-solid',
-    parentId: '1',
+    parentId: '2',
     module: '@gaf',
   },
   {
     title: '日志审计',
     path: '/gaf/log',
-    id: '1-5',
+    id: '2-5',
     icons: 'el-icon-user-solid',
-    parentId: '1',
+    parentId: '2',
     module: '@gaf',
   },
+  // 网站配置
   {
     title: '网站配置',
-    path: '2',
-    id: '2',
+    path: '3',
+    id: '3',
     icons: 'el-icon-user-solid',
     parentId: '',
     module: '@wokes',
@@ -123,17 +117,25 @@ module.exports = [
   {
     title: '轮播图配置',
     path: '/wokes/banner',
-    id: '2-1',
+    id: '3-1',
     icons: 'el-icon-user-solid',
-    parentId: '2',
+    parentId: '3',
     module: '@wokes',
   },
   {
     title: '友情链接配置',
     path: '/wokes/links',
-    id: '2-2',
+    id: '3-2',
     icons: 'el-icon-user-solid',
-    parentId: '2',
+    parentId: '3',
+    module: '@wokes',
+  },
+  {
+    title: '站点配置',
+    path: '/wokes/webconfig',
+    id: '3-3',
+    icons: 'el-icon-user-solid',
+    parentId: '3',
     module: '@wokes',
   },
 ];

app/service/power.js

@@ -43,8 +43,9 @@ class UserService extends Service {
             if (role.length > 0) {
               const adminMenuList = role[0].adminMenuList;
               for (let i = 0; i < adminMenuList.length; i++) {
-                if (!menulist.includes(adminMenuList[i])) {
-                  menulist.push(menu.filter(j => adminMenuList[i] === j.id)[0]);
+                const item = menu.filter(j => adminMenuList[i] === j.id)[0];
+                if (!menulist.includes(item)) {
+                  menulist.push(item);
                 }
               }
             }