From b49f849406a98192363bf28c4030de7c33c416c3 Mon Sep 17 00:00:00 2001 From: fmk Date: Fri, 4 Nov 2022 14:40:20 +0800 Subject: [PATCH] =?UTF-8?q?ios=20=E6=9B=B4=E6=94=B9=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/Runner.xcodeproj/project.pbxproj | 12 +- lib/retrofit/min_api.dart | 2 +- lib/retrofit/retrofit_api.dart | 2 +- lib/vip/vip_view/exclusive_coupon.dart | 135 ++++++++++++----------- lib/vip/vip_view/vip_goods_discount.dart | 2 +- 5 files changed, 81 insertions(+), 72 deletions(-) diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index a4707072..728f0ccd 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 = 5; + CURRENT_PROJECT_VERSION = 6; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -667,7 +667,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 3.1.5; + MARKETING_VERSION = 3.1.6; 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 = 5; + CURRENT_PROJECT_VERSION = 6; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -869,7 +869,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 3.1.5; + MARKETING_VERSION = 3.1.6; 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 = 5; + CURRENT_PROJECT_VERSION = 6; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -962,7 +962,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 3.1.5; + MARKETING_VERSION = 3.1.6; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", diff --git a/lib/retrofit/min_api.dart b/lib/retrofit/min_api.dart index 1308a39d..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 = "https://pos.api.lotus-wallet.com/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 d4d2e1d1..db673ef1 100644 --- a/lib/retrofit/retrofit_api.dart +++ b/lib/retrofit/retrofit_api.dart @@ -63,7 +63,7 @@ import 'data/wx_pay.dart'; part 'retrofit_api.g.dart'; -const localBaseUrl = "https://pos.platform.lotus-wallet.com/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/vip/vip_view/exclusive_coupon.dart b/lib/vip/vip_view/exclusive_coupon.dart index 2515132d..87f00b82 100644 --- a/lib/vip/vip_view/exclusive_coupon.dart +++ b/lib/vip/vip_view/exclusive_coupon.dart @@ -89,29 +89,32 @@ class _ExclusiveCoupon extends State { ), ), SizedBox(height: 5.h,), - Text.rich( - TextSpan( - children: [ - TextSpan( - text: "6", - style: TextStyle( - fontWeight: MyFontWeight.semi_bold, - fontSize: 36.sp, - color: Color(0xffFF7E12), - ), + Row( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.center, + textBaseline: TextBaseline.alphabetic, + children: [ + Text( + "6", + style: TextStyle( + fontSize: 36.sp, + fontWeight: FontWeight.w800, + color: Color(0xffFF7E12), ), - TextSpan( - text: " 折", - style: TextStyle( - fontSize: 24.sp, - color: Color(0xffFF7E12), - fontWeight: MyFontWeight.semi_bold, - ), + ), + SizedBox( + height: 4.h, + ), + Text( + "折", + style: TextStyle( + fontSize: 24.sp, + fontWeight: MyFontWeight.semi_bold, + color: Color(0xffFF7E12), ), - ], - ), - textDirection: TextDirection.ltr, - ), + ), + ], + ) ], ),)), Image.asset( @@ -157,29 +160,32 @@ class _ExclusiveCoupon extends State { ), ), SizedBox(height: 5.h,), - Text.rich( - TextSpan( - children: [ - TextSpan( - text: "7", - style: TextStyle( - fontWeight: MyFontWeight.semi_bold, - fontSize: 36.sp, - color: Color(0xffFF7E12), - ), + Row( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.center, + textBaseline: TextBaseline.alphabetic, + children: [ + Text( + "7", + style: TextStyle( + fontSize: 36.sp, + fontWeight: FontWeight.w800, + color: Color(0xffFF7E12), ), - TextSpan( - text: " 折", - style: TextStyle( - fontSize: 24.sp, - color: Color(0xffFF7E12), - fontWeight: MyFontWeight.semi_bold, - ), + ), + SizedBox( + height: 4.h, + ), + Text( + "折", + style: TextStyle( + fontSize: 24.sp, + fontWeight: MyFontWeight.semi_bold, + color: Color(0xffFF7E12), ), - ], - ), - textDirection: TextDirection.ltr, - ), + ), + ], + ) ], ),)), Image.asset( @@ -225,29 +231,32 @@ class _ExclusiveCoupon extends State { ), ), SizedBox(height: 5.h,), - Text.rich( - TextSpan( - children: [ - TextSpan( - text: "8", - style: TextStyle( - fontWeight: MyFontWeight.semi_bold, - fontSize: 36.sp, - color: Color(0xffFF7E12), - ), + Row( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.center, + textBaseline: TextBaseline.alphabetic, + children: [ + Text( + "8", + style: TextStyle( + fontSize: 36.sp, + fontWeight: FontWeight.w800, + color: Color(0xffFF7E12), ), - TextSpan( - text: " 折", - style: TextStyle( - fontSize: 24.sp, - color: Color(0xffFF7E12), - fontWeight: MyFontWeight.semi_bold, - ), + ), + SizedBox( + height: 4.h, + ), + Text( + "折", + style: TextStyle( + fontSize: 24.sp, + fontWeight: MyFontWeight.semi_bold, + color: Color(0xffFF7E12), ), - ], - ), - textDirection: TextDirection.ltr, - ), + ), + ], + ) ], ),)), Image.asset( diff --git a/lib/vip/vip_view/vip_goods_discount.dart b/lib/vip/vip_view/vip_goods_discount.dart index 6b27b249..373afa73 100644 --- a/lib/vip/vip_view/vip_goods_discount.dart +++ b/lib/vip/vip_view/vip_goods_discount.dart @@ -181,7 +181,7 @@ class _VipGoodsDiscount extends State { overflow: TextOverflow.ellipsis, style: TextStyle( color: Color(0xff0D0D0D), - fontSize:14.sp, + fontSize:13.sp, fontWeight: MyFontWeight.regular, ),), )),