From 1133013487706606232b5f6ccca6674e30ab6d02 Mon Sep 17 00:00:00 2001 From: fmk Date: Thu, 21 Apr 2022 10:59:13 +0800 Subject: [PATCH] =?UTF-8?q?ios=20=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/Runner.xcodeproj/project.pbxproj | 12 +++--- lib/community/community_course.dart | 2 +- lib/community/community_page.dart | 8 ++-- .../community_view/community_dynamic.dart | 38 +++++++++---------- lib/community/community_view/home_class.dart | 28 +++++++------- lib/community/headlines/article_list.dart | 14 +++---- lib/home/guide_page.dart | 4 +- lib/login/login_page.dart | 18 ++++----- lib/mine/mine_view/mine_view.dart | 4 +- lib/retrofit/min_api.dart | 2 +- lib/retrofit/retrofit_api.dart | 2 +- lib/store/store_order.dart | 20 +++++----- lib/store/store_view/store_info.dart | 4 +- lib/union/union_view/union_coupon.dart | 4 +- 14 files changed, 80 insertions(+), 80 deletions(-) diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 1a8ccb08..1c667829 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 = 87; + CURRENT_PROJECT_VERSION = 88; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -666,7 +666,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 1.0.87; + MARKETING_VERSION = 1.0.88; 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 = 87; + CURRENT_PROJECT_VERSION = 88; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -866,7 +866,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 1.0.87; + MARKETING_VERSION = 1.0.88; 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 = 87; + CURRENT_PROJECT_VERSION = 88; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -957,7 +957,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 1.0.87; + MARKETING_VERSION = 1.0.88; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", diff --git a/lib/community/community_course.dart b/lib/community/community_course.dart index 49b5a5f7..43d90d9b 100644 --- a/lib/community/community_course.dart +++ b/lib/community/community_course.dart @@ -269,7 +269,7 @@ class _CommunityCourse extends State ///课程banner CourseBanner(bannerData,), - SizedBox(height: 28), + SizedBox(height: 28.h), ///合集列表 HomeClass(collectMap,collectList,), diff --git a/lib/community/community_page.dart b/lib/community/community_page.dart index 5427554b..f465f050 100644 --- a/lib/community/community_page.dart +++ b/lib/community/community_page.dart @@ -80,7 +80,7 @@ class _CommunityPage extends State leading: false, titleChild: PreferredSize( preferredSize: Size( - MediaQuery.of(context).size.width - 60, + MediaQuery.of(context).size.width - 60.w, 38.h, ), child: TabBar( @@ -92,12 +92,12 @@ class _CommunityPage extends State labelPadding: EdgeInsets.only(left: 8.w, right: 8.w), indicatorSize: TabBarIndicatorSize.label, unselectedLabelStyle: TextStyle( - fontSize: 15.sp, + fontSize: MediaQuery.of(context).size.width >= 650 ? 10.sp : 15.sp, fontWeight: FontWeight.w400, ), labelStyle: TextStyle( color: Colors.black, - fontSize: 18.sp, + fontSize: MediaQuery.of(context).size.width >= 650 ? 12.sp : 18.sp, fontWeight: FontWeight.bold, ), labelColor: Colors.black, @@ -110,7 +110,7 @@ class _CommunityPage extends State action: GestureDetector( behavior: HitTestBehavior.opaque, child: Container(color: Colors.transparent, - padding: EdgeInsets.only(left: 20,right: 20), + padding: EdgeInsets.only(left: 20.w,right: 20.w), child: SvgPicture.asset( "assets/svg/shequ_fabu.svg", fit: BoxFit.contain, diff --git a/lib/community/community_view/community_dynamic.dart b/lib/community/community_view/community_dynamic.dart index 52bcd4a2..27bdb7aa 100644 --- a/lib/community/community_view/community_dynamic.dart +++ b/lib/community/community_view/community_dynamic.dart @@ -159,10 +159,10 @@ class _CommunityDynamic extends State { return Column( children: [ Container( - margin: EdgeInsets.only(top: 2), + margin: EdgeInsets.only(top: 2.h), key: globalKey, alignment: Alignment.topCenter, - padding: EdgeInsets.only(left: 16,top: 16,right: 16), + padding: EdgeInsets.only(left: 16.w,top: 16.h,right: 16.w), decoration: BoxDecoration( color: Colors.white, boxShadow: [ @@ -184,7 +184,7 @@ class _CommunityDynamic extends State { crossAxisAlignment: CrossAxisAlignment.center, children: [ Container( - height: 44, + height: 44.h, child: Row( children: [ GestureDetector( @@ -213,7 +213,7 @@ class _CommunityDynamic extends State { ), ), SizedBox( - width: 8, + width: 8.w, ), Column( mainAxisAlignment: MainAxisAlignment.spaceEvenly, @@ -222,7 +222,7 @@ class _CommunityDynamic extends State { Text( widget?.article?.authorName ?? "", style: TextStyle( - fontSize: 15.sp, + fontSize: MediaQuery.of(context).size.width >= 650 ? 12.sp :15.sp, fontWeight: MyFontWeight.semi_bold, color: Color(0xFF1A1A1A), ), @@ -230,7 +230,7 @@ class _CommunityDynamic extends State { Text( widget?.article?.createTime ?? "", style: TextStyle( - fontSize: 13.sp, + fontSize: MediaQuery.of(context).size.width >= 650 ? 10.sp :13.sp, fontWeight: MyFontWeight.regular, color: Color(0xFF808080), ), @@ -353,7 +353,7 @@ class _CommunityDynamic extends State { children: [ Expanded( child: Container( - padding: EdgeInsets.only(bottom: 16), + padding: EdgeInsets.only(bottom: 16.h), child:Row( // mainAxisAlignment: MainAxisAlignment.center, // crossAxisAlignment: CrossAxisAlignment.center, @@ -364,7 +364,7 @@ class _CommunityDynamic extends State { height: 16, ), SizedBox( - width: 5, + width: 5.w, ), Text( (widget.article != null) @@ -381,7 +381,7 @@ class _CommunityDynamic extends State { ), Expanded( child:Container( - padding: EdgeInsets.only(bottom: 16), + padding: EdgeInsets.only(bottom: 16.h), child:Row( // mainAxisAlignment: MainAxisAlignment.center, // crossAxisAlignment: CrossAxisAlignment.center, @@ -392,7 +392,7 @@ class _CommunityDynamic extends State { height: 16, ), SizedBox( - width: 5, + width: 5.w, ), Text( "${widget.article.comments ?? 0}", @@ -406,7 +406,7 @@ class _CommunityDynamic extends State { ))), Expanded( child:Container( - padding: EdgeInsets.only(bottom: 16), + padding: EdgeInsets.only(bottom: 16.h), child:Row( // mainAxisAlignment: MainAxisAlignment.center, // crossAxisAlignment: CrossAxisAlignment.center, @@ -417,7 +417,7 @@ class _CommunityDynamic extends State { height: 16, ), SizedBox( - width: 5, + width: 5.w, ), Text( "${widget.article.likes ?? 0}", @@ -440,7 +440,7 @@ class _CommunityDynamic extends State { }); }, child: Container( - padding: EdgeInsets.only(top:3,bottom: 16), + padding: EdgeInsets.only(top:3.h,bottom: 16.h), alignment: Alignment.center, // color: Colors.red, child: Text( @@ -458,7 +458,7 @@ class _CommunityDynamic extends State { ), ), Container( - height: 16, + height: 16.h, color: Color(0xFFF7F7F7), ), ], @@ -793,7 +793,7 @@ class _CommunityDynamic extends State { child: Column( children: [ SizedBox( - height: 10, + height: 10.h, ), GestureDetector( onTap: () { @@ -806,7 +806,7 @@ class _CommunityDynamic extends State { child: Row( children: [ SizedBox( - width: 4, + width: 4.w, ), Image.asset( "assets/image/icon_share.webp", @@ -816,7 +816,7 @@ class _CommunityDynamic extends State { color: Color(0xff515151), ), SizedBox( - width: 12, + width: 12.w, ), Text( S.of(context).fenxiang, @@ -847,7 +847,7 @@ class _CommunityDynamic extends State { child: Row( children: [ SizedBox( - width: 4, + width: 4.w, ), SvgPicture.asset( "assets/svg/ju_b.svg", @@ -855,7 +855,7 @@ class _CommunityDynamic extends State { height: 20, ), SizedBox( - width: 15, + width: 15.w, ), Text( S.of(context).jubaogaineirong, diff --git a/lib/community/community_view/home_class.dart b/lib/community/community_view/home_class.dart index 0c395342..add55a71 100644 --- a/lib/community/community_view/home_class.dart +++ b/lib/community/community_view/home_class.dart @@ -48,7 +48,7 @@ class _HomeClass extends State { Widget collectItem(CollectClassList collectList) { return Container( - width: 168, + width: 168.w, // height: 250, margin: EdgeInsets.symmetric( horizontal: 6.w, @@ -58,7 +58,7 @@ class _HomeClass extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Padding( - padding: EdgeInsets.only(left: 16, top: 5), + padding: EdgeInsets.only(left: 16.w, top: 5.h), child: Text( collectList.name, style: TextStyle( @@ -70,11 +70,11 @@ class _HomeClass extends State { ), Container( height: 195, - margin: EdgeInsets.only(top: 10), + margin: EdgeInsets.only(top: 10.h), child: ListView.builder( scrollDirection: Axis.horizontal, physics: BouncingScrollPhysics(), - padding: EdgeInsets.symmetric(horizontal: 10), + padding: EdgeInsets.symmetric(horizontal: 10.w), itemCount: widget.collectMap[collectList.id] == null ? 0 : widget.collectMap[collectList.id].length, @@ -105,8 +105,8 @@ class _HomeClass extends State { Widget classItem(CourseList collect) { return Container( - width: 168, - height: 195, + width: 168.w, + height: 195.h, decoration: BoxDecoration( borderRadius: BorderRadius.vertical( bottom: Radius.circular(4), @@ -122,7 +122,7 @@ class _HomeClass extends State { color: Colors.white, ), margin: EdgeInsets.symmetric( - horizontal: 6, + horizontal: 6.w, ), child: Column( children: [ @@ -154,7 +154,7 @@ class _HomeClass extends State { child: MImage( collect.coverImg, width: double.infinity, - height: 120, + height: 120.h, fit: BoxFit.cover, errorSrc: "assets/image/default_1.webp", fadeSrc: "assets/image/default_1.webp", @@ -179,7 +179,7 @@ class _HomeClass extends State { height: 16.h, color: Colors.white, ), - SizedBox(width: 5), + SizedBox(width: 5.w), Text( collect.viewers.toString(), style: TextStyle( @@ -190,7 +190,7 @@ class _HomeClass extends State { ), ], ), - SizedBox(width: 8), + SizedBox(width: 8.w), // Row( // children: [ // Image.asset( @@ -219,8 +219,8 @@ class _HomeClass extends State { children: [ Spacer(), Container( - margin: EdgeInsets.only(top: 8, right: 8), - padding: EdgeInsets.only(left: 2, right: 2), + margin: EdgeInsets.only(top: 8.h, right: 8.w), + padding: EdgeInsets.only(left: 2.w, right: 2.w), height: 20.h, alignment: Alignment.center, decoration: BoxDecoration( @@ -245,7 +245,7 @@ class _HomeClass extends State { ), Expanded( child: Container( - padding: EdgeInsets.all(8), + padding: EdgeInsets.all(8.w), child: Column( mainAxisAlignment: MainAxisAlignment.spaceBetween, crossAxisAlignment: CrossAxisAlignment.start, @@ -268,7 +268,7 @@ class _HomeClass extends State { ), ], ), - SizedBox(height: 2), + SizedBox(height: 2.h), Text( "${S.of(context).jiangshi}:${collect.author.name}", overflow: TextOverflow.ellipsis, diff --git a/lib/community/headlines/article_list.dart b/lib/community/headlines/article_list.dart index ff315e7e..4dca7c8b 100644 --- a/lib/community/headlines/article_list.dart +++ b/lib/community/headlines/article_list.dart @@ -38,13 +38,13 @@ class _ArticleList extends State { @override Widget build(BuildContext context) { return Container( - margin: EdgeInsets.only(top: 20, left: 16, right: 16), + margin: EdgeInsets.only(top: 20.h, left: 16.w, right: 16.w), child: Column( crossAxisAlignment: CrossAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.spaceAround, children: [ Padding( - padding: EdgeInsets.only(bottom: 12), + padding: EdgeInsets.only(bottom: 12.h), child: Text( S.of(context).zuixinwenzhang, overflow: TextOverflow.ellipsis, @@ -82,7 +82,7 @@ class _ArticleList extends State { return Container( width: double.infinity, padding: EdgeInsets.all(16), - margin: EdgeInsets.only(bottom: 12), + margin: EdgeInsets.only(bottom: 12.h), color: Colors.white, child: Row( crossAxisAlignment: CrossAxisAlignment.start, @@ -90,7 +90,7 @@ class _ArticleList extends State { children: [ Expanded( child: Container( - height: 105, + height: MediaQuery.of(context).size.width >= 650 ? 133.h :105, child: Column( crossAxisAlignment: CrossAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.spaceAround, @@ -105,11 +105,11 @@ class _ArticleList extends State { color: Colors.black, ), ), - SizedBox(height:5), + SizedBox(height:5.h), Text( widget?.articles[position]?.viceTitle ?? "", overflow: TextOverflow.ellipsis, - maxLines: 3, + maxLines: 2, style: TextStyle( fontSize: 12.sp, fontWeight: MyFontWeight.regular, @@ -132,7 +132,7 @@ class _ArticleList extends State { ), ), ), - SizedBox(width: 8), + SizedBox(width: 8.w), Image.asset( "assets/image/browse.webp", width: 14, diff --git a/lib/home/guide_page.dart b/lib/home/guide_page.dart index 32a6031a..016d9711 100644 --- a/lib/home/guide_page.dart +++ b/lib/home/guide_page.dart @@ -309,7 +309,7 @@ class _GuidePage extends State { fit: BoxFit.fill, ), SizedBox( - height: 66.h, + height: MediaQuery.of(context).size.width >= 650 ? 20.h :66.h, ), Container( alignment: Alignment.center, @@ -323,7 +323,7 @@ class _GuidePage extends State { ), ), SizedBox( - height: 23.h, + height: MediaQuery.of(context).size.width >= 650 ? 15.h :23.h, ), Padding( padding: EdgeInsets.only(left: 52.w, right: 52.w), diff --git a/lib/login/login_page.dart b/lib/login/login_page.dart index 23671846..490debd7 100644 --- a/lib/login/login_page.dart +++ b/lib/login/login_page.dart @@ -1066,7 +1066,7 @@ class _MyLoginPageState extends State with TickerProviderStateMixin { context: context, builder: (BuildContext context) { return SimpleDialog( - titlePadding: EdgeInsets.all(10), + titlePadding: EdgeInsets.all(10.h), backgroundColor: Colors.transparent, elevation: 0, shape: RoundedRectangleBorder( @@ -1079,7 +1079,7 @@ class _MyLoginPageState extends State with TickerProviderStateMixin { Container( alignment: Alignment.center, width: double.infinity, - height: 305.h, + height: MediaQuery.of(context).size.width >= 650 ? 410.h :305.h, padding: EdgeInsets.only(left: 16.w, right: 16.w), decoration: new BoxDecoration( color: Colors.white, @@ -1105,7 +1105,7 @@ class _MyLoginPageState extends State with TickerProviderStateMixin { style: TextStyle( fontWeight: MyFontWeight.medium, fontSize: 14.sp, - height: 1.3.h, + height: 1.2.h, color: Color(0xff727272), ), ), @@ -1124,14 +1124,14 @@ class _MyLoginPageState extends State with TickerProviderStateMixin { ]), ), SizedBox( - height: 10.h, + height: 5.h, ), Text( S.of(context).yinsizhengce2, style: TextStyle( color: Color(0xff727272), fontSize: 14.sp, - height: 1.3.h, + height: 1.2.h, fontWeight: MyFontWeight.medium, ), ), @@ -1155,8 +1155,8 @@ class _MyLoginPageState extends State with TickerProviderStateMixin { margin: EdgeInsets.only(bottom: 20.h), child: BorderText( padding: EdgeInsets.only( - top: 10.h, - bottom: 10.h, + top: 5.h, + bottom: 5.h, left: 36.w, right: 36.w, ), @@ -1192,8 +1192,8 @@ class _MyLoginPageState extends State with TickerProviderStateMixin { ); }, padding: EdgeInsets.only( - top: 10.h, - bottom: 10.h, + top: 5.h, + bottom: 5.h, left: 21.5.w, right: 21.5.w, ), diff --git a/lib/mine/mine_view/mine_view.dart b/lib/mine/mine_view/mine_view.dart index 6a913b82..125ed7dc 100644 --- a/lib/mine/mine_view/mine_view.dart +++ b/lib/mine/mine_view/mine_view.dart @@ -239,7 +239,7 @@ class _MineView extends State { ? S.of(context).denglu : "${widget.userInfo.nickname}", style: TextStyle( - fontSize: 16.sp, + fontSize: MediaQuery.of(context).size.width >= 650 ? 14.sp :16.sp, fontWeight: FontWeight.bold, color: Color(0xFF353535), ), @@ -267,7 +267,7 @@ class _MineView extends State { ? "" : "我的积分:${widget.userInfo.points}", style: TextStyle( - fontSize: 12.sp, + fontSize: MediaQuery.of(context).size.width >= 650 ? 10.sp :12.sp, fontWeight: MyFontWeight.regular, color: Color(0xFF2F2F2F), ), diff --git a/lib/retrofit/min_api.dart b/lib/retrofit/min_api.dart index ebe58ba5..33adbca6 100644 --- a/lib/retrofit/min_api.dart +++ b/lib/retrofit/min_api.dart @@ -32,7 +32,7 @@ part 'min_api.g.dart'; // const base_url = "http://192.168.10.37:8766/app/"; -const localBaseUrl = "http://192.168.10.236:8766/app/";///本地 +const localBaseUrl = "https://pos.api.lotus-wallet.com/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 65a3ccda..751209d3 100644 --- a/lib/retrofit/retrofit_api.dart +++ b/lib/retrofit/retrofit_api.dart @@ -68,7 +68,7 @@ part 'retrofit_api.g.dart'; // const base_url = "http://192.168.10.132:8766/app/";///詹云久 -const localBaseUrl = "http://192.168.10.236:8766/app/";///本地 +const localBaseUrl = "https://pos.platform.lotus-wallet.com/app/";///本地 const serviceBaseUrl = "https://pos.platform.lotus-wallet.com/app/";///线上 @RestApi(baseUrl: localBaseUrl) diff --git a/lib/store/store_order.dart b/lib/store/store_order.dart index abd6ae69..57f22673 100644 --- a/lib/store/store_order.dart +++ b/lib/store/store_order.dart @@ -257,8 +257,8 @@ class _StoreOrderPage extends State height: double.infinity, color: Colors.transparent, alignment: Alignment.centerRight, - margin: EdgeInsets.only(left: 10), - padding: EdgeInsets.all(10), + margin: EdgeInsets.only(left: 10.w), + padding: EdgeInsets.all(10.h), child: Icon( Icons.arrow_back_ios, color: Colors.black, @@ -315,7 +315,7 @@ class _StoreOrderPage extends State if (storeInfo == null || storeInfo.couponVOList == null) SizedBox( - height: 8, + height: 8.h, ), ///门店对应VIP信息 @@ -323,7 +323,7 @@ class _StoreOrderPage extends State ], ), ), - top:105.h, + top:MediaQuery.of(context).size.width >= 650 ? 80.h :105.h, bottom: 0, left: 0, right: 0, @@ -338,7 +338,7 @@ class _StoreOrderPage extends State bottom: PreferredSize( preferredSize: Size( MediaQuery.of(context).size.width, - 38, + 38.h, ), child: Container( padding: EdgeInsets.symmetric(horizontal: 10.w), @@ -355,12 +355,12 @@ class _StoreOrderPage extends State ), indicatorSize: TabBarIndicatorSize.label, unselectedLabelStyle: TextStyle( - fontSize: 15.sp, + fontSize: MediaQuery.of(context).size.width >= 650 ? 10.sp : 15.sp, fontWeight: FontWeight.w400, ), labelStyle: TextStyle( color: Colors.black, - fontSize: 18.sp, + fontSize: MediaQuery.of(context).size.width >= 650 ? 12.sp :18.sp, fontWeight: FontWeight.bold, ), labelColor: Colors.black, @@ -477,8 +477,8 @@ class _StoreOrderPage extends State right: 15, top: 14, child: RoundButton( - width: 17, - height: 17, + width: 17.w, + height: 17.h, text: "${count()}", textColor: Colors.white, fontWeight: MyFontWeight.regular, @@ -966,7 +966,7 @@ class _Title extends State { @override Widget build(BuildContext context) { return Container( - margin: EdgeInsets.only(bottom: 38), + margin: EdgeInsets.only(bottom: 38.h), child: Text( widget.title ?? "", style: TextStyle( diff --git a/lib/store/store_view/store_info.dart b/lib/store/store_view/store_info.dart index 97fa5013..99e9d57b 100644 --- a/lib/store/store_view/store_info.dart +++ b/lib/store/store_view/store_info.dart @@ -30,7 +30,7 @@ class _StoreInfoView extends State<StoreInfoView> { top: 5.h, bottom: 6.h, ), - height: 154.h, + height: MediaQuery.of(context).size.width >= 650 ? 180.h :154.h, padding: EdgeInsets.all(12.w), decoration: BoxDecoration( color: Colors.white, @@ -123,7 +123,7 @@ class _StoreInfoView extends State<StoreInfoView> { ), Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, - crossAxisAlignment: CrossAxisAlignment.end, + crossAxisAlignment: CrossAxisAlignment.center, children: [ Expanded( child: Text( diff --git a/lib/union/union_view/union_coupon.dart b/lib/union/union_view/union_coupon.dart index ea545bfa..0daa0d1c 100644 --- a/lib/union/union_view/union_coupon.dart +++ b/lib/union/union_view/union_coupon.dart @@ -62,7 +62,7 @@ class _UnionCoupon extends State<UnionCoupon> { Widget buildCoupon() { return Container( - height: 109.h, + height: 116.h, child: ListView.builder( itemCount: (widget.storeInfo != null && widget.storeInfo.couponVOList != null) ? widget.storeInfo.couponVOList.length @@ -258,7 +258,7 @@ class _UnionCoupon extends State<UnionCoupon> { ? Colors.grey : Color(0xFF32A060), padding: EdgeInsets.symmetric( - horizontal: 8.w, vertical: 4.h), + horizontal: 8.w, vertical:2.h), fontSize: 12.sp, ), ),