diff --git a/lib/settlement/settlement.dart b/lib/settlement/settlement.dart index 6a159a94..a7a777da 100644 --- a/lib/settlement/settlement.dart +++ b/lib/settlement/settlement.dart @@ -597,7 +597,7 @@ class _Settlement extends State { selectedBtn, couponListBean?.id, 0, - null, + promotion?.id, ); // } } @@ -612,17 +612,17 @@ class _Settlement extends State { return SettlementActivity(settleOrderInfo, storeInfo); }, ); - if (pro != null) { + // if (pro != null) { this.promotion = pro; promotions = promotion?.name ?? ""; coupons = ""; queryOrderInfo( address?.id, selectedBtn, - null, + couponListBean?.id, 0, promotion?.id, ); - } + // } } } diff --git a/lib/view_widget/tips_dialog.dart b/lib/view_widget/tips_dialog.dart index 0ac62ada..0c2df306 100644 --- a/lib/view_widget/tips_dialog.dart +++ b/lib/view_widget/tips_dialog.dart @@ -23,7 +23,7 @@ class _Tips extends State { child: Center( child: Container( width: MediaQuery.of(context).size.width - 80.w, - height: 146.h, + height: 165.h, decoration: BoxDecoration( color: Colors.white, borderRadius: BorderRadius.circular(8), @@ -32,7 +32,7 @@ class _Tips extends State { children: [ Container( width: double.infinity, - height: 90.h, + height:109.h, alignment: Alignment.center, padding: EdgeInsets.all(10), child: Text(