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: