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
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,
),
],
),
),
),
)
],
),
),
)
],
);
}

2
lib/order/order_view/order_address.dart

@ -144,7 +144,7 @@ class _OrderAddress extends State<OrderAddress> {
} 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,

Loading…
Cancel
Save