From 4ce745015fc093b4fda9a8f3cb88ddeb52008e59 Mon Sep 17 00:00:00 2001 From: boom <953969641@qq.com> Date: Thu, 1 Dec 2022 15:34:49 +0800 Subject: [PATCH] =?UTF-8?q?ios=20=E6=9B=B4=E6=94=B9=E8=A7=86=E9=A2=91?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=AE=80=E4=BB=8B=E9=97=B4=E8=B7=9D=EF=BC=9B?= =?UTF-8?q?=20=E6=9B=B4=E6=94=B9ios=E5=9C=B0=E5=9B=BE=E5=88=97=E8=A1=A8bug?= =?UTF-8?q?=EF=BC=9B=20=E4=BC=98=E5=8C=96=E4=B8=8B=E5=8D=95=E5=8A=A9?= =?UTF-8?q?=E5=86=9C=E7=A7=AF=E5=88=86=E6=9D=BF=E5=9D=97=EF=BC=9B=20?= =?UTF-8?q?=E6=9B=B4=E6=94=B9iOS=E8=AE=A2=E5=8D=95=E7=BB=93=E7=AE=97?= =?UTF-8?q?=EF=BC=8Cvip=E4=BC=98=E6=83=A0=E6=8C=89=E9=92=AE=EF=BC=9B=20?= =?UTF-8?q?=E6=9B=B4=E6=94=B9=E9=A6=96=E9=A1=B5bug=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/Runner.xcodeproj/project.pbxproj | 12 ++++++------ ios/Runner/Info.plist | 1 + lib/community/community_view/class_list_view.dart | 2 +- lib/home/home_page.dart | 7 +++++-- lib/main_page.dart | 2 +- lib/retrofit/min_api.dart | 2 +- lib/retrofit/retrofit_api.dart | 2 +- lib/settlement/settlement.dart | 15 +++++++++++++++ .../settlement_view/activity_coupon_remarks.dart | 2 +- 9 files changed, 32 insertions(+), 13 deletions(-) diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index eb90f659..e9017843 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 = 8; + CURRENT_PROJECT_VERSION = 9; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -667,7 +667,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 3.1.8; + MARKETING_VERSION = 3.1.9; 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 = 8; + CURRENT_PROJECT_VERSION = 9; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -869,7 +869,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 3.1.8; + MARKETING_VERSION = 3.1.9; 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 = 8; + CURRENT_PROJECT_VERSION = 9; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -962,7 +962,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 3.1.8; + MARKETING_VERSION = 3.1.9; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index 3deca04c..4887210d 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -144,6 +144,7 @@ UIBackgroundModes + location remote-notification UILaunchStoryboardName diff --git a/lib/community/community_view/class_list_view.dart b/lib/community/community_view/class_list_view.dart index 3bf6d6a3..7d3c1982 100644 --- a/lib/community/community_view/class_list_view.dart +++ b/lib/community/community_view/class_list_view.dart @@ -217,7 +217,7 @@ class _ClassListView extends State { maxLines: 2, style: TextStyle( fontSize: 13.sp, - height: 1.2.h, + height: 1.5.h, fontWeight: MyFontWeight.medium, color: Colors.black, ), diff --git a/lib/home/home_page.dart b/lib/home/home_page.dart index e418f8ad..57e69726 100644 --- a/lib/home/home_page.dart +++ b/lib/home/home_page.dart @@ -503,7 +503,10 @@ class HomePageState extends State with AutomaticKeepAliveClientMixin { }, child: SingleChildScrollView( physics: NeverScrollableScrollPhysics(), - child: Column( + child: FutureBuilder( + future: queryHome(), + builder: (context, snapshot) { + return Column( children: [ ///banner HomeBanner(bannerData, controller), @@ -579,7 +582,7 @@ class HomePageState extends State with AutomaticKeepAliveClientMixin { }, ), ], - ), + );}) ), ), ), diff --git a/lib/main_page.dart b/lib/main_page.dart index 69255113..3390b4f0 100644 --- a/lib/main_page.dart +++ b/lib/main_page.dart @@ -204,7 +204,7 @@ class _MainPage extends State with WidgetsBindingObserver { myLocPlugin.authAK("ylW2QPlsbERkho7jOgU4GQSeawmdUIoR"); BMFMapSDK.setApiKeyAndCoordType( 'ylW2QPlsbERkho7jOgU4GQSeawmdUIoR', - BMF_COORD_TYPE.COMMON, + BMF_COORD_TYPE.BD09LL, ); } else if (Platform.isAndroid) { BMFMapSDK.setCoordType(BMF_COORD_TYPE.BD09LL); diff --git a/lib/retrofit/min_api.dart b/lib/retrofit/min_api.dart index 7e9d7012..f7e60731 100644 --- a/lib/retrofit/min_api.dart +++ b/lib/retrofit/min_api.dart @@ -26,7 +26,7 @@ import 'data/shopping_home_config.dart'; part 'min_api.g.dart'; -const localBaseUrl = "http://192.168.10.129:8765/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 e1507418..06429ed5 100644 --- a/lib/retrofit/retrofit_api.dart +++ b/lib/retrofit/retrofit_api.dart @@ -64,7 +64,7 @@ import 'data/wx_pay.dart'; part 'retrofit_api.g.dart'; -const localBaseUrl = "http://192.168.10.129:8766/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/";///线上 diff --git a/lib/settlement/settlement.dart b/lib/settlement/settlement.dart index 41a039fc..463b5186 100644 --- a/lib/settlement/settlement.dart +++ b/lib/settlement/settlement.dart @@ -122,6 +122,7 @@ class _Settlement extends State { storeId: storeId, showLoading: false ); + queryMemberInfo(); if (promotions != null && promotions != "" && tableId <= 0) { queryOrderInfo( address != null ? address.id : null, @@ -256,6 +257,20 @@ class _Settlement extends State { } } + ///会员信息 + queryMemberInfo() async { + BaseData baseData = await minService.memberInfo().catchError((error) { + debugPrint(error); + }); + if (baseData != null && baseData.isSuccess) { + SharedPreferences.getInstance().then( + (value) => { + value.setString('minMember', jsonEncode(baseData.data)), + }, + ); + } + } + ///查看订单详情 queryOrderDetails(id) async { BaseData baseData = await minService.getOrderDetails({ diff --git a/lib/settlement/settlement_view/activity_coupon_remarks.dart b/lib/settlement/settlement_view/activity_coupon_remarks.dart index b9767cea..282f23ff 100644 --- a/lib/settlement/settlement_view/activity_coupon_remarks.dart +++ b/lib/settlement/settlement_view/activity_coupon_remarks.dart @@ -76,7 +76,7 @@ class _ActivityCouponRemarks extends State { mainAxisAlignment: MainAxisAlignment.spaceEvenly, crossAxisAlignment: CrossAxisAlignment.center, children: [ - if(!widget?.settleOrderInfo?.isRaise ?? false) + if(!(widget?.settleOrderInfo?.isRaise ?? false)) Row( mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,