From 74114784c9b81bf9e35dcc6f3ddcf562eafd13eb Mon Sep 17 00:00:00 2001
From: fmk <fengmeikan@hotmail.com>
Date: Fri, 21 Jul 2023 16:14:27 +0800
Subject: [PATCH] =?UTF-8?q?iOS=20=E7=82=B9=E5=8D=95=E9=A1=B5=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E8=8C=83=E5=9B=B4=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ios/Runner.xcodeproj/project.pbxproj |  6 ++--
 lib/store/store_view/store_info.dart | 50 +++++++++++++++++-----------
 2 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index c1914e4e..36c5d98e 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.17;
+				MARKETING_VERSION = 3.2.18;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -869,7 +869,7 @@
 					"$(PROJECT_DIR)/baidu",
 					"$(PROJECT_DIR)/Runner/baidu",
 				);
-				MARKETING_VERSION = 3.2.17;
+				MARKETING_VERSION = 3.2.18;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -962,7 +962,7 @@
 					"$(PROJECT_DIR)/baidu",
 					"$(PROJECT_DIR)/Runner/baidu",
 				);
-				MARKETING_VERSION = 3.2.17;
+				MARKETING_VERSION = 3.2.18;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
diff --git a/lib/store/store_view/store_info.dart b/lib/store/store_view/store_info.dart
index ab653393..aaa02685 100644
--- a/lib/store/store_view/store_info.dart
+++ b/lib/store/store_view/store_info.dart
@@ -164,21 +164,6 @@ class _StoreInfoView extends State<StoreInfoView> {
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
             crossAxisAlignment: CrossAxisAlignment.center,
             children: [
-              Expanded(
-                child: Text(
-                  "${S.of(context).dizhi}:${widget.storeInfo != null ? widget.storeInfo.address : ""}",
-                  maxLines: 2,
-                  textAlign: TextAlign.justify,
-                  style: TextStyle(
-                    color: Color(0xFF353535),
-                    fontWeight: MyFontWeight.regular,
-                    fontSize: 12.sp,
-                  ),
-                ),
-              ),
-              SizedBox(
-                width: 16.w,
-              ),
               GestureDetector(
                 behavior: HitTestBehavior.opaque,
                 onTap: () {
@@ -192,22 +177,49 @@ class _StoreInfoView extends State<StoreInfoView> {
                   );
                 },
                 child:Container(
+                  color: Colors.transparent,
                   padding:EdgeInsets.only(right: 8.w) ,
                   child:  Image.asset(
                     "assets/image/icon_union_location.webp",
-                    width: 24.w,
-                    height: 24.h,
+                    width: 20,
+                    height: 20,
+                  ),
+                ),
+              ),
+              Expanded(
+                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,
+                      },
+                    );
+                  },
+                  child: Text(
+                    "${S.of(context).dizhi}:${widget.storeInfo != null ? widget.storeInfo.address : ""}",
+                    maxLines: 2,
+                    textAlign: TextAlign.justify,
+                    style: TextStyle(
+                      color: Color(0xFF353535),
+                      fontWeight: MyFontWeight.regular,
+                      fontSize: 12.sp,
+                    ),
                   ),
                 ),
               ),
+
               if((widget?.storeInfo?.tel ?? "") != "")
               GestureDetector(
-                behavior: HitTestBehavior.opaque,
+                behavior: HitTestBehavior.translucent,
                 onTap: () {
                   showCallMobile();
                 },
                 child: Container(
-                  padding:EdgeInsets.only(left: 8.w) ,
+                  padding:EdgeInsets.only(left: 16.w,right: 8.w) ,
                   child: Image.asset(
                     "assets/image/icon_union_call.webp",
                     width: 24,