From a6aaa7d2b29e4310787e366eb598f3c7539212c7 Mon Sep 17 00:00:00 2001
From: wurong <953969641@qq.com>
Date: Sun, 25 Jun 2023 14:51:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dlist=E6=97=A0=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=8F=90=E7=A4=BA=E6=97=B6=E6=98=BE=E7=A4=BA=E7=81=B0?=
 =?UTF-8?q?=E8=89=B2=E6=9D=BF=E5=9D=97=E7=9A=84bug=EF=BC=9B=20=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E8=AF=A6=E6=83=85=E6=96=B0=E5=A2=9E=E7=89=A9=E6=B5=81?=
 =?UTF-8?q?=E5=8D=95=E5=8F=B7=E6=98=BE=E7=A4=BA=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/order/order_history_page.dart    | 16 +++----
 lib/order/order_view/order_info.dart |  3 ++
 lib/utils/bridge.dart                |  3 --
 lib/view_widget/no_data_view.dart    | 66 ++++++++++++++--------------
 4 files changed, 42 insertions(+), 46 deletions(-)

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<OrderHistoryList>
                   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<OrderInfoView> {
           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,
-                ),
-              ),
-          ],
-        ),
+        ],
       ),
     );
   }