diff --git a/src/router/permission.ts b/src/router/permission.ts
index 6567ae5e..6078ae2f 100644
--- a/src/router/permission.ts
+++ b/src/router/permission.ts
@@ -42,8 +42,20 @@ export const permissionRouter = (router: Router) => {
     const { role } = storeToRefs(useSignin())
     const { meta } = to
 
+    const hasRole = () => {
+      if (meta.role) {
+        if (meta.role.length === 0) {
+          return true
+        } else {
+          return meta.role.includes(role.value)
+        }
+      } else {
+        return true
+      }
+    }
+
     if (token !== 'no') {
-      if (meta?.role?.includes(role.value)) {
+      if (hasRole()) {
         if (to.path === '/' || from.path === '/login') {
           if (route !== 'no') {
             next(route)
diff --git a/src/views/login/components/Signin/index.tsx b/src/views/login/components/Signin/index.tsx
index 125771fa..4cb7dbe5 100644
--- a/src/views/login/components/Signin/index.tsx
+++ b/src/views/login/components/Signin/index.tsx
@@ -41,14 +41,14 @@ const Signin = defineComponent({
 
           if (signin(signinForm.value) === 0) {
             setTimeout(() => {
-              router.push('/dashboard')
-
               useSpin(false)
 
               window.$message.success(`欢迎${signinForm.value.name}登陆~`)
 
               setCache('token', 'tokenValue')
               setCache('person', signinForm.value)
+
+              router.push('/dashboard')
             }, 2 * 1000)
           }
         } else {