Merge remote-tracking branch 'origin/feature/0905_登录注册流程重构' into test

# Conflicts:
#	src/App.vue
#	src/layouts/components/siderBar/menu-list.ts
#	src/views/components/login/index.vue

src/router/guard/userLoginInfo.ts

@@ -7,7 +7,7 @@ import { message } from 'ant-design-vue';
 import NProgress from 'nprogress';
 import { goUserLogin } from '@/utils/user';
 // import router from '@/router';
-// import { checkRoutePermission } from '@/permission/permission';
+import { checkRoutePermission } from '@/permission/permission';
 
 import { useUserStore } from '@/stores/modules/user';
 
@@ -27,16 +27,17 @@ export default function setupUserLoginInfoGuard(router: Router) {
       return;
     }
 
-    // if (requiresAuth) {
-    //   const hasPermission = checkRoutePermission(routeName);
-    //   if (!hasPermission) {
-    //     message.error('您没有权限访问该页面');
-    //     next('/');
-    //     return;
-    //   }
-    //   next();
-    //   return;
-    // }
+    if (requiresAuth) {
+      const hasPermission = checkRoutePermission(routeName);
+
+      if (!hasPermission) {
+        message.error('您没有权限访问该页面');
+        next('/trial');
+        return;
+      }
+      next();
+      return;
+    }
 
     next();
   });

src/router/index.ts

@@ -48,7 +48,7 @@ export const router = createRouter({
       name: 'Trial',
       component: () => import('@/views/trial/index.vue'),
       meta: {
-        requiresAuth: true,
+        requiresAuth: false,
         requireLogin: true,
       },
     },