xt / Flutter-ReserveApp · Commits

Go to a project

Commit e8d37e71a024023e0fad62e69f33b1f0a9b4c160

Authored by gaiyaguang
2 parents e8cc4a9b 34c8d1e0
build: skipped

处理在线预订页面按钮居低

Inline Side-by-side
Showing 5 changed files with 276 additions and 114 deletions
1 -132d87951dd4c814f02e49539118d6af  
  1 +7babc7873f8d177769b987ba4c6c2911
@@ -405,7 +405,7 @@ @@ -405,7 +405,7 @@
405 CODE_SIGN_IDENTITY = "Apple Development"; 405 CODE_SIGN_IDENTITY = "Apple Development";
406 CODE_SIGN_STYLE = Automatic; 406 CODE_SIGN_STYLE = Automatic;
407 CURRENT_PROJECT_VERSION = 112; 407 CURRENT_PROJECT_VERSION = 112;
408 - DEVELOPMENT_TEAM = ""; 408 + DEVELOPMENT_TEAM = 8J59HM8B82;
409 ENABLE_BITCODE = NO; 409 ENABLE_BITCODE = NO;
410 FRAMEWORK_SEARCH_PATHS = ( 410 FRAMEWORK_SEARCH_PATHS = (
411 "$(inherited)", 411 "$(inherited)",
@@ -51,7 +51,6 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -51,7 +51,6 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
51 FocusNode _nameNode = FocusNode(); 51 FocusNode _nameNode = FocusNode();
52 FocusNode _needNode = FocusNode(); 52 FocusNode _needNode = FocusNode();
53 NotebookDetailModel detailModel = NotebookDetailModel(); 53 NotebookDetailModel detailModel = NotebookDetailModel();
54 - bool isRecommend = false; //可订桌位是否展示推荐桌位，无已选中包间情况下展示推荐的包间  
55 54
56 // //生成日期文本 55 // //生成日期文本
57 // _createDateText(DateTime day) { 56 // _createDateText(DateTime day) {
@@ -174,7 +173,9 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -174,7 +173,9 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
174 _notebookDetailChangeModel = 173 _notebookDetailChangeModel =
175 Provider.of<NotebookDetailChangeModel>(context, listen: false); 174 Provider.of<NotebookDetailChangeModel>(context, listen: false);
176 _notebookDetailChangeModel.initDateHourMinuteList(context); 175 _notebookDetailChangeModel.initDateHourMinuteList(context);
177 - _notebookDetailChangeModel.getNewTableList(context); 176 + String ddate = widget.detailEntity.ddate.toString() + '000';
  177 + _notebookDetailChangeModel.getNewTableList(context, ddate,
  178 + widget.detailEntity.ddate_solt, '6', widget.detailEntity.tables);
178 _initData(); 179 _initData();
179 180
180 // _initTime(); 181 // _initTime();
@@ -188,28 +189,28 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -188,28 +189,28 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
188 } 189 }
189 190
190 //处理在线预订 191 //处理在线预订
191 - setReserveStatus(String status, {String tid = ""}) async {  
192 - // bus.emit("remove_untreated_message", widget.mid);  
193 - UserModel userModel = Provider.of<UserModel>(context, listen: false);  
194 - Map<String, String> causeMap = {  
195 - "uid": userModel.user.openid,  
196 - "uname": userModel.user.account,  
197 - "desc": "",  
198 - };  
199 - Map<String, String> params = {  
200 - "rid": widget.rid,  
201 - "status": status, //5安排包间 6 拒绝订单  
202 - "tid": tid,  
203 - // "mid": widget.mid,  
204 - "cause": json.encode(causeMap)  
205 - };  
206 - // detailModel.setReserveStatus(context, params);  
207 - bool success =  
208 - await detailModel.setReserveStatus(context, params, ifPush: false);  
209 - if (success) {  
210 - _notebookDetailChangeModel.getNewTableList(context);  
211 - }  
212 - } 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 + // }
213 214
214 _topWidget() { 215 _topWidget() {
215 return Container( 216 return Container(
@@ -226,10 +227,9 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -226,10 +227,9 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
226 dayText: value['dayText'], 227 dayText: value['dayText'],
227 isImage: value['isImage'], 228 isImage: value['isImage'],
228 isSelect: value['select'], 229 isSelect: value['select'],
229 - onTap: () {  
230 - if (_notebookDetailChangeModel.dateList.length > 2 &&  
231 - _notebookDetailChangeModel.dateList[2]['title'] ==  
232 - '其他') { 230 + onTap: () async {
  231 + print(value['title']);
  232 + if (value['title'] == '其他') {
233 _calendWidget(DateTime.now()); 233 _calendWidget(DateTime.now());
234 } else { 234 } else {
235 for (int j = 0; 235 for (int j = 0;
@@ -242,6 +242,33 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -242,6 +242,33 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
242 value['title']) { 242 value['title']) {
243 _notebookDetailChangeModel.dateList[j]['select'] = 243 _notebookDetailChangeModel.dateList[j]['select'] =
244 true; 244 true;
  245 + //选完今天明天刷新页面
  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 + }
  262 + List<t.TableList> list =
  263 + await _notebookDetailChangeModel.getNewTableList(
  264 + context,
  265 + '${ddate}',
  266 + ddateSolt,
  267 + '6',
  268 + _notebookDetailChangeModel.tableList);
  269 + if (list.length == 0) {
  270 + _notebookDetailChangeModel.isRecommend = true;
  271 + }
245 if (j == 0 || j == 1) { 272 if (j == 0 || j == 1) {
246 _notebookDetailChangeModel.dateList[2]['title'] = 273 _notebookDetailChangeModel.dateList[2]['title'] =
247 '其他'; 274 '其他';
@@ -348,9 +375,34 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -348,9 +375,34 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
348 } 375 }
349 } 376 }
350 } 377 }
  378 + _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 +
  398 + _notebookDetailChangeModel.getNewTableList(
  399 + context,
  400 + '${ddate}',
  401 + '${item['ddateSolt']}',
  402 + '6',
  403 + _notebookDetailChangeModel.tableList);
351 } 404 }
352 } 405 }
353 - _notebookDetailChangeModel.notifyListeners();  
354 }, 406 },
355 dateText: value['dateText'], 407 dateText: value['dateText'],
356 dayText: '', 408 dayText: '',
@@ -379,6 +431,39 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -379,6 +431,39 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
379 true; 431 true;
380 _notebookDetailChangeModel.numController.text = 432 _notebookDetailChangeModel.numController.text =
381 value['dateText']; 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 +
  451 + // String tempDdate = ymyStr + ' ' + ddateStr + ':00';
  452 + int ddate = DateUtil.getDateMsByTimeStr(timeStr);
  453 +
  454 + String ddateSolt = '';
  455 + for (var item in _notebookDetailChangeModel.sunDateList) {
  456 + if (item['isSelect'] == true) {
  457 + ddateSolt = '${item['ddateSolt']}';
  458 + }
  459 + }
  460 + _notebookDetailChangeModel.getNewTableList(
  461 + context,
  462 + '${ddate}',
  463 + ddateSolt,
  464 + pnum,
  465 + _notebookDetailChangeModel.tableList);
  466 +
