xt / Flutter-ReserveApp · Commits

Go to a project

Commit f39cb4d3e82cc5b10bee390c6425f117fa66b22c

Authored by wdn127929
1 parent e44da6f9
build: skipped

选择桌位更多页面，没有选了几个桌子的提示，有时误触多选了一个桌子都不知道

Inline Side-by-side
Showing 3 changed files with 25 additions and 3 deletions
@@ -66,7 +66,7 @@ Future<void> main() async { @@ -66,7 +66,7 @@ Future<void> main() async {
66 LogUtil.init(isDebug: true, tag: 'ONE_KEY'); 66 LogUtil.init(isDebug: true, tag: 'ONE_KEY');
67 Provider.debugCheckInvalidValueType = null; 67 Provider.debugCheckInvalidValueType = null;
68 await initializeDateFormatting(); 68 await initializeDateFormatting();
69 - _requestPermissions(); 69 + // _requestPermissions();
70 Utils.changeStatusColor(); 70 Utils.changeStatusColor();
71 SystemChrome.setPreferredOrientations( 71 SystemChrome.setPreferredOrientations(
72 [DeviceOrientation.portraitUp, DeviceOrientation.portraitDown]) 72 [DeviceOrientation.portraitUp, DeviceOrientation.portraitDown])
@@ -389,7 +389,7 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -389,7 +389,7 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
389 // if (temp['tid'] != null) { 389 // if (temp['tid'] != null) {
390 // setReserveStatus("5", tid: temp['tid']); 390 // setReserveStatus("5", tid: temp['tid']);
391 // } 391 // }
392 - if (temp == null || temp['object'].length == 0) { 392 + if (temp == null) {
393 if (_notebookDetailChangeModel.tableList.length == 0) { 393 if (_notebookDetailChangeModel.tableList.length == 0) {
394 _notebookDetailChangeModel.isRecommend = true; 394 _notebookDetailChangeModel.isRecommend = true;
395 _notebookDetailChangeModel.tableList = []; 395 _notebookDetailChangeModel.tableList = [];
@@ -399,6 +399,14 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -399,6 +399,14 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
399 } 399 }
400 setState(() {}); 400 setState(() {});
401 } 401 }
  402 + } else if (temp['object'].length == 0) {
  403 + _notebookDetailChangeModel.isRecommend = true;
  404 + _notebookDetailChangeModel.tableList = [];
  405 + for (t.TableList item
  406 + in _notebookDetailChangeModel.recommendList) {
  407 + item.selected = false;
  408 + }
  409 + setState(() {});
402 } else { 410 } else {
403 _notebookDetailChangeModel.isRecommend = false; 411 _notebookDetailChangeModel.isRecommend = false;
404 _notebookDetailChangeModel.tableList = temp['object']; 412 _notebookDetailChangeModel.tableList = temp['object'];
@@ -59,6 +59,8 @@ class SelectTablePageState extends State<SelectTablePage> { @@ -59,6 +59,8 @@ class SelectTablePageState extends State<SelectTablePage> {
59 String currentArea; //当前选中区域 59 String currentArea; //当前选中区域
60 List<String> personNumList = []; 60 List<String> personNumList = [];
61 61
  62 + int selectNum = 0;
  63 +
62 @override 64 @override
63 void initState() { 65 void initState() {
64 // TODO: implement initState 66 // TODO: implement initState
@@ -85,6 +87,7 @@ class SelectTablePageState extends State<SelectTablePage> { @@ -85,6 +87,7 @@ class SelectTablePageState extends State<SelectTablePage> {
85 for (var table in widget.tableList) { 87 for (var table in widget.tableList) {
86 if (item.id == table.id) { 88 if (item.id == table.id) {
87 item.selected = true; 89 item.selected = true;
  90 + selectNum++;
88 // if (!tableList.contains(item)) { 91 // if (!tableList.contains(item)) {
89 // tableList.add(item); 92 // tableList.add(item);
90 // } 93 // }
@@ -413,9 +416,11 @@ class SelectTablePageState extends State<SelectTablePage> { @@ -413,9 +416,11 @@ class SelectTablePageState extends State<SelectTablePage> {
413 for (t.Table item 416 for (t.Table item
414 in areaTableMap[item]) { 417 in areaTableMap[item]) {
415 item.selected = false; 418 item.selected = false;
  419 + selectNum = 0;
416 if (table.id == item.id) { 420 if (table.id == item.id) {
417 item.selected = true; 421 item.selected = true;
418 selectTables = []; 422 selectTables = [];
  423 + selectNum++;
419 selectTables.add(table); 424 selectTables.add(table);
420 } 425 }
421 } 426 }
@@ -424,14 +429,21 @@ class SelectTablePageState extends State<SelectTablePage> { @@ -424,14 +429,21 @@ class SelectTablePageState extends State<SelectTablePage> {
424 } else { 429 } else {
425 if ((table as t.Table).selected) { 430 if ((table as t.Table).selected) {
426 selectTables.add(table); 431 selectTables.add(table);
  432 +
  433 + selectNum++;
  434 +
427 widget.tableList 435 widget.tableList
428 .add(tableToTableList(table)); 436 .add(tableToTableList(table));
429 } else { 437 } else {
430 widget.tableList.removeWhere( 438 widget.tableList.removeWhere(
431 (t) => t.id == table.id); 439 (t) => t.id == table.id);
  440 +
  441 + selectNum--;
  442 +
432 selectTables.removeWhere( 443 selectTables.removeWhere(
433 (t) => t.id == table.id); 444 (t) => t.id == table.id);
434 } 445 }
  446 + setState(() {});
435 } 447 }
436 }, 448 },
437 canSelected: true, 449 canSelected: true,
@@ -454,7 +466,9 @@ class SelectTablePageState extends State<SelectTablePage> { @@ -454,7 +466,9 @@ class SelectTablePageState extends State<SelectTablePage> {
454 alignment: Alignment.center, 466 alignment: Alignment.center,
455 color: MyColours.color_ffffff, 467 color: MyColours.color_ffffff,
456 child: CommonButton( 468 child: CommonButton(
457 - content: "确定", 469 + content: widget.fromPage == 'tablePhoto'
  470 + ? '确定'
  471 + : "已选${selectNum}个 确定",
458 width: 500, 472 width: 500,
459 height: 84, 473 height: 84,
460 fontSize: 34, 474 fontSize: 34,