From 8367bfb8507046f0c2e3eed88700da534d9fc806 Mon Sep 17 00:00:00 2001 From: fmk Date: Wed, 14 Sep 2022 16:24:05 +0800 Subject: [PATCH] ios --- ios/Runner.xcodeproj/project.pbxproj | 12 ++++++------ lib/home/home_view/shortcut_operation.dart | 2 +- lib/mine/mine_wallet_page.dart | 2 +- lib/retrofit/min_api.dart | 4 ++-- lib/retrofit/retrofit_api.dart | 4 ++-- lib/settlement/settlement.dart | 4 ++-- lib/union/union_list.dart | 5 ++--- pubspec.yaml | 2 +- 8 files changed, 17 insertions(+), 18 deletions(-) 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/mine/mine_wallet_page.dart b/lib/mine/mine_wallet_page.dart index c05015f3..1086f5ea 100644 --- a/lib/mine/mine_wallet_page.dart +++ b/lib/mine/mine_wallet_page.dart @@ -531,7 +531,7 @@ class _MineWalletPage extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - S.of(context).yue, + "${S.of(context).yue}(含活动)", style: TextStyle( fontSize: 14, fontWeight: MyFontWeight.semi_bold, diff --git a/lib/retrofit/min_api.dart b/lib/retrofit/min_api.dart index 1f2a6374..f7e60731 100644 --- a/lib/retrofit/min_api.dart +++ b/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/";///线上 diff --git a/lib/retrofit/retrofit_api.dart b/lib/retrofit/retrofit_api.dart index 8f74e4cc..b55cfa21 100644 --- a/lib/retrofit/retrofit_api.dart +++ b/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) 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 f7880708..8833dd24 100644 --- a/lib/union/union_list.dart +++ b/lib/union/union_list.dart @@ -155,7 +155,7 @@ class _UnionList extends State { ) ]), width: double.infinity, - height: 228.h, + height: 235.h, child: Stack( children: [ Positioned( @@ -187,7 +187,7 @@ class _UnionList extends State { 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 { fontWeight: MyFontWeight.regular, ), ),) - ], )), if(store.distance != null) diff --git a/pubspec.yaml b/pubspec.yaml index d30ce0e3..51560989 100644 --- a/pubspec.yaml +++ b/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"