xt / Flutter-ReserveApp · Commits

Go to a project

Commit d051b364a2680057951a0431c268b9da0269d811

Authored by wdn127929
1 parent f9eb3310
build: skipped

桌位页面bug

Inline Side-by-side
Showing 2 changed files with 45 additions and 13 deletions
@@ -548,7 +548,7 @@ @@ -548,7 +548,7 @@
548 CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements; 548 CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
549 CODE_SIGN_IDENTITY = "Apple Development"; 549 CODE_SIGN_IDENTITY = "Apple Development";
550 CODE_SIGN_STYLE = Automatic; 550 CODE_SIGN_STYLE = Automatic;
551 - CURRENT_PROJECT_VERSION = 5322; 551 + CURRENT_PROJECT_VERSION = 5323;
552 DEVELOPMENT_TEAM = 8J59HM8B82; 552 DEVELOPMENT_TEAM = 8J59HM8B82;
553 ENABLE_BITCODE = NO; 553 ENABLE_BITCODE = NO;
554 FLUTTER_BUILD_MODE = release; 554 FLUTTER_BUILD_MODE = release;
@@ -696,7 +696,7 @@ @@ -696,7 +696,7 @@
696 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements"; 696 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
697 CODE_SIGN_IDENTITY = "Apple Development"; 697 CODE_SIGN_IDENTITY = "Apple Development";
698 CODE_SIGN_STYLE = Automatic; 698 CODE_SIGN_STYLE = Automatic;
699 - CURRENT_PROJECT_VERSION = 5322; 699 + CURRENT_PROJECT_VERSION = 5323;
700 DEVELOPMENT_TEAM = 8J59HM8B82; 700 DEVELOPMENT_TEAM = 8J59HM8B82;
701 ENABLE_BITCODE = NO; 701 ENABLE_BITCODE = NO;
702 FLUTTER_BUILD_MODE = release; 702 FLUTTER_BUILD_MODE = release;
@@ -732,7 +732,7 @@ @@ -732,7 +732,7 @@
732 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 732 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
733 CODE_SIGN_IDENTITY = "Apple Development"; 733 CODE_SIGN_IDENTITY = "Apple Development";
734 CODE_SIGN_STYLE = Automatic; 734 CODE_SIGN_STYLE = Automatic;
735 - CURRENT_PROJECT_VERSION = 5322; 735 + CURRENT_PROJECT_VERSION = 5323;
736 DEVELOPMENT_TEAM = 8J59HM8B82; 736 DEVELOPMENT_TEAM = 8J59HM8B82;
737 ENABLE_BITCODE = NO; 737 ENABLE_BITCODE = NO;
738 FLUTTER_BUILD_MODE = release; 738 FLUTTER_BUILD_MODE = release;
@@ -125,6 +125,7 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -125,6 +125,7 @@ class TableManagerPageState extends State<TableManagerPage> {
125 String showErro = ''; 125 String showErro = '';
126 String ddateSoltSelect = ''; 126 String ddateSoltSelect = '';
127 bool isAddOver = true; 127 bool isAddOver = true;
  128 + bool isRealAddOver = true;
128 // int 129 // int
129 130
130 ScrollController _scrollCrl = ScrollController(); 131 ScrollController _scrollCrl = ScrollController();
@@ -362,12 +363,15 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -362,12 +363,15 @@ class TableManagerPageState extends State<TableManagerPage> {
362 }); 363 });
363 if (needInit) { 364 if (needInit) {
364 initCurruntIndex(); 365 initCurruntIndex();
  366 + isRealAddOver = _getAddOrder(dateTimeSelect, currTimeIndex);
365 } else { 367 } else {
366 bool has = storeBaseIndoProvider.dayDateData 368 bool has = storeBaseIndoProvider.dayDateData
367 .any((element) => element.ddateSolt == ddateSoltSelect); 369 .any((element) => element.ddateSolt == ddateSoltSelect);
368 currTimeIndex = has 370 currTimeIndex = has
369 ? int.parse(ddateSoltSelect) 371 ? int.parse(ddateSoltSelect)
370 : int.parse(storeBaseIndoProvider.dayDateData[0].ddateSolt); 372 : int.parse(storeBaseIndoProvider.dayDateData[0].ddateSolt);
  373 +
  374 + isRealAddOver = _getAddOrder(dateTimeSelect, currTimeIndex);
371 } 375 }
372 376
373 selectDateStr = returnDayDateStr(dateTime); 377 selectDateStr = returnDayDateStr(dateTime);
@@ -782,21 +786,23 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -782,21 +786,23 @@ class TableManagerPageState extends State<TableManagerPage> {
782 // itemScrollController.jumpTo(index: index, alignment: 0); 786 // itemScrollController.jumpTo(index: index, alignment: 0);
783 787
784 /// Generate item number [i]. 788 /// Generate item number [i].
785 - Widget item(int i) { 789 + ///
  790 + ///
  791 + _getAddOrder(DateTime datetimeTemp, int dsolt) {
786 bool addOrder = true; //默认允许创建 792 bool addOrder = true; //默认允许创建
787 //如果不允许新建过去的订单，则开始判断 793 //如果不允许新建过去的订单，则开始判断
788 if (!isAddOver) { 794 if (!isAddOver) {
789 String times; 795 String times;
790 //找到当前餐段对应的时间段 796 //找到当前餐段对应的时间段
791 - if (currTimeIndex == 1) { 797 + if (dsolt == 1) {
792 times = morning; 798 times = morning;
793 - } else if (currTimeIndex == 2) { 799 + } else if (dsolt == 2) {
794 times = noon; 800 times = noon;
795 - } else if (currTimeIndex == 3) { 801 + } else if (dsolt == 3) {
796 times = night; 802 times = night;
797 - } else if (currTimeIndex == 4) { 803 + } else if (dsolt == 4) {
798 times = meal1; 804 times = meal1;
799 - } else if (currTimeIndex == 5) { 805 + } else if (dsolt == 5) {
800 times = meal2; 806 times = meal2;
801 } 807 }
802 //组装时间戳 808 //组装时间戳
@@ -807,11 +813,11 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -807,11 +813,11 @@ class TableManagerPageState extends State<TableManagerPage> {
807 // '-' + 813 // '-' +
808 // '${dateTimeSelect.day}' + 814 // '${dateTimeSelect.day}' +
809 // ' ${datas[0]}:00'); //选中餐段开始时间戳 815 // ' ${datas[0]}:00'); //选中餐段开始时间戳
810 - DateTime selectEtime = DateTime.parse('${dateTimeSelect.year}' + 816 + DateTime selectEtime = DateTime.parse('${datetimeTemp.year}' +
811 '-' + 817 '-' +
812 - Utils.addZeroNumber(dateTimeSelect.month) + 818 + Utils.addZeroNumber(datetimeTemp.month) +
813 '-' + 819 '-' +
814 - Utils.addZeroNumber(dateTimeSelect.day) + 820 + Utils.addZeroNumber(datetimeTemp.day) +
815 ' ${datas[1]}:00'); //选中餐段结束时间戳 821 ' ${datas[1]}:00'); //选中餐段结束时间戳
816 // 过去的餐段界定 822 // 过去的餐段界定
817 if (selectEtime.isBefore(DateTime.now())) { 823 if (selectEtime.isBefore(DateTime.now())) {
@@ -822,7 +828,10 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -822,7 +828,10 @@ class TableManagerPageState extends State<TableManagerPage> {
822 addOrder = true; 828 addOrder = true;
823 } 829 }
824 } 830 }
  831 + return addOrder;
  832 + }
825 833
  834 + Widget item(int i) {
826 return GridView.builder( 835 return GridView.builder(
827 // controller: _areaController, 836 // controller: _areaController,
828 // physics: NeverScrollableScrollPhysics(), 837 // physics: NeverScrollableScrollPhysics(),
@@ -857,7 +866,7 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -857,7 +866,7 @@ class TableManagerPageState extends State<TableManagerPage> {
857 fromPage: 'table_manage', 866 fromPage: 'table_manage',
858 canSelected: true, 867 canSelected: true,
859 selectTables: tableManagerModel.selectTablesOrReserve, 868 selectTables: tableManagerModel.selectTablesOrReserve,
860 - addOrder:addOrder ,onSelected: (table) { 869 + addOrder: isRealAddOver, onSelected: (table) {
861 if (table.signStr == '已预订') { 870 if (table.signStr == '已预订') {
862 if (table.sign == '10') { 871 if (table.sign == '10') {
863 //宴会订单 872 //宴会订单
@@ -3810,6 +3819,16 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -3810,6 +3819,16 @@ class TableManagerPageState extends State<TableManagerPage> {
3810 flex: 1, 3819 flex: 1,
3811 child: InkWell( 3820 child: InkWell(
3812 onTap: () { 3821 onTap: () {
  3822 + isRealAddOver =
  3823 + _getAddOrder(dateTimeSelect, int.parse(element.ddateSolt));
  3824 + if (!isRealAddOver &&
  3825 + tableManagerModel.selectTablesOrReserve.length > 0) {
  3826 + Utils.showToast('不允许新建过去餐段的订单！');
  3827 + tableManagerModel.selectTablesOrReserve = [];
  3828 + isRealAddOver = _getAddOrder(dateTimeSelect, currTimeIndex);
  3829 + setState(() {});
  3830 + return;
  3831 + }
3813 currTimeIndex = int.parse(element.ddateSolt); 3832 currTimeIndex = int.parse(element.ddateSolt);
3814 setState(() {}); 3833 setState(() {});
3815 3834
@@ -3920,6 +3939,19 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -3920,6 +3939,19 @@ class TableManagerPageState extends State<TableManagerPage> {
3920 DialogUtil.showCalendarDialog(context, dateTime) 3939 DialogUtil.showCalendarDialog(context, dateTime)
3921 .then((day) async { 3940 .then((day) async {
3922 if (day != null) { 3941 if (day != null) {
  3942 + isRealAddOver = _getAddOrder(day, currTimeIndex);
  3943 + if (tableManagerModel.selectTablesOrReserve.length >
  3944 + 0) {
  3945 + if (!isRealAddOver) {
  3946 + Utils.showToast('不允许新建过去餐段的订单！');
  3947 + tableManagerModel.selectTablesOrReserve = [];
  3948 + isRealAddOver =
  3949 + _getAddOrder(dateTimeSelect, currTimeIndex);
  3950 + setState(() {});
  3951 + return;
  3952 + }
  3953 + }
  3954 +
3923 createDateText1(context, day); 3955 createDateText1(context, day);
3924 getMealSectionByDay(needInit: false); 3956 getMealSectionByDay(needInit: false);
3925 bool success = 3957 bool success =