From e2069bb37002e56aa81d71faea369149f6e8e082 Mon Sep 17 00:00:00 2001
From: fmk <fengmeikan@hotmail.com>
Date: Fri, 5 May 2023 18:25:27 +0800
Subject: [PATCH] =?UTF-8?q?ios,=E7=BB=93=E7=AE=97=E9=A1=B5=EF=BC=8C?=
 =?UTF-8?q?=E9=A2=84=E7=BA=A6=E9=97=A8=E5=BA=97=E5=BC=B9=E7=AA=97=E9=AB=98?=
 =?UTF-8?q?=E5=BA=A6=E6=9B=B4=E6=94=B9=EF=BC=9B=20=E9=A2=84=E7=BA=A6?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=A0=82=E9=A3=9F?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ios/Runner.xcodeproj/project.pbxproj   | 6 +++---
 lib/order/order_view/order_status.dart | 1 +
 lib/settlement/settlement.dart         | 8 ++++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 954f305e..7a8b06b0 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -667,7 +667,7 @@
 					"$(PROJECT_DIR)/baidu",
 					"$(PROJECT_DIR)/Runner/baidu",
 				);
-				MARKETING_VERSION = 3.2.11;
+				MARKETING_VERSION = 3.2.13;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -869,7 +869,7 @@
 					"$(PROJECT_DIR)/baidu",
 					"$(PROJECT_DIR)/Runner/baidu",
 				);
-				MARKETING_VERSION = 3.2.11;
+				MARKETING_VERSION = 3.2.13;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -962,7 +962,7 @@
 					"$(PROJECT_DIR)/baidu",
 					"$(PROJECT_DIR)/Runner/baidu",
 				);
-				MARKETING_VERSION = 3.2.11;
+				MARKETING_VERSION = 3.2.13;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
diff --git a/lib/order/order_view/order_status.dart b/lib/order/order_view/order_status.dart
index 06961969..23ec9774 100644
--- a/lib/order/order_view/order_status.dart
+++ b/lib/order/order_view/order_status.dart
@@ -63,6 +63,7 @@ class _OrderStatus extends State<OrderStatus> {
                     MainAxisAlignment.spaceBetween,
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
+                      if(widget.orderInfo !=null)
                       RoundButton(
                         text: widget.isTakeOut == 0
                             ? S.of(context).ziqu
diff --git a/lib/settlement/settlement.dart b/lib/settlement/settlement.dart
index d001e45a..ed738a5f 100644
--- a/lib/settlement/settlement.dart
+++ b/lib/settlement/settlement.dart
@@ -530,7 +530,7 @@ class _Settlement extends State<Settlement> {
         ((subscribeParam?.isEnableSubscribe ?? false) == true)
             ? true
             : false; //是否预约
-    placeOrderFirst.isTakeOut = ((storeInfo?.deliveryInfo?.dineInTakeStatus ?? false) == true) ? diningStatus : selectedBtn;
+    placeOrderFirst.isTakeOut = ((storeInfo?.deliveryInfo?.dineInTakeStatus ?? false) == true && (subscribeParam?.isEnableSubscribe ?? false) == false) ? diningStatus : selectedBtn;
     placeOrderFirst.notes = remakers +
         (reservationTime ?? "") +
         ((subscribeParam?.isEnableSubscribe ?? false) == true
@@ -832,10 +832,10 @@ class _Settlement extends State<Settlement> {
                                   widget.arguments["distance"],),
 
                               SizedBox(
-                                height: 16,
+                                height: 16.h,
                               ),
 
-                              if((storeInfo?.deliveryInfo?.dineInTakeStatus?? false) ==true && settleOrderInfo !=null)
+                              if((storeInfo?.deliveryInfo?.dineInTakeStatus?? false) ==true && (subscribeParam?.isEnableSubscribe ?? false) == false &&settleOrderInfo !=null)
                                 takeStatus(),
 
                               /// 预留的手机号， 可修改
@@ -1338,7 +1338,7 @@ class _Settlement extends State<Settlement> {
           ) {
             return Container(
               width: double.infinity,
-              height: 280.h,
+              height: 300.h,
               padding: EdgeInsets.symmetric(horizontal: 14.w, vertical: 16.h),
               decoration: new BoxDecoration(
                 color: Colors.white,