382 // if (j < 5) { 467 // if (j < 5) {
383 // _notebookDetailChangeModel.personNumList[5] 468 // _notebookDetailChangeModel.personNumList[5]
384 // ['dateText'] = '更多'; 469 // ['dateText'] = '更多';
@@ -425,6 +510,17 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -425,6 +510,17 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
425 } else { 510 } else {
426 _notebookDetailChangeModel.dateList[2]['title'] = '其他'; 511 _notebookDetailChangeModel.dateList[2]['title'] = '其他';
427 } 512 }
  513 + // 选完日历刷新页面
  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);
428 } 524 }
429 _notebookDetailChangeModel.notifyListeners(); 525 _notebookDetailChangeModel.notifyListeners();
430 }); 526 });
@@ -433,7 +529,7 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -433,7 +529,7 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
433 /// 可订桌位 529 /// 可订桌位
434 _middleWidget() { 530 _middleWidget() {
435 List canBookTable = []; 531 List canBookTable = [];
436 - if (isRecommend) { 532 + if (_notebookDetailChangeModel.isRecommend) {
437 canBookTable = _notebookDetailChangeModel.recommendList; 533 canBookTable = _notebookDetailChangeModel.recommendList;
438 } else { 534 } else {
439 canBookTable = _notebookDetailChangeModel.tableList; 535 canBookTable = _notebookDetailChangeModel.tableList;
@@ -443,87 +539,88 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -443,87 +539,88 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
443 color: MyColours.color_f5f5f5, 539 color: MyColours.color_f5f5f5,
444 child: Column( 540 child: Column(
445 children: [ 541 children: [
446 - Row(  
447 - mainAxisAlignment: MainAxisAlignment.spaceBetween,  
448 - crossAxisAlignment: CrossAxisAlignment.end,  
449 - children: [  
450 - Text(  
451 - '可订桌位',  
452 - style: TextStyle(  
453 - color: MyColours.color_353535,  
454 - fontSize: ScreenUtil().setSp(30)),  
455 - ),  
456 - InkWell(  
457 - onTap: () async {  
458 - //当前选中 月 日string  
459 - String mdStr = '';  
460 - //今天 明天 其他天  
461 - for (var item in _notebookDetailChangeModel.dateList) {  
462 - if (item['select'] == true) {  
463 - mdStr = item['title'];  
464 - } 542 + InkWell(
  543 + onTap: () async {
  544 + //当前选中 月 日string
  545 + String mdStr = '';
  546 + //今天 明天 其他天
  547 + for (var item in _notebookDetailChangeModel.dateList) {
  548 + if (item['select'] == true) {
  549 + mdStr = item['title'];
465 } 550 }
466 - String timeNowYear =  
467 - DateUtil.formatDate(DateTime.now(), format: 'yyyy');  
468 - String ymyStr = timeNowYear + '-' + mdStr; //年月日  
469 - String timeStr = ymyStr + ' ' + "00:00:00";  
470 - int ddate = DateUtil.getDateMsByTimeStr(timeStr); //筛选日期时间戳  
471 - String ddateSolt = '';  
472 - for (var item in _notebookDetailChangeModel.sunDateList) {  
473 - if (item['isSelect']) {  
474 - ddateSolt = '${item['ddateSolt']}';  
475 - } 551 + }
  552 + String timeNowYear =
  553 + DateUtil.formatDate(DateTime.now(), format: 'yyyy');
  554 + String ymyStr = timeNowYear + '-' + mdStr; //年月日
  555 + String timeStr = ymyStr + ' ' + "00:00:00";
  556 + int ddate = DateUtil.getDateMsByTimeStr(timeStr); //筛选日期时间戳
  557 + String ddateSolt = '';
  558 + for (var item in _notebookDetailChangeModel.sunDateList) {
  559 + if (item['isSelect']) {
  560 + ddateSolt = '${item['ddateSolt']}';
476 } 561 }
  562 + }
477 563
478 - // String tempDdate = ymyStr + ' ' + ddateStr + ':00';  
479 - // int ddate = DateUtil.getDateMsByTimeStr(timeStr);  
480 - Map temp = await NavigatorUtil.goSelectTablePage(  
481 - context, widget.rid, ddate, ddateSolt,  
482 - canChoose: true,  
483 - object: {'object': _notebookDetailChangeModel.tableList});  
484 - // if (temp['tid'] != null) {  
485 - // setReserveStatus("5", tid: temp['tid']);  
486 - // }  
487 - if (temp == null || temp['object'].length == 0) {  
488 - isRecommend = true; 564 + // String tempDdate = ymyStr + ' ' + ddateStr + ':00';
  565 + // int ddate = DateUtil.getDateMsByTimeStr(timeStr);
  566 + Map temp = await NavigatorUtil.goSelectTablePage(
  567 + context, widget.rid, ddate, ddateSolt,
  568 + canChoose: true,
  569 + object: {'object': _notebookDetailChangeModel.tableList});
  570 + // if (temp['tid'] != null) {
  571 + // setReserveStatus("5", tid: temp['tid']);
  572 + // }
  573 + if (temp == null || temp['object'].length == 0) {
  574 + if (_notebookDetailChangeModel.tableList.length == 0) {
  575 + _notebookDetailChangeModel.isRecommend = true;
489 _notebookDetailChangeModel.tableList = []; 576 _notebookDetailChangeModel.tableList = [];
490 for (t.TableList item 577 for (t.TableList item
491 in _notebookDetailChangeModel.recommendList) { 578 in _notebookDetailChangeModel.recommendList) {
492 item.selected = false; 579 item.selected = false;
493 } 580 }
494 setState(() {}); 581 setState(() {});
495 - } else {  
496 - isRecommend = false;  
497 - _notebookDetailChangeModel.tableList = temp['object'];  
498 - // if (_notebookDetailChangeModel.tableList.length == 0) {  
499 - // isRecommend = true;  
500 - // }  
501 - for (t.TableList item  
502 - in _notebookDetailChangeModel.tableList) {  
503 - item.selected = true;  
504 - }  
505 - setState(() {});  
506 } 582 }
  583 + } else {
  584 + _notebookDetailChangeModel.isRecommend = false;
  585 + _notebookDetailChangeModel.tableList = temp['object'];
  586 + // if (_notebookDetailChangeModel.tableList.length == 0) {
  587 + // isRecommend = true;
  588 + // }
  589 + for (t.TableList item
  590 + in _notebookDetailChangeModel.tableList) {
  591 + item.selected = true;
  592 + }
  593 + setState(() {});
  594 + }
507 595
508 - // _notebookDetailChangeModel.notifyListeners();  
509 - },  
510 - child: Row(  
511 - children: [  
512 - Text('更多',  
513 - style: TextStyle(  
514 - color: MyColours.color_353535,  
515 - fontSize: ScreenUtil().setSp(26))),  
516 - HEmptyView(20),  
517 - Image.asset(  
518 - 'assets/arr_right_gray.png',  
519 - width: ScreenUtil().setWidth(12),  
520 - height: ScreenUtil().setWidth(22),  
521 - )  
522 - ],  
523 - ),  
524 - )  
525 - ],  
526 - ), 596 + // _notebookDetailChangeModel.notifyListeners();
  597 + },
  598 + child: Row(
  599 + mainAxisAlignment: MainAxisAlignment.spaceBetween,
  600 + crossAxisAlignment: CrossAxisAlignment.end,
  601 + children: [
  602 + Text(
  603 + '可订桌位',
  604 + style: TextStyle(
  605 + color: MyColours.color_353535,
  606 + fontSize: ScreenUtil().setSp(30)),
  607 + ),
  608 + Row(
  609 + children: [
  610 + Text('更多',
  611 + style: TextStyle(
  612 + color: MyColours.color_353535,
  613 + fontSize: ScreenUtil().setSp(26))),
  614 + HEmptyView(20),
  615 + Image.asset(
  616 + 'assets/arr_right_gray.png',
  617 + width: ScreenUtil().setWidth(12),
  618 + height: ScreenUtil().setWidth(22),
  619 + )
  620 + ],
  621 + ),
  622 + ],
  623 + )),
527 VEmptyView(32), 624 VEmptyView(32),
528 Align( 625 Align(
529 alignment: Alignment.centerRight, 626 alignment: Alignment.centerRight,
@@ -940,7 +1037,6 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -940,7 +1037,6 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
940 ddate_solt = '晚餐'; 1037 ddate_solt = '晚餐';
941 } 1038 }
942 } 1039 }
943 -  
944 List<dynamic> tableinfo = 1040 List<dynamic> tableinfo =
945 convert.jsonDecode(_model.row.tableinfo); 1041 convert.jsonDecode(_model.row.tableinfo);
946 print(tableinfo); 1042 print(tableinfo);
@@ -1026,7 +1122,7 @@ class _ButtonState extends State<CustomButton> { @@ -1026,7 +1122,7 @@ class _ButtonState extends State<CustomButton> {
1026 ? Container( 1122 ? Container(
1027 alignment: Alignment.center, 1123 alignment: Alignment.center,
1028 // color: Colors.red, 1124 // color: Colors.red,
1029 - width: ScreenUtil().setWidth(110), 1125 + width: ScreenUtil().setWidth(114),
1030 height: ScreenUtil().setWidth(50), 1126 height: ScreenUtil().setWidth(50),
1031 // padding: EdgeInsets.zero, 1127 // padding: EdgeInsets.zero,
1032 child: TextField( 1128 child: TextField(
@@ -28,6 +28,8 @@ class NotebookDetailChangeModel with ChangeNotifier { @@ -28,6 +28,8 @@ class NotebookDetailChangeModel with ChangeNotifier {
28 List<TableList> tableList = []; 28 List<TableList> tableList = [];
29 String isSetDate = '0'; 29 String isSetDate = '0';
30 List<TableList> recommendList = []; //推荐列表 30 List<TableList> recommendList = []; //推荐列表
  31 + bool isRecommend = false; //是否展示推荐
  32 + List oldTableList = [];
31 33
32 clearData() { 34 clearData() {
33 dateList = []; //日期选择 月-日 某天 35 dateList = []; //日期选择 月-日 某天
@@ -345,17 +347,17 @@ class NotebookDetailChangeModel with ChangeNotifier { @@ -345,17 +347,17 @@ class NotebookDetailChangeModel with ChangeNotifier {
345 } 347 }
346 348
347 ///根据商家ID 获取桌位信息列表： 1：散座 2：包间 默认：获取所有数据 349 ///根据商家ID 获取桌位信息列表： 1：散座 2：包间 默认：获取所有数据
348 - Future<List<TableListSunModel>> getNewTableList(BuildContext context) async {  
349 - String createtime = detailEntity.ddate.toString() + '000';  
350 - DateTime createTime =  
351 - DateTime.fromMillisecondsSinceEpoch(int.parse(createtime)); 350 + Future<List<TableList>> getNewTableList(BuildContext context, String ddate,
  351 + String ddate_solt, String pnum, List oldTableList) async {
  352 + DateTime createTime = DateTime.fromMillisecondsSinceEpoch(int.parse(ddate));
352 String rdate = DateUtil.formatDate(createTime, format: "yyyyMMdd"); 353 String rdate = DateUtil.formatDate(createTime, format: "yyyyMMdd");
353 UserModel userModel = Provider.of<UserModel>(context, listen: false); 354 UserModel userModel = Provider.of<UserModel>(context, listen: false);
354 Map<String, String> params = { 355 Map<String, String> params = {
355 "sid": userModel.user.sellerid, 356 "sid": userModel.user.sellerid,
356 "rid": detailEntity.id, 357 "rid": detailEntity.id,
357 "rdate": rdate, 358 "rdate": rdate,
358 - 'ddate_solt': detailEntity.ddate_solt 359 + 'ddate_solt': ddate_solt,
  360 + 'pnum': pnum
359 }; 361 };
360 BaseResp<dynamic> baseResp = await DioUtil() 362 BaseResp<dynamic> baseResp = await DioUtil()
361 .request<dynamic>(context, Method.get, HttpUrl.get_table_list, 363 .request<dynamic>(context, Method.get, HttpUrl.get_table_list,
@@ -364,11 +366,11 @@ class NotebookDetailChangeModel with ChangeNotifier { @@ -364,11 +366,11 @@ class NotebookDetailChangeModel with ChangeNotifier {
364 print(error.toString()); 366 print(error.toString());
365 }); 367 });
366 List<TableListSunModel> itemModelList; 368 List<TableListSunModel> itemModelList;
367 - if (baseResp == null) return itemModelList; 369 + if (baseResp == null) return tableList;
368 if (baseResp.code == Constant.status_success) { 370 if (baseResp.code == Constant.status_success) {
369 if (int.parse(baseResp.status) != Constant.status_success) { 371 if (int.parse(baseResp.status) != Constant.status_success) {
370 Utils.showToast(baseResp.msg ?? ""); 372 Utils.showToast(baseResp.msg ?? "");
371 - return itemModelList; 373 + return tableList;
372 } 374 }
373 if (baseResp.responseData['data'] != null) { 375 if (baseResp.responseData['data'] != null) {
374 itemModelList = TableListModel.fromJson(baseResp.responseData).data; 376 itemModelList = TableListModel.fromJson(baseResp.responseData).data;
@@ -376,6 +378,7 @@ class NotebookDetailChangeModel with ChangeNotifier { @@ -376,6 +378,7 @@ class NotebookDetailChangeModel with ChangeNotifier {
376 Utils.showToast(baseResp.msg ?? ""); 378 Utils.showToast(baseResp.msg ?? "");
377 } 379 }
378 tableList = []; 380 tableList = [];
  381 +
379 for (int i = 0; i < itemModelList.length; i++) { 382 for (int i = 0; i < itemModelList.length; i++) {
380 if (itemModelList[i].name == "推荐") { 383 if (itemModelList[i].name == "推荐") {
381 recommendList = itemModelList[i].list; 384 recommendList = itemModelList[i].list;
@@ -387,7 +390,7 @@ class NotebookDetailChangeModel with ChangeNotifier { @@ -387,7 +390,7 @@ class NotebookDetailChangeModel with ChangeNotifier {
387 itemModelList.remove(item); 390 itemModelList.remove(item);
388 } 391 }
389 for (var item in item.list) { 392 for (var item in item.list) {
390 - for (var table in detailEntity.tables) { 393 + for (var table in oldTableList) {
391 if (item.id == table.id) { 394 if (item.id == table.id) {
392 item.selected = true; 395 item.selected = true;
393 if (!tableList.contains(item)) { 396 if (!tableList.contains(item)) {
@@ -397,9 +400,70 @@ class NotebookDetailChangeModel with ChangeNotifier { @@ -397,9 +400,70 @@ class NotebookDetailChangeModel with ChangeNotifier {
397 } 400 }
398 } 401 }
399 } 402 }
  403 + // List usedTableList = []; //被占用的包间
  404 + // for (var itemOld in oldTableList) {
  405 + // if (tableList.length == 0) {
  406 + // usedTableList = oldTableList;
  407 + // } else {
  408 + // for (var item in tableList) {
  409 + // if (item.id != itemOld.id) {
  410 + // usedTableList.add(item);
  411 + // }
  412 + // }
  413 + // }
  414 + // }
  415 + List idold = [];
  416 + for (var itemOld in oldTableList) {
  417 + idold.add(itemOld.id);
  418 + }
  419 + List idnew = [];
  420 + for (var item in tableList) {
  421 + idnew.add(item.id);
  422 + }
  423 + for (var item in idnew) {
  424 + idold.remove(item);
  425 + }
  426 + print(idold); //被占用的桌子的id
  427 + if (idold.length > 0) {
  428 + String msg = '';
  429 + for (var item in oldTableList) {
  430 + if (idold.contains(item.id)) {
  431 + msg += '${item.name},';
  432 + }
  433 + }
  434 + if (msg.endsWith(',')) {
  435 + msg = msg.substring(0, msg.length - 1);
  436 + }
  437 + Utils.showToast('${msg}已被占用啦');
  438 + }
  439 +
  440 + // if (usedTableList.length > 0) {
  441 + // print(usedTableList);
  442 + // String msg = '';
  443 + // for (var item in usedTableList) {
  444 + // msg += '${item.name},';
  445 + // }
  446 + // if (msg.endsWith(',')) {
  447 + // msg = msg.substring(0, msg.length - 1);
  448 + // }
  449 + // Utils.showToast('${msg}已被占用啦');
  450 + // }
  451 +
  452 + // if(usedTableList.length > 0){
  453 + // for (TableList item in usedTableList) {
  454 + // item
  455 + // }
  456 + // }
  457 +
  458 + if (tableList.length == 0) {
  459 + // Utils.showToast('包间已经被预订');
  460 + isRecommend = true;
  461 + } else {
  462 + isRecommend = false;
  463 + }
400 print(tableList); 464 print(tableList);
401 notifyListeners(); 465 notifyListeners();
402 - return itemModelList; 466 + return tableList;
403 } 467 }
404 } 468 }
405 469
@@ -46,7 +46,9 @@ class TableItemState extends State<TableItem> { @@ -46,7 +46,9 @@ class TableItemState extends State<TableItem> {
46 }); 46 });
47 widget.onSelected(table); 47 widget.onSelected(table);
48 } else { 48 } else {
49 - if (table.sign == '5') { 49 + if (table.sign == '5' || table.sign == '1') {
  50 + // 1一般是商户端
  51 + // 5是用户端
50 //已预订状态 不是自己的不可以选择，是自己的可以选择 52 //已预订状态 不是自己的不可以选择，是自己的可以选择
51 //当前桌子的预订id 53 //当前桌子的预订id
52 String idNow = ''; 54 String idNow = '';