已完成用户APP首期功能开发

交付用户端首期页面、配套接口、后台资源及测试文档。用户APP构建、静态分析和三个管理后台构建通过；完整测试仍有2项失败，后端模型注释检查未通过，详见交付记录。

apps/user_app/lib/app/app.dart

@@ -1,4 +1,8 @@
+// 功能：装配用户端主题与路由，并让桌面 Web 预览保持产品图手机画布宽度。
+// 版本：1.1.0。
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_localizations/flutter_localizations.dart';
 
 import '../ui/core/app_theme.dart';
 import 'dependencies.dart';
@@ -19,10 +23,28 @@ class _UserClientAppState extends State<UserClientApp> {
   @override
   Widget build(BuildContext context) => MaterialApp.router(
     title: '瓶安芯',
+    // 首期面向中文用户，系统日期与时间控件统一使用简体中文。
+    locale: const Locale('zh', 'CN'),
+    supportedLocales: const [Locale('zh', 'CN')],
+    localizationsDelegates: GlobalMaterialLocalizations.delegates,
     debugShowCheckedModeBanner: false,
     theme: AppTheme.light(),
     darkTheme: AppTheme.dark(),
     themeMode: ThemeMode.system,
     routerConfig: _router,
+    builder: (context, child) {
+      if (!kIsWeb) return child ?? const SizedBox.shrink();
+      // 产品设计宽853像素按2倍密度绘制；Web预览以427 CSS像素展示同一手机画布。
+      return ColoredBox(
+        color: const Color(0xFFEFF2F7),
+        child: Align(
+          alignment: Alignment.topCenter,
+          child: ConstrainedBox(
+            constraints: const BoxConstraints(maxWidth: 427),
+            child: SizedBox(width: double.infinity, child: child),
+          ),
+        ),
+      );
+    },
   );
 }

apps/user_app/lib/app/dependencies.dart

@@ -6,15 +6,19 @@ import 'package:flutter/foundation.dart';
 import '../data/repositories/client_repository.dart';
 import '../data/services/api_client.dart';
 import '../data/services/secure_session_store.dart';
+import '../data/services/repair_draft_store.dart';
+import '../domain/models/primary_models.dart';
 
 class AppDependencies {
   AppDependencies({
     required this.session,
     required this.repository,
+    this.repairDraftStore,
   });
 
   final UserSession session;
   final ClientRepository repository;
+  final RepairDraftStore? repairDraftStore;
 
   static Future<AppDependencies> create() async {
     final store = SecureSessionStore();
@@ -24,7 +28,11 @@ class AppDependencies {
       () => session.token,
       onUnauthorized: session.invalidate,
     );
-    return AppDependencies(session: session, repository: ClientRepository(api));
+    return AppDependencies(
+      session: session,
+      repository: ClientRepository(api),
+      repairDraftStore: SecureRepairDraftStore(),
+    );
   }
 }
 
@@ -36,6 +44,13 @@ class UserSession extends ChangeNotifier {
   final SessionStore _store;
   String _token = '';
   bool _expired = false;
+
+  /// 本次登录是否持久化；默认兼容旧调用方，登录页由用户显式选择。
+  bool rememberLogin = true;
+
+  /// 只保存本次明确同意的内容版本，不在客户端推测当前发布版本。
+  List<PublishedContent> loginConsents = const [];
+  DateTime? loginConsentShownAt;
   Future<void> _pendingClear = Future<void>.value();
 
   String get token => _token;
@@ -66,6 +81,15 @@ class UserSession extends ChangeNotifier {
           'password': verification ? '' : password,
           'code': verificationCode ?? '',
           'request_identity': requestIdentity ?? '',
+          if (loginConsents.isNotEmpty)
+            'consents': [
+              for (final c in loginConsents)
+                {
+                  'identity': c.identity,
+                  'version': c.version,
+                  'shown_at': loginConsentShownAt?.toUtc().toIso8601String(),
+                },
+            ],
         },
       ),
     );
@@ -74,9 +98,16 @@ class UserSession extends ChangeNotifier {
 
     // 等待旧令牌清理结束，避免迟到的删除任务误删刚写入的新令牌。
     await _pendingClear;
-    await _store.writeToken(token);
+    if (rememberLogin) {
+      await _store.writeToken(token);
+    } else {
+      // 清理历史令牌失败时不能声称已关闭持久会话。
+      await _store.clear();
+    }
     _token = token;
     _expired = false;
+    loginConsents = const [];
+    loginConsentShownAt = null;
     notifyListeners();
   }
 
@@ -89,9 +120,32 @@ class UserSession extends ChangeNotifier {
         body: {'phone': phone, 'purpose': purpose},
       ),
     );
