Browse Source

菜单整理

lilei 4 years ago
parent
commit
c71b3204e3
2 changed files with 215 additions and 232 deletions
  1. 214 231
      src/config/router.config.js
  2. 1 1
      src/views/shop/shopOrder.vue

+ 214 - 231
src/config/router.config.js

@@ -50,112 +50,112 @@ export const asyncRouterMap = [{
     redirect: '/shop/order',
     component: PageView,
     meta: {
-      title: '商',
+      title: '商',
       icon: 'shop',
       permission: 'M_shop'
     },
-    children: [{
-      path: '/shop/order',
-      redirect: '/shop/order/list',
-      name: 'shopOrder',
-      component: RouteView,
-      meta: {
-        title: '订单管理',
-        icon: 'profile'
-        // permission: 'M_tenants_list'
-      },
-      hideChildrenInMenu: true,
-      children: [{
-        path: '/shop/order/list',
-        name: 'shopOrderList',
-        component: () => import(/* webpackChunkName: "tenants" */ '@/views/shop/shopOrder.vue'),
+    children: [
+      {
+        path: '/shop/goods',
+        redirect: '/shop/goods/list',
+        name: 'goodsList',
+        component: RouteView,
         meta: {
-          title: '订单列表',
-          icon: 'profile',
-          hidden: true
-          // permission: 'M_tenants_list'
+          title: '商品管理',
+          icon: 'shopping',
+          permission: 'M_goodsManage_list'
+        },
+        hideChildrenInMenu: true,
+        children: [{
+          path: '/shop/goods/list',
+          name: 'goodsListList',
+          component: () => import(/* webpackChunkName: "tenants" */ '@/views/shop/goodsList.vue'),
+          meta: {
+            title: '商品列表',
+            icon: 'shopping',
+            hidden: true,
+            permission: 'M_goodsManage_list'
+          }
+        },
+        {
+          path: '/shop/goods/add',
+          name: 'goodsListAdd',
+          component: () => import(/* webpackChunkName: "tenants" */ '@/views/shop/goodsEdit.vue'),
+          meta: {
+            title: '新增商品',
+            icon: 'shopping',
+            hidden: true,
+            permission: 'B_goodsManage_add'
+          }
+        },
+        {
+          path: '/shop/goods/edit/:id',
+          name: 'goodsListEdit',
+          component: () => import(/* webpackChunkName: "tenants" */ '@/views/shop/goodsEdit.vue'),
+          meta: {
+            title: '编辑商品',
+            icon: 'shopping',
+            hidden: true,
+            permission: 'B_goodsManage_edit'
+          }
         }
+        ]
       },
       {
-        path: '/shop/order/detail/:id',
-        name: 'shopOrderDetail',
-        component: () => import(/* webpackChunkName: "tenants" */ '@/views/shop/orderDetail.vue'),
+        path: '/shop/goodsShelves',
+        name: 'goodsShelves',
+        component: () => import(/* webpackChunkName: "tenants" */ '@/views/shop/goodsShelves.vue'),
         meta: {
-          title: '订单详情',
-          icon: 'profile',
-          hidden: true
-          // permission: 'M_tenants_list'
+          title: '商品排序',
+          icon: 'flag',
+          permission: 'M_goodsShelves_0'
         }
-      }
-      ]
-    },
-
-    {
-      path: '/shop/goods',
-      redirect: '/shop/goods/list',
-      name: 'goodsList',
-      component: RouteView,
-      meta: {
-        title: '商品管理',
-        icon: 'shopping',
-        permission: 'M_goodsManage_list'
       },
-      hideChildrenInMenu: true,
-      children: [{
-        path: '/shop/goods/list',
-        name: 'goodsListList',
-        component: () => import(/* webpackChunkName: "tenants" */ '@/views/shop/goodsList.vue'),
+      {
+        path: '/shopSetting/goodsClass',
+        name: 'goodsClass',
+        component: () => import(/* webpackChunkName: "tenants" */ '@/views/shopSetting/goodsClass.vue'),
         meta: {
-          title: '商品列表',
-          icon: 'shopping',
-          hidden: true,
-          permission: 'M_goodsManage_list'
+          title: '商品分类管理',
+          icon: 'folder',
+          permission: 'M_goodsClass_list'
         }
-      },
+      }
+    ]
+  },
+  {
+    path: '/order',
+    redirect: '/order/list',
+    name: 'shopOrder',
+    component: PageView,
+    meta: {
+      title: '订单',
+      icon: 'profile'
+      // permission: 'M_tenants_list'
+    },
+    hideChildrenInMenu: true,
+    children: [
       {
-        path: '/shop/goods/add',
-        name: 'goodsListAdd',
-        component: () => import(/* webpackChunkName: "tenants" */ '@/views/shop/goodsEdit.vue'),
+        path: '/order/list',
+        name: 'shopOrderList',
+        component: () => import(/* webpackChunkName: "tenants" */ '@/views/shop/shopOrder.vue'),
         meta: {
-          title: '新增商品',
-          icon: 'shopping',
-          hidden: true,
-          permission: 'B_goodsManage_add'
+          title: '订单管理',
+          icon: 'profile'
+        // permission: 'M_tenants_list'
         }
       },
       {
-        path: '/shop/goods/edit/:id',
-        name: 'goodsListEdit',
-        component: () => import(/* webpackChunkName: "tenants" */ '@/views/shop/goodsEdit.vue'),
+        path: '/order/detail/:id',
+        name: 'shopOrderDetail',
+        component: () => import(/* webpackChunkName: "tenants" */ '@/views/shop/orderDetail.vue'),
         meta: {
-          title: '编辑商品',
-          icon: 'shopping',
-          hidden: true,
-          permission: 'B_goodsManage_edit'
+          title: '订单详情',
+          icon: 'profile',
+          hidden: true
+        // permission: 'M_tenants_list'
         }
       }
-      ]
-    },
-    {
-      path: '/shop/goodsShelves',
-      name: 'goodsShelves',
-      component: () => import(/* webpackChunkName: "tenants" */ '@/views/shop/goodsShelves.vue'),
-      meta: {
-        title: '商品排序',
-        icon: 'flag',
-        permission: 'M_goodsShelves_0'
-      }
-    },
-    {
-      path: '/shop/bannerSetting',
-      name: 'bannerSetting',
-      component: () => import(/* webpackChunkName: "appSetting" */ '@/views/shop/bannerSetting.vue'),
-      meta: {
-        title: '推广位设置',
-        icon: 'file-image',
-        permission: 'M_AdBanner_list'
-      }
-    }
     ]
   },
   // 用户
@@ -168,83 +168,84 @@ export const asyncRouterMap = [{
       icon: 'shop'
       // permission: 'M_shop'
     },
-    children: [{
-      path: '/userInfo/userManage',
-      redirect: '/userInfo/userManageList/list',
-      name: 'userManageList',
-      component: RouteView,
-      meta: {
-        title: '用户管理',
-        icon: 'profile'
-        // permission: 'M_tenants_list'
-      },
-      hideChildrenInMenu: true,
-      children: [{
-        path: '/userInfo/userManageList/list',
+    children: [
+      {
+        path: '/userInfo/userManage',
+        redirect: '/userInfo/userManageList/list',
         name: 'userManageList',
-        component: () => import(/* webpackChunkName: "tenants" */ '@/views/userInfo/userManageList.vue'),
+        component: RouteView,
         meta: {
-          title: '用户列表',
-          icon: 'profile',
-          hidden: true
+          title: '用户管理',
+          icon: 'profile'
+        // permission: 'M_tenants_list'
+        },
+        hideChildrenInMenu: true,
+        children: [{
+          path: '/userInfo/userManageList/list',
+          name: 'userManageList',
+          component: () => import(/* webpackChunkName: "tenants" */ '@/views/userInfo/userManageList.vue'),
+          meta: {
+            title: '用户列表',
+            icon: 'profile',
+            hidden: true
           // permission: 'M_tenants_list'
-        }
-      },
-      {
-        path: '/userInfo/userManageList_user/detail/:id',
-        name: 'userManageDetail',
-        component: () => import(/* webpackChunkName: "tenants" */ '@/views/userInfo/userDetails.vue'),
-        meta: {
-          title: '用户详情',
-          icon: 'profile',
-          hidden: true
+          }
+        },
+        {
+          path: '/userInfo/userManageList_user/detail/:id',
+          name: 'userManageDetail',
+          component: () => import(/* webpackChunkName: "tenants" */ '@/views/userInfo/userDetails.vue'),
+          meta: {
+            title: '用户详情',
+            icon: 'profile',
+            hidden: true
           // permission: 'M_tenants_list'
+          }
+        },
+        {
+          path: '/userInfo/userManageList_Ld/detail/:id',
+          name: 'ledouDetail',
+          component: () => import(/* webpackChunkName: "tenants" */ '@/views/userInfo/LdDetails.vue'),
+          meta: {
+            title: '乐豆详情',
+            icon: 'profile',
+            hidden: true
+          // permission: 'M_tenants_list'
+          }
         }
+        ]
       },
       {
-        path: '/userInfo/userManageList_Ld/detail/:id',
-        name: 'ledouDetail',
-        component: () => import(/* webpackChunkName: "tenants" */ '@/views/userInfo/LdDetails.vue'),
+        path: '/userInfo/releaseRecord/list',
+        name: 'releaseRecordList',
+        component: () => import(/* webpackChunkName: "tenants" */ '@/views/releaseRecord/releaseRecordList.vue'),
         meta: {
-          title: '乐豆详情',
-          icon: 'profile',
-          hidden: true
+          title: '投放记录',
+          icon: 'profile'
           // permission: 'M_tenants_list'
         }
-      }
-      ]
-    }]
+      }]
   },
   {
-    path: '/businessManage',
-    redirect: '/businessManag/userManage',
+    path: '/shopSetting',
+    redirect: '/shopSetting/bannerSetting',
     component: PageView,
     meta: {
-      title: '智享店管理',
+      title: '商城设置',
       icon: 'appstore',
-      permission: 'M_partnerManage'
-    },
-    children: [{
-      path: '/businessManage/userManage',
-      name: 'userManage',
-      component: () => import(/* webpackChunkName: "tenants" */ '@/views/businessManage/userManage/userManage.vue'),
-      meta: {
-        title: '用户管理',
-        icon: 'folder'
-        // permission: 'M_tenants_list'
-      }
+      permission: 'M_shopSetting'
     },
-    {
-      path: '/businessManage/partnerManage',
-      name: 'partnerManage',
-      component: () => import(/* webpackChunkName: "tenants" */
-        '@/views/businessManage/partnerManage/partnerManage.vue'),
-      meta: {
-        title: '销售商管理',
-        icon: 'solution',
-        permission: 'M_partnerManage_list'
+    children: [
+      {
+        path: '/shopSetting/bannerSetting',
+        name: 'bannerSetting',
+        component: () => import(/* webpackChunkName: "appSetting" */ '@/views/shop/bannerSetting.vue'),
+        meta: {
+          title: '推广位设置',
+          icon: 'file-image'
+          // permission: 'M_AdBanner_list'
+        }
       }
-    }
     ]
   },
   {
@@ -252,7 +253,7 @@ export const asyncRouterMap = [{
     redirect: '/equipmentManage/network',
     component: PageView,
     meta: {
-      title: '网点设备管理',
+      title: '网点/设备',
       icon: 'shop'
       // permission: 'M_tenants_list'
     },
@@ -311,56 +312,57 @@ export const asyncRouterMap = [{
     ]
   },
   {
-    path: '/releaseRecord',
-    name: 'releaseRecord',
+    path: '/businessManage',
+    redirect: '/businessManag/userManage',
     component: PageView,
-    hideChildrenInMenu: true,
-    redirect: '/releaseRecord/list',
     meta: {
-      title: '投放记录',
-      icon: 'shop'
-      // permission: 'M_tenants_list'
+      title: '乐享亭',
+      icon: 'appstore',
+      permission: 'M_partnerManage'
     },
-    children: [{
-      path: '/releaseRecord/list',
-      name: 'releaseRecordList',
-      component: () => import(/* webpackChunkName: "tenants" */ '@/views/releaseRecord/releaseRecordList.vue'),
-      meta: {
-        title: '投放记录',
-        icon: 'profile'
+    children: [
+      {
+        path: '/businessManage/partnerManage',
+        name: 'partnerManage',
+        component: () => import(/* webpackChunkName: "businessManage" */ '@/views/businessManage/partnerManage/partnerManage.vue'),
+        meta: {
+          title: '商户管理',
+          icon: 'solution',
+          permission: 'M_partnerManage_list'
+        }
+      },
+      {
+        path: '/businessManage/userManage',
+        name: 'userManage',
+        component: () => import(/* webpackChunkName: "businessManage" */ '@/views/businessManage/userManage/userManage.vue'),
+        meta: {
+          title: '用户管理',
+          icon: 'folder'
         // permission: 'M_tenants_list'
+        }
       }
-    }]
+    ]
   },
   {
-    path: '/shopSetting',
-    redirect: '/shopSetting/bannerSetting',
+    path: '/supplier',
+    redirect: '/supplier/list',
     component: PageView,
     meta: {
-      title: '商城设置',
+      title: '供货商',
       icon: 'appstore',
       permission: 'M_shopSetting'
     },
-    children: [{
-      path: '/shopSetting/goodsClass',
-      name: 'goodsClass',
-      component: () => import(/* webpackChunkName: "tenants" */ '@/views/shopSetting/goodsClass.vue'),
-      meta: {
-        title: '商品分类管理',
-        icon: 'folder',
-        permission: 'M_goodsClass_list'
-      }
-    },
-    {
-      path: '/shopSetting/supplier',
-      name: 'supplier',
-      component: () => import(/* webpackChunkName: "tenants" */ '@/views/shopSetting/supplier.vue'),
-      meta: {
-        title: '供货商管理',
-        icon: 'solution',
-        permission: 'M_supplier_list'
+    children: [
+      {
+        path: '/supplier/list',
+        name: 'supplier',
+        component: () => import(/* webpackChunkName: "supplier" */ '@/views/shopSetting/supplier.vue'),
+        meta: {
+          title: '供货商管理',
+          icon: 'solution',
+          permission: 'M_supplier_list'
+        }
       }
-    }
     ]
   },
   // auth
@@ -373,36 +375,37 @@ export const asyncRouterMap = [{
       icon: 'lock'
       // permission: 'M_auth_0'
     },
-    children: [{
-      path: '/menusAuth/menu',
-      name: 'powerMenu',
-      component: () => import(/* webpackChunkName: "auth" */ '@/views/power/menu/menu.vue'),
-      meta: {
-        title: '菜单管理',
-        icon: 'profile'
-        // permission: 'M_menusAuth_menu'
-      }
-    },
-    {
-      path: '/auth/userList',
-      name: 'powerUserList',
-      component: () => import(/* webpackChunkName: "auth" */ '@/views/power/user/userList.vue'),
-      meta: {
-        title: '用户管理',
-        icon: 'user'
+    children: [
+      {
+        path: '/auth/userList',
+        name: 'powerUserList',
+        component: () => import(/* webpackChunkName: "auth" */ '@/views/power/user/userList.vue'),
+        meta: {
+          title: '用户管理',
+          icon: 'user'
         // permission: 'M_auth_userList'
-      }
-    },
-    {
-      path: '/auth/roleList',
-      name: 'powerRoleList',
-      component: () => import(/* webpackChunkName: "auth" */ '@/views/power/role/roleList.vue'),
-      meta: {
-        title: '角色管理',
-        icon: 'solution'
+        }
+      },
+      {
+        path: '/auth/roleList',
+        name: 'powerRoleList',
+        component: () => import(/* webpackChunkName: "auth" */ '@/views/power/role/roleList.vue'),
+        meta: {
+          title: '角色管理',
+          icon: 'solution'
         // permission: 'M_auth_roleList'
+        }
+      },
+      {
+        path: '/menusAuth/menu',
+        name: 'powerMenu',
+        component: () => import(/* webpackChunkName: "auth" */ '@/views/power/menu/menu.vue'),
+        meta: {
+          title: '菜单管理',
+          icon: 'profile'
+          // permission: 'M_menusAuth_menu'
+        }
       }
-    }
     ]
   },
   {
@@ -425,26 +428,6 @@ export const asyncRouterMap = [{
         // permission: 'M_sys_dataDictionary'
       }
     },
-    // {
-    //   path: '/setting/register',
-    //   name: 'powerRegister',
-    //   component: () => import(/* webpackChunkName: "setting" */ '@/views/power/register/register.vue'),
-    //   meta: {
-    //     title: '参数管理',
-    //     icon: 'key'
-    //     // permission: 'M_sys_register'
-    //   }
-    // },
-    // {
-    //   path: '/setting/jobs',
-    //   name: 'powerJobs',
-    //   component: () => import(/* webpackChunkName: "setting" */ '@/views/power/job/jobs.vue'),
-    //   meta: {
-    //     title: '定时器',
-    //     icon: 'alert',
-    //     permission: 'M_sys_job'
-    //   }
-    // },
     {
       path: '/setting/OperateJournal',
       name: 'powerOperateJournal',

+ 1 - 1
src/views/shop/shopOrder.vue

@@ -155,7 +155,7 @@ export default {
     },
     //  查看详情
     handleView (row) {
-      this.$router.push({ path: `/shop/order/detail/${row.id}` })
+      this.$router.push({ path: `/order/detail/${row.id}` })
     },
     // 重置
     handleReset () {