diff --git a/assets/image/2x/order_kf.webp b/assets/image/2x/order_kf.webp new file mode 100644 index 00000000..4b742e17 Binary files /dev/null and b/assets/image/2x/order_kf.webp differ diff --git a/assets/image/2x/wait_meal.webp b/assets/image/2x/wait_meal.webp index c12d4f67..7473b7af 100644 Binary files a/assets/image/2x/wait_meal.webp and b/assets/image/2x/wait_meal.webp differ diff --git a/assets/image/3x/order_kf.webp b/assets/image/3x/order_kf.webp new file mode 100644 index 00000000..a05cad0a Binary files /dev/null and b/assets/image/3x/order_kf.webp differ diff --git a/assets/image/3x/wait_meal.webp b/assets/image/3x/wait_meal.webp index f7e2d448..2fa08b60 100644 Binary files a/assets/image/3x/wait_meal.webp and b/assets/image/3x/wait_meal.webp differ diff --git a/assets/image/order_kf.webp b/assets/image/order_kf.webp new file mode 100644 index 00000000..d29feb96 Binary files /dev/null and b/assets/image/order_kf.webp differ diff --git a/assets/image/wait_meal.webp b/assets/image/wait_meal.webp index 062401a8..1a580b2f 100644 Binary files a/assets/image/wait_meal.webp and b/assets/image/wait_meal.webp differ diff --git a/lib/order/order_detail_page.dart b/lib/order/order_detail_page.dart index ba3151d9..23dcbdb1 100644 --- a/lib/order/order_detail_page.dart +++ b/lib/order/order_detail_page.dart @@ -113,84 +113,81 @@ class _OrderDetailPage extends State { @override Widget build(BuildContext context) { - return Container( - color: Colors.white, - child: Stack( - children: [ - Container( - // height: (orderStatus >= 4 ? 118.h : 118.h) + - // MediaQuery.of(context).padding.top + - // kToolbarHeight + - // 48.h, - // color: Color(0xFF3A405A), - // width: MediaQuery.of(context).size.width, - decoration: BoxDecoration( - image: DecorationImage( - fit: BoxFit.fill, - image: AssetImage("assets/image/settlement_bg.webp"), - ), + return Stack( + children: [ + Container( + // height: (orderStatus >= 4 ? 118.h : 118.h) + + // MediaQuery.of(context).padding.top + + // kToolbarHeight + + // 48.h, + // color: Color(0xFF3A405A), + // width: MediaQuery.of(context).size.width, + decoration: BoxDecoration( + image: DecorationImage( + fit: BoxFit.fill, + image: AssetImage("assets/image/settlement_bg.webp"), ), - width: double.infinity, - height: 375.h, ), - Scaffold( - backgroundColor: Colors.transparent, - appBar: MyAppBar( - title: "订单详情", - titleColor: Colors.white, - background: Colors.transparent, - leadingColor: Colors.white, - brightness: Brightness.dark, - ), - body: Container( - child: SingleChildScrollView( - physics: BouncingScrollPhysics(), - child: Container( - child: Column( - children: [ - ///订单状态显示 - OrderStatus( - orderStatus, - isTakeOut, - sendStatus, - payStatus, - refundStatus, - title, - center, - orderInfo, - ), + width: double.infinity, + height: 375.h, + ), + Scaffold( + backgroundColor: Colors.transparent, + appBar: MyAppBar( + title: "订单详情", + titleColor: Colors.white, + background: Colors.transparent, + leadingColor: Colors.white, + brightness: Brightness.dark, + ), + body: Container( + child: SingleChildScrollView( + physics: BouncingScrollPhysics(), + child: Container( + child: Column( + children: [ + ///订单状态显示 + OrderStatus( + orderStatus, + isTakeOut, + sendStatus, + payStatus, + refundStatus, + title, + center, + orderInfo, + ), - ///订单取货地址,或, 收货地址 - OrderAddress( - orderStatus, - isTakeOut, - sendStatus, - payStatus, - refundStatus, - title, - center, - paySelected, - _orderCancel, - orderInfo, - ), + ///订单取货地址,或, 收货地址 + OrderAddress( + orderStatus, + isTakeOut, + sendStatus, + payStatus, + refundStatus, + title, + center, + paySelected, + _orderCancel, + orderInfo, + ), - ///订单商品 - OrderCommodity(orderInfo), + ///订单商品 + OrderCommodity(orderInfo), - ///显示订单信息 - OrderInfoView(orderInfo, isTakeOut), + ///显示订单信息 + OrderInfoView(orderInfo, isTakeOut), - Container( - height: 42.h, - ), - ], - ), + Container( + height: 42.h, + ), + ], ), ), ), - ) - ], - ), + ), + ) + ], ); } diff --git a/lib/order/order_view/order_address.dart b/lib/order/order_view/order_address.dart index 12a4206b..ff0b4857 100644 --- a/lib/order/order_view/order_address.dart +++ b/lib/order/order_view/order_address.dart @@ -144,7 +144,7 @@ class _OrderAddress extends State { } else if (widget.payStatus < 4) { SmartDialog.show( widget: TextImageWidget( - "assets/image/icon_empty.webp", + "assets/image/order_kf.webp", S.of(context).ruxutuikuanqingyumendianlianxi, "", S.of(context).zhidianmendian,