xt / Flutter-ReserveApp · Commits

Go to a project

Commit 4ec13cdd203e9cb237e6b1d9ad2fa3ab79a08d5f

Authored by “gaiyaguang”
1 parent 34c8d1e0

bug修复

Inline Side-by-side
Showing 2 changed files with 98 additions and 282 deletions
@@ -39,12 +39,6 @@ class NoteBookChangePage extends StatefulWidget { @@ -39,12 +39,6 @@ class NoteBookChangePage extends StatefulWidget {
39 } 39 }
40 40
41 class _NoteBookChangePageState extends State<NoteBookChangePage> { 41 class _NoteBookChangePageState extends State<NoteBookChangePage> {
42 - // String dateText = ""; //当前显示日期时间  
43 - // int currTimeIndex = 1; //当前选中时间段  
44 - // String morning; //早市时间段  
45 - // String noon; //午市时间段  
46 - // String night; //晚市时间段  
47 -  
48 DateTime dateTime; //当前日期 42 DateTime dateTime; //当前日期
49 NotebookDetailChangeModel _notebookDetailChangeModel; 43 NotebookDetailChangeModel _notebookDetailChangeModel;
50 FocusNode _phoneNode = FocusNode(); 44 FocusNode _phoneNode = FocusNode();
@@ -52,119 +46,6 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -52,119 +46,6 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
52 FocusNode _needNode = FocusNode(); 46 FocusNode _needNode = FocusNode();
53 NotebookDetailModel detailModel = NotebookDetailModel(); 47 NotebookDetailModel detailModel = NotebookDetailModel();
54 48
55 - // //生成日期文本  
56 - // _createDateText(DateTime day) {  
57 - // if (Utils.isOneDay(day, dateTime)) return; //日期没变  
58 - // setState(() {  
59 - // DateTime dateNow = DateTime.now();  
60 - // if (Utils.isOneDay(day, dateNow)) {  
61 - // dateText = Utils.addZeroNumber(dateNow.month) +  
62 - // "-" +  
63 - // Utils.addZeroNumber(dateNow.day) +  
64 - // " 今天";  
65 - // } else {  
66 - // dateText =  
67 - // Utils.addZeroNumber(day.month) + "-" + Utils.addZeroNumber(day.day);  
68 - // }  
69 - // dateTime = day;  
70 - // });  
71 - // // _getReserveList();  
72 - // // _reserveCountDay();  
73 - // }  
74 -  
75 - //初始化时间  
76 - _initTime() {  
77 - _notebookDetailChangeModel =  
78 - Provider.of<NotebookDetailChangeModel>(context, listen: false);  
79 - //今天  
80 - DateTime dateTime = DateTime.now();  
81 - int dateTimeMill = dateTime.millisecondsSinceEpoch;  
82 - String dateText = DateUtil.formatDateMs(dateTimeMill, format: 'MM-dd');  
83 - _notebookDetailChangeModel.dateList.add({  
84 - 'title': dateText,  
85 - 'select': false,  
86 - 'fontSize': 34.0,  
87 - 'dayText': ' 今天',  
88 - 'isImage': false  
89 - });  
90 - //明天  
91 - int tomorrowMill = dateTimeMill + 24 * 60 * 60 * 1000;  
92 - String dateTextTomorrow =  
93 - DateUtil.formatDateMs(tomorrowMill, format: 'MM-dd');  
94 - _notebookDetailChangeModel.dateList.add({  
95 - 'title': dateTextTomorrow,  
96 - 'select': false,  
97 - 'fontSize': 34.0,  
98 - 'dayText': ' 明天',  
99 - 'isImage': false  
100 - });  
101 - //第三个  
102 - _notebookDetailChangeModel.dateList.add({  
103 - 'title': '其他',  
104 - 'select': true,  
105 - 'fontSize': 30.0,  
106 - 'dayText': '',  
107 - 'isImage': true  
108 - });  
109 -  
110 - print(widget.detailEntity);  
111 - // dateList.add(value)  
112 - // morning =  
113 - // userModel.user.morning.isEmpty ? "00:00-00:00" : userModel.user.morning;  
114 - // noon = userModel.user.noon.isEmpty ? "00:00-00:00" : userModel.user.noon;  
115 - // night = userModel.user.night.isEmpty ? "00:00-00:00" : userModel.user.night;  
116 - // if (dateTime.isBefore(DateTime.parse(dateTime.year.toString() +  
117 - // "-" +  
118 - // Utils.addZeroNumber(dateTime.month) +  
119 - // "-" +  
120 - // Utils.addZeroNumber(dateTime.day) +  
121 - // " " +  
122 - // morning.split("-")[1] +  
123 - // ":00"))) {  
124 - // //未过早市  
125 - // currTimeIndex = 1;  
126 - // } else if (dateTime.isAfter(DateTime.parse(dateTime.year.toString() +  
127 - // "-" +  
128 - // Utils.addZeroNumber(dateTime.month) +  
129 - // "-" +  
130 - // Utils.addZeroNumber(dateTime.day) +  
131 - // " " +  
132 - // morning.split("-")[1] +  
133 - // ":00")) &&  
134 - // dateTime.isBefore(DateTime.parse(dateTime.year.toString() +  
135 - // "-" +  
136 - // Utils.addZeroNumber(dateTime.month) +  
137 - // "-" +  
138 - // Utils.addZeroNumber(dateTime.day) +  
139 - // " " +  
140 - // noon.split("-")[1] +  
141 - // ":00"))) {  
142 - // //过了早市，未过午市  
143 - // currTimeIndex = 2;  
144 - // } else if (dateTime.isAfter(DateTime.parse(dateTime.year.toString() +  
145 - // "-" +  
146 - // Utils.addZeroNumber(dateTime.month) +  
147 - // "-" +  
148 - // Utils.addZeroNumber(dateTime.day) +  
149 - // " " +  
150 - // noon.split("-")[1] +  
151 - // ":00")) &&  
152 - // dateTime.isBefore(DateTime.parse(dateTime.year.toString() +  
153 - // "-" +  
154 - // Utils.addZeroNumber(dateTime.month) +  
155 - // "-" +  
156 - // Utils.addZeroNumber(dateTime.day) +  
157 - // " " +  
158 - // night.split("-")[1] +  
159 - // ":00"))) {  
160 - // //过了午市，未过晚市  
161 - // currTimeIndex = 3;  
162 - // } else {  
163 - // //过了晚市  
164 - // currTimeIndex = 3;  
165 - // }  
166 - }  
167 -  
168 @override 49 @override
169 void initState() { 50 void initState() {
170 super.initState(); 51 super.initState();
@@ -174,11 +55,13 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -174,11 +55,13 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
174 Provider.of<NotebookDetailChangeModel>(context, listen: false); 55 Provider.of<NotebookDetailChangeModel>(context, listen: false);
175 _notebookDetailChangeModel.initDateHourMinuteList(context); 56 _notebookDetailChangeModel.initDateHourMinuteList(context);
176 String ddate = widget.detailEntity.ddate.toString() + '000'; 57 String ddate = widget.detailEntity.ddate.toString() + '000';
177 - _notebookDetailChangeModel.getNewTableList(context, ddate,  
178 - widget.detailEntity.ddate_solt, '6', widget.detailEntity.tables); 58 + _notebookDetailChangeModel.getNewTableList(
  59 + context,
  60 + ddate,
  61 + widget.detailEntity.ddate_solt,
  62 + widget.detailEntity.pnum,
  63 + widget.detailEntity.tables);
179 _initData(); 64 _initData();
180 -  
181 - // _initTime();  
182 } 65 }
183 66
184 _initData() { 67 _initData() {
@@ -188,30 +71,6 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -188,30 +71,6 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
188 } 71 }
189 } 72 }
190 73
191 - //处理在线预订  
192 - // setReserveStatus(String status, {String tid = ""}) async {  
193 - // // bus.emit("remove_untreated_message", widget.mid);  
194 - // UserModel userModel = Provider.of<UserModel>(context, listen: false);  
195 - // Map<String, String> causeMap = {  
196 - // "uid": userModel.user.openid,  
197 - // "uname": userModel.user.account,  
198 - // "desc": "",  
199 - // };  
200 - // Map<String, String> params = {  
201 - // "rid": widget.rid,  
202 - // "status": status, //5安排包间 6 拒绝订单  
203 - // "tid": tid,  
204 - // // "mid": widget.mid,  
205 - // "cause": json.encode(causeMap)  
206 - // };  
207 - // // detailModel.setReserveStatus(context, params);  
208 - // bool success =  
209 - // await detailModel.setReserveStatus(context, params, ifPush: false);  
210 - // if (success) {  
211 - // _notebookDetailChangeModel.getNewTableList(context);  
212 - // }  
213 - // }  
214 -  
215 _topWidget() { 74 _topWidget() {
216 return Container( 75 return Container(
217 padding: EdgeInsets.all(ScreenUtil().setWidth(40)), 76 padding: EdgeInsets.all(ScreenUtil().setWidth(40)),
@@ -243,28 +102,16 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -243,28 +102,16 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
243 _notebookDetailChangeModel.dateList[j]['select'] = 102 _notebookDetailChangeModel.dateList[j]['select'] =
244 true; 103 true;
245 //选完今天明天刷新页面 104 //选完今天明天刷新页面
246 - // String dateText = //09-09  
247 - String timeNowYear = DateUtil.formatDate(  
248 - DateTime.now(),  
249 - format: 'yyyy');  
250 - String ymyStr =  
251 - timeNowYear + '-' + value['title']; //年月日  
252 - String timeStr = ymyStr + ' ' + "00:00:00";  
253 - int ddate =  
254 - DateUtil.getDateMsByTimeStr(timeStr); //筛选日期时间戳  
255 - String ddateSolt = '';  
256 - for (var item  
257 - in _notebookDetailChangeModel.sunDateList) {  
258 - if (item['isSelect'] == true) {  
259 - ddateSolt = '${item['ddateSolt']}';  
260 - }  
261 - } 105 + int ddate = _getDdate(_notebookDetailChangeModel);
  106 + String ddateSolt =
  107 + _getDdateSolt(_notebookDetailChangeModel);
  108 + String pnum = _getPnum(_notebookDetailChangeModel);
262 List<t.TableList> list = 109 List<t.TableList> list =
263 await _notebookDetailChangeModel.getNewTableList( 110 await _notebookDetailChangeModel.getNewTableList(
264 context, 111 context,
265 '${ddate}', 112 '${ddate}',
266 ddateSolt, 113 ddateSolt,
267 - '6', 114 + pnum,
268 _notebookDetailChangeModel.tableList); 115 _notebookDetailChangeModel.tableList);
269 if (list.length == 0) { 116 if (list.length == 0) {
270 _notebookDetailChangeModel.isRecommend = true; 117 _notebookDetailChangeModel.isRecommend = true;
@@ -283,52 +130,6 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -283,52 +130,6 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
283 String selectDate = 130 String selectDate =
284 timeNow.replaceRange(5, 10, selectStr); 131 timeNow.replaceRange(5, 10, selectStr);
285 _calendWidget(DateUtil.getDateTime(selectDate)); 132 _calendWidget(DateUtil.getDateTime(selectDate));
286 - // String selectStr =  
287 - // _notebookDetailChangeModel.dateList[2]['title'];  
288 - // String timeNow = DateUtil.formatDate(  
289 - // DateTime.now(),  
290 - // );  
291 - // String selectDate =  
292 - // timeNow.replaceRange(5, 10, selectStr);  
293 - // DialogUtil.showCalendarDialog(  
294 - // context, DateUtil.getDateTime(selectDate))  
295 - // .then((day) {  
296 - // if (day != null) {  
297 - // // _createDateText(day);  
298 - // dateTime = day;  
299 - // int dateTimeMill = day.millisecondsSinceEpoch;  
300 - // String dateText = DateUtil.formatDateMs(  
301 - // dateTimeMill,  
302 - // format: 'MM-dd');  
303 - // bool isThird = true;  
304 - // for (int i = 0;  
305 - // i <  
306 - // _notebookDetailChangeModel  
307 - // .dateList.length;  
308 - // i++) {  
309 - // _notebookDetailChangeModel.dateList[i]  
310 - // ['select'] = false;  
311 -  
312 - // if (_notebookDetailChangeModel.dateList[i]  
313 - // ['title'] ==  
314 - // dateText) {  
315 - // _notebookDetailChangeModel.dateList[i]  
316 - // ['select'] = true;  
317 - // isThird = false;  
318 - // }  
319 - // }  
320 - // if (isThird) {  
321 - // _notebookDetailChangeModel.dateList[2]  
322 - // ['select'] = true;  
323 - // _notebookDetailChangeModel.dateList[2]  
324 - // ['title'] = dateText;  
325 - // } else {  
326 - // _notebookDetailChangeModel.dateList[2]  
327 - // ['title'] = '其他';  
328 - // }  
329 - // }  
330 - // _notebookDetailChangeModel.notifyListeners();  
331 - // });  
332 } 133 }
333 } 134 }
334 } 135 }
@@ -376,30 +177,13 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -376,30 +177,13 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
376 } 177 }
377 } 178 }
378 _notebookDetailChangeModel.notifyListeners(); 179 _notebookDetailChangeModel.notifyListeners();
379 -  
380 - //刷新页面  
381 - //当前选中 月 日string  
382 - String mdStr = '';  
383 - //今天 明天 其他天  
384 - for (var item in _notebookDetailChangeModel.dateList) {  
385 - if (item['select'] == true) {  
386 - mdStr = item['title'];  
387 - }  
388 - }  
389 - String timeNowYear =  
390 - DateUtil.formatDate(DateTime.now(), format: 'yyyy');  
391 - String ymyStr = timeNowYear + '-' + mdStr; //年月日  
392 - String timeStr = ymyStr + ' ' + '00:00:00';  
393 - // int start = DateUtil.getDateMsByTimeStr(timeStr);  
394 -  
395 - // String tempDdate = ymyStr + ' ' + ddateStr + ':00';  
396 - int ddate = DateUtil.getDateMsByTimeStr(timeStr);  
397 - 180 + int ddate = _getDdate(_notebookDetailChangeModel);
  181 + String pnum = _getPnum(_notebookDetailChangeModel);
