xt / Flutter-ReserveApp · Commits

Go to a project

Commit edcd29bc6413fc159b8d4d2fa3620fa711e77b11

Authored by wdn127929
1 parent 3419ac4e
build: skipped

到店时间15 \45

Inline Side-by-side
Showing 5 changed files with 187 additions and 49 deletions
@@ -473,22 +473,23 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -473,22 +473,23 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
473 int beginHour = int.parse(tempHour[0]); 473 int beginHour = int.parse(tempHour[0]);
474 /*获取开始分钟*/ 474 /*获取开始分钟*/
475 int beginMinute = int.parse(tempHour[1]); 475 int beginMinute = int.parse(tempHour[1]);
476 - if (beginMinute == 15) {  
477 - beginMinute = 30;  
478 - } else if (beginMinute == 45) {  
479 - beginHour++;  
480 - beginMinute = 0;  
481 - } 476 + // if (beginMinute == 15) {
  477 + // beginMinute = 30;
  478 + // } else
  479 + // if (beginMinute == 45) {
  480 + // beginHour++;
  481 + // beginMinute = 0;
  482 + // }
482 List endTemp = endDate.split(':'); 483 List endTemp = endDate.split(':');
483 /*获取结束小时*/ 484 /*获取结束小时*/
484 int endHour = int.parse(endTemp[0]); 485 int endHour = int.parse(endTemp[0]);
485 /*获取结束分钟*/ 486 /*获取结束分钟*/
486 int endMinute = int.parse(endTemp[1]); 487 int endMinute = int.parse(endTemp[1]);
487 - if (endMinute == 15) {  
488 - endDate = '${endTemp[0]}:00';  
489 - } else if (endMinute == 45) {  
490 - endDate = '${endTemp[0]}:30';  
491 - } 488 + // if (endMinute == 15) {
  489 + // endDate = '${endTemp[0]}:00';
  490 + // } else if (endMinute == 45) {
  491 + // endDate = '${endTemp[0]}:30';
  492 + // }
