xt / Flutter-ReserveApp · Commits

Go to a project

Commit 901110001d3be3ff09a390b078f7007d9f6c3ed4

Authored by wdn127929
1 parent 41d9bd18
build: skipped

下单时间默认18：00

Inline Side-by-side
Showing 5 changed files with 18 additions and 18 deletions
@@ -734,7 +734,7 @@ class _HomeEnterPageState extends State<HomeEnterPage> { @@ -734,7 +734,7 @@ class _HomeEnterPageState extends State<HomeEnterPage> {
734 } else if (currTimeIndex == 2) { 734 } else if (currTimeIndex == 2) {
735 tempTime = '12:00'; 735 tempTime = '12:00';
736 } else if (currTimeIndex == 3) { 736 } else if (currTimeIndex == 3) {
737 - tempTime = '18:30'; 737 + tempTime = '18:00';
738 } 738 }
739 } 739 }
740 String timeStr = dateText + ' ' + tempTime + ':00'; 740 String timeStr = dateText + ' ' + tempTime + ':00';
@@ -846,7 +846,7 @@ class _HomeEnterPageState extends State<HomeEnterPage> { @@ -846,7 +846,7 @@ class _HomeEnterPageState extends State<HomeEnterPage> {
846 } else if (currTimeIndex == 2) { 846 } else if (currTimeIndex == 2) {
847 _homeEnterModel.ddateStr = '12:00'; 847 _homeEnterModel.ddateStr = '12:00';
848 } else if (currTimeIndex == 3) { 848 } else if (currTimeIndex == 3) {
849 - _homeEnterModel.ddateStr = '18:30'; 849 + _homeEnterModel.ddateStr = '18:00';
850 } 850 }
851 // _homeEnterModel.initHourAndMinuteSelect(); 851 // _homeEnterModel.initHourAndMinuteSelect();
852 // 刷新页面 852 // 刷新页面
@@ -970,7 +970,7 @@ class _HomeEnterPageState extends State<HomeEnterPage> { @@ -970,7 +970,7 @@ class _HomeEnterPageState extends State<HomeEnterPage> {
970 // } else if (currTimeIndex == 2) { 970 // } else if (currTimeIndex == 2) {
971 // _homeEnterModel.ddateStr = '12:00'; 971 // _homeEnterModel.ddateStr = '12:00';
972 // } else if (currTimeIndex == 3) { 972 // } else if (currTimeIndex == 3) {
973 - // _homeEnterModel.ddateStr = '18:30'; 973 + // _homeEnterModel.ddateStr = '18:00';
974 // } 974 // }
975 // // _homeEnterModel.initHourAndMinuteSelect(); 975 // // _homeEnterModel.initHourAndMinuteSelect();
976 976
@@ -1380,7 +1380,7 @@ class _HomeEnterPageState extends State<HomeEnterPage> { @@ -1380,7 +1380,7 @@ class _HomeEnterPageState extends State<HomeEnterPage> {
1380 } else if (currTimeIndex == 2) { 1380 } else if (currTimeIndex == 2) {
1381 tempTime = '12:00'; 1381 tempTime = '12:00';
1382 } else if (currTimeIndex == 3) { 1382 } else if (currTimeIndex == 3) {
1383 - tempTime = '18:30'; 1383 + tempTime = '18:00';
1384 } 1384 }
1385 } 1385 }
1386 print(_model.row.tableinfo); 1386 print(_model.row.tableinfo);
@@ -1404,7 +1404,7 @@ class _HomeEnterPageState extends State<HomeEnterPage> { @@ -1404,7 +1404,7 @@ class _HomeEnterPageState extends State<HomeEnterPage> {
1404 // } else if (currTimeIndex == 2) { 1404 // } else if (currTimeIndex == 2) {
1405 // tempTime = '12:00'; 1405 // tempTime = '12:00';
1406 // } else if (currTimeIndex == 3) { 1406 // } else if (currTimeIndex == 3) {
1407 - // tempTime = '18:30'; 1407 + // tempTime = '18:00';
1408 // } 1408 // }
1409 // } 1409 // }
1410 // String timeStr = dateText + ' ' + tempTime + ':00'; 1410 // String timeStr = dateText + ' ' + tempTime + ':00';
@@ -331,7 +331,7 @@ class EnterModel with ChangeNotifier { @@ -331,7 +331,7 @@ class EnterModel with ChangeNotifier {
331 tempSelect = true; 331 tempSelect = true;
332 } 332 }
333 } else if (mnd == 3) { 333 } else if (mnd == 3) {
334 - if (temp == '18:30') { 334 + if (temp == '18:00') {
335 tempSelect = true; 335 tempSelect = true;
336 } 336 }
337 } 337 }
@@ -224,7 +224,7 @@ class HomeEnterModel with ChangeNotifier { @@ -224,7 +224,7 @@ class HomeEnterModel with ChangeNotifier {
224 tempSelect = true; 224 tempSelect = true;
225 } 225 }
226 } else if (mnd == 3) { 226 } else if (mnd == 3) {
227 - if (temp == '18:30') { 227 + if (temp == '18:00') {
228 tempSelect = true; 228 tempSelect = true;
229 } 229 }
230 } 230 }
@@ -307,11 +307,11 @@ class HomeEnterModel with ChangeNotifier { @@ -307,11 +307,11 @@ class HomeEnterModel with ChangeNotifier {
307 //晚市选中18：30 307 //晚市选中18：30
308 temp['select'] = false; 308 temp['select'] = false;
309 if (select) continue; 309 if (select) continue;
310 - if (nights.contains("18:30") && 310 + if (nights.contains("18:00") &&
311 timeMillsNow <= 311 timeMillsNow <=
312 DateUtil.getDateMsByTimeStr(DateUtil.formatDate(dateTime) 312 DateUtil.getDateMsByTimeStr(DateUtil.formatDate(dateTime)
313 - .replaceRange(11, 19, "18:30:00"))) {  
314 - if (temp['title'] == "18:30") { 313 + .replaceRange(11, 19, "18:00:00"))) {
  314 + if (temp['title'] == "18:00") {
315 temp['select'] = true; 315 temp['select'] = true;
316 select = true; 316 select = true;
317 } 317 }
@@ -589,7 +589,7 @@ class HomeEnterModel with ChangeNotifier { @@ -589,7 +589,7 @@ class HomeEnterModel with ChangeNotifier {
589 } else if (currTimeIndex == 2) { 589 } else if (currTimeIndex == 2) {
590 tempTime = '12:00'; 590 tempTime = '12:00';
591 } else if (currTimeIndex == 3) { 591 } else if (currTimeIndex == 3) {
592 - tempTime = '18:30'; 592 + tempTime = '18:00';
593 } 593 }
594 } 594 }
595 String timeStr = dateText + ' ' + tempTime + ':00'; 595 String timeStr = dateText + ' ' + tempTime + ':00';
@@ -295,7 +295,7 @@ class NotebookDetailChangeModel with ChangeNotifier { @@ -295,7 +295,7 @@ class NotebookDetailChangeModel with ChangeNotifier {
295 tempSelect = true; 295 tempSelect = true;
296 } 296 }
297 } else if (mnd == 3) { 297 } else if (mnd == 3) {
298 - if (temp == '18:30') { 298 + if (temp == '18:00') {
299 tempSelect = true; 299 tempSelect = true;
300 } 300 }
301 } 301 }
@@ -378,11 +378,11 @@ class NotebookDetailChangeModel with ChangeNotifier { @@ -378,11 +378,11 @@ class NotebookDetailChangeModel with ChangeNotifier {
378 //晚市选中18：30 378 //晚市选中18：30
379 temp['select'] = false; 379 temp['select'] = false;
380 if (select) continue; 380 if (select) continue;
381 - if (nights.contains("18:30") && 381 + if (nights.contains("18:00") &&
382 timeMillsNow <= 382 timeMillsNow <=
383 DateUtil.getDateMsByTimeStr(DateUtil.formatDate(dateTime) 383 DateUtil.getDateMsByTimeStr(DateUtil.formatDate(dateTime)
384 - .replaceRange(11, 19, "18:30:00"))) {  
385 - if (temp['title'] == "18:30") { 384 + .replaceRange(11, 19, "18:00:00"))) {
  385 + if (temp['title'] == "18:00") {
386 temp['select'] = true; 386 temp['select'] = true;
387 select = true; 387 select = true;
388 } 388 }
@@ -166,12 +166,12 @@ class TableManagerModel with ChangeNotifier { @@ -166,12 +166,12 @@ class TableManagerModel with ChangeNotifier {
166 DateUtil.getDateMsByTimeStr(DateUtil.formatDate(dateTime) 166 DateUtil.getDateMsByTimeStr(DateUtil.formatDate(dateTime)
167 .replaceRange(11, 19, "$temp:00"))) { 167 .replaceRange(11, 19, "$temp:00"))) {
168 currSelectTime = temp; 168 currSelectTime = temp;
169 - if (nights.contains("18:30") && 169 + if (nights.contains("18:00") &&
170 DateUtil.getDateMsByTimeStr(DateUtil.formatDate(dateTime) 170 DateUtil.getDateMsByTimeStr(DateUtil.formatDate(dateTime)
171 .replaceRange(11, 19, "$temp:00")) < 171 .replaceRange(11, 19, "$temp:00")) <
172 DateUtil.getDateMsByTimeStr(DateUtil.formatDate(dateTime) 172 DateUtil.getDateMsByTimeStr(DateUtil.formatDate(dateTime)
173 - .replaceRange(11, 19, "18:30:00"))) {  
174 - currSelectTime = "18:30"; 173 + .replaceRange(11, 19, "18:00:00"))) {
  174 + currSelectTime = "18:00";
175 } 175 }
176 break; 176 break;
177 } 177 }