xt / Flutter-ReserveApp · Commits

Go to a project

Commit c1dea779a8aa63418b5af89904f13a02bf56d693

Authored by wdn127929
1 parent 600e9128
build: skipped

默认选新选那一天的第一个餐段,回到今天 选当前时间对应的餐段

Inline Side-by-side
Showing 4 changed files with 94 additions and 33 deletions
... ... @@ -449,7 +449,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 5560;
CURRENT_PROJECT_VERSION = 5562;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
... ... @@ -632,7 +632,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 5560;
CURRENT_PROJECT_VERSION = 5562;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
... ... @@ -658,7 +658,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 5560;
CURRENT_PROJECT_VERSION = 5562;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
... ...
... ... @@ -162,14 +162,16 @@ class _NoteBookChangeFPageOnlyState extends State<NoteBookChangeFPageOnly> {
showLoading: false);
if (needInit) {
bool has = storeBaseIndoProvider.dayDateData!
.any((element) => element.ddateSolt == ddateSoltSelect);
// 创建一个你想要比较的日期对象，例如今天的日期
DateTime today = DateTime(dateTime.year, dateTime.month, dateTime.day);
if (has) {
currTimeIndex = int.parse(ddateSoltSelect);
// 比较两个日期是否相同
bool isToday = Utils.isOneDay(DateTime.now(), today);
if (isToday) {
currTimeIndex = int.parse(detailEntity!.ddate_solt!); //默认订单当前的餐段
} else {
currTimeIndex =
int.parse(storeBaseIndoProvider.dayDateData!.last.ddateSolt!);
int.parse(storeBaseIndoProvider.dayDateData!.first.ddateSolt!);
}
}
}
... ... @@ -941,7 +943,7 @@ class _NoteBookChangeFPageOnlyState extends State<NoteBookChangeFPageOnly> {
//如果不允许变更订单到过去餐段，则开始判断
//两个条件同时成立： 1.订单的时间是未来 2. 将要改变的时间是过去
if (!isReserveOver) {
String? times;
String? times = '00:00-00:00';
//找到当前餐段对应的时间段
storeBaseIndoProvider.dayDateData!.forEach((element) {
if (element.ddateSolt == detailEntity!.ddate_solt) {
... ... @@ -1020,7 +1022,10 @@ class _NoteBookChangeFPageOnlyState extends State<NoteBookChangeFPageOnly> {
//选中的时间+餐段组合的时间戳结束日期和现在比较，< 现在，则会变更到过去
if (nowStime.isBefore(reserveStime) && nowStime.isBefore(DateTime.now())) {
if ((nowStime.isBefore(reserveStime) ||
(int.parse(ddateSoltTemp!) < int.parse(detailEntity!.ddate_solt!) &&
nowStime.isAtSameMomentAs(reserveStime))) &&
nowStime.isBefore(DateTime.now())) {
// 变更到过去餐段
return true;
} else {
... ... @@ -1387,11 +1392,18 @@ class _NoteBookChangeFPageOnlyState extends State<NoteBookChangeFPageOnly> {
return;
}
}
day = DateTime(
day.year,
day.month,
day.day,
DateTime.now().hour,
DateTime.now().minute,
DateTime.now().second);
createDateText(context, day);
int dateTimeMill =
day.millisecondsSinceEpoch;
dateTime = day;
getMealSectionByDay(needInit: true);
await getMealSectionByDay(needInit: true);
_notebookDetailChangeModel.getNewTableList(
context,
'${dateTimeMill}',
... ...
... ... @@ -224,19 +224,34 @@ class NoteBookPageState extends State<NoteBookPage> {
currTimeIndex = int.parse(solt!);
}
} else {
if (first) {
bool has = storeBaseIndoProvider.dayDateData!
.any((element) => element.ddateSolt == solt);
currTimeIndex = has ? int.parse(solt!) : 1;
DateTime today =
DateTime(dateTimeNow!.year, dateTimeNow!.month, dateTimeNow!.day);
// 比较两个日期是否相同
bool isToday = Utils.isOneDay(DateTime.now(), today);
if (isToday) {
initCurruntIndex();
} else {
bool has = storeBaseIndoProvider.dayDateData!
.any((element) => element.ddateSolt == ddateSoltSelect);
if (has) {
currTimeIndex = int.parse(ddateSoltSelect);
} else {
initCurruntIndex();
}
// bool has = storeBaseIndoProvider.dayDateData!
// .any((element) => element.ddateSolt == ddateSoltSelect);
// currTimeIndex = has
// ? int.parse(ddateSoltSelect)
// : int.parse(storeBaseIndoProvider.dayDateData![0].ddateSolt!);
currTimeIndex =
int.parse(storeBaseIndoProvider.dayDateData!.first.ddateSolt!);
}
// if (first) {
// bool has = storeBaseIndoProvider.dayDateData!
// .any((element) => element.ddateSolt == solt);
// currTimeIndex = has ? int.parse(solt!) : 1;
// } else {
// bool has = storeBaseIndoProvider.dayDateData!
// .any((element) => element.ddateSolt == ddateSoltSelect);
// if (has) {
// currTimeIndex = int.parse(ddateSoltSelect);
// } else {
// initCurruntIndex();
// }
// }
}
_getReserveList(needLoading: true);
}
... ... @@ -299,8 +314,7 @@ class NoteBookPageState extends State<NoteBookPage> {
//过了午市，未过晚市
currTimeIndex = 5;
} else {
//过了晚市
//过了晚市
currTimeIndex =
int.parse(storeBaseIndoProvider.dayDateData!.last.ddateSolt!);
}
... ... @@ -1740,6 +1754,13 @@ class NoteBookPageState extends State<NoteBookPage> {
) {
if (!Utils.isOneDay(day, dateTimeNow!)) {
//不是一天
day = DateTime(
day.year,
day.month,
day.day,
DateTime.now().hour,
DateTime.now().minute,
DateTime.now().second);
dateTimeNow = day;
_focusedDay = dateTimeNow;
clearSel = false;
... ... @@ -1804,6 +1825,13 @@ class NoteBookPageState extends State<NoteBookPage> {
onTap: () {
if (!Utils.isOneDay(
day, dateTimeNow!)) {
day = DateTime(
day.year,
day.month,
day.day,
DateTime.now().hour,
DateTime.now().minute,
DateTime.now().second);
//不是一天
dateTimeNow = day;
_focusedDay = dateTimeNow;
... ... @@ -1967,6 +1995,13 @@ class NoteBookPageState extends State<NoteBookPage> {
DialogUtil.showCalendarDialog(context, dateTimeNow)
.then((day) {
if (day != null) {
day = DateTime(
day.year,
day.month,
day.day,
DateTime.now().hour,
DateTime.now().minute,
DateTime.now().second);
_createDateText(day);
}
});
... ...
... ... @@ -350,16 +350,24 @@ class TableManagerPageState extends State<TableManagerPage> {
meal2 = element.mdate;
}
});
if (needInit) {
// 创建一个你想要比较的日期对象，例如今天的日期
DateTime today = DateTime(
dateTimeSelect!.year, dateTimeSelect!.month, dateTimeSelect!.day);
// 比较两个日期是否相同
bool isToday = Utils.isOneDay(DateTime.now(), today);
if (isToday) {
initCurruntIndex();
isRealAddOver = _getAddOrder(dateTimeSelect, currTimeIndex);
} else {
bool has = storeBaseIndoProvider.dayDateData!
.any((element) => element.ddateSolt == ddateSoltSelect);
currTimeIndex = has
? int.parse(ddateSoltSelect)
: int.parse(storeBaseIndoProvider.dayDateData![0].ddateSolt!);
// bool has = storeBaseIndoProvider.dayDateData!
// .any((element) => element.ddateSolt == ddateSoltSelect);
// currTimeIndex = has
// ? int.parse(ddateSoltSelect)
// : int.parse(storeBaseIndoProvider.dayDateData![0].ddateSolt!);
currTimeIndex =
int.parse(storeBaseIndoProvider.dayDateData!.first.ddateSolt!);
isRealAddOver = _getAddOrder(dateTimeSelect, currTimeIndex);
}
... ... @@ -4031,10 +4039,16 @@ class TableManagerPageState extends State<TableManagerPage> {
return;
}
}
day = DateTime(
day.year,
day.month,
day.day,
DateTime.now().hour,
DateTime.now().minute,
DateTime.now().second);
createDateText1(context, day);
await getMealSectionByDay(needInit: true);
await getMealSectionByDay(needInit: true);
}
});
// // 切换之前的餐段
... ...