xt / Flutter-ReserveApp · Commits

Go to a project

Commit c0969fa5df1af32ff8d48a14bb9532979ff3a6d3

Authored by “gaiyaguang”
1 parent 31467915

1和5预订状态都可选择

Inline Side-by-side
Showing 2 changed files with 78 additions and 78 deletions
@@ -443,87 +443,86 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -443,87 +443,86 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
443 color: MyColours.color_f5f5f5, 443 color: MyColours.color_f5f5f5,
444 child: Column( 444 child: Column(
445 children: [ 445 children: [
446 - Row(  
447 - mainAxisAlignment: MainAxisAlignment.spaceBetween,  
448 - crossAxisAlignment: CrossAxisAlignment.end,  
449 - children: [  
450 - Text(  
451 - '可订桌位',  
452 - style: TextStyle(  
453 - color: MyColours.color_353535,  
454 - fontSize: ScreenUtil().setSp(30)),  
455 - ),  
456 - InkWell(  
457 - onTap: () async {  
458 - //当前选中 月 日string  
459 - String mdStr = '';  
460 - //今天 明天 其他天  
461 - for (var item in _notebookDetailChangeModel.dateList) {  
462 - if (item['select'] == true) {  
463 - mdStr = item['title'];  
464 - } 446 + InkWell(
  447 + onTap: () async {
  448 + //当前选中 月 日string
  449 + String mdStr = '';
  450 + //今天 明天 其他天
  451 + for (var item in _notebookDetailChangeModel.dateList) {
  452 + if (item['select'] == true) {
  453 + mdStr = item['title'];
465 } 454 }
466 - String timeNowYear =  
467 - DateUtil.formatDate(DateTime.now(), format: 'yyyy');  
468 - String ymyStr = timeNowYear + '-' + mdStr; //年月日  
469 - String timeStr = ymyStr + ' ' + "00:00:00";  
470 - int ddate = DateUtil.getDateMsByTimeStr(timeStr); //筛选日期时间戳  
471 - String ddateSolt = '';  
472 - for (var item in _notebookDetailChangeModel.sunDateList) {  
473 - if (item['isSelect']) {  
474 - ddateSolt = '${item['ddateSolt']}';  
475 - } 455 + }
  456 + String timeNowYear =
  457 + DateUtil.formatDate(DateTime.now(), format: 'yyyy');
  458 + String ymyStr = timeNowYear + '-' + mdStr; //年月日
  459 + String timeStr = ymyStr + ' ' + "00:00:00";
  460 + int ddate = DateUtil.getDateMsByTimeStr(timeStr); //筛选日期时间戳
  461 + String ddateSolt = '';
  462 + for (var item in _notebookDetailChangeModel.sunDateList) {
  463 + if (item['isSelect']) {
  464 + ddateSolt = '${item['ddateSolt']}';
476 } 465 }
  466 + }
477 467
478 - // String tempDdate = ymyStr + ' ' + ddateStr + ':00';  
479 - // int ddate = DateUtil.getDateMsByTimeStr(timeStr);  
480 - Map temp = await NavigatorUtil.goSelectTablePage(  
481 - context, widget.rid, ddate, ddateSolt,  
482 - canChoose: true,  
483 - object: {'object': _notebookDetailChangeModel.tableList});  
484 - // if (temp['tid'] != null) {  
485 - // setReserveStatus("5", tid: temp['tid']); 468 + // String tempDdate = ymyStr + ' ' + ddateStr + ':00';
  469 + // int ddate = DateUtil.getDateMsByTimeStr(timeStr);
  470 + Map temp = await NavigatorUtil.goSelectTablePage(
  471 + context, widget.rid, ddate, ddateSolt,
  472 + canChoose: true,
  473 + object: {'object': _notebookDetailChangeModel.tableList});
  474 + // if (temp['tid'] != null) {
  475 + // setReserveStatus("5", tid: temp['tid']);
  476 + // }
  477 + if (temp == null || temp['object'].length == 0) {
  478 + isRecommend = true;
  479 + _notebookDetailChangeModel.tableList = [];
  480 + for (t.TableList item
  481 + in _notebookDetailChangeModel.recommendList) {
  482 + item.selected = false;
  483 + }
  484 + setState(() {});
  485 + } else {
  486 + isRecommend = false;
  487 + _notebookDetailChangeModel.tableList = temp['object'];
  488 + // if (_notebookDetailChangeModel.tableList.length == 0) {
  489 + // isRecommend = true;
486 // } 490 // }
487 - if (temp == null || temp['object'].length == 0) {  
488 - isRecommend = true;  
489 - _notebookDetailChangeModel.tableList = [];  
490 - for (t.TableList item  
491 - in _notebookDetailChangeModel.recommendList) {  
492 - item.selected = false;  
493 - }  
494 - setState(() {});  
495 - } else {  
496 - isRecommend = false;  
497 - _notebookDetailChangeModel.tableList = temp['object'];  
498 - // if (_notebookDetailChangeModel.tableList.length == 0) {  
499 - // isRecommend = true;  
500 - // }  
501 - for (t.TableList item  
502 - in _notebookDetailChangeModel.tableList) {  
503 - item.selected = true;  
504 - }  
505 - setState(() {}); 491 + for (t.TableList item
  492 + in _notebookDetailChangeModel.tableList) {
  493 + item.selected = true;
506 } 494 }
  495 + setState(() {});
  496 + }
507 497
508 - // _notebookDetailChangeModel.notifyListeners();  
509 - },  
510 - child: Row(  
511 - children: [  
512 - Text('更多',  
513 - style: TextStyle(  
514 - color: MyColours.color_353535,  
515 - fontSize: ScreenUtil().setSp(26))),  
516 - HEmptyView(20),  
517 - Image.asset(  
518 - 'assets/arr_right_gray.png',  
519 - width: ScreenUtil().setWidth(12),  
520 - height: ScreenUtil().setWidth(22),  
521 - )  
522 - ],  
523 - ),  
524 - )  
525 - ],  
526 - ), 498 + // _notebookDetailChangeModel.notifyListeners();
  499 + },
  500 + child: Row(
  501 + mainAxisAlignment: MainAxisAlignment.spaceBetween,
  502 + crossAxisAlignment: CrossAxisAlignment.end,
  503 + children: [
  504 + Text(
  505 + '可订桌位',
  506 + style: TextStyle(
  507 + color: MyColours.color_353535,
  508 + fontSize: ScreenUtil().setSp(30)),
  509 + ),
  510 + Row(
  511 + children: [
  512 + Text('更多',
  513 + style: TextStyle(
  514 + color: MyColours.color_353535,
  515 + fontSize: ScreenUtil().setSp(26))),
  516 + HEmptyView(20),
  517 + Image.asset(
  518 + 'assets/arr_right_gray.png',
  519 + width: ScreenUtil().setWidth(12),
  520 + height: ScreenUtil().setWidth(22),
  521 + )
  522 + ],
  523 + ),
  524 + ],
  525 + )),
527 VEmptyView(32), 526 VEmptyView(32),
528 Align( 527 Align(
529 alignment: Alignment.centerRight, 528 alignment: Alignment.centerRight,
@@ -940,7 +939,6 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -940,7 +939,6 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
940 ddate_solt = '晚餐'; 939 ddate_solt = '晚餐';
941 } 940 }
942 } 941 }
943 -  
944 List<dynamic> tableinfo = 942 List<dynamic> tableinfo =
945 convert.jsonDecode(_model.row.tableinfo); 943 convert.jsonDecode(_model.row.tableinfo);
946 print(tableinfo); 944 print(tableinfo);
@@ -1026,7 +1024,7 @@ class _ButtonState extends State<CustomButton> { @@ -1026,7 +1024,7 @@ class _ButtonState extends State<CustomButton> {
1026 ? Container( 1024 ? Container(
1027 alignment: Alignment.center, 1025 alignment: Alignment.center,
1028 // color: Colors.red, 1026 // color: Colors.red,
1029 - width: ScreenUtil().setWidth(110), 1027 + width: ScreenUtil().setWidth(114),
1030 height: ScreenUtil().setWidth(50), 1028 height: ScreenUtil().setWidth(50),
1031 // padding: EdgeInsets.zero, 1029 // padding: EdgeInsets.zero,
1032 child: TextField( 1030 child: TextField(
@@ -46,7 +46,9 @@ class TableItemState extends State<TableItem> { @@ -46,7 +46,9 @@ class TableItemState extends State<TableItem> {
46 }); 46 });
47 widget.onSelected(table); 47 widget.onSelected(table);
48 } else { 48 } else {
49 - if (table.sign == '5') { 49 + if (table.sign == '5' || table.sign == '1') {
  50 + // 1一般是商户端
  51 + // 5是用户端
50 //已预订状态 不是自己的不可以选择，是自己的可以选择 52 //已预订状态 不是自己的不可以选择，是自己的可以选择
51 //当前桌子的预订id 53 //当前桌子的预订id
52 String idNow = ''; 54 String idNow = '';