扩大物品出户card点击区域

添加包裹代收提醒代收成功提示
hmxc
张萌 4 years ago
parent 45baef9cb5
commit 0b13cfdf5c

@ -29,209 +29,221 @@ class _ToDoOutDoorCardState extends State<ToDoOutDoorCard> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
TextStyle _textStyle = TextStyle _textStyle =
TextStyle(color: AppStyle.minorTextColor, fontSize: 28.sp); TextStyle(color: AppStyle.minorTextColor, fontSize: 28.sp);
return Container( return GestureDetector(
color: Color(0xFFFFFFFF), onTap: () async {
margin: widget.homeDisplay ? EdgeInsets.zero : EdgeInsets.only(top: 16.w), await Get.to(ItemsOutdoorDetailsPage(id: widget.model.id));
padding: EdgeInsets.only(left: 24.w, right: 24.w), if (widget.callRefresh != null) {
child: Column( widget.callRefresh();
children: [ }
Container( },
alignment: Alignment.centerLeft, child: Container(
height: 88.w, color: Color(0xFFFFFFFF),
width: double.infinity, margin:
child: Row( widget.homeDisplay ? EdgeInsets.zero : EdgeInsets.only(top: 16.w),
children: [ padding: EdgeInsets.only(left: 24.w, right: 24.w),
Container( child: Column(
alignment: Alignment.center, children: [
width: 112.w, Container(
height: 40.w, alignment: Alignment.centerLeft,
decoration: BoxDecoration( height: 88.w,
border: Border.all(color: Color(0xFF3F8FFE), width: 2.w), width: double.infinity,
child: Row(
children: [
Container(
alignment: Alignment.center,
width: 112.w,
height: 40.w,
decoration: BoxDecoration(
border: Border.all(color: Color(0xFF3F8FFE), width: 2.w),
),
child: Text(
'物品出户',
style: TextStyle(
color: Color(0xFF3F8FFE),
fontSize: 20.sp,
fontWeight: FontWeight.bold),
),
), ),
child: Text( 16.w.widthBox,
'物品出户', //TODO
// Text(
// widget.model.create,
// style: TextStyle(
// color: AppStyle.minorTextColor,
// fontSize: 22.sp,
// ),
// ),
Spacer(),
Text(
widget.model.statusValue,
style: TextStyle( style: TextStyle(
color: Color(0xFF3F8FFE), color: widget.model.statusColor,
fontSize: 20.sp, fontSize: 24.sp,
fontWeight: FontWeight.bold), fontWeight: FontWeight.bold,
),
), ),
],
),
),
...widget.homeDisplay
? []
: [
Row(
children: [
Image.asset(
R.ASSETS_OUTDOOR_IC_HOME_PNG,
width: 40.w,
height: 40.w,
),
4.w.widthBox,
Text(
'小区名称',
style: _textStyle,
),
Spacer(),
Text(
'五象新区人才公寓',
style: AppStyle().primaryStyle,
),
],
),
],
12.w.heightBox,
Row(
children: [
Image.asset(
R.ASSETS_OUTDOOR_IC_ADDRESS_PNG,
width: 40.w,
height: 40.w,
), ),
16.w.widthBox, 4.w.widthBox,
//TODO Text('详细地址', style: _textStyle),
// Text(
// widget.model.create,
// style: TextStyle(
// color: AppStyle.minorTextColor,
// fontSize: 22.sp,
// ),
// ),
Spacer(), Spacer(),
Text( Text(
widget.model.statusValue, widget.model.roomName,
style: TextStyle( style: AppStyle().primaryStyle,
color: widget.model.statusColor,
fontSize: 24.sp,
fontWeight: FontWeight.bold,
),
), ),
], ],
), ),
), 12.w.heightBox,
...widget.homeDisplay Row(
? [] children: [
: [ Image.asset(
Row( R.ASSETS_OUTDOOR_IC_GOOUT_PNG,
children: [ width: 40.w,
Image.asset( height: 40.w,
R.ASSETS_OUTDOOR_IC_HOME_PNG, ),
width: 40.w, 4.w.widthBox,
height: 40.w, Text(
), '出户人',
4.w.widthBox, style: _textStyle,
Text( ),
'小区名称', Spacer(),
style: _textStyle, Text(
), widget.model.applicantName,
Spacer(), style: AppStyle().primaryStyle,
Text( ),
'五象新区人才公寓', ],
style: AppStyle().primaryStyle, ),
), ...widget.homeDisplay
], ? []
), : [
], 12.w.heightBox,
12.w.heightBox, Row(
Row( children: [
children: [ Image.asset(
Image.asset( R.ASSETS_OUTDOOR_IC_PEOPLE_PNG,
R.ASSETS_OUTDOOR_IC_ADDRESS_PNG, width: 40.w,
width: 40.w, height: 40.w,
height: 40.w, ),
), 4.w.widthBox,
4.w.widthBox, Text(
Text('详细地址', style: _textStyle), '身份',
Spacer(), style: _textStyle,
Text( ),
widget.model.roomName, Spacer(),
style: AppStyle().primaryStyle, Text(
), widget.model.identityValue,
], style: AppStyle().primaryStyle,
), ),
12.w.heightBox, ],
Row( ),
children: [ ],
Image.asset( 12.w.heightBox,
R.ASSETS_OUTDOOR_IC_GOOUT_PNG, Row(
width: 40.w, children: [
height: 40.w, Image.asset(
), R.ASSETS_OUTDOOR_IC_CHUHU_PNG,
4.w.widthBox, width: 40.w,
Text( height: 40.w,
'出户人', ),
style: _textStyle, Text(
), '出户物品',
Spacer(), style: _textStyle,
Text( ),
widget.model.applicantName, Spacer(),
style: AppStyle().primaryStyle, Text(
), widget.model.articleOutName,
], style: AppStyle().primaryStyle,
), ),
...widget.homeDisplay ],
? [] ),
: [ 12.w.heightBox,
12.w.heightBox, Row(
Row( children: [
children: [ Image.asset(
Image.asset( R.ASSETS_OUTDOOR_IC_TIME_PNG,
R.ASSETS_OUTDOOR_IC_PEOPLE_PNG, width: 40.w,
width: 40.w, height: 40.w,
height: 40.w, ),
), 4.w.widthBox,
4.w.widthBox, Text(
Text( '出户时间',
'身份', style: _textStyle,
style: _textStyle, ),
), Spacer(),
Spacer(), Text(
Text( widget.model.expectedTime,
widget.model.identityValue,
style: AppStyle().primaryStyle,
),
],
),
],
12.w.heightBox,
Row(
children: [
Image.asset(
R.ASSETS_OUTDOOR_IC_CHUHU_PNG,
width: 40.w,
height: 40.w,
),
Text(
'出户物品',
style: _textStyle,
),
Spacer(),
Text(
widget.model.articleOutName,
style: AppStyle().primaryStyle,
),
],
),
12.w.heightBox,
Row(
children: [
Image.asset(
R.ASSETS_OUTDOOR_IC_TIME_PNG,
width: 40.w,
height: 40.w,
),
4.w.widthBox,
Text(
'出户时间',
style: _textStyle,
),
Spacer(),
Text(
widget.model.expectedTime,
style: AppStyle().primaryStyle,
),
],
),
24.w.heightBox,
Divider(
height: 1.w,
),
Container(
height: 112.w,
alignment: Alignment.centerRight,
child: AkuButton(
onPressed: () async {
await Get.to(ItemsOutdoorDetailsPage(id: widget.model.id));
if (widget.callRefresh != null) {
widget.callRefresh();
}
},
child: Container(
alignment: Alignment.center,
width: 160.w,
height: 64.w,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(8.w),
gradient: LinearGradient(
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: [AppStyle.primaryColor, AppStyle.minorColor])),
child: Text(
'查看详情',
style: AppStyle().primaryStyle, style: AppStyle().primaryStyle,
), ),
],
),
24.w.heightBox,
Divider(
height: 1.w,
),
Container(
height: 112.w,
alignment: Alignment.centerRight,
child: AkuButton(
onPressed: () async {
await Get.to(ItemsOutdoorDetailsPage(id: widget.model.id));
if (widget.callRefresh != null) {
widget.callRefresh();
}
},
child: Container(
alignment: Alignment.center,
width: 160.w,
height: 64.w,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(8.w),
gradient: LinearGradient(
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: [
AppStyle.primaryColor,
AppStyle.minorColor
])),
child: Text(
'查看详情',
style: AppStyle().primaryStyle,
),
),
), ),
), ),
), ],
], ),
), ),
); );
} }

