diff --git a/lib/models/message/notice_model.dart b/lib/models/message/notice_model.dart index e11906b..09d3efc 100644 --- a/lib/models/message/notice_model.dart +++ b/lib/models/message/notice_model.dart @@ -38,18 +38,6 @@ class NoticeModel extends Equatable { List get props => [id, type, status, title, content, sendDate, jumpId]; - Map toMap() { - return { - 'id': this.id, - 'type': this.type, - 'status': this.status, - 'title': this.title, - 'content': this.content, - 'sendDate': this.sendDate, - 'jumpId': this.jumpId, - }; - } - NoticeModel copyWith({ int? id, int? type, diff --git a/lib/models/message/notice_model.g.dart b/lib/models/message/notice_model.g.dart index 220e929..0276a2c 100644 --- a/lib/models/message/notice_model.g.dart +++ b/lib/models/message/notice_model.g.dart @@ -7,11 +7,11 @@ part of 'notice_model.dart'; // ************************************************************************** NoticeModel _$NoticeModelFromJson(Map json) => NoticeModel( - id: ['id'] as int, - type: ['type'] as int, - status: ['status'] as int, - title: ['title'] as String, - content: ['content'] as String, - sendDate: ['sendDate'] as String, - jumpId: ['jumpId'] as int, + id: json['id'] as int, + type: json['type'] as int, + status: json['status'] as int, + title: json['title'] as String, + content: json['content'] as String, + sendDate: json['sendDate'] as String, + jumpId: json['jumpId'] as int, ); \ No newline at end of file diff --git a/lib/new_ui/work_order/distributor/distributor_detail_page.dart b/lib/new_ui/work_order/distributor/distributor_detail_page.dart index 38a817d..94ee13b 100644 --- a/lib/new_ui/work_order/distributor/distributor_detail_page.dart +++ b/lib/new_ui/work_order/distributor/distributor_detail_page.dart @@ -222,15 +222,18 @@ class _DistributorDetailPageState extends State { }, text: '移至待分配'); case 3: - return BeeLongButton( - onPressed: () async { - var re = await WorkOrderFuc.reminderProcessing(widget.id); - if (re) { - _refreshController.callRefresh(); - } - }, - text: '提醒处理'); + return SizedBox.shrink(); case 4: + return BeeLongButton( + onPressed: () async { + var re = await WorkOrderFuc.reminderProcessing(widget.id); + if (re) { + _refreshController.callRefresh(); + } + }, + text: '提醒处理'); + + case 5: return BeeLongButton( onPressed: () async { var re = await WorkOrderFuc.reminderConfirm(widget.id); @@ -239,7 +242,8 @@ class _DistributorDetailPageState extends State { } }, text: '提醒用户确认'); - case 5: + + case 6: return BeeLongButton( onPressed: () async { WorkOrderFuc.getBill( @@ -255,8 +259,6 @@ class _DistributorDetailPageState extends State { ); }, text: '提醒支付'); - case 6: - case 7: case 8: diff --git a/lib/ui/home/messages/announce_view.dart b/lib/ui/home/messages/announce_view.dart index b3c7306..060f904 100644 --- a/lib/ui/home/messages/announce_view.dart +++ b/lib/ui/home/messages/announce_view.dart @@ -71,7 +71,6 @@ class _AnnounceViewState extends State { Rect.fromLTRB(0, 0, 0, MediaQuery.of(context).padding.top + 130.w), axis: Axis.vertical, ); - super.initState(); } @@ -102,7 +101,7 @@ class _AnnounceViewState extends State { await NetUtil().getList(SAASAPI.message.messageList, params: { 'pageNum': _page, 'size': _size, - 'type': 2, + 'type': null, }); _innerModelList = base.rows.map((e) => NoticeModel.fromJson(e)).toList(); @@ -110,7 +109,6 @@ class _AnnounceViewState extends State { if (_modelLists.isNotEmpty) { _headMonth = _modelLists[0].month; } - setState(() {}); }, onLoad: () async { @@ -119,7 +117,7 @@ class _AnnounceViewState extends State { await NetUtil().getList(SAASAPI.message.messageList, params: { 'pageNum': _page, 'size': _size, - 'type': 2, + 'type': null, }); if (base.total > _modelLists.length) { _innerModelList = @@ -127,7 +125,6 @@ class _AnnounceViewState extends State { monthListDepart(_innerModelList); setState(() {}); } else { - print('1111111'); _refreshController.finishLoadCallBack!(noMore: true); } },