ios

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/mine/mine_wallet_page.dart

@@ -531,7 +531,7 @@ class _MineWalletPage extends State<MineWalletPage> {
                       crossAxisAlignment: CrossAxisAlignment.start,
                       children: [
                         Text(
-                          S.of(context).yue,
+                          "${S.of(context).yue}(含活动)",
                           style: TextStyle(
                             fontSize: 14,
                             fontWeight: MyFontWeight.semi_bold,

lib/retrofit/min_api.dart

@@ -26,8 +26,8 @@ import 'data/shopping_home_config.dart';
 
 part 'min_api.g.dart';
 
-// const localBaseUrl = "http://192.168.10.129:8765/app/";///本地
-const localBaseUrl = "https://2946-27-19-77-115.jp.ngrok.io/app/";///本地
+const localBaseUrl = "http://192.168.10.78:8765/app/";///本地
+// const localBaseUrl = "https://2946-27-19-77-115.jp.ngrok.io/app/";///本地
 const serviceBaseUrl = "https://pos.api.lotus-wallet.com/app/";///线上
 
 

lib/retrofit/retrofit_api.dart

@@ -61,8 +61,8 @@ import 'data/wx_pay.dart';
 
 part 'retrofit_api.g.dart';
 
-// const localBaseUrl = "http://192.168.10.129:8765/app/";///本地
-const localBaseUrl = "https://2946-27-19-77-115.jp.ngrok.io/app/";///本地
+const localBaseUrl = "http://192.168.10.78:8766/app/";///本地
+// const localBaseUrl = "https://2946-27-19-77-115.jp.ngrok.io/app/";///本地
 const serviceBaseUrl = "https://pos.platform.lotus-wallet.com/app/";///线上
 
 @RestApi(baseUrl: localBaseUrl)

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

@@ -155,7 +155,7 @@ class _UnionList extends State<UnionList> {
             )
           ]),
       width: double.infinity,
-      height: 228.h,
+      height: 235.h,
       child: Stack(
         children: [
           Positioned(
@@ -187,7 +187,7 @@ class _UnionList extends State<UnionList> {
             left: 12.w,
             right: 12.w,
             child: Container(
-              height: 100.h,
+              height: 107.h,
               child: Row(
                 mainAxisAlignment: MainAxisAlignment.start,
                 crossAxisAlignment: CrossAxisAlignment.start,
@@ -234,7 +234,6 @@ class _UnionList extends State<UnionList> {
                               fontWeight: MyFontWeight.regular,
                             ),
                           ),)
-
                         ],
                       )),
                   if(store.distance != null)

pubspec.yaml

@@ -3,7 +3,7 @@ description: 一心回乡.
 
 publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 
-version: 2.0.36+24
+version: 3.1.3+27
 
 environment:
   sdk: ">=2.7.0 <3.0.0"