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

ios更改

zyh
fmk 3 years ago
parent
4ed7d56725
commit
0a63ff6fc9
3 changed files with 18 additions and 18 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. 22
      lib/mine/mine_page.dart
  3. 2
      lib/mine/mine_view/mine_calendar.dart

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

@ -616,7 +616,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 = 9; CURRENT_PROJECT_VERSION = 10;
DEVELOPMENT_TEAM = YF3Q8DVP52; DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
@ -666,7 +666,7 @@
"$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu", "$(PROJECT_DIR)/Runner/baidu",
); );
MARKETING_VERSION = 2.0.9; MARKETING_VERSION = 2.0.10;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",
@ -816,7 +816,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 = 9; CURRENT_PROJECT_VERSION = 10;
DEVELOPMENT_TEAM = YF3Q8DVP52; DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
@ -866,7 +866,7 @@
"$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu", "$(PROJECT_DIR)/Runner/baidu",
); );
MARKETING_VERSION = 2.0.9; MARKETING_VERSION = 2.0.10;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",
@ -907,7 +907,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 = 9; CURRENT_PROJECT_VERSION = 10;
DEVELOPMENT_TEAM = YF3Q8DVP52; DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
@ -957,7 +957,7 @@
"$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu", "$(PROJECT_DIR)/Runner/baidu",
); );
MARKETING_VERSION = 2.0.9; MARKETING_VERSION = 2.0.10;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",

22
lib/mine/mine_page.dart
Unescape View File

@ -195,7 +195,7 @@ class MinePageState extends State<MinePage> with AutomaticKeepAliveClientMixin {
// alignment: Alignment.centerRight, // alignment: Alignment.centerRight,
children: [ children: [
Container( Container(
height: 317, height: 317.h,
decoration: BoxDecoration( decoration: BoxDecoration(
color: Color(0xFF32A060) color: Color(0xFF32A060)
), ),
@ -245,7 +245,7 @@ class MinePageState extends State<MinePage> with AutomaticKeepAliveClientMixin {
), ),
), ),
Container( Container(
margin: EdgeInsets.only(top: 258.h), margin: EdgeInsets.only(top:258.h ),
child: Column( child: Column(
children: [ children: [
///我的订单 ///我的订单
@ -298,12 +298,12 @@ class MinePageState extends State<MinePage> with AutomaticKeepAliveClientMixin {
); );
}, },
child:Container( child:Container(
margin: EdgeInsets.only(left:14,right:14,bottom:10), margin: EdgeInsets.only(left:14.w,right:14.w,bottom:10.h),
padding: EdgeInsets.only(left:12, top:12, right:10,bottom: 12), padding: EdgeInsets.only(left:12.w, top:12.h, right:10.w,bottom: 12.h),
width: double.infinity, width: double.infinity,
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Colors.white,
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(8.r),
boxShadow: [ boxShadow: [
BoxShadow( BoxShadow(
color: Colors.black.withAlpha(12), color: Colors.black.withAlpha(12),
@ -489,11 +489,11 @@ class MinePageState extends State<MinePage> with AutomaticKeepAliveClientMixin {
///关注度/粉丝/成就数量 ///关注度/粉丝/成就数量
Widget attention() { Widget attention() {
return Container( return Container(
margin: EdgeInsets.only(left: 16, top: 10, right: 16), margin: EdgeInsets.only(left: 16.w, top: 10.h, right: 16.w),
// padding: EdgeInsets.only(top: 16,bottom: 16), // padding: EdgeInsets.only(top: 16,bottom: 16),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Colors.white,
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(8.r),
boxShadow: [ boxShadow: [
BoxShadow( BoxShadow(
color: Colors.black.withAlpha(12), color: Colors.black.withAlpha(12),
@ -518,7 +518,7 @@ class MinePageState extends State<MinePage> with AutomaticKeepAliveClientMixin {
}, },
child: Container( child: Container(
color: Colors.transparent, color: Colors.transparent,
padding: EdgeInsets.all(16), padding: EdgeInsets.all(16.h),
child: Column( child: Column(
children: [ children: [
Text( Text(
@ -530,7 +530,7 @@ class MinePageState extends State<MinePage> with AutomaticKeepAliveClientMixin {
), ),
), ),
SizedBox( SizedBox(
height: 4, height: 4.h,
), ),
Text( Text(
S.of(context).guanzhu, S.of(context).guanzhu,
@ -567,7 +567,7 @@ class MinePageState extends State<MinePage> with AutomaticKeepAliveClientMixin {
), ),
), ),
SizedBox( SizedBox(
height: 4, height: 4.h,
), ),
Text( Text(
S.of(context).fensi, S.of(context).fensi,
@ -606,7 +606,7 @@ class MinePageState extends State<MinePage> with AutomaticKeepAliveClientMixin {
), ),
), ),
SizedBox( SizedBox(
height: 4, height: 4.h,
), ),
Text( Text(
S.of(context).chengjiu, S.of(context).chengjiu,

2
lib/mine/mine_view/mine_calendar.dart
Unescape View File

@ -41,7 +41,7 @@ class _MineCalendar extends State<MineCalendar> {
children: [ children: [
GestureDetector( GestureDetector(
onTap: (){ onTap: (){
Navigator.of(context).pushNamed('/router/mine_greenery'); // Navigator.of(context).pushNamed('/router/mine_greenery');
}, },
child: Row( child: Row(
children: [ children: [

Write Preview
Loading…
Cancel
Save