xt / Flutter-ReserveApp · Commits

Go to a project

Commit cf278d35689c4e46ca041e8aa0a0bba50dbb4a89

Authored by wdn127929
2 parents 0dd55734 ccb9c0c7
build: skipped

消息中心新增 纪念日提醒和完善预订信息提醒 还差推送栏数据接收

Inline Side-by-side
Showing 16 changed files with 292 additions and 26 deletions
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
@@ -131,6 +131,12 @@ class NewUnmessage extends Object { @@ -131,6 +131,12 @@ class NewUnmessage extends Object {
131 @JsonKey(name: 'store_cdate') 131 @JsonKey(name: 'store_cdate')
132 String storeCdate; 132 String storeCdate;
133 133
  134 + @JsonKey(name: 'desc')
  135 + String desc;
  136 +
  137 + @JsonKey(name: 'dtime')
  138 + String dtime;
  139 +
134 NewUnmessage( 140 NewUnmessage(
135 this.id, 141 this.id,
136 this.uid, 142 this.uid,
@@ -159,7 +165,9 @@ class NewUnmessage extends Object { @@ -159,7 +165,9 @@ class NewUnmessage extends Object {
159 this.payid, 165 this.payid,
160 this.gid, 166 this.gid,
161 this.phone, 167 this.phone,
162 - this.storeCdate); 168 + this.storeCdate,
  169 + this.desc,
  170 + this.dtime);
163 171
164 String get rnameStr { 172 String get rnameStr {
165 if (rname == null || rname == '' || rname == ' ') return ""; 173 if (rname == null || rname == '' || rname == ' ') return "";
@@ -180,7 +188,7 @@ class NewUnmessage extends Object { @@ -180,7 +188,7 @@ class NewUnmessage extends Object {
180 188
181 ///年月日 餐段 189 ///年月日 餐段
182 String get ddateStr { 190 String get ddateStr {
183 - if (message_type != '17' && message_type != '18') { 191 + if (message_type != '17' && message_type != '18' && message_type != '19') {
184 String ymd = ""; 192 String ymd = "";
185 if (ddate_long != null) { 193 if (ddate_long != null) {
186 DateTime dateTime = DateTime.fromMillisecondsSinceEpoch( 194 DateTime dateTime = DateTime.fromMillisecondsSinceEpoch(
@@ -208,6 +216,8 @@ class NewUnmessage extends Object { @@ -208,6 +216,8 @@ class NewUnmessage extends Object {
208 return '会员充值${price}元'; 216 return '会员充值${price}元';
209 } else if (message_type == '18') { 217 } else if (message_type == '18') {
210 return '${storeCdateShow} 存酒'; 218 return '${storeCdateShow} 存酒';
  219 + }else if (message_type == '19') {
  220 + return '${desc} ${dtime}';
211 } 221 }
212 } 222 }
213 } 223 }
@@ -69,7 +69,9 @@ NewUnmessage _$NewUnmessageFromJson(Map<String, dynamic> json) { @@ -69,7 +69,9 @@ NewUnmessage _$NewUnmessageFromJson(Map<String, dynamic> json) {
69 json['pay_id'] as String, 69 json['pay_id'] as String,
70 json['gid'] as String, 70 json['gid'] as String,
71 json['phone'] as String, 71 json['phone'] as String,
72 - json['store_cdate'] as String); 72 + json['store_cdate'] as String,
  73 + json['desc'] as String,
  74 + json['dtime'] as String);
73 } 75 }
74 76
75 Map<String, dynamic> _$NewUnmessageToJson(NewUnmessage instance) => 77 Map<String, dynamic> _$NewUnmessageToJson(NewUnmessage instance) =>
@@ -101,5 +103,7 @@ Map<String, dynamic> _$NewUnmessageToJson(NewUnmessage instance) => @@ -101,5 +103,7 @@ Map<String, dynamic> _$NewUnmessageToJson(NewUnmessage instance) =>
101 'pay_id': instance.payid, 103 'pay_id': instance.payid,
102 'gid': instance.gid, 104 'gid': instance.gid,
103 'phone': instance.phone, 105 'phone': instance.phone,
104 - 'store_cdate': instance.storeCdate 106 + 'store_cdate': instance.storeCdate,
  107 + 'desc': instance.desc,
  108 + 'dtime': instance.dtime
105 }; 109 };
@@ -28,7 +28,9 @@ class EditReserverPage extends StatefulWidget { @@ -28,7 +28,9 @@ class EditReserverPage extends StatefulWidget {
28 final String name; 28 final String name;
29 final String sex; 29 final String sex;
30 final bool needBtn; 30 final bool needBtn;
31 - EditReserverPage(this.rid, this.name, this.sex, {Key key, this.needBtn}) 31 + final String mid;
  32 + EditReserverPage(this.rid, this.name, this.sex, this.mid,
  33 + {Key key, this.needBtn})
32 : super(key: key); 34 : super(key: key);
33 35
34 @override 36 @override
@@ -110,6 +112,18 @@ class _EditReserverPageState extends State<EditReserverPage> { @@ -110,6 +112,18 @@ class _EditReserverPageState extends State<EditReserverPage> {
110 } 112 }
111 } 113 }
112 114
  115 + //处理在线预订
  116 + setMessageStatus() {
  117 + bus.emit("remove_untreated_message", widget.mid);
  118 + bus.emit("refresh_untreated_num"); //刷新未读消息数目
  119 + Map<String, String> params = {
  120 + "sid": Provider.of<UserModel>(context, listen: false).user.sellerid,
  121 + "id": widget.mid,
  122 + "status": "is_handle"
  123 + };
  124 + detailModel.setMessageStatus(context, params);
  125 + }
  126 +
113 _getContactData() async { 127 _getContactData() async {
114 Contact contact = await _contactPicker.selectContactWithNative(); 128 Contact contact = await _contactPicker.selectContactWithNative();
115 setState(() { 129 setState(() {
@@ -581,6 +595,10 @@ class _EditReserverPageState extends State<EditReserverPage> { @@ -581,6 +595,10 @@ class _EditReserverPageState extends State<EditReserverPage> {
581 .phoneController.text 595 .phoneController.text
582 .replaceAll(' ', '')); 596 .replaceAll(' ', ''));
583 if (sucess) { 597 if (sucess) {
  598 + if (widget.mid != '' &&
  599 + widget.mid != null) {
  600 + setMessageStatus();
  601 + }
584 EventBus().emit( 602 EventBus().emit(
585 "refresh_tablemanager"); //刷新桌位 603 "refresh_tablemanager"); //刷新桌位
586 bus.emit("refresh_book_list"); //刷新已预订列表 604 bus.emit("refresh_book_list"); //刷新已预订列表
@@ -2776,7 +2776,8 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -2776,7 +2776,8 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
2776 '', 2776 '',
2777 '', 2777 '',
2778 needBtn: 2778 needBtn:
2779 - false); 2779 + false,
  2780 + mid:widget.mid);
2780 } 2781 }
2781 }, 2782 },
2782 )) 2783 ))
@@ -78,8 +78,16 @@ class MessageDialogItemF extends StatelessWidget { @@ -78,8 +78,16 @@ class MessageDialogItemF extends StatelessWidget {
78 btnname = 'online_order_go'; 78 btnname = 'online_order_go';
79 } else if (message.message_type == "18") { 79 } else if (message.message_type == "18") {
80 titleText = "存酒\n超期"; 80 titleText = "存酒\n超期";
81 - bgcolor = MyColours.color_F78D94;  
82 - btnname = 'order_go'; 81 + bgcolor = MyColours.color_F2995F;
  82 + btnname = 'online_order_go';
  83 + } else if (message.message_type == "19") {
  84 + titleText = "纪念日\n提醒";
  85 + bgcolor = MyColours.color_F2995F;
  86 + btnname = 'online_order_go';
  87 + } else if (message.message_type == "20") {
  88 + titleText = "店内\n消息";
  89 + bgcolor = MyColours.color_5F7292;
  90 + btnname = 'store_info_go';
83 } 91 }
84 if (isTreated) { 92 if (isTreated) {
85 bgcolor = MyColours.color_BFC4D4; 93 bgcolor = MyColours.color_BFC4D4;
@@ -233,6 +241,44 @@ class MessageDialogItemF extends StatelessWidget { @@ -233,6 +241,44 @@ class MessageDialogItemF extends StatelessWidget {
233 }; 241 };
234 await messageDialogModel.setMessageStatus(context, params1); 242 await messageDialogModel.setMessageStatus(context, params1);
235 bus.emit("refresh_untreated_num"); //刷新未读消息数目 243 bus.emit("refresh_untreated_num"); //刷新未读消息数目
  244 + } else if (message.message_type == "19") {
  245 + //纪念日提醒
  246 + CustomerBySellerSunModel userHistoryEntity =
  247 + CustomerBySellerSunModel(
  248 + null,
  249 + null,
  250 + message.phone,
  251 + null,
  252 + null,
  253 + null,
  254 + null,
  255 + null,
  256 + null,
  257 + null,
  258 + null,
  259 + message.gid,
  260 + null,
  261 + null,
  262 + null,
  263 + null);
  264 +
  265 + NavigatorUtil.goCustomerDetailPage(
  266 + context, userHistoryEntity, FromPage.FromPageMessagePage);
  267 + bus.emit("remove_untreated_message", message.id);
  268 +
  269 + Map<String, String> params1 = {
  270 + "sid":
  271 + Provider.of<UserModel>(context, listen: false).user.sellerid,
  272 + "id": message.id,
  273 + "status": "is_read"
  274 + };
  275 + await messageDialogModel.setMessageStatus(context, params1);
  276 + bus.emit("refresh_untreated_num"); //刷新未读消息数目
  277 + } else if (message.message_type == "20") {
  278 + //完善客人信息
  279 + NavigatorUtil.goNotebookDetailPage(
  280 + context, message.rid.toString(), message.uid,
  281 + mid: message.id);
236 } 282 }
237 }, 283 },
238 child: Stack( 284 child: Stack(
@@ -281,7 +327,8 @@ class MessageDialogItemF extends StatelessWidget { @@ -281,7 +327,8 @@ class MessageDialogItemF extends StatelessWidget {
281 message.message_type == "12" || 327 message.message_type == "12" ||
282 message.message_type == "13" || 328 message.message_type == "13" ||
283 message.message_type == "17" || 329 message.message_type == "17" ||
284 - message.message_type == "18" 330 + message.message_type == "18" ||
  331 + message.message_type == "19"
285 ? Expanded( 332 ? Expanded(
286 child: Column( 333 child: Column(
287 crossAxisAlignment: CrossAxisAlignment.start, 334 crossAxisAlignment: CrossAxisAlignment.start,
@@ -492,12 +539,14 @@ class MessageDialogItemF extends StatelessWidget { @@ -492,12 +539,14 @@ class MessageDialogItemF extends StatelessWidget {
492 ], 539 ],
493 )) 540 ))
494 : SizedBox(), 541 : SizedBox(),
495 - message.message_type == "15" 542 + message.message_type == "15" || message.message_type == "20"
496 ? Column( 543 ? Column(
497 crossAxisAlignment: CrossAxisAlignment.start, 544 crossAxisAlignment: CrossAxisAlignment.start,
498 children: [ 545 children: [
499 Text( 546 Text(
500 - "请确认 ${DateUtil.formatDate(DateTime.parse(message.ddate.replaceAll('/', '-')), format: DateFormats.y_mo_d)} ${message.dsoltStr} \n${message.tableClassName ?? ''}${message.tableClassName == null ? '' : ' '}客人是否如约到店", 547 + message.message_type == "15"
  548 + ? "请确认 ${DateUtil.formatDate(DateTime.parse(message.ddate.replaceAll('/', '-')), format: DateFormats.y_mo_d)} ${message.dsoltStr} \n${message.tableClassName ?? ''}${message.tableClassName == null ? '' : ' '}客人是否如约到店"
  549 + : "请完善 ${DateUtil.formatDate(DateTime.parse(message.ddate.replaceAll('/', '-')), format: DateFormats.y_mo_d)} ${message.dsoltStr} \n${message.tableClassName ?? ''}${message.tableClassName == null ? '' : ' '}预订客人信息",
501 maxLines: 3, 550 maxLines: 3,
502 overflow: TextOverflow.ellipsis, 551 overflow: TextOverflow.ellipsis,
503 style: TextStyle( 552 style: TextStyle(
@@ -703,6 +752,46 @@ class MessageDialogItemF extends StatelessWidget { @@ -703,6 +752,46 @@ class MessageDialogItemF extends StatelessWidget {
703 await messageDialogModel.setMessageStatus( 752 await messageDialogModel.setMessageStatus(
704 context, params1); 753 context, params1);
705 bus.emit("refresh_untreated_num"); //刷新未读消息数目 754 bus.emit("refresh_untreated_num"); //刷新未读消息数目
  755 + } else if (message.message_type == "19") {
  756 + //纪念日提醒
  757 + CustomerBySellerSunModel userHistoryEntity =
  758 + CustomerBySellerSunModel(
  759 + null,
  760 + null,
  761 + message.phone,
  762 + null,
  763 + null,
  764 + null,
  765 + null,
  766 + null,
  767 + null,
  768 + null,
  769 + null,
  770 + message.gid,
  771 + null,
  772 + null,
  773 + null,
  774 + null);
  775 +
  776 + NavigatorUtil.goCustomerDetailPage(context,
  777 + userHistoryEntity, FromPage.FromPageMessagePage);
  778 + bus.emit("remove_untreated_message", message.id);
  779 +
  780 + Map<String, String> params1 = {
  781 + "sid": Provider.of<UserModel>(context, listen: false)
  782 + .user
  783 + .sellerid,
  784 + "id": message.id,
  785 + "status": "is_read"
  786 + };
  787 + await messageDialogModel.setMessageStatus(
  788 + context, params1);
  789 + bus.emit("refresh_untreated_num"); //刷新未读消息数目
  790 + } else if (message.message_type == "20") {
  791 + //完善客人信息
  792 + NavigatorUtil.goNotebookDetailPage(
  793 + context, message.rid.toString(), message.uid,
  794 + mid: message.id);
706 } 795 }
707 }, 796 },
708 child: Image.asset( 797 child: Image.asset(
@@ -75,8 +75,16 @@ class MessageItemF extends StatelessWidget { @@ -75,8 +75,16 @@ class MessageItemF extends StatelessWidget {
75 btnname = 'online_order_go'; 75 btnname = 'online_order_go';
76 } else if (message.message_type == "18") { 76 } else if (message.message_type == "18") {
77 titleText = "存酒\n超期"; 77 titleText = "存酒\n超期";
78 - bgcolor = MyColours.color_F78D94;  
79 - btnname = 'order_go'; 78 + bgcolor = MyColours.color_F2995F;
  79 + btnname = 'online_order_go';
  80 + } else if (message.message_type == "19") {
  81 + titleText = "纪念日\n提醒";
  82 + bgcolor = MyColours.color_F2995F;
  83 + btnname = 'online_order_go';
  84 + } else if (message.message_type == "20") {
  85 + titleText = "店内\n消息";
  86 + bgcolor = MyColours.color_5F7292;
  87 + btnname = 'store_info_go';
80 } 88 }
81 if (isTreated) { 89 if (isTreated) {
82 bgcolor = MyColours.color_BFC4D4; 90 bgcolor = MyColours.color_BFC4D4;
@@ -153,6 +161,35 @@ class MessageItemF extends StatelessWidget { @@ -153,6 +161,35 @@ class MessageItemF extends StatelessWidget {
153 161
154 NavigatorUtil.goCustomerDetailPage( 162 NavigatorUtil.goCustomerDetailPage(
155 context, userHistoryEntity, FromPage.FromPageMessagePage); 163 context, userHistoryEntity, FromPage.FromPageMessagePage);
  164 + } else if (message.message_type == "19") {
  165 + //纪念日提醒
  166 + CustomerBySellerSunModel userHistoryEntity =
  167 + CustomerBySellerSunModel(
  168 + null,
  169 + null,
  170 + message.phone,
  171 + // '057128223456',
  172 + null,
  173 + null,
  174 + null,
  175 + null,
  176 + null,
  177 + null,
  178 + null,
  179 + null,
  180 + message.gid,
  181 + // '19358',
  182 + null,
  183 + null,
  184 + null,
  185 + null);
  186 +
  187 + NavigatorUtil.goCustomerDetailPage(
  188 + context, userHistoryEntity, FromPage.FromPageMessagePage);
  189 + } else if (message.message_type == "20") {
  190 + //完善客人信息
  191 + NavigatorUtil.goNotebookDetailPage(
  192 + context, message.rid.toString(), message.uid);
156 } 193 }
157 } else { 194 } else {
158 messageDialogModel.removeMessage(message.id); 195 messageDialogModel.removeMessage(message.id);
@@ -304,6 +341,45 @@ class MessageItemF extends StatelessWidget { @@ -304,6 +341,45 @@ class MessageItemF extends StatelessWidget {
304 }; 341 };
305 await messageDialogModel.setMessageStatus(context, params1); 342 await messageDialogModel.setMessageStatus(context, params1);
306 bus.emit("refresh_untreated_num"); //刷新未读消息数目 343 bus.emit("refresh_untreated_num"); //刷新未读消息数目
  344 + } else if (message.message_type == "19") {
  345 + //纪念日提醒
  346 + CustomerBySellerSunModel userHistoryEntity =
  347 + CustomerBySellerSunModel(
  348 + null,
  349 + null,
  350 + message.phone,
  351 + null,
  352 + null,
  353 + null,
  354 + null,
  355 + null,
  356 + null,
  357 + null,
  358 + null,
  359 + message.gid,
  360 + null,
  361 + null,
  362 + null,
  363 + null);
  364 +
  365 + NavigatorUtil.goCustomerDetailPage(
  366 + context, userHistoryEntity, FromPage.FromPageMessagePage);
  367 + bus.emit("remove_untreated_message", message.id);
  368 +
  369 + Map<String, String> params1 = {
  370 + "sid": Provider.of<UserModel>(context, listen: false)
  371 + .user
  372 + .sellerid,
  373 + "id": message.id,
  374 + "status": "is_read"
  375 + };
  376 + await messageDialogModel.setMessageStatus(context, params1);
  377 + bus.emit("refresh_untreated_num"); //刷新未读消息数目
  378 + } else if (message.message_type == "20") {
  379 + //完善客人信息
  380 + NavigatorUtil.goNotebookDetailPage(
  381 + context, message.rid.toString(), message.uid,
  382 + mid: message.id);
307 } 383 }
308 } 384 }
309 }, 385 },
@@ -339,6 +415,7 @@ class MessageItemF extends StatelessWidget { @@ -339,6 +415,7 @@ class MessageItemF extends StatelessWidget {
339 offset: Offset(0, 0.1 / 2), //1为 StrutStyle 的 leading的值 415 offset: Offset(0, 0.1 / 2), //1为 StrutStyle 的 leading的值
340 child: Text( 416 child: Text(
341 titleText, 417 titleText,
  418 + textAlign: TextAlign.center,
342 style: TextStyle( 419 style: TextStyle(
343 color: MyColours.color_ffffff, 420 color: MyColours.color_ffffff,
344 fontSize: ScreenUtil().setSp(24), 421 fontSize: ScreenUtil().setSp(24),
@@ -353,7 +430,8 @@ class MessageItemF extends StatelessWidget { @@ -353,7 +430,8 @@ class MessageItemF extends StatelessWidget {
353 message.message_type == "12" || 430 message.message_type == "12" ||
354 message.message_type == "13" || 431 message.message_type == "13" ||
355 message.message_type == "17" || 432 message.message_type == "17" ||
356 - message.message_type == "18" 433 + message.message_type == "18" ||
  434 + message.message_type == "19"
357 ? Expanded( 435 ? Expanded(
358 child: Column( 436 child: Column(
359 crossAxisAlignment: CrossAxisAlignment.start, 437 crossAxisAlignment: CrossAxisAlignment.start,
@@ -564,13 +642,15 @@ class MessageItemF extends StatelessWidget { @@ -564,13 +642,15 @@ class MessageItemF extends StatelessWidget {
564 ], 642 ],
565 )) 643 ))
566 : SizedBox(), 644 : SizedBox(),
567 - message.message_type == "15" 645 + message.message_type == "15" || message.message_type == "20"
568 ? Expanded( 646 ? Expanded(
569 child: Column( 647 child: Column(
570 crossAxisAlignment: CrossAxisAlignment.start, 648 crossAxisAlignment: CrossAxisAlignment.start,
571 children: [ 649 children: [
572 Text( 650 Text(
573 - "请确认 ${DateUtil.formatDate(DateTime.parse(message.ddate.replaceAll('/', '-')), format: DateFormats.y_mo_d)} ${message.dsoltStr} \n${message.tableClassName ?? ''}${message.tableClassName == null ? '' : ' '}客人是否如约到店", 651 + message.message_type == "15"
  652 + ? "请确认 ${DateUtil.formatDate(DateTime.parse(message.ddate.replaceAll('/', '-')), format: DateFormats.y_mo_d)} ${message.dsoltStr} \n${message.tableClassName ?? ''}${message.tableClassName == null ? '' : ' '}客人是否如约到店"
  653 + : "请完善 ${DateUtil.formatDate(DateTime.parse(message.ddate.replaceAll('/', '-')), format: DateFormats.y_mo_d)} ${message.dsoltStr} \n${message.tableClassName ?? ''}${message.tableClassName == null ? '' : ' '}预订客人信息",
574 maxLines: 3, 654 maxLines: 3,
575 overflow: TextOverflow.ellipsis, 655 overflow: TextOverflow.ellipsis,
576 style: TextStyle( 656 style: TextStyle(
@@ -775,6 +855,46 @@ class MessageItemF extends StatelessWidget { @@ -775,6 +855,46 @@ class MessageItemF extends StatelessWidget {
775 await messageDialogModel.setMessageStatus( 855 await messageDialogModel.setMessageStatus(
776 context, params1); 856 context, params1);
777 bus.emit("refresh_untreated_num"); //刷新未读消息数目 857 bus.emit("refresh_untreated_num"); //刷新未读消息数目
  858 + } else if (message.message_type == "19") {
  859 + //纪念日提醒
  860 + CustomerBySellerSunModel userHistoryEntity =
  861 + CustomerBySellerSunModel(
  862 + null,
  863 + null,
  864 + message.phone,
  865 + null,
  866 + null,
  867 + null,
  868 + null,
  869 + null,
  870 + null,
  871 + null,
  872 + null,
  873 + message.gid,
  874 + null,
  875 + null,
  876 + null,
  877 + null);
  878 +
  879 + NavigatorUtil.goCustomerDetailPage(context,
  880 + userHistoryEntity, FromPage.FromPageMessagePage);
  881 + bus.emit("remove_untreated_message", message.id);
  882 +
  883 + Map<String, String> params1 = {
  884 + "sid": Provider.of<UserModel>(context, listen: false)
  885 + .user
  886 + .sellerid,
  887 + "id": message.id,
  888 + "status": "is_read"
  889 + };
  890 + await messageDialogModel.setMessageStatus(
  891 + context, params1);
  892 + bus.emit("refresh_untreated_num"); //刷新未读消息数目
  893 + } else if (message.message_type == "20") {
  894 + //完善客人信息
  895 + NavigatorUtil.goNotebookDetailPage(
  896 + context, message.rid.toString(), message.uid,
  897 + mid: message.id);
778 } 898 }
779 }, 899 },
780 child: Image.asset( 900 child: Image.asset(
@@ -87,7 +87,20 @@ class MessageTreatedPageState extends State<MessageTreatedPage> { @@ -87,7 +87,20 @@ class MessageTreatedPageState extends State<MessageTreatedPage> {
87 model7.title = '存酒超期'; 87 model7.title = '存酒超期';
88 model7.select = false; 88 model7.select = false;
89 89
90 - menuTitle = [model1, model2, model3, model4, model5, model6, model7]; 90 + MessageMenuModel model8 = MessageMenuModel();
  91 + model8.title = '纪念日';
  92 + model8.select = false;
  93 +
  94 + menuTitle = [
  95 + model1,
  96 + model2,
  97 + model3,
  98 + model4,
  99 + model5,
  100 + model6,
  101 + model7,
  102 + model8
  103 + ];
91 // menuTitle = [model1, model2, model3, model4, model5]; 104 // menuTitle = [model1, model2, model3, model4, model5];
92 } 105 }
93 106
@@ -178,6 +191,10 @@ class MessageTreatedPageState extends State<MessageTreatedPage> { @@ -178,6 +191,10 @@ class MessageTreatedPageState extends State<MessageTreatedPage> {
178 //存酒超期 191 //存酒超期
179 typeid = '18'; 192 typeid = '18';
180 } 193 }
  194 + else if (index == 7) {
  195 + //纪念日
  196 + typeid = '19';
  197 + }
181 getMessage(typeid, showLoading: true); 198 getMessage(typeid, showLoading: true);
182 }, 199 },
183 child: Container( 200 child: Container(
@@ -216,12 +216,19 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { @@ -216,12 +216,19 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
216 DateUtil.formatDate(DateTime.now(), format: DateFormats.y_mo_d) + 216 DateUtil.formatDate(DateTime.now(), format: DateFormats.y_mo_d) +
217 ' 00:00:00'; 217 ' 00:00:00';
218 DateTime datenow = DateUtil.getDateTime(from); 218 DateTime datenow = DateUtil.getDateTime(from);
  219 +
219 //比较相差的天数 220 //比较相差的天数
220 - int day = edate.difference(datenow).inDays; 221 + int difference = edate.difference(datenow).inDays;
  222 +
  223 + int differenceSeconds = edate.difference(datenow).inSeconds;
  224 +
  225 + if (difference < 0 || (difference == 0 && differenceSeconds <= 0)) {
  226 + //过期
  227 + outDay = '0';
  228 + } else {
  229 + outDay = difference.toString();
  230 + }
221 231
222 - // difference < 0 || (difference == 0 && differenceSeconds <= 0  
223 -  
224 - outDay = day < 0 ? '0' : day.toString();  
225 // print(outDay); 232 // print(outDay);
226 } else { 233 } else {
227 outDay = '0'; 234 outDay = '0';
@@ -574,9 +574,9 @@ class NavigatorUtil { @@ -574,9 +574,9 @@ class NavigatorUtil {
574 /// 填写预订联系人页面 574 /// 填写预订联系人页面
575 static Future<dynamic> goEditReserverPage( 575 static Future<dynamic> goEditReserverPage(
576 BuildContext context, String rid, String name, String sex, 576 BuildContext context, String rid, String name, String sex,
577 - {replace = false, bool needBtn = false}) { 577 + {replace = false, bool needBtn = false, String mid}) {
578 return _navigateTo(context, 578 return _navigateTo(context,
579 - "${Routes.edit_reserver_page}?rid=${rid}&needBtn=$needBtn&name=${Uri.encodeComponent(name)}&sex=$sex", 579 + "${Routes.edit_reserver_page}?rid=${rid}&mid=${mid}&needBtn=$needBtn&name=${Uri.encodeComponent(name)}&sex=$sex",
580 replace: replace); 580 replace: replace);
581 } 581 }
582 582
@@ -328,7 +328,7 @@ var reserveDetailHandler = new Handler( @@ -328,7 +328,7 @@ var reserveDetailHandler = new Handler(
328 var editReserverPageHandle = new Handler( 328 var editReserverPageHandle = new Handler(
329 handlerFunc: (BuildContext context, Map<String, List<Object>> params) { 329 handlerFunc: (BuildContext context, Map<String, List<Object>> params) {
330 String rid = params['rid'].first; 330 String rid = params['rid'].first;
331 - // String mid = params['mid'].first; 331 + String mid = params['mid'].first;
332 // String uid = params['uid'].first; 332 // String uid = params['uid'].first;
333 String name = params["name"].first; 333 String name = params["name"].first;
334 String sex = params["sex"].first; 334 String sex = params["sex"].first;
@@ -337,8 +337,8 @@ var editReserverPageHandle = new Handler( @@ -337,8 +337,8 @@ var editReserverPageHandle = new Handler(
337 create: (_) => NotebookDetailModel(), 337 create: (_) => NotebookDetailModel(),
338 child: ChangeNotifierProvider<CouponProvider>( 338 child: ChangeNotifierProvider<CouponProvider>(
339 create: (_) => CouponProvider(), 339 create: (_) => CouponProvider(),
340 - child: EditReserverPage(rid, name, sex, needBtn: needBtn  
341 - // mid: mid, 340 + child: EditReserverPage(rid, name, sex, mid, needBtn: needBtn
  341 + // mid:
342 // uid: uid, 342 // uid: uid,
343 // fromNotify: fromNotify, 343 // fromNotify: fromNotify,
344 ))); 344 )));