diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 59b6b6a6..db6d720a 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -617,7 +617,7 @@ CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 42; + CURRENT_PROJECT_VERSION = 3; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -667,7 +667,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 2.0.42; + MARKETING_VERSION = 3.1.3; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", @@ -819,7 +819,7 @@ CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 42; + CURRENT_PROJECT_VERSION = 3; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -869,7 +869,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 2.0.42; + MARKETING_VERSION = 3.1.3; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", @@ -912,7 +912,7 @@ CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 42; + CURRENT_PROJECT_VERSION = 3; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -962,7 +962,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 2.0.42; + MARKETING_VERSION = 3.1.3; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", diff --git a/lib/home/home_view/shortcut_operation.dart b/lib/home/home_view/shortcut_operation.dart index 5609e15c..bdb4b586 100644 --- a/lib/home/home_view/shortcut_operation.dart +++ b/lib/home/home_view/shortcut_operation.dart @@ -27,7 +27,7 @@ class _ShortcutOperation extends State { @override Widget build(BuildContext context) { return Container( - height: 70.h, + height: 75.h, width: double.infinity, margin: EdgeInsets.only(bottom: 15.h, left: 9.w, right: 9.w), child: Row( diff --git a/lib/settlement/settlement.dart b/lib/settlement/settlement.dart index 39b81a9a..e0c8fbe1 100644 --- a/lib/settlement/settlement.dart +++ b/lib/settlement/settlement.dart @@ -776,7 +776,7 @@ class _Settlement extends State { flex: 1, ), Container( - height: 54.h, + height: 58.h, decoration: BoxDecoration( color: Colors.white, boxShadow: [ @@ -823,7 +823,7 @@ class _Settlement extends State { textColor: Colors.white, fontWeight: MyFontWeight.regular, backgroup: Color(0xFF32A060), - fontSize: 16.sp, + fontSize: 15.sp, padding: EdgeInsets.symmetric( vertical: 5.h, ), diff --git a/lib/union/union_list.dart b/lib/union/union_list.dart index 7c28d8d9..8833dd24 100644 --- a/lib/union/union_list.dart +++ b/lib/union/union_list.dart @@ -234,7 +234,6 @@ class _UnionList extends State { fontWeight: MyFontWeight.regular, ), ),) - ], )), if(store.distance != null)