398 _notebookDetailChangeModel.getNewTableList( 182 _notebookDetailChangeModel.getNewTableList(
399 context, 183 context,
400 '${ddate}', 184 '${ddate}',
401 '${item['ddateSolt']}', 185 '${item['ddateSolt']}',
402 - '6', 186 + pnum,
403 _notebookDetailChangeModel.tableList); 187 _notebookDetailChangeModel.tableList);
404 } 188 }
405 } 189 }
@@ -429,40 +213,25 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -429,40 +213,25 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
429 value['dateText']) { 213 value['dateText']) {
430 _notebookDetailChangeModel.personNumList[j]['isSelect'] = 214 _notebookDetailChangeModel.personNumList[j]['isSelect'] =
431 true; 215 true;
432 - _notebookDetailChangeModel.numController.text =  
433 - value['dateText'];  
434 - //人数选择页面刷新  
435 - String pnum = value['dateText'];  
436 -  
437 - //当前选中 月 日string  
438 - String mdStr = '';  
439 - //今天 明天 其他天  
440 - for (var item in _notebookDetailChangeModel.dateList) {  
441 - if (item['select'] == true) {  
442 - mdStr = item['title'];  
443 - }  
444 - }  
445 - String timeNowYear =  
446 - DateUtil.formatDate(DateTime.now(), format: 'yyyy');  
447 - String ymyStr = timeNowYear + '-' + mdStr; //年月日  
448 - String timeStr = ymyStr + ' ' + '00:00:00';  
449 - // int start = DateUtil.getDateMsByTimeStr(timeStr);  
450 216
451 - // String tempDdate = ymyStr + ' ' + ddateStr + ':00';  
452 - int ddate = DateUtil.getDateMsByTimeStr(timeStr); 217 + if (j < 5) {
  218 + _notebookDetailChangeModel.numController.text =
  219 + value['dateText'];
  220 + FocusScope.of(context)
  221 + .requestFocus(FocusNode()); //点击空白处隐藏键盘
  222 + //人数选择页面刷新
  223 + String pnum = value['dateText'];
  224 + int ddate = _getDdate(_notebookDetailChangeModel);
  225 + String ddateSolt =
  226 + _getDdateSolt(_notebookDetailChangeModel);
453 227
454 - String ddateSolt = '';  
455 - for (var item in _notebookDetailChangeModel.sunDateList) {  
456 - if (item['isSelect'] == true) {  
457 - ddateSolt = '${item['ddateSolt']}';  
458 - } 228 + _notebookDetailChangeModel.getNewTableList(
  229 + context,
  230 + '${ddate}',
  231 + ddateSolt,
  232 + pnum,
  233 + _notebookDetailChangeModel.tableList);
459 } 234 }
460 - _notebookDetailChangeModel.getNewTableList(  
461 - context,  
462 - '${ddate}',  
463 - ddateSolt,  
464 - pnum,  
465 - _notebookDetailChangeModel.tableList);  
466 235
467 // if (j < 5) { 236 // if (j < 5) {
468 // _notebookDetailChangeModel.personNumList[5] 237 // _notebookDetailChangeModel.personNumList[5]
@@ -511,16 +280,14 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -511,16 +280,14 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
511 _notebookDetailChangeModel.dateList[2]['title'] = '其他'; 280 _notebookDetailChangeModel.dateList[2]['title'] = '其他';
512 } 281 }
513 // 选完日历刷新页面 282 // 选完日历刷新页面
514 - // String dateText = //09-09  
515 - //筛选日期时间戳  
516 - String ddateSolt = '';  
517 - for (var item in _notebookDetailChangeModel.sunDateList) {  
518 - if (item['isSelect'] == true) {  
519 - ddateSolt = '${item['ddateSolt']}';  
520 - }  
521 - }  
522 - _notebookDetailChangeModel.getNewTableList(context, '${dateTimeMill}',  
523 - ddateSolt, '6', _notebookDetailChangeModel.tableList); 283 + String ddateSolt = _getDdateSolt(_notebookDetailChangeModel);
  284 + String pnum = _getPnum(_notebookDetailChangeModel);
  285 + _notebookDetailChangeModel.getNewTableList(
  286 + context,
  287 + '${dateTimeMill}',
  288 + ddateSolt,
  289 + _getPnum(_notebookDetailChangeModel),
  290 + _notebookDetailChangeModel.tableList);
