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

Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 

# Conflicts:
#	lib/qr/invite_friends.dart
dart3_last
fmk 2 years ago
parent
a3b787d075 cf739ee0a3
commit
7c883388bd
23 changed files with 398 additions and 303 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. BIN
      assets/image/2x/invite_1.webp
  2. BIN
      assets/image/2x/invite_2.webp
  3. BIN
      assets/image/2x/invite_3.webp
  4. BIN
      assets/image/2x/invite_4.webp
  5. BIN
      assets/image/2x/invite_friends.webp
  6. BIN
      assets/image/3x/invite_1.webp
  7. BIN
      assets/image/3x/invite_2.webp
  8. BIN
      assets/image/3x/invite_3.webp
  9. BIN
      assets/image/3x/invite_4.webp
  10. BIN
      assets/image/3x/invite_friends.webp
  11. BIN
      assets/image/invite_1.webp
  12. BIN
      assets/image/invite_2.webp
  13. BIN
      assets/image/invite_3.webp
  14. BIN
      assets/image/invite_4.webp
  15. BIN
      assets/image/invite_friends.webp
  16. 189
      lib/qr/invite_friends.dart
  17. 7
      lib/retrofit/data/activity_details.dart
  18. 3
      lib/retrofit/data/brand_data.dart
  19. 3
      lib/retrofit/data/miNiDetail.dart
  20. 2
      lib/store/shop__details_page.dart
  21. 4
      lib/store/shopping/shopping_goods_details.dart
  22. 492
      lib/store/shopping/shopping_home/group_details.dart
  23. 1
      lib/store/store_view/shop_goods.dart

BIN
assets/image/2x/invite_1.webp
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 968 B

BIN
assets/image/2x/invite_2.webp
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
assets/image/2x/invite_3.webp
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
assets/image/2x/invite_4.webp
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
assets/image/2x/invite_friends.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 235 KiB

After

Width:  |  Height:  |  Size: 238 KiB

BIN
assets/image/3x/invite_1.webp
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
assets/image/3x/invite_2.webp
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
assets/image/3x/invite_3.webp
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
assets/image/3x/invite_4.webp
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
assets/image/3x/invite_friends.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 454 KiB

After

Width:  |  Height:  |  Size: 457 KiB

BIN
assets/image/invite_1.webp
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 782 B

BIN
assets/image/invite_2.webp
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 836 B

BIN
assets/image/invite_3.webp
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 834 B

BIN
assets/image/invite_4.webp
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 810 B

BIN
assets/image/invite_friends.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 74 KiB

After

Width:  |  Height:  |  Size: 76 KiB

189
lib/qr/invite_friends.dart
Unescape View File

