Explorar el Código

数据分离,权限控制

wenjie hace 6 meses
padre
commit
21f02711e2
Se han modificado 31 ficheros con 1713 adiciones y 1538 borrados
  1. 68 1
      src/api/auth.js
  2. 7 1
      src/main.js
  3. 1 3
      src/permission.js
  4. 1309 1309
      src/router/index.js
  5. 1 0
      src/store/getters.js
  6. 31 6
      src/store/modules/user.js
  7. 17 34
      src/views/authorityManage/menuList.vue
  8. 17 4
      src/views/authorityManage/roleList.vue
  9. 157 100
      src/views/authorityManage/userList.vue
  10. 6 5
      src/views/operationManage/activityManage/index.vue
  11. 3 3
      src/views/operationManage/advertisingManage/index.vue
  12. 3 3
      src/views/operationManage/appMenuManage/index.vue
  13. 3 3
      src/views/operationManage/bannerManage/index.vue
  14. 5 4
      src/views/operationManage/comboManage/index.vue
  15. 2 2
      src/views/operationManage/comboManage/logList.vue
  16. 2 2
      src/views/operationManage/comboManage/vipActivation.vue
  17. 5 2
      src/views/operationManage/couponManage/index.vue
  18. 1 1
      src/views/operationManage/financeManage/withdraw.vue
  19. 23 9
      src/views/operationManage/goodsManage/goodsDetail.vue
  20. 4 4
      src/views/operationManage/goodsManage/homeGoodsSet.vue
  21. 7 6
      src/views/operationManage/goodsManage/index.vue
  22. 11 11
      src/views/operationManage/goodsManage/labelList.vue
  23. 2 2
      src/views/operationManage/goodsManage/productLibrary.vue
  24. 3 3
      src/views/operationManage/goodsType/index.vue
  25. 5 4
      src/views/operationManage/luckyDrawManage/index.vue
  26. 3 3
      src/views/operationManage/marketingManage/index.vue
  27. 3 3
      src/views/operationManage/marketingManage/invitePromotion/index.vue
  28. 1 1
      src/views/operationManage/orderManage/index.vue
  29. 2 2
      src/views/operationManage/orderManage/list.vue
  30. 6 3
      src/views/operationManage/shopManage/index.vue
  31. 5 4
      src/views/operationManage/templateManage/index.vue

+ 68 - 1
src/api/auth.js

@@ -2,7 +2,7 @@
  * @Author: error: error: git config user.name & please set dead value or install git && error: git config user.email & please set dead value or install git & please set dead value or install git
  * @Date: 2021-07-15 12:26:02
  * @LastEditors: wenjie 1454560336@qq.com
- * @LastEditTime: 2024-11-14 09:44:09
+ * @LastEditTime: 2024-11-22 14:41:47
  * @FilePath: \admin-manage\src\api\auth.js
  * @Description: 
  * 
@@ -91,6 +91,25 @@ export function delMenu(params) {
   })
 }
 
