From 0f47284235efa5171f2da91ff135814a4a51300c Mon Sep 17 00:00:00 2001 From: Jason <5340635+wen-jason@user.noreply.gitee.com> Date: Thu, 8 Sep 2022 19:09:53 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E7=AB=99=E4=BF=A1=E6=81=AF=EF=BC=8C?= =?UTF-8?q?=E7=99=BB=E5=BD=95=EF=BC=8C=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/src/api/consumer.ts | 5 + admin/src/components/popover-input/index.vue | 108 ++++++++++ admin/src/permission.ts | 2 +- admin/src/router/index.ts | 1 + admin/src/views/article/lists/index.vue | 13 +- admin/src/views/consumer/lists/detail.vue | 71 +++++- admin/src/views/consumer/lists/index.vue | 4 +- .../src/views/setting/website/information.vue | 74 ++++++- app/package-lock.json | 204 +++++++++--------- app/src/main.ts | 1 + app/src/pages/login/login.vue | 8 +- app/src/stores/app.ts | 4 +- app/yarn.lock | 79 +++---- 13 files changed, 399 insertions(+), 175 deletions(-) create mode 100644 admin/src/components/popover-input/index.vue diff --git a/admin/src/api/consumer.ts b/admin/src/api/consumer.ts index f38f0698..10577297 100644 --- a/admin/src/api/consumer.ts +++ b/admin/src/api/consumer.ts @@ -9,3 +9,8 @@ export function getUserList(params: any) { export function getUserDetail(params: any) { return request.get({ url: '/user/detail', params }) } + +// 用户编辑 +export function userEdit(params: any) { + return request.post({ url: '/user/edit', params }) +} diff --git a/admin/src/components/popover-input/index.vue b/admin/src/components/popover-input/index.vue new file mode 100644 index 00000000..a95d5a26 --- /dev/null +++ b/admin/src/components/popover-input/index.vue @@ -0,0 +1,108 @@ + + + + + diff --git a/admin/src/permission.ts b/admin/src/permission.ts index 2f553ecd..11bdcaeb 100644 --- a/admin/src/permission.ts +++ b/admin/src/permission.ts @@ -78,6 +78,6 @@ router.beforeEach(async (to, from, next) => { }) router.afterEach(() => { - // console.log(router.getRoutes()) + console.log(router.getRoutes()) NProgress.done() }) diff --git a/admin/src/router/index.ts b/admin/src/router/index.ts index 69d3be48..9ed6e36e 100644 --- a/admin/src/router/index.ts +++ b/admin/src/router/index.ts @@ -86,6 +86,7 @@ export function findFirstValidRoute(routes: RouteRecordRaw[]): string | undefine } export function getRoutePath(perms: string) { + console.log(router.getRoutes()) console.log(router.getRoutes().find((item) => item.meta?.perms == perms)?.path) return router.getRoutes().find((item) => item.meta?.perms == perms)?.path || '' } diff --git a/admin/src/views/article/lists/index.vue b/admin/src/views/article/lists/index.vue index 637376e9..a6f27c5a 100644 --- a/admin/src/views/article/lists/index.vue +++ b/admin/src/views/article/lists/index.vue @@ -34,7 +34,7 @@ @@ -57,6 +57,12 @@ /> + @@ -64,10 +70,9 @@ diff --git a/admin/src/views/consumer/lists/detail.vue b/admin/src/views/consumer/lists/detail.vue index 7800438c..f7cd9932 100644 --- a/admin/src/views/consumer/lists/detail.vue +++ b/admin/src/views/consumer/lists/detail.vue @@ -10,11 +10,59 @@ {{ formData.sn }} - {{ formData.nickname }} - {{ formData.username }} - {{ formData.realName || '-' }} - {{ formData.sex }} - {{ formData.mobile || '-' }} + + {{ formData.nickname }} + + + {{ formData.username }} + + + + + + + + {{ formData.realName || '-' }} + + + + + + + + {{ formData.sex }} + + + + + + + + {{ formData.mobile || '-' }} + + + + + + {{ formData.channel }} {{ formData.createTime }} {{ formData.lastLoginTime }} @@ -25,7 +73,8 @@ diff --git a/admin/src/views/consumer/lists/index.vue b/admin/src/views/consumer/lists/index.vue index 8fab42b4..915c87b3 100644 --- a/admin/src/views/consumer/lists/index.vue +++ b/admin/src/views/consumer/lists/index.vue @@ -47,10 +47,10 @@