fix：按照shadcn_ui对着demo_shadcn对齐

lib/features/detail/modules/renderer_registry.dart

@@ -1,16 +1,18 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:shadcn_ui/shadcn_ui.dart';
 
 import '../../../data/api/report_data_source.dart';
 import '../../../data/models/models.dart';
 import '../../../theme/app_icons.dart';
 import '../../../theme/yanting_text.dart';
 import '../../../theme/yanting_tokens.dart';
-import '../../../theme/wise_tokens.dart';
+import '../../../widgets/app_buttons.dart';
 import '../../../widgets/app_card.dart';
 import '../../../widgets/badges.dart';
 import '../../../widgets/mini_player.dart';
+import '../../../widgets/states.dart';
 
 typedef StartModuleAudio =
     void Function(
@@ -53,7 +55,7 @@ class ModuleRendererRegistry {
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
           _ModuleHeader(module: module),
-          const SizedBox(height: WiseSpacing.x3),
+          const SizedBox(height: YantingSpacing.x3),
           _contentFor(
             context,
             type: module.type,
@@ -69,13 +71,14 @@ class ModuleRendererRegistry {
             compact: module.renderMode != 'inline',
           ),
           if (module.hasDetailPage) ...[
-            const SizedBox(height: WiseSpacing.x3),
+            const SizedBox(height: YantingSpacing.x3),
             Align(
               alignment: Alignment.centerLeft,
-              child: TextButton.icon(
+              child: AppButton(
                 onPressed: openDetail,
-                icon: const Icon(AppIcons.externalLink),
-                label: const Text('查看详情'),
+                icon: AppIcons.externalLink,
+                kind: AppButtonKind.ghost,
+                label: '查看详情',
               ),
             ),
           ],
@@ -180,19 +183,31 @@ class ModuleDetailPage extends HookConsumerWidget {
       [dataSource, reportId, module.id, retryCount.value],
     );
     final snapshot = useFuture(future);
+    final theme = ShadTheme.of(context);
 
     return Scaffold(
-      appBar: AppBar(title: Text(module.titleCn)),
+      backgroundColor: theme.colorScheme.background,
+      appBar: AppBar(
+        backgroundColor: theme.colorScheme.background,
+        surfaceTintColor: Colors.transparent,
+        elevation: 0,
+        title: Text(module.titleCn),
+        bottom: PreferredSize(
+          preferredSize: const Size.fromHeight(1),
+          child: ColoredBox(
+            color: theme.colorScheme.border,
+            child: const SizedBox(height: 1, width: double.infinity),
+          ),
+        ),
+      ),
       body: snapshot.connectionState != ConnectionState.done
-          ? const Center(child: CircularProgressIndicator())
+          ? const LoadingState()
           : snapshot.hasError
           ? Center(
-              child: TextButton(
+              child: AppButton(
                 onPressed: () => retryCount.value++,
-                child: Text(
-                  snapshot.error.toString(),
-                  textAlign: TextAlign.center,
-                ),
+                kind: AppButtonKind.ghost,
+                label: snapshot.error.toString(),
               ),
             )
           : _ModuleDetailContent(
@@ -218,13 +233,18 @@ class _ModuleDetailContent extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return ListView(
-      padding: const EdgeInsets.fromLTRB(WiseSpacing.x4, 4, WiseSpacing.x4, 16),
+      padding: const EdgeInsets.fromLTRB(
+        YantingSpacing.x4,
+        4,
+        YantingSpacing.x4,
+        16,
+      ),
       children: [
         Text(
           detail.titleCn,
           style: YantingText.sectionTitle.copyWith(fontSize: 21),
         ),
-        const SizedBox(height: WiseSpacing.x2),
+        const SizedBox(height: YantingSpacing.x2),
         AppCard(
           child: registry.page(
             context,
@@ -233,7 +253,7 @@ class _ModuleDetailContent extends StatelessWidget {
             report: report,
           ),
         ),
-        const SizedBox(height: WiseSpacing.x3),
+        const SizedBox(height: YantingSpacing.x3),
         Text('缓存版本 ${detail.cacheVersion}', style: YantingText.meta),
       ],
     );
@@ -283,10 +303,10 @@ class _BasicInfo extends StatelessWidget {
           ),
           style: YantingText.body,
         ),
-        const SizedBox(height: WiseSpacing.x2),
+        const SizedBox(height: YantingSpacing.x2),
         Wrap(
-          spacing: WiseSpacing.x2,
-          runSpacing: WiseSpacing.x2,
+          spacing: YantingSpacing.x2,
+          runSpacing: YantingSpacing.x2,
           children: [
             for (final topic in topics) AppBadge(text: topic),
             if (report?.releasedAt != null)
@@ -312,8 +332,8 @@ class _CoreInsights extends StatelessWidget {
       children: [
         for (final point in points)
           Container(
-            margin: const EdgeInsets.only(bottom: WiseSpacing.x3),
-            padding: const EdgeInsets.all(WiseSpacing.x3),
+            margin: const EdgeInsets.only(bottom: YantingSpacing.x3),
+            padding: const EdgeInsets.all(YantingSpacing.x3),
             decoration: BoxDecoration(
               color: YantingColors.background,
               border: Border.all(color: YantingColors.border),
@@ -326,7 +346,7 @@ class _CoreInsights extends StatelessWidget {
                   text: _kindLabel(asString(point['kind'])),
                   kind: _kindBadge(asString(point['kind'])),
                 ),
-                const SizedBox(height: WiseSpacing.x1),
+                const SizedBox(height: YantingSpacing.x1),
                 Text(asString(point['text']), style: YantingText.body),
               ],
             ),
@@ -351,9 +371,9 @@ class _SourceCompliance extends StatelessWidget {
         if (asString(payload['source_note']).isNotEmpty)
           Text(asString(payload['source_note']), style: YantingText.body),
         if (institution != null) ...[
-          const SizedBox(height: WiseSpacing.x4),
+          const SizedBox(height: YantingSpacing.x4),
           Text('发布机构', style: YantingText.cardTitle.copyWith(fontSize: 17)),
-          const SizedBox(height: WiseSpacing.x2),
+          const SizedBox(height: YantingSpacing.x2),
           _InfoLine(label: '机构名称', value: institution.nameCn),
           if (institution.nameEn.isNotEmpty)
             _InfoLine(label: '英文名称', value: institution.nameEn),
@@ -377,10 +397,10 @@ class _SourceCompliance extends StatelessWidget {
             _InfoLine(label: '说明', value: institution.introCn),
         ],
         if (asString(payload['copyright_cn']).isNotEmpty) ...[
-          const SizedBox(height: WiseSpacing.x4),
+          const SizedBox(height: YantingSpacing.x4),
           Text(asString(payload['copyright_cn']), style: YantingText.meta),
         ],
-        const SizedBox(height: WiseSpacing.x3),
+        const SizedBox(height: YantingSpacing.x3),
         DecoratedBox(
           decoration: BoxDecoration(
             color: YantingColors.background,
@@ -388,7 +408,7 @@ class _SourceCompliance extends StatelessWidget {
             borderRadius: BorderRadius.circular(YantingRadius.md),
           ),
           child: Padding(
-            padding: const EdgeInsets.all(WiseSpacing.x3),
+            padding: const EdgeInsets.all(YantingSpacing.x3),
             child: Text(
               asString(payload['disclaimer'], '本内容为公开/授权研报的结构化解读，不构成投资建议。'),
               style: YantingText.meta.copyWith(color: YantingColors.warning),
@@ -410,7 +430,7 @@ class _InfoLine extends StatelessWidget {
   Widget build(BuildContext context) {
     if (value.isEmpty) return const SizedBox.shrink();
     return Padding(
-      padding: const EdgeInsets.only(bottom: WiseSpacing.x2),
+      padding: const EdgeInsets.only(bottom: YantingSpacing.x2),
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
@@ -420,7 +440,7 @@ class _InfoLine extends StatelessWidget {
               color: YantingColors.mutedForeground,
             ),
           ),
-          const SizedBox(height: WiseSpacing.x1),
+          const SizedBox(height: YantingSpacing.x1),
           Text(value, style: YantingText.body),
         ],
       ),
@@ -480,7 +500,7 @@ class _InstitutionModule extends StatelessWidget {
     return Row(
       children: [
         const Icon(AppIcons.bank, color: YantingColors.foreground),
-        const SizedBox(width: WiseSpacing.x2),
+        const SizedBox(width: YantingSpacing.x2),
         Expanded(child: Text(name, style: YantingText.body)),
         Text(
           '${asInt(payload['report_count'], report?.institution.reportCount ?? 0)} 份',
@@ -510,12 +530,12 @@ class _SectionsModule extends StatelessWidget {
       children: [
         if (summary.isNotEmpty) Text(summary, style: YantingText.body),
         for (final section in sections) ...[
-          const SizedBox(height: WiseSpacing.x3),
+          const SizedBox(height: YantingSpacing.x3),
           Text(
             asString(section['heading']),
             style: YantingText.cardTitle.copyWith(fontSize: 17),
           ),
-          const SizedBox(height: WiseSpacing.x1),
+          const SizedBox(height: YantingSpacing.x1),
           Text(asString(section['body']), style: YantingText.body),
         ],
       ],
@@ -538,8 +558,8 @@ class _KeyDataModule extends StatelessWidget {
       children: [
         for (final row in rows)
           Container(
-            margin: const EdgeInsets.only(bottom: WiseSpacing.x3),
-            padding: const EdgeInsets.all(WiseSpacing.x3),
+            margin: const EdgeInsets.only(bottom: YantingSpacing.x3),
+            padding: const EdgeInsets.all(YantingSpacing.x3),
             decoration: BoxDecoration(
               color: YantingColors.secondary,
               borderRadius: BorderRadius.circular(YantingRadius.md),
@@ -562,7 +582,7 @@ class _KeyDataModule extends StatelessWidget {
                     ],
                   ),
                 ),
-                const SizedBox(width: WiseSpacing.x2),
+                const SizedBox(width: YantingSpacing.x2),
                 Text(
                   _valueWithUnit(row),
                   textAlign: TextAlign.right,
@@ -635,10 +655,10 @@ class _TimelineEntry extends StatelessWidget {
                 ),
             ],
           ),
-          const SizedBox(width: WiseSpacing.x2),
+          const SizedBox(width: YantingSpacing.x2),
           Expanded(
             child: Padding(
-              padding: const EdgeInsets.only(bottom: WiseSpacing.x3),
+              padding: const EdgeInsets.only(bottom: YantingSpacing.x3),
               child: Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
@@ -650,12 +670,12 @@ class _TimelineEntry extends StatelessWidget {
                         fontWeight: FontWeight.w600,
                       ),
                     ),
-                  const SizedBox(height: WiseSpacing.x1),
+                  const SizedBox(height: YantingSpacing.x1),
                   Text(
                     asString(event['event']),
                     style: YantingText.cardTitle.copyWith(fontSize: 17),
                   ),
-                  const SizedBox(height: WiseSpacing.x1),
+                  const SizedBox(height: YantingSpacing.x1),
                   Text(asString(event['impact']), style: YantingText.body),
                 ],
               ),
@@ -695,10 +715,10 @@ class _StudyGuideModule extends StatelessWidget {
             ],
           ),
         if (glossary.isNotEmpty) ...[
-          const SizedBox(height: WiseSpacing.x3),
+          const SizedBox(height: YantingSpacing.x3),
           Wrap(
-            spacing: WiseSpacing.x2,
-            runSpacing: WiseSpacing.x2,
+            spacing: YantingSpacing.x2,
+            runSpacing: YantingSpacing.x2,
             children: [
               for (final item in glossary)
                 AppBadge(
@@ -730,10 +750,10 @@ class _StructureGraphModule extends StatelessWidget {
           asString(payload['root']),
           style: YantingText.cardTitle.copyWith(fontSize: 17),
         ),
-        const SizedBox(height: WiseSpacing.x3),
+        const SizedBox(height: YantingSpacing.x3),
         for (final node in nodes)
           Padding(
-            padding: const EdgeInsets.only(bottom: WiseSpacing.x4),
+            padding: const EdgeInsets.only(bottom: YantingSpacing.x4),
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
@@ -741,10 +761,10 @@ class _StructureGraphModule extends StatelessWidget {
                   asString(node['label']),
                   style: YantingText.cardTitle.copyWith(fontSize: 17),
                 ),
-                const SizedBox(height: WiseSpacing.x1),
+                const SizedBox(height: YantingSpacing.x1),
                 for (final child in asStringList(node['children']))
                   Padding(
-                    padding: const EdgeInsets.only(bottom: WiseSpacing.x1),
+                    padding: const EdgeInsets.only(bottom: YantingSpacing.x1),
                     child: Text(child, style: YantingText.body),
                   ),
               ],
@@ -770,7 +790,7 @@ class _RelatedSourcesModule extends StatelessWidget {
       children: [
         for (final item in items)
           Padding(
-            padding: const EdgeInsets.only(bottom: WiseSpacing.x4),
+            padding: const EdgeInsets.only(bottom: YantingSpacing.x4),
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
@@ -778,7 +798,7 @@ class _RelatedSourcesModule extends StatelessWidget {
                   asString(item['title']),
                   style: YantingText.cardTitle.copyWith(fontSize: 17),
                 ),
-                const SizedBox(height: WiseSpacing.x1),
+                const SizedBox(height: YantingSpacing.x1),
                 Text(
                   asString(item['summary_cn'], asString(item['source_name'])),
                   style: YantingText.body,
@@ -809,7 +829,7 @@ class _DifferentiatedViewModule extends StatelessWidget {
       children: [
         for (final item in items)
           Padding(
-            padding: const EdgeInsets.only(bottom: WiseSpacing.x4),
+            padding: const EdgeInsets.only(bottom: YantingSpacing.x4),
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
@@ -817,7 +837,7 @@ class _DifferentiatedViewModule extends StatelessWidget {
                   asString(item['topic']),
                   style: YantingText.cardTitle.copyWith(fontSize: 17),
                 ),
-                const SizedBox(height: WiseSpacing.x2),
+                const SizedBox(height: YantingSpacing.x2),
                 if (asString(item['consensus_view']).isNotEmpty) ...[
                   Text(
                     '常见观点',
@@ -825,12 +845,12 @@ class _DifferentiatedViewModule extends StatelessWidget {
                       color: YantingColors.mutedForeground,
                     ),
                   ),
-                  const SizedBox(height: WiseSpacing.x1),
+                  const SizedBox(height: YantingSpacing.x1),
                   Text(
                     asString(item['consensus_view']),
                     style: YantingText.body,
                   ),
-                  const SizedBox(height: WiseSpacing.x2),
+                  const SizedBox(height: YantingSpacing.x2),
                 ],
                 if (asString(item['report_position']).isNotEmpty) ...[
                   Text(
@@ -839,7 +859,7 @@ class _DifferentiatedViewModule extends StatelessWidget {
                       color: YantingColors.foreground,
                     ),
                   ),
-                  const SizedBox(height: WiseSpacing.x1),
+                  const SizedBox(height: YantingSpacing.x1),
                   Text(
                     asString(item['report_position']),
                     style: YantingText.body,
@@ -877,8 +897,8 @@ class _WeaknessesModule extends StatelessWidget {
         for (final item in items)
           Padding(
             padding: const EdgeInsets.only(
-              top: WiseSpacing.x3,
-              bottom: WiseSpacing.x2,
+              top: YantingSpacing.x3,
+              bottom: YantingSpacing.x2,
             ),
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
@@ -887,20 +907,20 @@ class _WeaknessesModule extends StatelessWidget {
                   asString(item['topic']),
                   style: YantingText.cardTitle.copyWith(fontSize: 17),
                 ),
-                const SizedBox(height: WiseSpacing.x1),
+                const SizedBox(height: YantingSpacing.x1),
                 Text(asString(item['weakness']), style: YantingText.body),
               ],
             ),
           ),
         if (verificationNotes.isNotEmpty || counterEvidence.isNotEmpty) ...[
-          const SizedBox(height: WiseSpacing.x2),
+          const SizedBox(height: YantingSpacing.x2),
           DecoratedBox(
             decoration: BoxDecoration(
               color: const Color(0x109A6500),
-              borderRadius: BorderRadius.circular(WiseRadius.sm),
+              borderRadius: BorderRadius.circular(YantingRadius.sm),
             ),
             child: Padding(
-              padding: const EdgeInsets.all(WiseSpacing.x3),
+              padding: const EdgeInsets.all(YantingSpacing.x3),
               child: Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
@@ -910,13 +930,13 @@ class _WeaknessesModule extends StatelessWidget {
                       color: YantingColors.warning,
                     ),
                   ),
-                  const SizedBox(height: WiseSpacing.x1),
+                  const SizedBox(height: YantingSpacing.x1),
                   for (final note
                       in verificationNotes.isNotEmpty
                           ? verificationNotes
                           : counterEvidence)
                     Padding(
-                      padding: const EdgeInsets.only(bottom: WiseSpacing.x1),
+                      padding: const EdgeInsets.only(bottom: YantingSpacing.x1),
                       child: Text(note, style: YantingText.meta),
                     ),
                 ],
@@ -947,7 +967,7 @@ class _Preview extends StatelessWidget {
         if (headline.isNotEmpty) Text(headline, style: YantingText.body),
         for (final item in highlights.take(3))
           Padding(
-            padding: const EdgeInsets.only(top: WiseSpacing.x1),
+            padding: const EdgeInsets.only(top: YantingSpacing.x1),
             child: Text('• $item', style: YantingText.meta),
           ),
       ],
@@ -988,7 +1008,7 @@ class _FallbackModule extends StatelessWidget {
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         AppBadge(text: '未知模块：$type', kind: BadgeKind.warning),
-        const SizedBox(height: WiseSpacing.x2),
+        const SizedBox(height: YantingSpacing.x2),
         _Preview(payload: payload),
       ],
     );

lib/features/detail/report_detail_page.dart

@@ -1,13 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:shadcn_ui/shadcn_ui.dart';
 
 import '../../data/api/report_data_source.dart';
 import '../../data/models/models.dart';
 import '../../theme/app_icons.dart';
 import '../../theme/yanting_text.dart';
 import '../../theme/yanting_tokens.dart';
-import '../../theme/wise_tokens.dart';
 import '../../widgets/app_buttons.dart';
 import '../../widgets/app_card.dart';
 import '../../widgets/badges.dart';
@@ -52,9 +52,23 @@ class ReportDetailPage extends HookConsumerWidget {
     ]);
     final snapshot = useFuture(detailFuture);
     const registry = ModuleRendererRegistry();
+    final theme = ShadTheme.of(context);
 
     return Scaffold(
-      appBar: AppBar(title: const Text('研报详情')),
+      backgroundColor: theme.colorScheme.background,
+      appBar: AppBar(
+        backgroundColor: theme.colorScheme.background,
+        surfaceTintColor: Colors.transparent,
+        elevation: 0,
+        title: const Text('研报详情'),
+        bottom: PreferredSize(
+          preferredSize: const Size.fromHeight(1),
+          child: ColoredBox(
+            color: theme.colorScheme.border,
+            child: const SizedBox(height: 1, width: double.infinity),
+          ),
+        ),
+      ),
       body: snapshot.connectionState != ConnectionState.done
           ? const LoadingState()
           : snapshot.hasError
@@ -106,7 +120,12 @@ class _ReportDetailContent extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return ListView(
-      padding: const EdgeInsets.fromLTRB(WiseSpacing.x4, 4, WiseSpacing.x4, 16),
+      padding: const EdgeInsets.fromLTRB(
+        YantingSpacing.x4,
+        4,
+        YantingSpacing.x4,
+        16,
+      ),
       children: [
         AppCard(
           color: YantingColors.brandSoft,
@@ -115,8 +134,8 @@ class _ReportDetailContent extends StatelessWidget {
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
               Wrap(
-                spacing: WiseSpacing.x2,
-                runSpacing: WiseSpacing.x2,
+                spacing: YantingSpacing.x2,
+                runSpacing: YantingSpacing.x2,
                 children: [
                   AppBadge(
                     text: detail.interpretationLabel,
@@ -134,7 +153,7 @@ class _ReportDetailContent extends StatelessWidget {
                   ),
                 ],
               ),
-              const SizedBox(height: WiseSpacing.x3),
+              const SizedBox(height: YantingSpacing.x3),
               Text(
                 detail.titleCn,
                 maxLines: 3,
@@ -142,10 +161,10 @@ class _ReportDetailContent extends StatelessWidget {
                 style: YantingText.sectionTitle.copyWith(fontSize: 21),
               ),
               if (detail.oneLiner.isNotEmpty) ...[
-                const SizedBox(height: WiseSpacing.x2),
+                const SizedBox(height: YantingSpacing.x2),
                 Text(detail.oneLiner, style: YantingText.body),
               ],
-              const SizedBox(height: WiseSpacing.x3),
+              const SizedBox(height: YantingSpacing.x3),
               Text(
                 '${detail.institution.nameCn} · ${formatDate(detail.releasedAt)}',
                 style: YantingText.meta,
@@ -153,11 +172,11 @@ class _ReportDetailContent extends StatelessWidget {
             ],
           ),
         ),
-        const SizedBox(height: WiseSpacing.x4),
+        const SizedBox(height: YantingSpacing.x4),
         _ActionBar(detail: detail),
-        const SizedBox(height: WiseSpacing.x4),
+        const SizedBox(height: YantingSpacing.x4),
         _Toc(modules: detail.modules),
-        const SizedBox(height: WiseSpacing.x4),
+        const SizedBox(height: YantingSpacing.x4),
         for (final module in detail.modules) ...[
           registry.card(
             context: context,
@@ -170,7 +189,7 @@ class _ReportDetailContent extends StatelessWidget {
             onSeekAudio: onSeekAudio,
             onSpeed: onSpeed,
           ),
-          const SizedBox(height: WiseSpacing.x4),
+          const SizedBox(height: YantingSpacing.x4),
         ],
       ],
     );
@@ -194,7 +213,7 @@ class _ActionBar extends StatelessWidget {
             onPressed: () => showLoginSheet(context, reason: '登录后保存到你的收藏'),
           ),
         ),
-        const SizedBox(width: WiseSpacing.x2),
+        const SizedBox(width: YantingSpacing.x2),
         Expanded(
           child: AppButton(
             label: '原文',
@@ -222,7 +241,7 @@ class _Toc extends StatelessWidget {
         children: [
           for (final module in modules)
             Padding(
-              padding: const EdgeInsets.only(right: WiseSpacing.x2),
+              padding: const EdgeInsets.only(right: YantingSpacing.x2),
               child: AppBadge(text: module.titleCn, kind: BadgeKind.brand),
             ),
         ],

lib/features/feed/feed_page.dart

@@ -1,12 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:shadcn_ui/shadcn_ui.dart';
 
 import '../../data/api/report_data_source.dart';
 import '../../data/content_providers.dart';
 import '../../data/models/models.dart';
 import '../../routing/app_routes.dart';
-import '../../theme/wise_tokens.dart';
+import '../../theme/yanting_tokens.dart';
 import '../../widgets/badges.dart';
 import '../../widgets/mini_player.dart';
 import '../../widgets/page_header.dart';
@@ -66,9 +67,9 @@ class FeedPage extends HookConsumerWidget {
         }
         return ListView(
           padding: const EdgeInsets.fromLTRB(
-            WiseSpacing.x4,
+            YantingSpacing.screenX,
             4,
-            WiseSpacing.x4,
+            YantingSpacing.screenX,
             16,
           ),
           children: [
@@ -79,7 +80,7 @@ class FeedPage extends HookConsumerWidget {
                 children: [
                   for (final t in topics)
                     Padding(
-                      padding: const EdgeInsets.only(right: WiseSpacing.x2),
+                      padding: const EdgeInsets.only(right: YantingSpacing.x2),
                       child: AppChip(
                         label: t,
                         selected: t == currentTopic,
@@ -89,7 +90,9 @@ class FeedPage extends HookConsumerWidget {
                 ],
               ),
             ),
-            const SizedBox(height: WiseSpacing.x3),
+            const SizedBox(height: YantingSpacing.x3),
+            const ShadSeparator.horizontal(),
+            const SizedBox(height: YantingSpacing.x3),
             if (visible.isEmpty)
               const EmptyState(
                 title: '暂无可推荐的研报解读',
@@ -112,7 +115,7 @@ class FeedPage extends HookConsumerWidget {
                 ),
                 onPlayTap: () => _playFromReport(onPlay, visible.first),
               ),
-              const SizedBox(height: WiseSpacing.x5),
+              const SizedBox(height: YantingSpacing.x6),
               const SectionTitle(title: '最新解读', icon: Icons.chevron_right),
               for (final report in visible.skip(1)) ...[
                 ReportCardWidget(
@@ -129,7 +132,7 @@ class FeedPage extends HookConsumerWidget {
                   ),
                   onPlayTap: () => _playFromReport(onPlay, report),
                 ),
-                const SizedBox(height: WiseSpacing.x3),
+                const SizedBox(height: YantingSpacing.x3),
               ],
             ],
           ],

lib/features/home/home_page.dart

@@ -0,0 +1,221 @@
+import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:shadcn_ui/shadcn_ui.dart';
+
+import '../../data/api/report_data_source.dart';
+import '../../data/content_providers.dart';
+import '../../data/models/models.dart';
+import '../../routing/app_routes.dart';
+import '../../theme/app_icons.dart';
+import '../../theme/yanting_text.dart';
+import '../../theme/yanting_tokens.dart';
+import '../../widgets/app_card.dart';
+import '../../widgets/badges.dart';
+import '../../widgets/mini_player.dart';
+import '../../widgets/page_header.dart';
+import '../../widgets/states.dart';
+import '../shared/report_card_widget.dart';
+
+class HomePage extends HookConsumerWidget {
+  const HomePage({
+    required this.dataSource,
+    required this.onPlay,
+    this.player = const PlayerStateModel(),
+    this.onStartModuleAudio,
+    this.onToggleAudio,
+    this.onSeekAudio,
+    this.onSpeed,
+    super.key,
+  });
+
+  final ReportDataSource dataSource;
+  final void Function(AudioItem item) onPlay;
+  final PlayerStateModel player;
+  final void Function(
+    String audioId,
+    String reportId,
+    String title,
+    int durationSec,
+  )?
+  onStartModuleAudio;
+  final VoidCallback? onToggleAudio;
+  final void Function(int delta)? onSeekAudio;
+  final VoidCallback? onSpeed;
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final snapshot = ref.watch(recommendedReportsProvider);
+
+    return snapshot.when(
+      loading: () => const LoadingState(),
+      error: (error, _) => ErrorState(
+        message: error.toString(),
+        onRetry: () => ref.invalidate(recommendedReportsProvider),
+      ),
+      data: (items) {
+        return SingleChildScrollView(
+          padding: const EdgeInsets.fromLTRB(
+            YantingSpacing.screenX,
+            4,
+            YantingSpacing.screenX,
+            16,
+          ),
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.stretch,
+            children: [
+              const PageHeader(title: '研听', subtitle: '全球机构研报中文解读'),
+              const SectionTitle(title: '推荐'),
+              if (items.isEmpty)
+                const EmptyState(title: '暂无可推荐的研报解读', message: '稍后再来看看最新内容')
+              else
+                ReportCardWidget(
+                  report: items.first,
+                  hero: true,
+                  onTap: () => openReportDetail(
+                    context,
+                    dataSource,
+                    items.first,
+                    player: player,
+                    onStartAudio: onStartModuleAudio,
+                    onToggleAudio: onToggleAudio,
+                    onSeekAudio: onSeekAudio,
+                    onSpeed: onSpeed,
+                  ),
+                  onPlayTap: () => _playFromReport(onPlay, items.first),
+                ),
+              const SizedBox(height: YantingSpacing.x6),
+              for (final item in _directoryItems)
+                Padding(
+                  padding: const EdgeInsets.only(bottom: 8),
+                  child: _DirectoryCard(item: item),
+                ),
+            ],
+          ),
+        );
+      },
+    );
+  }
+}
+
+class _DirectoryItem {
+  const _DirectoryItem({
+    required this.title,
+    required this.subtitle,
+    required this.icon,
+    required this.path,
+  });
+
+  final String title;
+  final String subtitle;
+  final IconData icon;
+  final String path;
+}
+
+class _DirectoryCard extends StatelessWidget {
+  const _DirectoryCard({required this.item});
+
+  final _DirectoryItem item;
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = ShadTheme.of(context);
+
+    return AppCard(
+      onTap: () => context.push(item.path),
+      padding: const EdgeInsets.all(16),
+      child: Row(
+        children: [
+          Container(
+            width: 44,
+            height: 44,
+            decoration: BoxDecoration(
+              color: theme.colorScheme.secondary,
+              borderRadius: BorderRadius.circular(8),
+            ),
+            child: Icon(
+              item.icon,
+              size: 20,
+              color: theme.colorScheme.secondaryForeground,
+            ),
+          ),
+          const SizedBox(width: 12),
+          Expanded(
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Row(
+                  children: [
+                    Flexible(
+                      child: Text(item.title, style: YantingText.listTitle),
+                    ),
+                    if (item.title == '推荐') ...[
+                      const SizedBox(width: 8),
+                      const AppBadge(text: '首页', kind: BadgeKind.tier),
+                    ],
+                  ],
+                ),
+                const SizedBox(height: 2),
+                Text(item.subtitle, style: YantingText.meta),
+              ],
+            ),
+          ),
+          Icon(
+            LucideIcons.chevronRight,
+            size: 16,
+            color: theme.colorScheme.mutedForeground,
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+const _directoryItems = [
+  _DirectoryItem(
+    title: '推荐',
+    subtitle: '主题筛选后的重点研报解读',
+    icon: AppIcons.sparkle,
+    path: AppRoutes.home,
+  ),
+  _DirectoryItem(
+    title: '研报',
+    subtitle: '搜索、筛选和浏览全部研报',
+    icon: AppIcons.article,
+    path: AppRoutes.reports,
+  ),
+  _DirectoryItem(
+    title: '机构',
+    subtitle: '按机构查看来源与覆盖主题',
+    icon: AppIcons.bank,
+    path: AppRoutes.institutions,
+  ),
+  _DirectoryItem(
+    title: '听单',
+    subtitle: '继续收听音频解读',
+    icon: AppIcons.headphones,
+    path: AppRoutes.listen,
+  ),
+  _DirectoryItem(
+    title: '我的',
+    subtitle: '登录、收藏与合规说明',
+    icon: AppIcons.user,
+    path: AppRoutes.profile,
+  ),
+];
+
+void _playFromReport(
+  void Function(AudioItem item) onPlay,
+  ReportCardModel report,
+) {
+  onPlay(
+    AudioItem(
+      audioId: 'local_${report.id}',
+      reportId: report.id,
+      titleCn: report.titleCn,
+      reportTitleCn: report.titleCn,
+      durationSec: 180,
+      institution: report.institution,
+    ),
+  );
+}

lib/features/institutions/institution_detail_page.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:shadcn_ui/shadcn_ui.dart';
 
 import '../../data/api/report_data_source.dart';
 import '../../data/models/models.dart';
@@ -8,7 +9,6 @@ import '../../routing/app_routes.dart';
 import '../../theme/app_icons.dart';
 import '../../theme/yanting_text.dart';
 import '../../theme/yanting_tokens.dart';
-import '../../theme/wise_tokens.dart';
 import '../../widgets/app_buttons.dart';
 import '../../widgets/app_card.dart';
 import '../../widgets/badges.dart';
@@ -35,9 +35,23 @@ class InstitutionDetailPage extends HookConsumerWidget {
       [dataSource, institutionId, retryCount.value],
     );
     final snapshot = useFuture(future);
+    final theme = ShadTheme.of(context);
 
     return Scaffold(
-      appBar: AppBar(title: const Text('机构主页')),
+      backgroundColor: theme.colorScheme.background,
+      appBar: AppBar(
+        backgroundColor: theme.colorScheme.background,
+        surfaceTintColor: Colors.transparent,
+        elevation: 0,
+        title: const Text('机构主页'),
+        bottom: PreferredSize(
+          preferredSize: const Size.fromHeight(1),
+          child: ColoredBox(
+            color: theme.colorScheme.border,
+            child: const SizedBox(height: 1, width: double.infinity),
+          ),
+        ),
+      ),
       body: snapshot.connectionState != ConnectionState.done
           ? const LoadingState()
           : snapshot.hasError
@@ -65,7 +79,12 @@ class _InstitutionDetailContent extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return ListView(
-      padding: const EdgeInsets.fromLTRB(WiseSpacing.x4, 4, WiseSpacing.x4, 16),
+      padding: const EdgeInsets.fromLTRB(
+        YantingSpacing.x4,
+        4,
+        YantingSpacing.x4,
+        16,
+      ),
       children: [
         AppCard(
           color: YantingColors.brandSoft,
@@ -116,26 +135,26 @@ class _InstitutionDetailContent extends StatelessWidget {
             ],
           ),
         ),
-        const SizedBox(height: WiseSpacing.x3),
+        const SizedBox(height: YantingSpacing.x3),
         if (item.introCn.isNotEmpty)
           AppCard(child: Text(item.introCn, style: YantingText.body)),
-        const SizedBox(height: WiseSpacing.x3),
+        const SizedBox(height: YantingSpacing.x3),
         if (item.credibilityNote.isNotEmpty)
           AppCard(
             child: Row(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
                 const Icon(AppIcons.shield, color: YantingColors.chart2),
-                const SizedBox(width: WiseSpacing.x2),
+                const SizedBox(width: YantingSpacing.x2),
                 Expanded(
                   child: Text(item.credibilityNote, style: YantingText.body),
                 ),
               ],
             ),
           ),
-        const SizedBox(height: WiseSpacing.x5),
+        const SizedBox(height: YantingSpacing.x6),
         Text('最新研报', style: YantingText.sectionTitle.copyWith(fontSize: 21)),
-        const SizedBox(height: WiseSpacing.x3),
+        const SizedBox(height: YantingSpacing.x3),
         if (item.recentReports.isEmpty)
           const EmptyState(
             title: '机构暂无研报',
@@ -148,7 +167,7 @@ class _InstitutionDetailContent extends StatelessWidget {
               report: report,
               onTap: () => openReportDetail(context, dataSource, report),
             ),
-            const SizedBox(height: WiseSpacing.x3),
+            const SizedBox(height: YantingSpacing.x3),
           ],
         AppButton(
           label: '了解相关服务',

lib/features/institutions/institutions_page.dart

@@ -1,10 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:shadcn_ui/shadcn_ui.dart';
 
 import '../../data/api/report_data_source.dart';
 import '../../data/content_providers.dart';
 import '../../routing/app_routes.dart';
-import '../../theme/wise_tokens.dart';
+import '../../theme/yanting_tokens.dart';
 import '../../widgets/institution_card.dart';
 import '../../widgets/page_header.dart';
 import '../../widgets/states.dart';
@@ -35,20 +36,23 @@ class InstitutionsPage extends HookConsumerWidget {
         }
         return ListView(
           padding: const EdgeInsets.fromLTRB(
-            WiseSpacing.x4,
+            YantingSpacing.screenX,
             4,
-            WiseSpacing.x4,
+            YantingSpacing.screenX,
             16,
           ),
           children: [
             const PageHeader(title: '机构', subtitle: '可获取研报的机构'),
+            const SizedBox(height: YantingSpacing.x3),
+            const ShadSeparator.horizontal(),
+            const SizedBox(height: YantingSpacing.x3),
             for (final item in sorted) ...[
               InstitutionCard(
                 institution: item,
                 onTap: () =>
                     openInstitutionDetail(context, dataSource, item.id),
               ),
-              const SizedBox(height: WiseSpacing.x3),
+              const SizedBox(height: YantingSpacing.x3),
             ],
           ],
         );

lib/features/listen/listen_page.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:shadcn_ui/shadcn_ui.dart';
 
 import '../../data/api/report_data_source.dart';
 import '../../data/content_providers.dart';
@@ -7,7 +8,6 @@ import '../../data/models/models.dart';
 import '../../theme/app_icons.dart';
 import '../../theme/yanting_text.dart';
 import '../../theme/yanting_tokens.dart';
-import '../../theme/wise_tokens.dart';
 import '../../widgets/app_card.dart';
 import '../../widgets/badges.dart';
 import '../../widgets/page_header.dart';
@@ -39,9 +39,9 @@ class ListenPage extends HookConsumerWidget {
         final current = items.first;
         return ListView(
           padding: const EdgeInsets.fromLTRB(
-            WiseSpacing.x4,
+            YantingSpacing.screenX,
             4,
-            WiseSpacing.x4,
+            YantingSpacing.screenX,
             16,
           ),
           children: [
@@ -52,9 +52,11 @@ class ListenPage extends HookConsumerWidget {
               onPlay: () => onPlay(current),
             ),
             const SectionTitle(title: '全部音频', icon: AppIcons.arrowRight),
+            const ShadSeparator.horizontal(),
+            const SizedBox(height: YantingSpacing.x3),
             for (final item in items.skip(1)) ...[
               _AudioListCard(item: item, onPlay: () => onPlay(item)),
-              const SizedBox(height: WiseSpacing.x3),
+              const SizedBox(height: YantingSpacing.x3),
             ],
           ],
         );
@@ -113,26 +115,17 @@ class _ContinueListeningCard extends StatelessWidget {
           const SizedBox(height: 16),
           Row(
             children: [
-              IconButton.filled(
+              ShadButton(
                 onPressed: onPlay,
-                icon: const Icon(AppIcons.play),
-                style: IconButton.styleFrom(
-                  backgroundColor: YantingColors.primary,
-                  foregroundColor: YantingColors.primaryForeground,
-                  fixedSize: const Size(48, 48),
-                ),
+                width: 48,
+                height: 48,
+                child: const Icon(AppIcons.play, size: 18),
               ),
               const SizedBox(width: 13),
               Expanded(
                 child: Column(
                   children: [
-                    LinearProgressIndicator(
-                      value: 0.42,
-                      minHeight: 5,
-                      borderRadius: BorderRadius.circular(YantingRadius.pill),
-                      backgroundColor: YantingColors.border,
-                      color: YantingColors.primary,
-                    ),
+                    const ShadProgress(value: 0.42),
                     const SizedBox(height: 8),
                     Row(
                       mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -204,14 +197,11 @@ class _AudioListCard extends StatelessWidget {
             ),
           ),
           const SizedBox(width: 10),
-          IconButton.filled(
+          ShadButton(
             onPressed: onPlay,
-            icon: const Icon(AppIcons.play),
-            style: IconButton.styleFrom(
-              backgroundColor: YantingColors.primary,
-              foregroundColor: YantingColors.primaryForeground,
-              fixedSize: const Size(44, 44),
-            ),
+            width: 44,
+            height: 44,
+            child: const Icon(AppIcons.play, size: 16),
           ),
         ],
       ),

lib/features/profile/profile_page.dart

@@ -4,7 +4,6 @@ import '../../data/api/report_data_source.dart';
 import '../../theme/app_icons.dart';
 import '../../theme/yanting_text.dart';
 import '../../theme/yanting_tokens.dart';
-import '../../theme/wise_tokens.dart';
 import '../../widgets/app_buttons.dart';
 import '../../widgets/app_card.dart';
 import '../../widgets/page_header.dart';
@@ -19,7 +18,12 @@ class ProfilePage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return ListView(
-      padding: const EdgeInsets.fromLTRB(WiseSpacing.x4, 4, WiseSpacing.x4, 16),
+      padding: const EdgeInsets.fromLTRB(
+        YantingSpacing.screenX,
+        4,
+        YantingSpacing.screenX,
+        16,
+      ),
       children: [
         const PageHeader(title: '我的'),
         AppCard(
@@ -52,7 +56,7 @@ class ProfilePage extends StatelessWidget {
             ],
           ),
         ),
-        const SizedBox(height: WiseSpacing.x3),
+        const SizedBox(height: YantingSpacing.x3),
         AppButton(
           label: '登录 / 注册',
           expand: true,
@@ -69,7 +73,7 @@ class ProfilePage extends StatelessWidget {
             ),
           ],
         ),
-        const SizedBox(height: WiseSpacing.x3),
+        const SizedBox(height: YantingSpacing.x3),
         _MenuGroup(
           children: [
             _MenuRow(
@@ -89,7 +93,7 @@ class ProfilePage extends StatelessWidget {
             ),
           ],
         ),
-        const SizedBox(height: WiseSpacing.x3),
+        const SizedBox(height: YantingSpacing.x3),
         AppCard(
           color: YantingColors.secondary,
           onTap: () => showOutboundSheet(context, title: '相关服务'),

lib/features/reports/reports_page.dart

@@ -1,17 +1,14 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:shadcn_ui/shadcn_ui.dart';
 
 import '../../data/api/report_data_source.dart';
 import '../../data/content_providers.dart';
 import '../../data/models/models.dart';
 import '../../routing/app_routes.dart';
-import '../../theme/app_icons.dart';
 import '../../theme/yanting_text.dart';
 import '../../theme/yanting_tokens.dart';
-import '../../theme/wise_tokens.dart';
-import '../../widgets/app_buttons.dart';
-import '../../widgets/badges.dart';
 import '../../widgets/mini_player.dart';
 import '../../widgets/page_header.dart';
 import '../../widgets/states.dart';
@@ -45,6 +42,8 @@ class ReportsPage extends HookConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
+    final theme = ShadTheme.of(context);
+    final searchController = useTextEditingController();
     final query = useState('');
     final topic = useState('');
     final hasAudio = useState(false);
@@ -67,104 +66,127 @@ class ReportsPage extends HookConsumerWidget {
           hasAudio: currentHasAudio,
         );
 
-        return ListView(
+        return SingleChildScrollView(
           padding: const EdgeInsets.fromLTRB(
-            WiseSpacing.x4,
+            YantingSpacing.screenX,
             4,
-            WiseSpacing.x4,
+            YantingSpacing.screenX,
             16,
           ),
-          children: [
-            const PageHeader(title: '研报', subtitle: '全部已发布研报解读'),
-            TextField(
-              decoration: InputDecoration(
-                hintText: '搜索标题、机构或主题',
-                prefixIcon: const Icon(AppIcons.search),
-                suffixIcon: currentQuery.isEmpty
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.stretch,
+            children: [
+              const PageHeader(title: '研报', subtitle: '全部已发布研报解读'),
+              ShadInput(
+                controller: searchController,
+                placeholder: const Text('搜索标题、机构或主题'),
+                leading: const Padding(
+                  padding: EdgeInsets.only(right: 8),
+                  child: Icon(LucideIcons.search, size: 16),
+                ),
+                trailing: currentQuery.isEmpty
                     ? null
-                    : IconButton(
-                        onPressed: () => query.value = '',
-                        icon: const Icon(Icons.close),
-                      ),
-                border: OutlineInputBorder(
-                  borderRadius: BorderRadius.circular(YantingRadius.md),
-                  borderSide: const BorderSide(color: YantingColors.input),
-                ),
-              ),
-              onChanged: (value) => query.value = value.trim(),
-            ),
-            const SizedBox(height: WiseSpacing.x3),
-            Row(
-              children: [
-                AppButton(
-                  label: '筛选',
-                  icon: AppIcons.filter,
-                  kind: AppButtonKind.ghost,
-                  onPressed: items.isEmpty
-                      ? null
-                      : () => _openFilterSheet(
-                          context,
-                          items: items,
-                          topic: topic,
+                    : Padding(
+                        padding: const EdgeInsets.only(left: 8),
+                        child: ShadButton.ghost(
+                          size: ShadButtonSize.sm,
+                          onPressed: () {
+                            searchController.clear();
+                            query.value = '';
+                          },
+                          child: const Icon(LucideIcons.x, size: 16),
                         ),
-                ),
-                const SizedBox(width: WiseSpacing.x2),
-                AppButton(
-                  label: '最新',
-                  icon: AppIcons.sort,
-                  kind: AppButtonKind.ghost,
-                  onPressed: () {},
-                ),
-                const SizedBox(width: WiseSpacing.x2),
-                AppChip(
-                  label: '音频',
-                  selected: currentHasAudio,
-                  onTap: () => hasAudio.value = !currentHasAudio,
-                ),
-                const Spacer(),
-                Text('共 ${filtered.length} 篇', style: YantingText.meta),
-              ],
-            ),
-            const SizedBox(height: WiseSpacing.x3),
-            if (filtered.isEmpty)
-              EmptyState(
-                title: currentQuery.isNotEmpty ? '未找到相关研报' : '当前筛选下暂无研报',
-                message: currentQuery.isNotEmpty ? '换个关键词试试' : '调整筛选条件后再试',
-                actionLabel: '清除筛选',
-                onAction: () {
-                  query.value = '';
-                  topic.value = '';
-                  hasAudio.value = false;
-                },
-              )
-            else
-              for (final report in filtered) ...[
-                ReportCardWidget(
-                  report: report,
-                  onTap: () => openReportDetail(
-                    context,
-                    dataSource,
-                    report,
-                    player: player,
-                    onStartAudio: onStartModuleAudio,
-                    onToggleAudio: onToggleAudio,
-                    onSeekAudio: onSeekAudio,
-                    onSpeed: onSpeed,
+                      ),
+                onChanged: (value) => query.value = value.trim(),
+              ),
+              const SizedBox(height: YantingSpacing.x3),
+              Wrap(
+                spacing: YantingSpacing.x2,
+                runSpacing: YantingSpacing.x2,
+                children: [
+                  ShadButton.outline(
+                    onPressed: items.isEmpty
+                        ? null
+                        : () => _openFilterSheet(
+                            context,
+                            items: items,
+                            topic: topic,
+                          ),
+                    leading: const Icon(
+                      LucideIcons.slidersHorizontal,
+                      size: 16,
+                    ),
+                    child: const Text('筛选'),
                   ),
-                  onPlayTap: () => onPlay(
-                    AudioItem(
-                      audioId: 'local_${report.id}',
-                      reportId: report.id,
-                      titleCn: report.titleCn,
-                      reportTitleCn: report.titleCn,
-                      durationSec: 180,
-                      institution: report.institution,
+                  ShadButton.outline(
+                    onPressed: () {},
+                    leading: const Icon(LucideIcons.arrowUpDown, size: 16),
+                    child: const Text('最新'),
+                  ),
+                  ShadBadge.secondary(
+                    onPressed: () => hasAudio.value = !currentHasAudio,
+                    backgroundColor: currentHasAudio
+                        ? theme.colorScheme.foreground
+                        : theme.colorScheme.secondary,
+                    foregroundColor: currentHasAudio
+                        ? theme.colorScheme.background
+                        : theme.colorScheme.secondaryForeground,
+                    hoverBackgroundColor: currentHasAudio
+                        ? theme.colorScheme.foreground.withValues(alpha: 0.9)
+                        : theme.colorScheme.border,
+                    child: const Text('音频'),
+                  ),
+                ],
+              ),
+              const SizedBox(height: 8),
+              Align(
+                alignment: Alignment.centerRight,
+                child: Text('共 ${filtered.length} 篇', style: YantingText.meta),
+              ),
+              const SizedBox(height: YantingSpacing.x3),
+              const ShadSeparator.horizontal(),
+              const SizedBox(height: YantingSpacing.x3),
+              if (filtered.isEmpty)
+                EmptyState(
+                  title: currentQuery.isNotEmpty ? '未找到相关研报' : '当前筛选下暂无研报',
+                  message: currentQuery.isNotEmpty ? '换个关键词试试' : '调整筛选条件后再试',
+                  actionLabel: '清除筛选',
+                  onAction: () {
+                    searchController.clear();
+                    query.value = '';
+                    topic.value = '';
+                    hasAudio.value = false;
+                  },
+                )
+              else
+                for (final report in filtered) ...[
+                  ReportCardWidget(
+                    report: report,
+                    onTap: () => openReportDetail(
+                      context,
+                      dataSource,
+                      report,
+                      player: player,
+                      onStartAudio: onStartModuleAudio,
+                      onToggleAudio: onToggleAudio,
+                      onSeekAudio: onSeekAudio,
+                      onSpeed: onSpeed,
+                    ),
+                    onPlayTap: () => onPlay(
+                      AudioItem(
+                        audioId: 'local_${report.id}',
+                        reportId: report.id,
+                        titleCn: report.titleCn,
+                        reportTitleCn: report.titleCn,
+                        durationSec: 180,
+                        institution: report.institution,
+                      ),
                     ),
                   ),
-                ),
-                const SizedBox(height: WiseSpacing.x3),
-              ],
-          ],
+                  const SizedBox(height: YantingSpacing.x3),
+                ],
+            ],
+          ),
         );
       },
     );
@@ -194,45 +216,65 @@ void _openFilterSheet(
   required ValueNotifier<String> topic,
 }) {
   final topics = {for (final item in items) ...item.topics}.toList();
-  showModalBottomSheet<void>(
+  showShadSheet<void>(
     context: context,
-    showDragHandle: true,
-    shape: const RoundedRectangleBorder(
-      borderRadius: BorderRadius.vertical(top: Radius.circular(WiseRadius.lg)),
-    ),
-    builder: (context) => Padding(
-      padding: const EdgeInsets.fromLTRB(20, 4, 20, 28),
-      child: Column(
-        mainAxisSize: MainAxisSize.min,
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Text('筛选研报', style: Theme.of(context).textTheme.titleLarge),
-          const SizedBox(height: WiseSpacing.x3),
-          Wrap(
-            spacing: WiseSpacing.x2,
-            runSpacing: WiseSpacing.x2,
-            children: [
-              AppChip(
-                label: '全部主题',
-                selected: topic.value.isEmpty,
-                onTap: () => topic.value = '',
-              ),
-              for (final t in topics)
-                AppChip(
-                  label: t,
-                  selected: topic.value == t,
-                  onTap: () => topic.value = t,
+    side: ShadSheetSide.bottom,
+    builder: (context) {
+      final theme = ShadTheme.of(context);
+      final selectedBackground = theme.colorScheme.foreground;
+      final selectedForeground = theme.colorScheme.background;
+      final unselectedBackground = theme.colorScheme.secondary;
+      final unselectedForeground = theme.colorScheme.secondaryForeground;
+
+      return ShadSheet(
+        title: const Text('筛选研报'),
+        description: const Text('按主题快速收窄列表。'),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Wrap(
+              spacing: YantingSpacing.x2,
+              runSpacing: YantingSpacing.x2,
+              children: [
+                ShadBadge.secondary(
+                  onPressed: () => topic.value = '',
+                  backgroundColor: topic.value.isEmpty
+                      ? selectedBackground
+                      : unselectedBackground,
+                  foregroundColor: topic.value.isEmpty
+                      ? selectedForeground
+                      : unselectedForeground,
+                  hoverBackgroundColor: topic.value.isEmpty
+                      ? selectedBackground.withValues(alpha: 0.9)
+                      : theme.colorScheme.border,
+                  child: const Text('全部主题'),
                 ),
-            ],
-          ),
-          const SizedBox(height: WiseSpacing.x4),
-          AppButton(
-            label: '完成',
-            expand: true,
-            onPressed: () => Navigator.pop(context),
-          ),
-        ],
-      ),
-    ),
+                for (final t in topics)
+                  ShadBadge.secondary(
+                    onPressed: () => topic.value = t,
+                    backgroundColor: topic.value == t
+                        ? selectedBackground
+                        : unselectedBackground,
+                    foregroundColor: topic.value == t
+                        ? selectedForeground
+                        : unselectedForeground,
+                    hoverBackgroundColor: topic.value == t
+                        ? selectedBackground.withValues(alpha: 0.9)
+                        : theme.colorScheme.border,
+                    child: Text(t),
+                  ),
+              ],
+            ),
+            const SizedBox(height: 12),
+            ShadButton(
+              width: double.infinity,
+              onPressed: () => Navigator.pop(context),
+              child: const Text('完成'),
+            ),
+          ],
+        ),
+      );
+    },
   );
 }

lib/features/shell_page.dart

@@ -1,10 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:shadcn_ui/shadcn_ui.dart';
 
-import '../routing/app_routes.dart';
 import '../data/providers.dart';
-import '../theme/wise_tokens.dart';
+import '../routing/app_routes.dart';
+import '../theme/yanting_text.dart';
 import '../widgets/bottom_tab_bar.dart';
 import '../widgets/mini_player.dart';
 
@@ -16,30 +17,42 @@ class ShellPage extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
+    final theme = ShadTheme.of(context);
     final player = ref.watch(audioPlayerControllerProvider);
     final controller = ref.read(audioPlayerControllerProvider.notifier);
+    final canPop = GoRouter.of(context).canPop();
     final selectedIndex = _tabs.indexWhere((tab) => tab.path == currentPath);
     final safeIndex = selectedIndex < 0 ? 0 : selectedIndex;
 
     return Scaffold(
+      backgroundColor: theme.colorScheme.background,
       appBar: AppBar(
-        title: const Column(
+        backgroundColor: theme.colorScheme.background,
+        surfaceTintColor: Colors.transparent,
+        elevation: 0,
+        leading: canPop
+            ? ShadIconButton.ghost(
+                onPressed: () => context.pop(),
+                icon: const Icon(LucideIcons.chevronLeft, size: 18),
+              )
+            : null,
+        title: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            Text('研听'),
-            Text(
-              '全球机构研报中文解读',
-              style: TextStyle(
-                fontSize: 12,
-                color: WiseColors.textSecondary,
-                fontWeight: FontWeight.w500,
-              ),
-            ),
+            Text('研听', style: YantingText.listTitle),
+            Text('全球机构研报中文解读', style: YantingText.meta.copyWith(fontSize: 12)),
           ],
         ),
+        bottom: PreferredSize(
+          preferredSize: const Size.fromHeight(1),
+          child: ColoredBox(
+            color: theme.colorScheme.border,
+            child: const SizedBox(height: 1, width: double.infinity),
+          ),
+        ),
       ),
       body: ColoredBox(
-        color: Theme.of(context).scaffoldBackgroundColor,
+        color: theme.colorScheme.background,
         child: Stack(children: [Positioned.fill(child: child)]),
       ),
       bottomNavigationBar: SafeArea(