+// 获取权限菜单
+export function getMenuAuth(params) {
+  return request({
+      url: '/zswl-cloud-shop/authRoleEmployee/getAuth',
+      method: 'get',
+      params
+  })
+}
+
+// 获取权限按钮
+export function getAuthButton(params) {
+  return request({
+      url: '/zswl-cloud-shop/authRoleEmployee/getAuthButton',
+      method: 'get',
+      params
+  })
+}
+
+
 // 角色列表
 export function authRoleList(params) {
   return request({
@@ -117,3 +136,51 @@ export function addOrUpdateAuthRole(data) {
       data
   })
 }
+
+// 获取全部角色
+export function getAllRole(params) {
+  return request({
+      url: '/zswl-cloud-shop/authRole/data',
+      method: 'get',
+      params
+  })
+}
+
+
+
+// 用户列表
+export function getUserList(params) {
+  return request({
+      url: '/zswl-cloud-shop/authRoleEmployee/search',
+      method: 'get',
+      params
+  })
+}
+
+// 添加用户
+export function addUser(data) {
+  return request({
+      url: '/zswl-cloud-shop/authRoleEmployee/add',
+      method: 'post',
+      data
+  })
+}
+
+// 编辑用户
+export function updateUser(data) {
+  return request({
+      url: '/zswl-cloud-shop/authRoleEmployee/update',
+      method: 'post',
+      data
+  })
+}
+
+// 启用用户
+export function enableUser(params) {
+  console.log(params);
+  return request({
+      url: '/zswl-cloud-shop/authRoleEmployee/enable',
+      method: 'get',
+      params
+  })
+}

+ 7 - 1
src/main.js

@@ -2,7 +2,7 @@
  * @Author: error: error: git config user.name & please set dead value or install git && error: git config user.email & please set dead value or install git & please set dead value or install git
  * @Date: 2022-06-29 15:28:34
  * @LastEditors: wenjie 1454560336@qq.com
- * @LastEditTime: 2024-10-25 14:21:05
+ * @LastEditTime: 2024-11-22 15:13:40
  * @FilePath: \admin-manage\src\main.js
  * @Description: 
  * 
@@ -55,8 +55,14 @@ Vue.use(Title)
 Vue.use(ElementUI)
 
 Vue.config.productionTip = false
+import { mapGetters } from 'vuex'
 
 Vue.mixin({
+  computed: {
+    ...mapGetters([
+      'btnAuthObj'
+    ]),
+  },
   data() {
     return {
       masterShopOptions:[

+ 1 - 3
src/permission.js

@@ -2,7 +2,7 @@
  * @Author: error: error: git config user.name & please set dead value or install git && error: git config user.email & please set dead value or install git & please set dead value or install git
  * @Date: 2022-08-02 18:10:30
  * @LastEditors: wenjie 1454560336@qq.com
- * @LastEditTime: 2024-11-13 16:21:09
+ * @LastEditTime: 2024-12-02 09:25:45
  * @FilePath: \admin-manage\src\permission.js
  * @Description: 
  * 
@@ -55,8 +55,6 @@ router.beforeEach((to, from, next) => {
           // 获取用户信息
           store.dispatch('user/getMenu').then(res=>{
             router.addRoutes(res)
-            console.log('list',res,router);
-            
             next({ ...to, replace: true })
             NProgress.done()
 

+ 1309 - 1309
src/router/index.js

@@ -2,7 +2,7 @@
  * @Author: wenjie 1454560336@qq.com
  * @Date: 2024-03-05 11:36:07
  * @LastEditors: wenjie 1454560336@qq.com
- * @LastEditTime: 2024-11-14 14:44:30
+ * @LastEditTime: 2024-11-25 14:54:13
  * @FilePath: \admin-manage\src\router\index.js
  * @Description:
  *
@@ -67,1332 +67,1332 @@ export let constantRoutes = [{
 
   //   ]
   // },
-  {
-    id: 0,
-    path: '/',
-    component: Layout,
-    redirect: '/home',
-    meta: {
-      title: '首页',
-      icon: 'icon-shouyefill'
-    },
-    children: [{
-        id: 1,
-        path: '/home',
-        name: '/home',
-        component: () => import('@/views/home/index.vue'),
-        meta: {
-          title: '首页',
-          icon: ''
-        },
-      },
-      {
-        id: 2,
-        path: '/updatePassword',
-        name: '/updatePassword',
-        component: () => import('@/views/updatePassword/index.vue'),
-        meta: {
-          title: '修改密码',
-          icon: ''
-        },
-      },
-    ]
-  },
-  {
-    id: 0,
-    path: '/authorityManage',
-    component: Layout,
-    meta: {
-      title: '权限管理',
-      icon: 'icon-shouyefill'
-    },
-    children: [
-      {
-        id: 1,
-        path: '/authorityManage/menuList',
-        name: '/authorityManage/menuList',
-        component: () => import('@/views/authorityManage/menuList.vue'),
-        meta: {
-          title: '菜单列表',
-          icon: ''
-        },
-      },
-      {
-        id: 2,
-        path: '/authorityManage/roleList',
-        name: '/authorityManage/roleList',
-        component: () => import('@/views/authorityManage/roleList.vue'),
-        meta: {
-          title: '角色列表',
-          icon: ''
-        },
-      },
-      {
-        id: 2,
-        path: '/authorityManage/userList',
-        name: '/authorityManage/userList',
-        component: () => import('@/views/authorityManage/userList.vue'),
-        meta: {
-          title: '用户列表',
-          icon: ''
-        },
-      },
-    ]
-  },
+  // {
+  //   id: 0,
+  //   path: '/',
+  //   component: Layout,
+  //   redirect: '/home',
+  //   meta: {
+  //     title: '首页',
+  //     icon: 'icon-shouyefill'
+  //   },
+  //   children: [{
+  //       id: 1,
+  //       path: '/home',
+  //       name: '/home',
+  //       component: () => import('@/views/home/index.vue'),
+  //       meta: {
+  //         title: '首页',
+  //         icon: ''
+  //       },
+  //     },
+  //     {
+  //       id: 2,
+  //       path: '/updatePassword',
+  //       name: '/updatePassword',
+  //       component: () => import('@/views/updatePassword/index.vue'),
+  //       meta: {
+  //         title: '修改密码',
+  //         icon: ''
+  //       },
+  //     },
+  //   ]
+  // },
+  // {
+  //   id: 0,
+  //   path: '/authorityManage',
+  //   component: Layout,
+  //   meta: {
+  //     title: '权限管理',
+  //     icon: 'icon-shouyefill'
+  //   },
+  //   children: [
+  //     {
+  //       id: 1,
+  //       path: '/authorityManage/menuList',
+  //       name: '/authorityManage/menuList',
+  //       component: () => import('@/views/authorityManage/menuList.vue'),
+  //       meta: {
+  //         title: '菜单列表',
+  //         icon: ''
+  //       },
+  //     },
+  //     {
+  //       id: 2,
+  //       path: '/authorityManage/roleList',
+  //       name: '/authorityManage/roleList',
+  //       component: () => import('@/views/authorityManage/roleList.vue'),
+  //       meta: {
+  //         title: '角色列表',
+  //         icon: ''
+  //       },
+  //     },
+  //     {
+  //       id: 2,
+  //       path: '/authorityManage/userList',
+  //       name: '/authorityManage/userList',
+  //       component: () => import('@/views/authorityManage/userList.vue'),
+  //       meta: {
+  //         title: '用户列表',
+  //         icon: ''
+  //       },
+  //     },
+  //   ]
+  // },
 
-  {
-    id: 0,
-    path: '/operationManage/index',
-    component: Layout,
-    meta: {
-      title: '运营管理',
-      icon: 'el-icon-s-shop'
-    },
-    alwaysShow: true,
-    children: [{
-        id: 0,
-        path: '/operationManage/shopManage/index',
-        component: operationLayout,
-        meta: {
-          title: '商铺管理',
-          icon: ''
-        },
-        alwaysShow: true,
-        children: [
-          {
-            id: 1,
-            path: '/operationManage/shopManage/shopType',
-            name: '/operationManage/shopManage/shopType',
-            component: () => import('@/views/operationManage/shopManage/shopType.vue'),
-            hidden:true,
-            meta: {
-              title: '店铺类型',
-              icon: ''
-            },
-          },{
-            id: 1,
-            path: '/operationManage/shopManage/index',
-            name: '/operationManage/shopManage/index',
-            component: () => import('@/views/operationManage/shopManage/index.vue'),
-            meta: {
-              title: '店铺列表',
-              icon: ''
-            },
-          },
+  // {
+  //   id: 0,
+  //   path: '/operationManage/index',
+  //   component: Layout,
+  //   meta: {
+  //     title: '运营管理',
+  //     icon: 'el-icon-s-shop'
+  //   },
+  //   alwaysShow: true,
+  //   children: [{
+  //       id: 0,
+  //       path: '/operationManage/shopManage/index',
+  //       component: operationLayout,
+  //       meta: {
+  //         title: '商铺管理',
+  //         icon: ''
+  //       },
+  //       alwaysShow: true,
+  //       children: [
+  //         {
+  //           id: 1,
+  //           path: '/operationManage/shopManage/shopType',
+  //           name: '/operationManage/shopManage/shopType',
+  //           component: () => import('@/views/operationManage/shopManage/shopType.vue'),
+  //           hidden:true,
+  //           meta: {
+  //             title: '店铺类型',
+  //             icon: ''
+  //           },
+  //         },{
+  //           id: 1,
+  //           path: '/operationManage/shopManage/index',
+  //           name: '/operationManage/shopManage/index',
+  //           component: () => import('@/views/operationManage/shopManage/index.vue'),
+  //           meta: {
+  //             title: '店铺列表',
+  //             icon: ''
+  //           },
+  //         },
 
-          {
-            id: 1,
-            path: '/operationManage/shopManage/shopAdd',
-            name: '/operationManage/shopManage/shopAdd',
-            component: () => import('@/views/operationManage/shopManage/shopAdd.vue'),
-            meta: {
-              title: '店铺添加'
-            },
-          },
-          {
-            id: 1,
-            path: '/operationManage/shopManage/shopAdd1',
-            name: '/operationManage/shopManage/shopAdd1',
-            hidden: true,
-            component: () => import('@/views/operationManage/shopManage/shopAdd1.vue'),
-            meta: {
-              title: '银联认证',
-              activeMenu: '/operationManage/shopManage/index'
+  //         {
+  //           id: 1,
+  //           path: '/operationManage/shopManage/shopAdd',
+  //           name: '/operationManage/shopManage/shopAdd',
+  //           component: () => import('@/views/operationManage/shopManage/shopAdd.vue'),
+  //           meta: {
+  //             title: '店铺添加'
+  //           },
+  //         },
+  //         {
+  //           id: 1,
+  //           path: '/operationManage/shopManage/shopAdd1',
+  //           name: '/operationManage/shopManage/shopAdd1',
+  //           hidden: true,
+  //           component: () => import('@/views/operationManage/shopManage/shopAdd1.vue'),
+  //           meta: {
+  //             title: '银联认证',
+  //             activeMenu: '/operationManage/shopManage/index'
 
-            },
-          },
-          {
-            id: 1,
-            path: '/operationManage/shopManage/shopAdd2',
-            name: '/operationManage/shopManage/shopAdd2',
-            hidden: true,
-            component: () => import('@/views/operationManage/shopManage/shopAdd2.vue'),
-            meta: {
-              title: '银联认证',
-              activeMenu: '/operationManage/shopManage/index'
+  //           },
+  //         },
+  //         {
+  //           id: 1,
+  //           path: '/operationManage/shopManage/shopAdd2',
+  //           name: '/operationManage/shopManage/shopAdd2',
+  //           hidden: true,
+  //           component: () => import('@/views/operationManage/shopManage/shopAdd2.vue'),
+  //           meta: {
+  //             title: '银联认证',
+  //             activeMenu: '/operationManage/shopManage/index'
 
-            },
-          },
-          {
-            id: 1,
-            path: '/operationManage/shopManage/shopAdd3',
-            name: '/operationManage/shopManage/shopAdd3',
-            hidden: true,
-            component: () => import('@/views/operationManage/shopManage/shopAdd3.vue'),
-            meta: {
-              title: '银联认证',
-              activeMenu: '/operationManage/shopManage/index'
+  //           },
+  //         },
+  //         {
+  //           id: 1,
+  //           path: '/operationManage/shopManage/shopAdd3',
+  //           name: '/operationManage/shopManage/shopAdd3',
+  //           hidden: true,
+  //           component: () => import('@/views/operationManage/shopManage/shopAdd3.vue'),
+  //           meta: {
+  //             title: '银联认证',
+  //             activeMenu: '/operationManage/shopManage/index'
 
-            },
-          },
-          {
-            id: 1,
-            path: '/operationManage/shopManage/shopAdd4',
-            name: '/operationManage/shopManage/shopAdd4',
-            hidden: true,
-            component: () => import('@/views/operationManage/shopManage/shopAdd4.vue'),
-            meta: {
-              title: '银联认证',
-              activeMenu: '/operationManage/shopManage/index'
+  //           },
+  //         },
+  //         {
+  //           id: 1,
+  //           path: '/operationManage/shopManage/shopAdd4',
+  //           name: '/operationManage/shopManage/shopAdd4',
+  //           hidden: true,
+  //           component: () => import('@/views/operationManage/shopManage/shopAdd4.vue'),
+  //           meta: {
+  //             title: '银联认证',
+  //             activeMenu: '/operationManage/shopManage/index'
 
-            },
-          }
-        ]
-      },
+  //           },
+  //         }
+  //       ]
+  //     },
      
-      {
-        id: 0,
-        path: '/operationManage/goodsType/index',
-        component: operationLayout,
-        meta: {
-          title: '商品分类',
-          icon: ''
-        },
-        alwaysShow: true,
-        children: [{
-            id: 1,
-            path: '/operationManage/goodsType/index',
-            name: '/operationManage/goodsType/index',
-            component: () => import('@/views/operationManage/goodsType/index.vue'),
-            meta: {
-              title: '分类列表',
-              icon: ''
-            },
-          },
-          {
-            id: 1,
-            path: '/operationManage/goodsType/addGoodsType',
-            name: '/operationManage/goodsType/addGoodsType',
-            hidden:true,
-            component: () => import('@/views/operationManage/goodsType/addGoodsType.vue'),
-            meta: {
-              title: '添加分类',
-              icon: '',
-              activeMenu: '/operationManage/goodsType/index'
-            },
-          },
-        ]
-      },
-      {
-        id: 0,
-        path: '/operationManage/goodsManage/index',
-        component: operationLayout,
-        meta: {
-          title: '商品管理',
-          icon: ''
-        },
-        alwaysShow: true,
-        children: [{
-            id: 1,
-            path: '/operationManage/goodsManage/index',
-            name: '/operationManage/goodsManage/index',
-            component: () => import('@/views/operationManage/goodsManage/index.vue'),
-            meta: {
-              title: '商品列表',
-              icon: ''
-            },
-          },
-          {
-            id: 1,
-            path: '/operationManage/goodsManage/goodsDetail',
-            name: '/operationManage/goodsManage/goodsDetail',
-            hidden:true,
-            component: () => import('@/views/operationManage/goodsManage/goodsDetail.vue'),
-            meta: {
-              title: '商品配置',
-              icon: '',
-              activeMenu: '/operationManage/goodsManage/index'
-            },
-          },
-          {
-            id: 1,
-            path: '/operationManage/goodsManage/labelList',
-            name: '/operationManage/goodsManage/labelList',
-            component: () => import('@/views/operationManage/goodsManage/labelList.vue'),
-            meta: {
-              title: '标签列表',
-              icon: ''
-            },
-          },
-          {
-            id: 1,
-            path: '/operationManage/goodsManage/productLibrary',
-            name: '/operationManage/goodsManage/productLibrary',
-            component: () => import('@/views/operationManage/goodsManage/productLibrary.vue'),
-            meta: {
-              title: '产品库',
-              icon: ''
-            },
-          },
-          {
-            id: 1,
-            path: '/operationManage/goodsManage/homeGoodsSet',
-            name: '/operationManage/goodsManage/homeGoodsSet',
-            component: () => import('@/views/operationManage/goodsManage/homeGoodsSet.vue'),
-            meta: {
-              title: '首页设置',
-              icon: ''
-            },
-          },
-        ]
-      },
+  //     {
+  //       id: 0,
+  //       path: '/operationManage/goodsType/index',
+  //       component: operationLayout,
+  //       meta: {
+  //         title: '商品分类',
+  //         icon: ''
+  //       },
+  //       alwaysShow: true,
+  //       children: [{
+  //           id: 1,
+  //           path: '/operationManage/goodsType/index',
+  //           name: '/operationManage/goodsType/index',
+  //           component: () => import('@/views/operationManage/goodsType/index.vue'),
+  //           meta: {
+  //             title: '分类列表',
+  //             icon: ''
+  //           },
+  //         },
+  //         {
+  //           id: 1,
+  //           path: '/operationManage/goodsType/addGoodsType',
+  //           name: '/operationManage/goodsType/addGoodsType',
+  //           hidden:true,
+  //           component: () => import('@/views/operationManage/goodsType/addGoodsType.vue'),
+  //           meta: {
+  //             title: '添加分类',
+  //             icon: '',
+  //             activeMenu: '/operationManage/goodsType/index'
+  //           },
+  //         },
+  //       ]
+  //     },
+  //     {
+  //       id: 0,
+  //       path: '/operationManage/goodsManage/index',
+  //       component: operationLayout,
+  //       meta: {
+  //         title: '商品管理',
+  //         icon: ''
+  //       },
+  //       alwaysShow: true,
+  //       children: [{
+  //           id: 1,
+  //           path: '/operationManage/goodsManage/index',
+  //           name: '/operationManage/goodsManage/index',
+  //           component: () => import('@/views/operationManage/goodsManage/index.vue'),
+  //           meta: {
+  //             title: '商品列表',
+  //             icon: ''
+  //           },
+  //         },
+  //         {
+  //           id: 1,
+  //           path: '/operationManage/goodsManage/goodsDetail',
+  //           name: '/operationManage/goodsManage/goodsDetail',
+  //           hidden:true,
+  //           component: () => import('@/views/operationManage/goodsManage/goodsDetail.vue'),
+  //           meta: {
+  //             title: '商品配置',
+  //             icon: '',
+  //             activeMenu: '/operationManage/goodsManage/index'
+  //           },
+  //         },
+  //         {
+  //           id: 1,
+  //           path: '/operationManage/goodsManage/labelList',
+  //           name: '/operationManage/goodsManage/labelList',
+  //           component: () => import('@/views/operationManage/goodsManage/labelList.vue'),
+  //           meta: {
+  //             title: '标签列表',
+  //             icon: ''
+  //           },
+  //         },
+  //         {
+  //           id: 1,
+  //           path: '/operationManage/goodsManage/productLibrary',
+  //           name: '/operationManage/goodsManage/productLibrary',
+  //           component: () => import('@/views/operationManage/goodsManage/productLibrary.vue'),
+  //           meta: {
+  //             title: '产品库',
+  //             icon: ''
+  //           },
+  //         },
+  //         {
+  //           id: 1,
+  //           path: '/operationManage/goodsManage/homeGoodsSet',
+  //           name: '/operationManage/goodsManage/homeGoodsSet',
+  //           component: () => import('@/views/operationManage/goodsManage/homeGoodsSet.vue'),
+  //           meta: {
+  //             title: '首页设置',
+  //             icon: ''
+  //           },
+  //         },
+  //       ]
+  //     },
    
-      {
-        id: 0,
-        path: '/operationManage/orderManage/index',
-        component: operationLayout,
-        meta: {
-          title: '订单管理',
-          icon: ''
-        },
-        alwaysShow: true,
-        children: [{
-          id: 1,
-          path: '/operationManage/orderManage/index',
-          name: '/operationManage/orderManage/index',
-          component: () => import('@/views/operationManage/orderManage/index.vue'),
-          meta: {
-            title: '支付订单',
-            icon: ''
-          },
-        },
-        {
-          id: 1,
-          path: '/operationManage/orderManage/payDetail',
-          name: '/operationManage/orderManage/payDetail',
-          hidden:true,
-          component: () => import('@/views/operationManage/orderManage/payDetail.vue'),
-          meta: {
-            title: '订单详情',
-            icon: '',
-            activeMenu: '/operationManage/orderManage/index'
-          },
-        },
-        {
-          id: 1,
-          path: '/operationManage/orderManage/list',
-          name: '/operationManage/orderManage/list',
-          component: () => import('@/views/operationManage/orderManage/list.vue'),
-          meta: {
-            title: '商品订单',
-            icon: ''
-          },
-        },
-        {
-          id: 1,
-          path: '/operationManage/orderManage/orderDetail',
-          name: '/operationManage/orderManage/orderDetail',
-          hidden:true,
-          component: () => import('@/views/operationManage/orderManage/orderDetail.vue'),
-          meta: {
-            title: '订单详情',
-            icon: '',
-            activeMenu: '/operationManage/orderManage/list'
-          },
-        },
+  //     {
+  //       id: 0,
+  //       path: '/operationManage/orderManage/index',
+  //       component: operationLayout,
+  //       meta: {
+  //         title: '订单管理',
+  //         icon: ''
+  //       },
+  //       alwaysShow: true,
+  //       children: [{
+  //         id: 1,
+  //         path: '/operationManage/orderManage/index',
+  //         name: '/operationManage/orderManage/index',
+  //         component: () => import('@/views/operationManage/orderManage/index.vue'),
+  //         meta: {
+  //           title: '支付订单',
+  //           icon: ''
+  //         },
+  //       },
+  //       {
+  //         id: 1,
+  //         path: '/operationManage/orderManage/payDetail',
+  //         name: '/operationManage/orderManage/payDetail',
+  //         hidden:true,
+  //         component: () => import('@/views/operationManage/orderManage/payDetail.vue'),
+  //         meta: {
+  //           title: '订单详情',
+  //           icon: '',
+  //           activeMenu: '/operationManage/orderManage/index'
+  //         },
+  //       },
+  //       {
+  //         id: 1,
+  //         path: '/operationManage/orderManage/list',
+  //         name: '/operationManage/orderManage/list',
+  //         component: () => import('@/views/operationManage/orderManage/list.vue'),
+  //         meta: {
+  //           title: '商品订单',
+  //           icon: ''
+  //         },
+  //       },
+  //       {
+  //         id: 1,
+  //         path: '/operationManage/orderManage/orderDetail',
+  //         name: '/operationManage/orderManage/orderDetail',
+  //         hidden:true,
+  //         component: () => import('@/views/operationManage/orderManage/orderDetail.vue'),
+  //         meta: {
+  //           title: '订单详情',
+  //           icon: '',
+  //           activeMenu: '/operationManage/orderManage/list'
+  //         },
+  //       },
 
-       ]
-      },
-      {
-        id: 0,
-        path: '/operationManage/marketingManage/index',
-        component: operationLayout,
-        meta: {
-          title: '营销管理',
-          icon: ''
-        },
-        alwaysShow: true,
-        children: [{
-          id: 1,
-          path: '/operationManage/marketingManage/index',
-          name: '/operationManage/marketingManage/index',
-          component: () => import('@/views/operationManage/marketingManage/index.vue'),
-          meta: {
-            title: '小桔活动',
-            icon: ''
-          },
-        },
-        {
-          id: 0,
-          path: '/operationManage/marketingManage/invitePromotion/index',
-          component: operationLayout,
-          meta: {
-            title: '推广邀请规则',
-            icon: ''
-          },
-          alwaysShow: true,
-          children: [
-            {
-              id: 1,
-              path: '/operationManage/marketingManage/invitePromotion/index',
-              name: '/operationManage/marketingManage/invitePromotion/index',
-              component: () => import('@/views/operationManage/marketingManage/invitePromotion/index.vue'),
-              meta: {
-                title: '规则管理',
-                icon: ''
-              },
-            },
-            {
-              id: 1,
-              path: '/operationManage/marketingManage/invitePromotion/add',
-              name: '/operationManage/marketingManage/invitePromotion/add',
-              component: () => import('@/views/operationManage/marketingManage/invitePromotion/add.vue'),
-              meta: {
-                title: '规则添加',
-                icon: ''
-              },
-            }
-          ]
-        }
-      ]
-      },
-      {
-        id: 0,
-        path: '/operationManage/comboManage/index',
-        component: operationLayout,
-        meta: {
-          title: '套餐管理',
-          icon: ''
-        },
-        alwaysShow: true,
-        children: [{
-            id: 1,
-            path: '/operationManage/comboManage/index',
-            name: '/operationManage/comboManage/index',
-            component: () => import('@/views/operationManage/comboManage/index.vue'),
-            meta: {
-              title: '套餐列表',
-              icon: ''
-            },
-          },
-          {
-            id: 1,
-            path: '/operationManage/comboManage/logList',
-            name: '/operationManage/comboManage/logList',
-            component: () => import('@/views/operationManage/comboManage/logList.vue'),
-            meta: {
-              title: '权益记录',
-              icon: ''
-            },
-          },
-          {
-            id: 1,
-            path: '/operationManage/comboManage/vipActivation',
-            name: '/operationManage/comboManage/vipActivation',
-            component: () => import('@/views/operationManage/comboManage/vipActivation.vue'),
-            meta: {
-              title: '会员激活码',
-              icon: ''
-            },
-          },
-          {
-            id: 1,
-            path: '/operationManage/comboManage/editCombo',
-            name: '/operationManage/comboManage/editCombo',
-            hidden:true,
-            component: () => import('@/views/operationManage/comboManage/editCombo.vue'),
-            meta: {
-              title: '编辑套餐',
-              icon: ''
-            },
-          },
-          {
-            id: 1,
-            path: '/operationManage/equitiesManage/index',
-            name: '/operationManage/equitiesManage/index',
-            component: () => import('@/views/operationManage/equitiesManage/index.vue'),
-            hidden:true,
-            meta: {
-              title: '权益列表',
-              icon: '',
-              activeMenu: '/operationManage/comboManage/index'
-            },
-          },
-          {
-            id: 1,
-            path: '/operationManage/equitiesManage/addEquities',
-            name: '/operationManage/equitiesManage/addEquities',
-            hidden:true,
-            component: () => import('@/views/operationManage/equitiesManage/addEquities.vue'),
-            meta: {
-              title: '添加权益',
-              icon: '',
-              activeMenu: '/operationManage/comboManage/index'
+  //      ]
+  //     },
+  //     {
+  //       id: 0,
+  //       path: '/operationManage/marketingManage/index',
+  //       component: operationLayout,
+  //       meta: {
+  //         title: '营销管理',
+  //         icon: ''
+  //       },
+  //       alwaysShow: true,
+  //       children: [{
+  //         id: 1,
+  //         path: '/operationManage/marketingManage/index',
+  //         name: '/operationManage/marketingManage/index',
+  //         component: () => import('@/views/operationManage/marketingManage/index.vue'),
+  //         meta: {
+  //           title: '小桔活动',
+  //           icon: ''
+  //         },
+  //       },
+  //       {
+  //         id: 0,
+  //         path: '/operationManage/marketingManage/invitePromotion/index',
+  //         component: operationLayout,
+  //         meta: {
+  //           title: '推广邀请规则',
+  //           icon: ''
+  //         },
+  //         alwaysShow: true,
+  //         children: [
+  //           {
+  //             id: 1,
+  //             path: '/operationManage/marketingManage/invitePromotion/index',
+  //             name: '/operationManage/marketingManage/invitePromotion/index',
+  //             component: () => import('@/views/operationManage/marketingManage/invitePromotion/index.vue'),
+  //             meta: {
+  //               title: '规则管理',
+  //               icon: ''
+  //             },
+  //           },
+  //           {
+  //             id: 1,
+  //             path: '/operationManage/marketingManage/invitePromotion/add',
+  //             name: '/operationManage/marketingManage/invitePromotion/add',
+  //             component: () => import('@/views/operationManage/marketingManage/invitePromotion/add.vue'),
+  //             meta: {
+  //               title: '规则添加',
+  //               icon: ''
+  //             },
+  //           }
+  //         ]
+  //       }
+  //     ]
+  //     },
+  //     {
+  //       id: 0,
+  //       path: '/operationManage/comboManage/index',
+  //       component: operationLayout,
+  //       meta: {
+  //         title: '套餐管理',
+  //         icon: ''
+  //       },
+  //       alwaysShow: true,
+  //       children: [{
+  //           id: 1,
+  //           path: '/operationManage/comboManage/index',
+  //           name: '/operationManage/comboManage/index',
+  //           component: () => import('@/views/operationManage/comboManage/index.vue'),
+  //           meta: {
+  //             title: '套餐列表',
+  //             icon: ''
+  //           },
+  //         },
+  //         {
+  //           id: 1,
+  //           path: '/operationManage/comboManage/logList',
+  //           name: '/operationManage/comboManage/logList',
+  //           component: () => import('@/views/operationManage/comboManage/logList.vue'),
+  //           meta: {
+  //             title: '权益记录',
+  //             icon: ''
+  //           },
+  //         },
+  //         {
+  //           id: 1,
+  //           path: '/operationManage/comboManage/vipActivation',
+  //           name: '/operationManage/comboManage/vipActivation',
+  //           component: () => import('@/views/operationManage/comboManage/vipActivation.vue'),
+  //           meta: {
+  //             title: '会员激活码',
+  //             icon: ''
+  //           },
+  //         },
+  //         {
+  //           id: 1,
+  //           path: '/operationManage/comboManage/editCombo',
+  //           name: '/operationManage/comboManage/editCombo',
+  //           hidden:true,
+  //           component: () => import('@/views/operationManage/comboManage/editCombo.vue'),
+  //           meta: {
+  //             title: '编辑套餐',
+  //             icon: ''
+  //           },
+  //         },
+  //         {
+  //           id: 1,
+  //           path: '/operationManage/equitiesManage/index',
+  //           name: '/operationManage/equitiesManage/index',
+  //           component: () => import('@/views/operationManage/equitiesManage/index.vue'),
+  //           hidden:true,
+  //           meta: {
+  //             title: '权益列表',
+  //             icon: '',
+  //             activeMenu: '/operationManage/comboManage/index'
+  //           },
+  //         },
+  //         {
+  //           id: 1,
+  //           path: '/operationManage/equitiesManage/addEquities',
+  //           name: '/operationManage/equitiesManage/addEquities',
+  //           hidden:true,
+  //           component: () => import('@/views/operationManage/equitiesManage/addEquities.vue'),
+  //           meta: {
+  //             title: '添加权益',
+  //             icon: '',
+  //             activeMenu: '/operationManage/comboManage/index'
 
-            },
-          },
-          {
-            id: 1,
-            path: '/operationManage/comboManage/checkoutCode',
-            name: '/operationManage/comboManage/checkoutCode',
-            component: () => import('@/views/operationManage/comboManage/checkoutCode.vue'),
-            hidden:true,
-            meta: {
-              title: '查看激活码',
-              icon: '',
-              activeMenu: '/operationManage/comboManage/vipActivation'
-            },
-          },
-        ]
-      },
+  //           },
+  //         },
+  //         {
+  //           id: 1,
+  //           path: '/operationManage/comboManage/checkoutCode',
+  //           name: '/operationManage/comboManage/checkoutCode',
+  //           component: () => import('@/views/operationManage/comboManage/checkoutCode.vue'),
+  //           hidden:true,
+  //           meta: {
+  //             title: '查看激活码',
+  //             icon: '',
+  //             activeMenu: '/operationManage/comboManage/vipActivation'
+  //           },
+  //         },
+  //       ]
+  //     },
 
-      {
-        id: 0,
-        path: '/operationManage/financeManage/index',
-        component: operationLayout,
-        meta: {
-          title: '财务管理',
-          icon: ''
-        },
-        alwaysShow: true,
-        children: [{
-          id: 1,
-          path: '/operationManage/financeManage/index',
-          name: '/operationManage/financeManage/index',
-          component: () => import('@/views/operationManage/financeManage/index.vue'),
-          meta: {
-            title: '分账列表',
-            icon: ''
-          },
-        },
-        {
-          id: 1,
-          path: '/operationManage/financeManage/withdraw',
-          name: '/operationManage/financeManage/withdraw',
-          component: () => import('@/views/operationManage/financeManage/withdraw.vue'),
-          meta: {
-            title: '账户余额',
-            icon: ''
-          },
-        },
-      ]
-      },
+  //     {
+  //       id: 0,
+  //       path: '/operationManage/financeManage/index',
+  //       component: operationLayout,
+  //       meta: {
+  //         title: '财务管理',
+  //         icon: ''
+  //       },
+  //       alwaysShow: true,
+  //       children: [{
+  //         id: 1,
+  //         path: '/operationManage/financeManage/index',
+  //         name: '/operationManage/financeManage/index',
+  //         component: () => import('@/views/operationManage/financeManage/index.vue'),
+  //         meta: {
+  //           title: '分账列表',
+  //           icon: ''
+  //         },
+  //       },
+  //       {
+  //         id: 1,
+  //         path: '/operationManage/financeManage/withdraw',
+  //         name: '/operationManage/financeManage/withdraw',
+  //         component: () => import('@/views/operationManage/financeManage/withdraw.vue'),
+  //         meta: {
+  //           title: '账户余额',
+  //           icon: ''
+  //         },
+  //       },
+  //     ]
+  //     },
   
-      {
-        id: 0,
-        path: '/operationManage/appMenuManage/index',
-        component: operationLayout,
-        meta: {
-          title: '小程序菜单',
-          icon: ''
-        },
-        alwaysShow: true,
-        children: [{
-            id: 1,
-            path: '/operationManage/appMenuManage/index',
-            name: '/operationManage/appMenuManage/index',
-            component: () => import('@/views/operationManage/appMenuManage/index.vue'),
-            meta: {
-              title: '菜单列表',
-              icon: ''
-            },
-          },
-          {
-            id: 1,
-            path: '/operationManage/appMenuManage/addMenu',
-            name: '/operationManage/appMenuManage/addMenu',
-            hidden:true,
-            component: () => import('@/views/operationManage/appMenuManage/addMenu.vue'),
-            meta: {
-              title: '添加菜单',
-              icon: '',
-              activeMenu: '/operationManage/appMenuManage/index'
-            },
-          },
-          {
-            id: 1,
-            path: '/operationManage/appMenuManage/editMenu',
-            name: '/operationManage/appMenuManage/editMenu',
-            hidden:true,
-            component: () => import('@/views/operationManage/appMenuManage/editMenu.vue'),
-            meta: {
-              title: '编辑菜单',
-              icon: '',
-              activeMenu: '/operationManage/appMenuManage/index'
-            },
-          },
-        ]
-      },
-      {
-        id: 0,
-        path: '/operationManage/bannerManage/index',
-        component: operationLayout,
-        meta: {
-          title: 'banner管理',
-          icon: ''
-        },
-        alwaysShow: true,
-        children: [{
-            id: 1,
-            path: '/operationManage/bannerManage/index',
-            name: '/operationManage/bannerManage/index',
-            component: () => import('@/views/operationManage/bannerManage/index.vue'),
-            meta: {
-              title: 'banner列表',
-              icon: ''
-            },
-          },
-          {
-            id: 1,
-            path: '/operationManage/bannerManage/addBanner',
-            name: '/operationManage/bannerManage/addBanner',
-            hidden:true,
-            component: () => import('@/views/operationManage/bannerManage/addBanner.vue'),
-            meta: {
-              title: '添加banner',
-              icon: '',
-              activeMenu: '/operationManage/bannerManage/index'
+  //     {
+  //       id: 0,
+  //       path: '/operationManage/appMenuManage/index',
+  //       component: operationLayout,
+  //       meta: {
+  //         title: '小程序菜单',
+  //         icon: ''
+  //       },
+  //       alwaysShow: true,
+  //       children: [{
+  //           id: 1,
+  //           path: '/operationManage/appMenuManage/index',
+  //           name: '/operationManage/appMenuManage/index',
+  //           component: () => import('@/views/operationManage/appMenuManage/index.vue'),
+  //           meta: {
+  //             title: '菜单列表',
+  //             icon: ''
+  //           },
+  //         },
+  //         {
+  //           id: 1,
+  //           path: '/operationManage/appMenuManage/addMenu',
+  //           name: '/operationManage/appMenuManage/addMenu',
+  //           hidden:true,
+  //           component: () => import('@/views/operationManage/appMenuManage/addMenu.vue'),
+  //           meta: {
+  //             title: '添加菜单',
+  //             icon: '',
+  //             activeMenu: '/operationManage/appMenuManage/index'
+  //           },
+  //         },
+  //         {
+  //           id: 1,
+  //           path: '/operationManage/appMenuManage/editMenu',
+  //           name: '/operationManage/appMenuManage/editMenu',
+  //           hidden:true,
+  //           component: () => import('@/views/operationManage/appMenuManage/editMenu.vue'),
+  //           meta: {
+  //             title: '编辑菜单',
+  //             icon: '',
+  //             activeMenu: '/operationManage/appMenuManage/index'
+  //           },
+  //         },
+  //       ]
+  //     },
+  //     {
+  //       id: 0,
+  //       path: '/operationManage/bannerManage/index',
+  //       component: operationLayout,
+  //       meta: {
+  //         title: 'banner管理',
+  //         icon: ''
+  //       },
+  //       alwaysShow: true,
+  //       children: [{
+  //           id: 1,
+  //           path: '/operationManage/bannerManage/index',
+  //           name: '/operationManage/bannerManage/index',
+  //           component: () => import('@/views/operationManage/bannerManage/index.vue'),
+  //           meta: {
+  //             title: 'banner列表',
+  //             icon: ''
+  //           },
+  //         },
+  //         {
+  //           id: 1,
+  //           path: '/operationManage/bannerManage/addBanner',
+  //           name: '/operationManage/bannerManage/addBanner',
+  //           hidden:true,
+  //           component: () => import('@/views/operationManage/bannerManage/addBanner.vue'),
+  //           meta: {
+  //             title: '添加banner',
+  //             icon: '',
+  //             activeMenu: '/operationManage/bannerManage/index'
 
-            },
-          },
-          {
-            id: 1,
-            path: '/operationManage/bannerManage/editBanner',
-            name: '/operationManage/bannerManage/editBanner',
-            hidden:true,
-            component: () => import('@/views/operationManage/bannerManage/editBanner.vue'),
-            meta: {
-              title: '编辑banner',
-              icon: '',
-              activeMenu: '/operationManage/bannerManage/index'
-            },
-          },
-        ]
-      },
-      {
-        id: 0,
-        path: '/operationManage/advertisingManage/index',
-        component: operationLayout,
-        meta: {
-          title: '广告位管理',
-          icon: ''
-        },
-        alwaysShow: true,
-        children: [{
-            id: 1,
-            path: '/operationManage/advertisingManage/index',
-            name: '/operationManage/advertisingManage/index',
-            component: () => import('@/views/operationManage/advertisingManage/index.vue'),
-            meta: {
-              title: '广告位列表',
-              icon: ''
-            },
-          },
-          {
-            id: 1,
-            path: '/operationManage/advertisingManage/addAdv',
-            name: '/operationManage/advertisingManage/addAdv',
-            hidden:true,
-            component: () => import('@/views/operationManage/advertisingManage/addAdv.vue'),
-            meta: {
-              title: '添加广告位',
-              icon: '',
-              activeMenu: '/operationManage/advertisingManage/index'
+  //           },
+  //         },
+  //         {
+  //           id: 1,
+  //           path: '/operationManage/bannerManage/editBanner',
+  //           name: '/operationManage/bannerManage/editBanner',
+  //           hidden:true,
+  //           component: () => import('@/views/operationManage/bannerManage/editBanner.vue'),
+  //           meta: {
+  //             title: '编辑banner',
+  //             icon: '',
+  //             activeMenu: '/operationManage/bannerManage/index'
+  //           },
+  //         },
+  //       ]
+  //     },
+  //     {
+  //       id: 0,
+  //       path: '/operationManage/advertisingManage/index',
+  //       component: operationLayout,
+  //       meta: {
+  //         title: '广告位管理',
+  //         icon: ''
+  //       },
+  //       alwaysShow: true,
+  //       children: [{
+  //           id: 1,
+  //           path: '/operationManage/advertisingManage/index',
+  //           name: '/operationManage/advertisingManage/index',
+  //           component: () => import('@/views/operationManage/advertisingManage/index.vue'),
+  //           meta: {
+  //             title: '广告位列表',
+  //             icon: ''
+  //           },
+  //         },
+  //         {
+  //           id: 1,
+  //           path: '/operationManage/advertisingManage/addAdv',
+  //           name: '/operationManage/advertisingManage/addAdv',
+  //           hidden:true,
+  //           component: () => import('@/views/operationManage/advertisingManage/addAdv.vue'),
+  //           meta: {
+  //             title: '添加广告位',
+  //             icon: '',
+  //             activeMenu: '/operationManage/advertisingManage/index'
 
-            },
-          },
-          {
-            id: 1,
-            path: '/operationManage/advertisingManage/editAdv',
-            name: '/operationManage/advertisingManage/editAdv',
-            hidden:true,
-            component: () => import('@/views/operationManage/advertisingManage/editAdv.vue'),
-            meta: {
-              title: '编辑广告位',
-              icon: '',
-              activeMenu: '/operationManage/advertisingManage/index'
-            },
-          },
-        ]
-      },
-      {
-        id: 0,
-        path: '/operationManage/couponManage/index',
-        component: operationLayout,
-        meta: {
-          title: '优惠券管理',
-          icon: ''
-        },
-        alwaysShow: true,
-        children: [{
-            id: 1,
-            path: '/operationManage/couponManage/index',
-            name: '/operationManage/couponManage/index',
-            component: () => import('@/views/operationManage/couponManage/index.vue'),
-            meta: {
-              title: '优惠券列表',
-              icon: ''
-            },
-          },
-          {
-            id: 1,
-            path: '/operationManage/couponManage/fullDiscountCoupon',
-            name: '/operationManage/couponManage/fullDiscountCoupon',
-            component: () => import('@/views/operationManage/couponManage/fullDiscountCoupon.vue'),
-            hidden:true,
-            meta: {
-              title: '满减优惠券',
-              icon: '',
-              activeMenu: '/operationManage/couponManage/index'
-            },
-          },
-          {
-            id: 1,
-            path: '/operationManage/couponManage/discountCoupon',
-            name: '/operationManage/couponManage/discountCoupon',
-            component: () => import('@/views/operationManage/couponManage/discountCoupon.vue'),
-            hidden:true,
-            meta: {
-              title: '折扣优惠券',
-              icon: '',
-              activeMenu: '/operationManage/couponManage/index'
-            },
-          },
-          {
-            id: 1,
-            path: '/operationManage/couponManage/refuelCoupon',
-            name: '/operationManage/couponManage/refuelCoupon',
-            component: () => import('@/views/operationManage/couponManage/refuelCoupon.vue'),
-            hidden:true,
-            meta: {
-              title: '加油优惠券',
-              icon: '',
-              activeMenu: '/operationManage/couponManage/index'
+  //           },
+  //         },
+  //         {
+  //           id: 1,
+  //           path: '/operationManage/advertisingManage/editAdv',
+  //           name: '/operationManage/advertisingManage/editAdv',
+  //           hidden:true,
+  //           component: () => import('@/views/operationManage/advertisingManage/editAdv.vue'),
+  //           meta: {
+  //             title: '编辑广告位',
+  //             icon: '',
+  //             activeMenu: '/operationManage/advertisingManage/index'
+  //           },
+  //         },
+  //       ]
+  //     },
+  //     {
+  //       id: 0,
+  //       path: '/operationManage/couponManage/index',
+  //       component: operationLayout,
+  //       meta: {
+  //         title: '优惠券管理',
+  //         icon: ''
+  //       },
+  //       alwaysShow: true,
+  //       children: [{
+  //           id: 1,
+  //           path: '/operationManage/couponManage/index',
+  //           name: '/operationManage/couponManage/index',
+  //           component: () => import('@/views/operationManage/couponManage/index.vue'),
+  //           meta: {
+  //             title: '优惠券列表',
+  //             icon: ''
+  //           },
+  //         },
+  //         {
+  //           id: 1,
+  //           path: '/operationManage/couponManage/fullDiscountCoupon',
+  //           name: '/operationManage/couponManage/fullDiscountCoupon',
+  //           component: () => import('@/views/operationManage/couponManage/fullDiscountCoupon.vue'),
+  //           hidden:true,
+  //           meta: {
+  //             title: '满减优惠券',
+  //             icon: '',
+  //             activeMenu: '/operationManage/couponManage/index'
+  //           },
+  //         },
+  //         {
+  //           id: 1,
+  //           path: '/operationManage/couponManage/discountCoupon',
+  //           name: '/operationManage/couponManage/discountCoupon',
+  //           component: () => import('@/views/operationManage/couponManage/discountCoupon.vue'),
+  //           hidden:true,
+  //           meta: {
+  //             title: '折扣优惠券',
+  //             icon: '',
+  //             activeMenu: '/operationManage/couponManage/index'
+  //           },
+  //         },
+  //         {
+  //           id: 1,
+  //           path: '/operationManage/couponManage/refuelCoupon',
+  //           name: '/operationManage/couponManage/refuelCoupon',
+  //           component: () => import('@/views/operationManage/couponManage/refuelCoupon.vue'),
+  //           hidden:true,
+  //           meta: {
+  //             title: '加油优惠券',
+  //             icon: '',
+  //             activeMenu: '/operationManage/couponManage/index'
 
-            },
-          },
+  //           },
+  //         },
 
-        ]
-      },
-      {
-        id: 0,
-        path: '/operationManage/luckyDrawManage/index',
-        component: operationLayout,
-        meta: {
-          title: '抽奖管理',
-          icon: ''
-        },
-        alwaysShow: true,
-        children: [{
-            id: 1,
-            path: '/operationManage/luckyDrawManage/index',
-            name: '/operationManage/luckyDrawManage/index',
-            component: () => import('@/views/operationManage/luckyDrawManage/index.vue'),
-            meta: {
-              title: '抽奖列表',
-              icon: ''
-            },
-          },
-          {
-            id: 1,
-            path: '/operationManage/luckyDrawManage/addLuckyDraw',
-            name: '/operationManage/luckyDrawManage/addLuckyDraw',
-            hidden:true,
-            component: () => import('@/views/operationManage/luckyDrawManage/addLuckyDraw.vue'),
-            meta: {
-              title: '添加抽奖',
-              icon: '',
-              activeMenu: '/operationManage/luckyDrawManage/index'
-            },
-          },
-          {
-            id: 1,
-            path: '/operationManage/luckyDrawManage/dataList',
-            name: '/operationManage/luckyDrawManage/dataList',
-            hidden:true,
-            component: () => import('@/views/operationManage/luckyDrawManage/dataList.vue'),
-            meta: {
-              title: '中奖数据',
-              icon: '',
-              activeMenu: '/operationManage/luckyDrawManage/index'
-            },
-          },
-          {
-            id: 1,
-            path: '/operationManage/luckyDrawManage/luckyDrawRule',
-            name: '/operationManage/luckyDrawManage/luckyDrawRule',
-            hidden:true,
-            component: () => import('@/views/operationManage/luckyDrawManage/luckyDrawRule.vue'),
-            meta: {
-              title: '活动规则',
-              icon: '',
-              activeMenu: '/operationManage/luckyDrawManage/index'
-            },
-          },
-        ]
-      },
-      {
-        id: 0,
-        path: '/operationManage/activityManage/index',
-        component: operationLayout,
-        meta: {
-          title: '活动管理',
-          icon: ''
-        },
-        alwaysShow: true,
-        children: [{
-            id: 1,
-            path: '/operationManage/activityManage/index',
-            name: '/operationManage/activityManage/index',
-            component: () => import('@/views/operationManage/activityManage/index.vue'),
-            meta: {
-              title: '活动列表',
-              icon: ''
-            },
-          },
-          {
-            id: 1,
-            path: '/operationManage/activityManage/addActivity',
-            name: '/operationManage/activityManage/addActivity',
-            hidden:true,
-            component: () => import('@/views/operationManage/activityManage/addActivity.vue'),
-            meta: {
-              title: '添加活动',
-              icon: '',
-              activeMenu: '/operationManage/activityManage/index'
-            },
-          },
-          {
-            id: 1,
-            path: '/operationManage/activityManage/dataList',
-            name: '/operationManage/activityManage/dataList',
-            hidden:true,
-            component: () => import('@/views/operationManage/activityManage/dataList.vue'),
-            meta: {
-              title: '报名详情',
-              icon: '',
-              activeMenu: '/operationManage/activityManage/index'
-            },
-          },
-        ]
-      },
-      {
-        id: 0,
-        path: '/operationManage/templateManage/index',
-        component: operationLayout,
-        meta: {
-          title: '数据采集模板',
-          icon: ''
-        },
-        alwaysShow: true,
-        children: [{
-            id: 1,
-            path: '/operationManage/templateManage/index',
-            name: '/operationManage/templateManage/index',
-            component: () => import('@/views/operationManage/templateManage/index.vue'),
-            meta: {
-              title: '模板列表',
-              icon: ''
-            },
-          },
-          {
-            id: 1,
-            path: '/operationManage/templateManage/addTemplate',
-            name: '/operationManage/templateManage/addTemplate',
-            hidden:true,
-            component: () => import('@/views/operationManage/templateManage/addTemplate.vue'),
-            meta: {
-              title: '添加模板',
-              icon: '',
-              activeMenu: '/operationManage/templateManage/index'
-            },
-          },
-        ]
-      },
-    ]
-  },
-  {
-    id: 0,
-    path: '/studyManage/index',
-    component: Layout,
-    meta: {
-      title: '研学管理',
-      icon: 'el-icon-s-shop'
-    },
-    alwaysShow: true,
-    children: [
-      {
-        id: 0,
-        path: '/studyManage/bannerManage/index',
-        component: operationLayout,
-        meta: {
-          title: 'banner管理',
-          icon: ''
-        },
-        alwaysShow: true,
-        children: [
-          {
-            id: 1,
-            path: '/studyManage/bannerManage/index',
-            name: '/studyManage/bannerManage/index',
-            component: () => import('@/views/studyManage/bannerManage/index.vue'),
-            meta: {
-              title: 'banner列表',
-              icon: ''
-            },
-          },
-          {
-            id: 1,
-            path: '/studyManage/bannerManage/addBanner',
-            name: '/studyManage/bannerManage/addBanner',
-            hidden:true,
-            component: () => import('@/views/studyManage/bannerManage/addBanner.vue'),
-            meta: {
-              title: '添加banner',
-              icon: '',
-              activeMenu: '/studyManage/bannerManage/index'
-            },
-          }
-        ]
-      },
-      {
-        id: 0,
-        path: '/studyManage/menuManage/index',
-        component: operationLayout,
-        meta: {
-          title: '栏目管理',
-          icon: ''
-        },
-        alwaysShow: true,
-        children: [
-          {
-            id: 1,
-            path: '/studyManage/menuManage/index',
-            name: '/studyManage/menuManage/index',
-            component: () => import('@/views/studyManage/menuManage/index.vue'),
-            meta: {
-              title: '栏目列表',
-              icon: ''
-            },
-          },
-          {
-            id: 1,
-            path: '/studyManage/menuManage/addMenu',
-            name: '/studyManage/menuManage/addMenu',
-            hidden:true,
-            component: () => import('@/views/studyManage/menuManage/addMenu.vue'),
-            meta: {
-              title: '添加栏目',
-              icon: '',
-              activeMenu: '/studyManage/menuManage/index'
-            },
-          }
-        ]
-      },
-      {
-        id: 0,
-        path: '/studyManage/courseManage/index',
-        component: operationLayout,
-        meta: {
-          title: '课程管理',
-          icon: ''
-        },
-        alwaysShow: true,
-        children: [
-          {
-            id: 1,
-            path: '/studyManage/courseManage/index',
-            name: '/studyManage/courseManage/index',
-            component: () => import('@/views/studyManage/courseManage/index.vue'),
-            meta: {
-              title: '课程列表',
-              icon: ''
-            },
-          },
-          {
-            id: 1,
-            path: '/studyManage/courseManage/addCourse',
-            name: '/studyManage/courseManage/addCourse',
-            hidden:true,
-            component: () => import('@/views/studyManage/courseManage/addCourse.vue'),
-            meta: {
-              title: '添加课程',
-              icon: '',
-              activeMenu: '/studyManage/courseManage/index'
-            },
-          }
-        ]
-      },
-      {
-        id: 0,
-        path: '/studyManage/tabManage/index',
-        component: operationLayout,
-        meta: {
-          title: '社区标签',
-          icon: ''
-        },
-        alwaysShow: true,
-        children: [
-          {
-            id: 1,
-            path: '/studyManage/tabManage/index',
-            name: '/studyManage/tabManage/index',
-            component: () => import('@/views/studyManage/tabManage/index.vue'),
-            meta: {
-              title: '标签列表',
-              icon: ''
-            },
-          },
-        ]
-      },
-      {
-        id: 0,
-        path: '/studyManage/communityManage/index',
-        component: operationLayout,
-        meta: {
-          title: '社区管理',
-          icon: ''
-        },
-        alwaysShow: true,
-        children: [
-          {
-            id: 1,
-            path: '/studyManage/communityManage/index',
-            name: '/studyManage/communityManage/index',
-            component: () => import('@/views/studyManage/communityManage/index.vue'),
-            meta: {
-              title: '文章列表',
-              icon: ''
-            },
-          },
-          {
-            id: 1,
-            path: '/studyManage/communityManage/addArticle',
-            name: '/studyManage/communityManage/addArticle',
-            hidden:true,
-            component: () => import('@/views/studyManage/communityManage/addArticle.vue'),
-            meta: {
-              title: '添加文章',
-              icon: '',
-              activeMenu: '/studyManage/communityManage/index'
-            },
-          }
-        ]
-      },
-      {
-        id: 0,
-        path: '/studyManage/questionBankManage/index',
-        component: operationLayout,
-        meta: {
-          title: '试题管理',
-          icon: ''
-        },
-        alwaysShow: true,
-        children: [
-          {
-            id: 1,
-            path: '/studyManage/questionBankManage/index',
-            name: '/studyManage/questionBankManage/index',
-            component: () => import('@/views/studyManage/questionBankManage/index.vue'),
-            meta: {
-              title: '题库列表',
-              icon: ''
-            },
-          },
-          {
-            id: 1,
-            path: '/studyManage/questionBankManage/editQuestions',
-            name: '/studyManage/questionBankManage/editQuestions',
-            hidden:true,
-            component: () => import('@/views/studyManage/questionBankManage/editQuestions.vue'),
-            meta: {
-              title: '编辑试卷',
-              icon: '',
-              activeMenu: '/studyManage/questionBankManage/index'
-            },
-          },
-        ]
-      },
-      {
-        id: 0,
-        path: '/studyManage/subscribeManage/index',
-        component: operationLayout,
-        meta: {
-          title: '预约管理',
-          icon: ''
-        },
-        alwaysShow: true,
-        children: [
-          {
-            id: 1,
-            path: '/studyManage/subscribeManage/index',
-            name: '/studyManage/subscribeManage/index',
-            component: () => import('@/views/studyManage/subscribeManage/index.vue'),
-            meta: {
-              title: '预约列表',
-              icon: ''
-            },
-          },
-        ]
-      },
-    ]
-    },
+  //       ]
+  //     },
+  //     {
+  //       id: 0,
+  //       path: '/operationManage/luckyDrawManage/index',
+  //       component: operationLayout,
+  //       meta: {
+  //         title: '抽奖管理',
+  //         icon: ''
+  //       },
+  //       alwaysShow: true,
+  //       children: [{
+  //           id: 1,
+  //           path: '/operationManage/luckyDrawManage/index',
+  //           name: '/operationManage/luckyDrawManage/index',
+  //           component: () => import('@/views/operationManage/luckyDrawManage/index.vue'),
+  //           meta: {
+  //             title: '抽奖列表',
+  //             icon: ''
+  //           },
+  //         },
+  //         {
+  //           id: 1,
+  //           path: '/operationManage/luckyDrawManage/addLuckyDraw',
+  //           name: '/operationManage/luckyDrawManage/addLuckyDraw',
+  //           hidden:true,
+  //           component: () => import('@/views/operationManage/luckyDrawManage/addLuckyDraw.vue'),
+  //           meta: {
+  //             title: '添加抽奖',
+  //             icon: '',
+  //             activeMenu: '/operationManage/luckyDrawManage/index'
+  //           },
+  //         },
+  //         {
+  //           id: 1,
+  //           path: '/operationManage/luckyDrawManage/dataList',
+  //           name: '/operationManage/luckyDrawManage/dataList',
+  //           hidden:true,
+  //           component: () => import('@/views/operationManage/luckyDrawManage/dataList.vue'),
+  //           meta: {
+  //             title: '中奖数据',
+  //             icon: '',
+  //             activeMenu: '/operationManage/luckyDrawManage/index'
+  //           },
+  //         },
+  //         {
+  //           id: 1,
+  //           path: '/operationManage/luckyDrawManage/luckyDrawRule',
+  //           name: '/operationManage/luckyDrawManage/luckyDrawRule',
+  //           hidden:true,
+  //           component: () => import('@/views/operationManage/luckyDrawManage/luckyDrawRule.vue'),
+  //           meta: {
+  //             title: '活动规则',
+  //             icon: '',
+  //             activeMenu: '/operationManage/luckyDrawManage/index'
+  //           },
+  //         },
+  //       ]
+  //     },
+  //     {
+  //       id: 0,
+  //       path: '/operationManage/activityManage/index',
+  //       component: operationLayout,
+  //       meta: {
+  //         title: '活动管理',
+  //         icon: ''
+  //       },
+  //       alwaysShow: true,
+  //       children: [{
+  //           id: 1,
+  //           path: '/operationManage/activityManage/index',
+  //           name: '/operationManage/activityManage/index',
+  //           component: () => import('@/views/operationManage/activityManage/index.vue'),
+  //           meta: {
+  //             title: '活动列表',
+  //             icon: ''
+  //           },
+  //         },
+  //         {
+  //           id: 1,
+  //           path: '/operationManage/activityManage/addActivity',
+  //           name: '/operationManage/activityManage/addActivity',
+  //           hidden:true,
+  //           component: () => import('@/views/operationManage/activityManage/addActivity.vue'),
+  //           meta: {
+  //             title: '添加活动',
+  //             icon: '',
+  //             activeMenu: '/operationManage/activityManage/index'
+  //           },
+  //         },
+  //         {
+  //           id: 1,
+  //           path: '/operationManage/activityManage/dataList',
+  //           name: '/operationManage/activityManage/dataList',
+  //           hidden:true,
+  //           component: () => import('@/views/operationManage/activityManage/dataList.vue'),
+  //           meta: {
+  //             title: '报名详情',
+  //             icon: '',
+  //             activeMenu: '/operationManage/activityManage/index'
+  //           },
+  //         },
+  //       ]
+  //     },
+  //     {
+  //       id: 0,
+  //       path: '/operationManage/templateManage/index',
+  //       component: operationLayout,
+  //       meta: {
+  //         title: '数据采集模板',
+  //         icon: ''
+  //       },
+  //       alwaysShow: true,
+  //       children: [{
+  //           id: 1,
+  //           path: '/operationManage/templateManage/index',
+  //           name: '/operationManage/templateManage/index',
+  //           component: () => import('@/views/operationManage/templateManage/index.vue'),
+  //           meta: {
+  //             title: '模板列表',
+  //             icon: ''
+  //           },
+  //         },
+  //         {
+  //           id: 1,
+  //           path: '/operationManage/templateManage/addTemplate',
+  //           name: '/operationManage/templateManage/addTemplate',
+  //           hidden:true,
+  //           component: () => import('@/views/operationManage/templateManage/addTemplate.vue'),
+  //           meta: {
+  //             title: '添加模板',
+  //             icon: '',
+  //             activeMenu: '/operationManage/templateManage/index'
+  //           },
+  //         },
+  //       ]
+  //     },
+  //   ]
+  // },
+  // {
+  //   id: 0,
+  //   path: '/studyManage/index',
+  //   component: Layout,
+  //   meta: {
+  //     title: '研学管理',
+  //     icon: 'el-icon-s-shop'
+  //   },
+  //   alwaysShow: true,
+  //   children: [
+  //     {
+  //       id: 0,
+  //       path: '/studyManage/bannerManage/index',
+  //       component: operationLayout,
+  //       meta: {
+  //         title: 'banner管理',
+  //         icon: ''
+  //       },
+  //       alwaysShow: true,
+  //       children: [
+  //         {
+  //           id: 1,
+  //           path: '/studyManage/bannerManage/index',
+  //           name: '/studyManage/bannerManage/index',
+  //           component: () => import('@/views/studyManage/bannerManage/index.vue'),
+  //           meta: {
+  //             title: 'banner列表',
+  //             icon: ''
+  //           },
+  //         },
+  //         {
+  //           id: 1,
+  //           path: '/studyManage/bannerManage/addBanner',
+  //           name: '/studyManage/bannerManage/addBanner',
+  //           hidden:true,
+  //           component: () => import('@/views/studyManage/bannerManage/addBanner.vue'),
+  //           meta: {
+  //             title: '添加banner',
+  //             icon: '',
+  //             activeMenu: '/studyManage/bannerManage/index'
+  //           },
+  //         }
+  //       ]
+  //     },
+  //     {
+  //       id: 0,
+  //       path: '/studyManage/menuManage/index',
+  //       component: operationLayout,
+  //       meta: {
+  //         title: '栏目管理',
+  //         icon: ''
+  //       },
+  //       alwaysShow: true,
+  //       children: [
+  //         {
+  //           id: 1,
+  //           path: '/studyManage/menuManage/index',
+  //           name: '/studyManage/menuManage/index',
+  //           component: () => import('@/views/studyManage/menuManage/index.vue'),
+  //           meta: {
+  //             title: '栏目列表',
+  //             icon: ''
+  //           },
+  //         },
+  //         {
+  //           id: 1,
+  //           path: '/studyManage/menuManage/addMenu',
+  //           name: '/studyManage/menuManage/addMenu',
+  //           hidden:true,
+  //           component: () => import('@/views/studyManage/menuManage/addMenu.vue'),
+  //           meta: {
+  //             title: '添加栏目',
+  //             icon: '',
+  //             activeMenu: '/studyManage/menuManage/index'
+  //           },
+  //         }
+  //       ]
+  //     },
+  //     {
+  //       id: 0,
+  //       path: '/studyManage/courseManage/index',
+  //       component: operationLayout,
+  //       meta: {
+  //         title: '课程管理',
+  //         icon: ''
+  //       },
+  //       alwaysShow: true,
+  //       children: [
+  //         {
+  //           id: 1,
+  //           path: '/studyManage/courseManage/index',
+  //           name: '/studyManage/courseManage/index',
+  //           component: () => import('@/views/studyManage/courseManage/index.vue'),
+  //           meta: {
+  //             title: '课程列表',
+  //             icon: ''
+  //           },
+  //         },
+  //         {
+  //           id: 1,
+  //           path: '/studyManage/courseManage/addCourse',
+  //           name: '/studyManage/courseManage/addCourse',
+  //           hidden:true,
+  //           component: () => import('@/views/studyManage/courseManage/addCourse.vue'),
+  //           meta: {
+  //             title: '添加课程',
+  //             icon: '',
+  //             activeMenu: '/studyManage/courseManage/index'
+  //           },
+  //         }
+  //       ]
+  //     },
+  //     {
+  //       id: 0,
+  //       path: '/studyManage/tabManage/index',
+  //       component: operationLayout,
+  //       meta: {
+  //         title: '社区标签',
+  //         icon: ''
+  //       },
+  //       alwaysShow: true,
+  //       children: [
+  //         {
+  //           id: 1,
+  //           path: '/studyManage/tabManage/index',
+  //           name: '/studyManage/tabManage/index',
+  //           component: () => import('@/views/studyManage/tabManage/index.vue'),
+  //           meta: {
+  //             title: '标签列表',
+  //             icon: ''
+  //           },
+  //         },
+  //       ]
+  //     },
+  //     {
+  //       id: 0,
+  //       path: '/studyManage/communityManage/index',
+  //       component: operationLayout,
+  //       meta: {
+  //         title: '社区管理',
+  //         icon: ''
+  //       },
+  //       alwaysShow: true,
+  //       children: [
+  //         {
+  //           id: 1,
+  //           path: '/studyManage/communityManage/index',
+  //           name: '/studyManage/communityManage/index',
+  //           component: () => import('@/views/studyManage/communityManage/index.vue'),
+  //           meta: {
+  //             title: '文章列表',
+  //             icon: ''
+  //           },
+  //         },
+  //         {
+  //           id: 1,
+  //           path: '/studyManage/communityManage/addArticle',
+  //           name: '/studyManage/communityManage/addArticle',
+  //           hidden:true,
+  //           component: () => import('@/views/studyManage/communityManage/addArticle.vue'),
+  //           meta: {
+  //             title: '添加文章',
+  //             icon: '',
+  //             activeMenu: '/studyManage/communityManage/index'
+  //           },
+  //         }
+  //       ]
+  //     },
+  //     {
+  //       id: 0,
+  //       path: '/studyManage/questionBankManage/index',
+  //       component: operationLayout,
+  //       meta: {
+  //         title: '试题管理',
+  //         icon: ''
+  //       },
+  //       alwaysShow: true,
+  //       children: [
+  //         {
+  //           id: 1,
+  //           path: '/studyManage/questionBankManage/index',
+  //           name: '/studyManage/questionBankManage/index',
+  //           component: () => import('@/views/studyManage/questionBankManage/index.vue'),
+  //           meta: {
+  //             title: '题库列表',
+  //             icon: ''
+  //           },
+  //         },
+  //         {
+  //           id: 1,
+  //           path: '/studyManage/questionBankManage/editQuestions',
+  //           name: '/studyManage/questionBankManage/editQuestions',
+  //           hidden:true,
+  //           component: () => import('@/views/studyManage/questionBankManage/editQuestions.vue'),
+  //           meta: {
+  //             title: '编辑试卷',
+  //             icon: '',
+  //             activeMenu: '/studyManage/questionBankManage/index'
+  //           },
+  //         },
+  //       ]
+  //     },
+  //     {
+  //       id: 0,
+  //       path: '/studyManage/subscribeManage/index',
+  //       component: operationLayout,
+  //       meta: {
+  //         title: '预约管理',
+  //         icon: ''
+  //       },
+  //       alwaysShow: true,
+  //       children: [
+  //         {
+  //           id: 1,
+  //           path: '/studyManage/subscribeManage/index',
+  //           name: '/studyManage/subscribeManage/index',
+  //           component: () => import('@/views/studyManage/subscribeManage/index.vue'),
+  //           meta: {
+  //             title: '预约列表',
+  //             icon: ''
+  //           },
+  //         },
+  //       ]
+  //     },
+  //   ]
+  //   },
 
-    {
-      id: 0,
-      path: '/merchantManage/index',
-      component: Layout,
-      redirect: '/merchantManage/index',
-      meta: {
-        title: '商户管理',
-        icon: 'el-icon-s-shop'
-      },
-      children: [{
-          id: 1,
-          path: '/merchantManage/index',
-          name: '/merchantManage/index',
-          component: () => import('@/views/merchantManage/index.vue'),
-          meta: {
-            title: '商户列表',
-            icon: ''
-          },
-        },
-        {
-          id: 1,
-          path: '/merchantManage/shopDetail',
-          name: '/merchantManage/shopDetail',
-          component: () => import('@/views/merchantManage/shopDetail.vue'),
-          hidden:true,
-          meta: {
-            title: '商户详情',
-            icon: '',
-            activeMenu:'/merchantManage/index'
-          },
-        },
-        {
-          id: 1,
-          hidden:true,
-          path: '/merchantManage/addUser',
-          name: '/merchantManage/addUser',
-          component: () => import('@/views/merchantManage/addUser.vue'),
-          meta: {
-            title: '添加商户',
-            icon: ''
-          },
-        },
-      ]
-    },
-  // 用户管理
-  {
-    id: 0,
-    path: '/userManage/index',
-    component: Layout,
-    meta: {
-      title: '用户管理',
-      icon: 'el-icon-s-shop'
-    },
-    alwaysShow: true,
-    children:[
-      // {
-      //   id: 0,
-      //   path: '/userManage/agentManage',
-      //   component: operationLayout,
-      //   redirect: '/userManage/agentManage',
-      //   meta: {
-      //     title: '渠道商',
-      //     icon: ''
-      //   },
-      //   children: [{
-      //       id: 1,
-      //       path: '/userManage/agentManage/index',
-      //       name: '/userManage/agentManage/index',
-      //       component: () => import('@/views/userManage/agentManage/index.vue'),
-      //       meta: {
-      //         title: '渠道商列表',
-      //         icon: ''
-      //       },
-      //     },
-      //     {
-      //       id: 1,
-      //       path: '/userManage/agentManage/addAgent',
-      //       name: '/userManage/agentManage/addAgent',
-      //       hidden:true,
-      //       component: () => import('@/views/userManage/agentManage/addAgent.vue'),
-      //       meta: {
-      //         title: '添加渠道商',
-      //         icon: ''
-      //       },
-      //     },
-      //     {
-      //       id: 1,
-      //       path: '/userManage/agentManage/editAgent',
-      //       name: '/userManage/agentManage/editAgent',
-      //       hidden:true,
-      //       component: () => import('@/views/userManage/agentManage/editAgent.vue'),
-      //       meta: {
-      //         title: '编辑渠道商',
-      //         icon: ''
-      //       },
-      //     },
-      //   ]
-      // },
-      {
-        id: 0,
-        path: '/userManage/memberManage',
-        component: operationLayout,
-        redirect: '/userManage/memberManage',
-        meta: {
-          title: '会员管理',
-          icon: ''
-        },
-        children: [{
-            id: 1,
-            path: '/userManage/memberManage/index',
-            name: '/userManage/memberManage/index',
-            component: () => import('@/views/userManage/memberManage/index.vue'),
-            meta: {
-              title: '会员列表',
-              icon: ''
-            },
-          },
-          // {
-          //   id: 1,
-          //   path: '/userManage/memberManage/memberDetail',
-          //   name: '/userManage/memberManage/memberDetail',
-          //   component: () => import('@/views/userManage/memberManage/memberDetail.vue'),
-          //   meta: {
-          //     title: '会员详情',
-          //     icon: ''
-          //   },
-          // },
-        ]
-      },
-      // {
-      //   id: 0,
-      //   path: '/userManage/userList',
-      //   component: operationLayout,
-      //   redirect: '/userManage/userList',
-      //   meta: {
-      //     title: '会员管理',
-      //     icon: ''
-      //   },
-      //   children: [{
-      //       id: 1,
-      //       path: '/userManage/userList/index',
-      //       name: '/userManage/userList/index',
-      //       component: () => import('@/views/userManage/userList/index.vue'),
-      //       meta: {
-      //         title: '用户列表',
-      //         icon: ''
-      //       },
-      //     },
-      //   ]
-      // },
-    ]
-  },
+  //   {
+  //     id: 0,
+  //     path: '/merchantManage/index',
+  //     component: Layout,
+  //     redirect: '/merchantManage/index',
+  //     meta: {
+  //       title: '商户管理',
+  //       icon: 'el-icon-s-shop'
+  //     },
+  //     children: [{
+  //         id: 1,
+  //         path: '/merchantManage/index',
+  //         name: '/merchantManage/index',
+  //         component: () => import('@/views/merchantManage/index.vue'),
+  //         meta: {
+  //           title: '商户列表',
+  //           icon: ''
+  //         },
+  //       },
+  //       {
+  //         id: 1,
+  //         path: '/merchantManage/shopDetail',
+  //         name: '/merchantManage/shopDetail',
+  //         component: () => import('@/views/merchantManage/shopDetail.vue'),
+  //         hidden:true,
+  //         meta: {
+  //           title: '商户详情',
+  //           icon: '',
+  //           activeMenu:'/merchantManage/index'
+  //         },
+  //       },
+  //       {
+  //         id: 1,
+  //         hidden:true,
+  //         path: '/merchantManage/addUser',
+  //         name: '/merchantManage/addUser',
+  //         component: () => import('@/views/merchantManage/addUser.vue'),
+  //         meta: {
+  //           title: '添加商户',
+  //           icon: ''
+  //         },
+  //       },
+  //     ]
+  //   },
+  // // 用户管理
+  // {
+  //   id: 0,
+  //   path: '/userManage/index',
+  //   component: Layout,
+  //   meta: {
+  //     title: '用户管理',
+  //     icon: 'el-icon-s-shop'
+  //   },
+  //   alwaysShow: true,
+  //   children:[
+  //     // {
+  //     //   id: 0,
+  //     //   path: '/userManage/agentManage',
+  //     //   component: operationLayout,
+  //     //   redirect: '/userManage/agentManage',
+  //     //   meta: {
+  //     //     title: '渠道商',
+  //     //     icon: ''
+  //     //   },
+  //     //   children: [{
+  //     //       id: 1,
+  //     //       path: '/userManage/agentManage/index',
+  //     //       name: '/userManage/agentManage/index',
+  //     //       component: () => import('@/views/userManage/agentManage/index.vue'),
+  //     //       meta: {
+  //     //         title: '渠道商列表',
+  //     //         icon: ''
+  //     //       },
+  //     //     },
+  //     //     {
+  //     //       id: 1,
+  //     //       path: '/userManage/agentManage/addAgent',
+  //     //       name: '/userManage/agentManage/addAgent',
+  //     //       hidden:true,
+  //     //       component: () => import('@/views/userManage/agentManage/addAgent.vue'),
+  //     //       meta: {
+  //     //         title: '添加渠道商',
+  //     //         icon: ''
+  //     //       },
+  //     //     },
+  //     //     {
+  //     //       id: 1,
+  //     //       path: '/userManage/agentManage/editAgent',
+  //     //       name: '/userManage/agentManage/editAgent',
+  //     //       hidden:true,
+  //     //       component: () => import('@/views/userManage/agentManage/editAgent.vue'),
+  //     //       meta: {
+  //     //         title: '编辑渠道商',
+  //     //         icon: ''
+  //     //       },
+  //     //     },
+  //     //   ]
+  //     // },
+  //     {
+  //       id: 0,
+  //       path: '/userManage/memberManage',
+  //       component: operationLayout,
+  //       redirect: '/userManage/memberManage',
+  //       meta: {
+  //         title: '会员管理',
+  //         icon: ''
+  //       },
+  //       children: [{
+  //           id: 1,
+  //           path: '/userManage/memberManage/index',
+  //           name: '/userManage/memberManage/index',
+  //           component: () => import('@/views/userManage/memberManage/index.vue'),
+  //           meta: {
+  //             title: '会员列表',
+  //             icon: ''
+  //           },
+  //         },
+  //         // {
+  //         //   id: 1,
+  //         //   path: '/userManage/memberManage/memberDetail',
+  //         //   name: '/userManage/memberManage/memberDetail',
+  //         //   component: () => import('@/views/userManage/memberManage/memberDetail.vue'),
+  //         //   meta: {
+  //         //     title: '会员详情',
+  //         //     icon: ''
+  //         //   },
+  //         // },
+  //       ]
+  //     },
+  //     // {
+  //     //   id: 0,
+  //     //   path: '/userManage/userList',
+  //     //   component: operationLayout,
+  //     //   redirect: '/userManage/userList',
+  //     //   meta: {
+  //     //     title: '会员管理',
+  //     //     icon: ''
+  //     //   },
+  //     //   children: [{
+  //     //       id: 1,
+  //     //       path: '/userManage/userList/index',
+  //     //       name: '/userManage/userList/index',
+  //     //       component: () => import('@/views/userManage/userList/index.vue'),
+  //     //       meta: {
+  //     //         title: '用户列表',
+  //     //         icon: ''
+  //     //       },
+  //     //     },
+  //     //   ]
+  //     // },
+  //   ]
+  // },
 
-  {
-    id: 0,
-    path: '/setting/index',
-    component: Layout,
-    meta: {
-      title: '系统设置',
-      icon: 'el-icon-s-shop'
-    },
-    alwaysShow: true,
-    children:[
-      {
-              id: 0,
-              path: '/setting/rulesManage',
-              component: operationLayout,
-              meta: {
-                title: '分账规则',
-                icon: ''
-              },
-              children: [{
-                  id: 1,
-                  path: '/setting/rulesManage',
-                  name: '/setting/rulesManage',
-                  component: () => import('@/views//setting/rulesManage/index.vue'),
-                  meta: {
-                    title: '规则列表',
-                    icon: ''
-                  },
-                },
-              ]
-      },
-      {
-        id: 1,
-        path: '/setting/synchronization',
-        name: '/setting/synchronization',
-        component: () => import('@/views/setting/synchronization.vue'),
-        meta: {
-          title: '同步管理',
-          icon: ''
-        },
-      },
-      {
-        id: 1,
-        path: '/setting/cityList',
-        name: '/setting/cityList',
-        component: () => import('@/views/setting/cityList.vue'),
-        meta: {
-          title: '城市列表',
-          icon: ''
-        },
-      },
-      // {
-      //   id: 0,
-      //   path: '/setting/commissionManage',
-      //   component: operationLayout,
-      //   meta: {
-      //     title: '渠道佣金',
-      //     icon: ''
-      //   },
-      //   children: [{
-      //       id: 1,
-      //       path: '/setting/commissionManage',
-      //       name: '/setting/commissionManage',
-      //       component: () => import('@/views//setting/commissionManage/index.vue'),
-      //       meta: {
-      //         title: '渠道佣金',
-      //         icon: ''
-      //       },
-      //     },
-      //   ]
-      // },
-      {
-        id: 0,
-        path: '/setting/setting',
-        component: operationLayout,
-        meta: {
-          title: '账号设置',
-          icon: ''
-        },
-        children: [{
-            id: 1,
-            path: '/setting/setting',
-            name: '/setting/setting',
-            component: () => import('@/views//setting/setting.vue'),
-            meta: {
-              title: '账号设置',
-              icon: ''
-            },
-          },
-        ]
-      },
-      {
-        id: 0,
-        path: '/setting/base',
-        component: operationLayout,
-        meta: {
-          title: '通用设置',
-          icon: ''
-        },
-        children: [{
-            id: 0,
-            path: '/setting/base',
-            name: '/setting/base',
-            component: () => import('@/views/setting/base.vue'),
-            meta: {
-              title: '通用设置',
-              icon: ''
-            },
-          },
-        ]
-      }
-    ]
-  }
+  // {
+  //   id: 0,
+  //   path: '/setting/index',
+  //   component: Layout,
+  //   meta: {
+  //     title: '系统设置',
+  //     icon: 'el-icon-s-shop'
+  //   },
+  //   alwaysShow: true,
+  //   children:[
+  //     {
+  //             id: 0,
+  //             path: '/setting/rulesManage',
+  //             component: operationLayout,
+  //             meta: {
+  //               title: '分账规则',
+  //               icon: ''
+  //             },
+  //             children: [{
+  //                 id: 1,
+  //                 path: '/setting/rulesManage',
+  //                 name: '/setting/rulesManage',
+  //                 component: () => import('@/views//setting/rulesManage/index.vue'),
+  //                 meta: {
+  //                   title: '规则列表',
+  //                   icon: ''
+  //                 },
+  //               },
+  //             ]
+  //     },
+  //     {
+  //       id: 1,
+  //       path: '/setting/synchronization',
+  //       name: '/setting/synchronization',
+  //       component: () => import('@/views/setting/synchronization.vue'),
+  //       meta: {
+  //         title: '同步管理',
+  //         icon: ''
+  //       },
+  //     },
+  //     {
+  //       id: 1,
+  //       path: '/setting/cityList',
+  //       name: '/setting/cityList',
+  //       component: () => import('@/views/setting/cityList.vue'),
+  //       meta: {
+  //         title: '城市列表',
+  //         icon: ''
+  //       },
+  //     },
+  //     // {
+  //     //   id: 0,
+  //     //   path: '/setting/commissionManage',
+  //     //   component: operationLayout,
+  //     //   meta: {
+  //     //     title: '渠道佣金',
+  //     //     icon: ''
+  //     //   },
+  //     //   children: [{
+  //     //       id: 1,
+  //     //       path: '/setting/commissionManage',
+  //     //       name: '/setting/commissionManage',
+  //     //       component: () => import('@/views//setting/commissionManage/index.vue'),
+  //     //       meta: {
+  //     //         title: '渠道佣金',
+  //     //         icon: ''
+  //     //       },
+  //     //     },
+  //     //   ]
+  //     // },
+  //     {
+  //       id: 0,
+  //       path: '/setting/setting',
+  //       component: operationLayout,
+  //       meta: {
+  //         title: '账号设置',
+  //         icon: ''
+  //       },
+  //       children: [{
+  //           id: 1,
+  //           path: '/setting/setting',
+  //           name: '/setting/setting',
+  //           component: () => import('@/views//setting/setting.vue'),
+  //           meta: {
+  //             title: '账号设置',
+  //             icon: ''
+  //           },
+  //         },
+  //       ]
+  //     },
+  //     {
+  //       id: 0,
+  //       path: '/setting/base',
+  //       component: operationLayout,
+  //       meta: {
+  //         title: '通用设置',
+  //         icon: ''
+  //       },
+  //       children: [{
+  //           id: 0,
+  //           path: '/setting/base',
+  //           name: '/setting/base',
+  //           component: () => import('@/views/setting/base.vue'),
+  //           meta: {
+  //             title: '通用设置',
+  //             icon: ''
+  //           },
+  //         },
+  //       ]
+  //     }
+  //   ]
+  // }
 
   // 404 page must be placed at the end !!!
   // { path: '*', redirect: '/404', hidden: true }

+ 1 - 0
src/store/getters.js

@@ -5,6 +5,7 @@ const getters = {
   refreshToken: state => state.user.refreshToken,
   avatar: state => state.user.avatar,
   menus: state => state.user.menus,
+  btnAuthObj: state => state.user.btnAuthObj,
   name: state => state.user.name
 }
 export default getters

+ 31 - 6
src/store/modules/user.js

@@ -1,4 +1,14 @@
-import { login,getMenuData} from '@/api/auth'
+/*
+ * @Author: wenjie 1454560336@qq.com
+ * @Date: 2024-11-14 15:02:58
+ * @LastEditors: wenjie 1454560336@qq.com
+ * @LastEditTime: 2024-11-25 17:13:07
+ * @FilePath: \admin-manage\src\store\modules\user.js
+ * @Description: 
+ * 
+ * Copyright (c) 2024 by ${git_name_email}, All Rights Reserved. 
+ */
+import { login,getMenuAuth,getAuthButton} from '@/api/auth'
 import { getToken, setToken, removeToken,setREToken } from '@/utils/auth'
 import { resetRouter, asyncRouter } from '@/router'
 import Layout from '@/layout'
@@ -11,7 +21,8 @@ const getDefaultState = () => {
     refreshToken:'',
     name: '',
     avatar: '',
-    menus:null
+    menus:null,
+    btnAuthObj:{},
   }
 }
 
@@ -37,6 +48,9 @@ const mutations = {
   },
   SET_MENU: (state, menus) => {
     state.menus = menus
+  },
+  SET_BTNAUTH: (state, btnAuthObj) => {
+    state.btnAuthObj = btnAuthObj
   }
 }
 
@@ -66,8 +80,10 @@ const actions = {
   // 获取菜单
   getMenu({ commit, state }) {
     return new Promise((resolve, reject) => {
-      getMenuData({menuSource:1}).then(response => {
-        let menuList = response.content.records
+      getMenuAuth({menuSource:1,shopId:0}).then(response => {
+        if(response.state == 'Success'){
+
+        let menuList = response.content
         let list = []
         menuList.map(item=>{
           let obj = {}
@@ -92,7 +108,7 @@ const actions = {
                   component:operationLayout,
                   meta: {
                     title: subItem.menuName,
-                    icon: 'el-icon-s-shop'
+                    // icon: 'el-icon-s-shop'
                   },
                   alwaysShow: true,
                   children:[]
@@ -103,6 +119,7 @@ const actions = {
                       path:i.requestUrl,
                       name:i.requestUrl,
                       component:resolve => require([`@/views${i.requestUrl}`], resolve),
+                      hidden:i.showStatus == 1?false:true,
                       meta: {
                         title: i.menuName,
                       }
@@ -115,10 +132,10 @@ const actions = {
                 subObj = {
                   path: subItem.requestUrl,
                   name: subItem.requestUrl,
+                  hidden:subItem.showStatus == 1?false:true,
                   component:resolve => require([`@/views${subItem.requestUrl}`], resolve),
                   meta: {
                     title: subItem.menuName,
-                    icon: 'el-icon-s-shop'
                   },
                 }
               }
@@ -131,7 +148,15 @@ const actions = {
         list.push({ path: '*', redirect: '/404', hidden: true })
         list = asyncRouter.concat(list)
         commit('SET_MENU', list)
+
+          getAuthButton({shopId:0}).then(res=>{
+            if(res.state == 'Success'){
+                commit('SET_BTNAUTH', res.content)
+            }
+          })
+
         resolve(list)
+        }
       }).catch(error => {
         reject(error)
       })

+ 17 - 34
src/views/authorityManage/menuList.vue

@@ -12,13 +12,18 @@
     style="width: 100%;margin-bottom: 20px;"
     row-key="id"
     border
-    default-expand-all
     :tree-props="{children: 'childs', hasChildren: 'hasChildren'}">
     <el-table-column
       prop="menuName"
       label="菜单名称"
       align="center"
       >
+    </el-table-column>
+     <el-table-column
+      prop="key"
+      label="key"
+      align="center"
+      >
     </el-table-column>
     <el-table-column
       prop="sort"
@@ -71,6 +76,12 @@
                 v-model="setQuery.menuName"
                 class="item-width-300"
                 ></el-input>
+            </el-form-item>
+            <el-form-item label="按钮key:"  prop="key">
+                <el-input
+                v-model="setQuery.key"
+                class="item-width-300"
+                ></el-input>
             </el-form-item>
              <el-form-item label="上级菜单:" v-if="setQuery.menuType != 1"  prop="parentId">
               <el-cascader
@@ -95,7 +106,7 @@
                     <el-radio :label="3">按钮</el-radio>
                 </el-radio-group>
             </el-form-item>
-             <el-form-item label="请求地址:" v-if="setQuery.menuType == 2" prop="requestUrl">
+             <el-form-item label="请求地址:" v-if="setQuery.menuType != 3" prop="requestUrl">
                 <el-input
                 v-model="setQuery.requestUrl"
                 class="item-width-300"
@@ -134,38 +145,7 @@ export default {
       title:"",
       btnLoading:false,
       dialogFormVisible:false,
-      tableData: [{
-          id: 1,
-          date: '2016-05-02',
-          name: '王小虎',
-          address: '上海市普陀区金沙江路 1518 弄'
-        }, {
-          id: 2,
-          date: '2016-05-04',
-          name: '王小虎',
-          address: '上海市普陀区金沙江路 1517 弄'
-        }, {
-          id: 3,
-          date: '2016-05-01',
-          name: '王小虎',
-          address: '上海市普陀区金沙江路 1519 弄',
-          children: [{
-              id: 31,
-              date: '2016-05-01',
-              name: '王小虎',
-              address: '上海市普陀区金沙江路 1519 弄'
-            }, {
-              id: 32,
-              date: '2016-05-01',
-              name: '王小虎',
-              address: '上海市普陀区金沙江路 1519 弄'
-          }]
-        }, {
-          id: 4,
-          date: '2016-05-03',
-          name: '王小虎',
-          address: '上海市普陀区金沙江路 1516 弄'
-        }],
+      tableData: [],
       loading: false,
       options:[
         {
@@ -219,6 +199,7 @@ export default {
             "menuName": row.menuName,
             "menuSource": row.menuSource,
             "menuType": row.menuType,
+            "key": row.key,
             "parentId": row.parentId,
             "requestUrl": row.requestUrl,
             "showStatus": row.showStatus,
@@ -234,6 +215,7 @@ export default {
             "menuSource": 1,
             "menuType": 1,
             "parentId": "",
+            "key": "",
             "requestUrl": "",
             "showStatus": 1,
             "sort": 0
@@ -310,6 +292,7 @@ export default {
             "id": res.content.id,
             "menuName": res.content.menuName,
             "menuSource": res.content.menuSource,
+            "key": res.content.key,
             "menuType": res.content.menuType,
             "parentId": res.content.parentId,
             "requestUrl": res.content.requestUrl,

+ 17 - 4
src/views/authorityManage/roleList.vue

@@ -146,7 +146,6 @@
                 style="margin-top: 10px;"
                 :data="data"
                 show-checkbox
-                default-expand-all
                 node-key="id"
                 ref="tree"
                 highlight-current
@@ -227,6 +226,7 @@ export default {
       dialogFormVisible: false,
       query: {
         "roleName":'',
+        "roleSource":1,
         "start":'',
         "end":'',
         "currentPage": 1,
@@ -282,8 +282,16 @@ export default {
           "sourceId": row.sourceId,
           "status": row.status
         }
+        let parentIds = this.data.map(item => {
+          return item.id
+        })
+        let authRang = this.setQuery.authRang.map(item=>{
+          if(!parentIds.includes(item)){
+            return item
+          }
+        })
         this.$nextTick(() => {
-          this.$refs.tree.setCheckedKeys(this.setQuery.authRang)
+          this.$refs.tree.setCheckedKeys(authRang)
         })
      
     },
@@ -344,9 +352,14 @@ export default {
         }
       })
     },
+    getId(){
+    },
     save(){
-       console.log(this.$refs.tree.getCheckedKeys());
-       this.setQuery.authRang = this.$refs.tree.getCheckedKeys().join(',')
+      // let list = this.$refs.tree.getCheckedNodes(false,true).map(item=>item.id).join(',')
+
+      //  console.log(this.$refs.tree.getCheckedKeys(false,true),list);
+      //  this.setQuery.authRang = this.$refs.tree.getCheckedKeys(false,true).join(',')
+       this.setQuery.authRang = this.$refs.tree.getCheckedNodes(false,true).map(item=>item.id).join(',')
         this.$refs.setQuery.validate((v) => {
         if (v) {
           this.btnLoading = true

+ 157 - 100
src/views/authorityManage/userList.vue

@@ -72,16 +72,23 @@
     >
       <el-table-column
         align="center"
-        label="角色名称"
-        prop="activityName"
+        label="姓名"
+        prop="employeeName"
         show-overflow-tooltip
       >
       </el-table-column>
       
       <el-table-column
         align="center"
-        label="备注"
-        prop="status"
+        label="登录账号"
+        prop="phoneNum"
+        show-overflow-tooltip
+      >
+      </el-table-column>
+       <el-table-column
+        align="center"
+        label="角色"
+        prop="roleName"
         show-overflow-tooltip
       >
       </el-table-column>
@@ -91,11 +98,14 @@
         prop="status"
         show-overflow-tooltip
       >
+        <template slot-scope="scope">
+          {{scope.row.status === 1 ? '启用' : '禁用'}}
+        </template>
       </el-table-column>
        <el-table-column
         align="center"
         label="创建时间"
-        prop="status"
+        prop="createTime"
         show-overflow-tooltip
       >
       </el-table-column>
@@ -103,8 +113,7 @@
        <el-table-column prop="address" align="center" label="操作">
         <template slot-scope="scope">
           <el-button type="text" size="small" @click="handleEdit(scope.row)">编辑</el-button>
-          <el-button type="text" size="small" @click="handleEdit(scope.row)">权限分配</el-button>
-          <el-button type="text" size="small" @click="handleDel(scope.row.id)">删除</el-button>
+          <el-button type="text" size="small" @click="handleDel(scope.row)">{{scope.row.status === 1 ? '禁用' : '启用'}}</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -126,24 +135,24 @@
         <el-form label-width="130px" :model="setQuery"
         ref="setQuery"
         :rules="rules">
-            <el-form-item label="姓名:"  prop="paperName">
+            <el-form-item label="姓名:"  prop="employeeName">
                 <el-input
-                v-model="setQuery.paperName"
+                v-model="setQuery.employeeName"
                 class="item-width-300"
                 ></el-input>
             </el-form-item>
-            <el-form-item label="登录账号:"  prop="paperName">
+            <el-form-item label="登录账号:"  prop="phoneNum">
                 <el-input
-                v-model="setQuery.paperName"
+                v-model="setQuery.phoneNum"
+                :maxlength="11"
                 class="item-width-300"
                 ></el-input>
             </el-form-item>
              
-            <el-form-item label="角色:"  prop="questionsNum">
+            <el-form-item label="角色:"  prop="roleId">
               <el-select
-                v-model="query.activityType"
-                size="small"
-                class="item-width-200 ml10"
+                v-model="setQuery.roleId"
+                class="item-width-300"
                 placeholder="请选择角色"
                 clearable
                 >
@@ -156,18 +165,18 @@
                     </el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item label="状态:"  prop="paperName">
-               <el-radio-group v-model="setQuery.type">
+            <el-form-item label="状态:"  prop="status">
+               <el-radio-group v-model="setQuery.status">
                     <el-radio :label="1">启用</el-radio>
                     <el-radio :label="2">禁用</el-radio>
                 </el-radio-group>
             </el-form-item>
 
-              <el-form-item label="原始密码" prop="old">
-                <el-input type="text" :maxlength="16" class="item-width-300" v-model="setQuery.old" autocomplete="off"></el-input>
+              <el-form-item label="登录密码" prop="password">
+                <el-input type="text" :maxlength="16" class="item-width-300" v-model="setQuery.password" autocomplete="off"></el-input>
             </el-form-item>
-            <el-form-item label="新的密码" prop="pwd">
-                <el-input type="text" :maxlength="16" class="item-width-300" v-model="setQuery.pwd" autocomplete="off"></el-input>
+            <el-form-item label="确认密码" prop="confirmPass">
+                <el-input type="text" :maxlength="16" class="item-width-300" v-model="setQuery.confirmPass" autocomplete="off"></el-input>
             </el-form-item>
            
         </el-form>
@@ -181,51 +190,12 @@
 </template>
 
   <script>
-  import {activityList,activityDel,activityStop} from '@/api/activity'
+  import {getUserList,enableUser,addUser,updateUser,getAllRole} from '@/api/auth'
 export default {
   name: "userList",
   data() {
     return {
         date:'',
-        data: [{
-          id: 1,
-          label: '一级 1',
-          children: [{
-            id: 4,
-            label: '二级 1-1',
-            children: [{
-              id: 9,
-              label: '三级 1-1-1'
-            }, {
-              id: 10,
-              label: '三级 1-1-2'
-            }]
-          }]
-        }, {
-          id: 2,
-          label: '一级 2',
-          children: [{
-            id: 5,
-            label: '二级 2-1'
-          }, {
-            id: 6,
-            label: '二级 2-2'
-          }]
-        }, {
-          id: 3,
-          label: '一级 3',
-          children: [{
-            id: 7,
-            label: '二级 3-1'
-          }, {
-            id: 8,
-            label: '二级 3-2'
-          }]
-        }],
-        defaultProps: {
-          children: 'children',
-          label: 'label'
-        },
       options:[
         {
           value:1,
@@ -251,19 +221,47 @@ export default {
       setQuery: {
        type:1
       },
-      rules:{
-         old:[
-            { required:true,message:'请填写旧密码', trigger: 'blur' }
-        ],
-        pwd: [
-            { required:true,message:'请填写新密码', trigger: 'blur' }
-
-        ],
-      },
       title: "",
       total: 0,
     };
   },
+  computed: {
+    rules(){
+      if(this.title == '添加'){
+        return {
+          employeeName:[
+              { required:true,message:'请填写用户名', trigger: 'blur' }
+          ],
+          phoneNum: [
+              { required:true,message:'请填写手机号', trigger: 'blur' }
+          ],
+          roleId: [
+              { required:true,message:'请选择角色', trigger: 'change' }
+          ],
+          password:[
+              { required:true,message:'请填写密码', trigger: 'blur' }
+          ],
+          confirmPass:[
+              { required:true,message:'请填写确认密码', trigger: 'blur' }
+          ],
+        }
+      }else{
+        return {
+          employeeName:[
+              { required:true,message:'请填写用户名', trigger: 'blur' }
+          ],
+          phoneNum: [
+              { required:true,message:'请填写手机号', trigger: 'blur' }
+          ],
+          roleId: [
+              { required:true,message:'请选择角色', trigger: 'change' }
+          ],
+          
+        }
+      }
+    }
+
+   },
   watch: {
     date(val){
       if(val){
@@ -279,23 +277,43 @@ export default {
     handleEdit(row){
         this.title = "编辑"
         this.dialogFormVisible = true
+        this.setQuery = {
+            "id": row.id,
+            "confirmPass": row.confirmPass,
+            "password": row.password,
+            "phoneNum": row.phoneNum,
+            "employeeName": row.employeeName,
+            "roleId": row.roleId,
+            "shopId": 0,
+            "status": row.status
+        }
      
     },
     handleAdd(){
         this.title = "添加"
         this.dialogFormVisible = true
+        this.setQuery = {
+            "confirmPass": "",
+            "employeeName": "",
+            "password": "",
+            "phoneNum": "",
+            "roleId": "",
+            "shopId": 0,
+            "status": 1
+        }
     },
     handleSearch(){
       this.query.currentPage = 1
-      this.activityList();
+      this.getUserList();
     },
-    handleDel(id){
-         this.$confirm(`此操作将删除该活动, 是否继续?`, "提示", {
+    handleDel(row){
+      let msg = row.status == 1 ? '禁用' : '启用'
+        this.$confirm(`此操作将${msg}该数据, 是否继续?`, "提示", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",
             type: "warning",
         }).then(() => {
-          activityDel({id}).then(res=>{
+          enableUser({id:row.id}).then(res=>{
             if(res.state == 'Success'){
                this.$notify({
                 title: "成功",
@@ -306,49 +324,88 @@ export default {
             }
           })
         })
+       
     },
     handleSizeChange(val) {
       this.query.currentPage = 1;
       this.query.pageSize = val;
-      this.activityList()
+      this.getUserList()
     },
     handleCurrentChange(val) {
       this.query.currentPage = val;
-      this.activityList()
+      this.getUserList()
+    },
+    getUserList(){
+      this.loading = true
+      getUserList(this.query).then(res=>{
+        this.loading = false
+        if(res.state == 'Success'){
+          this.tableData = res.content.records
+          this.total = res.content.total
+        }
+      })
     },
-    activityList(){
-    //   this.loading = true
-    //   activityList(this.query).then(res=>{
-    //     this.loading = false
-    //     if(res.state == 'Success'){
-    //       this.tableData = res.content.records
-    //       this.total = res.content.total
-    //     }
-    //   })
+    getAllRole(){
+      getAllRole({roleSource:1}).then(res=>{
+        if(res.state == 'Success'){
+          this.options = []
+          for (const key in res.content) {
+            this.options.push({
+              value: Number(key),
+              label: res.content[key]
+            })
+          }
+        }
+      })
     },
+    
     save(){
         this.$refs.setQuery.validate((v) => {
         if (v) {
-        //   this.btnLoading = true
-        //   addOrUpdatePaper(this.setQuery).then(res=>{
-        //     this.btnLoading = false
-        //     if(res.state == 'Success'){
-                this.dialogFormVisible = false
-        //       this.$notify({
-        //           title: '成功',
-        //           message: '操作成功',
-        //           type: 'success'
-        //         });
-        //         this.query.currentPage = 1
-        //         this.paperList();
-        //     }
-        //   })
+          this.btnLoading = true
+          if(this.title == "添加"){
+            addUser(this.setQuery).then(res=>{
+              this.btnLoading = false
+              if(res.state == 'Success'){
+                  this.dialogFormVisible = false
+                  this.$notify({
+                    title: '成功',
+                    message: '操作成功',
+                    type: 'success'
+                  });
+                  this.handleSearch();
+              }
+            })
+          }else{
+            let setQuery = JSON.parse(JSON.stringify(this.setQuery))
+            if(!setQuery.password){
+              delete setQuery.password
+            }
+            if(!setQuery.confirmPass){
+              delete setQuery.confirmPass
+            }
+             updateUser(setQuery).then(res=>{
+              this.btnLoading = false
+              if(res.state == 'Success'){
+                  this.dialogFormVisible = false
+                  this.$notify({
+                    title: '成功',
+                    message: '操作成功',
+                    type: 'success'
+                  });
+                  this.handleSearch();
+              }
+            })
+          }
+         
         }
       });
     }
   },
   created() {
-    this.activityList()
+    this.getUserList()
+    this.getAllRole()
+    
   },
 };
 </script>

+ 6 - 5
src/views/operationManage/activityManage/index.vue

@@ -53,6 +53,7 @@
         <el-button
             type="primary"
             size="small"
+            v-if="btnAuthObj.addSignUp"
             @click="handleAdd"
         >
             添加
@@ -103,11 +104,11 @@
 
        <el-table-column prop="address" align="center" label="操作">
         <template slot-scope="scope">
-          <el-button type="text" size="small" @click="handleData(scope.row.id)">数据</el-button>
-          <el-button type="text" size="small" v-if="scope.row.status != '已结束'" @click="handleShare(scope.row)">分享</el-button>
-          <el-button type="text" size="small" @click="handleDetail(scope.row, scope.row.status != '已结束'?'edit':'detail')">{{scope.row.status != '已结束'?'编辑':'查看'}}</el-button>
-          <el-button type="text" size="small" v-if="scope.row.status != '已结束'" @click="handleStop(scope.row.id)">停止</el-button>
-          <el-button type="text" size="small" @click="handleDel(scope.row.id)">删除</el-button>
+          <el-button type="text" size="small" v-if="btnAuthObj.signUpDataList" @click="handleData(scope.row.id)">数据</el-button>
+          <el-button type="text" size="small" v-if="scope.row.status != '已结束'&&btnAuthObj.shareSignUp" @click="handleShare(scope.row)">分享</el-button>
+          <el-button type="text" size="small" v-if="btnAuthObj.signUpDetail" @click="handleDetail(scope.row, scope.row.status != '已结束'?'edit':'detail')">{{scope.row.status != '已结束'?'编辑':'查看'}}</el-button>
+          <el-button type="text" size="small" v-if="scope.row.status != '已结束'&&btnAuthObj.stopSignUp" @click="handleStop(scope.row.id)">停止</el-button>
+          <el-button type="text" size="small" v-if="btnAuthObj.delSignUp" @click="handleDel(scope.row.id)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>

+ 3 - 3
src/views/operationManage/advertisingManage/index.vue

@@ -43,7 +43,7 @@
         搜索
       </el-button>
       </div>
-      <el-button class="add-btn" type="primary" size="small" @click="handleAdd"
+      <el-button class="add-btn" type="primary" size="small" v-if="btnAuthObj.addAdvertising" @click="handleAdd"
         >添加</el-button
       >
     </div>
@@ -111,8 +111,8 @@
       </el-table-column>
       <el-table-column prop="address" align="center" label="操作">
         <template slot-scope="scope">
-          <el-button type="text" size="small" @click="handleEdit(scope.row)">编辑</el-button>
-          <el-button type="text" size="small" @click="handleDel(scope.row.id)">删除</el-button>
+          <el-button type="text" size="small" v-if="btnAuthObj.editAdvertising" @click="handleEdit(scope.row)">编辑</el-button>
+          <el-button type="text" size="small" v-if="btnAuthObj.delAdvertising" @click="handleDel(scope.row.id)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>

+ 3 - 3
src/views/operationManage/appMenuManage/index.vue

@@ -28,7 +28,7 @@
         搜索
       </el-button>
       </div>
-      <el-button class="add-btn" type="primary" size="small" @click="handleAdd"
+      <el-button class="add-btn" type="primary" size="small" v-if="btnAuthObj.addMenu" @click="handleAdd"
         >添加</el-button
       >
     </div>
@@ -96,8 +96,8 @@
       <el-table-column prop="address" align="center" label="操作">
         <template slot-scope="scope">
           <el-button type="text" size="small" v-if="$route.query.title != '二级菜单'" @click="handle(scope.row.id)">查看下级</el-button>
-          <el-button type="text" size="small" @click="handleEdit(scope.row)">编辑</el-button>
-          <el-button type="text" size="small" @click="handleDel(scope.row.id)">删除</el-button>
+          <el-button type="text" size="small" v-if="btnAuthObj.editMenu" @click="handleEdit(scope.row)">编辑</el-button>
+          <el-button type="text" size="small" v-if="btnAuthObj.delMenu" @click="handleDel(scope.row.id)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>

+ 3 - 3
src/views/operationManage/bannerManage/index.vue

@@ -50,7 +50,7 @@
         搜索
       </el-button>
       </div>
-      <el-button class="add-btn" type="primary" size="small" @click="handleAdd"
+      <el-button class="add-btn" type="primary" size="small" v-if="btnAuthObj.addBanner" @click="handleAdd"
         >添加</el-button
       >
     </div>
@@ -119,8 +119,8 @@
       </el-table-column>
       <el-table-column prop="address" align="center" label="操作">
         <template slot-scope="scope">
-          <el-button type="text" size="small" @click="handleEdit(scope.row)">编辑</el-button>
-          <el-button type="text" size="small" @click="handleDel(scope.row.id)">删除</el-button>
+          <el-button type="text" size="small" v-if="btnAuthObj.editBanner" @click="handleEdit(scope.row)">编辑</el-button>
+          <el-button type="text" size="small" v-if="btnAuthObj.delBanner" @click="handleDel(scope.row.id)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>

+ 5 - 4
src/views/operationManage/comboManage/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="comboManage app-container">
     <div class="search">
-      <el-button class="add-btn" type="primary" size="small" @click="handleAdd"
+      <el-button class="add-btn" type="primary" size="small" v-if="btnAuthObj.editGoodType" @click="handleAdd"
         >添加</el-button
       >
     </div>
@@ -77,17 +77,18 @@
           <el-button
             type="text"
             size="small"
+            v-if="btnAuthObj.enableCombo"
             @click="handle(scope.row)"
             >{{ scope.row.status == 1 ? "禁用" : "启用" }}</el-button
           >
 
-          <el-button type="text" size="small" @click="handleEdit(scope.row.id)"
+          <el-button type="text" size="small" v-if="btnAuthObj.editCombo" @click="handleEdit(scope.row.id)"
             >修改</el-button
           >
-          <el-button type="text" size="small" @click="handleEditEquities(scope.row.setMealCode)"
+          <el-button type="text" size="small" v-if="btnAuthObj.configCombo" @click="handleEditEquities(scope.row.setMealCode)"
             >权益配置</el-button
           >
-          <el-button type="text" size="small" @click="handleDel(scope.row)"
+          <el-button type="text" size="small" v-if="btnAuthObj.delCombo" @click="handleDel(scope.row)"
             >删除</el-button
           >
         </template>

+ 2 - 2
src/views/operationManage/comboManage/logList.vue

@@ -2,7 +2,7 @@
  * @Author: wenjie 1454560336@qq.com
  * @Date: 2024-07-11 13:51:26
  * @LastEditors: wenjie 1454560336@qq.com
- * @LastEditTime: 2024-09-09 17:43:27
+ * @LastEditTime: 2024-11-22 15:43:14
  * @FilePath: \admin-manage\src\views\operationManage\comboManage\logList.vue
  * @Description: 
  * 
@@ -125,7 +125,7 @@
       <el-table-column align="center" label="操作">
         <template slot-scope="scope">
 
-          <el-button type="text" size="small" v-if="scope.row.status == 1" @click="handleCommit(scope.row.id)"
+          <el-button type="text" size="small" v-if="scope.row.status == 1&&btnAuthObj.send" @click="handleCommit(scope.row.id)"
             >发放</el-button
           >
           <!-- <el-button type="text" size="small" @click="handleDel(scope.row.id)"

+ 2 - 2
src/views/operationManage/comboManage/vipActivation.vue

@@ -180,14 +180,14 @@
           <el-button
             type="text"
             size="small"
-            v-if="scope.row.groupType === 2"
+            v-if="scope.row.groupType === 2&&btnAuthObj.createVipActivationl"
             @click="gotoGenerating(scope.row)"
             >生成激活码</el-button
           >
           <el-button
             type="text"
             size="small"
-            v-else
+             v-if="scope.row.groupType != 2&&btnAuthObj.vipActivationDetail"
             @click="codeDetails(scope.row)"
             >查看激活码</el-button
           >

+ 5 - 2
src/views/operationManage/couponManage/index.vue

@@ -39,6 +39,7 @@
           class="add-btn"
           type="primary"
           size="small"
+          v-if="btnAuthObj.addCoupon"
           @click="handleAdd('/operationManage/couponManage/refuelCoupon')"
         >
           立即添加
@@ -182,18 +183,20 @@
           <el-button
             type="text"
             size="small"
+            v-if="btnAuthObj.couponDetail"
             @click="handleDetail(scope.row,'detail')"
             >查看</el-button
           >
            <el-button
             type="text"
             size="small"
+            v-if="btnAuthObj.editCoupon"
             @click="handleDetail(scope.row,'edit')"
             >编辑</el-button
           >
         
-           <el-button type="text" size="small" v-if="scope.row.status == '进行中'" @click="handle(scope.row.id)">停止</el-button>
-          <el-button type="text" size="small" v-else @click="handleDel(scope.row.id)"
+           <el-button type="text" size="small" v-if="scope.row.status == '进行中'&&btnAuthObj.stopCoupon" @click="handle(scope.row.id)">停止</el-button>
+          <el-button type="text" size="small" v-if="scope.row.status != '进行中'&&btnAuthObj.delCoupon" @click="handleDel(scope.row.id)"
             >删除</el-button
           >
         </template>

+ 1 - 1
src/views/operationManage/financeManage/withdraw.vue

@@ -14,7 +14,7 @@
 
         <div class="value-box">
           <div class="text">{{money.ready}}</div>
-           <el-button class="btn" size="small" type="primary" @click="handleWithdraw">提现</el-button>
+           <el-button class="btn" size="small" type="primary" v-if="btnAuthObj.withdraw" @click="handleWithdraw">提现</el-button>
         </div>
       </div>
        <div class="item">

+ 23 - 9
src/views/operationManage/goodsManage/goodsDetail.vue

@@ -2,7 +2,7 @@
  * @Author: wj 1454560336@qq.com
  * @Date: 2023-11-24 14:39:54
  * @LastEditors: wenjie 1454560336@qq.com
- * @LastEditTime: 2024-11-11 17:23:24
+ * @LastEditTime: 2024-12-02 09:11:47
  * @FilePath: \admin-manage\src\views\operationManage\goodsManage\goodsDetail.vue
  * @Description: 
  * 
@@ -69,14 +69,16 @@
             </el-input>
           </el-form-item>
 
-        <template v-if="setQuery.prePlatformType && mode=='audit'">
+        <!-- <template v-if="setQuery.prePlatformType && mode=='audit'"> -->
+        <template v-if="setQuery.prices">
           <el-form-item label="商品操作平台商品信息:">
-            <div class="platformType">{{filterMasterName(setQuery.prePlatformType)}}</div>
+            <div class="platformType">{{filterMasterName(filterCurrentData().platformType)}}</div>
+            <!-- <div class="platformType">{{filterCurrentData()}}</div> -->
           </el-form-item>
            <el-form-item label="售价:" prop="platformPrice">
             <el-input
               type="number"
-              v-model="setQuery.platformPrice"
+              v-model="filterCurrentData().price"
               class="item-width-300"
             >
               <template slot="append">元</template>
@@ -85,7 +87,7 @@
         </template>
 
 
-        <el-form-item v-if="setQuery.prePlatformType && mode=='detail'" label="商品操作平台商品信息:">
+        <!-- <el-form-item v-if="setQuery.prePlatformType && mode=='detail'" label="商品操作平台商品信息:">
           <el-checkbox-group v-model="setQuery.platformType" prop="platformType">
             <div class="flex" v-for="(item,index) in setQuery.prices" :key="index" ><el-checkbox :label="item.platformType">{{filterMasterName(item.platformType) }}</el-checkbox> 
             <el-form-item  >
@@ -95,10 +97,10 @@
             </el-form-item>
             </div>
           </el-checkbox-group>
-        </el-form-item>
+        </el-form-item> -->
 
 
-          <el-form-item label="售价:" v-else-if="!setQuery.prePlatformType" prop="realPrice">
+          <el-form-item label="售价:" v-else prop="realPrice">
             <el-input
               type="number"
               v-model="setQuery.realPrice"
@@ -431,7 +433,7 @@
       <el-button type="primary" :loading="loading"  @click="save(2)">通过</el-button>
     </div>
     <div class="btn-group" v-else-if="mode == 'edit'">
-      <el-button   :loading="loading"  @click="">取消</el-button>
+      <!-- <el-button   :loading="loading"  @click="">取消</el-button> -->
       <el-button type="primary" :loading="loading"  @click="save()">保存</el-button>
     </div>
   </div>
@@ -633,7 +635,16 @@ export default Vue.extend({
     },
   },
   methods: {
+    filterCurrentData(){
+      let data
+      this.setQuery.prices.forEach(item=>{
+        if(item.platformType == this.$route.query.source){
+          data = item
+        }
+      })
+      return data
 
+    },
     add(index, key) {
       //最外层的index,属性名,内部输入框的index
       let obj;
@@ -721,7 +732,8 @@ export default Vue.extend({
                 "shareId": shareId,
                 "shopId":shopId,
                 "taxRate": 0,
-                "withdrawalRate": 0
+                "withdrawalRate": 0,
+                "platform":this.$route.query.source,
             }
             goodsSet(obj).then((res) => {
               this.loading = false;
@@ -753,6 +765,8 @@ export default Vue.extend({
             "labelId":this.showGoodsLabel == 1? this.labelId:null,
             "checkDetail": this.setQuery.checkDetail,
             "checkUserId": localStorage.getItem('epid'),
+            "platformType": this.$route.query.source,
+
             }).then(res=>{
               this.loading = false
               if(res.state == 'Success'){

+ 4 - 4
src/views/operationManage/goodsManage/homeGoodsSet.vue

@@ -37,13 +37,13 @@
 
     <div class="search">
       <div>
-          <el-button class="add-btn" type="primary" size="small" :disabled="!pids.length" @click="handleBatch(true)"
+          <el-button class="add-btn" type="primary" size="small" :disabled="!pids.length" v-if="btnAuthObj.blacklist" @click="handleBatch(true)"
           >批量加入黑名单</el-button
         >
       </div>
 
       <div>
-        <el-button class="add-btn" size="small" @click="handleSetting"
+        <el-button class="add-btn" size="small" v-if="btnAuthObj.setProduct" @click="handleSetting"
           >产品配置</el-button
         >
         <el-button class="add-btn" size="small" @click="handleList"
@@ -131,7 +131,7 @@
       <el-table-column align="center" label="操作">
         <template slot-scope="scope">
    
-          <el-button type="text" size="small" @click="handleDel(scope.row,true)"
+          <el-button type="text" size="small" v-if="btnAuthObj.blacklist" @click="handleDel(scope.row,true)"
             >加入黑名单</el-button
           >
         </template>
@@ -234,7 +234,7 @@
         <el-table-column align="center" label="操作">
           <template slot-scope="scope">
 
-            <el-button type="text" size="small" @click="handleDel(scope.row,false)"
+            <el-button type="text" size="small" v-if="btnAuthObj.blacklist" @click="handleDel(scope.row,false)"
               >移除黑名单</el-button
             >
           </template>

+ 7 - 6
src/views/operationManage/goodsManage/index.vue

@@ -105,7 +105,7 @@
           fit
         >
        <template slot-scope="scope">
-            <div>{{filterMasterName(scope.row.prePlatformType)}}</div>
+            <div>{{filterMasterName(scope.row.source)}}</div>
           </template>
         </el-table-column>
 
@@ -153,11 +153,11 @@
 
       <el-table-column prop="address" align="center" label="操作">
         <template slot-scope="scope">
-           <el-button type="text" size="small" v-if="activeName== '上架商品' || activeName== '审核未通过商品'" @click="handleDetail(scope.row,'detail')">查看</el-button>
-          <el-button type="text" size="small" v-if="activeName== '待审核商品'" @click="handleDetail(scope.row,'audit')">审核</el-button>
-          <el-button type="text" size="small" v-else-if="activeName== '上架商品'" @click="handleDetail(scope.row,'edit')">配置</el-button>
-          <el-button v-if="scope.row.status == 3" type="text" size="small" @click="handleApply(scope.row,4)">下架</el-button>
-          <el-button v-if="scope.row.status == 4" type="text" size="small" @click="handleApply(scope.row,3)">上架</el-button>
+           <el-button type="text" size="small" v-if="(activeName== '上架商品' || activeName== '审核未通过商品')&&btnAuthObj.editGoodType" @click="handleDetail(scope.row,'detail')">查看</el-button>
+          <el-button type="text" size="small" v-if="activeName== '待审核商品'&&btnAuthObj.auditGoodType" @click="handleDetail(scope.row,'audit')">审核</el-button>
+          <el-button type="text" size="small" v-else-if="activeName== '上架商品'&&btnAuthObj.setGoods" @click="handleDetail(scope.row,'edit')">配置</el-button>
+          <el-button v-if="scope.row.status == 3&&btnAuthObj.publishOutGood" type="text" size="small" @click="handleApply(scope.row,4)">下架</el-button>
+          <el-button v-if="scope.row.status == 4&&btnAuthObj.publishGood" type="text" size="small" @click="handleApply(scope.row,3)">上架</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -283,6 +283,7 @@ export default {
         path:'/operationManage/goodsManage/goodsDetail',
         query:{
           id:row.goodsId,
+          source:row.source,
           mode,
           // shopId:row.shopId
         }

+ 11 - 11
src/views/operationManage/goodsManage/labelList.vue

@@ -9,7 +9,7 @@
           placeholder="请输入名称"
           class="item-width-200 "
         ></el-input>
-          <el-select
+          <!-- <el-select
           v-model="platformType"
           multiple
           size="small"
@@ -24,7 +24,7 @@
             :value="item.value"
           >
           </el-option>
-        </el-select>
+        </el-select> -->
          <el-button
         class="ml10"
         type="primary"
@@ -50,7 +50,7 @@
           </el-option>
         </el-select> -->
       </div>
-      <el-button class="add-btn" type="primary" size="small" @click="handleAdd"
+      <el-button class="add-btn" type="primary" size="small" v-if="btnAuthObj.addLabel" @click="handleAdd"
         >添加</el-button
       >
     </div>
@@ -71,7 +71,7 @@
       >
       </el-table-column>
 
-      <el-table-column
+      <!-- <el-table-column
         prop="accountChildType"
         align="center"
         label="所属平台"
@@ -80,7 +80,7 @@
       <template slot-scope="scope">
         {{filterMasterName(scope.row.platformType )}}
       </template>
-      </el-table-column>
+      </el-table-column> -->
       
       <el-table-column
         prop="createTime"
@@ -92,8 +92,8 @@
 
       <el-table-column prop="address" align="center" label="操作">
         <template slot-scope="scope">
-          <el-button type="text" size="small" @click="handleEdit(scope.row)">编辑</el-button>
-          <el-button type="text" size="small" @click="handleDel(scope.row.id)">删除</el-button>
+          <el-button type="text" size="small" v-if="btnAuthObj.editLabel" @click="handleEdit(scope.row)">编辑</el-button>
+          <el-button type="text" size="small" v-if="btnAuthObj.delLabel" @click="handleDel(scope.row.id)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -119,7 +119,7 @@
         label-width="130px"
         >
           
-        <el-form-item label="所属平台:" prop="labelName">
+        <!-- <el-form-item label="所属平台:" prop="labelName">
             <el-select
             v-model="setQuery.platformType"
             clearable
@@ -134,7 +134,7 @@
             >
             </el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="标签名称:" prop="labelName">
             <el-input
             v-model="setQuery.labelName"
@@ -167,7 +167,7 @@ export default {
       btnLoading: false,
       platformType:"",
       query: {
-        platformType:null,
+        // platformType:null,
         // labelType: '',
         labelName: "",
         currentPage: 1,
@@ -219,7 +219,7 @@ export default {
      this.setQuery ={
         "id": 0,
         "labelName": "",
-        platformType:"",
+        platformType:1,
 
         // "labelType": 0
       }

+ 2 - 2
src/views/operationManage/goodsManage/productLibrary.vue

@@ -44,7 +44,7 @@
         搜索
       </el-button>
       </div>
-       <el-button class="add-btn" type="primary" size="small" @click="handleAdd"
+       <el-button class="add-btn" type="primary" size="small" v-if="btnAuthObj.addProduct" @click="handleAdd"
         >添加</el-button
       >
     
@@ -123,7 +123,7 @@
       </el-table-column>
        <el-table-column align="center" label="操作">
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click="handleEdit(scope.row)"
+            <el-button type="text" size="small" v-if="btnAuthObj.editProduct" @click="handleEdit(scope.row)"
               >编辑</el-button
             >
           </template>

+ 3 - 3
src/views/operationManage/goodsType/index.vue

@@ -34,7 +34,7 @@
           </el-option>
         </el-select> -->
       </div>
-      <el-button class="add-btn" type="primary" size="small" @click="handleAdd"
+      <el-button class="add-btn" v-if="btnAuthObj.addGoodType" type="primary" size="small"  @click="handleAdd"
         >添加</el-button
       >
     </div>
@@ -66,8 +66,8 @@
       <el-table-column prop="address" align="center" label="操作">
         <template slot-scope="scope">
           <el-button type="text" size="small" v-if="!$route.query.id" @click="handle(scope.row.id)">查看下级</el-button>
-          <el-button type="text" size="small" @click="handleEdit(scope.row)">编辑</el-button>
-          <el-button type="text" size="small" @click="handleDel(scope.row.id)">删除</el-button>
+          <el-button type="text" size="small" v-if="btnAuthObj.editGoodType" @click="handleEdit(scope.row)">编辑</el-button>
+          <el-button type="text" size="small" v-if="btnAuthObj.delGoodType" @click="handleDel(scope.row.id)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>

+ 5 - 4
src/views/operationManage/luckyDrawManage/index.vue

@@ -53,6 +53,7 @@
         <el-button
             type="primary"
             size="small"
+            v-if="btnAuthObj.addLucky"
             @click="handleAdd"
         >
             添加
@@ -129,11 +130,11 @@
 
        <el-table-column prop="address" align="center" label="操作">
         <template slot-scope="scope">
-          <el-button type="text" size="small" @click="handleData(scope.row.id)">中奖数据</el-button>
+          <el-button type="text" size="small" v-if="btnAuthObj.luckyDatalist" @click="handleData(scope.row.id)">中奖数据</el-button>
           <!-- <el-button type="text" size="small" v-if="scope.row.status != '已结束'" @click="handleShare(scope.row)">分享</el-button> -->
-          <el-button type="text" size="small" @click="handleEdit(scope.row,'edit')">编辑</el-button>
-          <el-button type="text" size="small" @click="handleStop(scope.row.id,scope.row.raffleStatus)">{{scope.row.raffleStatus==1?'停止':'开启'}}</el-button>
-          <el-button type="text" size="small" @click="handleRule(scope.row.id)">活动规则</el-button>
+          <el-button type="text" size="small" v-if="btnAuthObj.editLucky" @click="handleEdit(scope.row,'edit')">编辑</el-button>
+          <el-button type="text" size="small" v-if="btnAuthObj.stopLucky" @click="handleStop(scope.row.id,scope.row.raffleStatus)">{{scope.row.raffleStatus==1?'停止':'开启'}}</el-button>
+          <el-button type="text" size="small" v-if="btnAuthObj.luckyRules" @click="handleRule(scope.row.id)">活动规则</el-button>
         </template>
       </el-table-column>
     </el-table>

+ 3 - 3
src/views/operationManage/marketingManage/index.vue

@@ -21,7 +21,7 @@
         搜索
       </el-button>
       </div>
-       <el-button class="add-btn" type="primary" size="small" @click="handleAdd"
+       <el-button class="add-btn" type="primary" size="small" v-if="btnAuthObj.addActivity" @click="handleAdd"
         >添加</el-button
       >
     </div>
@@ -71,10 +71,10 @@
 
       <el-table-column align="center" label="操作">
         <template slot-scope="scope">
-          <el-button type="text" size="small" @click="handleEdit(scope.row)"
+          <el-button type="text" size="small" v-if="btnAuthObj.editActivity" @click="handleEdit(scope.row)"
             >编辑</el-button
           >
-          <el-button type="text" size="small" @click="handleDel(scope.row.id)"
+          <el-button type="text" size="small" v-if="btnAuthObj.delActivity" @click="handleDel(scope.row.id)"
             >删除</el-button
           >
         </template>

+ 3 - 3
src/views/operationManage/marketingManage/invitePromotion/index.vue

@@ -10,7 +10,7 @@
         </el-button>
       </div>
 
-      <el-button class="add-btn" type="primary" size="small" @click="handleAdd(0)">
+      <el-button class="add-btn" type="primary" size="small" v-if="btnAuthObj.addRules" @click="handleAdd(0)">
         添加
       </el-button>
 
@@ -45,8 +45,8 @@
 
       <el-table-column prop="address" width="180px" fixed="right" align="center" label="操作">
         <template slot-scope="scope">
-          <el-button type="text" size="small" @click="handleEdit(scope.row)">编辑</el-button>
-          <el-button type="text" size="small" @click="handleDel(scope.row.id)">删除</el-button>
+          <el-button type="text" size="small" v-if="btnAuthObj.editRules" @click="handleEdit(scope.row)">编辑</el-button>
+          <el-button type="text" size="small" v-if="btnAuthObj.delRules" @click="handleDel(scope.row.id)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>

+ 1 - 1
src/views/operationManage/orderManage/index.vue

@@ -128,7 +128,7 @@
       </el-table-column>
        <el-table-column prop="address" align="center" label="操作">
         <template slot-scope="scope">
-          <el-button type="text" size="small" @click="handleDetail(scope.row)">详情</el-button>
+          <el-button type="text" size="small" v-if="btnAuthObj.payOrderDetail" @click="handleDetail(scope.row)">详情</el-button>
         </template>
       </el-table-column>
     </el-table>

+ 2 - 2
src/views/operationManage/orderManage/list.vue

@@ -194,9 +194,9 @@
       </el-table-column>
        <el-table-column prop="address" align="center" label="操作">
         <template slot-scope="scope">
-          <el-button type="text" size="small" @click="handleDetail(scope.row,'detail')">详情</el-button>
+          <el-button type="text" size="small" v-if="btnAuthObj.goodsOrderDetail" @click="handleDetail(scope.row,'detail')">详情</el-button>
           <!-- 拒绝退款和申请退款都显示 -->
-          <el-button type="text" size="small" v-if="(scope.row.goodsModelList[0].refundLog&&scope.row.goodsModelList[0].refundLog.refund == 'REFUSAL_REFUND')||scope.row.goodsModelList[0].goodsState == 'APPLY_REFUND'&&scope.row.goodsModelList[0].jobFlowMap!='XiaoJu'" @click="handleDetail(scope.row,'refund')">介入处理</el-button>
+          <el-button type="text" size="small" v-if="((scope.row.goodsModelList[0].refundLog&&scope.row.goodsModelList[0].refundLog.refund == 'REFUSAL_REFUND')||scope.row.goodsModelList[0].goodsState == 'APPLY_REFUND')&&scope.row.goodsModelList[0].jobFlowMap!='XiaoJu'&&btnAuthObj.operation" @click="handleDetail(scope.row,'refund')">介入处理</el-button>
         </template>
       </el-table-column>
     </el-table>

+ 6 - 3
src/views/operationManage/shopManage/index.vue

@@ -69,6 +69,7 @@
         class="add-btn"
         type="primary"
         size="small"
+        v-if="btnAuthObj.addShop"
         @click="handleAdd(0)"
       >
         添加
@@ -127,7 +128,7 @@
       >
       <template slot-scope="scope">
         <div class="flex">
-          {{ filterMasterName(scope.row.platformType) }}
+          {{ filterMasterName(scope.row.shopPlatformType) }}
         </div>
         </template>
       </el-table-column>
@@ -171,6 +172,7 @@
           <el-button
             type="text"
             size="small"
+            v-if="btnAuthObj.shopDetail"
             @click="handleDetail(scope.row.shopId)"
             >店铺资料</el-button
           >
@@ -183,13 +185,14 @@
           <el-button
             type="text"
             size="small"
+            v-if="btnAuthObj.shopCode"
             @click="checkCode(scope.row.shopId,scope.row.shopName)"
             >收款码</el-button
           >
-           <el-button type="text" size="small" @click="handle(scope.row)">{{
+           <el-button type="text" size="small" v-if="btnAuthObj.enableShop" @click="handle(scope.row)">{{
             scope.row.state == 1 ? "禁用" : "启用"
           }}</el-button>
-          <el-button type="text" size="small" @click="handleDel(scope.row.shopId)"
+          <el-button type="text" size="small" v-if="btnAuthObj.delShop" @click="handleDel(scope.row.shopId)"
             >删除</el-button
           >
         </template>

+ 5 - 4
src/views/operationManage/templateManage/index.vue

@@ -23,6 +23,7 @@
         <el-button
             type="primary"
             size="small"
+            v-if="btnAuthObj.addTemplate"
             @click="handleAdd"
         >
             添加
@@ -57,10 +58,10 @@
       
        <el-table-column prop="address" align="center" label="操作">
         <template slot-scope="scope">
-          <el-button type="text" size="small" @click="handleDetail(scope.row.id,'edit')">编辑</el-button>
-          <el-button type="text" size="small" @click="handleCopy(scope.row.id)">复制</el-button>
-          <el-button type="text" size="small" @click="handleOperate(scope.row.id,scope.row.status == 1?2:1)">{{scope.row.status == 1?'停用':'启用'}}</el-button>
-          <el-button type="text" class="red" size="small" @click="handleOperate(scope.row.id,3)">删除</el-button>
+          <el-button type="text" size="small" v-if="btnAuthObj.templateDetail" @click="handleDetail(scope.row.id,'edit')">编辑</el-button>
+          <el-button type="text" size="small" v-if="btnAuthObj.copyTemplate" @click="handleCopy(scope.row.id)">复制</el-button>
+          <el-button type="text" size="small" v-if="btnAuthObj.stopTemplate" @click="handleOperate(scope.row.id,scope.row.status == 1?2:1)">{{scope.row.status == 1?'停用':'启用'}}</el-button>
+          <el-button type="text" class="red" size="small" v-if="btnAuthObj.delTemplate" @click="handleOperate(scope.row.id,3)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>