fmk
/
huixiang_app
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

ios 更改；

dart3_last
fmk 2 years ago
parent
4d13a46eb5
commit
b49f849406
5 changed files with 81 additions and 72 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      ios/Runner.xcodeproj/project.pbxproj
  2. 2
      lib/retrofit/min_api.dart
  3. 2
      lib/retrofit/retrofit_api.dart
  4. 135
      lib/vip/vip_view/exclusive_coupon.dart
  5. 2
      lib/vip/vip_view/vip_goods_discount.dart

12
ios/Runner.xcodeproj/project.pbxproj
Unescape View File

@ -617,7 +617,7 @@
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 5; CURRENT_PROJECT_VERSION = 6;
DEVELOPMENT_TEAM = YF3Q8DVP52; DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
@ -667,7 +667,7 @@
"$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu", "$(PROJECT_DIR)/Runner/baidu",
); );
MARKETING_VERSION = 3.1.5; MARKETING_VERSION = 3.1.6;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",
@ -819,7 +819,7 @@
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 5; CURRENT_PROJECT_VERSION = 6;
DEVELOPMENT_TEAM = YF3Q8DVP52; DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
@ -869,7 +869,7 @@
"$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu", "$(PROJECT_DIR)/Runner/baidu",
); );
MARKETING_VERSION = 3.1.5; MARKETING_VERSION = 3.1.6;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",
@ -912,7 +912,7 @@
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 5; CURRENT_PROJECT_VERSION = 6;
DEVELOPMENT_TEAM = YF3Q8DVP52; DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
@ -962,7 +962,7 @@
"$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu", "$(PROJECT_DIR)/Runner/baidu",
); );
MARKETING_VERSION = 3.1.5; MARKETING_VERSION = 3.1.6;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",

2
lib/retrofit/min_api.dart
Unescape View File

@ -26,7 +26,7 @@ import 'data/shopping_home_config.dart';
part 'min_api.g.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 localBaseUrl = "https://2946-27-19-77-115.jp.ngrok.io/app/";///本地
const serviceBaseUrl = "https://pos.api.lotus-wallet.com/app/";///线上 const serviceBaseUrl = "https://pos.api.lotus-wallet.com/app/";///线上

2
lib/retrofit/retrofit_api.dart
Unescape View File

@ -63,7 +63,7 @@ import 'data/wx_pay.dart';
part 'retrofit_api.g.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 localBaseUrl = "https://2946-27-19-77-115.jp.ngrok.io/app/";///本地
const serviceBaseUrl = "https://pos.platform.lotus-wallet.com/app/";///线上 const serviceBaseUrl = "https://pos.platform.lotus-wallet.com/app/";///线上

135
lib/vip/vip_view/exclusive_coupon.dart
Unescape View File

@ -89,29 +89,32 @@ class _ExclusiveCoupon extends State<ExclusiveCoupon> {
), ),
), ),
SizedBox(height: 5.h,), SizedBox(height: 5.h,),
Text.rich( Row(
TextSpan( mainAxisAlignment: MainAxisAlignment.start,
children: [ crossAxisAlignment: CrossAxisAlignment.center,
TextSpan( textBaseline: TextBaseline.alphabetic,
text: "6", children: [
style: TextStyle( Text(
fontWeight: MyFontWeight.semi_bold, "6",
fontSize: 36.sp, style: TextStyle(
color: Color(0xffFF7E12), fontSize: 36.sp,
), fontWeight: FontWeight.w800,
color: Color(0xffFF7E12),
), ),
TextSpan( ),
text: " 折", SizedBox(
style: TextStyle( height: 4.h,
fontSize: 24.sp, ),
color: Color(0xffFF7E12), Text(
fontWeight: MyFontWeight.semi_bold, "折",
), style: TextStyle(
fontSize: 24.sp,
fontWeight: MyFontWeight.semi_bold,
color: Color(0xffFF7E12),
), ),
], ),
), ],
textDirection: TextDirection.ltr, )
),
], ],
),)), ),)),
Image.asset( Image.asset(
@ -157,29 +160,32 @@ class _ExclusiveCoupon extends State<ExclusiveCoupon> {
), ),
), ),
SizedBox(height: 5.h,), SizedBox(height: 5.h,),
Text.rich( Row(
TextSpan( mainAxisAlignment: MainAxisAlignment.start,
children: [ crossAxisAlignment: CrossAxisAlignment.center,
TextSpan( textBaseline: TextBaseline.alphabetic,
text: "7", children: [
style: TextStyle( Text(
fontWeight: MyFontWeight.semi_bold, "7",
fontSize: 36.sp, style: TextStyle(
color: Color(0xffFF7E12), fontSize: 36.sp,
), fontWeight: FontWeight.w800,
color: Color(0xffFF7E12),
), ),
TextSpan( ),
text: " 折", SizedBox(
style: TextStyle( height: 4.h,
fontSize: 24.sp, ),
color: Color(0xffFF7E12), Text(
fontWeight: MyFontWeight.semi_bold, "折",
), style: TextStyle(
fontSize: 24.sp,
fontWeight: MyFontWeight.semi_bold,
color: Color(0xffFF7E12),
), ),
], ),
), ],
textDirection: TextDirection.ltr, )
),
], ],
),)), ),)),
Image.asset( Image.asset(
@ -225,29 +231,32 @@ class _ExclusiveCoupon extends State<ExclusiveCoupon> {
), ),
), ),
SizedBox(height: 5.h,), SizedBox(height: 5.h,),
Text.rich( Row(
TextSpan( mainAxisAlignment: MainAxisAlignment.start,
children: [ crossAxisAlignment: CrossAxisAlignment.center,
TextSpan( textBaseline: TextBaseline.alphabetic,
text: "8", children: [
style: TextStyle( Text(
fontWeight: MyFontWeight.semi_bold, "8",
fontSize: 36.sp, style: TextStyle(
color: Color(0xffFF7E12), fontSize: 36.sp,
), fontWeight: FontWeight.w800,
color: Color(0xffFF7E12),
), ),
TextSpan( ),
text: " 折", SizedBox(
style: TextStyle( height: 4.h,
fontSize: 24.sp, ),
color: Color(0xffFF7E12), Text(
fontWeight: MyFontWeight.semi_bold, "折",
), style: TextStyle(
fontSize: 24.sp,
fontWeight: MyFontWeight.semi_bold,
color: Color(0xffFF7E12),
), ),
], ),
), ],
textDirection: TextDirection.ltr, )
),
], ],
),)), ),)),
Image.asset( Image.asset(

2
lib/vip/vip_view/vip_goods_discount.dart
Unescape View File

@ -181,7 +181,7 @@ class _VipGoodsDiscount extends State<VipGoodsDiscount> {
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
style: TextStyle( style: TextStyle(
color: Color(0xff0D0D0D), color: Color(0xff0D0D0D),
fontSize:14.sp, fontSize:13.sp,
fontWeight: MyFontWeight.regular, fontWeight: MyFontWeight.regular,
),), ),),
)), )),

Write Preview
Loading…
Cancel
Save