router 冲突解决

lib/core/router/app_router.dart

@@ -6,6 +6,7 @@ import 'package:new_learn/features/auth/legal_document_page.dart';
 import 'package:new_learn/features/auth/legal_documents.dart';
 import 'package:new_learn/features/auth/login_page.dart';
 import 'package:new_learn/features/auth/privacy_consent_page.dart';
+import 'package:new_learn/features/auth/register_page.dart';
 import 'package:new_learn/features/class/all_student_view.dart';
 import 'package:new_learn/features/class/class_page.dart';
 import 'package:new_learn/features/class/my_interact_page.dart';
@@ -14,6 +15,10 @@ import 'package:new_learn/core/api/class/model.dart';
 import 'package:new_learn/features/my/my_page.dart';
 import 'package:new_learn/features/conquerPackage/captureList/index.dart';
 import 'package:new_learn/features/my/my_point/my_point_page.dart';
+import 'package:new_learn/features/my/my_report/my_report_page.dart';
+import 'package:new_learn/features/my/my_report/report_detail_page.dart';
+import 'package:new_learn/features/my/settings/settings_page.dart';
+import 'package:new_learn/features/my/settings/about_app_page.dart';
 import 'package:new_learn/features/recite/recite_page.dart';
 import 'package:new_learn/features/task/task_page.dart';
 import 'package:new_learn/core/router/main_tab_page.dart';
@@ -96,34 +101,47 @@ final GoRouter appRouter = GoRouter(
             GoRoute(path: '/recite', builder: (_, _) => const RecitePage()),
           ],
         ),
-        // 班级（含班级模块子页：全部同学 / 我的互动 / 动态详情）
+        // 班级（只有主 tab 页在 ShellBranch 内，子页放顶层避免 tabbar 遮挡）
         StatefulShellBranch(
           routes: [
             GoRoute(path: '/class', builder: (_, _) => const ClassPage()),
-            GoRoute(
-              path: '/class/all-student',
-              builder: (_, _) => const AllStudentPage(),
-            ),
-            GoRoute(
-              path: '/class/my-interact',
-              builder: (_, _) => const MyInteractPage(),
-            ),
-            GoRoute(
-              path: '/class/my-update-detail',
-              builder: (_, state) =>
-                  MyUpdateDetailPage(initialPost: state.extra as UserPostDto),
-            ),
           ],
         ),
-        // 我的（含我的积分页）
+        // 我的
         StatefulShellBranch(
-          routes: [
-            GoRoute(path: '/my', builder: (_, _) => const MyPage()),
-            GoRoute(path: '/myPoint', builder: (_, _) => const MyPointPage()),
-          ],
+          routes: [GoRoute(path: '/my', builder: (_, _) => const MyPage())],
         ),
       ],
     ),
+    // ---------- 二级业务页（不在 ShellBranch 内，push 时不显示 tabbar） ----------
+    GoRoute(
+      path: '/class/all-student',
+      builder: (_, _) => const AllStudentPage(),
+    ),
+    GoRoute(
+      path: '/class/my-interact',
+      builder: (_, _) => const MyInteractPage(),
+    ),
+    GoRoute(
+      path: '/class/my-update-detail',
+      builder: (_, state) =>
+          MyUpdateDetailPage(initialPost: state.extra as UserPostDto),
+    ),
+    GoRoute(path: '/myPoint', builder: (_, _) => const MyPointPage()),
+    GoRoute(path: '/myReport', builder: (_, _) => const MyReportPage()),
+    GoRoute(
+      path: '/report-detail',
+      builder: (_, state) {
+        // extra 格式：{'title': '...', 'url': '...'}
+        final extra = state.extra as Map<String, dynamic>? ?? {};
+        return ReportDetailPage(
+          title: extra['title'] as String? ?? '我的报告',
+          url: extra['url'] as String? ?? '',
+        );
+      },
+    ),
+    GoRoute(path: '/settings', builder: (_, _) => const SettingsPage()),
+    GoRoute(path: '/about-app', builder: (_, _) => const AboutAppPage()),
     // ---------- 首次启动隐私协议页 ----------
     GoRoute(
       path: '/privacy-consent',
@@ -143,7 +161,7 @@ final GoRouter appRouter = GoRouter(
         content: kPrivacyPolicyContent,
       ),
     ),
-    // ---------- 登录页 ----------
+    // ---------- 登录/注册页（未登录可访问） ----------
     GoRoute(path: '/login', builder: (_, _) => const LoginPage()),
     // ---------- 攻克包 - 截图名单 ----------
     GoRoute(
@@ -151,6 +169,8 @@ final GoRouter appRouter = GoRouter(
       builder: (_, state) =>
           CaptureListPage(courseId: state.extra as String),
     ),
+    GoRoute(path: '/register', builder: (_, _) => const RegisterPage()),
+
     // app_router.dart 的 routes 里加，不用管跳转逻辑
     // GoRoute(path: '/task/:id', builder: (_, _) => const TaskDetailPage()),
     // ---------- 以后新业务页在这里加，一行一个 ----------
@@ -158,7 +178,7 @@ final GoRouter appRouter = GoRouter(
 );
 
 /// 登录守卫（对标 vue-router beforeEach）：
-///   没登录 → 强制去 /login；已登录还访问 /login → 踢回首页
+///   没登录 → 强制去 /login；已登录还访问 /login 或 /register → 踢回首页
 String? _guardLogin(BuildContext context, GoRouterState state) {
   final acceptedPrivacy = privacyAcceptedNotifier.value;
   final loggedIn = DioClient.instance.accessToken != null;
@@ -167,11 +187,14 @@ String? _guardLogin(BuildContext context, GoRouterState state) {
       state.matchedLocation == '/user-agreement' ||
       state.matchedLocation == '/privacy-policy';
   final atLogin = state.matchedLocation == '/login';
+  final atRegister = state.matchedLocation == '/register';
+  // 未登录可白名单：隐私协议页 / 协议文档 / 登录页 / 注册页
+  final atAuthFree = atLogin || atRegister || atLegalDocument;
   if (!acceptedPrivacy && !atPrivacyConsent && !atLegalDocument) {
     return '/privacy-consent';
   }
   if (acceptedPrivacy && atPrivacyConsent) return loggedIn ? '/' : '/login';
-  if (!loggedIn && !atLogin && !atLegalDocument) return '/login';
-  if (loggedIn && atLogin) return '/';
+  if (!loggedIn && !atAuthFree && !atPrivacyConsent) return '/login';
+  if (loggedIn && (atLogin || atRegister)) return '/';
   return null;
 }