xt / Flutter-ReserveApp · Commits

Go to a project

Commit 4f21560a1f787b291c2ca2ffd09d5dd000664aab

Authored by wdn127929
1 parent 828647dd
build: skipped

多时段打包测试

Inline Side-by-side
Showing 4 changed files with 175 additions and 145 deletions
... ... @@ -99,9 +99,9 @@ class _NoteBookChangeFPageOnlyState extends State<NoteBookChangeFPageOnly> {
String dateText = ""; //当前显示日期时间
int currTimeIndex = 2;
String? morning; //早市时间段
String? noon; //午市时间段
String? night; //晚市时间段
// String? morning; //早市时间段
// String? noon; //午市时间段
// String? night; //晚市时间段
NotebookDetail? detailEntity;
late StoreBaseIndoProvider storeBaseIndoProvider;
... ... @@ -115,13 +115,13 @@ class _NoteBookChangeFPageOnlyState extends State<NoteBookChangeFPageOnly> {
void initState() {
super.initState();
if (App.sp!.containsKey('user')) {
String s = App.sp!.getString('user')!;
User _user = User.fromJson(json.decode(s));
morning = _user.morning!.isEmpty ? "00:00-00:00" : _user.morning;
noon = _user.noon!.isEmpty ? "00:00-00:00" : _user.noon;
night = _user.night!.isEmpty ? "00:00-00:00" : _user.night;
}
// if (App.sp!.containsKey('user')) {
// String s = App.sp!.getString('user')!;
// User _user = User.fromJson(json.decode(s));
// morning = _user.morning!.isEmpty ? "00:00-00:00" : _user.morning;
// noon = _user.noon!.isEmpty ? "00:00-00:00" : _user.noon;
// night = _user.night!.isEmpty ? "00:00-00:00" : _user.night;
// }
_nameNode.addListener(() {
if (_nameNode.hasFocus) {
... ... @@ -271,14 +271,17 @@ class _NoteBookChangeFPageOnlyState extends State<NoteBookChangeFPageOnly> {
print(detailEntity);
if (detailEntity!.phone != '0') {
_notebookDetailChangeModel.phoneController.text = detailEntity!.phone??"";
_notebookDetailChangeModel.phoneController.text =
detailEntity!.phone ?? "";
}
if (detailEntity!.rnameStr != '') {
_notebookDetailChangeModel.nameController.text = detailEntity!.rname??"";
_notebookDetailChangeModel.nameController.text =
detailEntity!.rname ?? "";
}
if (detailEntity!.cusdem != '' && detailEntity!.cusdem != null) {
_notebookDetailChangeModel.customController.text = detailEntity!.cusdem??"";
_notebookDetailChangeModel.customController.text =
detailEntity!.cusdem ?? "";
}
_notebookDetailChangeModel.initSexList();
... ... @@ -798,11 +801,11 @@ class _NoteBookChangeFPageOnlyState extends State<NoteBookChangeFPageOnly> {
// });
// }
_getContactData() async {
Contact? contact = await _contactPicker.selectPhoneNumber();
Contact? contact = await _contactPicker.selectPhoneNumber();
if (contact != null) {
setState(() {
String? fullName =
contact.fullName?.replaceAll(new RegExp(r"\s+\b|\b\s"), "") ??'';
contact.fullName?.replaceAll(new RegExp(r"\s+\b|\b\s"), "") ?? '';
// String phone = (contact.phoneNumbers![0]
// .replaceAll(new RegExp(r"\s+\b|\b\s"), ""));
// if (fullName == null) {
... ... @@ -811,7 +814,8 @@ class _NoteBookChangeFPageOnlyState extends State<NoteBookChangeFPageOnly> {
// fullName = contact.fullName!;
// }
_notebookDetailChangeModel.phoneController.text =
(contact.selectedPhoneNumber?.replaceAll(new RegExp(r"\s+"), ""))??'';
(contact.selectedPhoneNumber?.replaceAll(new RegExp(r"\s+"), "")) ??
'';
nameStr = fullName;
// _homeEnterModel.nameController.text = fullName + _nameSuffix();
_addNameSuffix(fullName, _nameSuffix());
... ... @@ -1012,15 +1016,14 @@ class _NoteBookChangeFPageOnlyState extends State<NoteBookChangeFPageOnly> {
//如果不允许变更过去餐段订单的时间，则开始判断
//连个条件同时成立： 1.订单的时间是过去 2. 时间改变
if (!isSetOver) {
String? times;
String? times = '00:00-00:00';
//找到当前餐段对应的时间段
if (currTimeIndex == 1) {
times = morning;
} else if (currTimeIndex == 2) {
times = noon;
} else if (currTimeIndex == 3) {
times = night;
int index = storeBaseIndoProvider.dayDateData!
.indexWhere((element) => element.ddateSolt == '${currTimeIndex}');
if (index != -1) {
times = storeBaseIndoProvider.dayDateData![index].mdate;
}
//else if (currTimeIndex == 4) {
// times = meal1;
// } else if (currTimeIndex == 5) {
... ... @@ -1308,22 +1311,26 @@ class _NoteBookChangeFPageOnlyState extends State<NoteBookChangeFPageOnly> {
//选中的时间+餐段组合的时间戳结束日期和现在比较，< 现在，则会变更到过去
String? times;
String times = '00:00-00:00';
//找到当前餐段对应的时间段
//找到当前餐段对应的时间段
if (currTimeIndex == 1) {
times = morning;
} else if (currTimeIndex == 2) {
times = noon;
} else if (currTimeIndex == 3) {
times = night;
int index = storeBaseIndoProvider
.dayDateData!
.indexWhere((element) =>
element.ddateSolt ==
'${currTimeIndex}');
if (index != -1) {
times = storeBaseIndoProvider
.dayDateData![index].mdate!;
}
//else if (currTimeIndex == 4) {
// times = meal1;
// } else if (currTimeIndex == 5) {
// times = meal2;
// }
//组装时间戳
List<String> datas = times!.split('-');
List<String> datas = times.split('-');
// DateTime selectStime = DateTime.parse('${dateTimeSelect.year}' +
// '-' +
// '${dateTimeSelect.month}' +
... ... @@ -2329,6 +2336,16 @@ class _NoteBookChangeFPageOnlyState extends State<NoteBookChangeFPageOnly> {
FocusScope.of(context)
.requestFocus(FocusNode()); //点击空白处隐藏键盘
print(detailEntity!.uid);
String? times = '00:00-00:00';
//找到当前餐段对应的时间段
int index = storeBaseIndoProvider.dayDateData!
.indexWhere((element) =>
element.ddateSolt ==
'${currTimeIndex}');
if (index != -1) {
times = storeBaseIndoProvider
.dayDateData![index].mdate;
}
SunReserveInfoModel? _model =
_notebookDetailChangeModel
... ... @@ -2342,9 +2359,7 @@ class _NoteBookChangeFPageOnlyState extends State<NoteBookChangeFPageOnly> {
detailEntity!.uid,
currTimeIndex,
dateTime,
morning,
noon,
night)
times )
: await _notebookDetailChangeModel
.setReserveInfoOnly(
context,
... ... @@ -2352,9 +2367,7 @@ class _NoteBookChangeFPageOnlyState extends State<NoteBookChangeFPageOnly> {
detailEntity!.uid,
currTimeIndex,
dateTime,
morning,
noon,
night);
times );
if (_model != null) {
if (ObjectUtil.isNotEmpty(_model.row) ||
ObjectUtil.isNotEmpty(_model.row!.id)) {
... ...
... ... @@ -394,40 +394,43 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
_initTime(int dateSolt) {
ddateHm = detailModel!.detailModelAllSunModel!.ddateStr;
// UserModel userModel = Provider.of<UserModel>(context, listen: false);
String str = detailModel!.detailModelAllSunModel!.mdate == null
String str = detailModel!.detailModelAllSunModel!.mdate == null || detailModel!.detailModelAllSunModel!.mdate == ''
? "00:00-00:00"
: detailModel!.detailModelAllSunModel!.mdate!;
if (dateSolt == 1) {
//早餐
str == "00:00-00:00"
? dailyList = []
: dailyList = _getHourAndMinute(str, 1);
} else if (dateSolt == 2) {
//午餐
str == "00:00-00:00"
str == "00:00-00:00"
? dailyList = []
: dailyList = _getHourAndMinute(str, 2);
} else if (dateSolt == 3) {
//晚餐
str == "00:00-00:00"
? dailyList = []
: dailyList = _getHourAndMinute(str, 3);
} else if (dateSolt == 4) {
//晚餐
str == "00:00-00:00"
? dailyList = []
: dailyList = _getHourAndMinute(str, 4);
} else if (dateSolt == 5) {
//晚餐
str == "00:00-00:00"
? dailyList = []
: dailyList = _getHourAndMinute(str, 5);
}
: dailyList = _getHourAndMinute(str, dateSolt );
// if (dateSolt == 1) {
// //早餐
// str == "00:00-00:00"
// ? dailyList = []
// : dailyList = _getHourAndMinute(str, 1);
// } else if (dateSolt == 2) {
// //午餐
// str == "00:00-00:00"
// ? dailyList = []
// : dailyList = _getHourAndMinute(str, 2);
// } else if (dateSolt == 3) {
// //晚餐
// str == "00:00-00:00"
// ? dailyList = []
// : dailyList = _getHourAndMinute(str, 3);
// } else if (dateSolt == 4) {
// //晚餐
// str == "00:00-00:00"
// ? dailyList = []
// : dailyList = _getHourAndMinute(str, 4);
// } else if (dateSolt == 5) {
// //晚餐
// str == "00:00-00:00"
// ? dailyList = []
// : dailyList = _getHourAndMinute(str, 5);
// }
}
// //根据获取时间 11:00-12:30 获取30分钟间隔组装的数组
... ...
... ... @@ -1240,40 +1240,43 @@ class InvicationPageState extends State<InvicationPage>
///初始化时间 半个小时
_initTime(int dateSolt) {
// UserModel userModel = Provider.of<UserModel>(context, listen: false);
String str = detailModel.detailModelAllSunModel!.mdate == null
String str = detailModel.detailModelAllSunModel!.mdate == null||detailModel.detailModelAllSunModel!.mdate == ''
? "00:00-00:00"
: detailModel.detailModelAllSunModel!.mdate!;
if (dateSolt == 1) {
//早餐
str == "00:00-00:00"
? dailyList = []
: dailyList = _getHourAndMinute(str, 1);
} else if (dateSolt == 2) {
//午餐
str == "00:00-00:00"
str == "00:00-00:00"
? dailyList = []
: dailyList = _getHourAndMinute(str, 2);
} else if (dateSolt == 3) {
//晚餐
str == "00:00-00:00"
? dailyList = []
: dailyList = _getHourAndMinute(str, 3);
} else if (dateSolt == 4) {
//晚餐
str == "00:00-00:00"
? dailyList = []
: dailyList = _getHourAndMinute(str, 4);
} else if (dateSolt == 5) {
//晚餐
str == "00:00-00:00"
? dailyList = []
: dailyList = _getHourAndMinute(str, 5);
}
: dailyList = _getHourAndMinute(str, dateSolt);
// if (dateSolt == 1) {
// //早餐
// str == "00:00-00:00"
// ? dailyList = []
// : dailyList = _getHourAndMinute(str, 1);
// } else if (dateSolt == 2) {
// //午餐
// str == "00:00-00:00"
// ? dailyList = []
// : dailyList = _getHourAndMinute(str, 2);
// } else if (dateSolt == 3) {
// //晚餐
// str == "00:00-00:00"
// ? dailyList = []
// : dailyList = _getHourAndMinute(str, 3);
// } else if (dateSolt == 4) {
// //晚餐
// str == "00:00-00:00"
// ? dailyList = []
// : dailyList = _getHourAndMinute(str, 4);
// } else if (dateSolt == 5) {
// //晚餐
// str == "00:00-00:00"
// ? dailyList = []
// : dailyList = _getHourAndMinute(str, 5);
// }
ddateHm = detailModel.detailModelAllSunModel!.ddateStr;
ddateIndex = dailyList.indexOf(ddateHm);
}
... ...
... ... @@ -471,14 +471,15 @@ class NotebookDetailChangeModelOnly with ChangeNotifier {
///录入更改内部预订
Future<SunReserveInfoModel?> setReserveInfoOnly(
BuildContext context,
String? nameStr,
String? uid,
int currTimeIndex,
DateTime dateTime,
String? morning,
String? noon,
String? night) async {
BuildContext context,
String? nameStr,
String? uid,
int currTimeIndex,
DateTime dateTime,
String? times,
// String? noon,
// String? night
) async {
UserModel userModel = Provider.of<UserModel>(context, listen: false);
if (phoneController.text.trim().length > 0) {
//判断是否可以输入自己的手机号
... ... @@ -545,22 +546,26 @@ class NotebookDetailChangeModelOnly with ChangeNotifier {
late String timeStrStart;
late String timeStrEnd;
if (currTimeIndex == 1) {
//早市
List timem = morning!.split('-');
timeStrStart = ymd + ' ' + timem[0] + ':00';
timeStrEnd = ymd + ' ' + timem[1] + ':00';
} else if (currTimeIndex == 2) {
//午市
List timem = noon!.split('-');
timeStrStart = ymd + ' ' + timem[0] + ':00';
timeStrEnd = ymd + ' ' + timem[1] + ':00';
} else if (currTimeIndex == 3) {
//晚市
List timem = night!.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) {
// //早市
// List timem = morning!.split('-');
// timeStrStart = ymd + ' ' + timem[0] + ':00';
// timeStrEnd = ymd + ' ' + timem[1] + ':00';
// } else if (currTimeIndex == 2) {
// //午市
// List timem = noon!.split('-');
// timeStrStart = ymd + ' ' + timem[0] + ':00';
// timeStrEnd = ymd + ' ' + timem[1] + ':00';
// } else if (currTimeIndex == 3) {
// //晚市
// List timem = night!.split('-');
// timeStrStart = ymd + ' ' + timem[0] + ':00';
// timeStrEnd = ymd + ' ' + timem[1] + ':00';
// }
int? startM = DateUtil.getDateMsByTimeStr(timeStrStart);
int? endM = DateUtil.getDateMsByTimeStr(timeStrEnd);
... ... @@ -632,14 +637,16 @@ class NotebookDetailChangeModelOnly with ChangeNotifier {
//更改在线预订
Future<SunReserveInfoModel?> updateOnlineReserveInfoOnly(
BuildContext context,
String? nameStr,
String? uid,
int currTimeIndex,
DateTime dateTime,
String? morning,
String? noon,
String? night) async {
BuildContext context,
String? nameStr,
String? uid,
int currTimeIndex,
DateTime dateTime,
String? times,
// String? morning,
// String? noon,
// String? night
) async {
UserModel userModel = Provider.of<UserModel>(context, listen: false);
if (phoneController.text.trim().length > 0) {
//判断是否可以输入自己的手机号
... ... @@ -710,22 +717,26 @@ class NotebookDetailChangeModelOnly with ChangeNotifier {
late String timeStrStart;
late String timeStrEnd;
if (currTimeIndex == 1) {
//早市
List timem = morning!.split('-');
timeStrStart = ymd + ' ' + timem[0] + ':00';
timeStrEnd = ymd + ' ' + timem[1] + ':00';
} else if (currTimeIndex == 2) {
//午市
List timem = noon!.split('-');
timeStrStart = ymd + ' ' + timem[0] + ':00';
timeStrEnd = ymd + ' ' + timem[1] + ':00';
} else if (currTimeIndex == 3) {
//晚市
List timem = night!.split('-');
List timem =times!.split('-');
timeStrStart = ymd + ' ' + timem[0] + ':00';
timeStrEnd = ymd + ' ' + timem[1] + ':00';
}
// if (currTimeIndex == 1) {
// //早市
// List timem = morning!.split('-');
// timeStrStart = ymd + ' ' + timem[0] + ':00';
// timeStrEnd = ymd + ' ' + timem[1] + ':00';
// } else if (currTimeIndex == 2) {
// //午市
// List timem = noon!.split('-');
// timeStrStart = ymd + ' ' + timem[0] + ':00';
// timeStrEnd = ymd + ' ' + timem[1] + ':00';
// } else if (currTimeIndex == 3) {
// //晚市
// List timem = night!.split('-');
// timeStrStart = ymd + ' ' + timem[0] + ':00';
// timeStrEnd = ymd + ' ' + timem[1] + ':00';
// }
int? startM = DateUtil.getDateMsByTimeStr(timeStrStart);
int? endM = DateUtil.getDateMsByTimeStr(timeStrEnd);
... ...