xt / Flutter-ReserveApp · Commits

Go to a project

Commit fc4ce8472fc8cf179ad1ccf117262d02fa425a53

Authored by wdn127929
1 parent ff23faf9
build: skipped

新建分支

Inline Side-by-side
Showing 2 changed files with 756 additions and 685 deletions
@@ -11,14 +11,14 @@ if (flutterRoot == null) { @@ -11,14 +11,14 @@ if (flutterRoot == null) {
11 throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") 11 throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
12 } 12 }
13 13
14 -def flutterVersionCode = "280" 14 +def flutterVersionCode = "282"
15 if (flutterVersionCode == null) { 15 if (flutterVersionCode == null) {
16 - flutterVersionCode = '280' 16 + flutterVersionCode = '282'
17 } 17 }
18 18
19 -def flutterVersionName = "2.8.0" 19 +def flutterVersionName = "2.8.2"
20 if (flutterVersionName == null) { 20 if (flutterVersionName == null) {
21 - flutterVersionName = '2.8.0' 21 + flutterVersionName = '2.8.2'
22 } 22 }
23 23
24 apply plugin: 'com.android.application' 24 apply plugin: 'com.android.application'
@@ -491,193 +491,196 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -491,193 +491,196 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
491 print(widget.uid); 491 print(widget.uid);
492 return Scaffold( 492 return Scaffold(
493 resizeToAvoidBottomInset: false, 493 resizeToAvoidBottomInset: false,
494 - body: SafeArea(  
495 - child: WillPopScope(  
496 - child: Container(  
497 - color: MyColours.color_ffffff,  
498 - child: Column(  
499 - children: <Widget>[  
500 - MyAppBar(  
501 - "订座详情",  
502 - showBack: true,  
503 - callback: () {  
504 - if (widget.fromNotify) {  
505 - NavigatorUtil.goHomePage(context, initialIndex: 0);  
506 - } else {  
507 - Navigator.of(context).pop();  
508 - }  
509 - },  
510 - ),  
511 - Expanded(child:  
512 - Consumer<NotebookDetailModel>(builder: (context, model, _) {  
513 - if (model.pageState != PageState.Success) {  
514 - return ExceptionPage(  
515 - pageState: model.pageState,  
516 - callback: () async {  
517 - // _getOrderListData();  
518 - _initCancel();  
519 - _getReserveDetail();  
520 - _getOrderInfo();  
521 - managers = await detailModel.getManagers(context); 494 + body: InkWell(
  495 + onTap: () {
  496 + FocusScope.of(context).requestFocus(FocusNode()); //隐藏键盘
  497 + },
  498 + child: SafeArea(
  499 + child: WillPopScope(
  500 + child: Container(
  501 + color: MyColours.color_ffffff,
  502 + child: Column(
  503 + children: <Widget>[
  504 + MyAppBar(
  505 + "订座详情",
  506 + showBack: true,
  507 + callback: () {
  508 + if (widget.fromNotify) {
  509 + NavigatorUtil.goHomePage(context, initialIndex: 0);
  510 + } else {
  511 + Navigator.of(context).pop();
  512 + }
522 }, 513 },
523 - emptyMsg: "暂时没有预订列表信息哦",  
524 - emptyImg: "empty_search",  
525 - showMsg: "加载中，请稍后...",  
526 - );  
527 - } else {  
528 - return Column(  
529 - children: [  
530 - Expanded(  
531 - child: DefaultTextStyle(  
532 - style: TextStyle(decoration: TextDecoration.none),  
533 - child: Container(  
534 - color: MyColours.color_ffffff,  
535 - child: SingleChildScrollView( 514 + ),
  515 + Expanded(child: Consumer<NotebookDetailModel>(
  516 + builder: (context, model, _) {
  517 + if (model.pageState != PageState.Success) {
  518 + return ExceptionPage(
  519 + pageState: model.pageState,
  520 + callback: () async {
  521 + // _getOrderListData();
  522 + _initCancel();
  523 + _getReserveDetail();
  524 + _getOrderInfo();
  525 + managers = await detailModel.getManagers(context);
  526 + },
  527 + emptyMsg: "暂时没有预订列表信息哦",
  528 + emptyImg: "empty_search",
  529 + showMsg: "加载中，请稍后...",
  530 + );
  531 + } else {
  532 + return Column(
  533 + children: [
  534 + Expanded(
  535 + child: DefaultTextStyle(
  536 + style:
  537 + TextStyle(decoration: TextDecoration.none),
536 child: Container( 538 child: Container(
537 - color: MyColours.color_ffffff,  
538 - padding: EdgeInsets.symmetric(  
539 - horizontal: ScreenUtil().setWidth(43)),  
540 - child: Column(  
541 - children: <Widget>[  
542 - RowMultiText(  
543 - "用餐时段", detailEntity.ddateMd),  
544 - Stack(  
545 - alignment: Alignment.center, 539 + color: MyColours.color_ffffff,
  540 + child: SingleChildScrollView(
  541 + child: Container(
  542 + color: MyColours.color_ffffff,
  543 + padding: EdgeInsets.symmetric(
  544 + horizontal:
  545 + ScreenUtil().setWidth(43)),
  546 + child: Column(
546 children: <Widget>[ 547 children: <Widget>[
547 - Column( 548 + RowMultiText(
  549 + "用餐时段", detailEntity.ddateMd),
  550 + Stack(
  551 + alignment: Alignment.center,
548 children: <Widget>[ 552 children: <Widget>[
549 - RowMultiText("用餐时间",  
550 - detailEntity.ddateHm), 553 + Column(
  554 + children: <Widget>[
  555 + RowMultiText("用餐时间",
  556 + detailEntity.ddateHm),
  557 + ],
  558 + ),
  559 + Image.asset(
  560 + detailEntity.statuImgAssets,
  561 + width: ScreenUtil()
  562 + .setWidth(114),
  563 + height:
  564 + ScreenUtil().setWidth(56),
  565 + )
551 ], 566 ],
552 ), 567 ),
553 - Image.asset(  
554 - detailEntity.statuImgAssets,  
555 - width: ScreenUtil().setWidth(114),  
556 - height: ScreenUtil().setWidth(56),  
557 - )  
558 - ],  
559 - ),  
560 - Offstage(  
561 - offstage: detailEntity.type == "0"  
562 - ? false  
563 - : true,  
564 - child: TitleAndBtn(  
565 - title: "用餐人数",  
566 - bookNum: detailEntity.pnum,  
567 - pnumlist: personNumList,  
568 - detailModel: model,  
569 - callback: () {  
570 - detailModel.upReserveInfo(context,  
571 - rid: widget.rid,  
572 - actualPum:  
573 - detailModel.selectNum);  
574 - },  
575 - ),  
576 - ),  
577 - Offstage(  
578 - offstage:  
579 - detailEntity.demands.length <= 0  
580 - ? true  
581 - : false,  
582 - child: Column(  
583 - children: <Widget>[  
584 - RowMultiText(  
585 - "包间需求",  
586 - (detailEntity.demands.length  
587 - .toString() +  
588 - "个") ??  
589 - ""),  
590 - Align(  
591 - alignment:  
592 - Alignment.centerRight,  
593 - child: Offstage(  
594 - offstage: detailEntity  
595 - .demands  
596 - .length >  
597 - 0  
598 - ? false  
599 - : true,  
600 - child: Container(  
601 - height: ScreenUtil()  
602 - .setHeight(210),  
603 - child: ListView.builder(  
604 - itemBuilder:  
605 - (BuildContext  
606 - contxt,  
607 - int index) {  
608 - return NeedItem(  
609 - detailEntity  
610 - .demands[  
611 - index]);  
612 - },  
613 - itemCount: detailEntity  
614 - .demands.length,  
615 - shrinkWrap: true,  
616 - scrollDirection:  
617 - Axis.horizontal,  
618 - ),  
619 - ),  
620 - ))  
621 - ],  
622 - ),  
623 - ),  
624 - RowMultiText(  
625 - "预订桌位",  
626 - (detailEntity.tables.length  
627 - .toString() +  
628 - "个")),  
629 - Align(  
630 - alignment: Alignment.centerRight,  
631 - child: Offstage( 568 + Offstage(
  569 + offstage: detailEntity.type == "0"
  570 + ? false
  571 + : true,
  572 + child: TitleAndBtn(
  573 + title: "用餐人数",
  574 + bookNum: detailEntity.pnum,
  575 + pnumlist: personNumList,
  576 + detailModel: model,
  577 + callback: () {
  578 + detailModel.upReserveInfo(
  579 + context,
  580 + rid: widget.rid,
  581 + actualPum: detailModel
  582 + .selectNum);
  583 + },
  584 + ),
  585 + ),
  586 + Offstage(
632 offstage: 587 offstage:
633 - detailEntity.tables.length > 0 588 + detailEntity.demands.length <=
  589 + 0
  590 + ? true
  591 + : false,
  592 + child: Column(
  593 + children: <Widget>[
  594 + RowMultiText(
  595 + "包间需求",
  596 + (detailEntity.demands
  597 + .length
  598 + .toString() +
  599 + "个") ??
  600 + ""),
  601 + Align(
  602 + alignment:
  603 + Alignment.centerRight,
  604 + child: Offstage(
  605 + offstage: detailEntity
  606 + .demands
  607 + .length >
  608 + 0
  609 + ? false
  610 + : true,
  611 + child: Container(
  612 + height: ScreenUtil()
  613 + .setHeight(210),
  614 + child:
  615 + ListView.builder(
  616 + itemBuilder:
  617 + (BuildContext
  618 + contxt,
  619 + int index) {
  620 + return NeedItem(
  621 + detailEntity
  622 + .demands[
  623 + index]);
  624 + },
  625 + itemCount:
  626 + detailEntity
  627 + .demands
  628 + .length,
  629 + shrinkWrap: true,
  630 + scrollDirection:
  631 + Axis.horizontal,
  632 + ),
  633 + ),
  634 + ))
  635 + ],
  636 + ),
  637 + ),
  638 + RowMultiText(
  639 + "预订桌位",
  640 + (detailEntity.tables.length
  641 + .toString() +
  642 + "个")),
  643 + Align(
  644 + alignment:
  645 + Alignment.centerRight,
  646 + child: Offstage(
  647 + offstage: detailEntity
  648 + .tables.length >
  649 + 0
634 ? false 650 ? false
635 : true, 651 : true,
636 - child: Container(  
637 - height:  
638 - ScreenUtil().setHeight(210),  
639 - child: ListView.builder(  
640 - itemBuilder:  
641 - (BuildContext contxt,  
642 - int index) {  
643 - return TableItem(  
644 - detailEntity  
645 - .tables[index]);  
646 - },  
647 - itemCount: detailEntity  
648 - .tables.length,  
649 - shrinkWrap: true,  
650 - scrollDirection:  
651 - Axis.horizontal,  
652 - ),  
653 - ),  
654 - )),  
655 - TitleAndTextfield(  
656 - title: "消费金额",  
657 - detailModel: detailModel,  
658 - rid: widget.rid,  
659 - ),  
660 - RowMultiText(  
661 - "客户姓名", detailEntity.rnameStr),  
662 - InkWell(  
663 - onTap: () {  
664 - if (formatPhone != null &&  
665 - formatPhone != '') {  
666 - if (userModel.user.role_name !=  
667 - '管理员' &&  
668 - userModel.user.role_name !=  
669 - '店长' &&  
670 - widget.uid != "null" &&  
671 - widget.uid !=  
672 - userModel.user.openid) {  
673 - } else {  
674 - DialogUtil.goPhone(formatPhone);  
675 - }  
676 - }  
677 - },  
678 - child: RowMultiText(  
679 - "客户电话",  
680 - userModel.user.role_name != 652 + child: Container(
  653 + height: ScreenUtil()
  654 + .setHeight(210),
  655 + child: ListView.builder(
  656 + itemBuilder:
  657 + (BuildContext contxt,
  658 + int index) {
  659 + return TableItem(
  660 + detailEntity
  661 + .tables[index]);
  662 + },
  663 + itemCount: detailEntity
  664 + .tables.length,
  665 + shrinkWrap: true,
  666 + scrollDirection:
  667 + Axis.horizontal,
  668 + ),
  669 + ),
  670 + )),
  671 + TitleAndTextfield(
  672 + title: "消费金额",
  673 + detailModel: detailModel,
  674 + rid: widget.rid,
  675 + ),
  676 + RowMultiText(
  677 + "客户姓名", detailEntity.rnameStr),
  678 + InkWell(
  679 + onTap: () {
  680 + if (formatPhone != null &&
  681 + formatPhone != '') {
  682 + if (userModel
  683 + .user.role_name !=
681 '管理员' && 684 '管理员' &&
682 userModel 685 userModel
683 .user.role_name != 686 .user.role_name !=
@@ -685,328 +688,362 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -685,328 +688,362 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
685 widget.uid != "null" && 688 widget.uid != "null" &&
686 widget.uid != 689 widget.uid !=
687 userModel 690 userModel
688 - .user.openid &&  
689 - formatPhone  
690 - .trim()  
691 - .length >  
692 - 0  
693 - ? Utils.starPhone(formatPhone)  
694 - : formatPhone),  
695 - ),  
696 - Offstage(  
697 - offstage: detailEntity.cusdem == '' ||  
698 - detailEntity.cusdem == null,  
699 - child: RowMultiText("备注信息",  
700 - detailEntity.cusdem ?? ""),  
701 - ),  
702 - MyDivider(double.infinity,  
703 - ScreenUtil().setHeight(1)),  
704 - Container(  
705 - color: MyColours.color_ffffff,  
706 - width: double.infinity,  
707 - height: ScreenUtil().setHeight(80),  
708 - alignment: Alignment.center,  
709 - child: Stack(  
710 - alignment: Alignment.center,  
711 - children: <Widget>[  
712 - Positioned(  
713 - left: 0,  
714 - child: Text(  
715 - "客户经理",  
716 - style: TextStyle(  
717 - color: MyColours  
718 - .color_828282,  
719 - fontSize: ScreenUtil()  
720 - .setSp(30)),  
721 - ),  
722 - ),  
723 - Positioned(  
724 - right: 0,  
725 - child: GestureDetector(  
726 - onTap: () async {  
727 - List<String> list = [];  
728 - for (Manager manager  
729 - in managers) {  
730 - list.add(  
731 - manager.roleUserName);  
732 - }  
733 - DialogUtil  
734 - .showSelectCusmanDialog(  
735 - context, list,  
736 - (value) {  
737 - if (value != null) {  
738 - setState(() {  
739 - cusmanText = managers[  
740 - value.first]  
741 - .userName;  
742 - });  
743 - _setCurrManager();  
744 - }  
745 - }).then((value) {});  
746 - },  
747 - child: Text(  
748 - cusmanText,  
749 - style: TextStyle(  
750 - color: MyColours  
751 - .color_353535,  
752 - fontSize: ScreenUtil()  
753 - .setSp(30),  
754 - decoration: TextDecoration  
755 - .underline, 691 + .user.openid) {
  692 + } else {
  693 + DialogUtil.goPhone(
  694 + formatPhone);
  695 + }
  696 + }
  697 + },
  698 + child: RowMultiText(
  699 + "客户电话",
  700 + userModel.user.role_name !=
  701 + '管理员' &&
  702 + userModel.user
  703 + .role_name !=
  704 + '店长' &&
  705 + widget.uid !=
  706 + "null" &&
  707 + widget.uid !=
  708 + userModel.user
  709 + .openid &&
  710 + formatPhone
  711 + .trim()
  712 + .length >
  713 + 0
  714 + ? Utils.starPhone(
  715 + formatPhone)
  716 + : formatPhone),
  717 + ),
  718 + Offstage(
  719 + offstage: detailEntity.cusdem ==
  720 + '' ||
  721 + detailEntity.cusdem == null,
  722 + child: RowMultiText("备注信息",
  723 + detailEntity.cusdem ?? ""),
  724 + ),
  725 + MyDivider(double.infinity,
  726 + ScreenUtil().setHeight(1)),
  727 + Container(
  728 + color: MyColours.color_ffffff,
  729 + width: double.infinity,
  730 + height:
  731 + ScreenUtil().setHeight(80),
  732 + alignment: Alignment.center,
  733 + child: Stack(
  734 + alignment: Alignment.center,
  735 + children: <Widget>[
  736 + Positioned(
  737 + left: 0,
  738 + child: Text(
  739 + "客户经理",
  740 + style: TextStyle(
  741 + color: MyColours
  742 + .color_828282,
  743 + fontSize: ScreenUtil()
  744 + .setSp(30)),
756 ), 745 ),
757 ), 746 ),
758 - ),  
759 - )  
760 - ],  
761 - ),  
762 - ),  
763 - Offstage(  
764 - offstage: detailEntity.note_name ==  
765 - '' ||  
766 - detailEntity.note_name == null,  
767 - child: RowMultiText("记录人",  
768 - detailEntity.note_name ?? ""),  
769 - ),  
770 - RowMultiText("下单时间",  
771 - _getDateTime(detailEntity.cdate)),  
772 - Offstage(  
773 - offstage: (detailEntity.status ==  
774 - "4" &&  
775 - detailEntity.cancel != null)  
776 - ? false  
777 - : true,  
778 - child: Column(  
779 - children: <Widget>[  
780 - MyDivider(double.infinity,  
781 - ScreenUtil().setHeight(2)),  
782 - RowMultiText(  
783 - "取消原因",  
784 - detailEntity.cancel?.desc ??  
785 - "",  
786 - textAlign: TextAlign.left),  
787 - RowMultiText(  
788 - "取消时间",  
789 - detailEntity  
790 - .cancel?.cdateStr ??  
791 - ""),  
792 - RowMultiText(  
793 - "操作人",  
794 - detailEntity.abolition == '2'  
795 - ? '顾客在线取消'  
796 - : detailEntity  
797 - .cancel?.uname ??  
798 - ""),  
799 - ],  
800 - ),  
801 - ),  
802 - _onlineCheckEditProvider  
803 - .orderInfoSunModel !=  
804 - null &&  
805 - _onlineCheckEditProvider  
806 - .orderInfoSunModel  
807 - .invoice !=  
808 - null &&  
809 - detailEntity.status != "4"  
810 - ? MyDivider(double.infinity,  
811 - ScreenUtil().setHeight(1))  
812 - : Container(),  
813 - _onlineCheckEditProvider  
814 - .orderInfoSunModel !=  
815 - null &&  
816 - _onlineCheckEditProvider  
817 - .orderInfoSunModel  
818 - .invoice !=  
819 - null &&  
820 - detailEntity.status != "4"  
821 - ? InkWell(  
822 - onTap: () {  
823 - NavigatorUtil  
824 - .goInvoiceDetailPage(  
825 - context,  
826 - fromNotify: false,  
827 - rid: widget.rid);  
828 - },  
829 - child: Container(  
830 - height: ScreenUtil()  
831 - .setWidth(87 * 2),  
832 - child: Row(  
833 - mainAxisAlignment:  
834 - MainAxisAlignment  
835 - .spaceBetween,  
836 - children: [  
837 - Text(  
838 - "发票抬头", 747 + Positioned(
  748 + right: 0,
  749 + child: GestureDetector(
  750 + onTap: () async {
  751 + List<String> list = [];
  752 + for (Manager manager
  753 + in managers) {
  754 + list.add(manager
  755 + .roleUserName);
  756 + }
  757 + DialogUtil
  758 + .showSelectCusmanDialog(
  759 + context, list,
  760 + (value) {
  761 + if (value != null) {
  762 + setState(() {
  763 + cusmanText =
  764 + managers[value
  765 + .first]
  766 + .userName;
  767 + });
  768 + _setCurrManager();
  769 + }
  770 + }).then((value) {});
  771 + },
  772 + child: Text(
  773 + cusmanText,
839 style: TextStyle( 774 style: TextStyle(
840 - color: MyColours  
841 - .color_828282,  
842 - fontSize:  
843 - ScreenUtil()  
844 - .setSp(30)), 775 + color: MyColours
  776 + .color_353535,
  777 + fontSize: ScreenUtil()
  778 + .setSp(30),
  779 + decoration:
  780 + TextDecoration
  781 + .underline,
  782 + ),
845 ), 783 ),
846 - Spacer(),  
847 - Column( 784 + ),
  785 + )
  786 + ],
  787 + ),
  788 + ),
  789 + Offstage(
  790 + offstage:
  791 + detailEntity.note_name ==
  792 + '' ||
  793 + detailEntity.note_name ==
  794 + null,
  795 + child: RowMultiText("记录人",
  796 + detailEntity.note_name ?? ""),
  797 + ),
  798 + RowMultiText(
  799 + "下单时间",
  800 + _getDateTime(
  801 + detailEntity.cdate)),
  802 + Offstage(
  803 + offstage:
  804 + (detailEntity.status == "4" &&
  805 + detailEntity.cancel !=
  806 + null)
  807 + ? false
  808 + : true,
  809 + child: Column(
  810 + children: <Widget>[
  811 + MyDivider(
  812 + double.infinity,
  813 + ScreenUtil()
  814 + .setHeight(2)),
  815 + RowMultiText(
  816 + "取消原因",
  817 + detailEntity
  818 + .cancel?.desc ??
  819 + "",
  820 + textAlign:
  821 + TextAlign.left),
  822 + RowMultiText(
  823 + "取消时间",
  824 + detailEntity.cancel
  825 + ?.cdateStr ??
  826 + ""),
  827 + RowMultiText(
  828 + "操作人",
  829 + detailEntity.abolition ==
  830 + '2'
  831 + ? '顾客在线取消'
  832 + : detailEntity.cancel
  833 + ?.uname ??
  834 + ""),
  835 + ],
  836 + ),
  837 + ),
  838 + _onlineCheckEditProvider
  839 + .orderInfoSunModel !=
  840 + null &&
  841 + _onlineCheckEditProvider
  842 + .orderInfoSunModel
  843 + .invoice !=
  844 + null &&
  845 + detailEntity.status != "4"
  846 + ? MyDivider(double.infinity,
  847 + ScreenUtil().setHeight(1))
  848 + : Container(),
  849 + _onlineCheckEditProvider
  850 + .orderInfoSunModel !=
  851 + null &&
  852 + _onlineCheckEditProvider
  853 + .orderInfoSunModel
  854 + .invoice !=
  855 + null &&
  856 + detailEntity.status != "4"
  857 + ? InkWell(
  858 + onTap: () {
  859 + NavigatorUtil
  860 + .goInvoiceDetailPage(
  861 + context,
  862 + fromNotify: false,
  863 + rid: widget.rid);
  864 + },
  865 + child: Container(
  866 + height: ScreenUtil()
  867 + .setWidth(87 * 2),
  868 + child: Row(
848 mainAxisAlignment: 869 mainAxisAlignment:
849 MainAxisAlignment 870 MainAxisAlignment
850 - .center, 871 + .spaceBetween,
851 children: [ 872 children: [
852 Text( 873 Text(
  874 + "发票抬头",
  875 + style: TextStyle(
  876 + color: MyColours
  877 + .color_828282,
  878 + fontSize:
  879 + ScreenUtil()
  880 + .setSp(
  881 + 30)),
  882 + ),
  883 + Spacer(),
  884 + Column(
  885 + mainAxisAlignment:
  886 + MainAxisAlignment
  887 + .center,
  888 + children: [
  889 + Text(
  890 + _onlineCheckEditProvider
  891 + .orderInfoSunModel
  892 + .invoice
  893 + .title,
  894 + style: TextStyle(
  895 + color: MyColours
  896 + .color_353535,
  897 + fontWeight:
  898 + FontWeight
  899 + .bold,
  900 + fontSize:
  901 + ScreenUtil()
  902 + .setSp(33))),
853 _onlineCheckEditProvider 903 _onlineCheckEditProvider
854 - .orderInfoSunModel  
855 - .invoice  
856 - .title, 904 + .orderInfoSunModel
  905 + .invoice
  906 + .taxnumber ==
  907 + null ||
  908 + _onlineCheckEditProvider
  909 + .orderInfoSunModel
  910 + .invoice
  911 + .taxnumber ==
  912 + ''
  913 + ? Container()
  914 + : Column(
  915 + children: [
  916 + VEmptyView(
  917 + 10),
  918 + Text(
  919 + '税号：${_onlineCheckEditProvider.orderInfoSunModel.invoice.taxnumber}',
  920 + style:
  921 + TextStyle(color: MyColours.color_707070, fontSize: ScreenUtil().setSp(28)))
  922 + ],
  923 + )
  924 + ],
  925 + ),
  926 + HEmptyView(20),
  927 + Image.asset(
  928 + Utils.getImgPath(
  929 + 'arr_right_gray'),
  930 + width: ScreenUtil()
  931 + .setWidth(12),
  932 + height: ScreenUtil()
  933 + .setWidth(22),
  934 + )
  935 + ],
  936 + ),
  937 + ),
  938 + )
  939 + : Container(),
  940 + _onlineCheckEditProvider
  941 + .orderInfoSunModel !=
  942 + null &&
  943 + _onlineCheckEditProvider
  944 + .orderInfoSunModel
  945 + .price !=
  946 + null &&
  947 + detailEntity.status != "4"
  948 + ? MyDivider(double.infinity,
  949 + ScreenUtil().setHeight(1))
  950 + : Container(),
  951 + _onlineCheckEditProvider
  952 + .orderInfoSunModel !=
  953 + null &&
  954 + _onlineCheckEditProvider
  955 + .orderInfoSunModel
  956 + .price !=
  957 + null &&
  958 + detailEntity.status != "4"
  959 + ? InkWell(
  960 + onTap: () {
  961 + //在线买单消息 去查看 跳转在线买单详情页面
  962 + NavigatorUtil
  963 + .goOnlineCheckDetailPage(
  964 + context,
  965 + rid:
  966 + '${widget.rid}');
  967 + },
  968 + child: Container(
  969 + height: ScreenUtil()
  970 + .setWidth(87 * 2),
  971 + child: Row(
  972 + mainAxisAlignment:
  973 + MainAxisAlignment
  974 + .spaceBetween,
  975 + children: [
  976 + Text(
  977 + "实收金额：",
  978 + style: TextStyle(
  979 + color: MyColours
  980 + .color_707070,
  981 + fontSize:
  982 + ScreenUtil()
  983 + .setSp(
  984 + 30)),
  985 + ),
  986 + HEmptyView(20),
  987 + Text(
  988 + '¥ ${_onlineCheckEditProvider.orderInfoSunModel.price}',
  989 + style: TextStyle(
  990 + color: MyColours
  991 + .color_353535,
  992 + fontSize:
  993 + ScreenUtil()
  994 + .setSp(
  995 + 32)),
  996 + ),
  997 + Spacer(),
  998 + Text('查看明细',
857 style: TextStyle( 999 style: TextStyle(
858 color: MyColours 1000 color: MyColours
859 - .color_353535,  
860 - fontWeight:  
861 - FontWeight  
862 - .bold, 1001 + .color_707070,
863 fontSize: 1002 fontSize:
864 ScreenUtil() 1003 ScreenUtil()
865 .setSp( 1004 .setSp(
866 - 33))),  
867 - _onlineCheckEditProvider  
868 - .orderInfoSunModel  
869 - .invoice  
870 - .taxnumber ==  
871 - null ||  
872 - _onlineCheckEditProvider  
873 - .orderInfoSunModel  
874 - .invoice  
875 - .taxnumber ==  
876 - ''  
877 - ? Container()  
878 - : Column(  
879 - children: [  
880 - VEmptyView(  
881 - 10),  
882 - Text(  
883 - '税号：${_onlineCheckEditProvider.orderInfoSunModel.invoice.taxnumber}',  
884 - style: TextStyle(  
885 - color:  
886 - MyColours.color_707070,  
887 - fontSize: ScreenUtil().setSp(28)))  
888 - ],  
889 - ) 1005 + 28))),
  1006 + HEmptyView(20),
  1007 + Image.asset(
  1008 + Utils.getImgPath(
  1009 + 'arr_right_gray'),
  1010 + width: ScreenUtil()
  1011 + .setWidth(12),
  1012 + height: ScreenUtil()
  1013 + .setWidth(22),
  1014 + )
890 ], 1015 ],
891 ), 1016 ),
892 - HEmptyView(20),  
893 - Image.asset(  
894 - Utils.getImgPath(  
895 - 'arr_right_gray'),  
896 - width: ScreenUtil()  
897 - .setWidth(12),  
898 - height: ScreenUtil()  
899 - .setWidth(22),  
900 - )  
901 - ],  
902 - ),  
903 - ),  
904 - )  
905 - : Container(),  
906 - _onlineCheckEditProvider  
907 - .orderInfoSunModel !=  
908 - null &&  
909 - _onlineCheckEditProvider  
910 - .orderInfoSunModel  
911 - .price !=  
912 - null &&  
913 - detailEntity.status != "4"  
914 - ? MyDivider(double.infinity,  
915 - ScreenUtil().setHeight(1))  
916 - : Container(),  
917 - _onlineCheckEditProvider  
918 - .orderInfoSunModel !=  
919 - null &&  
920 - _onlineCheckEditProvider  
921 - .orderInfoSunModel  
922 - .price !=  
923 - null &&  
924 - detailEntity.status != "4"  
925 - ? InkWell(  
926 - onTap: () {  
927 - //在线买单消息 去查看 跳转在线买单详情页面  
928 - NavigatorUtil  
929 - .goOnlineCheckDetailPage(  
930 - context,  
931 - rid: '${widget.rid}');  
932 - },  
933 - child: Container(  
934 - height: ScreenUtil()  
935 - .setWidth(87 * 2),  
936 - child: Row(  
937 - mainAxisAlignment:  
938 - MainAxisAlignment  
939 - .spaceBetween,  
940 - children: [  
941 - Text(  
942 - "实收金额：",  
943 - style: TextStyle(  
944 - color: MyColours  
945 - .color_707070,  
946 - fontSize:  
947 - ScreenUtil()  
948 - .setSp(30)),  
949 - ),  
950 - HEmptyView(20),  
951 - Text(  
952 - '¥ ${_onlineCheckEditProvider.orderInfoSunModel.price}',  
953 - style: TextStyle(  
954 - color: MyColours  
955 - .color_353535,  
956 - fontSize:  
957 - ScreenUtil()  
958 - .setSp(32)),  
959 - ),  
960 - Spacer(),  
961 - Text('查看明细',  
962 - style: TextStyle(  
963 - color: MyColours  
964 - .color_707070,  
965 - fontSize:  
966 - ScreenUtil()  
967 - .setSp(  
968 - 28))),  
969 - HEmptyView(20),  
970 - Image.asset(  
971 - Utils.getImgPath(  
972 - 'arr_right_gray'),  
973 - width: ScreenUtil()  
974 - .setWidth(12),  
975 - height: ScreenUtil()  
976 - .setWidth(22),  
977 - )  
978 - ],  
979 - ),  
980 - ),  
981 - )  
982 - : Container(),  
983 - ],  
984 - )),  
985 - ),  
986 - )),  
987 - ),  
988 - Offstage(  
989 - offstage: ((detailEntity.orderInfo != null &&  
990 - detailEntity.orderInfo.status == "3") ||  
991 - detailEntity.status == "3" ||  
992 - detailEntity.status == "4" ||  
993 - detailEntity.status == "6"),  
994 - child: Container(  
995 - width: double.infinity,  
996 - height: ScreenUtil().setWidth(84),  
997 - decoration: BoxDecoration(  
998 - color: MyColours.color_199095,  
999 - borderRadius: BorderRadius.circular(  
1000 - ScreenUtil().setWidth(10)),  
1001 - ),  
1002 - margin: EdgeInsets.symmetric(  
1003 - vertical: ScreenUtil().setHeight(20),  
1004 - horizontal: ScreenUtil().setHeight(40)),  
1005 - child: Row(  
1006 - children: [  
1007 - Offstage(  
1008 - offstage:  
1009 - ((detailEntity.orderInfo != null && 1017 + ),
  1018 + )
  1019 + : Container(),
  1020 + ],
  1021 + )),
  1022 + ),
  1023 + )),
  1024 + ),
  1025 + Offstage(
  1026 + offstage: ((detailEntity.orderInfo != null &&
  1027 + detailEntity.orderInfo.status == "3") ||
  1028 + detailEntity.status == "3" ||
  1029 + detailEntity.status == "4" ||
  1030 + detailEntity.status == "6"),
  1031 + child: Container(
  1032 + width: double.infinity,
  1033 + height: ScreenUtil().setWidth(84),
  1034 + decoration: BoxDecoration(
  1035 + color: MyColours.color_199095,
  1036 + borderRadius: BorderRadius.circular(
  1037 + ScreenUtil().setWidth(10)),
  1038 + ),
  1039 + margin: EdgeInsets.symmetric(
  1040 + vertical: ScreenUtil().setHeight(20),
  1041 + horizontal: ScreenUtil().setHeight(40)),
  1042 + child: Row(
  1043 + children: [
  1044 + Offstage(
  1045 + offstage: ((detailEntity.orderInfo !=
  1046 + null &&
1010 detailEntity.orderInfo 1047 detailEntity.orderInfo
1011 .status == 1048 .status ==
1012 "3") || 1049 "3") ||
@@ -1015,209 +1052,241 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -1015,209 +1052,241 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
1015 detailEntity.status == "6") 1052 detailEntity.status == "6")
1016 ? true 1053 ? true
1017 : false, 1054 : false,
1018 - child: _cancelAndChangeBtn(() {  
1019 - DialogUtil.showShareDialog(context)  
1020 - ?.then((value) {  
1021 - switch (value) {  
1022 - case 1: //微信  
1023 - NavigatorUtil.goInvicationPage(  
1024 - context,  
1025 - detailEntity.id,  
1026 - detailEntity.tableinfoStr,  
1027 - detailEntity.ddate,  
1028 - detailEntity.ddateStr,  
1029 - detailEntity.phone,  
1030 - detailEntity.ddate_solt);  
1031 - break;  
1032 - case 2: //短信  
1033 - if (detailEntity.phone == null ||  
1034 - detailEntity.phone.isEmpty) {  
1035 - Utils.showToast("没有预订人电话信息");  
1036 - return;  
1037 - }  
1038 - NavigatorUtil.goSmsPage(  
1039 - context,  
1040 - detailEntity.id,  
1041 - );  
1042 - break;  
1043 - case 3: //电话  
1044 - if (detailEntity.phone != null &&  
1045 - detailEntity  
1046 - .phone.isNotEmpty) {  
1047 - if (userModel.user.role_name !=  
1048 - '管理员' &&  
1049 - userModel.user.role_name !=  
1050 - '店长' &&  
1051 - widget.uid != "null" &&  
1052 - widget.uid !=  
1053 - userModel.user.openid) {  
1054 - Utils.showToast("您无权拨打该电话");  
1055 - } else {  
1056 - Utils.goPhone(  
1057 - detailEntity.phone);  
1058 - }  
1059 - } else {  
1060 - Utils.showToast("没有预订人电话信息"); 1055 + child: _cancelAndChangeBtn(() {
  1056 + DialogUtil.showShareDialog(context)
  1057 + ?.then((value) {
  1058 + switch (value) {
  1059 + case 1: //微信
  1060 + NavigatorUtil
  1061 + .goInvicationPage(
  1062 + context,
  1063 + detailEntity.id,
  1064 + detailEntity
  1065 + .tableinfoStr,
  1066 + detailEntity.ddate,
  1067 + detailEntity.ddateStr,
  1068 + detailEntity.phone,
  1069 + detailEntity
  1070 + .ddate_solt);
  1071 + break;
  1072 + case 2: //短信
  1073 + if (detailEntity.phone ==
  1074 + null ||
  1075 + detailEntity
  1076 + .phone.isEmpty) {
  1077 + Utils.showToast(
  1078 + "没有预订人电话信息");
  1079 + return;
  1080 + }
  1081 + NavigatorUtil.goSmsPage(
  1082 + context,
  1083 + detailEntity.id,
  1084 + );
  1085 + break;
  1086 + case 3: //电话
  1087 + if (detailEntity.phone !=
  1088 + null &&
  1089 + detailEntity
  1090 + .phone.isNotEmpty) {
  1091 + if (userModel.user
  1092 + .role_name !=
  1093 + '管理员' &&
  1094 + userModel.user
  1095 + .role_name !=
  1096 + '店长' &&
  1097 + widget.uid != "null" &&
  1098 + widget.uid !=
  1099 + userModel
  1100 + .user.openid) {
  1101 + Utils.showToast(
  1102 + "您无权拨打该电话");
  1103 + } else {
  1104 + Utils.goPhone(
  1105 + detailEntity.phone);
  1106 + }
  1107 + } else {
  1108 + Utils.showToast(
  1109 + "没有预订人电话信息");
  1110 + }
  1111 + break;
1061 } 1112 }
1062 - break;  
1063 - }  
1064 - });  
1065 - }, "通知客户",  
1066 - bgColor: MyColours.color_199095,  
1067 - width: detailEntity.order.cookbooklist  
1068 - .length ==  
1069 - 0  
1070 - ? ScreenUtil.screenWidthDp -  
1071 - ScreenUtil().setWidth(100)  
1072 - : (ScreenUtil.screenWidthDp -  
1073 - ScreenUtil()  
1074 - .setWidth(91)) /  
1075 - 2,  
1076 - fontColor: MyColours.color_ffffff)),  
1077 - Offstage(  
1078 - offstage: !(detailEntity  
1079 - .order.cookbooklist.length >  
1080 - 0 &&  
1081 - ((detailEntity.orderInfo != null &&  
1082 - detailEntity  
1083 - .orderInfo.status ==  
1084 - "3") &&  
1085 - detailEntity.status != "3" &&  
1086 - detailEntity.status != "4" &&  
1087 - detailEntity.status != "6")),  
1088 - child: MyDivider(ScreenUtil().setWidth(2),  
1089 - ScreenUtil().setWidth(50),  
1090 - color: MyColours.color_ffffff)),  
1091 - Offstage(  
1092 - offstage: detailEntity  
1093 - .order.cookbooklist.length ==  
1094 - 0  
1095 - ? true  
1096 - : false,  
1097 - child: _cancelAndChangeBtn(() {  
1098 - NavigatorUtil.goHasOrderFoodPage(  
1099 - context,  
1100 - rid: detailEntity.id);  
1101 - }, '查看菜品',  
1102 - bgColor: MyColours.color_199095,  
1103 - width: ((detailEntity.orderInfo != 1113 + });
  1114 + }, "通知客户",
  1115 + bgColor: MyColours.color_199095,
  1116 + width: detailEntity
  1117 + .order
  1118 + .cookbooklist
  1119 + .length ==
  1120 + 0
  1121 + ? ScreenUtil.screenWidthDp -
  1122 + ScreenUtil().setWidth(100)
  1123 + : (ScreenUtil.screenWidthDp -
  1124 + ScreenUtil()
  1125 + .setWidth(91)) /
  1126 + 2,
  1127 + fontColor:
  1128 + MyColours.color_ffffff)),
  1129 + Offstage(
  1130 + offstage: !(detailEntity.order
  1131 + .cookbooklist.length >
  1132 + 0 &&
  1133 + ((detailEntity.orderInfo !=
1104 null && 1134 null &&
1105 detailEntity.orderInfo 1135 detailEntity.orderInfo
1106 .status == 1136 .status ==
1107 - "3") ||  
1108 - detailEntity.status == "3" ||  
1109 - detailEntity.status == "4" ||  
1110 - detailEntity.status == "6")  
1111 - ? ScreenUtil.screenWidthDp -  
1112 - ScreenUtil().setWidth(91)  
1113 - : (ScreenUtil.screenWidthDp -  
1114 - ScreenUtil()  
1115 - .setWidth(91)) /  
1116 - 2,  
1117 - fontColor: MyColours.color_ffffff))  
1118 - ],  
1119 - ))),  
1120 - Offstage(  
1121 - offstage: ((detailEntity.orderInfo != null &&  
1122 - detailEntity.orderInfo.status == "3") ||  
1123 - detailEntity.status == "3" ||  
1124 - detailEntity.status == "4" ||  
1125 - detailEntity.status == "6")  
1126 - ? true  
1127 - : false,  
1128 - child: Container(  
1129 - width: double.infinity,  
1130 - height: ScreenUtil().setWidth(84),  
1131 - margin: EdgeInsets.symmetric(  
1132 - horizontal: ScreenUtil().setHeight(40)),  
1133 - decoration: BoxDecoration(  
1134 - border: Border.all(  
1135 - color: userModel.user.role_name != '管理员' &&  
1136 - userModel.user.role_name != '店长' &&  
1137 - widget.uid != "null" &&  
1138 - widget.uid != userModel.user.openid  
1139 - ? MyColours.color_999999  
1140 - : MyColours.color_199095,  
1141 - width: ScreenUtil().setWidth(2)),  
1142 - borderRadius: BorderRadius.circular(  
1143 - ScreenUtil().setWidth(10)),  
1144 - ),  
1145 - // child: Text('fff'),  
1146 - child: Material(  
1147 - color: Colors.transparent,  
1148 - child: Row(  
1149 - children: [  
1150 - Expanded(  
1151 - child: _cancelAndChangeBtn(() {  
1152 - print('点击变更预订');  
1153 - if (userModel.user.role_name != '管理员' &&  
1154 - userModel.user.role_name != '店长' &&  
1155 - widget.uid != "null" &&  
1156 - widget.uid != userModel.user.openid) {  
1157 - } else {  
1158 - NavigatorUtil.goNoteBookChangePage(  
1159 - context, detailEntity, widget.rid);  
1160 - }  
1161 - }, '变更预订',  
1162 - fontColor: userModel.user.role_name !=  
1163 - '管理员' &&  
1164 - userModel.user.role_name !=  
1165 - '店长' &&  
1166 - widget.uid != "null" &&  
1167 - widget.uid !=  
1168 - userModel.user.openid  
1169 - ? MyColours.color_999999  
1170 - : MyColours.color_199095)),  
1171 - MyDivider(  
1172 - ScreenUtil().setWidth(2),  
1173 - ScreenUtil().setWidth(50), 1137 + "3") &&
  1138 + detailEntity.status != "3" &&
  1139 + detailEntity.status != "4" &&
  1140 + detailEntity.status != "6")),
  1141 + child: MyDivider(
  1142 + ScreenUtil().setWidth(2),
  1143 + ScreenUtil().setWidth(50),
  1144 + color: MyColours.color_ffffff)),
  1145 + Offstage(
  1146 + offstage: detailEntity.order
  1147 + .cookbooklist.length ==
  1148 + 0
  1149 + ? true
  1150 + : false,
  1151 + child: _cancelAndChangeBtn(() {
  1152 + NavigatorUtil.goHasOrderFoodPage(
  1153 + context,
  1154 + rid: detailEntity.id);
  1155 + }, '查看菜品',
  1156 + bgColor: MyColours.color_199095,
  1157 + width: ((detailEntity.orderInfo !=
  1158 + null &&
  1159 + detailEntity.orderInfo
  1160 + .status ==
  1161 + "3") ||
  1162 + detailEntity.status ==
  1163 + "3" ||
  1164 + detailEntity.status ==
  1165 + "4" ||
  1166 + detailEntity.status ==
  1167 + "6")
  1168 + ? ScreenUtil.screenWidthDp -
  1169 + ScreenUtil().setWidth(91)
  1170 + : (ScreenUtil.screenWidthDp -
  1171 + ScreenUtil()
  1172 + .setWidth(91)) /
  1173 + 2,
  1174 + fontColor:
  1175 + MyColours.color_ffffff))
  1176 + ],
  1177 + ))),
  1178 + Offstage(
  1179 + offstage: ((detailEntity.orderInfo != null &&
  1180 + detailEntity.orderInfo.status == "3") ||
  1181 + detailEntity.status == "3" ||
  1182 + detailEntity.status == "4" ||
  1183 + detailEntity.status == "6")
  1184 + ? true
  1185 + : false,
  1186 + child: Container(
  1187 + width: double.infinity,
  1188 + height: ScreenUtil().setWidth(84),
  1189 + margin: EdgeInsets.symmetric(
  1190 + horizontal: ScreenUtil().setHeight(40)),
  1191 + decoration: BoxDecoration(
  1192 + border: Border.all(
1174 color: userModel.user.role_name != '管理员' && 1193 color: userModel.user.role_name != '管理员' &&
1175 userModel.user.role_name != '店长' && 1194 userModel.user.role_name != '店长' &&
1176 widget.uid != "null" && 1195 widget.uid != "null" &&
1177 widget.uid != userModel.user.openid 1196 widget.uid != userModel.user.openid
1178 ? MyColours.color_999999 1197 ? MyColours.color_999999
1179 : MyColours.color_199095, 1198 : MyColours.color_199095,
1180 - ),  
1181 - Expanded(  
1182 - child: _cancelAndChangeBtn(() {  
1183 - if (userModel.user.role_name != '管理员' &&  
1184 - userModel.user.role_name != '店长' &&  
1185 - widget.uid != "null" &&  
1186 - widget.uid != userModel.user.openid) {  
1187 - } else {  
1188 - _showCancelWidget(context);  
1189 - }  
1190 - }, '取消预订',  
1191 - fontColor: userModel.user.role_name !=  
1192 - '管理员' &&  
1193 - userModel.user.role_name !=  
1194 - '店长' &&  
1195 - widget.uid != "null" &&  
1196 - widget.uid !=  
1197 - userModel.user.openid  
1198 - ? MyColours.color_999999  
1199 - : MyColours.color_199095)),  
1200 - ],  
1201 - )),  
1202 - ),  
1203 - ),  
1204 - VEmptyView(ScreenUtil().setWidth(60))  
1205 - ],  
1206 - );  
1207 - }  
1208 - })),  
1209 - ],  
1210 - ),  
1211 - ),  
1212 - onWillPop: () async {  
1213 - if (widget.fromNotify) {  
1214 - NavigatorUtil.goHomePage(context, initialIndex: 0);  
1215 - return true;  
1216 - }  
1217 - Navigator.of(context).pop();  
1218 - return true;  
1219 - },  
1220 - )), 1199 + width: ScreenUtil().setWidth(2)),
  1200 + borderRadius: BorderRadius.circular(
  1201 + ScreenUtil().setWidth(10)),
  1202 + ),
  1203 + // child: Text('fff'),
  1204 + child: Material(
  1205 + color: Colors.transparent,
  1206 + child: Row(
  1207 + children: [
  1208 + Expanded(
  1209 + child: _cancelAndChangeBtn(() {
  1210 + print('点击变更预订');
  1211 + if (userModel.user.role_name != '管理员' &&
  1212 + userModel.user.role_name != '店长' &&
  1213 + widget.uid != "null" &&
  1214 + widget.uid !=
  1215 + userModel.user.openid) {
  1216 + } else {
  1217 + NavigatorUtil.goNoteBookChangePage(
  1218 + context,
  1219 + detailEntity,
  1220 + widget.rid);
  1221 + }
  1222 + }, '变更预订',
  1223 + fontColor: userModel
  1224 + .user.role_name !=
  1225 + '管理员' &&
  1226 + userModel
  1227 + .user.role_name !=
  1228 + '店长' &&
  1229 + widget.uid != "null" &&
  1230 + widget.uid !=
  1231 + userModel.user.openid
  1232 + ? MyColours.color_999999
  1233 + : MyColours.color_199095)),
  1234 + MyDivider(
  1235 + ScreenUtil().setWidth(2),
  1236 + ScreenUtil().setWidth(50),
  1237 + color:
  1238 + userModel.user.role_name != '管理员' &&
  1239 + userModel.user.role_name !=
  1240 + '店长' &&
  1241 + widget.uid != "null" &&
  1242 + widget.uid !=
  1243 + userModel.user.openid
  1244 + ? MyColours.color_999999
  1245 + : MyColours.color_199095,
  1246 + ),
  1247 + Expanded(
  1248 + child: _cancelAndChangeBtn(() {
  1249 + if (userModel.user.role_name != '管理员' &&
  1250 + userModel.user.role_name != '店长' &&
  1251 + widget.uid != "null" &&
  1252 + widget.uid !=
  1253 + userModel.user.openid) {
  1254 + } else {
  1255 + _showCancelWidget(context);
  1256 + }
  1257 + }, '取消预订',
  1258 + fontColor: userModel
  1259 + .user.role_name !=
  1260 + '管理员' &&
  1261 + userModel
  1262 + .user.role_name !=
  1263 + '店长' &&
  1264 + widget.uid != "null" &&
  1265 + widget.uid !=
  1266 + userModel.user.openid
  1267 + ? MyColours.color_999999
  1268 + : MyColours.color_199095)),
  1269 + ],
  1270 + )),
  1271 + ),
  1272 + ),
  1273 + VEmptyView(ScreenUtil().setWidth(60))
  1274 + ],
  1275 + );
  1276 + }
  1277 + })),
  1278 + ],
  1279 + ),
  1280 + ),
  1281 + onWillPop: () async {
  1282 + if (widget.fromNotify) {
  1283 + NavigatorUtil.goHomePage(context, initialIndex: 0);
  1284 + return true;
  1285 + }
  1286 + Navigator.of(context).pop();
  1287 + return true;
  1288 + },
  1289 + ))),
1221 ); 1290 );
1222 } 1291 }
1223 } 1292 }
@@ -1342,15 +1411,16 @@ class _TitleAndTextfieldState extends State<TitleAndTextfield> { @@ -1342,15 +1411,16 @@ class _TitleAndTextfieldState extends State<TitleAndTextfield> {
1342 void initState() { 1411 void initState() {
1343 super.initState(); 1412 super.initState();
1344 1413
1345 - if (Platform.isIOS) { 1414 + // if (Platform.isIOS) {
1346 numberFocusNode.addListener(() { 1415 numberFocusNode.addListener(() {
1347 if (numberFocusNode.hasFocus) { 1416 if (numberFocusNode.hasFocus) {
1348 showOverlay(context); 1417 showOverlay(context);
1349 } else { 1418 } else {
  1419 + _updateMoney();
1350 removeOverlay(); 1420 removeOverlay();
1351 } 1421 }
1352 }); 1422 });
1353 - } 1423 + // }
1354 } 1424 }
1355 1425
1356 showOverlay(BuildContext context) { 1426 showOverlay(BuildContext context) {
@@ -1363,7 +1433,7 @@ class _TitleAndTextfieldState extends State<TitleAndTextfield> { @@ -1363,7 +1433,7 @@ class _TitleAndTextfieldState extends State<TitleAndTextfield> {
1363 left: 0.0, 1433 left: 0.0,
1364 child: InputDoneView( 1434 child: InputDoneView(
1365 callback: () { 1435 callback: () {
1366 - _updateMoney(); 1436 + // _updateMoney();
1367 }, 1437 },
1368 )); 1438 ));
1369 }); 1439 });
@@ -1466,6 +1536,7 @@ class _TitleAndTextfieldState extends State<TitleAndTextfield> { @@ -1466,6 +1536,7 @@ class _TitleAndTextfieldState extends State<TitleAndTextfield> {
1466 fontSize: ScreenUtil().setSp(30), 1536 fontSize: ScreenUtil().setSp(30),
1467 color: MyColours.color_199095), 1537 color: MyColours.color_199095),
1468 textAlign: TextAlign.right, 1538 textAlign: TextAlign.right,
  1539 + textInputAction: TextInputAction.done,
1469 decoration: InputDecoration( 1540 decoration: InputDecoration(
1470 hintText: "修改", 1541 hintText: "修改",
1471 hintStyle: TextStyle( 1542 hintStyle: TextStyle(
@@ -1499,7 +1570,7 @@ class _TitleAndTextfieldState extends State<TitleAndTextfield> { @@ -1499,7 +1570,7 @@ class _TitleAndTextfieldState extends State<TitleAndTextfield> {
1499 }, 1570 },
1500 onEditingComplete: () { 1571 onEditingComplete: () {
1501 FocusScope.of(context).requestFocus(FocusNode()); //隐藏键盘 1572 FocusScope.of(context).requestFocus(FocusNode()); //隐藏键盘
1502 - _updateMoney(); 1573 + // _updateMoney();
1503 }, 1574 },
1504 keyboardType: 1575 keyboardType:
1505 TextInputType.numberWithOptions(decimal: true), 1576 TextInputType.numberWithOptions(decimal: true),