@ -132,6 +132,8 @@ class _PackageManageCardState extends State<PackageManageCard> {
params: {"packageCollectionId": packageCollectionId}); params: {"packageCollectionId": packageCollectionId});
if (!baseModel.status) { if (!baseModel.status) {
BotToast.showText(text: baseModel.message); BotToast.showText(text: baseModel.message);
} else {
BotToast.showText(text: '已成功提醒领取');
} }
} }

@ -28,201 +28,212 @@ class _ItemsOutdoorCardState extends State<ItemsOutdoorCard> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
TextStyle _textStyle = TextStyle _textStyle =
TextStyle(color: AppStyle.minorTextColor, fontSize: 28.sp); TextStyle(color: AppStyle.minorTextColor, fontSize: 28.sp);
return Container( return GestureDetector(
color: Color(0xFFFFFFFF), onTap: () async {
margin: EdgeInsets.only(top: 16.w), await Get.to(ItemsOutdoorDetailsPage(id: widget.model.id));
padding: EdgeInsets.only(left: 24.w, right: 24.w), if (widget.callRefresh != null) {
child: Column( widget.callRefresh();
children: [ }
Container( },
alignment: Alignment.centerLeft, child: Container(
height: 88.w, color: Color(0xFFFFFFFF),
width: double.infinity, margin: EdgeInsets.only(top: 16.w),
child: Row( padding: EdgeInsets.only(left: 24.w, right: 24.w),
children: [ child: Column(
Container( children: [
alignment: Alignment.center, Container(
width: 112.w, alignment: Alignment.centerLeft,
height: 40.w, height: 88.w,
decoration: BoxDecoration( width: double.infinity,
border: Border.all(color: Color(0xFF3F8FFE), width: 2.w), child: Row(
children: [
Container(
alignment: Alignment.center,
width: 112.w,
height: 40.w,
decoration: BoxDecoration(
border: Border.all(color: Color(0xFF3F8FFE), width: 2.w),
),
child: Text(
'物品出户',
style: TextStyle(
color: Color(0xFF3F8FFE),
fontSize: 20.sp,
fontWeight: FontWeight.bold),
),
), ),
child: Text( AkuBox.w(16),
'物品出户', //TODO
// Text(
// widget.model.create,
// style: TextStyle(
// color: AppStyle.minorTextColor,
// fontSize: 22.sp,
// ),
// ),
Spacer(),
Text(
widget.model.statusValue,
style: TextStyle( style: TextStyle(
color: Color(0xFF3F8FFE), color: widget.model.statusColor,
fontSize: 20.sp, fontSize: 24.sp,
fontWeight: FontWeight.bold), fontWeight: FontWeight.bold,
),
), ),
],
),
),
Row(
children: [
Image.asset(
R.ASSETS_OUTDOOR_IC_HOME_PNG,
width: 40.w,
height: 40.w,
),
AkuBox.w(4),
Text(
'小区名称',
style: _textStyle,
), ),
AkuBox.w(16),
//TODO
// Text(
// widget.model.create,
// style: TextStyle(
// color: AppStyle.minorTextColor,
// fontSize: 22.sp,
// ),
// ),
Spacer(), Spacer(),
Text( Text(
widget.model.statusValue, '五象新区人才公寓',
style: TextStyle( style: AppStyle().primaryStyle,
color: widget.model.statusColor,
fontSize: 24.sp,
fontWeight: FontWeight.bold,
),
), ),
], ],
), ),
), AkuBox.h(12),
Row( Row(
children: [ children: [
Image.asset( Image.asset(
R.ASSETS_OUTDOOR_IC_HOME_PNG, R.ASSETS_OUTDOOR_IC_ADDRESS_PNG,
width: 40.w, width: 40.w,
height: 40.w, height: 40.w,
), ),
AkuBox.w(4), AkuBox.w(4),
Text( Text('详细地址', style: _textStyle),
'小区名称', Spacer(),
style: _textStyle, Text(
), widget.model.roomName,
Spacer(),
Text(
'五象新区人才公寓',
style: AppStyle().primaryStyle,
),
],
),
AkuBox.h(12),
Row(
children: [
Image.asset(
R.ASSETS_OUTDOOR_IC_ADDRESS_PNG,
width: 40.w,
height: 40.w,
),
AkuBox.w(4),
Text('详细地址', style: _textStyle),
Spacer(),
Text(
widget.model.roomName,
style: AppStyle().primaryStyle,
),
],
),
AkuBox.h(12),
Row(
children: [
Image.asset(
R.ASSETS_OUTDOOR_IC_GOOUT_PNG,
width: 40.w,
height: 40.w,
),
AkuBox.w(4),
Text(
'出户人',
style: _textStyle,
),
Spacer(),
Text(
widget.model.applicantName,
style: AppStyle().primaryStyle,
),
],
),
AkuBox.h(12),
Row(
children: [
Image.asset(
R.ASSETS_OUTDOOR_IC_PEOPLE_PNG,
width: 40.w,
height: 40.w,
),
AkuBox.w(4),
Text(
'身份',
style: _textStyle,
),
Spacer(),
Text(
widget.model.identityValue,
style: AppStyle().primaryStyle,
),
],
),
AkuBox.h(12),
Row(
children: [
Image.asset(
R.ASSETS_OUTDOOR_IC_CHUHU_PNG,
width: 40.w,
height: 40.w,
),
Text(
'出户物品',
style: _textStyle,
),
Spacer(),
Text(
widget.model.articleOutName,
style: AppStyle().primaryStyle,
),
],
),
AkuBox.h(12),
Row(
children: [
Image.asset(
R.ASSETS_OUTDOOR_IC_TIME_PNG,
width: 40.w,
height: 40.w,
),
AkuBox.w(4),
Text(
'出户时间',
style: _textStyle,
),
Spacer(),
Text(
widget.model.expectedTime,
style: AppStyle().primaryStyle,
),
],
),
AkuBox.h(24),
Divider(
height: 1.w,
),
Container(
height: 112.w,
alignment: Alignment.centerRight,
child: AkuButton(
onPressed: () async {
await Get.to(ItemsOutdoorDetailsPage(id: widget.model.id));
if (widget.callRefresh != null) {
widget.callRefresh();
}
},
child: Container(
alignment: Alignment.center,
width: 160.w,
height: 64.w,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(8.w),
gradient: LinearGradient(
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: [AppStyle.primaryColor, AppStyle.minorColor])),
child: Text(
'查看详情',
style: AppStyle().primaryStyle, style: AppStyle().primaryStyle,
), ),
],
),
AkuBox.h(12),
Row(
children: [
Image.asset(
R.ASSETS_OUTDOOR_IC_GOOUT_PNG,
width: 40.w,
height: 40.w,
),
AkuBox.w(4),
Text(
'出户人',
style: _textStyle,
),
Spacer(),
Text(
widget.model.applicantName,
style: AppStyle().primaryStyle,
),
],
),
AkuBox.h(12),
Row(
children: [
Image.asset(
R.ASSETS_OUTDOOR_IC_PEOPLE_PNG,
width: 40.w,
height: 40.w,
),
AkuBox.w(4),
Text(
'身份',
style: _textStyle,
),
Spacer(),
Text(
widget.model.identityValue,
style: AppStyle().primaryStyle,
),
],
),
AkuBox.h(12),
Row(
children: [
Image.asset(
R.ASSETS_OUTDOOR_IC_CHUHU_PNG,
width: 40.w,
height: 40.w,
),
Text(
'出户物品',
style: _textStyle,
),
Spacer(),
Text(
widget.model.articleOutName,
style: AppStyle().primaryStyle,
),
],
),
AkuBox.h(12),
Row(
children: [
Image.asset(
R.ASSETS_OUTDOOR_IC_TIME_PNG,
width: 40.w,
height: 40.w,
),
AkuBox.w(4),
Text(
'出户时间',
style: _textStyle,
),
Spacer(),
Text(
widget.model.expectedTime,
style: AppStyle().primaryStyle,
),
],
),
AkuBox.h(24),
Divider(
height: 1.w,
),
Container(
height: 112.w,
alignment: Alignment.centerRight,
child: AkuButton(
onPressed: () async {
await Get.to(ItemsOutdoorDetailsPage(id: widget.model.id));
if (widget.callRefresh != null) {
widget.callRefresh();
}
},
child: Container(
alignment: Alignment.center,
width: 160.w,
height: 64.w,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(8.w),
gradient: LinearGradient(
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: [
AppStyle.primaryColor,
AppStyle.minorColor
])),
child: Text(
'查看详情',
style: AppStyle().primaryStyle,
),
),
), ),
), ),
), ],
], ),
), ),
); );
} }

Loading…
Cancel
Save