ios,结算页，预约门店弹窗高度更改；

预约商品不显示堂食选择；

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)",

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

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,