diff --git a/src/router/index.js b/src/router/index.js index 7094ec3..9555023 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -12,7 +12,7 @@ const routes = [ redirect: '/home/index', meta: { title: '主页', - roles: ['admin', 'editor'], + roles: ['master', 'admin', 'editor'], hidden: true } }, @@ -22,7 +22,7 @@ const routes = [ meta: { title: '概况', icon: 'iconfont icon-fuwudiqiu', - roles: ['admin', 'editor'], + roles: ['master', 'admin', 'editor'], tapName: 'plane' }, redirect: '/home/index', @@ -33,7 +33,7 @@ const routes = [ meta: { title: '概况', icon: 'iconfont icon-fuwudiqiu', - roles: ['admin', 'editor'], + roles: ['master', 'admin', 'editor'], tapName: 'plane' } }, @@ -43,7 +43,7 @@ const routes = [ meta: { title: '设置', icon: 'iconfont icon-shezhi', - roles: ['admin', 'editor'], + roles: ['master', 'admin', 'editor'], tapName: 'plane', hidden: true } @@ -55,7 +55,7 @@ const routes = [ component: Login, meta: { title: '登录', - roles: ['admin', 'editor'], + roles: ['master', 'admin', 'editor'], hidden: true } }, @@ -66,7 +66,7 @@ const routes = [ meta: { title: '机型管理', icon: 'iconfont icon-chuiqigudingyi', - roles: ['admin', 'editor'], + roles: ['master', 'admin'], tapName: 'plane' }, children: [ @@ -76,7 +76,7 @@ const routes = [ meta: { title: '机型列表', icon: 'el-icon-tickets', - roles: ['admin', 'editor'], + roles: ['master', 'admin'], tapName: 'plane' } }, @@ -86,7 +86,7 @@ const routes = [ meta: { title: '机型添加', icon: 'el-icon-plus', - roles: ['admin', 'editor'], + roles: ['master', 'admin'], tapName: 'plane', hidden: true } @@ -97,7 +97,7 @@ const routes = [ meta: { title: '机型更新', icon: 'el-icon-edit', - roles: ['admin', 'editor'], + roles: ['master', 'admin'], tapName: 'plane', hidden: true } @@ -111,7 +111,7 @@ const routes = [ meta: { title: '飞机管理', icon: 'el-icon-edit-outline', - roles: ['admin', 'editor'], + roles: ['master', 'admin'], tapName: 'plane' }, children: [ @@ -121,7 +121,7 @@ const routes = [ meta: { title: '飞机列表', icon: 'el-icon-tickets', - roles: ['admin', 'editor'], + roles: ['master', 'admin'], tapName: 'plane' } }, @@ -131,7 +131,7 @@ const routes = [ meta: { title: '飞机添加', icon: 'el-icon-plus', - roles: ['admin', 'editor'], + roles: ['master', 'admin'], tapName: 'plane', hidden: true } @@ -142,7 +142,7 @@ const routes = [ meta: { title: '飞机更新', icon: 'el-icon-edit', - roles: ['admin', 'editor'], + roles: ['master', 'admin'], tapName: 'plane', hidden: true } @@ -153,7 +153,7 @@ const routes = [ meta: { title: '飞机对频', icon: 'el-icon-link', - roles: ['admin', 'editor'], + roles: ['master', 'admin'], tapName: 'plane', hidden: true } @@ -164,7 +164,7 @@ const routes = [ meta: { title: '飞行数据统计', icon: 'el-icon-data-line', - roles: ['admin', 'editor'], + roles: ['master', 'admin'], tapName: 'plane', hidden: true } @@ -178,7 +178,7 @@ const routes = [ meta: { title: '飞行限制', icon: 'iconfont icon-jinfeiqu', - roles: ['admin', 'editor'], + roles: ['master', 'admin'], tapName: 'plane' }, children: [ @@ -188,7 +188,7 @@ const routes = [ meta: { title: '禁飞区设置', icon: 'iconfont icon-huizhi', - roles: ['admin', 'editor'], + roles: ['master', 'admin'], tapName: 'plane' } }, @@ -198,7 +198,7 @@ const routes = [ meta: { title: '限飞区设置', icon: 'iconfont icon-huizhi', - roles: ['admin', 'editor'], + roles: ['master', 'admin'], tapName: 'plane' } } @@ -211,7 +211,7 @@ const routes = [ meta: { title: '航线管理', icon: 'iconfont icon-feihangluxian', - roles: ['admin', 'editor'], + roles: ['master', 'admin'], tapName: 'plane' }, children: [ @@ -221,7 +221,7 @@ const routes = [ meta: { title: '航线列表', icon: 'iconfont icon-a-05-1-1jihuazhihanggenzong', - roles: ['admin', 'editor'], + roles: ['master', 'admin'], tapName: 'plane' } }, @@ -231,7 +231,7 @@ const routes = [ meta: { title: '航线设计', icon: 'iconfont icon-huizhi', - roles: ['admin', 'editor'], + roles: ['master', 'admin'], tapName: 'plane' } }, @@ -241,7 +241,7 @@ const routes = [ meta: { title: '航线编辑', icon: 'iconfont icon-huizhi', - roles: ['admin', 'editor'], + roles: ['master', 'admin'], tapName: 'plane', hidden: true } @@ -255,7 +255,7 @@ const routes = [ meta: { title: '站点管理', icon: 'iconfont icon-zhandianguanli', - roles: ['admin', 'editor'], + roles: ['master', 'admin'], tapName: 'plane' }, children: [ @@ -265,7 +265,7 @@ const routes = [ meta: { title: '站点列表', icon: 'el-icon-tickets', - roles: ['admin', 'editor'], + roles: ['master', 'admin'], tapName: 'plane' } }, @@ -275,7 +275,7 @@ const routes = [ meta: { title: '站点添加', icon: 'el-icon-plus', - roles: ['admin', 'editor'], + roles: ['master', 'admin'], tapName: 'plane', hidden: true } @@ -286,7 +286,7 @@ const routes = [ meta: { title: '站点更新', icon: 'el-icon-edit', - roles: ['admin', 'editor'], + roles: ['master', 'admin'], tapName: 'plane', hidden: true } @@ -300,7 +300,7 @@ const routes = [ meta: { title: '无人机', icon: 'iconfont icon-wurenji', - roles: ['admin', 'editor'], + roles: ['master', 'admin'], tapName: 'plane' }, children: [ @@ -310,7 +310,7 @@ const routes = [ meta: { title: '集群控制', icon: 'iconfont icon-a-jiqunkongzhianniu_huaban1', - roles: ['admin', 'editor'], + roles: ['master', 'admin'], tapName: 'plane' } }, @@ -320,7 +320,7 @@ const routes = [ meta: { title: '飞机加载中', icon: 'el-icon-loading', - roles: ['admin', 'editor'], + roles: ['master', 'admin'], tapName: 'plane' } } @@ -333,7 +333,7 @@ const routes = [ meta: { title: '商铺管理', icon: 'iconfont icon-a-shanghu_choose2x1', - roles: ['admin', 'editor'], + roles: ['master', 'admin'], tapName: 'admin' }, children: [ @@ -343,7 +343,7 @@ const routes = [ meta: { title: '商铺设置', icon: 'iconfont icon-dianpuguanli', - roles: ['admin', 'editor'], + roles: ['master', 'admin'], tapName: 'admin' } }, @@ -353,7 +353,7 @@ const routes = [ meta: { title: '商铺添加', icon: 'iconfont icon-check', - roles: ['admin', 'editor'], + roles: ['master'], tapName: 'admin' } } @@ -366,7 +366,7 @@ const routes = [ meta: { title: '管理员管理', icon: 'iconfont icon-guanliyuan', - roles: ['admin', 'editor'], + roles: ['master', 'admin'], tapName: 'admin' }, children: [ @@ -376,7 +376,7 @@ const routes = [ meta: { title: '账户列表', icon: 'iconfont icon-yonghuguanli', - roles: ['admin', 'editor'], + roles: ['master', 'admin'], tapName: 'admin' } }, @@ -386,7 +386,7 @@ const routes = [ meta: { title: '账户添加', icon: 'iconfont icon-xinzengguanliyuan', - roles: ['admin', 'editor'], + roles: ['master', 'admin'], tapName: 'admin', hidden: true } @@ -397,7 +397,7 @@ const routes = [ meta: { title: '账户编辑', icon: 'iconfont icon-huizhi', - roles: ['admin', 'editor'], + roles: ['master', 'admin'], tapName: 'admin', hidden: true } @@ -411,7 +411,7 @@ const routes = [ meta: { title: '公告管理', icon: 'el-icon-microphone', - roles: ['admin', 'editor'], + roles: ['master', 'admin', 'editor'], tapName: 'admin' }, children: [ @@ -421,7 +421,7 @@ const routes = [ meta: { title: '公告列表', icon: 'el-icon-chat-line-square', - roles: ['admin', 'editor'], + roles: ['master', 'admin', 'editor'], tapName: 'admin' } }, @@ -431,7 +431,7 @@ const routes = [ meta: { title: '发布公告', icon: 'el-icon-microphone', - roles: ['admin', 'editor'], + roles: ['master', 'admin', 'editor'], tapName: 'admin' } } @@ -444,7 +444,7 @@ const routes = [ meta: { title: '分类管理', icon: 'iconfont icon-a-ziliaocaozuoxianshifenleishu', - roles: ['admin', 'editor'], + roles: ['master', 'admin', 'editor'], tapName: 'admin' }, children: [ @@ -454,7 +454,7 @@ const routes = [ meta: { title: '分类管理', icon: 'iconfont icon-a-ziliaocaozuoxianshifenleishu', - roles: ['admin', 'editor'], + roles: ['master', 'admin', 'editor'], tapName: 'admin' } } @@ -467,7 +467,7 @@ const routes = [ meta: { title: '商品管理', icon: 'iconfont icon-chanpin', - roles: ['admin', 'editor'], + roles: ['master', 'admin', 'editor'], tapName: 'admin' }, children: [ @@ -477,7 +477,7 @@ const routes = [ meta: { title: 'SPU列表', icon: 'iconfont icon-chanpinliebiao-02', - roles: ['admin', 'editor'], + roles: ['master', 'admin', 'editor'], tapName: 'admin' } }, @@ -487,7 +487,7 @@ const routes = [ meta: { title: 'SPU添加', icon: 'iconfont icon-huoquchanpin', - roles: ['admin', 'editor'], + roles: ['master', 'admin', 'editor'], tapName: 'admin', hidden: true } @@ -498,7 +498,7 @@ const routes = [ meta: { title: 'SPU编辑', icon: 'iconfont icon-huoquchanpin', - roles: ['admin', 'editor'], + roles: ['master', 'admin', 'editor'], tapName: 'admin', hidden: true } @@ -509,7 +509,7 @@ const routes = [ meta: { title: 'SKU列表', icon: 'iconfont icon-sku', - roles: ['admin', 'editor'], + roles: ['master', 'admin', 'editor'], tapName: 'admin' } }, @@ -519,7 +519,7 @@ const routes = [ meta: { title: 'SKU添加', icon: 'iconfont icon-sku1', - roles: ['admin', 'editor'], + roles: ['master', 'admin', 'editor'], tapName: 'admin', hidden: true } @@ -530,7 +530,7 @@ const routes = [ meta: { title: 'SKU编辑', icon: 'iconfont icon-sku1', - roles: ['admin', 'editor'], + roles: ['master', 'admin', 'editor'], tapName: 'admin', hidden: true } @@ -544,7 +544,7 @@ const routes = [ meta: { title: '广告管理', icon: 'iconfont icon-guanggao', - roles: ['admin', 'editor'], + roles: ['master', 'admin', 'editor'], tapName: 'admin' }, children: [ @@ -554,7 +554,7 @@ const routes = [ meta: { title: 'banner设置', icon: 'iconfont icon-banner', - roles: ['admin', 'editor'], + roles: ['master', 'admin', 'editor'], tapName: 'admin' } }, @@ -564,7 +564,7 @@ const routes = [ meta: { title: '滚动通知设置', icon: 'iconfont icon-m-gundongwenzi', - roles: ['admin', 'editor'], + roles: ['master', 'admin', 'editor'], tapName: 'admin' } } @@ -577,7 +577,7 @@ const routes = [ meta: { title: '订单与统计', icon: 'iconfont icon-dingdantongji', - roles: ['admin', 'editor'], + roles: ['master', 'admin', 'editor'], tapName: 'admin' }, children: [ @@ -587,7 +587,7 @@ const routes = [ meta: { title: '订单管理', icon: 'iconfont icon-a-SalesOrderManagement', - roles: ['admin', 'editor'], + roles: ['master', 'admin', 'editor'], tapName: 'admin' } }, @@ -597,7 +597,7 @@ const routes = [ meta: { title: '订单详情', icon: 'iconfont icon-a-SalesOrderManagement', - roles: ['admin', 'editor'], + roles: ['master', 'admin', 'editor'], tapName: 'admin', hidden: true } @@ -608,7 +608,7 @@ const routes = [ meta: { title: '销售统计', icon: 'iconfont icon-data-view', - roles: ['admin', 'editor'], + roles: ['master', 'admin', 'editor'], tapName: 'admin' } } @@ -619,7 +619,7 @@ const routes = [ component: Page404, meta: { title: '404', - roles: ['admin', 'editor'], + roles: ['master', 'admin', 'editor'], hidden: true } }, @@ -628,7 +628,7 @@ const routes = [ redirect: '/', meta: { title: '主页', - roles: ['admin', 'editor'], + roles: ['master', 'admin', 'editor'], hidden: true } } diff --git a/src/store/index.js b/src/store/index.js index 0754733..085739c 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -295,6 +295,7 @@ const store = new Vuex.Store({ params.append('name', form.name) params.append('uname', form.uname) params.append('pwd', form.pwd) + params.append('role', form.role === 'admin' ? 5 : 6) params.append('shop_id', form.shop_id) params.append('upFile', form.upFile) const res = await api.post('addAdmin', params, 'Admin') @@ -317,6 +318,7 @@ const store = new Vuex.Store({ params.append('shop_id', form.shop_id) params.append('uname', form.uname) params.append('pwd', form.pwd) + params.append('role', form.role === 'admin' ? 5 : 6) params.append('upFile', form.upFile) params.append('oldFile', form.oldFile) const res = await api.post('saveAdmin', params, 'Admin') diff --git a/src/views/layout/components/main/admin/add.vue b/src/views/layout/components/main/admin/add.vue index a604893..75278b8 100644 --- a/src/views/layout/components/main/admin/add.vue +++ b/src/views/layout/components/main/admin/add.vue @@ -136,6 +136,7 @@ export default { const data = { name: this.admin.name, uname: this.admin.uname, + role: this.admin.role === 5 ? 'admin' : 'editor', oldFile: this.admin.photo, shop_id: this.admin.shop_id }