xt / Flutter-ReserveApp · Commits

Go to a project

Commit 0ab9838afe7e7a1b11f46882fc30e231f65ee1b2

Authored by wdn127929
1 parent 8669a65e
build: skipped

多时段修复

Inline Side-by-side
Showing 2 changed files with 57 additions and 33 deletions
... ... @@ -238,7 +238,7 @@ class NoteBookOnlySunModel {
ddateSolt = json["ddate_solt"];
}
if (json["mname"] is String) {
ddateSolt = json["mname"];
mname = json["mname"];
}
if (json["status"] is String) {
status = json["status"];
... ...
... ... @@ -501,23 +501,40 @@ class NotebookDetailChangeModelOnly with ChangeNotifier {
String? ddateSolt = detailEntity!.ddate_solt; //订座详情页面的餐段（1，2，3 早餐、午餐、晚餐）
String tempTime = ddateHm; //默认上个页面到店时间半小时值
if (ddateSolt != currTimeIndex.toString()) {
if (currTimeIndex == 1) {
tempTime = '08:00';
if (userModel.user!.morning != '' && userModel.user!.morning != null) {
List tempDate = userModel.user!.morning!.split("-");
tempTime = tempDate[0];
}
} else if (currTimeIndex == 2) {
tempTime = '12:00';
if (userModel.user!.noon != '' && userModel.user!.noon != null) {
List tempDate = userModel.user!.noon!.split("-");
tempTime = tempDate[0];
}
} else if (currTimeIndex == 3) {
tempTime = '18:00';
if (userModel.user!.night != '' && userModel.user!.night != null) {
List tempDate = userModel.user!.night!.split("-");
tempTime = tempDate[0];
List tempDate = times!.split("-");
tempTime = tempDate[0];
if (tempTime == null) {
if (currTimeIndex == 1) {
tempTime = '08:00';
// if (userModel.user!.morning != '' &&
// userModel.user!.morning != null) {
// List tempDate = userModel.user!.morning!.split("-");
// tempTime = tempDate[0];
// }
} else if (currTimeIndex == 2) {
tempTime = '12:00';
// if (userModel.user!.noon != '' && userModel.user!.noon != null) {
// List tempDate = userModel.user!.noon!.split("-");
// tempTime = tempDate[0];
// }
} else if (currTimeIndex == 3) {
tempTime = '18:00';
// if (userModel.user!.night != '' && userModel.user!.night != null) {
// List tempDate = userModel.user!.night!.split("-");
// tempTime = tempDate[0];
// }
} else if (currTimeIndex == 4) {
tempTime = '20:00';
// if (userModel.user!.night != '' && userModel.user!.night != null) {
// List tempDate = userModel.user!.night!.split("-");
// tempTime = tempDate[0];
// }
} else if (currTimeIndex == 5) {
tempTime = '21:00';
// if (userModel.user!.night != '' && userModel.user!.night != null) {
// List tempDate = userModel.user!.night!.split("-");
// tempTime = tempDate[0];
// }
}
}
}
... ... @@ -672,24 +689,31 @@ class NotebookDetailChangeModelOnly with ChangeNotifier {
if (currTimeIndex == 1) {
tempTime = '08:00';
ddateSolt = '1';
if (userModel.user!.morning != '' && userModel.user!.morning != null) {
List tempDate = userModel.user!.morning!.split("-");
tempTime = tempDate[0];
}
List tempDate = times!.split("-");
tempTime = tempDate[0];
// if (userModel.user!.morning != '' && userModel.user!.morning != null) {
// List tempDate = userModel.user!.morning!.split("-");
// tempTime = tempDate[0];
// }
} else if (currTimeIndex == 2) {
tempTime = '12:00';
ddateSolt = '2';
if (userModel.user!.noon != '' && userModel.user!.noon != null) {
List tempDate = userModel.user!.noon!.split("-");
tempTime = tempDate[0];
}
List tempDate = times!.split("-");
tempTime = tempDate[0];
// if (userModel.user!.noon != '' && userModel.user!.noon != null) {
// List tempDate = userModel.user!.noon!.split("-");
// tempTime = tempDate[0];
// }
} else if (currTimeIndex == 3) {
tempTime = '18:00';
ddateSolt = '3';
if (userModel.user!.night != '' && userModel.user!.night != null) {
List tempDate = userModel.user!.night!.split("-");
tempTime = tempDate[0];
}
List tempDate = times!.split("-");
tempTime = tempDate[0];
// if (userModel.user!.night != '' && userModel.user!.night != null) {
// List tempDate = userModel.user!.night!.split("-");
// tempTime = tempDate[0];
// }
}
}
... ... @@ -717,9 +741,9 @@ class NotebookDetailChangeModelOnly with ChangeNotifier {
late String timeStrStart;
late String timeStrEnd;
List timem =times!.split('-');
timeStrStart = ymd + ' ' + timem[0] + ':00';
timeStrEnd = ymd + ' ' + timem[1] + ':00';
List timem = times!.split('-');
timeStrStart = ymd + ' ' + timem[0] + ':00';
timeStrEnd = ymd + ' ' + timem[1] + ':00';
// if (currTimeIndex == 1) {
// //早市
... ...