diff --git a/lib/store/store_order.dart b/lib/store/store_order.dart index caa0ddc3..4b144f15 100644 --- a/lib/store/store_order.dart +++ b/lib/store/store_order.dart @@ -203,7 +203,17 @@ class _StoreOrderPage extends State @override Widget build(BuildContext context) { - return Container( + return WillPopScope( + onWillPop: () async { + if (dialogShowing) { + debugPrint("ssssasdadsasdadasd"); + SmartDialog.dismiss(); + return false; + } else { + return true; + } + }, + child:Container( color: Colors.white, child: Stack( children: [ @@ -522,7 +532,7 @@ class _StoreOrderPage extends State ), ], ), - ); + )); } ///领取优惠券 diff --git a/lib/union/union_list.dart b/lib/union/union_list.dart index ad9d7866..6dd2b0fb 100644 --- a/lib/union/union_list.dart +++ b/lib/union/union_list.dart @@ -142,8 +142,7 @@ class _UnionList extends State { Widget buildStoreItem(Store store, position) { return Container( - margin: EdgeInsets.fromLTRB(16.w, 8.h, 16.w, 8.h), - // padding: EdgeInsets.fromLTRB(20.w, 20.h, 20.w, 20.h), + margin: EdgeInsets.fromLTRB(16.w, 8.h, 16.w, 12.h), decoration: BoxDecoration( color: Colors.white, borderRadius: BorderRadius.all(Radius.circular(8)), @@ -186,7 +185,7 @@ class _UnionList extends State { Positioned( bottom: 16.h, left: 12.w, - right: 0, + right: 12.w, child: Container( height: 100.h, child: Row( diff --git a/pubspec.yaml b/pubspec.yaml index a91080b1..81c81947 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -3,7 +3,7 @@ description: 一心回乡. publish_to: 'none' # Remove this line if you wish to publish to pub.dev -version: 2.0.8+7 +version: 2.0.9+8 environment: sdk: ">=2.7.0 <3.0.0"