From 506c85542cc3623fe85d7c2a5592718fe9916fac Mon Sep 17 00:00:00 2001
From: zhangmeng <494089941@qq.com>
Date: Mon, 2 Aug 2021 15:53:35 +0800
Subject: [PATCH 1/2] update version
---
.fvm/fvm_config.json | 2 +-
ios/Runner.xcodeproj/project.pbxproj | 6 +++---
ios/Runner/Info.plist | 2 +-
pubspec.lock | 6 +++---
pubspec.yaml | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json
index 301f9b8..de7d397 100644
--- a/.fvm/fvm_config.json
+++ b/.fvm/fvm_config.json
@@ -1,4 +1,4 @@
{
- "flutterSdkVersion": "2.0.0",
+ "flutterSdkVersion": "2.0.2",
"flavors": {}
}
\ No newline at end of file
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 8cbcfd3..a14825a 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/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 = (
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index b5bb513..a24f767 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -95,7 +95,7 @@
CFBundleVersion
- $(FLUTTER_BUILD_NUMBER)
+ $(CURRENT_PROJECT_VERSION)
Infomation Property List
LSApplicationQueriesSchemes
diff --git a/pubspec.lock b/pubspec.lock
index 5dc2ece..c352d9c 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -56,7 +56,7 @@ packages:
name: async
url: "https://pub.flutter-io.cn"
source: hosted
- version: "2.6.1"
+ version: "2.5.0"
audio_session:
dependency: transitive
description:
@@ -1246,7 +1246,7 @@ packages:
name: source_span
url: "https://pub.flutter-io.cn"
source: hosted
- version: "1.8.1"
+ version: "1.8.0"
sp_util:
dependency: transitive
description:
@@ -1334,7 +1334,7 @@ packages:
name: test_api
url: "https://pub.flutter-io.cn"
source: hosted
- version: "0.3.0"
+ version: "0.2.19"
timeline_tile:
dependency: "direct main"
description:
diff --git a/pubspec.yaml b/pubspec.yaml
index d993494..245eb1c 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -2,7 +2,7 @@ name: recook
description: Recook Market App.
publish_to: "none"
-version: 1.9.0-dev+306
+version: 1.9.1-dev+307
environment:
sdk: ">=2.10.0 <3.0.0"
From 48874da531fdb6d3ea7420eba1a58192bb412b29 Mon Sep 17 00:00:00 2001
From: zhangmeng <494089941@qq.com>
Date: Mon, 2 Aug 2021 16:45:45 +0800
Subject: [PATCH 2/2] update pub
---
.../buy_tickets/choose_tickets_type_page.dart | 2 +-
lib/pages/buy_tickets/tickets_order_page.dart | 2 +-
pubspec.lock | 16 +---------------
pubspec.yaml | 4 ++--
4 files changed, 5 insertions(+), 19 deletions(-)
diff --git a/lib/pages/buy_tickets/choose_tickets_type_page.dart b/lib/pages/buy_tickets/choose_tickets_type_page.dart
index 5e2da62..c418f00 100644
--- a/lib/pages/buy_tickets/choose_tickets_type_page.dart
+++ b/lib/pages/buy_tickets/choose_tickets_type_page.dart
@@ -126,7 +126,7 @@ class _ChooseTicketsTypePageState extends State {
void onTap(int index) {
if (index == 0) {
- Get.to(TicketsOrderPage());
+ Get.to(TicketsOrderPage(ticketType: 1,));
} else {
Get.to(UsedPassagerPage());
}
diff --git a/lib/pages/buy_tickets/tickets_order_page.dart b/lib/pages/buy_tickets/tickets_order_page.dart
index 9cf456d..60b2b80 100644
--- a/lib/pages/buy_tickets/tickets_order_page.dart
+++ b/lib/pages/buy_tickets/tickets_order_page.dart
@@ -293,7 +293,7 @@ class _TicketsOrderPageState extends State
return MaterialButton(
padding: EdgeInsets.zero,
onPressed: () {
- Get.to(TicketsOrderDetailPage());
+ Get.to(TicketsOrderDetailPage(ticketType: 1,));
},
child: _ticketsItem());
}),
diff --git a/pubspec.lock b/pubspec.lock
index 8146a78..426a911 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -29,13 +29,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.1"
- animator:
- dependency: transitive
- description:
- name: animator
- url: "https://pub.dartlang.org"
- source: hosted
- version: "3.1.0"
args:
dependency: transitive
description:
@@ -1268,13 +1261,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "1.10.0"
- states_rebuilder:
- dependency: transitive
- description:
- name: states_rebuilder
- url: "https://pub.dartlang.org"
- source: hosted
- version: "4.3.0"
stream_channel:
dependency: transitive
description:
@@ -1418,7 +1404,7 @@ packages:
name: velocity_x
url: "https://pub.dartlang.org"
source: hosted
- version: "2.6.1"
+ version: "3.3.0"
video_player:
dependency: "direct main"
description:
diff --git a/pubspec.yaml b/pubspec.yaml
index ad3abad..2a168de 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -154,7 +154,7 @@ dependencies:
encrypt: ^5.0.0
# 时间选择器
- flutter_datetime_picker: ^1.5.0
+ flutter_datetime_picker: ^1.5.1
#日期选择器
flutter_custom_calendar:
@@ -242,7 +242,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