Merge remote-tracking branch 'origin/wr_2023_new_business_new' into wr_2023_new_business_new

ios/Runner.xcodeproj/project.pbxproj

@@ -653,7 +653,7 @@
 					"$(PROJECT_DIR)/baidu",
 					"$(PROJECT_DIR)/Runner/baidu",
 				);
-				MARKETING_VERSION = 3.2.30;
+				MARKETING_VERSION = 3.2.31;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -857,7 +857,7 @@
 					"$(PROJECT_DIR)/baidu",
 					"$(PROJECT_DIR)/Runner/baidu",
 				);
-				MARKETING_VERSION = 3.2.30;
+				MARKETING_VERSION = 3.2.31;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -947,7 +947,7 @@
 					"$(PROJECT_DIR)/baidu",
 					"$(PROJECT_DIR)/Runner/baidu",
 				);
-				MARKETING_VERSION = 3.2.30;
+				MARKETING_VERSION = 3.2.31;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"$(inherited)",

lib/store/shop_details_page.dart

@@ -74,11 +74,11 @@ class _ShopDetailsPage extends State<ShopDetailsPage> {
     storeId = widget.arguments["storeId"];
     isSetMeal = widget.arguments["isSetMeal"] ?? false;
     scrollController.addListener(() {
-      if(scIndex == 0 && scrollController.offset > 400){
+      if(scIndex == 0 && scrollController.offset > (MediaQuery.of(context).size.height >= 750 ? 392.h : 400.h)){
         setState(() {
           scIndex = 1;
         });
-      }else if(scIndex == 1 && scrollController.offset <= 400){
+      }else if(scIndex == 1 && scrollController.offset <= (MediaQuery.of(context).size.height >= 750 ? 392.h : 400.h)){
         setState(() {
           scIndex = 0;
         });