From 3d31eefb2e694d6dfce4794acec60a4087a96eb7 Mon Sep 17 00:00:00 2001
From: wurong <953969641@qq.com>
Date: Wed, 9 Aug 2023 15:23:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E8=87=AA=E5=8A=A8=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E6=9B=B4=E6=94=B9=EF=BC=9B=20=E9=97=A8=E5=BA=97?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=B2=A1=E6=9C=89=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=E7=BB=8F=E7=BA=AC=E5=BA=A6=E5=88=99=E4=B8=8D=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/settlement/settlement.dart       |  6 +++---
 lib/store/store_view/store_info.dart | 20 ++++++++++++--------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/lib/settlement/settlement.dart b/lib/settlement/settlement.dart
index b722a1bf..4d28b511 100644
--- a/lib/settlement/settlement.dart
+++ b/lib/settlement/settlement.dart
@@ -140,7 +140,7 @@ class _Settlement extends State<Settlement> {
           storeId: storeId,
           showLoading: false);
       queryMemberInfo();
-      if (promotions != null && promotions != "" && tableId <= 0) {
+      if (widget.arguments["pid"] != null && widget.arguments["pid"] != "" && tableId <= 0) {
         queryOrderInfo(
             address != null ? address.id : null,
             ((storeInfo?.pickupType?.dineInTakeStatus ?? false) == true &&
@@ -155,7 +155,7 @@ class _Settlement extends State<Settlement> {
             productSkuId ?? "",
             actProductId ?? "",
             actProductSkuId ?? "",
-            "ACTIVITY",
+            "AUTO",
             // useVipPriceSelect,
             // useBenefitSelect,
             count1,
@@ -1383,7 +1383,7 @@ class _Settlement extends State<Settlement> {
           0,
           (settleOrderInfo.isRaise || payChannel == 5)
               ? ""
-              : promotion?.id ?? productId,
+              : widget.arguments["pid"] ?? (promotion?.id ?? productId),
           productSkuId ?? "",
           actProductId ?? "",
           actProductSkuId ?? "",
diff --git a/lib/store/store_view/store_info.dart b/lib/store/store_view/store_info.dart
index aaa02685..2f274a37 100644
--- a/lib/store/store_view/store_info.dart
+++ b/lib/store/store_view/store_info.dart
@@ -190,14 +190,18 @@ class _StoreInfoView extends State<StoreInfoView> {
                 child: GestureDetector(
                   behavior: HitTestBehavior.opaque,
                   onTap: () {
-                    Navigator.of(context).pushNamed(
-                      '/router/location_map',
-                      arguments: {
-                        "lat": widget.storeInfo.latitude,
-                        "lng": widget.storeInfo.longitude,
-                        "storeName": widget.storeInfo.storeName,
-                      },
-                    );
+                    if(widget.storeInfo.longitude != null && widget.storeInfo.latitude != null){
+                      Navigator.of(context).pushNamed(
+                        '/router/location_map',
+                        arguments: {
+                          "lat": widget.storeInfo.latitude,
+                          "lng": widget.storeInfo.longitude,
+                          "storeName": widget.storeInfo.storeName,
+                        },
+                      );
+                    }else{
+                      return;
+                    }
                   },
                   child: Text(
                     "${S.of(context).dizhi}:${widget.storeInfo != null ? widget.storeInfo.address : ""}",