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

# Conflicts:
#	pubspec.yaml

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)",

lib/home/home_view/shortcut_operation.dart

@@ -27,7 +27,7 @@ class _ShortcutOperation extends State<ShortcutOperation> {
   @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(

lib/settlement/settlement.dart

@@ -776,7 +776,7 @@ class _Settlement extends State<Settlement> {
                     flex: 1,
                   ),
                   Container(
-                    height: 54.h,
+                    height: 58.h,
                     decoration: BoxDecoration(
                       color: Colors.white,
                       boxShadow: [
@@ -823,7 +823,7 @@ class _Settlement extends State<Settlement> {
                           textColor: Colors.white,
                           fontWeight: MyFontWeight.regular,
                           backgroup: Color(0xFF32A060),
-                          fontSize: 16.sp,
+                          fontSize: 15.sp,
                           padding: EdgeInsets.symmetric(
                             vertical: 5.h,
                           ),

lib/union/union_list.dart

@@ -234,7 +234,6 @@ class _UnionList extends State<UnionList> {
                               fontWeight: MyFontWeight.regular,
                             ),
                           ),)
-
                         ],
                       )),
                   if(store.distance != null)