From ec40e7fd8ba1dcf3e136082e9030291252ba9add Mon Sep 17 00:00:00 2001
From: Zheng Jie <201507802@qq.com>
Date: Wed, 3 Mar 2021 12:10:50 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96](v2.6?=
 =?UTF-8?q?)=EF=BC=9Aupdate=20permission.js?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

close https://github.com/elunez/eladmin/issues/597
---
 src/utils/permission.js | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/utils/permission.js b/src/utils/permission.js
index be3fe4e..b0c7523 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -11,15 +11,9 @@ export default {
       if (value && value instanceof Array && value.length > 0) {
         const roles = store.getters && store.getters.roles
         const permissionRoles = value
-
-        const hasPermission = roles.some(role => {
+        return roles.some(role => {
           return permissionRoles.includes(role)
         })
-
-        if (!hasPermission) {
-          return false
-        }
-        return true
       } else {
         console.error(`need roles! Like v-permission="['admin','editor']"`)
         return false

From 04c1ab9923a8398555ccac46bd13ae9d9645a2b3 Mon Sep 17 00:00:00 2001
From: Zheng Jie <201507802@qq.com>
Date: Wed, 3 Mar 2021 14:49:10 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96](v2.6?=
 =?UTF-8?q?)=EF=BC=9A=E4=BF=AE=E5=A4=8D=E9=87=8D=E6=96=B0=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E5=90=8E=E9=87=8D=E5=AE=9A=E5=90=91=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E4=B8=A2=E5=A4=B1=EF=BC=8C=E5=85=B7=E4=BD=93=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E5=A6=82=E4=B8=8B=20issues?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

close https://github.com/elunez/eladmin/issues/584
---
 src/views/login.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/login.vue b/src/views/login.vue
index 085713c..210e777 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -74,8 +74,8 @@ export default {
   watch: {
     $route: {
       handler: function(route) {
-        if (route.query) {
-          const data = route.query
+        const data = route.query
+        if (data && data.redirect) {
           this.redirect = data.redirect
           delete data.redirect
           this.redirect = this.redirect + '&' + qs.stringify(data, { indices: false })