xt / Flutter-ReserveApp · Commits

Go to a project

Commit 8db2665eab12554fef6bbc247cee5a32af442f8e

Authored by “gaiyaguang”
1 parent ba0c3a5b
build: skipped

合并

Inline Side-by-side
Showing 2 changed files with 349 additions and 346 deletions
@@ -31,7 +31,7 @@ class NotebookDetailPage extends StatefulWidget { @@ -31,7 +31,7 @@ class NotebookDetailPage extends StatefulWidget {
31 final String rid; 31 final String rid;
32 final bool fromNotify; 32 final bool fromNotify;
33 33
34 - NotebookDetailPage(this.rid, {this.fromNotify=false}); 34 + NotebookDetailPage(this.rid, {this.fromNotify = false});
35 35
36 @override 36 @override
37 State<StatefulWidget> createState() { 37 State<StatefulWidget> createState() {
@@ -143,7 +143,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -143,7 +143,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
143 "cause": json.encode(causeMap) 143 "cause": json.encode(causeMap)
144 }; 144 };
145 bool success = 145 bool success =
146 - await detailModel.setReserveStatus(context, params, ifPush: false); 146 + await detailModel.setReserveStatus(context, params, ifPush: false);
147 if (success) { 147 if (success) {
148 _getReserveDetail(); 148 _getReserveDetail();
149 } 149 }
@@ -170,7 +170,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -170,7 +170,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
170 context: context, 170 context: context,
171 barrierDismissible: false, 171 barrierDismissible: false,
172 barrierLabel: 172 barrierLabel:
173 - MaterialLocalizations.of(context).modalBarrierDismissLabel, 173 + MaterialLocalizations.of(context).modalBarrierDismissLabel,
174 transitionDuration: const Duration(milliseconds: 150), 174 transitionDuration: const Duration(milliseconds: 150),
175 pageBuilder: (BuildContext context, Animation animation, 175 pageBuilder: (BuildContext context, Animation animation,
176 Animation secondaryAnimation) { 176 Animation secondaryAnimation) {
@@ -197,7 +197,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -197,7 +197,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
197 decoration: BoxDecoration( 197 decoration: BoxDecoration(
198 color: Colors.white, 198 color: Colors.white,
199 borderRadius: 199 borderRadius:
200 - BorderRadius.circular(ScreenUtil().setWidth(10)), 200 + BorderRadius.circular(ScreenUtil().setWidth(10)),
201 ), 201 ),
202 child: Column( 202 child: Column(
203 mainAxisSize: MainAxisSize.min, 203 mainAxisSize: MainAxisSize.min,
@@ -277,7 +277,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -277,7 +277,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
277 Text(value['title'], 277 Text(value['title'],
278 style: TextStyle( 278 style: TextStyle(
279 fontSize: 279 fontSize:
280 - ScreenUtil().setSp(32), 280 + ScreenUtil().setSp(32),
281 fontWeight: FontWeight.normal, 281 fontWeight: FontWeight.normal,
282 decoration: TextDecoration.none, 282 decoration: TextDecoration.none,
283 color: MyColours.color_333333)) 283 color: MyColours.color_333333))
@@ -285,42 +285,42 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -285,42 +285,42 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
285 ), 285 ),
286 value['title'] == '其他原因' && isShowTF 286 value['title'] == '其他原因' && isShowTF
287 ? Material( 287 ? Material(
288 - child: Container(  
289 - color: Colors.white,  
290 - padding: EdgeInsets.only(  
291 - left:  
292 - ScreenUtil().setWidth(76)),  
293 - child: TextField(  
294 - maxLines: 1,  
295 - controller: _cancelController,  
296 - focusNode: _cancelNode,  
297 - textAlignVertical:  
298 - TextAlignVertical.bottom,  
299 - decoration: InputDecoration(  
300 - hintText: "请填写原因",  
301 - hintStyle: TextStyle(  
302 - color: MyColours.color_999999,  
303 - fontSize:  
304 - ScreenUtil().setSp(30),  
305 - ),  
306 - enabledBorder:  
307 - UnderlineInputBorder(  
308 - borderSide: BorderSide(  
309 - color: MyColours  
310 - .color_d8d8d8), 288 + child: Container(
  289 + color: Colors.white,
  290 + padding: EdgeInsets.only(
  291 + left:
  292 + ScreenUtil().setWidth(76)),
  293 + child: TextField(
  294 + maxLines: 1,
  295 + controller: _cancelController,
  296 + focusNode: _cancelNode,
  297 + textAlignVertical:
  298 + TextAlignVertical.bottom,
  299 + decoration: InputDecoration(
  300 + hintText: "请填写原因",
  301 + hintStyle: TextStyle(
  302 + color: MyColours.color_999999,
  303 + fontSize:
  304 + ScreenUtil().setSp(30),
  305 + ),
  306 + enabledBorder:
  307 + UnderlineInputBorder(
  308 + borderSide: BorderSide(
  309 + color: MyColours
  310 + .color_d8d8d8),
  311 + ),
  312 + // border: InputBorder.none,
311 ), 313 ),
312 - // border: InputBorder.none, 314 + onChanged: (_) {
  315 + setState(() {});
  316 + },
  317 + onEditingComplete: () {
  318 + print('fff');
  319 + _cancelNode.unfocus();
  320 + },
  321 + // keyboardType: TextInputType.number,
313 ), 322 ),
314 - onChanged: (_) {  
315 - setState(() {});  
316 - },  
317 - onEditingComplete: () {  
318 - print('fff');  
319 - _cancelNode.unfocus();  
320 - },  
321 - // keyboardType: TextInputType.number,  
322 - ),  
323 - )) 323 + ))
324 : Container(), 324 : Container(),
325 VEmptyView(40) 325 VEmptyView(40)
326 ]), 326 ]),
@@ -353,8 +353,8 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -353,8 +353,8 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
353 353
354 Navigator.of(context).pop(); 354 Navigator.of(context).pop();
355 Loading.showLoading(context); 355 Loading.showLoading(context);
356 - setReserveStatus('4', desc: desc);  
357 bus.emit("refresh_book_list"); 356 bus.emit("refresh_book_list");
  357 + setReserveStatus('4', desc: desc);
