From 8ca78446f941f5eb68ad149720dbb614eaae43e4 Mon Sep 17 00:00:00 2001
From: w-R <953969641@qq.com>
Date: Mon, 7 Feb 2022 11:51:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=83=E5=B1=80=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/order/order_detail_page.dart       |  5 -----
 lib/order/order_view/order_info.dart   |  4 ++--
 lib/order/order_view/order_status.dart | 31 ++++++++++++++------------
 3 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/lib/order/order_detail_page.dart b/lib/order/order_detail_page.dart
index 8913271d..149dc7be 100644
--- a/lib/order/order_detail_page.dart
+++ b/lib/order/order_detail_page.dart
@@ -1,7 +1,6 @@
 import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
-import 'package:fluwx/fluwx.dart';
 import 'package:huixiang/generated/l10n.dart';
 import 'package:huixiang/order/order_view/order_address.dart';
 import 'package:huixiang/order/order_view/order_commodity.dart';
@@ -10,12 +9,8 @@ import 'package:huixiang/order/order_view/order_pay_selected.dart';
 import 'package:huixiang/order/order_view/order_status.dart';
 import 'package:huixiang/retrofit/data/base_data.dart';
 import 'package:huixiang/retrofit/data/order_info.dart';
-import 'package:huixiang/retrofit/data/placeOrderFirst.dart';
-import 'package:huixiang/retrofit/data/wx_pay.dart';
 import 'package:huixiang/retrofit/min_api.dart';
 import 'package:huixiang/retrofit/retrofit_api.dart';
-import 'package:huixiang/settlement/settlement_view/pay_method.dart';
-import 'package:huixiang/utils/min.dart';
 import 'package:huixiang/view_widget/icon_text.dart';
 import 'package:huixiang/view_widget/my_appbar.dart';
 import 'package:shared_preferences/shared_preferences.dart';
diff --git a/lib/order/order_view/order_info.dart b/lib/order/order_view/order_info.dart
index 0fdb3eff..945ead9a 100644
--- a/lib/order/order_view/order_info.dart
+++ b/lib/order/order_view/order_info.dart
@@ -45,8 +45,8 @@ class _OrderInfoView extends State<OrderInfoView> {
               S.of(context).dingdanhao, widget.orderInfo != null ? widget.orderInfo.id : ""),
           orderInfoItem(S.of(context).xiadanshijian,
               widget.orderInfo != null ? widget.orderInfo.createTime : ""),
-          // orderInfoItem(S.of(context).peisongfangshi, orderInfo != null ? orderInfo.createTime : ""),
-          orderInfoItem(S.of(context).peisongfangshi,"美团配送"),
+          orderInfoItem(S.of(context).peisongfangshi,(widget.orderInfo != null && widget.orderInfo.logisticsName != "") ? widget.orderInfo.logisticsName : "美团配送"),
+          // orderInfoItem(S.of(context).peisongfangshi,"美团配送"),
           orderInfoItem(
               S.of(context).beizhuxinxi,
               widget.orderInfo != null
diff --git a/lib/order/order_view/order_status.dart b/lib/order/order_view/order_status.dart
index fd2125c6..598ede2f 100644
--- a/lib/order/order_view/order_status.dart
+++ b/lib/order/order_view/order_status.dart
@@ -166,18 +166,21 @@ class _OrderStatus extends State<OrderStatus> {
       }
     }
     return [
-      AspectRatio(
-        aspectRatio: 1,
-        child: BorderText(
-          text: hour,
-          textColor: Colors.white,
-          fontSize: 21.sp,
-          fontWeight: FontWeight.bold,
-          borderColor: Colors.white,
-          borderWidth: 1,
-          padding: EdgeInsets.all(2),
-        ),
-      ),
+     Container(
+       alignment: Alignment.center,
+       child: AspectRatio(
+         aspectRatio: 1,
+         child: BorderText(
+           text: hour,
+           textColor: Colors.white,
+           fontSize:16.sp,
+           fontWeight: FontWeight.bold,
+           borderColor: Colors.white,
+           borderWidth: 1,
+           // padding: EdgeInsets.all(2),
+         ),
+       ),
+     ),
       SizedBox(
         width: 8.w,
       ),
@@ -196,11 +199,11 @@ class _OrderStatus extends State<OrderStatus> {
         child: BorderText(
           text: minute,
           textColor: Colors.white,
-          fontSize: 21.sp,
+          fontSize:16.sp,
           fontWeight: FontWeight.bold,
           borderColor: Colors.white,
           borderWidth: 1,
-          padding: EdgeInsets.all(2),
+          // padding: EdgeInsets.all(2),
         ),
       ),
     ];