diff --git a/frontend/mobile-app/lib/core/services/contract_check_service.dart b/frontend/mobile-app/lib/core/services/contract_check_service.dart index be66b3f6..7803c534 100644 --- a/frontend/mobile-app/lib/core/services/contract_check_service.dart +++ b/frontend/mobile-app/lib/core/services/contract_check_service.dart @@ -114,7 +114,7 @@ class ContractCheckService { /// 查找第一个待签署的预种合并合同编号 Future _getPendingPrePlantingMergeNo() async { try { - final merges = await _prePlantingService.getMerges(); + final merges = await _prePlantingService.getMyMerges(); final pending = merges.where( (m) => m.contractStatus == PrePlantingContractStatus.pending, ); diff --git a/frontend/mobile-app/lib/features/contract_signing/presentation/pages/pending_contracts_page.dart b/frontend/mobile-app/lib/features/contract_signing/presentation/pages/pending_contracts_page.dart index feb5438e..f614dce6 100644 --- a/frontend/mobile-app/lib/features/contract_signing/presentation/pages/pending_contracts_page.dart +++ b/frontend/mobile-app/lib/features/contract_signing/presentation/pages/pending_contracts_page.dart @@ -45,13 +45,10 @@ class _PendingContractsPageState extends ConsumerState { final prePlantingService = ref.read(prePlantingServiceProvider); // 并行加载:普通认种未签合同 + 预种待签合并 - final results = await Future.wait([ - contractService.getUnsignedTasks(), - prePlantingService.getMerges(), - ]); - - final tasks = results[0] as List; - final allMerges = results[1] as List; + final tasksFuture = contractService.getUnsignedTasks(); + final mergesFuture = prePlantingService.getMyMerges(); + final tasks = await tasksFuture; + final allMerges = await mergesFuture; final pendingMerges = allMerges .where((m) => m.contractStatus == PrePlantingContractStatus.pending) .toList(); diff --git a/frontend/mobile-app/lib/features/pre_planting/presentation/pages/pre_planting_purchase_page.dart b/frontend/mobile-app/lib/features/pre_planting/presentation/pages/pre_planting_purchase_page.dart index 5bd3a4ca..e0530e23 100644 --- a/frontend/mobile-app/lib/features/pre_planting/presentation/pages/pre_planting_purchase_page.dart +++ b/frontend/mobile-app/lib/features/pre_planting/presentation/pages/pre_planting_purchase_page.dart @@ -5,6 +5,7 @@ import 'package:city_pickers/city_pickers.dart'; import '../../../../core/di/injection_container.dart'; import '../../../../core/services/pre_planting_service.dart'; import '../../../../core/services/tree_pricing_service.dart'; +import '../../../../routes/route_paths.dart'; // ============================================ // [2026-02-17] 预种计划购买页面