Browse Source

修复list无数据提示时显示灰色板块的bug;

订单详情新增物流单号显示;
new_revision_app
wurong 2 years ago
parent
commit
a6aaa7d2b2
  1. 2
      lib/order/order_history_page.dart
  2. 3
      lib/order/order_view/order_info.dart
  3. 3
      lib/utils/bridge.dart
  4. 2
      lib/view_widget/no_data_view.dart

2
lib/order/order_history_page.dart

@ -382,7 +382,6 @@ class _OrderHistoryList extends State<OrderHistoryList>
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
Expanded( Expanded(
child: Container(
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
@ -391,7 +390,6 @@ class _OrderHistoryList extends State<OrderHistoryList>
? orderInfo.productList ? orderInfo.productList
: null), : null),
), ),
),
flex: 1, flex: 1,
), ),
Padding( Padding(

3
lib/order/order_view/order_info.dart

@ -48,6 +48,9 @@ class _OrderInfoView extends State<OrderInfoView> {
orderInfoItem(S.of(context).peisongfangshi, widget.isTakeOut == 0 orderInfoItem(S.of(context).peisongfangshi, widget.isTakeOut == 0
? S.of(context).ziqu : widget.isTakeOut == 3 ? "打包":widget.isTakeOut == 4?"堂食":((widget.orderInfo != null && widget.orderInfo.logisticsName != "") ? widget.orderInfo.logisticsName : "美团配送")), ? S.of(context).ziqu : widget.isTakeOut == 3 ? "打包":widget.isTakeOut == 4?"堂食":((widget.orderInfo != null && widget.orderInfo.logisticsName != "") ? widget.orderInfo.logisticsName : "美团配送")),
// orderInfoItem(S.of(context).peisongfangshi,"美团配送"), // orderInfoItem(S.of(context).peisongfangshi,"美团配送"),
if(widget.orderInfo != null && widget.orderInfo.logisticsNum != "" )
orderInfoItem("物流单号",
widget.orderInfo != null ? widget.orderInfo.logisticsNum : ""),
if(widget?.orderInfo?.subcribeTime != null && widget?.orderInfo?.subcribeTime != "") if(widget?.orderInfo?.subcribeTime != null && widget?.orderInfo?.subcribeTime != "")
orderInfoItem("预约时间", orderInfoItem("预约时间",
widget.orderInfo != null ? widget.orderInfo.subcribeTime : ""), widget.orderInfo != null ? widget.orderInfo.subcribeTime : ""),

3
lib/utils/bridge.dart

@ -1,6 +1,3 @@
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
class Bridge { class Bridge {

2
lib/view_widget/no_data_view.dart

@ -27,7 +27,6 @@ class NoDataView extends StatelessWidget {
return Container( return Container(
margin: margin, margin: margin,
alignment: Alignment.center, alignment: Alignment.center,
child: Expanded(
child: Column( child: Column(
children: [ children: [
Image( Image(
@ -64,7 +63,6 @@ class NoDataView extends StatelessWidget {
), ),
], ],
), ),
),
); );
} }
} }
Loading…
Cancel
Save