xt / Flutter-ReserveApp · Commits

Go to a project

Commit ece8251670ecee03a1d4f288f378f30a01050cc7

Authored by gaiyaguang
2 parents 655e0ceb 3136d350
build: skipped

ios 正式环境bug修复

Inline Side-by-side
Showing 2 changed files with 98 additions and 282 deletions
... ... @@ -39,12 +39,6 @@ class NoteBookChangePage extends StatefulWidget {
}
class _NoteBookChangePageState extends State<NoteBookChangePage> {
// String dateText = ""; //当前显示日期时间
// int currTimeIndex = 1; //当前选中时间段
// String morning; //早市时间段
// String noon; //午市时间段
// String night; //晚市时间段
DateTime dateTime; //当前日期
NotebookDetailChangeModel _notebookDetailChangeModel;
FocusNode _phoneNode = FocusNode();
... ... @@ -52,119 +46,6 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
FocusNode _needNode = FocusNode();
NotebookDetailModel detailModel = NotebookDetailModel();
// //生成日期文本
// _createDateText(DateTime day) {
// if (Utils.isOneDay(day, dateTime)) return; //日期没变
// setState(() {
// DateTime dateNow = DateTime.now();
// if (Utils.isOneDay(day, dateNow)) {
// dateText = Utils.addZeroNumber(dateNow.month) +
// "-" +
// Utils.addZeroNumber(dateNow.day) +
// " 今天";
// } else {
// dateText =
// Utils.addZeroNumber(day.month) + "-" + Utils.addZeroNumber(day.day);
// }
// dateTime = day;
// });
// // _getReserveList();
// // _reserveCountDay();
// }
//初始化时间
_initTime() {
_notebookDetailChangeModel =
Provider.of<NotebookDetailChangeModel>(context, listen: false);
//今天
DateTime dateTime = DateTime.now();
int dateTimeMill = dateTime.millisecondsSinceEpoch;
String dateText = DateUtil.formatDateMs(dateTimeMill, format: 'MM-dd');
_notebookDetailChangeModel.dateList.add({
'title': dateText,
'select': false,
'fontSize': 34.0,
'dayText': ' 今天',
'isImage': false
});
//明天
int tomorrowMill = dateTimeMill + 24 * 60 * 60 * 1000;
String dateTextTomorrow =
DateUtil.formatDateMs(tomorrowMill, format: 'MM-dd');
_notebookDetailChangeModel.dateList.add({
'title': dateTextTomorrow,
'select': false,
'fontSize': 34.0,
'dayText': ' 明天',
'isImage': false
});
//第三个
_notebookDetailChangeModel.dateList.add({
'title': '其他',
'select': true,
'fontSize': 30.0,
'dayText': '',
'isImage': true
});
print(widget.detailEntity);
// dateList.add(value)
// morning =
// userModel.user.morning.isEmpty ? "00:00-00:00" : userModel.user.morning;
// noon = userModel.user.noon.isEmpty ? "00:00-00:00" : userModel.user.noon;
// night = userModel.user.night.isEmpty ? "00:00-00:00" : userModel.user.night;
// if (dateTime.isBefore(DateTime.parse(dateTime.year.toString() +
// "-" +
// Utils.addZeroNumber(dateTime.month) +
// "-" +
// Utils.addZeroNumber(dateTime.day) +
// " " +
// morning.split("-")[1] +
// ":00"))) {
// //未过早市
// currTimeIndex = 1;
// } else if (dateTime.isAfter(DateTime.parse(dateTime.year.toString() +
// "-" +
// Utils.addZeroNumber(dateTime.month) +
// "-" +
// Utils.addZeroNumber(dateTime.day) +
// " " +
// morning.split("-")[1] +
// ":00")) &&
// dateTime.isBefore(DateTime.parse(dateTime.year.toString() +
// "-" +
// Utils.addZeroNumber(dateTime.month) +
// "-" +
// Utils.addZeroNumber(dateTime.day) +
// " " +
// noon.split("-")[1] +
// ":00"))) {
// //过了早市，未过午市
// currTimeIndex = 2;
// } else if (dateTime.isAfter(DateTime.parse(dateTime.year.toString() +
// "-" +
// Utils.addZeroNumber(dateTime.month) +
// "-" +
// Utils.addZeroNumber(dateTime.day) +
// " " +
// noon.split("-")[1] +
// ":00")) &&
// dateTime.isBefore(DateTime.parse(dateTime.year.toString() +
// "-" +
// Utils.addZeroNumber(dateTime.month) +
// "-" +
// Utils.addZeroNumber(dateTime.day) +
// " " +
// night.split("-")[1] +
// ":00"))) {
// //过了午市，未过晚市
// currTimeIndex = 3;
// } else {
// //过了晚市
// currTimeIndex = 3;
// }
}
@override
void initState() {
super.initState();
... ... @@ -174,11 +55,13 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
Provider.of<NotebookDetailChangeModel>(context, listen: false);
_notebookDetailChangeModel.initDateHourMinuteList(context);
String ddate = widget.detailEntity.ddate.toString() + '000';
_notebookDetailChangeModel.getNewTableList(context, ddate,
widget.detailEntity.ddate_solt, '6', widget.detailEntity.tables);
_notebookDetailChangeModel.getNewTableList(
context,
ddate,
widget.detailEntity.ddate_solt,
widget.detailEntity.pnum,
widget.detailEntity.tables);
_initData();
// _initTime();
}
_initData() {
... ... @@ -188,30 +71,6 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
}
}
//处理在线预订
// setReserveStatus(String status, {String tid = ""}) async {
// // bus.emit("remove_untreated_message", widget.mid);
// UserModel userModel = Provider.of<UserModel>(context, listen: false);
// Map<String, String> causeMap = {
// "uid": userModel.user.openid,
// "uname": userModel.user.account,
// "desc": "",
// };
// Map<String, String> params = {
// "rid": widget.rid,
// "status": status, //5安排包间 6 拒绝订单
// "tid": tid,
// // "mid": widget.mid,
// "cause": json.encode(causeMap)
// };
// // detailModel.setReserveStatus(context, params);
// bool success =
// await detailModel.setReserveStatus(context, params, ifPush: false);
// if (success) {
// _notebookDetailChangeModel.getNewTableList(context);
// }
// }
_topWidget() {
return Container(
padding: EdgeInsets.all(ScreenUtil().setWidth(40)),
... ... @@ -243,28 +102,16 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
_notebookDetailChangeModel.dateList[j]['select'] =
true;
//选完今天明天刷新页面
// String dateText = //09-09
String timeNowYear = DateUtil.formatDate(
DateTime.now(),
format: 'yyyy');
String ymyStr =
timeNowYear + '-' + value['title']; //年月日
String timeStr = ymyStr + ' ' + "00:00:00";
int ddate =
DateUtil.getDateMsByTimeStr(timeStr); //筛选日期时间戳
String ddateSolt = '';
for (var item
in _notebookDetailChangeModel.sunDateList) {
if (item['isSelect'] == true) {
ddateSolt = '${item['ddateSolt']}';
}
}
int ddate = _getDdate(_notebookDetailChangeModel);
String ddateSolt =
_getDdateSolt(_notebookDetailChangeModel);
String pnum = _getPnum(_notebookDetailChangeModel);
List<t.TableList> list =
await _notebookDetailChangeModel.getNewTableList(
context,
'${ddate}',
ddateSolt,
'6',
pnum,
_notebookDetailChangeModel.tableList);
if (list.length == 0) {
_notebookDetailChangeModel.isRecommend = true;
... ... @@ -283,52 +130,6 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
String selectDate =
timeNow.replaceRange(5, 10, selectStr);
_calendWidget(DateUtil.getDateTime(selectDate));
// String selectStr =
// _notebookDetailChangeModel.dateList[2]['title'];
// String timeNow = DateUtil.formatDate(
// DateTime.now(),
// );
// String selectDate =
// timeNow.replaceRange(5, 10, selectStr);
// DialogUtil.showCalendarDialog(
// context, DateUtil.getDateTime(selectDate))
// .then((day) {
// if (day != null) {
// // _createDateText(day);
// dateTime = day;
// int dateTimeMill = day.millisecondsSinceEpoch;
// String dateText = DateUtil.formatDateMs(
// dateTimeMill,
// format: 'MM-dd');
// bool isThird = true;
// for (int i = 0;
// i <
// _notebookDetailChangeModel
// .dateList.length;
// i++) {
// _notebookDetailChangeModel.dateList[i]
// ['select'] = false;
// if (_notebookDetailChangeModel.dateList[i]
// ['title'] ==
// dateText) {
// _notebookDetailChangeModel.dateList[i]
// ['select'] = true;
// isThird = false;
// }
// }
// if (isThird) {
// _notebookDetailChangeModel.dateList[2]
// ['select'] = true;
// _notebookDetailChangeModel.dateList[2]
// ['title'] = dateText;
// } else {
// _notebookDetailChangeModel.dateList[2]
// ['title'] = '其他';
// }
// }
// _notebookDetailChangeModel.notifyListeners();
// });
}
}
}
... ... @@ -376,30 +177,13 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
}
}
_notebookDetailChangeModel.notifyListeners();
//刷新页面
//当前选中 月 日string
String mdStr = '';
//今天 明天 其他天
for (var item in _notebookDetailChangeModel.dateList) {
if (item['select'] == true) {
mdStr = item['title'];
}
}
String timeNowYear =
DateUtil.formatDate(DateTime.now(), format: 'yyyy');
String ymyStr = timeNowYear + '-' + mdStr; //年月日
String timeStr = ymyStr + ' ' + '00:00:00';
// int start = DateUtil.getDateMsByTimeStr(timeStr);
// String tempDdate = ymyStr + ' ' + ddateStr + ':00';
int ddate = DateUtil.getDateMsByTimeStr(timeStr);
int ddate = _getDdate(_notebookDetailChangeModel);
String pnum = _getPnum(_notebookDetailChangeModel);
_notebookDetailChangeModel.getNewTableList(
context,
'${ddate}',
'${item['ddateSolt']}',
'6',
pnum,
_notebookDetailChangeModel.tableList);
}
}
... ... @@ -429,40 +213,25 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
value['dateText']) {
_notebookDetailChangeModel.personNumList[j]['isSelect'] =
true;
_notebookDetailChangeModel.numController.text =
value['dateText'];
//人数选择页面刷新
String pnum = value['dateText'];
//当前选中 月 日string
String mdStr = '';
//今天 明天 其他天
for (var item in _notebookDetailChangeModel.dateList) {
if (item['select'] == true) {
mdStr = item['title'];
}
}
String timeNowYear =
DateUtil.formatDate(DateTime.now(), format: 'yyyy');
String ymyStr = timeNowYear + '-' + mdStr; //年月日
String timeStr = ymyStr + ' ' + '00:00:00';
// int start = DateUtil.getDateMsByTimeStr(timeStr);
// String tempDdate = ymyStr + ' ' + ddateStr + ':00';
int ddate = DateUtil.getDateMsByTimeStr(timeStr);
if (j < 5) {
_notebookDetailChangeModel.numController.text =
value['dateText'];
FocusScope.of(context)
.requestFocus(FocusNode()); //点击空白处隐藏键盘
//人数选择页面刷新
String pnum = value['dateText'];
int ddate = _getDdate(_notebookDetailChangeModel);
String ddateSolt =
_getDdateSolt(_notebookDetailChangeModel);
String ddateSolt = '';
for (var item in _notebookDetailChangeModel.sunDateList) {
if (item['isSelect'] == true) {
ddateSolt = '${item['ddateSolt']}';
}
_notebookDetailChangeModel.getNewTableList(
context,
'${ddate}',
ddateSolt,
pnum,
_notebookDetailChangeModel.tableList);
}
_notebookDetailChangeModel.getNewTableList(
context,
'${ddate}',
ddateSolt,
pnum,
_notebookDetailChangeModel.tableList);
// if (j < 5) {
// _notebookDetailChangeModel.personNumList[5]
... ... @@ -511,16 +280,14 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
_notebookDetailChangeModel.dateList[2]['title'] = '其他';
}
// 选完日历刷新页面
// String dateText = //09-09
//筛选日期时间戳
String ddateSolt = '';
for (var item in _notebookDetailChangeModel.sunDateList) {
if (item['isSelect'] == true) {
ddateSolt = '${item['ddateSolt']}';
}
}
_notebookDetailChangeModel.getNewTableList(context, '${dateTimeMill}',
ddateSolt, '6', _notebookDetailChangeModel.tableList);
String ddateSolt = _getDdateSolt(_notebookDetailChangeModel);
String pnum = _getPnum(_notebookDetailChangeModel);
_notebookDetailChangeModel.getNewTableList(
context,
'${dateTimeMill}',
ddateSolt,
_getPnum(_notebookDetailChangeModel),
_notebookDetailChangeModel.tableList);
}
_notebookDetailChangeModel.notifyListeners();
});
... ... @@ -1044,20 +811,12 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
if (tableinfo.length > 1) {
_nameStr = _model.row.name + '等${tableinfo.length}桌';
}
// t.TableList _tableList = t.TableList.fromJson(tableinfo);
// _model.row.tableinfo
NavigatorUtil.goInvicationPage(context, _model.row.id,
_nameStr, _model.row.ddate, ddate_solt,
replace: true);
} else {
Utils.showToast("变更预订订单失败，请重试！");
}
// messageDialogModel.removeMessage(message.id);
// NavigatorUtil.goHandleOnlinePage(
// context, message.rid.toString(), message.id,
// replace: messageDialogModel.messages.isEmpty);
},
))
]),
... ... @@ -1065,6 +824,48 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
}
}
/// 获取日期 今天 明天 后天等等
int _getDdate(NotebookDetailChangeModel model) {
//当前选中 月 日string
String mdStr = '';
//今天 明天 其他天
for (var item in model.dateList) {
if (item['select'] == true) {
mdStr = item['title'];
}
}
String timeNowYear = DateUtil.formatDate(DateTime.now(), format: 'yyyy');
String ymyStr = timeNowYear + '-' + mdStr; //年月日
String timeStr = ymyStr + ' ' + "00:00:00";
int ddate = DateUtil.getDateMsByTimeStr(timeStr); //筛选日期时间戳
return ddate;
}
/// 获取早餐、午餐、晚餐字段 1 ，2， 3
String _getDdateSolt(NotebookDetailChangeModel model) {
String ddateSolt = '';
for (var item in model.sunDateList) {
if (item['isSelect']) {
ddateSolt = '${item['ddateSolt']}';
}
}
return ddateSolt;
}
/// 选中前面的按钮获取人数,输入的自己获取
String _getPnum(NotebookDetailChangeModel model) {
String pnum = '6';
for (var item in model.personNumList) {
if (item['isSelect']) {
pnum = item['dateText'];
}
}
if (pnum == '更多') {
pnum = '6';
}
return pnum;
}
class CustomButton extends StatefulWidget {
final String dateText;
final String dayText;
... ... @@ -1128,7 +929,11 @@ class _ButtonState extends State<CustomButton> {
child: TextField(
controller: widget.model.numController,
maxLines: 1,
inputFormatters: [LengthLimitingTextInputFormatter(3)],
inputFormatters: [
LengthLimitingTextInputFormatter(3),
WhitelistingTextInputFormatter.digitsOnly
],
//光标颜色
cursorColor: widget.isSelect
? Colors.white
... ... @@ -1179,8 +984,13 @@ class _ButtonState extends State<CustomButton> {
widget.model.notifyListeners();
},
onEditingComplete: () {
print('fff');
_cancelNode.unfocus();
int ddate = _getDdate(widget.model);
String ddateSolt = _getDdateSolt(widget.model);
String pnum = _getPnum(widget.model);
widget.model.getNewTableList(context, '${ddate}',
ddateSolt, pnum, widget.model.tableList);
},
keyboardType: TextInputType.number,
),
... ...
... ... @@ -277,7 +277,7 @@ class NotebookDetailChangeModel with ChangeNotifier {
tempSelect = true;
}
} else if (mnd == 3) {
if (temp == '16:30') {
if (temp == '18:30') {
tempSelect = true;
}
}
... ... @@ -349,6 +349,9 @@ class NotebookDetailChangeModel with ChangeNotifier {
///根据商家ID 获取桌位信息列表： 1：散座 2：包间 默认：获取所有数据
Future<List<TableList>> getNewTableList(BuildContext context, String ddate,
String ddate_solt, String pnum, List oldTableList) async {
if (pnum == '') {
pnum = '6';
}
DateTime createTime = DateTime.fromMillisecondsSinceEpoch(int.parse(ddate));
String rdate = DateUtil.formatDate(createTime, format: "yyyyMMdd");
UserModel userModel = Provider.of<UserModel>(context, listen: false);
... ... @@ -476,6 +479,9 @@ class NotebookDetailChangeModel with ChangeNotifier {
pnum = item['dateText'];
}
}
if (pnum == '') {
pnum = '6';
}
String sex = '1';
for (var item in sexList) {
if (item['select']) {
... ...