From 5f8586666c0cbd33a3f7e9c494174f22f070f7c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=89=E7=A7=8B?= <497055328@qq.com> Date: Tue, 15 Sep 2026 11:23:48 +0800 Subject: [PATCH] fix: align photo unit prices and update purchase labels --- .../yzx/kiosk/ui/face/RecentPhotosFlowTest.kt | 20 +++++++++---------- .../face/view/FaceRecognitionResultScreen.kt | 20 ++++++++++++++----- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/app/src/androidTest/java/com/yzx/kiosk/ui/face/RecentPhotosFlowTest.kt b/app/src/androidTest/java/com/yzx/kiosk/ui/face/RecentPhotosFlowTest.kt index 4ca2a94..b4d5e56 100644 --- a/app/src/androidTest/java/com/yzx/kiosk/ui/face/RecentPhotosFlowTest.kt +++ b/app/src/androidTest/java/com/yzx/kiosk/ui/face/RecentPhotosFlowTest.kt @@ -289,7 +289,7 @@ class RecentPhotosFlowTest { compose.onNodeWithText("全选").performClick() compose.waitUntil(10_000) { resultVm.totalPrice.value == "4.00" } assertEquals(2, resultVm.selectedPhotos.value.size) - compose.onNodeWithText("支付打印版\n4元").assertIsEnabled() + compose.onNodeWithText("购买打印照片\n4元").assertIsEnabled() screenshot("recent-photos-results") compose.onAllNodesWithText("点击预览")[0].performClick() compose.onNodeWithContentDescription("关闭").assertIsDisplayed().performClick() @@ -342,7 +342,7 @@ class RecentPhotosFlowTest { compose.onNodeWithText("打印版 2元/张").assertIsDisplayed() compose.onNodeWithText("电子版 1元/张").assertIsDisplayed() screenshot("purchase-two-modes") - compose.onNodeWithText("支付电子版\n1元").performClick() + compose.onNodeWithText("购买电子照片\n1元").performClick() compose.waitUntil(10_000) { requests.any { it.url.encodedPath.endsWith("pay-success-message") } } compose.onNodeWithText("微信支付").assertIsDisplayed() compose.onNodeWithText("订单金额 1元").assertDoesNotExist() @@ -374,7 +374,7 @@ class RecentPhotosFlowTest { compose.runOnIdle { resultVm.retryQuote() } compose.waitUntil(10_000) { !resultVm.quoteLoading.value } compose.onNodeWithText("电子版暂不可购买").assertIsNotEnabled() - compose.onNodeWithText("支付打印版\n2元").assertIsEnabled() + compose.onNodeWithText("购买打印照片\n2元").assertIsEnabled() } private fun pushCompletion(number: String = "MOCK-RECENT-1", mode: String = "electronic") { @@ -389,7 +389,7 @@ class RecentPhotosFlowTest { val routes = CopyOnWriteArrayList() val collector = kotlinx.coroutines.CoroutineScope(kotlinx.coroutines.Dispatchers.Main).launchCollect(nav) { routes.add(it) } try { - compose.onNodeWithText("支付电子版\n1元").performClick() + compose.onNodeWithText("购买电子照片\n1元").performClick() compose.waitUntil(10_000) { requests.any { it.url.encodedPath.endsWith("pay-success-message") } } compose.waitForIdle() assertTrue(routes.isEmpty()) @@ -410,26 +410,26 @@ class RecentPhotosFlowTest { showElectronicSelection("1.00") queryFails = true val quotesBefore = requests.count { it.url.encodedPath.endsWith("verify-result") } - compose.onNodeWithText("支付电子版\n1元").performClick() + compose.onNodeWithText("购买电子照片\n1元").performClick() compose.waitUntil(10_000) { requests.count { it.url.encodedPath.endsWith("verify-result") } > quotesBefore && !resultVm.quoteLoading.value } assertNull(resultVm.payQrCodeUrl.value) compose.onNodeWithText("微信支付").assertDoesNotExist() - compose.onNodeWithText("支付电子版\n1元").assertIsEnabled() + compose.onNodeWithText("购买电子照片\n1元").assertIsEnabled() } @Test fun rejectedLinkRestoresButtonsAndQuoteBusinessErrorsRemainVisible() { showElectronicSelection("1.00") payFails = true val quotesBefore = requests.count { it.url.encodedPath.endsWith("verify-result") } - compose.onNodeWithText("支付电子版\n1元").performClick() + compose.onNodeWithText("购买电子照片\n1元").performClick() compose.waitUntil(10_000) { requests.count { it.url.encodedPath.endsWith("verify-result") } > quotesBefore && !resultVm.quoteLoading.value && !resultVm.creatingOrder.value } assertNull(resultVm.payQrCodeUrl.value) - compose.onNodeWithText("支付电子版\n1元").assertIsEnabled() + compose.onNodeWithText("购买电子照片\n1元").assertIsEnabled() quoteFails = true compose.runOnIdle { resultVm.retryQuote() } compose.waitUntil(10_000) { resultVm.quoteError.value != null } compose.onNodeWithText("项目已下线，请重新选择").assertIsDisplayed() - compose.onNodeWithText("支付打印版\n--元").assertIsNotEnabled() + compose.onNodeWithText("购买打印照片\n--元").assertIsNotEnabled() } @Test fun selectionChangesDiscardTheOldQrAndOrder() { @@ -484,7 +484,7 @@ class RecentPhotosFlowTest { compose.setContent { FaceRecognitionResultScreen(source = AppRoutes.RECENT_RESULT_SOURCE, viewModel = resultVm) } compose.waitUntil(10_000) { resultVm.recentPhotosState.value == RecentPhotosState.ERROR } compose.onNodeWithText("照片加载失败，请重试").assertIsDisplayed() - compose.onNodeWithText("支付打印版\n--元").assertIsNotEnabled() + compose.onNodeWithText("购买打印照片\n--元").assertIsNotEnabled() recentCode = 200 compose.onNodeWithText("重试").performClick() compose.waitUntil(10_000) { resultVm.recentPhotosState.value == RecentPhotosState.EMPTY } diff --git a/app/src/main/java/com/yzx/kiosk/ui/face/view/FaceRecognitionResultScreen.kt b/app/src/main/java/com/yzx/kiosk/ui/face/view/FaceRecognitionResultScreen.kt index 707342d..16673d1 100644 --- a/app/src/main/java/com/yzx/kiosk/ui/face/view/FaceRecognitionResultScreen.kt +++ b/app/src/main/java/com/yzx/kiosk/ui/face/view/FaceRecognitionResultScreen.kt @@ -149,16 +149,26 @@ fun FaceRecognitionResultScreen( colors = CardDefaults.cardColors(containerColor = Color(0xFFF4F4F4)) ) { Column(Modifier.fillMaxWidth().padding(24.dp)) { - Text("已选择 ${selectedCount} 张", fontSize = 24.sp, fontWeight = FontWeight.Bold) + Row( + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically, + ) { + Text("已选择 ${selectedCount} 张", fontSize = 24.sp, fontWeight = FontWeight.Bold) + Spacer(Modifier.weight(1f)) + Row( + horizontalArrangement = Arrangement.spacedBy(20.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + Text("打印版 ${formatPriceDisplay(pricePerPhoto)}元/张", fontSize = 21.sp) + Text("电子版 ${formatPriceDisplay(electronicPrice)}元/张", fontSize = 21.sp) + } + } Spacer(Modifier.height(16.dp)) Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(16.dp)) { PurchaseMode.entries.forEach { mode -> val isPrint = mode == PurchaseMode.PRINT - val unit = if (isPrint) pricePerPhoto else electronicPrice val total = if (isPrint) totalPrice else electronicTotal Column(Modifier.weight(1f)) { - Text("${mode.label} ${formatPriceDisplay(unit)}元/张", fontSize = 21.sp) - Spacer(Modifier.height(12.dp)) Button( onClick = { viewModel.getPayUrl(mode) { showPayDialog = true } }, enabled = selectedCount > 0 && total != "--" && !creatingOrder && !quoteLoading, @@ -171,7 +181,7 @@ fun FaceRecognitionResultScreen( ) { Text( text = if (!isPrint && total == "--" && !quoteLoading) - "电子版暂不可购买" else "支付${mode.label}\n${formatPriceDisplay(total)}元", + "电子版暂不可购买" else "${if (isPrint) "购买打印照片" else "购买电子照片"}\n${formatPriceDisplay(total)}元", textAlign = TextAlign.Center, fontSize = 24.sp, lineHeight = 32.sp,