diff --git a/lib/message/system_details.dart b/lib/message/system_details.dart index efdc1d6e..7e70d7f0 100644 --- a/lib/message/system_details.dart +++ b/lib/message/system_details.dart @@ -243,7 +243,7 @@ class _SystemDetails extends State { ? "assets/image/icon_system_message.webp" : (message.typed == 2) ? "assets/image/icon_system_message.webp" - : "assets/image/c_z.webp", + : "assets/image/icon_cz.webp", width: 24.w, height: 24.h, ), @@ -370,7 +370,7 @@ class _SystemDetails extends State { ? "assets/image/icon_system_message.webp" : (message.typed == 2) ? "assets/image/icon_system_message.webp" - : "assets/image/c_z.webp", + : "assets/image/icon_cz.webp", width: 24.w, height: 24.h, ), diff --git a/lib/message/system_message.dart b/lib/message/system_message.dart index c253b071..7312b58b 100644 --- a/lib/message/system_message.dart +++ b/lib/message/system_message.dart @@ -154,6 +154,7 @@ class _SystemMessagePage extends State { // ), // ], // ), + backgroundColor: Colors.white, body: SmartRefresher( enablePullDown: true, enablePullUp: true, @@ -363,6 +364,7 @@ class _SystemMessagePage extends State { ), ], ), + if(title != S.of(context).xitongxiaoxi) Container( margin: EdgeInsets.only(top: 12.h), width: double.infinity, @@ -643,7 +645,7 @@ class _SystemMessagePage extends State { ? "assets/image/icon_system_message.webp" : (message.typed == 2) ? "assets/image/icon_system_message.webp" - : "assets/image/c_z.webp", + : "assets/image/icon_cz.webp", width: 40.w, height: 40.h, ), diff --git a/lib/order/order_detail_page.dart b/lib/order/order_detail_page.dart index a9fac982..0d9344aa 100644 --- a/lib/order/order_detail_page.dart +++ b/lib/order/order_detail_page.dart @@ -174,61 +174,52 @@ class _OrderDetailPage extends State { }, ), onRefresh:(){ - setState(() { - queryDetails(); - }); + queryDetails(); }, physics: BouncingScrollPhysics(), scrollController: ScrollController(), - child: Container( - child: SingleChildScrollView( - physics: BouncingScrollPhysics(), - child: Container( - child: Column( - children: [ - ///订单状态显示 - OrderStatus( - orderStatus, - isTakeOut, - sendStatus, - payStatus, - refundStatus, - title, - center, - orderInfo, - ), + child: Column( + children: [ + ///订单状态显示 + OrderStatus( + orderStatus, + isTakeOut, + sendStatus, + payStatus, + refundStatus, + title, + center, + orderInfo, + ), - ///订单取货地址,或, 收货地址 - if(orderInfo != null && orderInfo.addressExt != null) - OrderAddress( - orderStatus, - isTakeOut, - sendStatus, - payStatus, - refundStatus, - title, - center, - paySelected, - _orderCancel, - orderInfo, - jumpState - ), + ///订单取货地址,或, 收货地址 + if(orderInfo != null && orderInfo.addressExt != null) + OrderAddress( + orderStatus, + isTakeOut, + sendStatus, + payStatus, + refundStatus, + title, + center, + paySelected, + _orderCancel, + orderInfo, + jumpState + ), - ///订单商品 - if(orderInfo != null) - OrderCommodity(orderInfo), + ///订单商品 + if(orderInfo != null) + OrderCommodity(orderInfo), - ///显示订单信息 - if(orderInfo != null) - OrderInfoView(orderInfo, isTakeOut), + ///显示订单信息 + if(orderInfo != null) + OrderInfoView(orderInfo, isTakeOut), - Container( - height: 42.h, - ), - ], - ), + Container( + height: 42.h, ), - ), + ], ), ), )