Merge branch 'master' of https://git.oa00.com/recook/recook

.fvm/fvm_config.json

@@ -1,4 +1,4 @@
 {
-  "flutterSdkVersion": "2.0.0",
+  "flutterSdkVersion": "2.0.2",
   "flavors": {}
 }

ios/Runner.xcodeproj/project.pbxproj

@@ -394,7 +394,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 145;
+				CURRENT_PROJECT_VERSION = 307;
 				DEVELOPMENT_TEAM = HV8WM8C68W;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -531,7 +531,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 145;
+				CURRENT_PROJECT_VERSION = 307;
 				DEVELOPMENT_TEAM = HV8WM8C68W;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -569,7 +569,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 145;
+				CURRENT_PROJECT_VERSION = 307;
 				DEVELOPMENT_TEAM = HV8WM8C68W;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (

ios/Runner/Info.plist

@@ -95,7 +95,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>$(FLUTTER_BUILD_NUMBER)</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>Infomation Property List</key>
 	<dict>
 		<key>LSApplicationQueriesSchemes</key>

lib/pages/buy_tickets/choose_tickets_type_page.dart

@@ -126,7 +126,7 @@ class _ChooseTicketsTypePageState extends State<ChooseTicketsTypePage> {
 
   void onTap(int index) {
     if (index == 0) {
-      Get.to(TicketsOrderPage());
+      Get.to(TicketsOrderPage(ticketType: 1,));
     } else {
       Get.to(UsedPassagerPage());
     }

lib/pages/buy_tickets/tickets_order_page.dart

@@ -293,7 +293,7 @@ class _TicketsOrderPageState extends State<TicketsOrderPage>
             return MaterialButton(
                 padding: EdgeInsets.zero,
                 onPressed: () {
-                  Get.to(TicketsOrderDetailPage());
+                  Get.to(TicketsOrderDetailPage(ticketType: 1,));
                 },
                 child: _ticketsItem());
           }),

pubspec.yaml

@@ -2,7 +2,7 @@ name: recook
 description: Recook Market App.
 publish_to: "none"
 
-version: 1.9.1-dev+306
+version: 1.9.1-dev+307
 environment:
   sdk: ">=2.10.0 <3.0.0"
 
@@ -154,7 +154,7 @@ dependencies:
   encrypt: ^5.0.0
 
   # 时间选择器
-  flutter_datetime_picker: ^1.5.0
+  flutter_datetime_picker: ^1.5.1
 
   #日期选择器
   flutter_custom_calendar:
@@ -243,7 +243,7 @@ dependencies:
   hive_flutter: ^1.0.0
 
   pin_input_text_field: ^4.0.0
-  velocity_x: ^2.6.0
+  velocity_x: ^3.3.0
 
   animations:
   device_info: ^2.0.0