Merge branch 'master' into deploy

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

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 })