diff --git a/lib/pages/user/items/item_order_list.dart b/lib/pages/user/items/item_order_list.dart index 4b01c9e..ed99943 100644 --- a/lib/pages/user/items/item_order_list.dart +++ b/lib/pages/user/items/item_order_list.dart @@ -231,7 +231,10 @@ class _OrderListItemState extends State { } break; } - if (widget.orderModel.canConfirm) { + if (widget.orderModel.canConfirm && + widget.orderModel.goodsList + .indexWhere((element) => element.rStatus == '退款审核中') == + -1) { children ..add(Container( width: rSize(8), diff --git a/lib/pages/user/order/order_detail_page.dart b/lib/pages/user/order/order_detail_page.dart index 351503b..3236eb5 100644 --- a/lib/pages/user/order/order_detail_page.dart +++ b/lib/pages/user/order/order_detail_page.dart @@ -342,8 +342,14 @@ class _OrderDetailPageState extends OrderDetailState height: 1, )); } - - if (orderDetail.canConfirm) { + // 确认收货按钮显示控制 + // 当订单中包含‘退款审核中’的状态时,不显示确认收货 + if (orderDetail.canConfirm && + orderDetail.brands.indexWhere((element) => + element.goods + .indexWhere((element) => element.rStatus == '退款审核中') != + -1) == + -1) { items ..add(CustomImageButton( width: buttonWidth,