492 List res = []; 493 List res = [];
493 bool tempLimit = true; 494 bool tempLimit = true;
494 while (tempLimit) { 495 while (tempLimit) {
@@ -584,13 +585,13 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -584,13 +585,13 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
584 tempLimit = false; 585 tempLimit = false;
585 break; 586 break;
586 } 587 }
587 - if (beginMinute == 30) { 588 + if (beginMinute == 45) {
588 beginHour++; 589 beginHour++;
589 if (beginHour >= 24) { 590 if (beginHour >= 24) {
590 beginHour = 0; 591 beginHour = 0;
591 } 592 }
592 } 593 }
593 - beginMinute = (beginMinute + 30) % 60; 594 + beginMinute = (beginMinute + 15) % 60;
594 } 595 }
595 return res; 596 return res;
596 } 597 }
@@ -1077,33 +1077,168 @@ class InvicationPageState extends State<InvicationPage> @@ -1077,33 +1077,168 @@ class InvicationPageState extends State<InvicationPage>
1077 } 1077 }
1078 } 1078 }
1079 1079
  1080 +// //根据获取时间 11:00-12:30 获取30分钟间隔组装的数组
  1081 +// _getHourAndMinute(String hourAndMinuteStr, int mnd) {
  1082 +// List tempDate = hourAndMinuteStr.split("-");
  1083 +// String beginDate = tempDate[0];
  1084 +// String endDate = tempDate[1];
  1085 +// List tempHour = beginDate.split(':');
  1086 +
  1087 +// /*获取开始小时*/
  1088 +// int beginHour = int.parse(tempHour[0]);
  1089 +// /*获取开始分钟*/
  1090 +// int beginMinute = int.parse(tempHour[1]);
  1091 +// // if (beginMinute == 15) {
  1092 +// // beginMinute = 30;
  1093 +// // } else
  1094 +// if (beginMinute == 45) {
  1095 +// beginHour++;
  1096 +// beginMinute = 0;
  1097 +// }
  1098 +// List endTemp = endDate.split(':');
  1099 +// /*获取结束小时*/
  1100 +// int endHour = int.parse(endTemp[0]);
  1101 +// /*获取结束分钟*/
  1102 +// int endMinute = int.parse(endTemp[1]);
  1103 +// // if (endMinute == 15) {
  1104 +// // endDate = '${endTemp[0]}:00';
  1105 +// // } else if (endMinute == 45) {
  1106 +// // endDate = '${endTemp[0]}:30';
  1107 +// // }
  1108 +// List res = [];
  1109 +// bool tempLimit = true;
  1110 +// while (tempLimit) {
  1111 +// String temp = _dealTime(beginHour, beginMinute);
  1112 +// // if (mnd == 1) {
  1113 +// // //早市
  1114 +// // mornings.add(temp);
  1115 +// // } else if (mnd == 2) {
  1116 +// // //午市
  1117 +// // noons.add(temp);
  1118 +// // } else if (mnd == 3) {
  1119 +// // //晚市
  1120 +// // nights.add(temp);
  1121 +// // }
  1122 +// bool tempSelect = false;
  1123 +// if (int.parse(detailModel!.detailModelAllSunModel!.isSetDdate!) ==
  1124 +// 1) //设置预订时间
  1125 +// {
  1126 +// if (temp == ddateHm) {
  1127 +// tempSelect = true;
  1128 +// }
  1129 +// } else {
  1130 +// UserModel userModel = Provider.of<UserModel>(context, listen: false);
  1131 +// String beginDate = '';
  1132 +// if (storeBaseIndoProvider.dayDateData != null) {
  1133 +// int index = storeBaseIndoProvider.dayDateData!
  1134 +// .indexWhere((element) => element.ddateSolt == '${mnd}');
  1135 +// if (index != -1) {
  1136 +// List tempDate =
  1137 +// storeBaseIndoProvider.dayDateData![index].mdate!.split("-");
  1138 +
  1139 +// beginDate = tempDate[0];
  1140 +// }
  1141 +// }
  1142 +// if (beginDate == '') {
  1143 +// if (mnd == 1) {
  1144 +// beginDate = '08:00';
  1145 +
  1146 +// // if (userModel.user!.morning != '' &&
  1147 +// // userModel.user!.morning != null) {
  1148 +// // List tempDate = userModel.user!.morning!.split("-");
  1149 +// // beginDate = tempDate[0];
  1150 +// // }
  1151 +// } else if (mnd == 2) {
  1152 +// beginDate = '12:00';
  1153 +
  1154 +// // if (userModel.user!.noon != '' && userModel.user!.noon != null) {
  1155 +// // List tempDate = userModel.user!.noon!.split("-");
  1156 +// // beginDate = tempDate[0];
  1157 +// // }
  1158 +// } else if (mnd == 3) {
  1159 +// beginDate = '18:00';
  1160 +// // if (userModel.user!.night != '' && userModel.user!.night != null) {
  1161 +// // List tempDate = userModel.user!.night!.split("-");
  1162 +// // beginDate = tempDate[0];
  1163 +// // }
  1164 +// } else if (mnd == 4) {
  1165 +// beginDate = '20:00';
  1166 +// // if (userModel.user!.night != '' && userModel.user!.night != null) {
  1167 +// // List tempDate = userModel.user!.night!.split("-");
  1168 +// // beginDate = tempDate[0];
  1169 +// // }
  1170 +// } else if (mnd == 5) {
  1171 +// beginDate = '21:00';
  1172 +// // if (userModel.user!.night != '' && userModel.user!.night != null) {
  1173 +// // List tempDate = userModel.user!.night!.split("-");
  1174 +// // beginDate = tempDate[0];
  1175 +// // }
  1176 +// }
  1177 +// }
  1178 +
  1179 +// if (temp == beginDate) {
  1180 +// tempSelect = true;
  1181 +// }
  1182 +
  1183 +// // if (mnd == 1) {
  1184 +// // if (temp == '08:00') {
  1185 +// // tempSelect = true;
  1186 +// // }
  1187 +// // } else if (mnd == 2) {
  1188 +// // if (temp == '12:00') {
  1189 +// // tempSelect = true;
  1190 +// // }
  1191 +// // } else if (mnd == 3) {
  1192 +// // if (temp == '18:00') {
  1193 +// // tempSelect = true;
  1194 +// // }
  1195 +// // }
  1196 +// }
  1197 +// Map tempMap = {'title': temp, 'select': tempSelect};
  1198 +// res.add(tempMap);
  1199 +// if (temp == endDate) {
  1200 +// tempLimit = false;
  1201 +// break;
  1202 +// }
  1203 +// if (beginMinute == 45) {
  1204 +// beginHour++;
  1205 +// if (beginHour >= 24) {
  1206 +// beginHour = 0;
  1207 +// }
  1208 +// }
  1209 +// beginMinute = (beginMinute + 15) % 60;
  1210 +// }
  1211 +// return res;
  1212 +// }