358 }, 358 },
359 text: '确认', 359 text: '确认',
360 height: ScreenUtil().setWidth(80), 360 height: ScreenUtil().setWidth(80),
@@ -379,321 +379,327 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -379,321 +379,327 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
379 return WillPopScope( 379 return WillPopScope(
380 child: detailEntity == null 380 child: detailEntity == null
381 ? Container( 381 ? Container(
382 - width: double.infinity,  
383 - height: double.infinity,  
384 - color: MyColours.color_ffffff,  
385 - ) 382 + width: double.infinity,
  383 + height: double.infinity,
  384 + color: MyColours.color_ffffff,
  385 + )
386 : Container( 386 : Container(
387 - color: MyColours.color_ffffff,  
388 - child: Column(  
389 - children: <Widget>[  
390 - SizedBox(height: ScreenUtil.statusBarHeight),  
391 - MyAppBar(  
392 - "订座详情",  
393 - showBack: true,  
394 - callback: (){  
395 - if(widget.fromNotify){  
396 - NavigatorUtil.goHomePage(context,initialIndex: 0);  
397 - }else{  
398 - Navigator.of(context).pop();  
399 - }  
400 - },  
401 - ),  
402 - Expanded(  
403 - child: DefaultTextStyle(  
404 - style: TextStyle(decoration: TextDecoration.none),  
405 - child: Container(  
406 - color: MyColours.color_ffffff,  
407 - child: SingleChildScrollView(  
408 - child: Container( 387 + color: MyColours.color_ffffff,
  388 + child: Column(
  389 + children: <Widget>[
  390 + SizedBox(height: ScreenUtil.statusBarHeight),
  391 + MyAppBar(
  392 + "订座详情",
  393 + showBack: true,
  394 + callback: () {
  395 + if (widget.fromNotify) {
  396 + NavigatorUtil.goHomePage(context, initialIndex: 0);
  397 + } else {
  398 + Navigator.of(context).pop();
  399 + }
  400 + },
  401 + ),
  402 + Expanded(
  403 + child: DefaultTextStyle(
  404 + style: TextStyle(decoration: TextDecoration.none),
  405 + child: Container(
409 color: MyColours.color_ffffff, 406 color: MyColours.color_ffffff,
410 - padding: EdgeInsets.symmetric(  
411 - horizontal: ScreenUtil().setWidth(43)),  
412 - child: Column(  
413 - children: <Widget>[  
414 - RowMultiText("用餐时段", detailEntity.ddateMd),  
415 - Stack(  
416 - alignment: Alignment.center,  
417 - children: <Widget>[  
418 - Column(  
419 - children: <Widget>[  
420 - RowMultiText(  
421 - "用餐时间", detailEntity.ddateHm),  
422 - Offstage(  
423 - offstage: detailEntity.type == "0"  
424 - ? false  
425 - : true,  
426 - child: RowMultiText(  
427 - "用餐人数", detailEntity.pnum),  
428 - )  
429 - ],  
430 - ),  
431 - Image.asset(  
432 - detailEntity.statuImgAssets,  
433 - width: ScreenUtil().setWidth(100),  
434 - height: ScreenUtil().setWidth(30),  
435 - )  
436 - ],  
437 - ),  
438 - Offstage(  
439 - offstage: detailEntity.demands.length <= 0  
440 - ? true  
441 - : false, 407 + child: SingleChildScrollView(
  408 + child: Container(
  409 + color: MyColours.color_ffffff,
  410 + padding: EdgeInsets.symmetric(
  411 + horizontal: ScreenUtil().setWidth(43)),
442 child: Column( 412 child: Column(
443 children: <Widget>[ 413 children: <Widget>[
  414 + RowMultiText("用餐时段", detailEntity.ddateMd),
  415 + Stack(
  416 + alignment: Alignment.center,
  417 + children: <Widget>[
  418 + Column(
  419 + children: <Widget>[
  420 + RowMultiText(
  421 + "用餐时间", detailEntity.ddateHm),
  422 + Offstage(
  423 + offstage: detailEntity.type == "0"
  424 + ? false
  425 + : true,
  426 + child: RowMultiText(
  427 + "用餐人数", detailEntity.pnum),
  428 + )
  429 + ],
  430 + ),
  431 + Image.asset(
  432 + detailEntity.statuImgAssets,
  433 + width: ScreenUtil().setWidth(100),
  434 + height: ScreenUtil().setWidth(30),
  435 + )
  436 + ],
  437 + ),
  438 + Offstage(
  439 + offstage: detailEntity.demands.length <= 0
  440 + ? true
  441 + : false,
  442 + child: Column(
  443 + children: <Widget>[
  444 + RowMultiText(
  445 + "包间需求",
  446 + (detailEntity.demands.length
  447 + .toString() +
  448 + "个") ??
  449 + ""),
  450 + Align(
  451 + alignment: Alignment.centerRight,
  452 + child: Offstage(
  453 + offstage: detailEntity
  454 + .demands.length >
  455 + 0
  456 + ? false
  457 + : true,
  458 + child: Container(
  459 + height: ScreenUtil()
  460 + .setHeight(210),
  461 + child: ListView.builder(
  462 + itemBuilder:
  463 + (BuildContext contxt,
  464 + int index) {
  465 + return NeedItem(
  466 + detailEntity
  467 + .demands[index]);
  468 + },
  469 + itemCount: detailEntity
  470 + .demands.length,
  471 + shrinkWrap: true,
  472 + scrollDirection:
  473 + Axis.horizontal,
  474 + ),
  475 + ),
  476 + ))
  477 + ],
  478 + ),
  479 + ),
444 RowMultiText( 480 RowMultiText(
445 - "包间需求",  
446 - (detailEntity.demands.length  
447 - .toString() +  
448 - "个") ??  
449 - ""), 481 + "预订桌位",
  482 + (detailEntity.tables.length.toString() +
  483 + "个")),
450 Align( 484 Align(
451 alignment: Alignment.centerRight, 485 alignment: Alignment.centerRight,
452 child: Offstage( 486 child: Offstage(
453 offstage: 487 offstage:
454 - detailEntity.demands.length >  
455 - 0  
456 - ? false  
457 - : true, 488 + detailEntity.tables.length > 0
  489 + ? false
  490 + : true,
458 child: Container( 491 child: Container(
459 - height:  
460 - ScreenUtil().setHeight(210), 492 + height: ScreenUtil().setHeight(210),
461 child: ListView.builder( 493 child: ListView.builder(
462 - itemBuilder:  
463 - (BuildContext contxt, 494 + itemBuilder: (BuildContext contxt,
464 int index) { 495 int index) {
465 - return NeedItem(detailEntity  
466 - .demands[index]); 496 + return TableItem(
  497 + detailEntity.tables[index]);
467 }, 498 },
468 - itemCount: detailEntity  
469 - .demands.length, 499 + itemCount:
  500 + detailEntity.tables.length,
470 shrinkWrap: true, 501 shrinkWrap: true,
471 - scrollDirection:  
472 - Axis.horizontal, 502 + scrollDirection: Axis.horizontal,
473 ), 503 ),
474 ), 504 ),
475 - ))  
476 - ],  
477 - ),  
478 - ),  
479 - RowMultiText(  
480 - "预订桌位",  
481 - (detailEntity.tables.length.toString() +  
482 - "个")),  
483 - Align(  
484 - alignment: Alignment.centerRight,  
485 - child: Offstage(  
486 - offstage: detailEntity.tables.length > 0  
487 - ? false  
488 - : true,  
489 - child: Container(  
490 - height: ScreenUtil().setHeight(210),  
491 - child: ListView.builder(  
492 - itemBuilder: (BuildContext contxt,  
493 - int index) {  
494 - return TableItem(  
495 - detailEntity.tables[index]);  
496 - },  
497 - itemCount:  
498 - detailEntity.tables.length,  
499 - shrinkWrap: true,  
500 - scrollDirection: Axis.horizontal, 505 + )),
  506 + RowMultiText("客户姓名", detailEntity.rnameStr),
  507 + RowMultiText(
  508 + "客户电话", detailEntity.phone ?? ""),
  509 + MyDivider(double.infinity,
  510 + ScreenUtil().setHeight(1)),
  511 + Container(
  512 + color: MyColours.color_ffffff,
  513 + width: double.infinity,
  514 + height: ScreenUtil().setHeight(80),
  515 + alignment: Alignment.center,
  516 + child: Stack(
  517 + alignment: Alignment.center,
  518 + children: <Widget>[
  519 + Positioned(
  520 + left: 0,
  521 + child: Text(
  522 + "客户经理",
  523 + style: TextStyle(
  524 + color: MyColours.color_828282,
  525 + fontSize:
  526 + ScreenUtil().setSp(30)),
  527 + ),
  528 + ),
  529 + Positioned(
  530 + right: 0,
  531 + child: GestureDetector(
  532 + onTap: () async {
  533 + List<String> list = [];
  534 + for (Manager manager
  535 + in managers) {
  536 + list.add(
  537 + manager.roleUserName);
  538 + }
  539 + DialogUtil
  540 + .showSelectCusmanDialog(
  541 + context, list, (value) {
  542 + if (value != null) {
  543 + setState(() {
  544 + cusmanText =
  545 + managers[value.first]
  546 + .userName;
  547 + });
  548 + _setCurrManager();
  549 + }
  550 + }).then((value) {});
  551 + },
  552 + child: Text(
  553 + cusmanText,
  554 + style: TextStyle(
  555 + color: MyColours.color_353535,
  556 + fontSize:
  557 + ScreenUtil().setSp(30),
  558 + decoration:
  559 + TextDecoration.underline,
  560 + ),
  561 + ),
  562 + ),
  563 + )
  564 + ],
501 ), 565 ),
502 ), 566 ),
503 - )),  
504 - RowMultiText("客户姓名", detailEntity.rnameStr),  
505 - RowMultiText(  
506 - "客户电话", detailEntity.phone ?? ""),  
507 - MyDivider(double.infinity,  
508 - ScreenUtil().setHeight(1)),  
509 - Container(  
510 - color: MyColours.color_ffffff,  
511 - width: double.infinity,  
512 - height: ScreenUtil().setHeight(80),  
513 - alignment: Alignment.center,  
514 - child: Stack(  
515 - alignment: Alignment.center,  
516 - children: <Widget>[  
517 - Positioned(  
518 - left: 0,  
519 - child: Text(  
520 - "客户经理",  
521 - style: TextStyle(  
522 - color: MyColours.color_828282,  
523 - fontSize:  
524 - ScreenUtil().setSp(30)),  
525 - ), 567 + Offstage(
  568 + offstage: detailEntity.note_name == '',
  569 + child: RowMultiText(
  570 + "记录人", detailEntity.note_name ?? ""),
526 ), 571 ),
527 - Positioned(  
528 - right: 0,  
529 - child: GestureDetector(  
530 - onTap: () async {  
531 - List<String> list = [];  
532 - for (Manager manager  
533 - in managers) {  
534 - list.add(manager.roleUserName);  
535 - }  
536 - DialogUtil.showSelectCusmanDialog(  
537 - context, list, (value) {  
538 - if (value != null) {  
539 - setState(() {  
540 - cusmanText =  
541 - managers[value.first]  
542 - .userName;  
543 - });  
544 - _setCurrManager();  
545 - }  
546 - }).then((value) {});  
547 - },  
548 - child: Text(  
549 - cusmanText,  
550 - style: TextStyle(  
551 - color: MyColours.color_353535,  
552 - fontSize:  
553 - ScreenUtil().setSp(30),  
554 - decoration:  
555 - TextDecoration.underline,  
556 - ),  
557 - ), 572 + Offstage(
  573 + offstage: (detailEntity.status == "4" &&
  574 + detailEntity.cancel != null)
  575 + ? false
  576 + : true,
  577 + child: Column(
  578 + children: <Widget>[
  579 + MyDivider(double.infinity,
  580 + ScreenUtil().setHeight(2)),
  581 + RowMultiText("取消原因",
  582 + detailEntity.cancel?.desc ?? "",
  583 + textAlign: TextAlign.left),
  584 + RowMultiText(
  585 + "取消时间",
  586 + detailEntity.cancel?.cdateStr ??
  587 + ""),
  588 + RowMultiText(
  589 + "操作人",
  590 + detailEntity.abolition == '2'
  591 + ? '顾客在线取消'
  592 + : detailEntity
  593 + .cancel?.uname ??
  594 + ""),
  595 + ],
558 ), 596 ),
559 - )  
560 - ],  
561 - ),  
562 - ),  
563 - Offstage(  
564 - offstage: detailEntity.note_name == '',  
565 - child: RowMultiText(  
566 - "记录人", detailEntity.note_name ?? ""),  
567 - ),  
568 - Offstage(  
569 - offstage: (detailEntity.status == "4" &&  
570 - detailEntity.cancel != null)  
571 - ? false  
572 - : true,  
573 - child: Column(  
574 - children: <Widget>[  
575 - MyDivider(double.infinity,  
576 - ScreenUtil().setHeight(2)),  
577 - RowMultiText("取消原因",  
578 - detailEntity.cancel?.desc ?? "",  
579 - textAlign: TextAlign.left),  
580 - RowMultiText(  
581 - "取消时间",  
582 - detailEntity.cancel?.cdateStr ??  
583 - ""),  
584 - RowMultiText(  
585 - "操作人",  
586 - detailEntity.abolition == '2'  
587 - ? '顾客在线取消'  
588 - : detailEntity.cancel?.uname ??  
589 - ""), 597 + ),
590 ], 598 ],
591 - ),  
592 - ),  
593 - ],  
594 - )), 599 + )),
  600 + ),
  601 + )),
  602 + ),
  603 + Offstage(
  604 + offstage: (detailEntity.status == "3" ||
  605 + detailEntity.status == "4" ||
  606 + detailEntity.status == "6")
  607 + ? true
  608 + : false,
  609 + child: Container(
  610 + width: double.infinity,
  611 + decoration: BoxDecoration(
  612 + color: MyColours.color_ffffff,
  613 + border: Border(
  614 + top: BorderSide(
  615 + color: MyColours.color_dbe3e3,
  616 + width: ScreenUtil().setWidth(1)))),
  617 + padding: EdgeInsets.symmetric(
  618 + horizontal: ScreenUtil().setHeight(40)),
  619 + margin: EdgeInsets.symmetric(
  620 + vertical: ScreenUtil().setHeight(20)),
  621 + child: CommonButton(
  622 + content: "通知客户",
  623 + width: 669,
  624 + height: 80,
  625 + fontSize: 34,
  626 + onPress: () {
  627 + DialogUtil.showShareDialog(context)?.then((value) {
  628 + switch (value) {
  629 + case 1: //微信
  630 + NavigatorUtil.goInvicationPage(
  631 + context,
  632 + detailEntity.id,
  633 + detailEntity.tableinfoStr,
  634 + detailEntity.ddate,
  635 + detailEntity.ddateStr);
  636 + break;
  637 + case 2: //短信
  638 + NavigatorUtil.goSmsPage(
  639 + context, detailEntity.id);
  640 + break;
  641 + case 3: //电话
  642 + if (detailEntity.phone != null &&
  643 + detailEntity.phone.isNotEmpty) {
  644 + Utils.goPhone(detailEntity.phone);
  645 + } else {
  646 + Utils.showToast("没有客户电话！");
  647 + }
  648 + break;
  649 + }
  650 + });
  651 + },
  652 + ),
595 ), 653 ),
596 - )),  
597 - ),  
598 - Offstage(  
599 - offstage: (detailEntity.status == "3" ||  
600 - detailEntity.status == "4" ||  
601 - detailEntity.status == "6")  
602 - ? true  
603 - : false,  
604 - child: Container(  
605 - width: double.infinity,  
606 - decoration: BoxDecoration(  
607 - color: MyColours.color_ffffff,  
608 - border: Border(  
609 - top: BorderSide(  
610 - color: MyColours.color_dbe3e3,  
611 - width: ScreenUtil().setWidth(1)))),  
612 - padding: EdgeInsets.symmetric(  
613 - horizontal: ScreenUtil().setHeight(40)),  
614 - margin: EdgeInsets.symmetric(  
615 - vertical: ScreenUtil().setHeight(20)),  
616 - child: CommonButton(  
617 - content: "通知客户",  
618 - width: 669,  
619 - height: 80,  
620 - fontSize: 34,  
621 - onPress: () {  
622 - DialogUtil.showShareDialog(context)?.then((value) {  
623 - switch (value) {  
624 - case 1: //微信  
625 - NavigatorUtil.goInvicationPage(  
626 - context,  
627 - detailEntity.id,  
628 - detailEntity.tableinfoStr,  
629 - detailEntity.ddate,  
630 - detailEntity.ddateStr);  
631 - break;  
632 - case 2: //短信  
633 - NavigatorUtil.goSmsPage(context, detailEntity.id);  
634 - break;  
635 - case 3: //电话  
636 - if (detailEntity.phone != null &&  
637 - detailEntity.phone.isNotEmpty) {  
638 - Utils.goPhone(detailEntity.phone);  
639 - } else {  
640 - Utils.showToast("没有客户电话！");  
641 - }  
642 - break;  
643 - }  
644 - });  
645 - },  
646 - ),  
647 - ),  
648 - ),  
649 - Offstage(  
650 - offstage: (detailEntity.status == "3" ||  
651 - detailEntity.status == "4" ||  
652 - detailEntity.status == "6")  
653 - ? true  
654 - : false,  
655 - child: Container(  
656 - width: double.infinity,  
657 - height: ScreenUtil().setWidth(80),  
658 - margin: EdgeInsets.symmetric(  
659 - horizontal: ScreenUtil().setHeight(40)),  
660 - decoration: BoxDecoration(  
661 - border: Border.all(  
662 - color: MyColours.color_199095,  
663 - width: ScreenUtil().setWidth(2)),  
664 - borderRadius:  
665 - BorderRadius.circular(ScreenUtil().setWidth(5)),  
666 - ),  
667 - // child: Text('fff'),  
668 - child: Material(  
669 - child: Row(  
670 - children: [  
671 - Expanded(  
672 - child: _cancelAndChangeBtn(() {  
673 - print('点击变更预订');  
674 - NavigatorUtil.goNoteBookChangePage(  
675 - context, detailEntity, widget.rid);  
676 - }, '变更预订')),  
677 - MyDivider(  
678 - ScreenUtil().setWidth(2),  
679 - ScreenUtil().setWidth(50),  
680 - color: MyColours.color_199095,  
681 - ),  
682 - Expanded(  
683 - child: _cancelAndChangeBtn(() {  
684 - _showCancelWidget(context);  
685 - }, '取消预订')),  
686 - ],  
687 - )), 654 + ),
  655 + Offstage(
  656 + offstage: (detailEntity.status == "3" ||
  657 + detailEntity.status == "4" ||
  658 + detailEntity.status == "6")
  659 + ? true
  660 + : false,
  661 + child: Container(
  662 + width: double.infinity,
  663 + height: ScreenUtil().setWidth(80),
  664 + margin: EdgeInsets.symmetric(
  665 + horizontal: ScreenUtil().setHeight(40)),
  666 + decoration: BoxDecoration(
  667 + border: Border.all(
  668 + color: MyColours.color_199095,
  669 + width: ScreenUtil().setWidth(2)),
  670 + borderRadius:
  671 + BorderRadius.circular(ScreenUtil().setWidth(5)),
  672 + ),
  673 + // child: Text('fff'),
  674 + child: Material(
  675 + child: Row(
  676 + children: [
  677 + Expanded(
  678 + child: _cancelAndChangeBtn(() {
  679 + print('点击变更预订');
  680 + NavigatorUtil.goNoteBookChangePage(
  681 + context, detailEntity, widget.rid);
  682 + }, '变更预订')),
  683 + MyDivider(
  684 + ScreenUtil().setWidth(2),
  685 + ScreenUtil().setWidth(50),
  686 + color: MyColours.color_199095,
  687 + ),
  688 + Expanded(
  689 + child: _cancelAndChangeBtn(() {
  690 + _showCancelWidget(context);
  691 + }, '取消预订')),
  692 + ],
  693 + )),
  694 + ),
  695 + ),
  696 + VEmptyView(ScreenUtil().setWidth(60))
  697 + ],
688 ), 698 ),
689 ), 699 ),
690 - VEmptyView(ScreenUtil().setWidth(60))  
691 - ],  
692 - ),  
693 - ),  
694 - onWillPop: ()async{  
695 - if(widget.fromNotify){  
696 - NavigatorUtil.goHomePage(context,initialIndex: 0); 700 + onWillPop: () async {
  701 + if (widget.fromNotify) {
  702 + NavigatorUtil.goHomePage(context, initialIndex: 0);
697 return true; 703 return true;
698 } 704 }
699 Navigator.of(context).pop(); 705 Navigator.of(context).pop();
@@ -45,12 +45,13 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -45,12 +45,13 @@ class NoteBookPageState extends State<NoteBookPage> {
45 userModel = Provider.of<UserModel>(context, listen: false); 45 userModel = Provider.of<UserModel>(context, listen: false);
46 _controller = EasyRefreshController(); 46 _controller = EasyRefreshController();
47 _initTime(); 47 _initTime();
  48 + bus.on("refresh_book_list", (args) {
  49 + _getReserveList();
  50 + });
  51 +
48 WidgetsBinding.instance.addPostFrameCallback((_) { 52 WidgetsBinding.instance.addPostFrameCallback((_) {
49 _getReserveList(); 53 _getReserveList();
50 _reserveCountDay(); 54 _reserveCountDay();
51 - bus.on("refresh_book_list", (args) {  
52 - _getReserveList();  
53 - });  
54 }); 55 });
55 } 56 }
56 57
@@ -251,19 +252,15 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -251,19 +252,15 @@ class NoteBookPageState extends State<NoteBookPage> {
251 setState(() { 252 setState(() {
252 DateTime dateNow = DateTime.now(); 253 DateTime dateNow = DateTime.now();
253 dateText = 254 dateText =
254 - Utils.addZeroNumber(day.month) + "-" +Utils.addZeroNumber(day.day); 255 + Utils.addZeroNumber(day.month) + "-" + Utils.addZeroNumber(day.day);
255 if (Utils.isOneDay(day, dateNow)) { 256 if (Utils.isOneDay(day, dateNow)) {
256 - dateText +=  
257 - " 今天";  
258 - } else if(Utils.isOneDay(day,dateNow.add(Duration(days: 1)))){  
259 - dateText +=  
260 - " 明天";  
261 - }else if(Utils.isOneDay(day,dateNow.add(Duration(days: 2)))){  
262 - dateText +=  
263 - " 后天";  
264 - }else{  
265 - dateText +=  
266 - " 周${Utils.formatWeekDayNum(day.weekday)}"; 257 + dateText += " 今天";
  258 + } else if (Utils.isOneDay(day, dateNow.add(Duration(days: 1)))) {
  259 + dateText += " 明天";
  260 + } else if (Utils.isOneDay(day, dateNow.add(Duration(days: 2)))) {
  261 + dateText += " 后天";
  262 + } else {
  263 + dateText += " 周${Utils.formatWeekDayNum(day.weekday)}";
267 } 264 }
268 dateTime = day; 265 dateTime = day;
269 }); 266 });