Browse Source

订单详情更改

zyh
w-R 3 years ago
parent
commit
915eb948ea
  1. BIN
      assets/image/2x/order_kf.webp
  2. BIN
      assets/image/2x/wait_meal.webp
  3. BIN
      assets/image/3x/order_kf.webp
  4. BIN
      assets/image/3x/wait_meal.webp
  5. BIN
      assets/image/order_kf.webp
  6. BIN
      assets/image/wait_meal.webp
  7. 135
      lib/order/order_detail_page.dart
  8. 2
      lib/order/order_view/order_address.dart

BIN
assets/image/2x/order_kf.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

BIN
assets/image/2x/wait_meal.webp

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
assets/image/3x/order_kf.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 59 KiB

BIN
assets/image/3x/wait_meal.webp

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
assets/image/order_kf.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

BIN
assets/image/wait_meal.webp

Binary file not shown.

Before

Width:  |  Height:  |  Size: 712 B

After

Width:  |  Height:  |  Size: 1.1 KiB

135
lib/order/order_detail_page.dart

@ -113,84 +113,81 @@ class _OrderDetailPage extends State<OrderDetailPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Container( return Stack(
color: Colors.white, children: [
child: Stack( Container(
children: [ // height: (orderStatus >= 4 ? 118.h : 118.h) +
Container( // MediaQuery.of(context).padding.top +
// height: (orderStatus >= 4 ? 118.h : 118.h) + // kToolbarHeight +
// MediaQuery.of(context).padding.top + // 48.h,
// kToolbarHeight + // color: Color(0xFF3A405A),
// 48.h, // width: MediaQuery.of(context).size.width,
// color: Color(0xFF3A405A), decoration: BoxDecoration(
// width: MediaQuery.of(context).size.width, image: DecorationImage(
decoration: BoxDecoration( fit: BoxFit.fill,
image: DecorationImage( image: AssetImage("assets/image/settlement_bg.webp"),
fit: BoxFit.fill,
image: AssetImage("assets/image/settlement_bg.webp"),
),
), ),
width: double.infinity,
height: 375.h,
), ),
Scaffold( width: double.infinity,
backgroundColor: Colors.transparent, height: 375.h,
appBar: MyAppBar( ),
title: "订单详情", Scaffold(
titleColor: Colors.white, backgroundColor: Colors.transparent,
background: Colors.transparent, appBar: MyAppBar(
leadingColor: Colors.white, title: "订单详情",
brightness: Brightness.dark, titleColor: Colors.white,
), background: Colors.transparent,
body: Container( leadingColor: Colors.white,
child: SingleChildScrollView( brightness: Brightness.dark,
physics: BouncingScrollPhysics(), ),
child: Container( body: Container(
child: Column( child: SingleChildScrollView(
children: [ physics: BouncingScrollPhysics(),
/// child: Container(
OrderStatus( child: Column(
orderStatus, children: [
isTakeOut, ///
sendStatus, OrderStatus(
payStatus, orderStatus,
refundStatus, isTakeOut,
title, sendStatus,
center, payStatus,
orderInfo, refundStatus,
), title,
center,
orderInfo,
),
/// ///
OrderAddress( OrderAddress(
orderStatus, orderStatus,
isTakeOut, isTakeOut,
sendStatus, sendStatus,
payStatus, payStatus,
refundStatus, refundStatus,
title, title,
center, center,
paySelected, paySelected,
_orderCancel, _orderCancel,
orderInfo, orderInfo,
), ),
/// ///
OrderCommodity(orderInfo), OrderCommodity(orderInfo),
/// ///
OrderInfoView(orderInfo, isTakeOut), OrderInfoView(orderInfo, isTakeOut),
Container( Container(
height: 42.h, height: 42.h,
), ),
], ],
),
), ),
), ),
), ),
) ),
], )
), ],
); );
} }

2
lib/order/order_view/order_address.dart

@ -144,7 +144,7 @@ class _OrderAddress extends State<OrderAddress> {
} else if (widget.payStatus < 4) { } else if (widget.payStatus < 4) {
SmartDialog.show( SmartDialog.show(
widget: TextImageWidget( widget: TextImageWidget(
"assets/image/icon_empty.webp", "assets/image/order_kf.webp",
S.of(context).ruxutuikuanqingyumendianlianxi, S.of(context).ruxutuikuanqingyumendianlianxi,
"", "",
S.of(context).zhidianmendian, S.of(context).zhidianmendian,

Loading…
Cancel
Save