xt / Flutter-ReserveApp · Commits

Go to a project

Commit 5aecc32fea7a5e59d9e6f8b93ee5a7d5f04a35db

Authored by wdn127929
1 parent 34d63e60
build: skipped

时间parse问题

Inline Side-by-side
Showing 3 changed files with 24 additions and 24 deletions
... ... @@ -548,7 +548,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 5320;
CURRENT_PROJECT_VERSION = 5321;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -696,7 +696,7 @@
CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 5320;
CURRENT_PROJECT_VERSION = 5321;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -732,7 +732,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 5320;
CURRENT_PROJECT_VERSION = 5321;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ...
... ... @@ -807,9 +807,9 @@ class _NoteBookChangeFPageOnlyState extends State<NoteBookChangeFPageOnly> {
// ' ${datas[0]}:00'); //选中餐段开始时间戳
DateTime selectEtime = DateTime.parse('${time.year}' +
'-' +
'${time.month}' +
Utils.addZeroNumber(time.month) +
'-' +
'${time.day}' +
Utils.addZeroNumber(time.day) +
' ${datas[1]}:00'); //选中餐段结束时间戳
// 过去的餐段界定
if (selectEtime.isBefore(DateTime.now())) {
... ... @@ -843,9 +843,9 @@ class _NoteBookChangeFPageOnlyState extends State<NoteBookChangeFPageOnly> {
DateTime reserveStime = DateTime.parse('${reservedate.year}' +
'-' +
'${reservedate.month}' +
Utils.addZeroNumber(reservedate.month) +
'-' +
'${reservedate.day}' +
Utils.addZeroNumber(reservedate.day) +
' ${datasreserve[0]}:00'); //订单餐段开始时间戳
String timesnow;
... ... @@ -862,17 +862,14 @@ class _NoteBookChangeFPageOnlyState extends State<NoteBookChangeFPageOnly> {
//将要选中的餐段和时间
DateTime nowStime = DateTime.parse('${dateTime.year}' +
'-' +
'${dateTime.month}' +
Utils.addZeroNumber(dateTime.month) +
'-' +
'${dateTime.day}' +
Utils.addZeroNumber(dateTime.day) +
' ${datanow[1]}:00'); //选中餐段结束时间戳
//选中的时间+餐段组合的时间戳结束日期和现在比较，< 现在，则会变更到过去
//选中的时间+餐段组合的时间戳结束日期和现在比较，< 现在，则会变更到过去
if (nowStime.isBefore(reserveStime)&&nowStime.isBefore(DateTime.now())) {
if (nowStime.isBefore(reserveStime) && nowStime.isBefore(DateTime.now())) {
// 变更到过去餐段
return true;
} else {
... ... @@ -1139,9 +1136,9 @@ class _NoteBookChangeFPageOnlyState extends State<NoteBookChangeFPageOnly> {
DateTime selectEtime = DateTime.parse(
'${dateTime.year}' +
'-' +
'${dateTime.month}' +
Utils.addZeroNumber(dateTime.month) +
'-' +
'${dateTime.day}' +
Utils.addZeroNumber(dateTime.day) +
' ${datas[1]}:00'); //选中餐段结束时间戳
// 过去的餐段界定
if (selectEtime.isBefore(DateTime.now())) {
... ... @@ -1201,23 +1198,26 @@ class _NoteBookChangeFPageOnlyState extends State<NoteBookChangeFPageOnly> {
DateTime selectEtime = DateTime.parse(
'${day.year}' +
'-' +
'${day.month}' +
Utils.addZeroNumber(day.month) +
'-' +
'${day.day}' +
Utils.addZeroNumber(day.day) +
' ${datas[1]}:00'); //选中餐段结束时间戳
if (DateTime.parse('${day.year}' +
'-' +
'${day.month}' +
Utils.addZeroNumber(
day.month) +
'-' +
'${day.day}' +
Utils.addZeroNumber(day.day) +
' 00:00:00')
.isBefore(DateTime.parse(
'${reservedate.year}' +
'-' +
'${reservedate.month}' +
Utils.addZeroNumber(
reservedate.month) +
'-' +
'${reservedate.day}' +
Utils.addZeroNumber(
reservedate.day) +
' 00:00:00')) &&
selectEtime
.isBefore(DateTime.now())) {
... ...
... ... @@ -809,9 +809,9 @@ class TableManagerPageState extends State<TableManagerPage> {
// ' ${datas[0]}:00'); //选中餐段开始时间戳
DateTime selectEtime = DateTime.parse('${dateTimeSelect.year}' +
'-' +
'${dateTimeSelect.month}' +
Utils.addZeroNumber(dateTimeSelect.month) +
'-' +
'${dateTimeSelect.day}' +
Utils.addZeroNumber(dateTimeSelect.day) +
' ${datas[1]}:00'); //选中餐段结束时间戳
// 过去的餐段界定
if (selectEtime.isBefore(DateTime.now())) {
... ...