From 9d07548afb1b872b65e3f47f673cb46faa1c15bd Mon Sep 17 00:00:00 2001 From: zsw Date: Tue, 30 Jul 2024 12:17:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E6=8A=AC=E5=A4=B4=EF=BC=8C?= =?UTF-8?q?=E5=8F=91=E7=A5=A8=E7=AE=A1=E7=90=86=EF=BC=8C=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E5=8F=91=E7=A5=A8=E4=BF=A1=E6=81=AF=E9=A1=B5=E9=9D=A2=E5=BA=95?= =?UTF-8?q?=E9=83=A8=E6=8C=89=E9=92=AEios=E7=AB=AFui=E9=80=82=E9=85=8D?= =?UTF-8?q?=EF=BC=9B=20=E9=97=A8=E5=BA=97=E8=AF=A6=E6=83=85=E6=95=B0?= =?UTF-8?q?=E6=8D=AEbug=E5=A4=84=E7=90=86=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/order/invoices_manage/add_invoices_title.dart | 10 ++++++++-- lib/order/invoices_manage/edit_invoices_info.dart | 8 +++++++- lib/order/invoices_manage/invoices_title_info.dart | 8 +++++++- lib/store/store_view/store_info.dart | 2 +- 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/lib/order/invoices_manage/add_invoices_title.dart b/lib/order/invoices_manage/add_invoices_title.dart index 1bd65a6f..fc53ee36 100644 --- a/lib/order/invoices_manage/add_invoices_title.dart +++ b/lib/order/invoices_manage/add_invoices_title.dart @@ -548,9 +548,15 @@ class _AddInvoicesTitle extends State { } }, child: Container( - padding: EdgeInsets.symmetric(vertical: 20.h), - color: Color(0xff32A060), + margin: EdgeInsets.only(bottom:25.h,left:20.w,right: 20.w), + padding: EdgeInsets.symmetric(vertical:16.h), width: double.infinity, + decoration: BoxDecoration( + color: Color(0xff32A060), + borderRadius: BorderRadius.circular( + 45 + ), + ), alignment: Alignment.center, child: Text( S.of(context).baocun, diff --git a/lib/order/invoices_manage/edit_invoices_info.dart b/lib/order/invoices_manage/edit_invoices_info.dart index 1cb53bed..ec4f8392 100644 --- a/lib/order/invoices_manage/edit_invoices_info.dart +++ b/lib/order/invoices_manage/edit_invoices_info.dart @@ -398,8 +398,14 @@ class _EditInvoicesInfo extends State { } }, child: Container( - padding: EdgeInsets.symmetric(vertical: 20.h), + padding: EdgeInsets.symmetric(vertical:16.h), + margin: EdgeInsets.only(bottom:25.h,left:20.w,right: 20.w), + decoration: BoxDecoration( color: Color(0xff32A060), + borderRadius: BorderRadius.circular( + 45 + ), + ), width: double.infinity, alignment: Alignment.center, child: Text( diff --git a/lib/order/invoices_manage/invoices_title_info.dart b/lib/order/invoices_manage/invoices_title_info.dart index b8cc4c79..a4c8fec7 100644 --- a/lib/order/invoices_manage/invoices_title_info.dart +++ b/lib/order/invoices_manage/invoices_title_info.dart @@ -239,8 +239,14 @@ class _InvoicesTitleInfo extends State { }); }, child: Container( - padding: EdgeInsets.symmetric(vertical: 20.h), + padding: EdgeInsets.symmetric(vertical:16.h), + margin: EdgeInsets.only(bottom:25.h,left:20.w,right: 20.w), + decoration: BoxDecoration( color: Color(0xff32A060), + borderRadius: BorderRadius.circular( + 45 + ), + ), width: double.infinity, alignment: Alignment.center, child: Text( diff --git a/lib/store/store_view/store_info.dart b/lib/store/store_view/store_info.dart index 8f279764..7f08fea6 100644 --- a/lib/store/store_view/store_info.dart +++ b/lib/store/store_view/store_info.dart @@ -112,7 +112,7 @@ class _StoreInfoView extends State { ), Row( children: [ - if( widget.storeInfo.perCapitaConsumption != null && ( widget.storeInfo?.perCapitaConsumption ?? "0") != "0") + if(( widget.storeInfo?.perCapitaConsumption ?? "") != "0") Padding(padding:EdgeInsets.only(right: 20.w), child: Text( S.of(context).ren(