合并5.4.2线上版本

@@ -132,7 +132,7 @@
         </provider>
         <meta-data
             android:name="com.amap.api.v2.apikey"
-            android:value="13464ddadd6a5d825e79f90e10ba72d2"/>
+            android:value="378180aa66e6d13fddfee5fd7a127d4f"/>
 
               <activity
             android:name="com.yalantis.ucrop.UCropActivity"

@@ -553,9 +553,8 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
-				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 5424;
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 542;
 				DEVELOPMENT_TEAM = 8J59HM8B82;
 				ENABLE_BITCODE = NO;
 				FLUTTER_BUILD_MODE = release;
@@ -705,9 +704,8 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
-				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 5424;
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 542;
 				DEVELOPMENT_TEAM = 8J59HM8B82;
 				ENABLE_BITCODE = NO;
 				FLUTTER_BUILD_MODE = debug;
@@ -748,9 +746,8 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
-				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 5424;
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 542;
 				DEVELOPMENT_TEAM = 8J59HM8B82;
 				ENABLE_BITCODE = NO;
 				FLUTTER_BUILD_MODE = release;

@@ -226,11 +226,11 @@ class MyAppState extends State<MyApp> {
     await AmapLocation.instance.updatePrivacyShow(true);
     await AmapLocation.instance.updatePrivacyAgree(true);
     await AmapService.instance.init(
-        iosKey: '24fe3a700e69114a4328d4e46823dcda',
-        androidKey: '13464ddadd6a5d825e79f90e10ba72d2');
+        iosKey: 'e402b13a251d4e33fad022b13d47b8f4',
+        androidKey: '378180aa66e6d13fddfee5fd7a127d4f');
 
     await AmapLocation.instance.init(
-      iosKey: '24fe3a700e69114a4328d4e46823dcda',
+      iosKey: 'e402b13a251d4e33fad022b13d47b8f4',
     );
   }
 

@@ -105,11 +105,11 @@ class _FirstPageState extends State<FirstPage> {
     await AmapLocation.instance.updatePrivacyShow(true);
     await AmapLocation.instance.updatePrivacyAgree(true);
     await AmapService.instance.init(
-        iosKey: '24fe3a700e69114a4328d4e46823dcda',
-        androidKey: '13464ddadd6a5d825e79f90e10ba72d2');
+        iosKey: 'e402b13a251d4e33fad022b13d47b8f4',
+        androidKey: '378180aa66e6d13fddfee5fd7a127d4f');
 
     await AmapLocation.instance.init(
-      iosKey: '24fe3a700e69114a4328d4e46823dcda',
+      iosKey: 'e402b13a251d4e33fad022b13d47b8f4',
     );
   }
 

@@ -159,7 +159,7 @@ class TableManagerPageState extends State<TableManagerPage> {
 
   String dateText = ""; //当前显示日期时间
   String dateShowNow = ""; //今天，明天，后天
-  int currTimeIndex = 2; //当前选中时间段
+  int currTimeIndex; //当前选中时间段
   String morning = "00:00-00:00"; //早市时间段
   String noon = "00:00-00:00"; //午市时间段
   String night = "00:00-00:00"; //晚市时间段
@@ -2681,6 +2681,10 @@ class TableManagerPageState extends State<TableManagerPage> {
                           radius: ScreenUtil().setWidth(8),
                           isBold: false,
                           onPressed: () async {
+                            if(currTimeIndex == null){
+                              Utils.showToast('请选择餐段或检查您的网络！');
+                              return;
+                            }
                             // _onlyReserve();
                             Loading.showLoading(
                               context,
@@ -2731,6 +2735,10 @@ class TableManagerPageState extends State<TableManagerPage> {
                         radius: ScreenUtil().setWidth(8),
                         isBold: false,
                         onPressed: () async {
+                          if(currTimeIndex == null){
+                              Utils.showToast('请选择餐段或检查您的网络！');
+                              return;
+                            }
                           Loading.showLoading(
                             context,
                           );