From 84c1279e3019566ad8b4389c2d4bad005aed2bb1 Mon Sep 17 00:00:00 2001
From: w-R <953969641@qq.com>
Date: Thu, 17 Feb 2022 11:28:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/order/bargain_group_order.dart            | 46 +++++++++----------
 lib/order/order_history_page.dart             |  5 +-
 .../shopping/shopping_home/group_details.dart |  2 +-
 3 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/lib/order/bargain_group_order.dart b/lib/order/bargain_group_order.dart
index ff1ffbbb..b40bebff 100644
--- a/lib/order/bargain_group_order.dart
+++ b/lib/order/bargain_group_order.dart
@@ -66,9 +66,9 @@ class _BargainGroupOrder extends State<BargainGroupOrder>
     ];
     _pages = [
       ExchangeHistoryList(0,type),
+      ExchangeHistoryList(1,type),
       ExchangeHistoryList(2,type),
-      ExchangeHistoryList(3,type),
-      ExchangeHistoryList(4,type)
+      ExchangeHistoryList(3,type)
     ];
   }
 
@@ -252,25 +252,25 @@ class _ExchangeHistoryList extends State<ExchangeHistoryList> {
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
-              Container(
-                width: 19.w,
-                height:21.h,
-                margin: EdgeInsets.only(left: 12.w, top: 12.h),
-                alignment: Alignment.center,
-                decoration: BoxDecoration(
-                  color: Color(0xff32A060),
-                  borderRadius: BorderRadius.circular(2),
-                ),
-                child: Text(
-                  // (orderInfo != null && orderInfo.isTakeOut == 0) ? "自" : "外",
-                  "自",
-                  style: TextStyle(
-                    fontSize: 12.sp,
-                    fontWeight: FontWeight.bold,
-                    color: Colors.white,
-                  ),
-                ),
-              ),
+              // Container(
+              //   width: 19.w,
+              //   height:21.h,
+              //   margin: EdgeInsets.only(left: 12.w, top: 12.h),
+              //   alignment: Alignment.center,
+              //   decoration: BoxDecoration(
+              //     color: Color(0xff32A060),
+              //     borderRadius: BorderRadius.circular(2),
+              //   ),
+              //   child: Text(
+              //     // (orderInfo != null && orderInfo.isTakeOut == 0) ? "自" : "外",
+              //     "自",
+              //     style: TextStyle(
+              //       fontSize: 12.sp,
+              //       fontWeight: FontWeight.bold,
+              //       color: Colors.white,
+              //     ),
+              //   ),
+              // ),
               Expanded(
                 child: Container(
                   width: double.infinity,
@@ -289,7 +289,7 @@ class _ExchangeHistoryList extends State<ExchangeHistoryList> {
               ),
               Padding(
                 padding: EdgeInsets.only(top: 12.h, right: 12.w),
-                child: Text(
+                child:Text(
                   // (orderInfo != null &&
                   //     orderInfo.storeVO != null &&
                   //     orderInfo.storeVO.posType != null)
@@ -301,7 +301,7 @@ class _ExchangeHistoryList extends State<ExchangeHistoryList> {
                   //     orderInfo.sendStatus,
                   //     orderInfo.isTakeOut)
                   //     : "",
-                  "还差${activityOrderList?.howManyMore ?? 0}人拼团成功",
+                  activityOrderList.howManyMore != 0 ? "还差${activityOrderList?.howManyMore ?? 0}人拼团成功" : "拼团成功",
                   style: TextStyle(
                     fontSize: 14.sp,
                     fontWeight: FontWeight.bold,
diff --git a/lib/order/order_history_page.dart b/lib/order/order_history_page.dart
index 112f098b..61fc8196 100644
--- a/lib/order/order_history_page.dart
+++ b/lib/order/order_history_page.dart
@@ -242,6 +242,7 @@ class _OrderHistoryList extends State<OrderHistoryList>
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
+              (orderInfo != null && orderInfo.orderType == 0) ? Container():
               Container(
                 width: 19,
                 height: 21,
@@ -256,7 +257,7 @@ class _OrderHistoryList extends State<OrderHistoryList>
                       style: BorderStyle.solid,
                     )),
                 child: Text(
-                  "团",
+                  (orderInfo != null && orderInfo.orderType == 7) ?"秒":"团",
                   style: TextStyle(
                     fontSize: 12.sp,
                     fontWeight: FontWeight.bold,
@@ -274,7 +275,7 @@ class _OrderHistoryList extends State<OrderHistoryList>
                   borderRadius: BorderRadius.circular(2),
                 ),
                 child: Text(
-                  (orderInfo != null && orderInfo.isTakeOut == 0) ? "自" : "外",
+                  (orderInfo != null && orderInfo.isTakeOut == 0) ? "自" : ((orderInfo != null && orderInfo.isTakeOut == 1) ? "外" : "物"),
                   style: TextStyle(
                     fontSize: 12.sp,
                     fontWeight: FontWeight.bold,
diff --git a/lib/store/shopping/shopping_home/group_details.dart b/lib/store/shopping/shopping_home/group_details.dart
index a66a292d..51db3931 100644
--- a/lib/store/shopping/shopping_home/group_details.dart
+++ b/lib/store/shopping/shopping_home/group_details.dart
@@ -497,7 +497,7 @@ class _GroupDetails extends State<GroupDetails> {
                   ),
                 )),
           ),
-          if((activityActRecordDetails?.actRecord?.joinNum ?? 0) < limitNumber && tempDay != 0 && tempHour!=0 && tempM != 0 && tempS != 0)
+          if((activityActRecordDetails?.actRecord?.joinNum ?? 0) < limitNumber || tempDay != 0 && tempHour!=0 && tempM != 0 && tempS != 0)
           InkWell(
             onTap: () {
               setState(() {