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> {
if (detailEntity.deposit_cancel != null &&
detailEntity.deposit_cancel != '')
VEmptyView(10),
Padding(
padding: EdgeInsets.only(left: w(16)),
child: Text(
'${detailEntity.deposit_cancel ?? ''}',
style: TextStyle(color: MyColours.color_515151, fontSize: font(14)),
))
if (detailEntity.deposit_cancel != null &&
detailEntity.deposit_cancel != '')
Padding(
padding: EdgeInsets.only(left: w(16)),
child: Text(
'订金去向：${detailEntity.deposit_cancel ?? ''}',
style:
TextStyle(color: MyColours.color_999999, fontSize: font(14)),
))
// MyDivider(double.infinity, w(0.5), color: MyColours.color_BFC4D4),
]);
}
... ...
... ... @@ -1412,7 +1412,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
// if (widget.initialIndex == 1 && needRefreshTemp == false) {
// } else {
// _clearBadge(() {
// _getAllUnMessages();
// _getAllUnMessages();
// });
// }
... ...
... ... @@ -302,9 +302,10 @@ class MessageDialogItemF extends StatelessWidget {
child: Stack(
children: <Widget>[
Container(
margin: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(24 * 2),
vertical: ScreenUtil().setWidth(20)),
margin: EdgeInsets.only(
left: ScreenUtil().setWidth(24 * 2),
right: ScreenUtil().setWidth(24 * 2),
bottom: ScreenUtil().setWidth(20)),
padding: EdgeInsets.only(
right: ScreenUtil().setWidth(32),
),
... ...
... ... @@ -5879,28 +5879,39 @@ class DialogUtil {
mainAxisSize: MainAxisSize.min,
children: <Widget>[
Container(
margin: EdgeInsets.only(
top: ScreenUtil().setWidth(31),
bottom: ScreenUtil().setWidth(2)),
// margin: EdgeInsets.only(
// // top: ScreenUtil().setWidth(31),
// bottom: ScreenUtil().setWidth(2)),
width: double.infinity,
child: Stack(
alignment: Alignment.center,
children: <Widget>[
Text(
Container(
// margin: EdgeInsets.only(
// top: ScreenUtil().setWidth(21),
// bottom: ScreenUtil().setWidth(2)),
child: Text(
"您有一条新的消息",
style: TextStyle(
color: MyColours.color_333333,
fontSize: ScreenUtil().setSp(32)),
),
Positioned(
right: ScreenUtil().setWidth(23),
)),
Align(
alignment: Alignment.centerRight,
child: GestureDetector(
onTap: () {
Navigator.of(dialogContext).pop();
},
child: Padding(
padding: EdgeInsets.all(
ScreenUtil().setWidth(12)),
child: Container(
color: messageModel.messages.length > 3
? MyColours.color_24A4A8
: MyColours.color_ffffff,
padding: EdgeInsets.only(
top: ScreenUtil().setWidth(31),
left: ScreenUtil().setWidth(42),
right: ScreenUtil().setWidth(33),
bottom: ScreenUtil().setWidth(38),
),
child: Image.asset(
"assets/close.png",
width: ScreenUtil().setWidth(28),
... ... @@ -8368,10 +8379,10 @@ class DialogUtil {
color: rColor)),
onPressed: () {
Navigator.of(context).pop();
if (rCallback != null) {
rCallback();
}
if (rCallback != null) {
rCallback();
}
},
),
],
... ...