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 : ""}",