5cac1dab by renchao@pashanhoo.com

Merge branch 'dev'

2 parents fb5de7b9 32b13d6c
...@@ -55,7 +55,6 @@ router.beforeEach(async (to, from, next) => { ...@@ -55,7 +55,6 @@ router.beforeEach(async (to, from, next) => {
55 } else { 55 } else {
56 localStorage.setItem("location", window.location.href) 56 localStorage.setItem("location", window.location.href)
57 window.location.href = window._config.casBaseURL + '/login?service=' + encodeURIComponent(locationUrl); 57 window.location.href = window._config.casBaseURL + '/login?service=' + encodeURIComponent(locationUrl);
58 permission()
59 } 58 }
60 } else { 59 } else {
61 permission() 60 permission()
......