xt / Flutter-ReserveApp · Commits

Go to a project

Commit ce2b4458b6d084d2c5cdda0a3309e9ac2db6942f

Authored by wdn127929
1 parent c6ba5f41
build: skipped

订金去向&消息弹窗关闭按钮点击范围扩大

Inline Side-by-side
Showing 4 changed files with 39 additions and 24 deletions
@@ -1747,12 +1747,15 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -1747,12 +1747,15 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
1747 if (detailEntity.deposit_cancel != null && 1747 if (detailEntity.deposit_cancel != null &&
1748 detailEntity.deposit_cancel != '') 1748 detailEntity.deposit_cancel != '')
1749 VEmptyView(10), 1749 VEmptyView(10),
1750 - Padding(  
1751 - padding: EdgeInsets.only(left: w(16)),  
1752 - child: Text(  
1753 - '${detailEntity.deposit_cancel ?? ''}',  
1754 - style: TextStyle(color: MyColours.color_515151, fontSize: font(14)),  
1755 - )) 1750 + if (detailEntity.deposit_cancel != null &&
  1751 + detailEntity.deposit_cancel != '')
  1752 + Padding(
  1753 + padding: EdgeInsets.only(left: w(16)),
  1754 + child: Text(
  1755 + '订金去向：${detailEntity.deposit_cancel ?? ''}',
  1756 + style:
  1757 + TextStyle(color: MyColours.color_999999, fontSize: font(14)),
  1758 + ))
1756 // MyDivider(double.infinity, w(0.5), color: MyColours.color_BFC4D4), 1759 // MyDivider(double.infinity, w(0.5), color: MyColours.color_BFC4D4),
1757 ]); 1760 ]);
1758 } 1761 }
@@ -1412,7 +1412,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -1412,7 +1412,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
1412 // if (widget.initialIndex == 1 && needRefreshTemp == false) { 1412 // if (widget.initialIndex == 1 && needRefreshTemp == false) {
1413 // } else { 1413 // } else {
1414 // _clearBadge(() { 1414 // _clearBadge(() {
1415 - // _getAllUnMessages(); 1415 + // _getAllUnMessages();
1416 // }); 1416 // });
1417 // } 1417 // }
1418 1418
@@ -302,9 +302,10 @@ class MessageDialogItemF extends StatelessWidget { @@ -302,9 +302,10 @@ class MessageDialogItemF extends StatelessWidget {
302 child: Stack( 302 child: Stack(
303 children: <Widget>[ 303 children: <Widget>[
304 Container( 304 Container(
305 - margin: EdgeInsets.symmetric(  
306 - horizontal: ScreenUtil().setWidth(24 * 2),  
307 - vertical: ScreenUtil().setWidth(20)), 305 + margin: EdgeInsets.only(
  306 + left: ScreenUtil().setWidth(24 * 2),
  307 + right: ScreenUtil().setWidth(24 * 2),
  308 + bottom: ScreenUtil().setWidth(20)),
308 padding: EdgeInsets.only( 309 padding: EdgeInsets.only(
309 right: ScreenUtil().setWidth(32), 310 right: ScreenUtil().setWidth(32),
310 ), 311 ),
@@ -5879,28 +5879,39 @@ class DialogUtil { @@ -5879,28 +5879,39 @@ class DialogUtil {
5879 mainAxisSize: MainAxisSize.min, 5879 mainAxisSize: MainAxisSize.min,
5880 children: <Widget>[ 5880 children: <Widget>[
5881 Container( 5881 Container(
5882 - margin: EdgeInsets.only(  
5883 - top: ScreenUtil().setWidth(31),  
5884 - bottom: ScreenUtil().setWidth(2)), 5882 + // margin: EdgeInsets.only(
  5883 + // // top: ScreenUtil().setWidth(31),
  5884 + // bottom: ScreenUtil().setWidth(2)),
5885 width: double.infinity, 5885 width: double.infinity,
5886 child: Stack( 5886 child: Stack(
5887 alignment: Alignment.center, 5887 alignment: Alignment.center,
5888 children: <Widget>[ 5888 children: <Widget>[
5889 - Text( 5889 + Container(
  5890 + // margin: EdgeInsets.only(
  5891 + // top: ScreenUtil().setWidth(21),
  5892 + // bottom: ScreenUtil().setWidth(2)),
  5893 + child: Text(
5890 "您有一条新的消息", 5894 "您有一条新的消息",
5891 style: TextStyle( 5895 style: TextStyle(
5892 color: MyColours.color_333333, 5896 color: MyColours.color_333333,
5893 fontSize: ScreenUtil().setSp(32)), 5897 fontSize: ScreenUtil().setSp(32)),
5894 - ),  
5895 - Positioned(  
5896 - right: ScreenUtil().setWidth(23), 5898 + )),
  5899 + Align(
  5900 + alignment: Alignment.centerRight,
5897 child: GestureDetector( 5901 child: GestureDetector(
5898 onTap: () { 5902 onTap: () {
5899 Navigator.of(dialogContext).pop(); 5903 Navigator.of(dialogContext).pop();
5900 }, 5904 },
5901 - child: Padding(  
5902 - padding: EdgeInsets.all(  
5903 - ScreenUtil().setWidth(12)), 5905 + child: Container(
  5906 + color: messageModel.messages.length > 3
  5907 + ? MyColours.color_24A4A8
  5908 + : MyColours.color_ffffff,
  5909 + padding: EdgeInsets.only(
  5910 + top: ScreenUtil().setWidth(31),
  5911 + left: ScreenUtil().setWidth(42),
  5912 + right: ScreenUtil().setWidth(33),
  5913 + bottom: ScreenUtil().setWidth(38),
  5914 + ),
5904 child: Image.asset( 5915 child: Image.asset(
5905 "assets/close.png", 5916 "assets/close.png",
5906 width: ScreenUtil().setWidth(28), 5917 width: ScreenUtil().setWidth(28),
@@ -8368,10 +8379,10 @@ class DialogUtil { @@ -8368,10 +8379,10 @@ class DialogUtil {
8368 color: rColor)), 8379 color: rColor)),
8369 onPressed: () { 8380 onPressed: () {
8370 Navigator.of(context).pop(); 8381 Navigator.of(context).pop();
8371 -  
8372 - if (rCallback != null) {  
8373 - rCallback();  
8374 - } 8382 +
  8383 + if (rCallback != null) {
  8384 + rCallback();
  8385 + }
8375 }, 8386 },
8376 ), 8387 ),
8377 ], 8388 ],