xt / Flutter-ReserveApp · Commits

Go to a project

Commit f34cc103500db939b250df35acd3d8183f8ed973

Authored by wdn127929
1 parent 10553449

修改默认午餐到店时间为12：00

Inline Side-by-side
Showing 4 changed files with 15 additions and 15 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 = "263" 14 +def flutterVersionCode = "270"
15 if (flutterVersionCode == null) { 15 if (flutterVersionCode == null) {
16 - flutterVersionCode = '263' 16 + flutterVersionCode = '270'
17 } 17 }
18 18
19 -def flutterVersionName = "2.6.3" 19 +def flutterVersionName = "2.7.0"
20 if (flutterVersionName == null) { 20 if (flutterVersionName == null) {
21 - flutterVersionName = '2.6.3' 21 + flutterVersionName = '2.7.0'
22 } 22 }
23 23
24 apply plugin: 'com.android.application' 24 apply plugin: 'com.android.application'
@@ -280,14 +280,14 @@ class HomeEnterModel with ChangeNotifier { @@ -280,14 +280,14 @@ class HomeEnterModel with ChangeNotifier {
280 case "noon": //选中午市 280 case "noon": //选中午市
281 bool select = false; 281 bool select = false;
282 for (var temp in dailyMap['noon']) { 282 for (var temp in dailyMap['noon']) {
283 - //午市选中12：30 283 + //午市选中12：00
284 temp['select'] = false; 284 temp['select'] = false;
285 if (select) continue; 285 if (select) continue;
286 - if (noons.contains("12:30") && 286 + if (noons.contains("12:00") &&
287 timeMillsNow <= 287 timeMillsNow <=
288 DateUtil.getDateMsByTimeStr(DateUtil.formatDate(dateTime) 288 DateUtil.getDateMsByTimeStr(DateUtil.formatDate(dateTime)
289 - .replaceRange(11, 19, "12:30:00"))) {  
290 - if (temp['title'] == "12:30") { 289 + .replaceRange(11, 19, "12:00:00"))) {
  290 + if (temp['title'] == "12:00") {
291 temp['select'] = true; 291 temp['select'] = true;
292 select = true; 292 select = true;
293 } 293 }
@@ -351,14 +351,14 @@ class NotebookDetailChangeModel with ChangeNotifier { @@ -351,14 +351,14 @@ class NotebookDetailChangeModel with ChangeNotifier {
351 case "noon": //选中午市 351 case "noon": //选中午市
352 bool select = false; 352 bool select = false;
353 for (var temp in dailyMap['noon']) { 353 for (var temp in dailyMap['noon']) {
354 - //午市选中12：30 354 + //午市选中12：00
355 temp['select'] = false; 355 temp['select'] = false;
356 if (select) continue; 356 if (select) continue;
357 - if (noons.contains("12:30") && 357 + if (noons.contains("12:00") &&
358 timeMillsNow <= 358 timeMillsNow <=
359 DateUtil.getDateMsByTimeStr(DateUtil.formatDate(dateTime) 359 DateUtil.getDateMsByTimeStr(DateUtil.formatDate(dateTime)
360 - .replaceRange(11, 19, "12:30:00"))) {  
361 - if (temp['title'] == "12:30") { 360 + .replaceRange(11, 19, "12:00:00"))) {
  361 + if (temp['title'] == "12:00") {
362 temp['select'] = true; 362 temp['select'] = true;
363 select = true; 363 select = true;
364 } 364 }
@@ -149,12 +149,12 @@ class TableManagerModel with ChangeNotifier { @@ -149,12 +149,12 @@ class TableManagerModel with ChangeNotifier {
149 DateUtil.getDateMsByTimeStr(DateUtil.formatDate(dateTime) 149 DateUtil.getDateMsByTimeStr(DateUtil.formatDate(dateTime)
150 .replaceRange(11, 19, "$temp:00"))) { 150 .replaceRange(11, 19, "$temp:00"))) {
151 currSelectTime = temp; 151 currSelectTime = temp;
152 - if (noons.contains("12:30") && 152 + if (noons.contains("12:00") &&
153 DateUtil.getDateMsByTimeStr(DateUtil.formatDate(dateTime) 153 DateUtil.getDateMsByTimeStr(DateUtil.formatDate(dateTime)
154 .replaceRange(11, 19, "$temp:00")) < 154 .replaceRange(11, 19, "$temp:00")) <
155 DateUtil.getDateMsByTimeStr(DateUtil.formatDate(dateTime) 155 DateUtil.getDateMsByTimeStr(DateUtil.formatDate(dateTime)
156 - .replaceRange(11, 19, "12:30:00"))) {  
157 - currSelectTime = "12:30"; 156 + .replaceRange(11, 19, "12:00:00"))) {
  157 + currSelectTime = "12:00";
158 } 158 }
159 break; 159 break;
160 } 160 }