diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 07eb6b51..54b23161 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -616,7 +616,7 @@ CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 9; + CURRENT_PROJECT_VERSION = 10; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -666,7 +666,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 2.0.9; + MARKETING_VERSION = 2.0.10; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", @@ -816,7 +816,7 @@ CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 9; + CURRENT_PROJECT_VERSION = 10; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -866,7 +866,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 2.0.9; + MARKETING_VERSION = 2.0.10; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", @@ -907,7 +907,7 @@ CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 9; + CURRENT_PROJECT_VERSION = 10; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -957,7 +957,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 2.0.9; + MARKETING_VERSION = 2.0.10; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", diff --git a/lib/mine/mine_page.dart b/lib/mine/mine_page.dart index 8f983dfe..cd05c828 100644 --- a/lib/mine/mine_page.dart +++ b/lib/mine/mine_page.dart @@ -195,7 +195,7 @@ class MinePageState extends State with AutomaticKeepAliveClientMixin { // alignment: Alignment.centerRight, children: [ Container( - height: 317, + height: 317.h, decoration: BoxDecoration( color: Color(0xFF32A060) ), @@ -245,7 +245,7 @@ class MinePageState extends State with AutomaticKeepAliveClientMixin { ), ), Container( - margin: EdgeInsets.only(top: 258.h), + margin: EdgeInsets.only(top:258.h ), child: Column( children: [ ///我的订单 @@ -298,12 +298,12 @@ class MinePageState extends State with AutomaticKeepAliveClientMixin { ); }, child:Container( - margin: EdgeInsets.only(left:14,right:14,bottom:10), - padding: EdgeInsets.only(left:12, top:12, right:10,bottom: 12), + margin: EdgeInsets.only(left:14.w,right:14.w,bottom:10.h), + padding: EdgeInsets.only(left:12.w, top:12.h, right:10.w,bottom: 12.h), width: double.infinity, decoration: BoxDecoration( color: Colors.white, - borderRadius: BorderRadius.circular(8), + borderRadius: BorderRadius.circular(8.r), boxShadow: [ BoxShadow( color: Colors.black.withAlpha(12), @@ -489,11 +489,11 @@ class MinePageState extends State with AutomaticKeepAliveClientMixin { ///关注度/粉丝/成就数量 Widget attention() { 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), decoration: BoxDecoration( color: Colors.white, - borderRadius: BorderRadius.circular(8), + borderRadius: BorderRadius.circular(8.r), boxShadow: [ BoxShadow( color: Colors.black.withAlpha(12), @@ -518,7 +518,7 @@ class MinePageState extends State with AutomaticKeepAliveClientMixin { }, child: Container( color: Colors.transparent, - padding: EdgeInsets.all(16), + padding: EdgeInsets.all(16.h), child: Column( children: [ Text( @@ -530,7 +530,7 @@ class MinePageState extends State with AutomaticKeepAliveClientMixin { ), ), SizedBox( - height: 4, + height: 4.h, ), Text( S.of(context).guanzhu, @@ -567,7 +567,7 @@ class MinePageState extends State with AutomaticKeepAliveClientMixin { ), ), SizedBox( - height: 4, + height: 4.h, ), Text( S.of(context).fensi, @@ -606,7 +606,7 @@ class MinePageState extends State with AutomaticKeepAliveClientMixin { ), ), SizedBox( - height: 4, + height: 4.h, ), Text( S.of(context).chengjiu, diff --git a/lib/mine/mine_view/mine_calendar.dart b/lib/mine/mine_view/mine_calendar.dart index c1675ef1..ae2af535 100644 --- a/lib/mine/mine_view/mine_calendar.dart +++ b/lib/mine/mine_view/mine_calendar.dart @@ -41,7 +41,7 @@ class _MineCalendar extends State { children: [ GestureDetector( onTap: (){ - Navigator.of(context).pushNamed('/router/mine_greenery'); + // Navigator.of(context).pushNamed('/router/mine_greenery'); }, child: Row( children: [