From 7f2479d995bf72befed83198c05ba9a102cc2931 Mon Sep 17 00:00:00 2001 From: hailin Date: Sun, 1 Feb 2026 01:58:53 -0800 Subject: [PATCH] =?UTF-8?q?fix(mining-app):=20=E6=9B=B4=E6=96=B0=E5=BC=B9?= =?UTF-8?q?=E7=AA=97=E4=B8=8D=E5=8F=AF=E7=82=B9=E5=87=BB=E5=A4=96=E9=83=A8?= =?UTF-8?q?=E5=85=B3=E9=97=AD=EF=BC=8C=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=8C=89=E4=B9=B0=E5=8D=96=E8=A7=92=E8=89=B2=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=B8=8D=E5=90=8C=E5=80=92=E8=AE=A1=E6=97=B6=E6=96=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 更新提示弹窗 barrierDismissible 始终为 false，防止用户误触关闭 - 订单详情页根据买家/卖家角色显示不同的倒计时提示文案 - 买方：你需要在xx:xx内完成付款 / 等待卖方确认收款 - 卖方：对方将在xx:xx内完成付款 / 请在xx:xx内确认收款 Co-Authored-By: Claude Opus 4.5 --- .../updater/channels/self_hosted_updater.dart | 2 +- .../pages/c2c/c2c_order_detail_page.dart | 28 +++++++++++++------ 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/frontend/mining-app/lib/core/updater/channels/self_hosted_updater.dart b/frontend/mining-app/lib/core/updater/channels/self_hosted_updater.dart index 366dcb2f..5ef824f8 100644 --- a/frontend/mining-app/lib/core/updater/channels/self_hosted_updater.dart +++ b/frontend/mining-app/lib/core/updater/channels/self_hosted_updater.dart @@ -31,7 +31,7 @@ class SelfHostedUpdater extends StatefulWidget { }) async { await showDialog( context: context, - barrierDismissible: !isForceUpdate, + barrierDismissible: false, builder: (context) => SelfHostedUpdater( versionInfo: versionInfo, isForceUpdate: isForceUpdate, diff --git a/frontend/mining-app/lib/presentation/pages/c2c/c2c_order_detail_page.dart b/frontend/mining-app/lib/presentation/pages/c2c/c2c_order_detail_page.dart index cc41fdb2..0b73e0b7 100644 --- a/frontend/mining-app/lib/presentation/pages/c2c/c2c_order_detail_page.dart +++ b/frontend/mining-app/lib/presentation/pages/c2c/c2c_order_detail_page.dart @@ -108,7 +108,7 @@ class _C2cOrderDetailPageState extends ConsumerState { const SizedBox(height: 16), // 订单状态卡片 - _buildStatusCard(order), + _buildStatusCard(order, isBuyer), const SizedBox(height: 16), @@ -158,7 +158,7 @@ class _C2cOrderDetailPageState extends ConsumerState { ); } - Widget _buildStatusCard(C2cOrderModel order) { + Widget _buildStatusCard(C2cOrderModel order, bool isBuyer) { Color statusColor; String statusText; String statusDesc; @@ -176,18 +176,30 @@ class _C2cOrderDetailPageState extends ConsumerState { statusColor = Colors.blue; statusText = '待付款'; remainingSeconds = order.paymentRemainingSeconds; - statusDesc = remainingSeconds != null && remainingSeconds > 0 - ? '对方将在 ${_formatRemainingTime(remainingSeconds)} 内完成付款' - : '买方需在规定时间内付款'; + if (isBuyer) { + statusDesc = remainingSeconds != null && remainingSeconds > 0 + ? '你需要在 ${_formatRemainingTime(remainingSeconds)} 内完成付款' + : '请在规定时间内完成付款'; + } else { + statusDesc = remainingSeconds != null && remainingSeconds > 0 + ? '对方将在 ${_formatRemainingTime(remainingSeconds)} 内完成付款' + : '买方需在规定时间内付款'; + } statusIcon = Icons.payment; break; case C2cOrderStatus.paid: statusColor = Colors.purple; statusText = '待确认'; remainingSeconds = order.confirmRemainingSeconds; - statusDesc = remainingSeconds != null && remainingSeconds > 0 - ? '请在 ${_formatRemainingTime(remainingSeconds)} 内确认收款' - : '卖方需确认收款后释放资产'; + if (isBuyer) { + statusDesc = remainingSeconds != null && remainingSeconds > 0 + ? '等待卖方在 ${_formatRemainingTime(remainingSeconds)} 内确认收款' + : '等待卖方确认收款'; + } else { + statusDesc = remainingSeconds != null && remainingSeconds > 0 + ? '请在 ${_formatRemainingTime(remainingSeconds)} 内确认收款' + : '请确认收款后释放资产'; + } statusIcon = Icons.check_circle_outline; break; case C2cOrderStatus.completed: