From 0a5e16bd39f1d1e5d758728bb9c4ae6176f27f69 Mon Sep 17 00:00:00 2001 From: karl Date: Wed, 31 Jul 2024 16:45:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8A=A0=E7=9B=9F=E5=95=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/src/router/index.js | 12 +++--- admin/src/views/admin/index.vue | 15 +++++++ admin/vue.config.js | 3 +- .../app/admin/controller/AdminController.php | 4 ++ .../app/admin/controller/FollowController.php | 42 +++++++++++++++++++ .../app/admin/controller/IndexController.php | 12 +++++- service/public/index.html | 2 +- .../{app.c40ff1c4.css => app.c1ab260d.css} | 0 ...6f451e.css => chunk-03e0c360.d8319abc.css} | 0 ...d4ddec.css => chunk-0bfa76a9.a9a4c581.css} | 0 ...4c460d.css => chunk-2b905db8.0066d622.css} | 0 ...cca511.css => chunk-630c52ac.a829b29e.css} | 0 ...247fed.css => chunk-73120fe4.5bba4edf.css} | 0 ...16a548.css => chunk-758bae1c.5e444339.css} | 0 ...7afa9e.css => chunk-7fdc61f5.c43bc853.css} | 0 ...a6f16d.css => chunk-a672369a.a2c6d206.css} | 0 ...85ddc0.css => chunk-f14cda0a.c3011210.css} | 0 .../js/{app.8e8f29bc.js => app.f8ff22e5.js} | 2 +- ...42a7f37f.js => chunk-023b2e94.b28fdf1a.js} | 0 ...eba91d92.js => chunk-03e0c360.d82d471c.js} | 0 ...e2881e31.js => chunk-0bfa76a9.6dfdbc58.js} | 0 ...a73870d5.js => chunk-120ad319.ac35d461.js} | 0 .../static/js/chunk-2681d490.065bcab2.js | 1 + .../static/js/chunk-2681d490.2f755c55.js | 1 - ...e0427e1c.js => chunk-2b905db8.e175341d.js} | 0 ...7d6cb8ef.js => chunk-2d0de3a1.7fb4833f.js} | 0 ...b0596de7.js => chunk-2d21a050.09dc3952.js} | 0 ...94ba54df.js => chunk-46a84215.c42fe5c3.js} | 0 ...b04f148a.js => chunk-5b015b61.91b0054a.js} | 0 ...0aa9ce1c.js => chunk-5d3a368d.be6ba18f.js} | 0 ...a33f97ac.js => chunk-630c52ac.b07e5dbd.js} | 0 ...d881b121.js => chunk-6e1eea3c.bf0aeb2c.js} | 0 ...f8420141.js => chunk-6fb398b6.3d13de40.js} | 0 ...77d9d715.js => chunk-73120fe4.8c312986.js} | 0 ...a9c50bbb.js => chunk-758bae1c.17e1ce79.js} | 0 ...9cb26548.js => chunk-7fdc61f5.64073e81.js} | 0 ...d42974d8.js => chunk-865f36c8.8ca18ea1.js} | 0 ...653d7d0b.js => chunk-91a3134e.518132c8.js} | 0 ...b6141b6e.js => chunk-a672369a.e1b2ab7a.js} | 0 ...a6d3b36b.js => chunk-bc86863a.f9b7c3b8.js} | 0 ...4386310d.js => chunk-d8b473a4.beff5c9e.js} | 0 ...e797664.js => chunk-elementUI.0dc151ab.js} | 0 ...8339be8a.js => chunk-f00febf4.92ee5e9b.js} | 0 ...73c90572.js => chunk-f14cda0a.d8e43220.js} | 0 ...ibs.7d4b5e4a.js => chunk-libs.7f7bba00.js} | 0 45 files changed, 82 insertions(+), 12 deletions(-) rename service/public/static/css/{app.c40ff1c4.css => app.c1ab260d.css} (100%) rename service/public/static/css/{chunk-03e0c360.056f451e.css => chunk-03e0c360.d8319abc.css} (100%) rename service/public/static/css/{chunk-0bfa76a9.e1d4ddec.css => chunk-0bfa76a9.a9a4c581.css} (100%) rename service/public/static/css/{chunk-2b905db8.5d4c460d.css => chunk-2b905db8.0066d622.css} (100%) rename service/public/static/css/{chunk-630c52ac.6dcca511.css => chunk-630c52ac.a829b29e.css} (100%) rename service/public/static/css/{chunk-73120fe4.f2247fed.css => chunk-73120fe4.5bba4edf.css} (100%) rename service/public/static/css/{chunk-758bae1c.8816a548.css => chunk-758bae1c.5e444339.css} (100%) rename service/public/static/css/{chunk-7fdc61f5.727afa9e.css => chunk-7fdc61f5.c43bc853.css} (100%) rename service/public/static/css/{chunk-a672369a.26a6f16d.css => chunk-a672369a.a2c6d206.css} (100%) rename service/public/static/css/{chunk-f14cda0a.c385ddc0.css => chunk-f14cda0a.c3011210.css} (100%) rename service/public/static/js/{app.8e8f29bc.js => app.f8ff22e5.js} (72%) rename service/public/static/js/{chunk-023b2e94.42a7f37f.js => chunk-023b2e94.b28fdf1a.js} (100%) rename service/public/static/js/{chunk-03e0c360.eba91d92.js => chunk-03e0c360.d82d471c.js} (100%) rename service/public/static/js/{chunk-0bfa76a9.e2881e31.js => chunk-0bfa76a9.6dfdbc58.js} (100%) rename service/public/static/js/{chunk-120ad319.a73870d5.js => chunk-120ad319.ac35d461.js} (100%) create mode 100644 service/public/static/js/chunk-2681d490.065bcab2.js delete mode 100644 service/public/static/js/chunk-2681d490.2f755c55.js rename service/public/static/js/{chunk-2b905db8.e0427e1c.js => chunk-2b905db8.e175341d.js} (100%) rename service/public/static/js/{chunk-2d0de3a1.7d6cb8ef.js => chunk-2d0de3a1.7fb4833f.js} (100%) rename service/public/static/js/{chunk-2d21a050.b0596de7.js => chunk-2d21a050.09dc3952.js} (100%) rename service/public/static/js/{chunk-46a84215.94ba54df.js => chunk-46a84215.c42fe5c3.js} (100%) rename service/public/static/js/{chunk-5b015b61.b04f148a.js => chunk-5b015b61.91b0054a.js} (100%) rename service/public/static/js/{chunk-5d3a368d.0aa9ce1c.js => chunk-5d3a368d.be6ba18f.js} (100%) rename service/public/static/js/{chunk-630c52ac.a33f97ac.js => chunk-630c52ac.b07e5dbd.js} (100%) rename service/public/static/js/{chunk-6e1eea3c.d881b121.js => chunk-6e1eea3c.bf0aeb2c.js} (100%) rename service/public/static/js/{chunk-6fb398b6.f8420141.js => chunk-6fb398b6.3d13de40.js} (100%) rename service/public/static/js/{chunk-73120fe4.77d9d715.js => chunk-73120fe4.8c312986.js} (100%) rename service/public/static/js/{chunk-758bae1c.a9c50bbb.js => chunk-758bae1c.17e1ce79.js} (100%) rename service/public/static/js/{chunk-7fdc61f5.9cb26548.js => chunk-7fdc61f5.64073e81.js} (100%) rename service/public/static/js/{chunk-865f36c8.d42974d8.js => chunk-865f36c8.8ca18ea1.js} (100%) rename service/public/static/js/{chunk-91a3134e.653d7d0b.js => chunk-91a3134e.518132c8.js} (100%) rename service/public/static/js/{chunk-a672369a.b6141b6e.js => chunk-a672369a.e1b2ab7a.js} (100%) rename service/public/static/js/{chunk-bc86863a.a6d3b36b.js => chunk-bc86863a.f9b7c3b8.js} (100%) rename service/public/static/js/{chunk-d8b473a4.4386310d.js => chunk-d8b473a4.beff5c9e.js} (100%) rename service/public/static/js/{chunk-elementUI.ae797664.js => chunk-elementUI.0dc151ab.js} (100%) rename service/public/static/js/{chunk-f00febf4.8339be8a.js => chunk-f00febf4.92ee5e9b.js} (100%) rename service/public/static/js/{chunk-f14cda0a.73c90572.js => chunk-f14cda0a.d8e43220.js} (100%) rename service/public/static/js/{chunk-libs.7d4b5e4a.js => chunk-libs.7f7bba00.js} (100%) diff --git a/admin/src/router/index.js b/admin/src/router/index.js index fead9425..142ba839 100644 --- a/admin/src/router/index.js +++ b/admin/src/router/index.js @@ -200,7 +200,7 @@ export const asyncRoutes = [ meta: { title: 'QA管理', icon: 'el-icon-question', - roles: ['order_index', 'editor'] + roles: ['order_index', 'editor', 'franchisee'] }, children: [ { @@ -209,7 +209,7 @@ export const asyncRoutes = [ name: 'problem', meta: { title: 'QA常见问题', - roles: ['order_pub', 'editor'] + roles: ['order_pub', 'editor', 'franchisee'] } }, { @@ -299,7 +299,7 @@ export const asyncRoutes = [ meta: { title: '日志记录', icon: 'nested', - roles: ['follow_index', 'log_index', 'editor'] + roles: ['follow_index', 'log_index', 'editor', 'franchisee'] }, children: [ { @@ -308,7 +308,7 @@ export const asyncRoutes = [ name: 'Follow', meta: { title: '跟进记录', - roles: ['follow_index', 'editor'] + roles: ['follow_index', 'editor', 'franchisee'] } }, { @@ -331,7 +331,7 @@ export const asyncRoutes = [ meta: { title: '公告管理', icon: 'el-icon-s-promotion', - roles: ['follow_index', 'log_index', 'editor'] + roles: ['admin'] }, children: [ { @@ -340,7 +340,7 @@ export const asyncRoutes = [ name: 'list', meta: { title: '公告列表', - roles: ['follow_index', 'editor'] + roles: ['admin'] } } ] diff --git a/admin/src/views/admin/index.vue b/admin/src/views/admin/index.vue index 27338d9e..f6ae95da 100644 --- a/admin/src/views/admin/index.vue +++ b/admin/src/views/admin/index.vue @@ -109,6 +109,21 @@ > + + + + + + + + 多个用英文逗号隔开,例如: 384731,2328 +