524 } 291 }
525 _notebookDetailChangeModel.notifyListeners(); 292 _notebookDetailChangeModel.notifyListeners();
526 }); 293 });
@@ -1044,20 +811,12 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -1044,20 +811,12 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
1044 if (tableinfo.length > 1) { 811 if (tableinfo.length > 1) {
1045 _nameStr = _model.row.name + '等${tableinfo.length}桌'; 812 _nameStr = _model.row.name + '等${tableinfo.length}桌';
1046 } 813 }
1047 -  
1048 - // t.TableList _tableList = t.TableList.fromJson(tableinfo);  
1049 - // _model.row.tableinfo  
1050 NavigatorUtil.goInvicationPage(context, _model.row.id, 814 NavigatorUtil.goInvicationPage(context, _model.row.id,
1051 _nameStr, _model.row.ddate, ddate_solt, 815 _nameStr, _model.row.ddate, ddate_solt,
1052 replace: true); 816 replace: true);
1053 } else { 817 } else {
1054 Utils.showToast("变更预订订单失败，请重试！"); 818 Utils.showToast("变更预订订单失败，请重试！");
1055 } 819 }
1056 -  
1057 - // messageDialogModel.removeMessage(message.id);  
1058 - // NavigatorUtil.goHandleOnlinePage(  
1059 - // context, message.rid.toString(), message.id,  
1060 - // replace: messageDialogModel.messages.isEmpty);  
1061 }, 820 },
1062 )) 821 ))
1063 ]), 822 ]),
@@ -1065,6 +824,48 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -1065,6 +824,48 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
1065 } 824 }
1066 } 825 }
1067 826
  827 +/// 获取日期 今天 明天 后天等等
  828 +int _getDdate(NotebookDetailChangeModel model) {
  829 + //当前选中 月 日string
  830 + String mdStr = '';
  831 + //今天 明天 其他天
  832 + for (var item in model.dateList) {
  833 + if (item['select'] == true) {
  834 + mdStr = item['title'];
  835 + }
  836 + }
  837 + String timeNowYear = DateUtil.formatDate(DateTime.now(), format: 'yyyy');
  838 + String ymyStr = timeNowYear + '-' + mdStr; //年月日
  839 + String timeStr = ymyStr + ' ' + "00:00:00";
  840 + int ddate = DateUtil.getDateMsByTimeStr(timeStr); //筛选日期时间戳
  841 + return ddate;
  842 +}
  843 +
  844 +/// 获取早餐、午餐、晚餐字段 1 ，2， 3
  845 +String _getDdateSolt(NotebookDetailChangeModel model) {
  846 + String ddateSolt = '';
  847 + for (var item in model.sunDateList) {
  848 + if (item['isSelect']) {
  849 + ddateSolt = '${item['ddateSolt']}';
  850 + }
  851 + }
  852 + return ddateSolt;
  853 +}
  854 +
  855 +/// 选中前面的按钮获取人数,输入的自己获取
  856 +String _getPnum(NotebookDetailChangeModel model) {
  857 + String pnum = '6';
  858 + for (var item in model.personNumList) {
  859 + if (item['isSelect']) {
  860 + pnum = item['dateText'];
  861 + }
  862 + }
  863 + if (pnum == '更多') {
  864 + pnum = '6';
  865 + }
  866 + return pnum;
  867 +}
  868 +
