From 93f10c80f74050c37c80f25cc61606af68c81619 Mon Sep 17 00:00:00 2001 From: laiiihz Date: Fri, 12 Mar 2021 14:42:24 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E9=A1=B5?= =?UTF-8?q?=EF=BC=8C=E6=9C=89=E5=95=86=E5=93=81=E5=9C=A8=E5=94=AE=E5=90=8E?= =?UTF-8?q?=E4=B8=AD=E6=97=B6=EF=BC=8C=E7=A1=AE=E8=AE=A4=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E9=9C=80=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/user/items/item_order_list.dart | 5 ++++- lib/pages/user/order/order_detail_page.dart | 10 ++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) 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,