diff --git a/assets/image/2x/invite_1.webp b/assets/image/2x/invite_1.webp new file mode 100644 index 00000000..abeb38e5 Binary files /dev/null and b/assets/image/2x/invite_1.webp differ diff --git a/assets/image/2x/invite_2.webp b/assets/image/2x/invite_2.webp new file mode 100644 index 00000000..4c57442c Binary files /dev/null and b/assets/image/2x/invite_2.webp differ diff --git a/assets/image/2x/invite_3.webp b/assets/image/2x/invite_3.webp new file mode 100644 index 00000000..446c5fff Binary files /dev/null and b/assets/image/2x/invite_3.webp differ diff --git a/assets/image/2x/invite_4.webp b/assets/image/2x/invite_4.webp new file mode 100644 index 00000000..fb9d316a Binary files /dev/null and b/assets/image/2x/invite_4.webp differ diff --git a/assets/image/2x/invite_friends.webp b/assets/image/2x/invite_friends.webp index 81a73b6d..f87005cc 100644 Binary files a/assets/image/2x/invite_friends.webp and b/assets/image/2x/invite_friends.webp differ diff --git a/assets/image/3x/invite_1.webp b/assets/image/3x/invite_1.webp new file mode 100644 index 00000000..1596446a Binary files /dev/null and b/assets/image/3x/invite_1.webp differ diff --git a/assets/image/3x/invite_2.webp b/assets/image/3x/invite_2.webp new file mode 100644 index 00000000..4fb6c070 Binary files /dev/null and b/assets/image/3x/invite_2.webp differ diff --git a/assets/image/3x/invite_3.webp b/assets/image/3x/invite_3.webp new file mode 100644 index 00000000..ce5f47cd Binary files /dev/null and b/assets/image/3x/invite_3.webp differ diff --git a/assets/image/3x/invite_4.webp b/assets/image/3x/invite_4.webp new file mode 100644 index 00000000..d98fca93 Binary files /dev/null and b/assets/image/3x/invite_4.webp differ diff --git a/assets/image/3x/invite_friends.webp b/assets/image/3x/invite_friends.webp index db90f17d..502913da 100644 Binary files a/assets/image/3x/invite_friends.webp and b/assets/image/3x/invite_friends.webp differ diff --git a/assets/image/invite_1.webp b/assets/image/invite_1.webp new file mode 100644 index 00000000..01c95ea8 Binary files /dev/null and b/assets/image/invite_1.webp differ diff --git a/assets/image/invite_2.webp b/assets/image/invite_2.webp new file mode 100644 index 00000000..bf416f1e Binary files /dev/null and b/assets/image/invite_2.webp differ diff --git a/assets/image/invite_3.webp b/assets/image/invite_3.webp new file mode 100644 index 00000000..835d5956 Binary files /dev/null and b/assets/image/invite_3.webp differ diff --git a/assets/image/invite_4.webp b/assets/image/invite_4.webp new file mode 100644 index 00000000..3e4f2803 Binary files /dev/null and b/assets/image/invite_4.webp differ diff --git a/assets/image/invite_friends.webp b/assets/image/invite_friends.webp index 59df5b9a..5a5a6e8e 100644 Binary files a/assets/image/invite_friends.webp and b/assets/image/invite_friends.webp differ diff --git a/lib/qr/invite_friends.dart b/lib/qr/invite_friends.dart index 9b7b6027..fb386973 100644 --- a/lib/qr/invite_friends.dart +++ b/lib/qr/invite_friends.dart @@ -228,7 +228,7 @@ class _InviteFriends extends State { height: 52.h, decoration: BoxDecoration( borderRadius: BorderRadius.circular(26), - color: Color(0xFF00E16F), + color: Color(0xFF32A060), ), margin: EdgeInsets.symmetric(horizontal:14.w), child: Row( @@ -270,6 +270,8 @@ class _InviteFriends extends State { margin: EdgeInsets.only(bottom:12.h,left:14.h,right: 14.h), padding: EdgeInsets.all(6), child:Column( + // mainAxisAlignment: MainAxisAlignment.spaceAround, + crossAxisAlignment: CrossAxisAlignment.start, children: [ Container( decoration: BoxDecoration( @@ -292,21 +294,18 @@ class _InviteFriends extends State { ), SizedBox(height: 17.h,), IntrinsicHeight( - child: - Row( + child: Row( mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center, children: [ Column( - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.center, children: [ Row( mainAxisAlignment: MainAxisAlignment.spaceAround, crossAxisAlignment: CrossAxisAlignment.center, children: [ Image.asset( - "assets/image/zu_tuan.webp", + "assets/image/invite_wx.webp", width: 42, height: 42, fit: BoxFit.cover, @@ -330,6 +329,34 @@ class _InviteFriends extends State { ), ], ), + Row( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Image.asset( + "assets/image/invite_1.webp", + width: 24, + height: 24, + fit: BoxFit.cover, + ), + Container( + width: 43.w, + child: Flex( + children: List.generate(0, (_) { + return SizedBox( + width: 3, + height: 1, + child: DecoratedBox( + decoration: BoxDecoration(color: Colors.white), + ), + ); + }), + mainAxisAlignment: MainAxisAlignment.spaceBetween, + direction: Axis.horizontal, + ), + ), + ], + ), SizedBox(height: 8.h), Row( mainAxisAlignment: MainAxisAlignment.spaceAround, @@ -339,9 +366,10 @@ class _InviteFriends extends State { width:46.w, child: Text( - "1.分享给微信好友", + "分享链接给好友", style: TextStyle( fontSize: 12.sp, + height: 1.3.h, fontWeight: MyFontWeight.regular, color: Color(0xFF181818), ), @@ -374,7 +402,7 @@ class _InviteFriends extends State { crossAxisAlignment: CrossAxisAlignment.center, children: [ Image.asset( - "assets/image/zt_zf.webp", + "assets/image/yq_zt.webp", width: 42, height: 42, fit: BoxFit.cover, @@ -398,6 +426,34 @@ class _InviteFriends extends State { ), ], ), + Row( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Image.asset( + "assets/image/invite_2.webp", + width: 24, + height: 24, + fit: BoxFit.cover, + ), + Container( + width: 43.w, + child: Flex( + children: List.generate(0, (_) { + return SizedBox( + width: 3, + height: 1, + child: DecoratedBox( + decoration: BoxDecoration(color: Colors.white), + ), + ); + }), + mainAxisAlignment: MainAxisAlignment.spaceBetween, + direction: Axis.horizontal, + ), + ), + ], + ), SizedBox(height: 8.h), Row( mainAxisAlignment: MainAxisAlignment.spaceAround, @@ -407,9 +463,10 @@ class _InviteFriends extends State { width:46.w, child: Text( - "2.好友注册", + "好友注册并获得10元优惠券", style: TextStyle( fontSize: 12.sp, + height: 1.3.h, fontWeight: MyFontWeight.regular, color: Color(0xFF181818), ), @@ -442,7 +499,7 @@ class _InviteFriends extends State { crossAxisAlignment: CrossAxisAlignment.center, children: [ Image.asset( - "assets/image/yq_zt.webp", + "assets/image/zt_m.webp", width: 42, height: 42, fit: BoxFit.cover, @@ -466,19 +523,47 @@ class _InviteFriends extends State { ), ], ), + Row( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Image.asset( + "assets/image/invite_3.webp", + width: 24, + height: 24, + fit: BoxFit.cover, + ), + Container( + width: 43.w, + child: Flex( + children: List.generate(0, (_) { + return SizedBox( + width: 3, + height: 1, + child: DecoratedBox( + decoration: BoxDecoration(color: Colors.white), + ), + ); + }), + mainAxisAlignment: MainAxisAlignment.spaceBetween, + direction: Axis.horizontal, + ), + ), + ], + ), SizedBox(height: 8.h), Row( - mainAxisAlignment: MainAxisAlignment.spaceAround, + mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center, children: [ - Container( width: 46.w, child: Text( - "3.邀请完成", + "好友完成首单", style: TextStyle( fontSize: 12.sp, + height: 1.3.h, fontWeight: MyFontWeight.regular, color: Color(0xFF181818), ), @@ -507,19 +592,26 @@ class _InviteFriends extends State { Column( children: [ Image.asset( - "assets/image/zt_m.webp", + "assets/image/invite_q.webp", width: 42, height: 42, fit: BoxFit.cover, ), + Image.asset( + "assets/image/invite_4.webp", + width: 24, + height: 24, + fit: BoxFit.cover, + ), SizedBox(height: 8.h), Container( width: 46.w, child: Text( - "4.获得优惠券", + "邀请达成获得奖励", style: TextStyle( fontSize: 12.sp, + height: 1.3.h, fontWeight: MyFontWeight.regular, color: Color(0xFF181818), ), @@ -654,27 +746,29 @@ class _InviteFriends extends State { ) ), SizedBox(height:12.h,), + Padding(padding:EdgeInsets.symmetric(horizontal: 6.w), + child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, crossAxisAlignment: CrossAxisAlignment.start, children: [ - Text( - S.of(context).shoujihao, - style: TextStyle( - fontWeight: MyFontWeight.semi_bold, - fontSize:14.sp, - color: Color(0xFF000000), + Text( + S.of(context).shoujihao, + style: TextStyle( + fontWeight: MyFontWeight.semi_bold, + fontSize:14.sp, + color: Color(0xFF000000), + ), ), - ), - Text( - S.of(context).jiangli, - style: TextStyle( - fontWeight: MyFontWeight.semi_bold, - fontSize:14.sp, - color: Color(0xFF000000), + Text( + "注册时间", + style: TextStyle( + fontWeight: MyFontWeight.semi_bold, + fontSize:14.sp, + color: Color(0xFF000000), + ), ), - ), - ],), + ],),), SizedBox(height:12.h,), (invitationList.length == null || invitationList.length == 0) ? NoDataView( @@ -710,35 +804,20 @@ class _InviteFriends extends State { mainAxisAlignment: MainAxisAlignment.spaceBetween, crossAxisAlignment: CrossAxisAlignment.center, children: [ - Column( - mainAxisAlignment: MainAxisAlignment.start, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - AppUtils.phoneEncode(invitationList?.phone ?? ""), - style: TextStyle( - color: Color(0xFF000000), - fontSize: 12.sp, - fontWeight: MyFontWeight.regular, - ), - ), - SizedBox(height:8), - Text( - "注册时间:${invitationList?.createTime ?? ""}", - style: TextStyle( - color: Color(0xFF000000), - fontSize: 12.sp, - fontWeight: MyFontWeight.regular, - ), - ), - ], + Text( + AppUtils.phoneEncode(invitationList?.phone ?? ""), + style: TextStyle( + color: Color(0xFF000000), + fontSize: 12.sp, + fontWeight: MyFontWeight.regular, ), + ), Text( - "新人全场减30优惠券*1", + invitationList?.createTime ?? "", style: TextStyle( - color: Color(0xFF353535), + color: Color(0xFF000000), fontSize: 12.sp, - fontWeight: MyFontWeight.medium, + fontWeight: MyFontWeight.regular, ), ), ], diff --git a/lib/retrofit/data/activity_details.dart b/lib/retrofit/data/activity_details.dart index cdab41cd..a3484ecf 100644 --- a/lib/retrofit/data/activity_details.dart +++ b/lib/retrofit/data/activity_details.dart @@ -469,6 +469,7 @@ class ActProduct { String shortName, String supplierName, String detail, + String details, String rightImg, }) { _id = id; @@ -491,6 +492,7 @@ class ActProduct { _shortName = shortName; _supplierName =supplierName; _detail = detail; + _details = details; _rightImg = rightImg; } @@ -520,6 +522,7 @@ class ActProduct { _shortName = json['shortName']; _supplierName = json['supplierName']; _detail = json['detail']; + _details = json['details']; _rightImg = json['rightImg']; } @@ -543,6 +546,7 @@ class ActProduct { String _shortName; String _supplierName; String _detail; + String _details; String _rightImg; String get id => _id; @@ -585,6 +589,8 @@ class ActProduct { String get detail => _detail; + String get details => _details; + String get rightImg => _rightImg; Map toJson() { @@ -611,6 +617,7 @@ class ActProduct { map['shortName'] = _shortName; map['supplierName'] = _supplierName; map['detail'] = _detail; + map['details'] = _details; map['rightImg'] = _rightImg; return map; } diff --git a/lib/retrofit/data/brand_data.dart b/lib/retrofit/data/brand_data.dart index c88e21ea..8c83d645 100644 --- a/lib/retrofit/data/brand_data.dart +++ b/lib/retrofit/data/brand_data.dart @@ -11,6 +11,7 @@ class BrandData { String originAvatar; String originDesc; String originator; + bool inviteNewShow; dynamic contents; dynamic ideals; @@ -24,6 +25,7 @@ class BrandData { ..originAvatar = json['originAvatar'] as String ..originDesc = json['originDesc'] as String ..originator = json['originator'] as String + ..inviteNewShow = json['inviteNewShow'] as bool ..contents = json['contents'] ..ideals = json['ideals']; @@ -34,6 +36,7 @@ class BrandData { 'originAvatar': this.originAvatar, 'originDesc': this.originDesc, 'originator': this.originator, + 'inviteNewShow': this.inviteNewShow, 'contents': this.contents, 'ideals': this.ideals, }; diff --git a/lib/retrofit/data/miNiDetail.dart b/lib/retrofit/data/miNiDetail.dart index 65f600fa..5c2e24bc 100644 --- a/lib/retrofit/data/miNiDetail.dart +++ b/lib/retrofit/data/miNiDetail.dart @@ -69,6 +69,7 @@ class MiNiDetail { int setMeal; int attrStyle; String detail; + String details; int isDelete; String printerFlag; String thumbnailImg; @@ -117,6 +118,7 @@ class MiNiDetail { miNiDetailBean.setMeal = map['setMeal']; miNiDetailBean.attrStyle = map['attrStyle']; miNiDetailBean.detail = map['detail']; + miNiDetailBean.details = map['details']; miNiDetailBean.isDelete = map['isDelete']; miNiDetailBean.printerFlag = map['printerFlag']; miNiDetailBean.thumbnailImg = map['thumbnailImg']; @@ -171,6 +173,7 @@ class MiNiDetail { "setMeal": setMeal, "attrStyle": attrStyle, "detail" :detail, + "details" :details, "isDelete": isDelete, "printerFlag": printerFlag, "thumbnailImg": thumbnailImg, diff --git a/lib/store/shop__details_page.dart b/lib/store/shop__details_page.dart index 9120e6c5..3c790402 100644 --- a/lib/store/shop__details_page.dart +++ b/lib/store/shop__details_page.dart @@ -593,7 +593,7 @@ class _ShopDetailsPage extends State { Container( color: Colors.white, child: Html( - data: miNiDetail?.detail ?? "", + data: miNiDetail?.details ?? "", customImageRenders: { networkSourceMatcher(): networkImageRender( loadingWidget: () { diff --git a/lib/store/shopping/shopping_goods_details.dart b/lib/store/shopping/shopping_goods_details.dart index 77fc765c..e5048f4b 100644 --- a/lib/store/shopping/shopping_goods_details.dart +++ b/lib/store/shopping/shopping_goods_details.dart @@ -565,8 +565,8 @@ class _ShoppingGoodsDetails extends State { margin: EdgeInsets.only(bottom: 72.h), child: Html( data: pageType != null - ? (activityDetails?.actProduct?.detail ?? "") - : (miNiDetail?.detail ?? ""), + ? (activityDetails?.actProduct?.details ?? "") + : (miNiDetail?.details ?? ""), customImageRenders: { networkSourceMatcher(): networkImageRender( loadingWidget: () { diff --git a/lib/store/shopping/shopping_home/group_details.dart b/lib/store/shopping/shopping_home/group_details.dart index 1cf35346..229d064a 100644 --- a/lib/store/shopping/shopping_home/group_details.dart +++ b/lib/store/shopping/shopping_home/group_details.dart @@ -736,269 +736,271 @@ class _GroupDetails extends State { ), ), SizedBox(height: 12.h), - Row( - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Column( - children: [ - Row( - mainAxisAlignment: MainAxisAlignment.spaceAround, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Image.asset( - "assets/image/zu_tuan.webp", - width: 42, - height: 42, - fit: BoxFit.cover, - ), - Container( - width: 45, - child: Flex( - children: List.generate(8, (_) { - return SizedBox( - width: 3, - height: 1, - child: DecoratedBox( - decoration: - BoxDecoration(color: Color(0xFF32A060)), - ), - ); - }), - mainAxisAlignment: MainAxisAlignment.spaceBetween, - direction: Axis.horizontal, + IntrinsicHeight( + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Column( + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.spaceAround, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Image.asset( + "assets/image/zu_tuan.webp", + width: 42, + height: 42, + fit: BoxFit.cover, ), - ), - ], - ), - SizedBox(height: 8.h), - Row( - mainAxisAlignment: MainAxisAlignment.spaceAround, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Column( - children: [ - Text( - "开团/参团", - style: TextStyle( - fontSize: 12.sp, - fontWeight: MyFontWeight.regular, - color: Color(0xFF181818), - ), + Container( + width: 45, + child: Flex( + children: List.generate(8, (_) { + return SizedBox( + width: 3, + height: 1, + child: DecoratedBox( + decoration: + BoxDecoration(color: Color(0xFF32A060)), + ), + ); + }), + mainAxisAlignment: MainAxisAlignment.spaceBetween, + direction: Axis.horizontal, ), - Text( - "拼团享低价", - style: TextStyle( - fontSize: 10.sp, - fontWeight: MyFontWeight.regular, - color: Color(0xFF5F5F5F), + ), + ], + ), + SizedBox(height: 8.h), + Row( + mainAxisAlignment: MainAxisAlignment.spaceAround, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Column( + children: [ + Text( + "开团/参团", + style: TextStyle( + fontSize: 12.sp, + fontWeight: MyFontWeight.regular, + color: Color(0xFF181818), + ), ), - ), - ], - ), - Container( - width: 35, - child: Flex( - children: List.generate(0, (_) { - return SizedBox( - width: 3, - height: 1, - child: DecoratedBox( - decoration: - BoxDecoration(color: Colors.white), + Text( + "拼团享低价", + style: TextStyle( + fontSize: 10.sp, + fontWeight: MyFontWeight.regular, + color: Color(0xFF5F5F5F), ), - ); - }), - mainAxisAlignment: MainAxisAlignment.spaceBetween, - direction: Axis.horizontal, + ), + ], ), - ), - ], - ), - ], - ), - Column( - children: [ - Row( - mainAxisAlignment: MainAxisAlignment.spaceAround, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Image.asset( - "assets/image/zt_zf.webp", - width: 42, - height: 42, - fit: BoxFit.cover, - ), - Container( - width: 45, - child: Flex( - children: List.generate(8, (_) { - return SizedBox( - width: 3, - height: 1, - child: DecoratedBox( - decoration: - BoxDecoration(color: Color(0xFF32A060)), - ), - ); - }), - mainAxisAlignment: MainAxisAlignment.spaceBetween, - direction: Axis.horizontal, + Container( + width: 35, + child: Flex( + children: List.generate(0, (_) { + return SizedBox( + width: 3, + height: 1, + child: DecoratedBox( + decoration: + BoxDecoration(color: Colors.white), + ), + ); + }), + mainAxisAlignment: MainAxisAlignment.spaceBetween, + direction: Axis.horizontal, + ), ), - ), - ], - ), - SizedBox(height: 8.h), - Row( - mainAxisAlignment: MainAxisAlignment.spaceAround, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Column( - children: [ - Text( - "成功支付", - style: TextStyle( - fontSize: 12.sp, - fontWeight: MyFontWeight.regular, - color: Color(0xFF181818), - ), + ], + ), + ], + ), + Column( + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.spaceAround, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Image.asset( + "assets/image/zt_zf.webp", + width: 42, + height: 42, + fit: BoxFit.cover, + ), + Container( + width: 45, + child: Flex( + children: List.generate(8, (_) { + return SizedBox( + width: 3, + height: 1, + child: DecoratedBox( + decoration: + BoxDecoration(color: Color(0xFF32A060)), + ), + ); + }), + mainAxisAlignment: MainAxisAlignment.spaceBetween, + direction: Axis.horizontal, ), - Text( - "下单可开团", - style: TextStyle( - fontSize: 10.sp, - fontWeight: MyFontWeight.regular, - color: Color(0xFF5F5F5F), + ), + ], + ), + SizedBox(height: 8.h), + Row( + mainAxisAlignment: MainAxisAlignment.spaceAround, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Column( + children: [ + Text( + "成功支付", + style: TextStyle( + fontSize: 12.sp, + fontWeight: MyFontWeight.regular, + color: Color(0xFF181818), + ), ), - ), - ], - ), - Container( - width: 35, - child: Flex( - children: List.generate(0, (_) { - return SizedBox( - width: 3, - height: 1, - child: DecoratedBox( - decoration: - BoxDecoration(color: Colors.white), + Text( + "下单可开团", + style: TextStyle( + fontSize: 10.sp, + fontWeight: MyFontWeight.regular, + color: Color(0xFF5F5F5F), ), - ); - }), - mainAxisAlignment: MainAxisAlignment.spaceBetween, - direction: Axis.horizontal, + ), + ], ), - ), - ], - ), - ], - ), - Column( - children: [ - Row( - mainAxisAlignment: MainAxisAlignment.spaceAround, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Image.asset( - "assets/image/yq_zt.webp", - width: 42, - height: 42, - fit: BoxFit.cover, - ), - Container( - width: 45, - child: Flex( - children: List.generate(8, (_) { - return SizedBox( - width: 3, - height: 1, - child: DecoratedBox( - decoration: - BoxDecoration(color: Color(0xFF32A060)), - ), - ); - }), - mainAxisAlignment: MainAxisAlignment.spaceBetween, - direction: Axis.horizontal, + Container( + width: 35, + child: Flex( + children: List.generate(0, (_) { + return SizedBox( + width: 3, + height: 1, + child: DecoratedBox( + decoration: + BoxDecoration(color: Colors.white), + ), + ); + }), + mainAxisAlignment: MainAxisAlignment.spaceBetween, + direction: Axis.horizontal, + ), ), - ), - ], - ), - SizedBox(height: 8.h), - Row( - mainAxisAlignment: MainAxisAlignment.spaceAround, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Column( - children: [ - Text( - "邀请参团", - style: TextStyle( - fontSize: 12.sp, - fontWeight: MyFontWeight.regular, - color: Color(0xFF181818), - ), + ], + ), + ], + ), + Column( + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.spaceAround, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Image.asset( + "assets/image/yq_zt.webp", + width: 42, + height: 42, + fit: BoxFit.cover, + ), + Container( + width: 45, + child: Flex( + children: List.generate(8, (_) { + return SizedBox( + width: 3, + height: 1, + child: DecoratedBox( + decoration: + BoxDecoration(color: Color(0xFF32A060)), + ), + ); + }), + mainAxisAlignment: MainAxisAlignment.spaceBetween, + direction: Axis.horizontal, ), - Text( - "一起享优惠", - style: TextStyle( - fontSize: 10.sp, - fontWeight: MyFontWeight.regular, - color: Color(0xFF5F5F5F), + ), + ], + ), + SizedBox(height: 8.h), + Row( + mainAxisAlignment: MainAxisAlignment.spaceAround, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Column( + children: [ + Text( + "邀请参团", + style: TextStyle( + fontSize: 12.sp, + fontWeight: MyFontWeight.regular, + color: Color(0xFF181818), + ), ), - ), - ], - ), - Container( - width: 35, - child: Flex( - children: List.generate(0, (_) { - return SizedBox( - width: 3, - height: 1, - child: DecoratedBox( - decoration: - BoxDecoration(color: Colors.white), + Text( + "一起享优惠", + style: TextStyle( + fontSize: 10.sp, + fontWeight: MyFontWeight.regular, + color: Color(0xFF5F5F5F), ), - ); - }), - mainAxisAlignment: MainAxisAlignment.spaceBetween, - direction: Axis.horizontal, + ), + ], ), + Container( + width: 35, + child: Flex( + children: List.generate(0, (_) { + return SizedBox( + width: 3, + height: 1, + child: DecoratedBox( + decoration: + BoxDecoration(color: Colors.white), + ), + ); + }), + mainAxisAlignment: MainAxisAlignment.spaceBetween, + direction: Axis.horizontal, + ), + ), + ], + ) + ], + ), + Column( + children: [ + Image.asset( + "assets/image/zt_m.webp", + width: 42, + height: 42, + fit: BoxFit.cover, + ), + SizedBox(height: 8.h), + Text( + "人满成团", + style: TextStyle( + fontSize: 12.sp, + fontWeight: MyFontWeight.regular, + color: Color(0xFF181818), ), - ], - ) - ], - ), - Column( - children: [ - Image.asset( - "assets/image/zt_m.webp", - width: 42, - height: 42, - fit: BoxFit.cover, - ), - SizedBox(height: 8.h), - Text( - "人满成团", - style: TextStyle( - fontSize: 12.sp, - fontWeight: MyFontWeight.regular, - color: Color(0xFF181818), ), - ), - Text( - "人不满退款", - style: TextStyle( - fontSize: 10.sp, - fontWeight: MyFontWeight.regular, - color: Color(0xFF5F5F5F), + Text( + "人不满退款", + style: TextStyle( + fontSize: 10.sp, + fontWeight: MyFontWeight.regular, + color: Color(0xFF5F5F5F), + ), ), - ), - ], - ), - ], + ], + ), + ], + ), ), ], )); diff --git a/lib/store/store_view/shop_goods.dart b/lib/store/store_view/shop_goods.dart index 807e16ba..70c37762 100644 --- a/lib/store/store_view/shop_goods.dart +++ b/lib/store/store_view/shop_goods.dart @@ -237,6 +237,7 @@ class _ShopGoods extends State { (widget.productListBean?.attrStyle ?? 0) == 0) GestureDetector( onTap: () { + widget.add(widget.shoppingCartSkuItemListBean); }, child: Image.asset(