diff --git a/assets/image/2x/welfare_zx.webp b/assets/image/2x/welfare_zx.webp index a8fb64d7..41d6d4ce 100644 Binary files a/assets/image/2x/welfare_zx.webp and b/assets/image/2x/welfare_zx.webp differ diff --git a/assets/image/2x/welfare_zx_tu.webp b/assets/image/2x/welfare_zx_tu.webp new file mode 100644 index 00000000..128289e5 Binary files /dev/null and b/assets/image/2x/welfare_zx_tu.webp differ diff --git a/assets/image/3x/welfare_zx.webp b/assets/image/3x/welfare_zx.webp index 17365d1f..6ce35e18 100644 Binary files a/assets/image/3x/welfare_zx.webp and b/assets/image/3x/welfare_zx.webp differ diff --git a/assets/image/3x/welfare_zx_tu.webp b/assets/image/3x/welfare_zx_tu.webp new file mode 100644 index 00000000..47f64af0 Binary files /dev/null and b/assets/image/3x/welfare_zx_tu.webp differ diff --git a/assets/image/welfare_zx.webp b/assets/image/welfare_zx.webp index c2fabcd7..35d82651 100644 Binary files a/assets/image/welfare_zx.webp and b/assets/image/welfare_zx.webp differ diff --git a/assets/image/welfare_zx_tu.webp b/assets/image/welfare_zx_tu.webp new file mode 100644 index 00000000..2a50cdeb Binary files /dev/null and b/assets/image/welfare_zx_tu.webp differ diff --git a/lib/home/home_page.dart b/lib/home/home_page.dart index 0ac92a81..d344a6df 100644 --- a/lib/home/home_page.dart +++ b/lib/home/home_page.dart @@ -21,6 +21,7 @@ import 'package:huixiang/retrofit/data/article.dart'; import 'package:huixiang/retrofit/data/banner.dart'; import 'package:huixiang/retrofit/data/base_data.dart'; import 'package:huixiang/retrofit/data/brand.dart'; +import 'package:huixiang/retrofit/data/coupon.dart'; import 'package:huixiang/retrofit/data/founder.dart'; import 'package:huixiang/retrofit/data/goods.dart'; import 'package:huixiang/retrofit/data/goods_category.dart'; @@ -71,6 +72,7 @@ class HomePageState extends State with AutomaticKeepAliveClientMixin { }); queryMsgStats(); queryActivity(); + queryCoupon(); if ((widget.invite ?? "") != "" || widget.interviewCouponList != null && @@ -142,6 +144,8 @@ class HomePageState extends State with AutomaticKeepAliveClientMixin { Founder founder; bool isSigned = false; int totalMsg = 0; + List coupons = []; + int state = 1; queryHome() async { // EasyLoading.show(status: S.of(context).zhengzaijiazai); @@ -329,9 +333,46 @@ class HomePageState extends State with AutomaticKeepAliveClientMixin { } } + queryCoupon() async { + if (apiService == null) { + SharedPreferences value = await SharedPreferences.getInstance(); + apiService = ApiService( + Dio(), + context: context, + token: value.getString("token"), + ); + } + BaseData> baseData = await apiService.queryCoupon({ + "centre": true, + "pageNum": pageNum, + "pageSize": 10, + "searchKey": "", + "state": 0 + }).catchError((onError) { + refreshController.refreshFailed(); + refreshController.loadFailed(); + }); + if (pageNum == 1) coupons.clear(); + if (baseData != null && baseData.isSuccess) { + coupons.addAll(baseData.data.list); + refreshController.refreshCompleted(); + refreshController.loadComplete(); + if (baseData.data.pageNum == baseData.data.pages) { + refreshController.loadNoData(); + } else { + pageNum += 1; + } + setState(() {}); + } else { + refreshController.refreshFailed(); + refreshController.loadFailed(); + } + } + _onRefresh(){ queryHome(); queryMsgStats(); + queryCoupon(); } @override @@ -465,7 +506,7 @@ class HomePageState extends State with AutomaticKeepAliveClientMixin { // }), ///特惠专区 - DiscountZone(), + DiscountZone(coupons), ///推荐商品展示 HomeRecommendGoods(), diff --git a/lib/home/home_view/discount_zone.dart b/lib/home/home_view/discount_zone.dart index ec0a974b..81485dda 100644 --- a/lib/home/home_view/discount_zone.dart +++ b/lib/home/home_view/discount_zone.dart @@ -1,12 +1,20 @@ import 'package:dio/dio.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'package:huixiang/generated/l10n.dart'; +import 'package:huixiang/retrofit/data/coupon.dart'; import 'package:huixiang/retrofit/retrofit_api.dart'; import 'package:huixiang/utils/font_weight.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:huixiang/view_widget/classic_header.dart'; import 'package:huixiang/view_widget/item_title.dart'; +import 'package:huixiang/view_widget/my_footer.dart'; +import 'package:pull_to_refresh/pull_to_refresh.dart'; class DiscountZone extends StatefulWidget { + final List coupon; + + DiscountZone(this.coupon); @override State createState() { return _DiscountZone(); @@ -19,6 +27,7 @@ class _DiscountZone extends State { @override void initState() { super.initState(); + } @override @@ -30,22 +39,44 @@ class _DiscountZone extends State { crossAxisAlignment: CrossAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start, children: [ - ItemTitle( - text: "特惠专区", - ), + Padding(padding:EdgeInsets.symmetric(horizontal: 14.w), + child: Row( + children: [ + Expanded(child: + Text( + "特惠专区", + style: TextStyle( + color: Color(0xFF0D0D0D), + fontSize: 15.sp, + fontWeight: FontWeight.bold, + ), + )), + GestureDetector( + onTap: (){ + Navigator.of(context).pushNamed('/router/welfare_page'); + }, + child: Text( + "更多好券", + style: TextStyle( + color: Color(0xFF4D4D4D), + fontSize: 12.sp, + fontWeight: MyFontWeight.regular, + ), + ), + ) + ], + ),), Container( - height: 91.h, - margin: EdgeInsets.only(top: 14,left: 14.w), + height: 91, + margin: EdgeInsets.only(top: 10), child: ListView.builder( scrollDirection: Axis.horizontal, physics: BouncingScrollPhysics(), - itemCount: 6, + padding: EdgeInsets.symmetric(horizontal: 10), itemBuilder: (context, position) { - return GestureDetector( - onTap: () {}, - child: discountItem(), - ); + return discountItem(widget.coupon[position]); }, + itemCount:widget.coupon.length, ), ), ], @@ -53,9 +84,9 @@ class _DiscountZone extends State { ); } - Widget discountItem() { + Widget discountItem(Coupon coupon) { return Container( - width: 246.w, + width: 300.w, height: 91.h, decoration: BoxDecoration( image: DecorationImage( @@ -63,79 +94,232 @@ class _DiscountZone extends State { image: AssetImage("assets/image/discount.webp"), ), ), - padding: EdgeInsets.symmetric(horizontal: 12.w, vertical: 15.h), margin: EdgeInsets.only(right: 6.w), child: Row( mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, children: [ - Column( - children: [ - Text.rich( - TextSpan( + Expanded( + flex: 1, + child:Container( + margin: EdgeInsets.only(top: 12,bottom: 12), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, children: [ - TextSpan( - text: "¥", - style: TextStyle( - fontSize: 12.sp, - fontWeight: MyFontWeight.semi_bold, - color: Color(0xFF32A060), - ), - ), - TextSpan( - text: "30", - style: TextStyle( - fontSize: 30.sp, - fontWeight: MyFontWeight.semi_bold, - color: Color(0xFF32A060), - ), - ), + Expanded(child: Container( + child:discountWidget(coupon), + )), ], ), - ), + )), + Expanded( + flex: 2, + child: Container( + margin: EdgeInsets.only(top: 12,left:35,bottom: 12), + child: Column( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Expanded(child: + Text( + coupon != null ? coupon.couponName ?? "" : "", + maxLines: 1, + overflow: TextOverflow.ellipsis, + style: TextStyle( + fontSize: 14.sp, + fontWeight: MyFontWeight.semi_bold, + color: Color(0xFF0D0D0D), + ), + ),), + Spacer(), + SizedBox(height:5), + Expanded(child: + (coupon.useStartTime == null && + coupon.useEndTime == null)? + Text( + S.of(context).quantian, + maxLines: 1, + overflow: TextOverflow.ellipsis, + style: TextStyle( + fontSize: 12.sp, + fontWeight: MyFontWeight.regular, + color: Color(0xFF4D4D4D), + ), + ):Text( + "有效期至 ${coupon.useEndTime.substring(0, coupon.useEndTime.indexOf(" "))}", + maxLines:1, + overflow: TextOverflow.ellipsis, + style: TextStyle( + fontSize: 12.sp, + fontWeight: MyFontWeight.regular, + color: Color(0xFF4D4D4D), + ), + )), + ], + ), + )), + ], + ) + ); + } + + Widget discountWidget(Coupon coupon) { + if (coupon.bizType == 1) { + return Column( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.baseline, + textBaseline: TextBaseline.alphabetic, + children: [ Text( - "满30.1可用", + "¥", style: TextStyle( fontSize: 12.sp, - fontWeight: MyFontWeight.regular, - color: Color(0xFF32A060), + fontWeight: MyFontWeight.medium, + color: coupon.status == 3 ? Color(0xFFB3B3B3):Color(0xff32A060), ), ), - ], - ), - Spacer(), - Column( - mainAxisAlignment: MainAxisAlignment.start, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ + SizedBox( + height: 4.h, + ), Text( - "百年川椒(哈乐城店)", + coupon != null + ? double.tryParse("${coupon.discountAmount}" ?? "0") + .toInt() + .toString() + : "", style: TextStyle( - fontSize: 14.sp, - fontWeight: MyFontWeight.bold, - color: Color(0xFF0D0D0D), + fontSize: 30.sp, + fontWeight: MyFontWeight.semi_bold, + color: coupon.status == 3 ? Color(0xFFB3B3B3):Color(0xff32A060), ), ), + ], + ), + Text( + S.of(context).manyuankeyong(coupon != null + ? ("${coupon.fullAmount}" ?? "0") + .toString() + : ""), + style: TextStyle( + fontSize: 12.sp, + fontWeight: MyFontWeight.semi_bold, + color: coupon.status == 3 ? Color(0xFFB3B3B3):Color(0xff32A060), + ), + ), + ], + ); + } else if (coupon.bizType == 3) { + return Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Container( + padding: EdgeInsets.only(bottom:10,top: 7), + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + S.of(context).duihuanquan, + style: TextStyle( + fontSize: 26.sp, + fontWeight: MyFontWeight.semi_bold, + color: coupon.status == 3 ? Color(0xFFB3B3B3):Color(0xff32A060), + ), + ), + ], + ), + ), + Text( + S.of(context).xianshangshiyong, + style: TextStyle( + fontSize: 12.sp, + fontWeight: MyFontWeight.semi_bold, + color: coupon.status == 3 ? Color(0xFFB3B3B3):Color(0xff32A060), + ), + ), + ], + ); + } else if (coupon.bizType == 5) { + return Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Container( + padding: EdgeInsets.only(bottom:10,top: 7), + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + S.of(context).duihuanquan, + style: TextStyle( + fontSize: 30.sp, + fontWeight: MyFontWeight.semi_bold, + color: coupon.status == 3 ? Color(0xFFB3B3B3):Color(0xff32A060), + ), + ), + ], + ), + ), + Text( + S.of(context).xianxiashiyong, + style: TextStyle( + fontSize: 12.sp, + fontWeight: MyFontWeight.semi_bold, + color: coupon.status == 3 ? Color(0xFFB3B3B3):Color(0xff32A060), + ), + ), + ], + ); + } else { + return Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.baseline, + textBaseline: TextBaseline.alphabetic, + children: [ Text( - "新人满减30元", + coupon != null + ? "${(coupon.discountPercent / 10.0 >= 10) ? 10 : coupon.discountPercent / 10.0}" ?? + "0" + : "", style: TextStyle( - fontSize: 10.sp, - fontWeight: MyFontWeight.regular, - color: Color(0xFF4D4D4D), + fontSize: 30.sp, + fontWeight: MyFontWeight.semi_bold, + color: coupon.status == 3 ? Color(0xFFB3B3B3):Color(0xff32A060), ), ), + SizedBox( + height: 4.h, + ), Text( - "有效期至2022-09-10", + "折", style: TextStyle( - fontSize: 12.sp, - fontWeight: MyFontWeight.regular, - color: Color(0xFF4D4D4D), + fontSize: 20.sp, + fontWeight: MyFontWeight.semi_bold, + color: coupon.status == 3 ? Color(0xFFB3B3B3):Color(0xff32A060), ), ), ], - ) + ), + Text( + S.of(context).quanchangtongyong, + style: TextStyle( + fontSize: 12.sp, + fontWeight: MyFontWeight.semi_bold, + color: coupon.status == 3 ? Color(0xFFB3B3B3):Color(0xff32A060), + ), + ), ], - ), - ); + ); + } } + } diff --git a/lib/home/home_view/home_banner.dart b/lib/home/home_view/home_banner.dart index 6fe50e8d..edae5219 100644 --- a/lib/home/home_view/home_banner.dart +++ b/lib/home/home_view/home_banner.dart @@ -26,7 +26,7 @@ class _HomeBanner extends State { aspectRatio: 1.4, child: Swiper( pagination: SwiperPagination( - margin: EdgeInsets.only(bottom: 20.h), + margin: EdgeInsets.only(bottom: 12.h), alignment: Alignment.bottomCenter, builder: DotSwiperPaginationBuilder( size: 8, diff --git a/lib/home/home_view/welfare_core.dart b/lib/home/home_view/welfare_core.dart index 04c70e43..a62b3b6c 100644 --- a/lib/home/home_view/welfare_core.dart +++ b/lib/home/home_view/welfare_core.dart @@ -58,7 +58,6 @@ class _WelfareCore extends State { ) ], ),), - Container( width: double.infinity, margin: EdgeInsets.only(left:9.w,right: 9.w,top: 16.h,bottom: 12.h), diff --git a/lib/home/welfare_page.dart b/lib/home/welfare_page.dart index 8ad83b7b..d83a7dfd 100644 --- a/lib/home/welfare_page.dart +++ b/lib/home/welfare_page.dart @@ -120,18 +120,18 @@ class _WelfarePage extends State { physics: BouncingScrollPhysics(), scrollController: scrollController, child: Container( - margin: EdgeInsets.only(top: 125.h,left: 14,right: 14), - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(6), - color: Color(0xFFF9FAF7), - ), + margin: EdgeInsets.only(top: 45.h,left: 14,right: 14), child: SingleChildScrollView( physics: BouncingScrollPhysics(), child: FutureBuilder( // future: querySignInfo(), builder: (context, snap) { return Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, children: [ + + weekCoupons(), inviteFriends(), @@ -153,95 +153,137 @@ class _WelfarePage extends State { /// 周券包推荐 Widget weekCoupons() { - return Container( - width: double.infinity, - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(6), - color: Colors.white, - boxShadow: [ - BoxShadow( - color: Color(0x08213303).withAlpha(12), - offset: Offset(0, 2), - blurRadius: 3, - spreadRadius: 0, - ), - ], - ), - // margin: EdgeInsets.only(top: 139.h), - child: Column( - mainAxisAlignment: MainAxisAlignment.start, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Padding( - padding: EdgeInsets.symmetric(horizontal: 12.w,vertical: 16.h), - child: - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Text( - S.of(context).lingquanzhongxin, - style: TextStyle( - color: Color(0xFF0D0D0D), - fontSize: 15.sp, - fontWeight: MyFontWeight.bold, - ), - ), - Text( - "每周上新 ", - style: TextStyle( - color: Color(0xFF4D4D4D), - fontSize: 12.sp, - fontWeight: MyFontWeight.regular, - ), + return Stack( + alignment: Alignment.topRight, + children: [ + Container( + width: double.infinity, + margin: EdgeInsets.only(top: 95), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(6), + color: Colors.white, + boxShadow: [ + BoxShadow( + color: Color(0x08213303).withAlpha(12), + offset: Offset(0, 2), + blurRadius: 3, + spreadRadius: 0, ), ], - )), - AspectRatio( - aspectRatio: 1.22, - child: Swiper( - viewportFraction: 0.9, - scale: 0.7, - pagination: SwiperPagination( - alignment: Alignment.bottomCenter, - builder: DotSwiperPaginationBuilder( - size: 8, - activeSize: 8, - space: 5, - activeColor: Colors.black, - color: Colors.black.withAlpha(76), - ), - ), - physics: BouncingScrollPhysics(), - itemBuilder: (context, position) { - return Column( + ), + // margin: EdgeInsets.only(top: 139.h), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Padding( + padding: EdgeInsets.symmetric(horizontal: 12.w,vertical: 16.h), + child: + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: CrossAxisAlignment.center, children: [ - Container( - // height: 84.h, - // child: ListView.builder( - // scrollDirection: Axis.horizontal, - // physics: BouncingScrollPhysics(), - // padding: EdgeInsets.symmetric(horizontal: 12), - // itemCount:3, - // itemBuilder: (context, index) { - // return GestureDetector( - // onTap: () { - // - // }, - // child: weekItem(), - // ); - // }, - // ), - child: weekItem(), + Text( + S.of(context).lingquanzhongxin, + style: TextStyle( + color: Color(0xFF0D0D0D), + fontSize: 15.sp, + fontWeight: MyFontWeight.bold, + ), + ), + Text( + "每周上新 ", + style: TextStyle( + color: Color(0xFF4D4D4D), + fontSize: 12.sp, + fontWeight: MyFontWeight.regular, + ), ), ], - ); - }, - itemCount:3, - ), - ) - ], - ), + )), + AspectRatio( + aspectRatio: 1.22, + child: Swiper( + viewportFraction: 0.9, + scale: 0.7, + pagination: SwiperPagination( + alignment: Alignment.bottomCenter, + builder: DotSwiperPaginationBuilder( + size: 8, + activeSize: 8, + space: 5, + activeColor: Colors.black, + color: Colors.black.withAlpha(76), + ), + ), + physics: BouncingScrollPhysics(), + itemBuilder: (context, position) { + return Column( + children: [ + Container( + // height: 84.h, + // child: ListView.builder( + // scrollDirection: Axis.horizontal, + // physics: BouncingScrollPhysics(), + // padding: EdgeInsets.symmetric(horizontal: 12), + // itemCount:3, + // itemBuilder: (context, index) { + // return GestureDetector( + // onTap: () { + // + // }, + // child: weekItem(), + // ); + // }, + // ), + child: weekItem(), + ), + ], + ); + }, + itemCount:3, + ), + ) + ], + ) + ), + Row( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Expanded(child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Padding(padding:EdgeInsets.only(top: 12), + child: Text( + "福利周周有，优惠享不停", + style: TextStyle( + fontSize: 20.sp, + fontWeight: MyFontWeight.bold, + color: Color(0xFFFFFFFF), + ), + )), + SizedBox(height: 8,), + Text( + "各种优惠全都有", + style: TextStyle( + fontSize: 14.sp, + fontWeight: MyFontWeight.regular, + color: Color(0xFFFFFFFF), + ), + ), + ], + )), + Image.asset( + "assets/image/welfare_zx_tu.webp", + width:120.w, + height:105.h, + fit: BoxFit.cover, + ) + ], + ), + ], ); } diff --git a/lib/view_widget/new_coupon_widget.dart b/lib/view_widget/new_coupon_widget.dart index 03156b55..0e0c6d54 100644 --- a/lib/view_widget/new_coupon_widget.dart +++ b/lib/view_widget/new_coupon_widget.dart @@ -16,7 +16,7 @@ class NewCouponWidget extends StatelessWidget { @override Widget build(BuildContext context) { - return buildCoupon(context); + return homeCoupon(context); } @@ -408,73 +408,71 @@ class NewCouponWidget extends StatelessWidget { ], ), )), - Expanded( - flex: 2, - child:Container( - margin: EdgeInsets.only(top: 12,left: 12,bottom: 12), - child: Column( - mainAxisAlignment: MainAxisAlignment.start, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Expanded(child: - Text( - coupon != null ? coupon.couponName ?? "" : "", - maxLines: 1, - overflow: TextOverflow.ellipsis, - style: TextStyle( - fontSize: 14.sp, - fontWeight: MyFontWeight.semi_bold, - color: Color(0xFF353535), - ), - )), - Expanded(child: - (coupon.useStartTime == null && - coupon.useEndTime == null)? - Text( - S.of(context).quantian, - maxLines: 1, - overflow: TextOverflow.ellipsis, - style: TextStyle( - fontSize: 12.sp, - fontWeight: MyFontWeight.regular, - color: coupon.status == 3 ? Color(0xFFB3B3B3) :Color(0xFF4D4D4D), - ), - ):Text( - "有效期至 ${coupon?.useEndTime ?? ""}", - maxLines:1, - overflow: TextOverflow.ellipsis, - style: TextStyle( - fontSize: 12.sp, - fontWeight: MyFontWeight.regular, - color: coupon.status == 3 ? Color(0xFFB3B3B3) :Color(0xFF4D4D4D), - ), - )), - GestureDetector( - onTap: (){ - // showDeleteDialog(); + Container( + margin: EdgeInsets.only(top: 12,left: 12,bottom: 12), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Expanded(child: + Text( + coupon != null ? coupon.couponName ?? "" : "", + maxLines: 1, + overflow: TextOverflow.ellipsis, + style: TextStyle( + fontSize: 14.sp, + fontWeight: MyFontWeight.semi_bold, + color: Color(0xFF353535), + ), + )), + Expanded(child: + (coupon.useStartTime == null && + coupon.useEndTime == null)? + Text( + S.of(context).quantian, + maxLines: 1, + overflow: TextOverflow.ellipsis, + style: TextStyle( + fontSize: 12.sp, + fontWeight: MyFontWeight.regular, + color: coupon.status == 3 ? Color(0xFFB3B3B3) :Color(0xFF4D4D4D), + ), + ):Text( + "有效期至 ${coupon?.useEndTime ?? ""}", + maxLines:1, + overflow: TextOverflow.ellipsis, + style: TextStyle( + fontSize: 12.sp, + fontWeight: MyFontWeight.regular, + color: coupon.status == 3 ? Color(0xFFB3B3B3) :Color(0xFF4D4D4D), + ), + )), + GestureDetector( + onTap: (){ + // showDeleteDialog(); - }, - child: Row( - children: [ - Text( - "使用详情", - style: TextStyle( - fontSize: 12.sp, - fontWeight: MyFontWeight.regular, - color: coupon.status == 3 ? Color(0xFFB3B3B3):Color(0xFF4D4D4D), - ), - ), - Icon( - Icons.keyboard_arrow_right, - color: coupon.status == 3 ? Color(0xFFB3B3B3) :Color(0xFF4D4D4D), - size: 20, - ) - ], + }, + child: Row( + children: [ + Text( + "使用详情", + style: TextStyle( + fontSize: 12.sp, + fontWeight: MyFontWeight.regular, + color: coupon.status == 3 ? Color(0xFFB3B3B3):Color(0xFF4D4D4D), + ), ), - ) - ], - ), - )), + Icon( + Icons.keyboard_arrow_right, + color: coupon.status == 3 ? Color(0xFFB3B3B3) :Color(0xFF4D4D4D), + size: 20, + ) + ], + ), + ) + ], + ), + ), Column( mainAxisAlignment: MainAxisAlignment.end, crossAxisAlignment: CrossAxisAlignment.end, @@ -583,7 +581,7 @@ class NewCouponWidget extends StatelessWidget { Text( S.of(context).duihuanquan, style: TextStyle( - fontSize: 26.sp, + fontSize: 30.sp, fontWeight: MyFontWeight.semi_bold, color: coupon.status == 3 ? Color(0xFFB3B3B3):Color(0xff32A060), ), @@ -617,7 +615,7 @@ class NewCouponWidget extends StatelessWidget { "0" : "", style: TextStyle( - fontSize: 40.sp, + fontSize: 30.sp, fontWeight: MyFontWeight.semi_bold, color: coupon.status == 3 ? Color(0xFFB3B3B3):Color(0xff32A060), ), @@ -628,7 +626,7 @@ class NewCouponWidget extends StatelessWidget { Text( "折", style: TextStyle( - fontSize: 20.sp, + fontSize: 16.sp, fontWeight: MyFontWeight.semi_bold, color: coupon.status == 3 ? Color(0xFFB3B3B3):Color(0xff32A060), ),