diff --git a/lib/order/order_history_page.dart b/lib/order/order_history_page.dart index ae78e3d5..59b7e465 100644 --- a/lib/order/order_history_page.dart +++ b/lib/order/order_history_page.dart @@ -382,15 +382,13 @@ class _OrderHistoryList extends State crossAxisAlignment: CrossAxisAlignment.center, children: [ Expanded( - child: Container( - child: Row( - mainAxisAlignment: MainAxisAlignment.start, - crossAxisAlignment: CrossAxisAlignment.center, - children: goodsItem((orderInfo != null && - orderInfo.productList != null) - ? orderInfo.productList - : null), - ), + child: Row( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.center, + children: goodsItem((orderInfo != null && + orderInfo.productList != null) + ? orderInfo.productList + : null), ), flex: 1, ), diff --git a/lib/order/order_view/order_info.dart b/lib/order/order_view/order_info.dart index 753382c7..b279e6a9 100644 --- a/lib/order/order_view/order_info.dart +++ b/lib/order/order_view/order_info.dart @@ -48,6 +48,9 @@ class _OrderInfoView extends State { 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 : "美团配送")), // 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 != "") orderInfoItem("预约时间", widget.orderInfo != null ? widget.orderInfo.subcribeTime : ""), diff --git a/lib/utils/bridge.dart b/lib/utils/bridge.dart index 94fefb82..2de5aa0e 100644 --- a/lib/utils/bridge.dart +++ b/lib/utils/bridge.dart @@ -1,6 +1,3 @@ - - - import 'package:flutter/services.dart'; class Bridge { diff --git a/lib/view_widget/no_data_view.dart b/lib/view_widget/no_data_view.dart index 22fb9ac2..7f74d674 100644 --- a/lib/view_widget/no_data_view.dart +++ b/lib/view_widget/no_data_view.dart @@ -27,43 +27,41 @@ class NoDataView extends StatelessWidget { return Container( margin: margin, alignment: Alignment.center, - child: Expanded( - child: Column( - children: [ - Image( - image: AssetImage(src), - width: iconWidth, - height: iconHeight, + child: Column( + children: [ + Image( + image: AssetImage(src), + width: iconWidth, + height: iconHeight, + ), + SizedBox( + height: 35.h, + ), + Text( + text, + textAlign: TextAlign.center, + style: TextStyle( + fontSize: fontSize, + height: 1.5, + color: Color(0xFF353535), ), - SizedBox( - height: 35.h, - ), - Text( - text, - textAlign: TextAlign.center, - style: TextStyle( - fontSize: fontSize, - height: 1.5, - color: Color(0xFF353535), + ), + SizedBox( + height: 10.h, + ), + if (isShowBtn) + Container( + margin: EdgeInsets.symmetric(horizontal: 16.w), + child: RoundButton( + text: S.of(context).fanhuishouye, + textColor: Colors.white, + fontSize: 14.sp, + padding: EdgeInsets.all(12.w), + backgroup: Color(0xFF32A060), + radius: 4, ), ), - SizedBox( - height: 10.h, - ), - if (isShowBtn) - Container( - margin: EdgeInsets.symmetric(horizontal: 16.w), - child: RoundButton( - text: S.of(context).fanhuishouye, - textColor: Colors.white, - fontSize: 14.sp, - padding: EdgeInsets.all(12.w), - backgroup: Color(0xFF32A060), - radius: 4, - ), - ), - ], - ), + ], ), ); }