1068 class CustomButton extends StatefulWidget { 869 class CustomButton extends StatefulWidget {
1069 final String dateText; 870 final String dateText;
1070 final String dayText; 871 final String dayText;
@@ -1128,7 +929,11 @@ class _ButtonState extends State<CustomButton> { @@ -1128,7 +929,11 @@ class _ButtonState extends State<CustomButton> {
1128 child: TextField( 929 child: TextField(
1129 controller: widget.model.numController, 930 controller: widget.model.numController,
1130 maxLines: 1, 931 maxLines: 1,
1131 - inputFormatters: [LengthLimitingTextInputFormatter(3)], 932 +
  933 + inputFormatters: [
  934 + LengthLimitingTextInputFormatter(3),
  935 + WhitelistingTextInputFormatter.digitsOnly
  936 + ],
1132 //光标颜色 937 //光标颜色
1133 cursorColor: widget.isSelect 938 cursorColor: widget.isSelect
1134 ? Colors.white 939 ? Colors.white
@@ -1179,8 +984,13 @@ class _ButtonState extends State<CustomButton> { @@ -1179,8 +984,13 @@ class _ButtonState extends State<CustomButton> {
1179 widget.model.notifyListeners(); 984 widget.model.notifyListeners();
1180 }, 985 },
1181 onEditingComplete: () { 986 onEditingComplete: () {
1182 - print('fff');  
1183 _cancelNode.unfocus(); 987 _cancelNode.unfocus();
  988 + int ddate = _getDdate(widget.model);
  989 + String ddateSolt = _getDdateSolt(widget.model);
  990 + String pnum = _getPnum(widget.model);
  991 +
  992 + widget.model.getNewTableList(context, '${ddate}',
  993 + ddateSolt, pnum, widget.model.tableList);
1184 }, 994 },
1185 keyboardType: TextInputType.number, 995 keyboardType: TextInputType.number,
1186 ), 996 ),
@@ -277,7 +277,7 @@ class NotebookDetailChangeModel with ChangeNotifier { @@ -277,7 +277,7 @@ class NotebookDetailChangeModel with ChangeNotifier {
277 tempSelect = true; 277 tempSelect = true;
278 } 278 }
279 } else if (mnd == 3) { 279 } else if (mnd == 3) {
280 - if (temp == '16:30') { 280 + if (temp == '18:30') {
281 tempSelect = true; 281 tempSelect = true;
282 } 282 }
283 } 283 }
@@ -349,6 +349,9 @@ class NotebookDetailChangeModel with ChangeNotifier { @@ -349,6 +349,9 @@ class NotebookDetailChangeModel with ChangeNotifier {
349 ///根据商家ID 获取桌位信息列表： 1：散座 2：包间 默认：获取所有数据 349 ///根据商家ID 获取桌位信息列表： 1：散座 2：包间 默认：获取所有数据
350 Future<List<TableList>> getNewTableList(BuildContext context, String ddate, 350 Future<List<TableList>> getNewTableList(BuildContext context, String ddate,
351 String ddate_solt, String pnum, List oldTableList) async { 351 String ddate_solt, String pnum, List oldTableList) async {
  352 + if (pnum == '') {
  353 + pnum = '6';
  354 + }
352 DateTime createTime = DateTime.fromMillisecondsSinceEpoch(int.parse(ddate)); 355 DateTime createTime = DateTime.fromMillisecondsSinceEpoch(int.parse(ddate));
353 String rdate = DateUtil.formatDate(createTime, format: "yyyyMMdd"); 356 String rdate = DateUtil.formatDate(createTime, format: "yyyyMMdd");
354 UserModel userModel = Provider.of<UserModel>(context, listen: false); 357 UserModel userModel = Provider.of<UserModel>(context, listen: false);
@@ -476,6 +479,9 @@ class NotebookDetailChangeModel with ChangeNotifier { @@ -476,6 +479,9 @@ class NotebookDetailChangeModel with ChangeNotifier {
476 pnum = item['dateText']; 479 pnum = item['dateText'];
477 } 480 }
478 } 481 }
  482 + if (pnum == '') {
  483 + pnum = '6';
  484 + }
479 String sex = '1'; 485 String sex = '1';
480 for (var item in sexList) { 486 for (var item in sexList) {
481 if (item['select']) { 487 if (item['select']) {