@ -228,7 +228,7 @@ class _InviteFriends extends State<InviteFriends> {
height: 52.h, height: 52.h,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(26), borderRadius: BorderRadius.circular(26),
color: Color(0xFF00E16F), color: Color(0xFF32A060),
), ),
margin: EdgeInsets.symmetric(horizontal:14.w), margin: EdgeInsets.symmetric(horizontal:14.w),
child: Row( child: Row(
@ -270,6 +270,8 @@ class _InviteFriends extends State<InviteFriends> {
margin: EdgeInsets.only(bottom:12.h,left:14.h,right: 14.h), margin: EdgeInsets.only(bottom:12.h,left:14.h,right: 14.h),
padding: EdgeInsets.all(6), padding: EdgeInsets.all(6),
child:Column( child:Column(
// mainAxisAlignment: MainAxisAlignment.spaceAround,
crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Container( Container(
decoration: BoxDecoration( decoration: BoxDecoration(
@ -292,21 +294,18 @@ class _InviteFriends extends State<InviteFriends> {
), ),
SizedBox(height: 17.h,), SizedBox(height: 17.h,),
IntrinsicHeight( IntrinsicHeight(
child: child: Row(
Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
Column( Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceAround, mainAxisAlignment: MainAxisAlignment.spaceAround,
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
Image.asset( Image.asset(
"assets/image/zu_tuan.webp", "assets/image/invite_wx.webp",
width: 42, width: 42,
height: 42, height: 42,
fit: BoxFit.cover, fit: BoxFit.cover,
@ -330,6 +329,34 @@ class _InviteFriends extends State<InviteFriends> {
), ),
], ],
), ),
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), SizedBox(height: 8.h),
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceAround, mainAxisAlignment: MainAxisAlignment.spaceAround,
@ -339,9 +366,10 @@ class _InviteFriends extends State<InviteFriends> {
width:46.w, width:46.w,
child: child:
Text( Text(
"1.分享给微信好友", "分享链接给好友",
style: TextStyle( style: TextStyle(
fontSize: 12.sp, fontSize: 12.sp,
height: 1.3.h,
fontWeight: MyFontWeight.regular, fontWeight: MyFontWeight.regular,
color: Color(0xFF181818), color: Color(0xFF181818),
), ),
@ -374,7 +402,7 @@ class _InviteFriends extends State<InviteFriends> {
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
Image.asset( Image.asset(
"assets/image/zt_zf.webp", "assets/image/yq_zt.webp",
width: 42, width: 42,
height: 42, height: 42,
fit: BoxFit.cover, fit: BoxFit.cover,
@ -398,6 +426,34 @@ class _InviteFriends extends State<InviteFriends> {
), ),
], ],
), ),
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), SizedBox(height: 8.h),
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceAround, mainAxisAlignment: MainAxisAlignment.spaceAround,
@ -407,9 +463,10 @@ class _InviteFriends extends State<InviteFriends> {
width:46.w, width:46.w,
child: child:
Text( Text(
"2.好友注册", "好友注册并获得10元优惠券",
style: TextStyle( style: TextStyle(
fontSize: 12.sp, fontSize: 12.sp,
height: 1.3.h,
fontWeight: MyFontWeight.regular, fontWeight: MyFontWeight.regular,
color: Color(0xFF181818), color: Color(0xFF181818),
), ),
@ -442,7 +499,7 @@ class _InviteFriends extends State<InviteFriends> {
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
Image.asset( Image.asset(
"assets/image/yq_zt.webp", "assets/image/zt_m.webp",
width: 42, width: 42,
height: 42, height: 42,
fit: BoxFit.cover, fit: BoxFit.cover,
@ -466,19 +523,47 @@ class _InviteFriends extends State<InviteFriends> {
), ),
], ],
), ),
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), SizedBox(height: 8.h),
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceAround, mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
Container( Container(
width: 46.w, width: 46.w,
child: child:
Text( Text(
"3.邀请完成", "好友完成首单",
style: TextStyle( style: TextStyle(
fontSize: 12.sp, fontSize: 12.sp,
height: 1.3.h,
fontWeight: MyFontWeight.regular, fontWeight: MyFontWeight.regular,
color: Color(0xFF181818), color: Color(0xFF181818),
), ),
@ -507,19 +592,26 @@ class _InviteFriends extends State<InviteFriends> {
Column( Column(
children: [ children: [
Image.asset( Image.asset(
"assets/image/zt_m.webp", "assets/image/invite_q.webp",
width: 42, width: 42,
height: 42, height: 42,
fit: BoxFit.cover, fit: BoxFit.cover,
), ),
Image.asset(
"assets/image/invite_4.webp",
width: 24,
height: 24,
fit: BoxFit.cover,
),
SizedBox(height: 8.h), SizedBox(height: 8.h),
Container( Container(
width: 46.w, width: 46.w,
child: child:
Text( Text(
"4.获得优惠券", "邀请达成获得奖励",
style: TextStyle( style: TextStyle(
fontSize: 12.sp, fontSize: 12.sp,
height: 1.3.h,
fontWeight: MyFontWeight.regular, fontWeight: MyFontWeight.regular,
color: Color(0xFF181818), color: Color(0xFF181818),
), ),
@ -654,27 +746,29 @@ class _InviteFriends extends State<InviteFriends> {
) )
), ),
SizedBox(height:12.h,), SizedBox(height:12.h,),
Padding(padding:EdgeInsets.symmetric(horizontal: 6.w),
child:
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text( Text(
S.of(context).shoujihao, S.of(context).shoujihao,
style: TextStyle( style: TextStyle(
fontWeight: MyFontWeight.semi_bold, fontWeight: MyFontWeight.semi_bold,
fontSize:14.sp, fontSize:14.sp,
color: Color(0xFF000000), color: Color(0xFF000000),
),
), ),
), Text(
Text( "注册时间",
S.of(context).jiangli, style: TextStyle(
style: TextStyle( fontWeight: MyFontWeight.semi_bold,
fontWeight: MyFontWeight.semi_bold, fontSize:14.sp,
fontSize:14.sp, color: Color(0xFF000000),
color: Color(0xFF000000), ),
), ),
), ],),),
],),
SizedBox(height:12.h,), SizedBox(height:12.h,),
(invitationList.length == null || invitationList.length == 0) (invitationList.length == null || invitationList.length == 0)
? NoDataView( ? NoDataView(
@ -710,35 +804,20 @@ class _InviteFriends extends State<InviteFriends> {
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
Column( Text(
mainAxisAlignment: MainAxisAlignment.start, AppUtils.phoneEncode(invitationList?.phone ?? ""),
crossAxisAlignment: CrossAxisAlignment.start, style: TextStyle(
children: [ color: Color(0xFF000000),
Text( fontSize: 12.sp,
AppUtils.phoneEncode(invitationList?.phone ?? ""), fontWeight: MyFontWeight.regular,
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( Text(
"新人全场减30优惠券*1", invitationList?.createTime ?? "",
style: TextStyle( style: TextStyle(
color: Color(0xFF353535), color: Color(0xFF000000),
fontSize: 12.sp, fontSize: 12.sp,
fontWeight: MyFontWeight.medium, fontWeight: MyFontWeight.regular,
), ),
), ),
], ],

7
lib/retrofit/data/activity_details.dart
Unescape View File

@ -469,6 +469,7 @@ class ActProduct {
String shortName, String shortName,
String supplierName, String supplierName,
String detail, String detail,
String details,
String rightImg, String rightImg,
}) { }) {
_id = id; _id = id;
@ -491,6 +492,7 @@ class ActProduct {
_shortName = shortName; _shortName = shortName;
_supplierName =supplierName; _supplierName =supplierName;
_detail = detail; _detail = detail;
_details = details;
_rightImg = rightImg; _rightImg = rightImg;
} }
@ -520,6 +522,7 @@ class ActProduct {
_shortName = json['shortName']; _shortName = json['shortName'];
_supplierName = json['supplierName']; _supplierName = json['supplierName'];
_detail = json['detail']; _detail = json['detail'];
_details = json['details'];
_rightImg = json['rightImg']; _rightImg = json['rightImg'];
} }
@ -543,6 +546,7 @@ class ActProduct {
String _shortName; String _shortName;
String _supplierName; String _supplierName;
String _detail; String _detail;
String _details;
String _rightImg; String _rightImg;
String get id => _id; String get id => _id;
@ -585,6 +589,8 @@ class ActProduct {
String get detail => _detail; String get detail => _detail;
String get details => _details;
String get rightImg => _rightImg; String get rightImg => _rightImg;
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
@ -611,6 +617,7 @@ class ActProduct {
map['shortName'] = _shortName; map['shortName'] = _shortName;
map['supplierName'] = _supplierName; map['supplierName'] = _supplierName;
map['detail'] = _detail; map['detail'] = _detail;
map['details'] = _details;
map['rightImg'] = _rightImg; map['rightImg'] = _rightImg;
return map; return map;
} }

3
lib/retrofit/data/brand_data.dart
Unescape View File

@ -11,6 +11,7 @@ class BrandData {
String originAvatar; String originAvatar;
String originDesc; String originDesc;
String originator; String originator;
bool inviteNewShow;
dynamic contents; dynamic contents;
dynamic ideals; dynamic ideals;
@ -24,6 +25,7 @@ class BrandData {
..originAvatar = json['originAvatar'] as String ..originAvatar = json['originAvatar'] as String
..originDesc = json['originDesc'] as String ..originDesc = json['originDesc'] as String
..originator = json['originator'] as String ..originator = json['originator'] as String
..inviteNewShow = json['inviteNewShow'] as bool
..contents = json['contents'] ..contents = json['contents']
..ideals = json['ideals']; ..ideals = json['ideals'];
@ -34,6 +36,7 @@ class BrandData {
'originAvatar': this.originAvatar, 'originAvatar': this.originAvatar,
'originDesc': this.originDesc, 'originDesc': this.originDesc,
'originator': this.originator, 'originator': this.originator,
'inviteNewShow': this.inviteNewShow,
'contents': this.contents, 'contents': this.contents,
'ideals': this.ideals, 'ideals': this.ideals,
}; };

3
lib/retrofit/data/miNiDetail.dart
Unescape View File

@ -69,6 +69,7 @@ class MiNiDetail {
int setMeal; int setMeal;
int attrStyle; int attrStyle;
String detail; String detail;
String details;
int isDelete; int isDelete;
String printerFlag; String printerFlag;
String thumbnailImg; String thumbnailImg;
@ -117,6 +118,7 @@ class MiNiDetail {
miNiDetailBean.setMeal = map['setMeal']; miNiDetailBean.setMeal = map['setMeal'];
miNiDetailBean.attrStyle = map['attrStyle']; miNiDetailBean.attrStyle = map['attrStyle'];
miNiDetailBean.detail = map['detail']; miNiDetailBean.detail = map['detail'];
miNiDetailBean.details = map['details'];
miNiDetailBean.isDelete = map['isDelete']; miNiDetailBean.isDelete = map['isDelete'];
miNiDetailBean.printerFlag = map['printerFlag']; miNiDetailBean.printerFlag = map['printerFlag'];
miNiDetailBean.thumbnailImg = map['thumbnailImg']; miNiDetailBean.thumbnailImg = map['thumbnailImg'];
@ -171,6 +173,7 @@ class MiNiDetail {
"setMeal": setMeal, "setMeal": setMeal,
"attrStyle": attrStyle, "attrStyle": attrStyle,
"detail" :detail, "detail" :detail,
"details" :details,
"isDelete": isDelete, "isDelete": isDelete,
"printerFlag": printerFlag, "printerFlag": printerFlag,
"thumbnailImg": thumbnailImg, "thumbnailImg": thumbnailImg,

2
lib/store/shop__details_page.dart
Unescape View File

@ -593,7 +593,7 @@ class _ShopDetailsPage extends State<ShopDetailsPage> {
Container( Container(
color: Colors.white, color: Colors.white,
child: Html( child: Html(
data: miNiDetail?.detail ?? "", data: miNiDetail?.details ?? "",
customImageRenders: { customImageRenders: {
networkSourceMatcher(): networkImageRender( networkSourceMatcher(): networkImageRender(
loadingWidget: () { loadingWidget: () {

4
lib/store/shopping/shopping_goods_details.dart
Unescape View File

@ -565,8 +565,8 @@ class _ShoppingGoodsDetails extends State<ShoppingGoodsDetails> {
margin: EdgeInsets.only(bottom: 72.h), margin: EdgeInsets.only(bottom: 72.h),
child: Html( child: Html(
data: pageType != null data: pageType != null
? (activityDetails?.actProduct?.detail ?? "") ? (activityDetails?.actProduct?.details ?? "")
: (miNiDetail?.detail ?? ""), : (miNiDetail?.details ?? ""),
customImageRenders: { customImageRenders: {
networkSourceMatcher(): networkImageRender( networkSourceMatcher(): networkImageRender(
loadingWidget: () { loadingWidget: () {

492
lib/store/shopping/shopping_home/group_details.dart
Unescape View File

@ -736,269 +736,271 @@ class _GroupDetails extends State<GroupDetails> {
), ),
), ),
SizedBox(height: 12.h), SizedBox(height: 12.h),
Row( IntrinsicHeight(
mainAxisAlignment: MainAxisAlignment.center, child: Row(
crossAxisAlignment: CrossAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ crossAxisAlignment: CrossAxisAlignment.center,
Column( children: [
children: [ Column(
Row( children: [
mainAxisAlignment: MainAxisAlignment.spaceAround, Row(
crossAxisAlignment: CrossAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [ crossAxisAlignment: CrossAxisAlignment.center,
Image.asset( children: [
"assets/image/zu_tuan.webp", Image.asset(
width: 42, "assets/image/zu_tuan.webp",
height: 42, width: 42,
fit: BoxFit.cover, 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: 45,
), child: Flex(
SizedBox(height: 8.h), children: List.generate(8, (_) {
Row( return SizedBox(
mainAxisAlignment: MainAxisAlignment.spaceAround, width: 3,
crossAxisAlignment: CrossAxisAlignment.center, height: 1,
children: [ child: DecoratedBox(
Column( decoration:
children: [ BoxDecoration(color: Color(0xFF32A060)),
Text( ),
"开团/参团", );
style: TextStyle( }),
fontSize: 12.sp, mainAxisAlignment: MainAxisAlignment.spaceBetween,
fontWeight: MyFontWeight.regular, direction: Axis.horizontal,
color: Color(0xFF181818),
),
), ),
Text( ),
"拼团享低价", ],
style: TextStyle( ),
fontSize: 10.sp, SizedBox(height: 8.h),
fontWeight: MyFontWeight.regular, Row(
color: Color(0xFF5F5F5F), mainAxisAlignment: MainAxisAlignment.spaceAround,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Column(
children: [
Text(
"开团/参团",
style: TextStyle(
fontSize: 12.sp,
fontWeight: MyFontWeight.regular,
color: Color(0xFF181818),
),
), ),
), Text(
], "拼团享低价",
), style: TextStyle(
Container( fontSize: 10.sp,
width: 35, fontWeight: MyFontWeight.regular,
child: Flex( color: Color(0xFF5F5F5F),
children: List.generate(0, (_) {
return SizedBox(
width: 3,
height: 1,
child: DecoratedBox(
decoration:
BoxDecoration(color: Colors.white),
), ),
); ),
}), ],
mainAxisAlignment: MainAxisAlignment.spaceBetween,
direction: Axis.horizontal,
), ),
), Container(
], width: 35,
), child: Flex(
], children: List.generate(0, (_) {
), return SizedBox(
Column( width: 3,
children: [ height: 1,
Row( child: DecoratedBox(
mainAxisAlignment: MainAxisAlignment.spaceAround, decoration:
crossAxisAlignment: CrossAxisAlignment.center, BoxDecoration(color: Colors.white),
children: [ ),
Image.asset( );
"assets/image/zt_zf.webp", }),
width: 42, mainAxisAlignment: MainAxisAlignment.spaceBetween,
height: 42, direction: Axis.horizontal,
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,
), ),
), ],
], ),
), ],
SizedBox(height: 8.h), ),
Row( Column(
mainAxisAlignment: MainAxisAlignment.spaceAround, children: [
crossAxisAlignment: CrossAxisAlignment.center, Row(
children: [ mainAxisAlignment: MainAxisAlignment.spaceAround,
Column( crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
Text( Image.asset(
"成功支付", "assets/image/zt_zf.webp",
style: TextStyle( width: 42,
fontSize: 12.sp, height: 42,
fontWeight: MyFontWeight.regular, fit: BoxFit.cover,
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, SizedBox(height: 8.h),
fontWeight: MyFontWeight.regular, Row(
color: Color(0xFF5F5F5F), mainAxisAlignment: MainAxisAlignment.spaceAround,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Column(
children: [
Text(
"成功支付",
style: TextStyle(
fontSize: 12.sp,
fontWeight: MyFontWeight.regular,
color: Color(0xFF181818),
),
), ),
), Text(
], "下单可开团",
), style: TextStyle(
Container( fontSize: 10.sp,
width: 35, fontWeight: MyFontWeight.regular,
child: Flex( color: Color(0xFF5F5F5F),
children: List.generate(0, (_) {
return SizedBox(
width: 3,
height: 1,
child: DecoratedBox(
decoration:
BoxDecoration(color: Colors.white),
), ),
); ),
}), ],
mainAxisAlignment: MainAxisAlignment.spaceBetween,
direction: Axis.horizontal,
), ),
), Container(
], width: 35,
), child: Flex(
], children: List.generate(0, (_) {
), return SizedBox(
Column( width: 3,
children: [ height: 1,
Row( child: DecoratedBox(
mainAxisAlignment: MainAxisAlignment.spaceAround, decoration:
crossAxisAlignment: CrossAxisAlignment.center, BoxDecoration(color: Colors.white),
children: [ ),
Image.asset( );
"assets/image/yq_zt.webp", }),
width: 42, mainAxisAlignment: MainAxisAlignment.spaceBetween,
height: 42, direction: Axis.horizontal,
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,
), ),
), ],
], ),
), ],
SizedBox(height: 8.h), ),
Row( Column(
mainAxisAlignment: MainAxisAlignment.spaceAround, children: [
crossAxisAlignment: CrossAxisAlignment.center, Row(
children: [ mainAxisAlignment: MainAxisAlignment.spaceAround,
Column( crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
Text( Image.asset(
"邀请参团", "assets/image/yq_zt.webp",
style: TextStyle( width: 42,
fontSize: 12.sp, height: 42,
fontWeight: MyFontWeight.regular, fit: BoxFit.cover,
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, SizedBox(height: 8.h),
fontWeight: MyFontWeight.regular, Row(
color: Color(0xFF5F5F5F), mainAxisAlignment: MainAxisAlignment.spaceAround,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Column(
children: [
Text(
"邀请参团",
style: TextStyle(
fontSize: 12.sp,
fontWeight: MyFontWeight.regular,
color: Color(0xFF181818),
),
), ),
), Text(
], "一起享优惠",
), style: TextStyle(
Container( fontSize: 10.sp,
width: 35, fontWeight: MyFontWeight.regular,
child: Flex( color: Color(0xFF5F5F5F),
children: List.generate(0, (_) {
return SizedBox(
width: 3,
height: 1,
child: DecoratedBox(
decoration:
BoxDecoration(color: Colors.white),
), ),
); ),
}), ],
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(
Text( "人不满退款",
"人不满退款", style: TextStyle(
style: TextStyle( fontSize: 10.sp,
fontSize: 10.sp, fontWeight: MyFontWeight.regular,
fontWeight: MyFontWeight.regular, color: Color(0xFF5F5F5F),
color: Color(0xFF5F5F5F), ),
), ),
), ],
], ),
), ],
], ),
), ),
], ],
)); ));

1
lib/store/store_view/shop_goods.dart
Unescape View File

@ -237,6 +237,7 @@ class _ShopGoods extends State<ShopGoods> {
(widget.productListBean?.attrStyle ?? 0) == 0) (widget.productListBean?.attrStyle ?? 0) == 0)
GestureDetector( GestureDetector(
onTap: () { onTap: () {
widget.add(widget.shoppingCartSkuItemListBean); widget.add(widget.shoppingCartSkuItemListBean);
}, },
child: Image.asset( child: Image.asset(

Write Preview
Loading…
Cancel
Save