1080 //根据获取时间 11:00-12:30 获取30分钟间隔组装的数组 1213 //根据获取时间 11:00-12:30 获取30分钟间隔组装的数组
1081 _getHourAndMinute(String hourAndMinuteStr, int mnd) { 1214 _getHourAndMinute(String hourAndMinuteStr, int mnd) {
1082 List tempDate = hourAndMinuteStr.split("-"); 1215 List tempDate = hourAndMinuteStr.split("-");
1083 String beginDate = tempDate[0]; 1216 String beginDate = tempDate[0];
1084 String endDate = tempDate[1]; 1217 String endDate = tempDate[1];
1085 List tempHour = beginDate.split(':'); 1218 List tempHour = beginDate.split(':');
  1219 +
1086 /*获取开始小时*/ 1220 /*获取开始小时*/
1087 int beginHour = int.parse(tempHour[0]); 1221 int beginHour = int.parse(tempHour[0]);
1088 /*获取开始分钟*/ 1222 /*获取开始分钟*/
1089 int beginMinute = int.parse(tempHour[1]); 1223 int beginMinute = int.parse(tempHour[1]);
1090 - if (beginMinute == 15) {  
1091 - beginMinute = 30;  
1092 - } else if (beginMinute == 45) {  
1093 - beginHour++;  
1094 - beginMinute = 0;  
1095 - } 1224 + // if (beginMinute == 15) {
  1225 + // beginMinute = 30;
  1226 + // } else
  1227 + // if (beginMinute == 45) {
  1228 + // beginHour++;
  1229 + // beginMinute = 0;
  1230 + // }
1096 List endTemp = endDate.split(':'); 1231 List endTemp = endDate.split(':');
1097 /*获取结束小时*/ 1232 /*获取结束小时*/
1098 int endHour = int.parse(endTemp[0]); 1233 int endHour = int.parse(endTemp[0]);
1099 /*获取结束分钟*/ 1234 /*获取结束分钟*/
1100 int endMinute = int.parse(endTemp[1]); 1235 int endMinute = int.parse(endTemp[1]);
1101 - if (endMinute == 15) {  
1102 - endDate = '${endTemp[0]}:00';  
1103 - } else if (endMinute == 45) {  
1104 - endDate = '${endTemp[0]}:30';  
1105 - }  
1106 - List<String> res = []; 1236 + // if (endMinute == 15) {
  1237 + // endDate = '${endTemp[0]}:00';
  1238 + // } else if (endMinute == 45) {
  1239 + // endDate = '${endTemp[0]}:30';
  1240 + // }
  1241 + List res = [];
1107 bool tempLimit = true; 1242 bool tempLimit = true;
1108 while (tempLimit) { 1243 while (tempLimit) {
1109 String temp = _dealTime(beginHour, beginMinute); 1244 String temp = _dealTime(beginHour, beginMinute);
@@ -1112,13 +1247,13 @@ class InvicationPageState extends State<InvicationPage> @@ -1112,13 +1247,13 @@ class InvicationPageState extends State<InvicationPage>
1112 tempLimit = false; 1247 tempLimit = false;
1113 break; 1248 break;
1114 } 1249 }
1115 - if (beginMinute == 30) { 1250 + if (beginMinute == 45) {
1116 beginHour++; 1251 beginHour++;
1117 if (beginHour >= 24) { 1252 if (beginHour >= 24) {
1118 beginHour = 0; 1253 beginHour = 0;
1119 } 1254 }
1120 } 1255 }
1121 - beginMinute = (beginMinute + 30) % 60; 1256 + beginMinute = (beginMinute + 15) % 60;
1122 } 1257 }
1123 return res; 1258 return res;
1124 } 1259 }
@@ -1079,6 +1079,7 @@ Future<bool> getAllCuisine(BuildContext context) async { @@ -1079,6 +1079,7 @@ Future<bool> getAllCuisine(BuildContext context) async {
1079 // return '30'; 1079 // return '30';
1080 // } else { 1080 // } else {
1081 Map map = data[value[0]]; 1081 Map map = data[value[0]];
  1082 +
1082 1083
1083 int? minute = map.values.last[value[1]]; 1084 int? minute = map.values.last[value[1]];
1084 if (minute == 0) { 1085 if (minute == 0) {
@@ -345,9 +345,10 @@ class NotebookDetailPageSimState extends State<NotebookDetailPageSim> { @@ -345,9 +345,10 @@ class NotebookDetailPageSimState extends State<NotebookDetailPageSim> {
345 int beginHour = int.parse(tempHour[0]); 345 int beginHour = int.parse(tempHour[0]);
346 /*获取开始分钟*/ 346 /*获取开始分钟*/
347 int beginMinute = int.parse(tempHour[1]); 347 int beginMinute = int.parse(tempHour[1]);
348 - if (beginMinute == 15) {  
349 - beginMinute = 30;  
350 - } else if (beginMinute == 45) { 348 + // if (beginMinute == 15) {
  349 + // beginMinute = 30;
  350 + // } else
  351 + if (beginMinute == 45) {
351 beginHour++; 352 beginHour++;
352 beginMinute = 0; 353 beginMinute = 0;
353 } 354 }
@@ -356,11 +357,11 @@ class NotebookDetailPageSimState extends State<NotebookDetailPageSim> { @@ -356,11 +357,11 @@ class NotebookDetailPageSimState extends State<NotebookDetailPageSim> {
356 int endHour = int.parse(endTemp[0]); 357 int endHour = int.parse(endTemp[0]);
357 /*获取结束分钟*/ 358 /*获取结束分钟*/
358 int endMinute = int.parse(endTemp[1]); 359 int endMinute = int.parse(endTemp[1]);
359 - if (endMinute == 15) {  
360 - endDate = '${endTemp[0]}:00';  
361 - } else if (endMinute == 45) {  
362 - endDate = '${endTemp[0]}:30';  
363 - } 360 + // if (endMinute == 15) {
  361 + // endDate = '${endTemp[0]}:00';
  362 + // } else if (endMinute == 45) {
  363 + // endDate = '${endTemp[0]}:30';
  364 + // }
364 List res = []; 365 List res = [];
365 bool tempLimit = true; 366 bool tempLimit = true;
366 while (tempLimit) { 367 while (tempLimit) {
@@ -428,13 +429,13 @@ class NotebookDetailPageSimState extends State<NotebookDetailPageSim> { @@ -428,13 +429,13 @@ class NotebookDetailPageSimState extends State<NotebookDetailPageSim> {
428 tempLimit = false; 429 tempLimit = false;
429 break; 430 break;
430 } 431 }
431 - if (beginMinute == 30) { 432 + if (beginMinute == 45) {
432 beginHour++; 433 beginHour++;
433 if (beginHour >= 24) { 434 if (beginHour >= 24) {
434 beginHour = 0; 435 beginHour = 0;
435 } 436 }
436 } 437 }
437 - beginMinute = (beginMinute + 30) % 60; 438 + beginMinute = (beginMinute + 15) % 60;
438 } 439 }
439 return res; 440 return res;
440 } 441 }
@@ -233,15 +233,15 @@ class NotebookDetailChangeModel with ChangeNotifier { @@ -233,15 +233,15 @@ class NotebookDetailChangeModel with ChangeNotifier {
233 String beginDate = tempDate[0]; 233 String beginDate = tempDate[0];
234 String endDate = tempDate[1]; 234 String endDate = tempDate[1];
235 List tempHour = beginDate.split(':'); 235 List tempHour = beginDate.split(':');
236 - String? isSetDate = detailEntity.is_set_ddate;  
237 - String? ddateSolt = detailEntity.ddate_solt; 236 +
238 /*获取开始小时*/ 237 /*获取开始小时*/
239 int beginHour = int.parse(tempHour[0]); 238 int beginHour = int.parse(tempHour[0]);
240 /*获取开始分钟*/ 239 /*获取开始分钟*/
241 int beginMinute = int.parse(tempHour[1]); 240 int beginMinute = int.parse(tempHour[1]);
242 - if (beginMinute == 15) {  
243 - beginMinute = 30;  
244 - } else if (beginMinute == 45) { 241 + // if (beginMinute == 15) {
  242 + // beginMinute = 30;
  243 + // } else
  244 + if (beginMinute == 45) {
245 beginHour++; 245 beginHour++;
246 beginMinute = 0; 246 beginMinute = 0;
247 } 247 }
@@ -250,11 +250,11 @@ class NotebookDetailChangeModel with ChangeNotifier { @@ -250,11 +250,11 @@ class NotebookDetailChangeModel with ChangeNotifier {
250 int endHour = int.parse(endTemp[0]); 250 int endHour = int.parse(endTemp[0]);
251 /*获取结束分钟*/ 251 /*获取结束分钟*/
252 int endMinute = int.parse(endTemp[1]); 252 int endMinute = int.parse(endTemp[1]);
253 - if (endMinute == 15) {  
254 - endDate = '${endTemp[0]}:00';  
255 - } else if (endMinute == 45) {  
256 - endDate = '${endTemp[0]}:30';  
257 - } 253 + // if (endMinute == 15) {
  254 + // endDate = '${endTemp[0]}:00';
  255 + // } else if (endMinute == 45) {
  256 + // endDate = '${endTemp[0]}:30';
  257 + // }
258 List res = []; 258 List res = [];
259 bool tempLimit = true; 259 bool tempLimit = true;
260 while (tempLimit) { 260 while (tempLimit) {
@@ -321,13 +321,13 @@ class NotebookDetailChangeModel with ChangeNotifier { @@ -321,13 +321,13 @@ class NotebookDetailChangeModel with ChangeNotifier {
321 tempLimit = false; 321 tempLimit = false;
322 break; 322 break;
323 } 323 }
324 - if (beginMinute == 30) { 324 + if (beginMinute == 45) {
325 beginHour++; 325 beginHour++;
326 if (beginHour >= 24) { 326 if (beginHour >= 24) {
327 beginHour = 0; 327 beginHour = 0;
328 } 328 }
329 } 329 }
330 - beginMinute = (beginMinute + 30) % 60; 330 + beginMinute = (beginMinute + 15) % 60;
331 } 331 }
332 return res; 332 return res;
333 } 333 }