From 64ef2b60225c6b287746cc38e0f3551cedb35451 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=95=E9=87=91=E6=B3=BD?= <1098696801@qq.com> Date: Fri, 5 Aug 2022 19:12:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=99=BB=E5=BD=95=E5=A4=9A?= =?UTF-8?q?=E6=AC=A1=E7=82=B9=E5=87=BB=E5=AF=BC=E8=87=B4=E8=B7=AF=E7=94=B1?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=B8=80=E4=BA=9B=E8=AD=A6=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- magic-boot-ui/src/permission.js | 2 +- magic-boot-ui/src/views/login.vue | 43 +++++++++++-------- .../src/views/system/menu/menu-form.vue | 4 +- .../src/views/system/menu/menu-icons.vue | 1 - .../src/views/system/menu/menu-list.vue | 2 +- 5 files changed, 29 insertions(+), 23 deletions(-) diff --git a/magic-boot-ui/src/permission.js b/magic-boot-ui/src/permission.js index e3e2e35..4f140f6 100644 --- a/magic-boot-ui/src/permission.js +++ b/magic-boot-ui/src/permission.js @@ -29,6 +29,7 @@ router.beforeEach(async(to, from, next) => { if (loadInfo) { next() } else { + loadInfo = true try { // get user info // note: roles must be a object array! such as: ['admin'] or ,['developer','editor'] @@ -42,7 +43,6 @@ router.beforeEach(async(to, from, next) => { router.addRoute(it) }) }) - loadInfo = true // dynamically add accessible routes // hack method to ensure that addRoutes is complete // set the replace: true, so the navigation will not leave a history record diff --git a/magic-boot-ui/src/views/login.vue b/magic-boot-ui/src/views/login.vue index a5bd672..90f8da3 100644 --- a/magic-boot-ui/src/views/login.vue +++ b/magic-boot-ui/src/views/login.vue @@ -3,22 +3,24 @@
{{ $global.title }}
-
- - -
-
- - -
-
- - - -
-
- -
+
+ + + + +
Copyright © 2020-{{new Date().getYear() + 1900}} ssssssss.org.cn All rights reserved.
@@ -61,9 +63,12 @@ return }else{ loading.value = true - login(loginForm).then((res) => { - proxy.$router.push({ path: '/home' }) - loading.value = false + login(loginForm).then((token) => { + if(token){ + proxy.$router.push({ path: '/home' }) + }else{ + loading.value = false + } }).catch(() => { refreshCode() loading.value = false diff --git a/magic-boot-ui/src/views/system/menu/menu-form.vue b/magic-boot-ui/src/views/system/menu/menu-form.vue index 04de513..f14d8eb 100644 --- a/magic-boot-ui/src/views/system/menu/menu-form.vue +++ b/magic-boot-ui/src/views/system/menu/menu-form.vue @@ -186,12 +186,13 @@ function save(d) { if (valid) { d.loading() if(temp.value.pid == temp.value.id){ - this.$notify({ + proxy.$notify({ title: '失败', message: '上级菜单不能选当前菜单', type: 'error', duration: 2000 }) + d.hideLoading() return } if(proxy.$treeTable.isChildren(proxy.$treeTable.queryChildren(props.menuData, temp.value.id), temp.value.pid)){ @@ -201,6 +202,7 @@ function save(d) { type: 'error', duration: 2000 }) + d.hideLoading() return } if(menuType.value == 'menu'){ diff --git a/magic-boot-ui/src/views/system/menu/menu-icons.vue b/magic-boot-ui/src/views/system/menu/menu-icons.vue index bf9beec..2575af7 100644 --- a/magic-boot-ui/src/views/system/menu/menu-icons.vue +++ b/magic-boot-ui/src/views/system/menu/menu-icons.vue @@ -10,7 +10,6 @@
- {{ item }}
diff --git a/magic-boot-ui/src/views/system/menu/menu-list.vue b/magic-boot-ui/src/views/system/menu/menu-list.vue index 3cd6e92..715ec70 100644 --- a/magic-boot-ui/src/views/system/menu/menu-list.vue +++ b/magic-boot-ui/src/views/system/menu/menu-list.vue @@ -28,7 +28,7 @@