+    // Mock环境只生成服务端校验记录，并未向用户手机发送短信，不能启动已发送倒计时。
+    if (details['delivery_status'] == 'not_sent') {
+      throw const ApiException(2410, '短信验证码暂未开放');
+    }
     return details['request_identity'] as String? ?? '';
   }
 
+  /// 使用重置专用验证码修改密码，服务端校验验证码用途和密码规则。
+  Future<void> resetPassword({
+    required String phone,
+    required String code,
+    required String requestIdentity,
+    required String password,
+  }) async {
+    await ApiClient(() => '').post(
+      '$_root/auth/reset-password',
+      authenticated: false,
+      body: {
+        'phone': phone,
+        'code': code,
+        'request_identity': requestIdentity,
+        'new_password': password,
+      },
+    );
+  }
+
   Future<void> logout() async {
     _token = '';
     _expired = false;

apps/user_app/lib/app/router.dart

@@ -4,12 +4,45 @@ import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 
 import '../ui/features/auth/login_page.dart';
+import '../ui/features/address/addresses_page.dart';
 import '../ui/features/auth/register_page.dart';
 import '../ui/features/home/home_page.dart';
 import '../ui/features/orders/orders_page.dart';
+import '../ui/features/orders/gas_contracts_page.dart';
+import '../ui/features/orders/shop_order_detail_page.dart';
+import '../ui/features/orders/payment_confirmation_page.dart';
+import '../ui/features/orders/gas_order_create_page.dart';
+import '../ui/features/orders/delivery_detail_page.dart';
+import '../ui/features/orders/delivery_track_page.dart';
+import '../ui/features/orders/invoice_preview_page.dart';
 import '../ui/features/profile/profile_page.dart';
-import '../ui/features/shared/record_list_page.dart';
+import '../ui/features/profile/devices_page.dart';
+import '../ui/features/profile/device_groups_page.dart';
+import '../ui/features/profile/emergency_contacts_page.dart';
+import '../ui/features/profile/family_sharing_page.dart';
+import '../ui/features/profile/profile_edit_page.dart';
+import '../ui/features/profile/user_records_page.dart';
+import '../ui/features/profile/usage_statistics_page.dart';
+import '../ui/features/profile/message_center_page.dart';
+import '../ui/features/settings/settings_page.dart';
+import '../ui/features/settings/login_password_page.dart';
+import '../ui/features/settings/payment_password_page.dart';
+import '../ui/features/wallet/wallet_page.dart';
+import '../ui/features/wallet/recharge_records_page.dart';
+import '../ui/features/wallet/recharge_page.dart';
+import '../ui/features/wallet/wallet_bills_page.dart';
+import '../ui/features/wallet/withdrawal_page.dart';
+import '../ui/features/wallet/bank_cards_page.dart';
+import '../ui/features/wallet/deposit_page.dart';
+import '../ui/features/wallet/deposit_return_page.dart';
 import '../ui/features/shop/shop_page.dart';
+import '../ui/features/shop/checkout_page.dart';
+import '../ui/features/shop/cart_page.dart';
+import '../ui/features/shop/favorites_page.dart';
+import '../ui/features/shop/product_detail_page.dart';
+import '../ui/features/home/safety_contents_page.dart';
+import '../ui/features/tickets/ticket_detail_page.dart';
+import '../ui/features/tickets/repair_page.dart';
 import 'auth_navigation.dart';
 import 'dependencies.dart';
 
@@ -21,7 +54,13 @@ GoRouter createRouter(
   refreshListenable: dependencies.session,
   redirect: (context, state) {
     final authRoute = state.matchedLocation == '/login' || state.matchedLocation == '/register';
-    if (!dependencies.session.isAuthenticated && !authRoute) {
+    final publicRoute =
+        state.matchedLocation == '/home' ||
+        state.matchedLocation == '/shop' ||
+        state.matchedLocation == '/contents' ||
+        state.matchedLocation.startsWith('/contents/') ||
+        state.matchedLocation.startsWith('/products/');
+    if (!dependencies.session.isAuthenticated && !authRoute && !publicRoute) {
       return buildAuthLocation(
         '/login',
         redirectTarget: state.uri.toString(),
@@ -34,10 +73,167 @@ GoRouter createRouter(
     return null;
   },
   routes: [
+    GoRoute(
+      path: '/devices',
+      builder: (_, state) => DevicesPage(repository: dependencies.repository),
+    ),
+    GoRoute(
+      path: '/records',
+      builder: (_, state) => UserRecordsPage(repository: dependencies.repository),
+    ),
+    GoRoute(
+      path: '/usage',
+      builder: (_, state) => UsageStatisticsPage(repository: dependencies.repository),
+    ),
+    GoRoute(
+      path: '/messages',
+      builder: (_, state) => MessageCenterPage(repository: dependencies.repository),
+    ),
+    GoRoute(
+      path: '/device-groups',
+      builder: (_, state) => DeviceGroupsPage(repository: dependencies.repository),
+    ),
+    GoRoute(
+      path: '/safety/contacts',
+      builder: (_, state) => EmergencyContactsPage(repository: dependencies.repository),
+    ),
+    GoRoute(
+      path: '/family',
+      builder: (_, state) => FamilySharingPage(repository: dependencies.repository),
+    ),
+    GoRoute(
+      path: '/contents',
+      builder: (_, state) => SafetyContentsPage(repository: dependencies.repository),
+    ),
+    GoRoute(
+      path: '/contents/:identity',
+      builder: (_, state) => SafetyContentsPage(
+        repository: dependencies.repository,
+        identity: state.pathParameters['identity']!,
+      ),
+    ),
+    GoRoute(
+      path: '/settings/payment-password',
+      builder: (_, state) => PaymentPasswordPage(repository: dependencies.repository),
+    ),
+    GoRoute(
+      path: '/settings',
+      builder: (_, state) =>
+          SettingsPage(repository: dependencies.repository, session: dependencies.session),
+    ),
+    GoRoute(
+      path: '/settings/password',
+      builder: (_, state) =>
+          LoginPasswordPage(repository: dependencies.repository, session: dependencies.session),
+    ),
+    GoRoute(
+      path: '/gas/order',
+      builder: (_, _) => GasOrderCreatePage(repository: dependencies.repository),
+    ),
+    GoRoute(
+      path: '/gas/orders/:identity',
+      builder: (_, state) => ShopOrderDetailPage(
+        repository: dependencies.repository,
+        identity: state.pathParameters['identity']!,
+        business: 'gas',
+      ),
+    ),
+    GoRoute(
+      path: '/shop/orders/:identity',
+      builder: (_, state) => ShopOrderDetailPage(
+        repository: dependencies.repository,
+        identity: state.pathParameters['identity']!,
+      ),
+    ),
+    GoRoute(
+      path: '/gas/orders/:identity/delivery',
+      builder: (_, state) => DeliveryDetailPage(
+        repository: dependencies.repository,
+        identity: state.pathParameters['identity']!,
+      ),
+    ),
+    GoRoute(
+      path: '/gas/orders/:identity/delivery/track',
+      builder: (_, state) => DeliveryTrackPage(
+        repository: dependencies.repository,
+        identity: state.pathParameters['identity']!,
+      ),
+    ),
+    GoRoute(
+      path: '/invoice/:business/:identity',
+      builder: (_, state) => InvoicePreviewPage(
+        repository: dependencies.repository,
+        business: state.pathParameters['business']!,
+        identity: state.pathParameters['identity']!,
+      ),
+    ),
+    GoRoute(
+      path: '/payment/:business/:identity',
+      builder: (_, state) => PaymentConfirmationPage(
+        repository: dependencies.repository,
+        business: state.pathParameters['business']!,
+        identity: state.pathParameters['identity']!,
+      ),
+    ),
+    GoRoute(
+      path: '/favorites',
+      builder: (_, state) => FavoritesPage(repository: dependencies.repository),
+    ),
+    GoRoute(
+      path: '/cart',
+      builder: (_, state) => CartPage(repository: dependencies.repository),
+    ),
+    GoRoute(
+      path: '/cart/checkout',
+      builder: (_, state) =>
+          CheckoutPage(repository: dependencies.repository, productIdentity: '', fromCart: true),
+    ),
+    GoRoute(
+      path: '/repair',
+      builder: (_, state) => RepairPage(
+        repository: dependencies.repository,
+        draftStore: dependencies.repairDraftStore,
+      ),
+    ),
+    GoRoute(
+      path: '/tickets/:identity',
+      builder: (_, state) => TicketDetailPage(
+        repository: dependencies.repository,
+        identity: state.pathParameters['identity']!,
+      ),
+    ),
+    GoRoute(
+      path: '/checkout/:identity',
+      builder: (_, state) => CheckoutPage(
+        repository: dependencies.repository,
+        productIdentity: state.pathParameters['identity']!,
+        initialQuantity: int.tryParse(state.uri.queryParameters['quantity'] ?? '') ?? 1,
+      ),
+    ),
+    GoRoute(
+      path: '/products/:identity',
+      builder: (_, state) => ProductDetailPage(
+        repository: dependencies.repository,
+        identity: state.pathParameters['identity']!,
+        authenticated: dependencies.session.isAuthenticated,
+      ),
+    ),
+    GoRoute(
+      path: '/addresses',
+      builder: (context, state) => AddressesPage(
+        repository: dependencies.repository,
+        selecting: state.uri.queryParameters['select'] == '1',
+      ),
+    ),
+    GoRoute(
+      path: '/profile/edit',
+      builder: (context, state) => ProfileEditPage(repository: dependencies.repository),
+    ),
     GoRoute(
       path: '/login',
       builder: (context, state) => LoginPage(
         session: dependencies.session,
+        repository: dependencies.repository,
         redirectTarget: sanitizeRedirectTarget(state.uri.queryParameters['redirect']),
         showSessionExpiredMessage: state.uri.queryParameters['reason'] == 'expired',
       ),
@@ -52,20 +248,41 @@ GoRouter createRouter(
     ),
     GoRoute(
       path: '/records/contracts',
-      builder: (context, state) => RecordListPage(
-        title: '供气合同',
-        eyebrow: '可信履约',
-        sourceKey: 'contracts',
-        loader: dependencies.repository.contracts,
-      ),
+      builder: (context, state) => GasContractsPage(repository: dependencies.repository),
+    ),
+    GoRoute(
+      path: '/wallet',
+      builder: (context, state) => WalletPage(repository: dependencies.repository),
     ),
     GoRoute(
       path: '/records/wallet',
-      builder: (context, state) => RecordListPage(
-        title: '钱包流水',
-        eyebrow: '资金记录',
-        sourceKey: 'wallet_records',
-        loader: dependencies.repository.walletRecords,
+      builder: (context, state) => WalletBillsPage(repository: dependencies.repository),
+    ),
+    GoRoute(
+      path: '/wallet/recharge-records',
+      builder: (context, state) => RechargeRecordsPage(repository: dependencies.repository),
+    ),
+    GoRoute(
+      path: '/wallet/recharge',
+      builder: (context, state) => RechargePage(repository: dependencies.repository),
+    ),
+    GoRoute(
+      path: '/wallet/withdraw',
+      builder: (context, state) => WithdrawalPage(repository: dependencies.repository),
+    ),
+    GoRoute(
+      path: '/wallet/banks',
+      builder: (context, state) => BankCardsPage(repository: dependencies.repository),
+    ),
+    GoRoute(
+      path: '/deposits',
+      builder: (context, state) => DepositPage(repository: dependencies.repository),
+    ),
+    GoRoute(
+      path: '/deposits/return',
+      builder: (context, state) => DepositReturnPage(
+        repository: dependencies.repository,
+        depositIdentity: state.uri.queryParameters['deposit'] ?? '',
       ),
     ),
     StatefulShellRoute.indexedStack(
@@ -75,7 +292,10 @@ GoRouter createRouter(
           routes: [
             GoRoute(
               path: '/home',
-              builder: (context, state) => HomePage(repository: dependencies.repository),
+              builder: (context, state) => HomePage(
+                repository: dependencies.repository,
+                authenticated: dependencies.session.isAuthenticated,
+              ),
             ),
           ],
         ),
@@ -83,7 +303,10 @@ GoRouter createRouter(
           routes: [
             GoRoute(
               path: '/shop',
-              builder: (context, state) => ShopPage(repository: dependencies.repository),
+              builder: (context, state) => ShopPage(
+                repository: dependencies.repository,
+                authenticated: dependencies.session.isAuthenticated,
+              ),
             ),
           ],
         ),
@@ -91,7 +314,16 @@ GoRouter createRouter(
           routes: [
             GoRoute(
               path: '/orders',
-              builder: (context, state) => OrdersPage(repository: dependencies.repository),
+              builder: (context, state) => OrdersPage(
+                key: ValueKey(state.uri.queryParameters['tab']),
+                repository: dependencies.repository,
+                initialTab: switch (state.uri.queryParameters['tab']) {
+                  'gas' => 1,
+                  'shop' => 0,
+                  'tickets' => 3,
+                  _ => 1,
+                },
+              ),
             ),
           ],
         ),
@@ -99,8 +331,11 @@ GoRouter createRouter(
           routes: [
             GoRoute(
               path: '/me',
-              builder: (context, state) =>
-                  ProfilePage(session: dependencies.session, repository: dependencies.repository),
+              builder: (context, state) => ProfilePage(
+                session: dependencies.session,
+                repository: dependencies.repository,
+                openRepair: state.uri.queryParameters['repair'] == '1',
+              ),
             ),
           ],
         ),