Merge branch 'master' into chenshuainan

lib/core/router/app_router.dart

@@ -13,14 +13,20 @@ import 'package:new_learn/features/class/my_interact_page.dart';
 import 'package:new_learn/features/class/my_update_detail_page.dart';
 import 'package:new_learn/core/api/class/model.dart';
 import 'package:new_learn/features/my/my_page.dart';
+import 'package:new_learn/features/my/note/note_page.dart';
 import 'package:new_learn/features/conquerPackage/captureList/index.dart';
 import 'package:new_learn/features/conquerPackage/beforeDuringClass/index.dart';
 import 'package:new_learn/features/my/my_point/my_point_page.dart';
+import 'package:new_learn/features/my/question_list/question_list_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/exam/exam_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/report/report_computation_page.dart';
+import 'package:new_learn/features/report/report_web_view_page.dart';
+import 'package:new_learn/features/report/student_info_page.dart';
 import 'package:new_learn/features/task/task_page.dart';
 import 'package:new_learn/core/router/main_tab_page.dart';
 import 'package:new_learn/core/network/dio_client.dart';
@@ -71,6 +77,12 @@ import 'package:new_learn/core/providers/user_provider.dart';
 ///   必须在创建 GoRouter 前全局开启，见 main.dart 的 main()。
 /// ============================================================
 
+/// 【kTabPaths】四个底部 tab 路径集合（动态来源，别人改 tab 路由时同步改这里即可）
+///
+/// 全局拦截器 ReportRedirectNotifier 用它判断"当前是否在 tab 页面"，
+/// 避免硬编码分散在多个地方。
+const kTabPaths = <String>{'/', '/recite', '/class', '/my'};
+
 /// 全局路由表（对标 Vue 的 router/index.ts）
 final GoRouter appRouter = GoRouter(
   navigatorKey:
@@ -129,7 +141,19 @@ final GoRouter appRouter = GoRouter(
           MyUpdateDetailPage(initialPost: state.extra as UserPostDto),
     ),
     GoRoute(path: '/myPoint', builder: (_, _) => const MyPointPage()),
+    // 我的笔记
+    GoRoute(path: '/myNote', builder: (_, _) => const NotePage()),
+    // 错题本（type=2）/ 我的收藏（type=1）共用 QuestionListPage
+    GoRoute(
+      path: '/myWrong',
+      builder: (_, _) => const QuestionListPage(type: 2),
+    ),
+    GoRoute(
+      path: '/myCollect',
+      builder: (_, _) => const QuestionListPage(type: 1),
+    ),
     GoRoute(path: '/myReport', builder: (_, _) => const MyReportPage()),
+    GoRoute(path: '/myExam', builder: (_, _) => const ExamPage()),
     GoRoute(
       path: '/report-detail',
       builder: (_, state) {
@@ -143,6 +167,16 @@ final GoRouter appRouter = GoRouter(
     ),
     GoRoute(path: '/settings', builder: (_, _) => const SettingsPage()),
     GoRoute(path: '/about-app', builder: (_, _) => const AboutAppPage()),
+    // ---------- 诊断报告包三个页面（不在 ShellBranch 内，push 时不显示 tabbar） ----------
+    GoRoute(path: '/studentInfo', builder: (_, _) => const StudentInfoPage()),
+    GoRoute(
+      path: '/reportWebView',
+      builder: (_, _) => const ReportWebViewPage(),
+    ),
+    GoRoute(
+      path: '/reportComputation',
+      builder: (_, _) => const ReportComputationPage(),
+    ),
     // ---------- 首次启动隐私协议页 ----------
     GoRoute(
       path: '/privacy-consent',
@@ -167,8 +201,7 @@ final GoRouter appRouter = GoRouter(
     // ---------- 攻克包 - 截图名单 ----------
     GoRoute(
       path: '/conquerPackage/captureList',
-      builder: (_, state) =>
-          CaptureListPage(courseId: state.extra as String),
+      builder: (_, state) => CaptureListPage(courseId: state.extra as String),
     ),
     // ---------- 攻克包 - 课前课中 ----------
     GoRoute(