xt / Flutter-ReserveApp · Commits

Go to a project

Commit ee335a7b7bde02edbd64be621c7f6e42ba4419d0

Authored by wdn127929
1 parent d11ee546
build: skipped

bug修复

Inline Side-by-side
Showing 8 changed files with 587 additions and 553 deletions
@@ -548,7 +548,7 @@ @@ -548,7 +548,7 @@
548 CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements; 548 CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
549 CODE_SIGN_IDENTITY = "Apple Development"; 549 CODE_SIGN_IDENTITY = "Apple Development";
550 CODE_SIGN_STYLE = Automatic; 550 CODE_SIGN_STYLE = Automatic;
551 - CURRENT_PROJECT_VERSION = 52693; 551 + CURRENT_PROJECT_VERSION = 52695;
552 DEVELOPMENT_TEAM = 8J59HM8B82; 552 DEVELOPMENT_TEAM = 8J59HM8B82;
553 ENABLE_BITCODE = NO; 553 ENABLE_BITCODE = NO;
554 FLUTTER_BUILD_MODE = release; 554 FLUTTER_BUILD_MODE = release;
@@ -696,7 +696,7 @@ @@ -696,7 +696,7 @@
696 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements"; 696 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
697 CODE_SIGN_IDENTITY = "Apple Development"; 697 CODE_SIGN_IDENTITY = "Apple Development";
698 CODE_SIGN_STYLE = Automatic; 698 CODE_SIGN_STYLE = Automatic;
699 - CURRENT_PROJECT_VERSION = 52693; 699 + CURRENT_PROJECT_VERSION = 52695;
700 DEVELOPMENT_TEAM = 8J59HM8B82; 700 DEVELOPMENT_TEAM = 8J59HM8B82;
701 ENABLE_BITCODE = NO; 701 ENABLE_BITCODE = NO;
702 FLUTTER_BUILD_MODE = release; 702 FLUTTER_BUILD_MODE = release;
@@ -732,7 +732,7 @@ @@ -732,7 +732,7 @@
732 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 732 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
733 CODE_SIGN_IDENTITY = "Apple Development"; 733 CODE_SIGN_IDENTITY = "Apple Development";
734 CODE_SIGN_STYLE = Automatic; 734 CODE_SIGN_STYLE = Automatic;
735 - CURRENT_PROJECT_VERSION = 52693; 735 + CURRENT_PROJECT_VERSION = 52695;
736 DEVELOPMENT_TEAM = 8J59HM8B82; 736 DEVELOPMENT_TEAM = 8J59HM8B82;
737 ENABLE_BITCODE = NO; 737 ENABLE_BITCODE = NO;
738 FLUTTER_BUILD_MODE = release; 738 FLUTTER_BUILD_MODE = release;
@@ -23,13 +23,24 @@ NotebookDetail _$NotebookDetailFromJson(Map<String, dynamic> json) { @@ -23,13 +23,24 @@ NotebookDetail _$NotebookDetailFromJson(Map<String, dynamic> json) {
23 String servename; 23 String servename;
24 String serveuid; 24 String serveuid;
25 if (json['serve_name'] != null) { 25 if (json['serve_name'] != null) {
26 - servename = json['serve_name'];  
27 -  
28 - }  
29 -if (json['serve_uid'] != null) {  
30 -  
31 - serveuid = json['serve_uid']; 26 + if (json['serve_name'] is Map) {
  27 + servename = json['serve_name']['nick_name'];
  28 + serveuid = json['serve_name']['id'];
  29 + } else if (json['serve_name'] is String) {
  30 + servename = json['serve_name'];
  31 + if (json['serve_uid'] != null) {
  32 + serveuid = json['serve_uid'];
  33 + }
  34 + }
32 } 35 }
  36 +// if (json['serve_name'] != null) {
  37 + // servename = json['serve_name'];
  38 +
  39 +// }
  40 +// if (json['serve_uid'] != null) {
  41 +
  42 +// serveuid = json['serve_uid'];
  43 +// }
33 return NotebookDetail() 44 return NotebookDetail()
34 ..id = json['id'] as String 45 ..id = json['id'] as String
35 ..uid = json['uid'] as String 46 ..uid = json['uid'] as String
This diff could not be displayed because it is too large.
@@ -111,7 +111,7 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -111,7 +111,7 @@ class TableManagerPageState extends State<TableManagerPage> {
111 String ddateHm = '选填'; 111 String ddateHm = '选填';
112 int actualPnumIndex; 112 int actualPnumIndex;
113 int ddateIndex; 113 int ddateIndex;
114 - List<String> couponsCan = []; //优惠券弹框数据 114 + // List<String> couponsCan = []; //优惠券弹框数据
115 String youhui = '选择优惠'; 115 String youhui = '选择优惠';
116 int couponSelectIndex = 0; 116 int couponSelectIndex = 0;
117 CouponProvider couponProvider; 117 CouponProvider couponProvider;
@@ -121,6 +121,7 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -121,6 +121,7 @@ class TableManagerPageState extends State<TableManagerPage> {
121 121
122 String smsErro = ''; 122 String smsErro = '';
123 String showErro = ''; 123 String showErro = '';
  124 + // int
124 125
125 ScrollController _scrollCrl = ScrollController(); 126 ScrollController _scrollCrl = ScrollController();
126 final ItemPositionsListener itemPositionsListener = 127 final ItemPositionsListener itemPositionsListener =
@@ -148,45 +149,47 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -148,45 +149,47 @@ class TableManagerPageState extends State<TableManagerPage> {
148 String smsContent = ''; 149 String smsContent = '';
149 PersonnelProvider personnelProvider; 150 PersonnelProvider personnelProvider;
150 151
  152 + DateTime dateTime = DateTime.now();
  153 +
  154 + String dateText = ""; //当前显示日期时间
  155 + int currTimeIndex = 1; //当前选中时间段
  156 + String morning; //早市时间段
  157 + String noon; //午市时间段
  158 + String night; //晚市时间段
  159 + // UserModel userModel;
  160 +
  161 + // Map dailyMap = {}; // 早市对应半点钟，午市对应半点钟、晚市对应半点钟
  162 + bool swichState = false; //仅看空座
  163 + String selectDateStr = '';
  164 + String selectWeekAndLunarCalendar = '';
  165 + String doltStr = '';
  166 + DateTime dateTimeSelect;
  167 + int selectNumber = 0;
  168 +
151 @override 169 @override
152 void initState() { 170 void initState() {
153 // TODO: implement initState 171 // TODO: implement initState
154 super.initState(); 172 super.initState();
155 173
156 LogUtil.v("table_manager_page initState"); 174 LogUtil.v("table_manager_page initState");
157 - // for (int i = 1; i < 31; i++) {  
158 - // personNumList.add(i.toString());  
159 - // }  
160 - personNumList = Utils.getPersonNumList();  
161 175
162 - // personNumList.add('30以上'); 176 + if (App.sp.containsKey('user')) {
  177 + String s = App.sp.getString('user');
  178 + User _user = User.fromJson(json.decode(s));
  179 + morning = _user.morning.isEmpty ? "00:00-00:00" : _user.morning;
  180 + noon = _user.noon.isEmpty ? "00:00-00:00" : _user.noon;
  181 + night = _user.night.isEmpty ? "00:00-00:00" : _user.night;
  182 + }
  183 + initTimeTable();
  184 + personNumList = Utils.getPersonNumList();
163 185
164 WidgetsBinding.instance.addPostFrameCallback((_) { 186 WidgetsBinding.instance.addPostFrameCallback((_) {
165 - // tableManagerModel.pageStateOrReserve = PageState.Loading;  
166 - // tableManagerModel.initTimeTable(context);  
167 if (App.sp.containsKey('table_list')) { 187 if (App.sp.containsKey('table_list')) {
168 // //退出清空桌位数据 188 // //退出清空桌位数据
169 App.sp.remove('table_list'); 189 App.sp.remove('table_list');
170 } 190 }
171 191
172 - // getSpTableList();  
173 - UserModel userModel = Provider.of<UserModel>(context, listen: false);  
174 - tableManagerModel.dateTime = DateTime.now();  
175 - tableManagerModel.dateText =  
176 - tableManagerModel.returnDate(tableManagerModel.dateTime);  
177 - setState(() {});  
178 - tableManagerModel.dateTimeSelect = tableManagerModel.dateTime;  
179 - // tableManagerModel.notifyListeners;  
180 getUserAccountTypeById(showLoading: false); 192 getUserAccountTypeById(showLoading: false);
181 - // couponProvider.sendSMS = false;  
182 - // String tableSp = App.sp.getString('table_list_or_reserve');  
183 - // if (tableSp != null) {  
184 - // //有缓存数据  
185 - // // tableManagerModel.showLoading = true;  
186 - // // Loading.showLoading(context);  
187 -  
188 - // }  
189 -  
190 _myExtendedMaterialTextSelectionControls = 193 _myExtendedMaterialTextSelectionControls =
191 MyTextSelectionControls(callback: (value) { 194 MyTextSelectionControls(callback: (value) {
192 _baseIndoProvider.phoneController.value = TextEditingValue( 195 _baseIndoProvider.phoneController.value = TextEditingValue(
@@ -196,17 +199,10 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -196,17 +199,10 @@ class TableManagerPageState extends State<TableManagerPage> {
196 offset: value.toString().length))); 199 offset: value.toString().length)));
197 }); 200 });
198 _getSellerById(); 201 _getSellerById();
199 -  
200 - // _couponNetworkData(selfDismiss: true);  
201 -  
202 - // getDzSellerConf();  
203 - // _getRemark();  
204 -  
205 EventBus().on("refresh_tablemanager", (arg) { 202 EventBus().on("refresh_tablemanager", (arg) {
206 //订座-完成预订 刷新管理桌位 203 //订座-完成预订 刷新管理桌位
207 tableManagerModel.getTableListOrReserve( 204 tableManagerModel.getTableListOrReserve(
208 - context,  
209 - ); 205 + context, currTimeIndex, dateTime, selectNumber);
210 print(tableManagerModel); 206 print(tableManagerModel);
211 }); 207 });
212 EventBus().on("refresh_tablePhoto", (arg) { 208 EventBus().on("refresh_tablePhoto", (arg) {
@@ -234,6 +230,155 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -234,6 +230,155 @@ class TableManagerPageState extends State<TableManagerPage> {
234 }); 230 });
235 } 231 }
236 232
  233 + //初始化时间
  234 + initTimeTable() {
  235 + dateTime = DateTime.now();
  236 + dateText = returnDate(dateTime);
  237 + dateTimeSelect = dateTime;
  238 +
  239 + if (dateTime.isBefore(DateTime.parse(dateTime.year.toString() +
  240 + "-" +
  241 + Utils.addZeroNumber(dateTime.month) +
  242 + "-" +
  243 + Utils.addZeroNumber(dateTime.day) +
  244 + " " +
  245 + morning.split("-")[1] +
  246 + ":00"))) {
  247 + //未过早市
  248 + currTimeIndex = 1;
  249 + } else if (dateTime.isAfter(DateTime.parse(dateTime.year.toString() +
  250 + "-" +
  251 + Utils.addZeroNumber(dateTime.month) +
  252 + "-" +
  253 + Utils.addZeroNumber(dateTime.day) +
  254 + " " +
  255 + morning.split("-")[1] +
  256 + ":00")) &&
  257 + dateTime.isBefore(DateTime.parse(dateTime.year.toString() +
  258 + "-" +
  259 + Utils.addZeroNumber(dateTime.month) +
  260 + "-" +
  261 + Utils.addZeroNumber(dateTime.day) +
  262 + " " +
  263 + noon.split("-")[1] +
  264 + ":00"))) {
  265 + //过了早市，未过午市
  266 + currTimeIndex = 2;
  267 + } else if (dateTime.isAfter(DateTime.parse(dateTime.year.toString() +
  268 + "-" +
  269 + Utils.addZeroNumber(dateTime.month) +
  270 + "-" +
  271 + Utils.addZeroNumber(dateTime.day) +
  272 + " " +
  273 + noon.split("-")[1] +
  274 + ":00")) &&
  275 + dateTime.isBefore(DateTime.parse(dateTime.year.toString() +
  276 + "-" +
  277 + Utils.addZeroNumber(dateTime.month) +
  278 + "-" +
  279 + Utils.addZeroNumber(dateTime.day) +
  280 + " " +
  281 + night.split("-")[1] +
  282 + ":00"))) {
  283 + //过了午市，未过晚市
  284 + currTimeIndex = 3;
  285 + } else {
  286 + //过了晚市
  287 + currTimeIndex = 3;
  288 + }
  289 +
  290 + selectDateStr = returnDayDateStr(dateTime);
  291 + selectWeekAndLunarCalendar = returnWeekAndLunarCalendar(dateTime, context);
  292 + }
  293 +
  294 + String returnWeekAndLunarCalendar(DateTime day, BuildContext context) {
  295 + String date = "星期${Utils.formatWeekDayNum(day.weekday)} ";
  296 + date += Utils.lunarCalendarHolidays(day);
  297 + _getDoltStr(context);
  298 + return date;
  299 + }
  300 +
  301 + String returnDayDateStr(DateTime day) {
  302 + String date = '';
  303 + DateTime dateNow = DateTime.now();
  304 + String ymd = "${day.year}年" +
  305 + Utils.addZeroNumber(day.month) +
  306 + "月" +
  307 + Utils.addZeroNumber(day.day) +
  308 + "日";
  309 +
  310 + if (Utils.isOneDay(day, dateNow)) {
  311 + date += "今天 ";
  312 + } else if (Utils.isOneDay(day, dateNow.add(Duration(days: 1)))) {
  313 + date += "明天 ";
  314 + } else if (Utils.isOneDay(day, dateNow.add(Duration(days: 2)))) {
  315 + date += "后天 ";
  316 + }
  317 + date += ymd;
  318 + // date += " 星期${Utils.formatWeekDayNum(day.weekday)}";
  319 + return date;
  320 + }
  321 +
  322 + //生成日期文本
  323 + createDateText(BuildContext context, DateTime day) {
  324 + if (Utils.isOneDay(day, dateTime)) return; //日期没变
  325 + dateTimeSelect = day;
  326 + dateText = returnDate(day);
  327 + selectDateStr = returnDayDateStr(day);
  328 + selectWeekAndLunarCalendar = returnWeekAndLunarCalendar(day, context);
  329 + dateTime = day;
  330 + // getReserveList(context, needLoading: false, showloading: true);
  331 + }
  332 +
  333 + //生成日期文本
  334 + createDateText1(BuildContext context, DateTime day) {
  335 + if (Utils.isOneDay(day, dateTime)) return; //日期没变
  336 + dateTimeSelect = day;
  337 + dateText = returnDate(day);
  338 + selectDateStr = returnDayDateStr(day);
  339 + selectWeekAndLunarCalendar = returnWeekAndLunarCalendar(day, context);
  340 + dateTime = day;
  341 + // getReserveList(context, needLoading: false, showloading: true);
  342 + }
  343 +
  344 + String _returnDayDateWeek(DateTime day) {
  345 + String date = '';
  346 + DateTime dateNow = DateTime.now();
  347 + String ymd = "${day.year}-" +
  348 + Utils.addZeroNumber(day.month) +
  349 + "-" +
  350 + Utils.addZeroNumber(day.day);
  351 +
  352 + if (Utils.isOneDay(day, dateNow)) {
  353 + date += "今天 ";
  354 + } else if (Utils.isOneDay(day, dateNow.add(Duration(days: 1)))) {
  355 + date += "明天 ";
  356 + } else if (Utils.isOneDay(day, dateNow.add(Duration(days: 2)))) {
  357 + date += "后天 ";
  358 + }
  359 + date += ymd;
  360 + date += " 星期${Utils.formatWeekDayNum(day.weekday)}";
  361 + return date;
  362 + }
  363 +
  364 + returnDate(DateTime day) {
  365 + // String time = Utils.lunarCalendarHolidays(day);
  366 + String date = _returnDayDateWeek(day);
  367 + // date += ' ${time}';
  368 + return date;
  369 + }
  370 +
  371 + _getDoltStr(BuildContext context) {
  372 + if (currTimeIndex == 1) {
  373 + doltStr = '早餐';
  374 + } else if (currTimeIndex == 2) {
  375 + doltStr = '午餐';
  376 + } else if (currTimeIndex == 3) {
  377 + doltStr = '晚餐';
  378 + }
  379 + // _initTimeDdate(currTimeIndex, context);
  380 + }
  381 +
237 List<TableListReseveSunModel> getSpTableList() { 382 List<TableListReseveSunModel> getSpTableList() {
238 String tableList = App.sp.getString('table_list_or_reserve'); 383 String tableList = App.sp.getString('table_list_or_reserve');
239 if (tableList == null) { 384 if (tableList == null) {
@@ -272,8 +417,8 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -272,8 +417,8 @@ class TableManagerPageState extends State<TableManagerPage> {
272 _getSellerById() async { 417 _getSellerById() async {
273 StoreBaseIndoProvider storeBaseIndoProvider = 418 StoreBaseIndoProvider storeBaseIndoProvider =
274 Provider.of<StoreBaseIndoProvider>(context, listen: false); 419 Provider.of<StoreBaseIndoProvider>(context, listen: false);
275 - GetSellerInfoSunModel sellerInfoSunModel =  
276 - await storeBaseIndoProvider.getSellerById(context, showLoading: false); 420 + GetSellerInfoSunModel sellerInfoSunModel = await storeBaseIndoProvider
  421 + .getSellerById(context, showLoading: false, selfDismiss: true);
277 if (sellerInfoSunModel != null) { 422 if (sellerInfoSunModel != null) {
278 if (App.sp.containsKey('user')) { 423 if (App.sp.containsKey('user')) {
279 String s = App.sp.getString('user'); 424 String s = App.sp.getString('user');
@@ -289,8 +434,22 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -289,8 +434,22 @@ class TableManagerPageState extends State<TableManagerPage> {
289 '${sellerInfoSunModel.data.mapAddress}${sellerInfoSunModel.data.realAddress ?? ''}'; 434 '${sellerInfoSunModel.data.mapAddress}${sellerInfoSunModel.data.realAddress ?? ''}';
290 await UserModel().saveUserInfo(_user); 435 await UserModel().saveUserInfo(_user);
291 } 436 }
  437 + UserModel userModel = Provider.of<UserModel>(context, listen: false);
  438 + morning = userModel.user.morning.isEmpty
  439 + ? "00:00-00:00"
  440 + : userModel.user.morning;
  441 + noon = userModel.user.noon.isEmpty ? "00:00-00:00" : userModel.user.noon;
  442 + night =
  443 + userModel.user.night.isEmpty ? "00:00-00:00" : userModel.user.night;
  444 + setState(() {});
  445 + bool showLoading = true;
  446 + if (tableManagerModel.pageStateOrReserve == PageState.Loading) {
  447 + showLoading = false;
  448 + }
  449 + tableManagerModel.getTableListOrReserve(
  450 + context, currTimeIndex, dateTime, selectNumber,
  451 + showLoading: showLoading);
292 } 452 }
293 - tableManagerModel.initTimeTable(context);  
294 } 453 }
295 454
296 // ///获取备注信息 455 // ///获取备注信息
@@ -421,65 +580,64 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -421,65 +580,64 @@ class TableManagerPageState extends State<TableManagerPage> {
421 } 580 }
422 581
423 ///消费券 582 ///消费券
424 - _couponNetworkData(  
425 - {bool isShowLoading = true, bool selfDismiss = false}) async {  
426 - couponSelectIndex = 0;  
427 - Map<String, String> params = {  
428 - "uid": Provider.of<UserModel>(context, listen: false).user.openid,  
429 - 'status': '1'  
430 - };  
431 - await couponProvider.getCustomerSelectActivityNew(context, params,  
432 - isShowLoading: isShowLoading, selfDismiss: selfDismiss);  
433 - //此人已经新建好券  
434 - if (couponProvider.couponListSelect.length > 0) {  
435 - // couponProvider.initCouponSelect(context);  
436 - couponsCan = [];  
437 - List<CouponSunModel> temp = [];  
438 - for (int i = 0; i < couponProvider.couponListSelect.length; i++) {  
439 - if (couponProvider.couponListSelect[i].isOpenBool) {  
440 -// 店铺优惠券  
441 - if (couponProvider.couponListSelect[i].isType == '1') {  
442 - if (couponProvider.couponListSelect[i].uidList != null) {  
443 - List<String> listuids =  
444 - couponProvider.couponListSelect[i].uidList.split(',');  
445 - if (listuids.contains(  
446 - Provider.of<UserModel>(context, listen: false).user.openid))  
447 - couponsCan.add(couponProvider.couponListSelect[i].aname);  
448 - temp.add(couponProvider.couponListSelect[i]);  
449 - }  
450 - } else {  
451 - //我的优惠券  
452 - couponsCan.add(couponProvider.couponListSelect[i].aname);  
453 - temp.add(couponProvider.couponListSelect[i]);  
454 - }  
455 - }  
456 - }  
457 - couponProvider.couponListSelect = temp;  
458 - //获取绑定的优惠券  
459 - // _getActivityByRid();  
460 -  
461 - // if (couponProvider.coupons.length == 0) {  
462 - // setState(() {  
463 - // couponHeight = 0.0;  
464 - // });  
465 - // } else {  
466 - // setState(() {  
467 - // couponHeight = 140.0;  
468 - // });  
469 - // }  
470 - } else {  
471 - //没有新建的优惠券  
472 - // setState(() {  
473 - // couponHeight = 0.0;  
474 - // });  
475 - }  
476 - } 583 +// _couponNetworkData(
  584 +// {bool isShowLoading = true, bool selfDismiss = false}) async {
  585 +// couponSelectIndex = 0;
  586 +// Map<String, String> params = {
  587 +// "uid": Provider.of<UserModel>(context, listen: false).user.openid,
  588 +// 'status': '1'
  589 +// };
  590 +// await couponProvider.getCustomerSelectActivityNew(context, params,
  591 +// isShowLoading: isShowLoading, selfDismiss: selfDismiss);
  592 +// //此人已经新建好券
  593 +// if (couponProvider.couponListSelect.length > 0) {
  594 +// // couponProvider.initCouponSelect(context);
  595 +// couponsCan = [];
  596 +// List<CouponSunModel> temp = [];
  597 +// for (int i = 0; i < couponProvider.couponListSelect.length; i++) {
  598 +// if (couponProvider.couponListSelect[i].isOpenBool) {
  599 +// // 店铺优惠券
  600 +// if (couponProvider.couponListSelect[i].isType == '1') {
  601 +// if (couponProvider.couponListSelect[i].uidList != null) {
  602 +// List<String> listuids =
  603 +// couponProvider.couponListSelect[i].uidList.split(',');
  604 +// if (listuids.contains(
  605 +// Provider.of<UserModel>(context, listen: false).user.openid))
  606 +// couponsCan.add(couponProvider.couponListSelect[i].aname);
  607 +// temp.add(couponProvider.couponListSelect[i]);
  608 +// }
  609 +// } else {
  610 +// //我的优惠券
  611 +// couponsCan.add(couponProvider.couponListSelect[i].aname);
  612 +// temp.add(couponProvider.couponListSelect[i]);
  613 +// }
  614 +// }
  615 +// }
  616 +// couponProvider.couponListSelect = temp;
  617 +// //获取绑定的优惠券
  618 +// // _getActivityByRid();
  619 +
  620 +// // if (couponProvider.coupons.length == 0) {
  621 +// // setState(() {
  622 +// // couponHeight = 0.0;
  623 +// // });
  624 +// // } else {
  625 +// // setState(() {
  626 +// // couponHeight = 140.0;
  627 +// // });
  628 +// // }
  629 +// } else {
  630 +// //没有新建的优惠券
  631 +// // setState(() {
  632 +// // couponHeight = 0.0;
  633 +// // });
  634 +// }
  635 +// }
477 636
478 ///刷新图片显示 637 ///刷新图片显示
479 _refreshTablePhoto() async { 638 _refreshTablePhoto() async {
480 await tableManagerModel.getTableListOrReserve( 639 await tableManagerModel.getTableListOrReserve(
481 - context,  
482 - ); 640 + context, currTimeIndex, dateTime, selectNumber);
483 tableManagerModel.notifyListeners(); 641 tableManagerModel.notifyListeners();
484 } 642 }
485 643
@@ -2043,14 +2201,15 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -2043,14 +2201,15 @@ class TableManagerPageState extends State<TableManagerPage> {
2043 2201
2044 _onlyReserve() async { 2202 _onlyReserve() async {
2045 bool isShow = true; //是否需要弹窗 “预订失败!” 2203 bool isShow = true; //是否需要弹窗 “预订失败!”
2046 - SunReserveInfoModel _model =  
2047 - await tableManagerModel.setReserveInfoOrReseve(context, (v) { 2204 + SunReserveInfoModel _model = await tableManagerModel
  2205 + .setReserveInfoOrReseve(context, (v) {
2048 if (v) { 2206 if (v) {
2049 isShow = true; 2207 isShow = true;
2050 } else { 2208 } else {
2051 isShow = false; 2209 isShow = false;
2052 } 2210 }
2053 - }, needKeep: true, guest: widget.guest); 2211 + }, dateTime, currTimeIndex, morning, noon, night,
  2212 + needKeep: true, guest: widget.guest);
2054 if (_model != null && 2213 if (_model != null &&
2055 ObjectUtil.isNotEmpty(_model.row) && 2214 ObjectUtil.isNotEmpty(_model.row) &&
2056 ObjectUtil.isNotEmpty(_model.row.id)) { 2215 ObjectUtil.isNotEmpty(_model.row.id)) {
@@ -2185,9 +2344,7 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -2185,9 +2344,7 @@ class TableManagerPageState extends State<TableManagerPage> {
2185 child: Column( 2344 child: Column(
2186 children: [ 2345 children: [
2187 Text( 2346 Text(
2188 - tableManagerModel.selectDateStr +  
2189 - ' ' +  
2190 - tableManagerModel.doltStr, 2347 + selectDateStr + ' ' + doltStr,
2191 style: TextStyle( 2348 style: TextStyle(
2192 color: MyColours.color_515151, 2349 color: MyColours.color_515151,
2193 fontSize: ScreenUtil().setSp(28), 2350 fontSize: ScreenUtil().setSp(28),
@@ -2195,7 +2352,7 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -2195,7 +2352,7 @@ class TableManagerPageState extends State<TableManagerPage> {
2195 ), 2352 ),
2196 VEmptyView(8), 2353 VEmptyView(8),
2197 Text( 2354 Text(
2198 - tableManagerModel.selectWeekAndLunarCalendar, 2355 + selectWeekAndLunarCalendar,
2199 style: TextStyle( 2356 style: TextStyle(
2200 color: MyColours.color_999999, 2357 color: MyColours.color_999999,
2201 fontSize: ScreenUtil().setSp(20)), 2358 fontSize: ScreenUtil().setSp(20)),
@@ -2400,14 +2557,15 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -2400,14 +2557,15 @@ class TableManagerPageState extends State<TableManagerPage> {
2400 2557
2401 _wechatReserve(bool isWechat) async { 2558 _wechatReserve(bool isWechat) async {
2402 bool isShow = true; //是否需要弹窗 “预订失败!” 2559 bool isShow = true; //是否需要弹窗 “预订失败!”
2403 - SunReserveInfoModel _model =  
2404 - await tableManagerModel.setReserveInfoOrReseve(context, (v) { 2560 + SunReserveInfoModel _model = await tableManagerModel
  2561 + .setReserveInfoOrReseve(context, (v) {
2405 if (v) { 2562 if (v) {
2406 isShow = true; 2563 isShow = true;
2407 } else { 2564 } else {
2408 isShow = false; 2565 isShow = false;
2409 } 2566 }
2410 - }, needKeep: true, guest: widget.guest); 2567 + }, dateTime, currTimeIndex, morning, noon, night,
  2568 + needKeep: true, guest: widget.guest);
2411 if (_model != null && 2569 if (_model != null &&
2412 ObjectUtil.isNotEmpty(_model.row) && 2570 ObjectUtil.isNotEmpty(_model.row) &&
2413 ObjectUtil.isNotEmpty(_model.row.id)) { 2571 ObjectUtil.isNotEmpty(_model.row.id)) {
@@ -3210,7 +3368,7 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -3210,7 +3368,7 @@ class TableManagerPageState extends State<TableManagerPage> {
3210 } else { 3368 } else {
3211 isShow = false; 3369 isShow = false;
3212 } 3370 }
3213 - }, 3371 + }, dateTime, currTimeIndex, morning, noon, night,
3214 needKeep: true, 3372 needKeep: true,
3215 pnum: pnum, 3373 pnum: pnum,
3216 cusdem: cusdem, 3374 cusdem: cusdem,
@@ -3463,11 +3621,11 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -3463,11 +3621,11 @@ class TableManagerPageState extends State<TableManagerPage> {
3463 _clickMorAndNoonAndNig(BuildContext context) async { 3621 _clickMorAndNoonAndNig(BuildContext context) async {
3464 ddateIndex = null; 3622 ddateIndex = null;
3465 ddateHm = '选填'; 3623 ddateHm = '选填';
3466 - tableManagerModel.selectDateStr =  
3467 - tableManagerModel.returnDayDateStr(tableManagerModel.dateTimeSelect);  
3468 - tableManagerModel.selectWeekAndLunarCalendar = tableManagerModel  
3469 - .returnWeekAndLunarCalendar(tableManagerModel.dateTimeSelect, context);  
3470 - bool success = await tableManagerModel.getTableListOrReserve(context, 3624 + selectDateStr = returnDayDateStr(dateTimeSelect);
  3625 + selectWeekAndLunarCalendar =
  3626 + returnWeekAndLunarCalendar(dateTimeSelect, context);
  3627 + bool success = await tableManagerModel.getTableListOrReserve(
  3628 + context, currTimeIndex, dateTime, selectNumber,
3471 showLoading: true, selfDismiss: false); 3629 showLoading: true, selfDismiss: false);
3472 } 3630 }
3473 3631
@@ -3497,13 +3655,13 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -3497,13 +3655,13 @@ class TableManagerPageState extends State<TableManagerPage> {
3497 int sum = 3; 3655 int sum = 3;
3498 int hide = 0; 3656 int hide = 0;
3499 int btnNum = 0; 3657 int btnNum = 0;
3500 - if (tableManagerModel.morning == "00:00-00:00") { 3658 + if (morning == "00:00-00:00") {
3501 hide++; 3659 hide++;
3502 } 3660 }
3503 - if (tableManagerModel.noon == "00:00-00:00") { 3661 + if (noon == "00:00-00:00") {
3504 hide++; 3662 hide++;
3505 } 3663 }
3506 - if (tableManagerModel.night == "00:00-00:00") { 3664 + if (night == "00:00-00:00") {
3507 hide++; 3665 hide++;
3508 } 3666 }
3509 btnNum = sum - hide; 3667 btnNum = sum - hide;
@@ -3519,14 +3677,16 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -3519,14 +3677,16 @@ class TableManagerPageState extends State<TableManagerPage> {
3519 Expanded( 3677 Expanded(
3520 child: GestureDetector( 3678 child: GestureDetector(
3521 onTap: () { 3679 onTap: () {
3522 - DialogUtil.showCalendarDialog(  
3523 - context, tableManagerModel.dateTime) 3680 + DialogUtil.showCalendarDialog(context, dateTime)
3524 .then((day) async { 3681 .then((day) async {
3525 if (day != null) { 3682 if (day != null) {
3526 - tableManagerModel.createDateText1(context, day); 3683 + createDateText1(context, day);
3527 bool success = 3684 bool success =
3528 await tableManagerModel.getTableListOrReserve( 3685 await tableManagerModel.getTableListOrReserve(
3529 context, 3686 context,
  3687 + currTimeIndex,
  3688 + dateTime,
  3689 + selectNumber,
3530 showLoading: true, 3690 showLoading: true,
3531 ); 3691 );
3532 } 3692 }
@@ -3546,7 +3706,7 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -3546,7 +3706,7 @@ class TableManagerPageState extends State<TableManagerPage> {
3546 children: [ 3706 children: [
3547 Expanded( 3707 Expanded(
3548 child: Text( 3708 child: Text(
3549 - tableManagerModel.dateText, 3709 + dateText,
3550 textAlign: TextAlign.center, 3710 textAlign: TextAlign.center,
3551 style: TextStyle( 3711 style: TextStyle(
3552 color: MyColours.color_ffffff, 3712 color: MyColours.color_ffffff,
@@ -3570,8 +3730,7 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -3570,8 +3730,7 @@ class TableManagerPageState extends State<TableManagerPage> {
3570 HEmptyView(20), 3730 HEmptyView(20),
3571 Container( 3731 Container(
3572 width: btnNum == 3 && 3732 width: btnNum == 3 &&
3573 - (tableManagerModel.currTimeIndex == 3 ||  
3574 - tableManagerModel.currTimeIndex == 1) 3733 + (currTimeIndex == 3 || currTimeIndex == 1)
3575 ? ScreenUtil().setWidth(300) + 3734 ? ScreenUtil().setWidth(300) +
3576 ScreenUtil().setWidth(4) 3735 ScreenUtil().setWidth(4)
3577 : ScreenUtil().setWidth(300), 3736 : ScreenUtil().setWidth(300),
@@ -3587,33 +3746,26 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -3587,33 +3746,26 @@ class TableManagerPageState extends State<TableManagerPage> {
3587 children: <Widget>[ 3746 children: <Widget>[
3588 Offstage( 3747 Offstage(
3589 offstage: 3748 offstage:
3590 - tableManagerModel.morning == "00:00-00:00"  
3591 - ? true  
3592 - : false, 3749 + morning == "00:00-00:00" ? true : false,
3593 child: CommonButtonFlat( 3750 child: CommonButtonFlat(
3594 content: "早餐", 3751 content: "早餐",
3595 - state: tableManagerModel.currTimeIndex == 1  
3596 - ? 1  
3597 - : 0, 3752 + state: currTimeIndex == 1 ? 1 : 0,
3598 fontSize: 28, 3753 fontSize: 28,
3599 - right:  
3600 - tableManagerModel.noon == "00:00-00:00" &&  
3601 - tableManagerModel.night ==  
3602 - "00:00-00:00"  
3603 - ? true  
3604 - : false, 3754 + right: noon == "00:00-00:00" &&
  3755 + night == "00:00-00:00"
  3756 + ? true
  3757 + : false,
3605 width: ScreenUtil().setWidth(300) / btnNum, 3758 width: ScreenUtil().setWidth(300) / btnNum,
3606 onPress: () { 3759 onPress: () {
3607 - if (tableManagerModel.currTimeIndex == 1)  
3608 - return; 3760 + if (currTimeIndex == 1) return;
3609 setState(() { 3761 setState(() {
3610 - tableManagerModel.currTimeIndex = 1; 3762 + currTimeIndex = 1;
3611 }); 3763 });
3612 3764
3613 _clickMorAndNoonAndNig(context); 3765 _clickMorAndNoonAndNig(context);
3614 }, 3766 },
3615 )), 3767 )),
3616 - btnNum == 3 && tableManagerModel.currTimeIndex == 3 3768 + btnNum == 3 && currTimeIndex == 3
3617 ? MyDivider( 3769 ? MyDivider(
3618 ScreenUtil().setWidth(4), 3770 ScreenUtil().setWidth(4),
3619 ScreenUtil().setWidth(46), 3771 ScreenUtil().setWidth(46),
@@ -3621,35 +3773,23 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -3621,35 +3773,23 @@ class TableManagerPageState extends State<TableManagerPage> {
3621 ) 3773 )
3622 : SizedBox(), 3774 : SizedBox(),
3623 Offstage( 3775 Offstage(
3624 - offstage:  
3625 - tableManagerModel.noon == "00:00-00:00"  
3626 - ? true  
3627 - : false, 3776 + offstage: noon == "00:00-00:00" ? true : false,
3628 child: CommonButtonFlat( 3777 child: CommonButtonFlat(
3629 content: "午餐", 3778 content: "午餐",
3630 - state: tableManagerModel.currTimeIndex == 2  
3631 - ? 1  
3632 - : 0, 3779 + state: currTimeIndex == 2 ? 1 : 0,
3633 fontSize: 28, 3780 fontSize: 28,
3634 width: ScreenUtil().setWidth(300) / btnNum, 3781 width: ScreenUtil().setWidth(300) / btnNum,
3635 - left:  
3636 - tableManagerModel.morning == "00:00-00:00"  
3637 - ? true  
3638 - : false,  
3639 - right:  
3640 - tableManagerModel.night == "00:00-00:00"  
3641 - ? true  
3642 - : false, 3782 + left: morning == "00:00-00:00" ? true : false,
  3783 + right: night == "00:00-00:00" ? true : false,
3643 onPress: () { 3784 onPress: () {
3644 - if (tableManagerModel.currTimeIndex == 2)  
3645 - return; 3785 + if (currTimeIndex == 2) return;
3646 setState(() { 3786 setState(() {
3647 - tableManagerModel.currTimeIndex = 2; 3787 + currTimeIndex = 2;
3648 }); 3788 });
3649 _clickMorAndNoonAndNig(context); 3789 _clickMorAndNoonAndNig(context);
3650 }, 3790 },
3651 )), 3791 )),
3652 - btnNum == 3 && tableManagerModel.currTimeIndex == 1 3792 + btnNum == 3 && currTimeIndex == 1
3653 ? MyDivider( 3793 ? MyDivider(
3654 ScreenUtil().setWidth(4), 3794 ScreenUtil().setWidth(4),
3655 ScreenUtil().setWidth(46), 3795 ScreenUtil().setWidth(46),
@@ -3657,27 +3797,21 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -3657,27 +3797,21 @@ class TableManagerPageState extends State<TableManagerPage> {
3657 ) 3797 )
3658 : SizedBox(), 3798 : SizedBox(),
3659 Offstage( 3799 Offstage(
3660 - offstage: tableManagerModel.night == "00:00-00:00"  
3661 - ? true  
3662 - : false, 3800 + offstage: night == "00:00-00:00" ? true : false,
3663 child: Container( 3801 child: Container(
3664 child: CommonButtonFlat( 3802 child: CommonButtonFlat(
3665 content: "晚餐", 3803 content: "晚餐",
3666 - left: tableManagerModel.morning ==  
3667 - "00:00-00:00" &&  
3668 - tableManagerModel.noon == "00:00-00:00" 3804 + left: morning == "00:00-00:00" &&
  3805 + noon == "00:00-00:00"
3669 ? true 3806 ? true
3670 : false, 3807 : false,
3671 - state: tableManagerModel.currTimeIndex == 3  
3672 - ? 1  
3673 - : 0, 3808 + state: currTimeIndex == 3 ? 1 : 0,
3674 fontSize: 28, 3809 fontSize: 28,
3675 width: ScreenUtil().setWidth(300) / btnNum, 3810 width: ScreenUtil().setWidth(300) / btnNum,
3676 onPress: () { 3811 onPress: () {
3677 - if (tableManagerModel.currTimeIndex == 3)  
3678 - return; 3812 + if (currTimeIndex == 3) return;
3679 setState(() { 3813 setState(() {
3680 - tableManagerModel.currTimeIndex = 3; 3814 + currTimeIndex = 3;
3681 }); 3815 });
3682 3816
3683 _clickMorAndNoonAndNig(context); 3817 _clickMorAndNoonAndNig(context);
@@ -3697,7 +3831,8 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -3697,7 +3831,8 @@ class TableManagerPageState extends State<TableManagerPage> {
3697 child: ExceptionPage( 3831 child: ExceptionPage(
3698 pageState: model.pageStateOrReserve, 3832 pageState: model.pageStateOrReserve,
3699 callback: () { 3833 callback: () {
3700 - tableManagerModel.getTableListOrReserve(context, 3834 + tableManagerModel.getTableListOrReserve(
  3835 + context, currTimeIndex, dateTime, selectNumber,
3701 showLoading: true); 3836 showLoading: true);
3702 }, 3837 },
3703 emptyMsg: "暂时没有桌位哦", 3838 emptyMsg: "暂时没有桌位哦",
@@ -3736,8 +3871,7 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -3736,8 +3871,7 @@ class TableManagerPageState extends State<TableManagerPage> {
3736 setState(() { 3871 setState(() {
3737 // isSelected = false; 3872 // isSelected = false;
3738 area.select = true; 3873 area.select = true;
3739 - tableManagerModel.selectNumber =  
3740 - index; 3874 + selectNumber = index;
3741 // tableManagerModel.currentArea = 3875 // tableManagerModel.currentArea =
3742 // tableManagerModel 3876 // tableManagerModel
3743 // .areas[index - 1].name; 3877 // .areas[index - 1].name;
@@ -3756,9 +3890,9 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -3756,9 +3890,9 @@ class TableManagerPageState extends State<TableManagerPage> {
3756 InkWell( 3890 InkWell(
3757 onTap: () { 3891 onTap: () {
3758 setState(() { 3892 setState(() {
3759 - model.swichState = !model.swichState; 3893 + swichState = !swichState;
3760 }); 3894 });
3761 - if (model.swichState) { 3895 + if (swichState) {
3762 //把没有预订和宴会的桌子筛选出来显示 3896 //把没有预订和宴会的桌子筛选出来显示
3763 3897
3764 model.tablesOrReserveData 3898 model.tablesOrReserveData
@@ -3823,7 +3957,7 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -3823,7 +3957,7 @@ class TableManagerPageState extends State<TableManagerPage> {
3823 // color: MyColours.color_9C9C9C), 3957 // color: MyColours.color_9C9C9C),
3824 HEmptyView(30), 3958 HEmptyView(30),
3825 Image.asset( 3959 Image.asset(
3826 - model.swichState 3960 + swichState
3827 ? Utils.getImgPath( 3961 ? Utils.getImgPath(
3828 'f_swich_on') 3962 'f_swich_on')
3829 : Utils.getImgPath( 3963 : Utils.getImgPath(
@@ -3847,7 +3981,12 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -3847,7 +3981,12 @@ class TableManagerPageState extends State<TableManagerPage> {
3847 ], 3981 ],
3848 ), 3982 ),
3849 ), 3983 ),
3850 - if (tableManagerModel.selectNumber != null) 3984 + if (tableManagerModel.tablesOrReserveDataShow !=
  3985 + null &&
  3986 + tableManagerModel
  3987 + .tablesOrReserveDataShow.length >
  3988 + 0 &&
  3989 + selectNumber != null)
3851 Expanded( 3990 Expanded(
3852 // flex: 2, 3991 // flex: 2,
3853 child: Container( 3992 child: Container(
@@ -3855,8 +3994,7 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -3855,8 +3994,7 @@ class TableManagerPageState extends State<TableManagerPage> {
3855 minHeight: 3994 minHeight:
3856 ScreenUtil().setWidth(100)), 3995 ScreenUtil().setWidth(100)),
3857 color: Color.fromRGBO(249, 249, 249, 1), 3996 color: Color.fromRGBO(249, 249, 249, 1),
3858 - child: item(  
3859 - tableManagerModel.selectNumber))), 3997 + child: item(selectNumber))),
3860 tableManagerModel.selectTablesOrReserve.length > 0 3998 tableManagerModel.selectTablesOrReserve.length > 0
3861 ? 3999 ?
3862 // wechatNotification 4000 // wechatNotification
@@ -30,14 +30,14 @@ class StoreBaseIndoProvider with ChangeNotifier { @@ -30,14 +30,14 @@ class StoreBaseIndoProvider with ChangeNotifier {
30 String _dataKey = "data"; 30 String _dataKey = "data";
31 31
32 ///根据商家ID获取商家信息 32 ///根据商家ID获取商家信息
33 - Future<GetSellerInfoSunModel> getSellerById(BuildContext context,{bool showLoading = true}) async { 33 + Future<GetSellerInfoSunModel> getSellerById(BuildContext context,{bool showLoading = true, bool selfDismiss = false,}) async {
34 Map<String, String> params = { 34 Map<String, String> params = {
35 "sellerid": Provider.of<UserModel>(context, listen: false).user.sellerid, 35 "sellerid": Provider.of<UserModel>(context, listen: false).user.sellerid,
36 }; 36 };
37 BaseResp<Map<String, dynamic>> baseResp = await DioUtil() 37 BaseResp<Map<String, dynamic>> baseResp = await DioUtil()
38 .request<Map<String, dynamic>>( 38 .request<Map<String, dynamic>>(
39 context, Method.post, HttpUrl.get_seller_info, 39 context, Method.post, HttpUrl.get_seller_info,
40 - data: params,showLoading:showLoading ) 40 + data: params,showLoading:showLoading,selfDismiss:selfDismiss )
41 .catchError((error) { 41 .catchError((error) {
42 print(error.toString()); 42 print(error.toString());
43 }); 43 });
@@ -56,22 +56,22 @@ class TableManagerModelOrReserve with ChangeNotifier { @@ -56,22 +56,22 @@ class TableManagerModelOrReserve with ChangeNotifier {
56 // List<t.Table> tablesCanNote = []; //全部桌子(空桌子) 56 // List<t.Table> tablesCanNote = []; //全部桌子(空桌子)
57 // List<t.Table> tablesShow = []; //页面展示 57 // List<t.Table> tablesShow = []; //页面展示
58 58
59 - DateTime dateTime = DateTime.now();  
60 -  
61 - String dateText = ""; //当前显示日期时间  
62 - int currTimeIndex = 1; //当前选中时间段  
63 - String morning; //早市时间段  
64 - String noon; //午市时间段  
65 - String night; //晚市时间段  
66 - // UserModel userModel;  
67 -  
68 - // Map dailyMap = {}; // 早市对应半点钟，午市对应半点钟、晚市对应半点钟  
69 - bool swichState = false; //仅看空座  
70 - String selectDateStr = '';  
71 - String selectWeekAndLunarCalendar = '';  
72 - String doltStr = '';  
73 - DateTime dateTimeSelect;  
74 - int selectNumber; 59 + // DateTime dateTime = DateTime.now();
  60 +
  61 + // String dateText = ""; //当前显示日期时间
  62 + // int currTimeIndex = 1; //当前选中时间段
  63 + // String morning; //早市时间段
  64 + // String noon; //午市时间段
  65 + // String night; //晚市时间段
  66 + // // UserModel userModel;
  67 +
  68 + // // Map dailyMap = {}; // 早市对应半点钟，午市对应半点钟、晚市对应半点钟
  69 + // bool swichState = false; //仅看空座
  70 + // String selectDateStr = '';
  71 + // String selectWeekAndLunarCalendar = '';
  72 + // String doltStr = '';
  73 + // DateTime dateTimeSelect;
  74 + // int selectNumber;
75 75
76 // List dailyList = []; // 早市对应半点钟，午市对应半点钟、晚市对应半点钟 76 // List dailyList = []; // 早市对应半点钟，午市对应半点钟、晚市对应半点钟
77 // List<FeastBoardModel> banquetByDateData = []; //宴会看板数据/宴会预订的数据 77 // List<FeastBoardModel> banquetByDateData = []; //宴会看板数据/宴会预订的数据
@@ -88,6 +88,7 @@ class TableManagerModelOrReserve with ChangeNotifier { @@ -88,6 +88,7 @@ class TableManagerModelOrReserve with ChangeNotifier {
88 88
89 TableManagerModelOrReserve() { 89 TableManagerModelOrReserve() {
90 // print('fdsfs'); 90 // print('fdsfs');
  91 +
91 String tableSp = App.sp.getString('table_list_or_reserve'); 92 String tableSp = App.sp.getString('table_list_or_reserve');
92 93
93 if (tableSp == null) { 94 if (tableSp == null) {
@@ -113,7 +114,7 @@ class TableManagerModelOrReserve with ChangeNotifier { @@ -113,7 +114,7 @@ class TableManagerModelOrReserve with ChangeNotifier {
113 tempShow.add(TableListReseveSunModel.fromJson2(element)); 114 tempShow.add(TableListReseveSunModel.fromJson2(element));
114 }); 115 });
115 } 116 }
116 - selectNumber = 0; 117 +
117 tablesOrReserveData = temp; 118 tablesOrReserveData = temp;
118 tablesOrReserveDataShow = tempShow; 119 tablesOrReserveDataShow = tempShow;
119 pageStateOrReserve = PageState.Success; 120 pageStateOrReserve = PageState.Success;
@@ -147,13 +148,25 @@ class TableManagerModelOrReserve with ChangeNotifier { @@ -147,13 +148,25 @@ class TableManagerModelOrReserve with ChangeNotifier {
147 148
148 // 获取商家桌位列表及对应预订数据 149 // 获取商家桌位列表及对应预订数据
149 150
150 - Future<bool> getTableListOrReserve(BuildContext context,  
151 - {showLoading = false, bool selfDismiss = false, bool needInitIndex = false}) async { 151 + Future<bool> getTableListOrReserve(
  152 + BuildContext context,
  153 + int currTimeIndex,
  154 + DateTime datetime,
  155 + int selectNumber, {
  156 + showLoading = true,
  157 + bool selfDismiss = false,
  158 + }) async {
  159 + // if (pageStateOrReserve == PageState.Loading) {
  160 + // showLoading = false;
  161 + // } else {
  162 + // showLoading = true;
  163 + // }
  164 +
152 Map<String, String> params = { 165 Map<String, String> params = {
153 'sid': Provider.of<UserModel>(context, listen: false).user.sellerid, 166 'sid': Provider.of<UserModel>(context, listen: false).user.sellerid,
154 'x': '1', 167 'x': '1',
155 'y': '200', 168 'y': '200',
156 - "rdate": _getRdate(), 169 + "rdate": _getRdate(datetime),
157 "ddate_solt": currTimeIndex.toString(), 170 "ddate_solt": currTimeIndex.toString(),
158 "keywords": "", 171 "keywords": "",
159 "sort": "1" 172 "sort": "1"
@@ -180,21 +193,26 @@ class TableManagerModelOrReserve with ChangeNotifier { @@ -180,21 +193,26 @@ class TableManagerModelOrReserve with ChangeNotifier {
180 List<TableListReserve> tableListOrReserveDataAll = []; //桌位页面数据接口重组 --全部 193 List<TableListReserve> tableListOrReserveDataAll = []; //桌位页面数据接口重组 --全部
181 194
182 tablesOrReserveData.forEach((element) { 195 tablesOrReserveData.forEach((element) {
  196 + element.select = false;
  197 +
183 tableListOrReserveDataAll.addAll(element.tableList); 198 tableListOrReserveDataAll.addAll(element.tableList);
184 }); 199 });
185 - 200 + tablesOrReserveDataShow.forEach((element) {
  201 + element.select = false;
  202 + });
186 TableListReseveSunModel data0 = TableListReseveSunModel(); 203 TableListReseveSunModel data0 = TableListReseveSunModel();
187 204
188 data0.name = '全部'; 205 data0.name = '全部';
189 - data0.select = true; 206 + data0.select = false;
  207 +
190 data0.tableList = tableListOrReserveDataAll; 208 data0.tableList = tableListOrReserveDataAll;
191 tablesOrReserveData.insert(0, data0); 209 tablesOrReserveData.insert(0, data0);
192 210
193 tablesOrReserveDataShow.insert(0, data0); 211 tablesOrReserveDataShow.insert(0, data0);
194 - if(needInitIndex){  
195 - selectNumber = 0;  
196 - }  
197 - 212 +
  213 + tablesOrReserveData[selectNumber].select = true;
  214 +
  215 + tablesOrReserveDataShow[selectNumber].select = true;
198 216
199 App.sp.setString( 217 App.sp.setString(
200 'table_list_or_reserve', json.encode(tablesOrReserveDataShow)); 218 'table_list_or_reserve', json.encode(tablesOrReserveDataShow));
@@ -286,122 +304,6 @@ class TableManagerModelOrReserve with ChangeNotifier { @@ -286,122 +304,6 @@ class TableManagerModelOrReserve with ChangeNotifier {
286 // } 304 // }
287 305
288 //初始化时间 306 //初始化时间
289 - initTimeTable(BuildContext context) async {  
290 - UserModel userModel = Provider.of<UserModel>(context, listen: false);  
291 - dateTime = DateTime.now();  
292 - dateText = returnDate(dateTime);  
293 - dateTimeSelect = dateTime;  
294 - // morning = '07:00-10:00';  
295 - // noon = '11:00-14:30';  
296 - // night = '16:00-21:00';  
297 - morning =  
298 - userModel.user.morning.isEmpty ? "00:00-00:00" : userModel.user.morning;  
299 - noon = userModel.user.noon.isEmpty ? "00:00-00:00" : userModel.user.noon;  
300 - night = userModel.user.night.isEmpty ? "00:00-00:00" : userModel.user.night;  
301 - // userModel.user.morning.isEmpty  
302 - // ? dailyMap.putIfAbsent("morning", () => "")  
303 - // : dailyMap.putIfAbsent("morning", () => _getHourAndMinute(morning, 1));  
304 - // userModel.user.noon.isEmpty  
305 - // ? dailyMap.putIfAbsent("noon", () => "")  
306 - // : dailyMap.putIfAbsent("noon", () => _getHourAndMinute(noon, 2));  
307 - // userModel.user.night.isEmpty  
308 - // ? dailyMap.putIfAbsent("night", () => "")  
309 - // : dailyMap.putIfAbsent("night", () => _getHourAndMinute(night, 3));  
310 - if (dateTime.isBefore(DateTime.parse(dateTime.year.toString() +  
311 - "-" +  
312 - Utils.addZeroNumber(dateTime.month) +  
313 - "-" +  
314 - Utils.addZeroNumber(dateTime.day) +  
315 - " " +  
316 - morning.split("-")[1] +  
317 - ":00"))) {  
318 - //未过早市  
319 - currTimeIndex = 1;  
320 - } else if (dateTime.isAfter(DateTime.parse(dateTime.year.toString() +  
321 - "-" +  
322 - Utils.addZeroNumber(dateTime.month) +  
323 - "-" +  
324 - Utils.addZeroNumber(dateTime.day) +  
325 - " " +  
326 - morning.split("-")[1] +  
327 - ":00")) &&  
328 - dateTime.isBefore(DateTime.parse(dateTime.year.toString() +  
329 - "-" +  
330 - Utils.addZeroNumber(dateTime.month) +  
331 - "-" +  
332 - Utils.addZeroNumber(dateTime.day) +  
333 - " " +  
334 - noon.split("-")[1] +  
335 - ":00"))) {  
336 - //过了早市，未过午市  
337 - currTimeIndex = 2;  
338 - } else if (dateTime.isAfter(DateTime.parse(dateTime.year.toString() +  
339 - "-" +  
340 - Utils.addZeroNumber(dateTime.month) +  
341 - "-" +  
342 - Utils.addZeroNumber(dateTime.day) +  
343 - " " +  
344 - noon.split("-")[1] +  
345 - ":00")) &&  
346 - dateTime.isBefore(DateTime.parse(dateTime.year.toString() +  
347 - "-" +  
348 - Utils.addZeroNumber(dateTime.month) +  
349 - "-" +  
350 - Utils.addZeroNumber(dateTime.day) +  
351 - " " +  
352 - night.split("-")[1] +  
353 - ":00"))) {  
354 - //过了午市，未过晚市  
355 - currTimeIndex = 3;  
356 - } else {  
357 - //过了晚市  
358 - currTimeIndex = 3;  
359 - }  
360 -  
361 - selectDateStr = returnDayDateStr(dateTime);  
362 - selectWeekAndLunarCalendar = returnWeekAndLunarCalendar(dateTime, context);  
363 -  
364 - getTableListOrReserve(context,needInitIndex: true);  
365 - // userModel.user.morning.isEmpty  
366 - // ? dailyMap.putIfAbsent("morning", () => "")  
367 - // : dailyMap.putIfAbsent("morning", () => _getHourAndMinute(morning, 1));  
368 - // userModel.user.noon.isEmpty  
369 - // ? dailyMap.putIfAbsent("noon", () => "")  
370 - // : dailyMap.putIfAbsent("noon", () => _getHourAndMinute(noon, 2));  
371 - // userModel.user.night.isEmpty  
372 - // ? dailyMap.putIfAbsent("night", () => "")  
373 - // : dailyMap.putIfAbsent("night", () => _getHourAndMinute(night, 3));  
374 -  
375 - // List temp = [];  
376 - // String tableSp = App.sp.getString('table_list');  
377 - // if (tableSp == null) {  
378 - // temp = await getTableList(context);  
379 - // } else {  
380 - // // List list = json.decode(tableSp);  
381 - // // list.forEach((element) {  
382 - // // temp.add(TableOuter.fromJson2(element));  
383 - // // });  
384 - // temp = getSpTableList();  
385 - // }  
386 -  
387 - // if (temp.length > 0) {  
388 - // await getReserveList(context, selfDismiss: true);  
389 - // // await getReserveList(context,  
390 - // // needLoading: false,  
391 - // // showMsg: true,  
392 - // // showloading: true,  
393 - // // selfDismiss: true);  
394 - // if (showLoading) {  
395 - // Loading.hideLoading(context);  
396 - // }  
397 - // } else {  
398 - // // pageState = PageState.Empty;  
399 - // pageState = PageState.Success;  
400 - // notifyListeners();  
401 - // }  
402 - }  
403 -  
404 - //初始化时间  
405 // initTime(BuildContext context) async { 307 // initTime(BuildContext context) async {
406 // UserModel userModel = Provider.of<UserModel>(context, listen: false); 308 // UserModel userModel = Provider.of<UserModel>(context, listen: false);
407 // dateTime = DateTime.now(); 309 // dateTime = DateTime.now();
@@ -650,12 +552,13 @@ class TableManagerModelOrReserve with ChangeNotifier { @@ -650,12 +552,13 @@ class TableManagerModelOrReserve with ChangeNotifier {
650 // } 552 // }
651 553
652 Future<bool> getTableItExistOrder( 554 Future<bool> getTableItExistOrder(
653 - BuildContext context, String rdate, String tableids, 555 + BuildContext context, String rdate, String tableids, String ddateSolt,
654 {showLoading = false, bool selfDismiss = false}) async { 556 {showLoading = false, bool selfDismiss = false}) async {
655 Map<String, String> params = { 557 Map<String, String> params = {
656 'sid': Provider.of<UserModel>(context, listen: false).user.sellerid, 558 'sid': Provider.of<UserModel>(context, listen: false).user.sellerid,
657 'tableid': tableids, 559 'tableid': tableids,
658 'rdate': rdate, 560 'rdate': rdate,
  561 + 'ddate_solt': ddateSolt
659 }; 562 };
660 BaseResp<dynamic> baseResp = await DioUtil() 563 BaseResp<dynamic> baseResp = await DioUtil()
661 .request<dynamic>(context, Method.get, HttpUrl.get_table_it_exist_order, 564 .request<dynamic>(context, Method.get, HttpUrl.get_table_it_exist_order,
@@ -714,7 +617,13 @@ class TableManagerModelOrReserve with ChangeNotifier { @@ -714,7 +617,13 @@ class TableManagerModelOrReserve with ChangeNotifier {
714 617
715 ///录入更改内部预订 618 ///录入更改内部预订
716 Future<SunReserveInfoModel> setReserveInfoOrReseve( 619 Future<SunReserveInfoModel> setReserveInfoOrReseve(
717 - BuildContext context, CustomCallBack callback, 620 + BuildContext context,
  621 + CustomCallBack callback,
  622 + DateTime dateTime,
  623 + int currTimeIndex,
  624 + String morning,
  625 + String noon,
  626 + String night,
718 {needKeep = false, 627 {needKeep = false,
719 Guest guest, 628 Guest guest,
720 String pnum, 629 String pnum,
@@ -729,7 +638,8 @@ class TableManagerModelOrReserve with ChangeNotifier { @@ -729,7 +638,8 @@ class TableManagerModelOrReserve with ChangeNotifier {
729 //判断是否可以输入自己的手机号 638 //判断是否可以输入自己的手机号
730 CustomerProvider customerProvider = 639 CustomerProvider customerProvider =
731 Provider.of<CustomerProvider>(context, listen: false); 640 Provider.of<CustomerProvider>(context, listen: false);
732 - await customerProvider.getSellerGuest(context,showLoading: true,selfDismiss: true); 641 + await customerProvider.getSellerGuest(context,
  642 + showLoading: true, selfDismiss: true);
733 if (customerProvider.isselfphone) { 643 if (customerProvider.isselfphone) {
734 //录入客户电话时不能用自己手机号（管店） 644 //录入客户电话时不能用自己手机号（管店）
735 645
@@ -783,7 +693,8 @@ class TableManagerModelOrReserve with ChangeNotifier { @@ -783,7 +693,8 @@ class TableManagerModelOrReserve with ChangeNotifier {
783 } 693 }
784 print(tableSelectInfo); 694 print(tableSelectInfo);
785 695
786 - bool sucess = await getTableItExistOrder(context, rdate, tableSelectInfo); 696 + bool sucess = await getTableItExistOrder(
  697 + context, rdate, tableSelectInfo, currTimeIndex.toString());
787 698
788 if (sucess) { 699 if (sucess) {
789 UserModel userModel = Provider.of<UserModel>(context, listen: false); 700 UserModel userModel = Provider.of<UserModel>(context, listen: false);
@@ -1508,7 +1419,7 @@ class TableManagerModelOrReserve with ChangeNotifier { @@ -1508,7 +1419,7 @@ class TableManagerModelOrReserve with ChangeNotifier {
1508 // } 1419 // }
1509 1420
1510 //获取一天开始-结束时间字符串 1421 //获取一天开始-结束时间字符串
1511 - String _getRdate() { 1422 + String _getRdate(DateTime dateTime) {
1512 //一天开始时间 1423 //一天开始时间
1513 double startDay; 1424 double startDay;
1514 //一天结束时间 1425 //一天结束时间
@@ -1652,45 +1563,45 @@ class TableManagerModelOrReserve with ChangeNotifier { @@ -1652,45 +1563,45 @@ class TableManagerModelOrReserve with ChangeNotifier {
1652 // notifyListeners(); 1563 // notifyListeners();
1653 // } 1564 // }
1654 1565
1655 - //生成日期文本  
1656 - createDateText(BuildContext context, DateTime day) {  
1657 - if (Utils.isOneDay(day, dateTime)) return; //日期没变  
1658 - dateTimeSelect = day;  
1659 - dateText = returnDate(day);  
1660 - selectDateStr = returnDayDateStr(day);  
1661 - selectWeekAndLunarCalendar = returnWeekAndLunarCalendar(day, context);  
1662 - dateTime = day;  
1663 - // getReserveList(context, needLoading: false, showloading: true);  
1664 - } 1566 + // //生成日期文本
  1567 + // createDateText(BuildContext context, DateTime day) {
  1568 + // if (Utils.isOneDay(day, dateTime)) return; //日期没变
  1569 + // dateTimeSelect = day;
  1570 + // dateText = returnDate(day);
  1571 + // selectDateStr = returnDayDateStr(day);
  1572 + // selectWeekAndLunarCalendar = returnWeekAndLunarCalendar(day, context);
  1573 + // dateTime = day;
  1574 + // // getReserveList(context, needLoading: false, showloading: true);
  1575 + // }
1665 1576
1666 - //生成日期文本  
1667 - createDateText1(BuildContext context, DateTime day) {  
1668 - if (Utils.isOneDay(day, dateTime)) return; //日期没变  
1669 - dateTimeSelect = day;  
1670 - dateText = returnDate(day);  
1671 - selectDateStr = returnDayDateStr(day);  
1672 - selectWeekAndLunarCalendar = returnWeekAndLunarCalendar(day, context);  
1673 - dateTime = day;  
1674 - // getReserveList(context, needLoading: false, showloading: true);  
1675 - } 1577 + // //生成日期文本
  1578 + // createDateText1(BuildContext context, DateTime day) {
  1579 + // if (Utils.isOneDay(day, dateTime)) return; //日期没变
  1580 + // dateTimeSelect = day;
  1581 + // dateText = returnDate(day);
  1582 + // selectDateStr = returnDayDateStr(day);
  1583 + // selectWeekAndLunarCalendar = returnWeekAndLunarCalendar(day, context);
  1584 + // dateTime = day;
  1585 + // // getReserveList(context, needLoading: false, showloading: true);
  1586 + // }
1676 1587
1677 - returnDate(DateTime day) {  
1678 - // String time = Utils.lunarCalendarHolidays(day);  
1679 - String date = _returnDayDateWeek(day);  
1680 - // date += ' ${time}';  
1681 - return date;  
1682 - } 1588 + // returnDate(DateTime day) {
  1589 + // // String time = Utils.lunarCalendarHolidays(day);
  1590 + // String date = _returnDayDateWeek(day);
  1591 + // // date += ' ${time}';
  1592 + // return date;
  1593 + // }
1683 1594
1684 - _getDoltStr(BuildContext context) {  
1685 - if (currTimeIndex == 1) {  
1686 - doltStr = '早餐';  
1687 - } else if (currTimeIndex == 2) {  
1688 - doltStr = '午餐';  
1689 - } else if (currTimeIndex == 3) {  
1690 - doltStr = '晚餐';  
1691 - }  
1692 - // _initTimeDdate(currTimeIndex, context);  
1693 - } 1595 + // _getDoltStr(BuildContext context) {
  1596 + // if (currTimeIndex == 1) {
  1597 + // doltStr = '早餐';
  1598 + // } else if (currTimeIndex == 2) {
  1599 + // doltStr = '午餐';
  1600 + // } else if (currTimeIndex == 3) {
  1601 + // doltStr = '晚餐';
  1602 + // }
  1603 + // // _initTimeDdate(currTimeIndex, context);
  1604 + // }
1694 1605
1695 // String returnDayDateWeekStr(DateTime day, int index) { 1606 // String returnDayDateWeekStr(DateTime day, int index) {
1696 // String date = _returnDayDate(day); 1607 // String date = _returnDayDate(day);
@@ -1705,53 +1616,53 @@ class TableManagerModelOrReserve with ChangeNotifier { @@ -1705,53 +1616,53 @@ class TableManagerModelOrReserve with ChangeNotifier {
1705 // return date; 1616 // return date;
1706 // } 1617 // }
1707 1618
1708 - String returnDayDateStr(DateTime day) {  
1709 - String date = '';  
1710 - DateTime dateNow = DateTime.now();  
1711 - String ymd = "${day.year}年" +  
1712 - Utils.addZeroNumber(day.month) +  
1713 - "月" +  
1714 - Utils.addZeroNumber(day.day) +  
1715 - "日";  
1716 -  
1717 - if (Utils.isOneDay(day, dateNow)) {  
1718 - date += "今天 ";  
1719 - } else if (Utils.isOneDay(day, dateNow.add(Duration(days: 1)))) {  
1720 - date += "明天 ";  
1721 - } else if (Utils.isOneDay(day, dateNow.add(Duration(days: 2)))) {  
1722 - date += "后天 ";  
1723 - }  
1724 - date += ymd;  
1725 - // date += " 星期${Utils.formatWeekDayNum(day.weekday)}";  
1726 - return date;  
1727 - } 1619 + // String returnDayDateStr(DateTime day) {
  1620 + // String date = '';
  1621 + // DateTime dateNow = DateTime.now();
  1622 + // String ymd = "${day.year}年" +
  1623 + // Utils.addZeroNumber(day.month) +
  1624 + // "月" +
  1625 + // Utils.addZeroNumber(day.day) +
  1626 + // "日";
  1627 +
  1628 + // if (Utils.isOneDay(day, dateNow)) {
  1629 + // date += "今天 ";
  1630 + // } else if (Utils.isOneDay(day, dateNow.add(Duration(days: 1)))) {
  1631 + // date += "明天 ";
  1632 + // } else if (Utils.isOneDay(day, dateNow.add(Duration(days: 2)))) {
  1633 + // date += "后天 ";
  1634 + // }
  1635 + // date += ymd;
  1636 + // // date += " 星期${Utils.formatWeekDayNum(day.weekday)}";
  1637 + // return date;
  1638 + // }
1728 1639
1729 - String _returnDayDateWeek(DateTime day) {  
1730 - String date = '';  
1731 - DateTime dateNow = DateTime.now();  
1732 - String ymd = "${day.year}-" +  
1733 - Utils.addZeroNumber(day.month) +  
1734 - "-" +  
1735 - Utils.addZeroNumber(day.day);  
1736 -  
1737 - if (Utils.isOneDay(day, dateNow)) {  
1738 - date += "今天 ";  
1739 - } else if (Utils.isOneDay(day, dateNow.add(Duration(days: 1)))) {  
1740 - date += "明天 ";  
1741 - } else if (Utils.isOneDay(day, dateNow.add(Duration(days: 2)))) {  
1742 - date += "后天 ";  
1743 - }  
1744 - date += ymd;  
1745 - date += " 星期${Utils.formatWeekDayNum(day.weekday)}";  
1746 - return date;  
1747 - } 1640 + // String _returnDayDateWeek(DateTime day) {
  1641 + // String date = '';
  1642 + // DateTime dateNow = DateTime.now();
  1643 + // String ymd = "${day.year}-" +
  1644 + // Utils.addZeroNumber(day.month) +
  1645 + // "-" +
  1646 + // Utils.addZeroNumber(day.day);
  1647 +
  1648 + // if (Utils.isOneDay(day, dateNow)) {
  1649 + // date += "今天 ";
  1650 + // } else if (Utils.isOneDay(day, dateNow.add(Duration(days: 1)))) {
  1651 + // date += "明天 ";
  1652 + // } else if (Utils.isOneDay(day, dateNow.add(Duration(days: 2)))) {
  1653 + // date += "后天 ";
  1654 + // }
  1655 + // date += ymd;
  1656 + // date += " 星期${Utils.formatWeekDayNum(day.weekday)}";
  1657 + // return date;
  1658 + // }
1748 1659
1749 - String returnWeekAndLunarCalendar(DateTime day, BuildContext context) {  
1750 - String date = "星期${Utils.formatWeekDayNum(day.weekday)} ";  
1751 - date += Utils.lunarCalendarHolidays(day);  
1752 - _getDoltStr(context);  
1753 - return date;  
1754 - } 1660 + // String returnWeekAndLunarCalendar(DateTime day, BuildContext context) {
  1661 + // String date = "星期${Utils.formatWeekDayNum(day.weekday)} ";
  1662 + // date += Utils.lunarCalendarHolidays(day);
  1663 + // _getDoltStr(context);
  1664 + // return date;
  1665 + // }
1755 1666
1756 //获取桌位数据 1667 //获取桌位数据
1757 Future<dynamic> setSwitchStatus( 1668 Future<dynamic> setSwitchStatus(
@@ -537,46 +537,46 @@ var handleSelectTableFHandler = new Handler( @@ -537,46 +537,46 @@ var handleSelectTableFHandler = new Handler(
537 537
538 538
539 // 跳转到选择桌位_方硕新修改的页面 539 // 跳转到选择桌位_方硕新修改的页面
540 -var handleSelectTableFOrReserveHandler = new Handler(  
541 - handlerFunc: (BuildContext context, Map<String, List<Object>> params) {  
542 - String rid = params['rid'].first;  
543 - String tid = params['tid'].first;  
544 - DateTime dateTime =  
545 - DateTime.fromMillisecondsSinceEpoch(int.parse(params["dateTime"].first));  
546 - String ddateSlot = params["ddate_slot"].first;  
547 - String source = params["source"].first;  
548 -  
549 - String fromPage = params["fromPage"].first;  
550 - bool canChoose = params["canChoose"].first == "true" ? true : false;  
551 - String hmS = params["hmS"].first;  
552 - String hmE = params["hmE"].first;  
553 - List<TableList> res = [];  
554 - if (params.keys.contains('object')) {  
555 - Map object = FluroConvertUtils.string2map(params["object"].first);  
556 - List temp = object['object'];  
557 -  
558 - for (var item in temp) {  
559 - res.add(TableList.fromJson(item));  
560 - }  
561 - }  
562 -  
563 - String ridFeast = params["ridFeast"].first;  
564 -  
565 - // return SelectTablePage(rid, dateTime, ddate_slot,canChoose: canChoose);  
566 - return ChangeNotifierProvider<ChooseTableModel>(  
567 - create: (_) => ChooseTableModel(),  
568 - child: ChangeNotifierProvider<TableManagerModelOrReserve>(  
569 - create: (_) => TableManagerModelOrReserve(),  
570 - child: SelectTableFPageOrReserve(rid, dateTime, ddateSlot,  
571 - canChoose: canChoose,  
572 - tableList: res,  
573 - fromPage: fromPage,  
574 - tid: tid,  
575 - hmS: hmS,  
576 - hmE: hmE,  
577 - source: source,  
578 - ridFeast: ridFeast)));  
579 -}); 540 +// var handleSelectTableFOrReserveHandler = new Handler(
  541 +// handlerFunc: (BuildContext context, Map<String, List<Object>> params) {
  542 +// String rid = params['rid'].first;
  543 +// String tid = params['tid'].first;
  544 +// DateTime dateTime =
  545 +// DateTime.fromMillisecondsSinceEpoch(int.parse(params["dateTime"].first));
  546 +// String ddateSlot = params["ddate_slot"].first;
  547 +// String source = params["source"].first;
  548 +
  549 +// String fromPage = params["fromPage"].first;
  550 +// bool canChoose = params["canChoose"].first == "true" ? true : false;
  551 +// String hmS = params["hmS"].first;
  552 +// String hmE = params["hmE"].first;
  553 +// List<TableList> res = [];
  554 +// if (params.keys.contains('object')) {
  555 +// Map object = FluroConvertUtils.string2map(params["object"].first);
  556 +// List temp = object['object'];
  557 +
  558 +// for (var item in temp) {
  559 +// res.add(TableList.fromJson(item));
  560 +// }
  561 +// }
  562 +
  563 +// String ridFeast = params["ridFeast"].first;
  564 +
  565 +// // return SelectTablePage(rid, dateTime, ddate_slot,canChoose: canChoose);
  566 +// return ChangeNotifierProvider<ChooseTableModel>(
  567 +// create: (_) => ChooseTableModel(),
  568 +// child: ChangeNotifierProvider<TableManagerModelOrReserve>(
  569 +// create: (_) => TableManagerModelOrReserve(),
  570 +// child: SelectTableFPageOrReserve(rid, dateTime, ddateSlot,
  571 +// canChoose: canChoose,
  572 +// tableList: res,
  573 +// fromPage: fromPage,
  574 +// tid: tid,
  575 +// hmS: hmS,
  576 +// hmE: hmE,
  577 +// source: source,
  578 +// ridFeast: ridFeast)));
  579 +// });
580 580
581 // 跳转到照片管理的选择桌位_方硕新修改的页面 581 // 跳转到照片管理的选择桌位_方硕新修改的页面
582 var photoManagerPageHandle = new Handler( 582 var photoManagerPageHandle = new Handler(
@@ -8,19 +8,18 @@ import 'route_handles.dart'; @@ -8,19 +8,18 @@ import 'route_handles.dart';
8 class Routes { 8 class Routes {
9 static String login = "/"; //登录页 9 static String login = "/"; //登录页
10 static String home = "/home"; //主页 10 static String home = "/home"; //主页
11 -static String home_sim = "/home_sim"; //主页_极速版  
12 - 11 + static String home_sim = "/home_sim"; //主页_极速版
  12 +
13 static String handle_online_page = "/handle_online_page"; //处理在线预订 13 static String handle_online_page = "/handle_online_page"; //处理在线预订
14 - static String handle_online_page_sim = "/handle_online_page_sim"; //处理在线预订  
15 - 14 + static String handle_online_page_sim = "/handle_online_page_sim"; //处理在线预订
  15 +
16 static String reserve_detail = "/reserve_detail"; //预订详情 16 static String reserve_detail = "/reserve_detail"; //预订详情
17 - static String reserve_detail_sim = "/reserve_detail_sim"; //预订详情  
18 - 17 + static String reserve_detail_sim = "/reserve_detail_sim"; //预订详情
  18 +
19 static String select_table = "/select_table"; //选择桌位 19 static String select_table = "/select_table"; //选择桌位
20 static String select_table_f = "/select_table_f"; //选择桌位_方硕新修改的页面 20 static String select_table_f = "/select_table_f"; //选择桌位_方硕新修改的页面
21 static String invication = "/invication"; //邀请函 21 static String invication = "/invication"; //邀请函
22 22
23 -  
24 static String invication_sim = "/invication_sim"; //邀请函 23 static String invication_sim = "/invication_sim"; //邀请函
25 static String sms = "/sms"; //发短信 24 static String sms = "/sms"; //发短信
26 static String webview = "/webview"; //网页 25 static String webview = "/webview"; //网页
@@ -39,9 +38,8 @@ static String home_sim = "/home_sim"; //銝駁△_ @@ -39,9 +38,8 @@ static String home_sim = "/home_sim"; //銝駁△_
39 static String coupon_select = "/coupon_select"; //优惠券选择 38 static String coupon_select = "/coupon_select"; //优惠券选择
40 static String coupon_detail = "/coupon_detail"; //优惠券详情页 39 static String coupon_detail = "/coupon_detail"; //优惠券详情页
41 static String base_info = "/base_info"; //个人资料页面 40 static String base_info = "/base_info"; //个人资料页面
42 - static String base_info_sim = "/base_info_sim"; //个人资料页面 41 + static String base_info_sim = "/base_info_sim"; //个人资料页面
43 42
44 -  
45 static String binding_phone = "/binding_phone"; //绑定手机号码页面 43 static String binding_phone = "/binding_phone"; //绑定手机号码页面
46 static String if_need_create_store = "/if_need_create_store"; //是否选择新建店铺页面 44 static String if_need_create_store = "/if_need_create_store"; //是否选择新建店铺页面
47 static String create_store = "/create_store"; //新建店铺 45 static String create_store = "/create_store"; //新建店铺
@@ -65,8 +63,8 @@ static String home_sim = "/home_sim"; //銝駁△_ @@ -65,8 +63,8 @@ static String home_sim = "/home_sim"; //銝駁△_
65 static String sms_manager_page = "/sms_manager_page"; //短信充值 63 static String sms_manager_page = "/sms_manager_page"; //短信充值
66 static String sms_recharge_page = "/sms_recharge_page"; //短信充值 64 static String sms_recharge_page = "/sms_recharge_page"; //短信充值
67 static String store_base_info_page = "/store_base_info_page"; //店铺信息 65 static String store_base_info_page = "/store_base_info_page"; //店铺信息
68 - static String store_base_info_page_sim = "/store_base_info_page_sim"; //店铺信息  
69 - 66 + static String store_base_info_page_sim = "/store_base_info_page_sim"; //店铺信息
  67 +
70 static String room_type_manage_page = "/room_type_manage_page"; //包间类型管理 68 static String room_type_manage_page = "/room_type_manage_page"; //包间类型管理
71 static String room_type_create_page = "/room_type_create_page"; //包间类型创建 69 static String room_type_create_page = "/room_type_create_page"; //包间类型创建
72 static String room_type_select_table_page = 70 static String room_type_select_table_page =
@@ -76,12 +74,12 @@ static String home_sim = "/home_sim"; //銝駁△_ @@ -76,12 +74,12 @@ static String home_sim = "/home_sim"; //銝駁△_
76 static String menu_add_dishes_page = "/menu_add_dishes_page"; //添加菜品页面 74 static String menu_add_dishes_page = "/menu_add_dishes_page"; //添加菜品页面
77 static String personnel_manage_page = "/personnel_manage_page"; //店员管理页面 75 static String personnel_manage_page = "/personnel_manage_page"; //店员管理页面
78 76
79 -  
80 - static String personnel_manage_page_sim = "/personnel_manage_page_sim"; //店员管理页面 77 + static String personnel_manage_page_sim =
  78 + "/personnel_manage_page_sim"; //店员管理页面
81 static String personnel_detail_page = "/personnel_detail_page"; //店员详情页面 79 static String personnel_detail_page = "/personnel_detail_page"; //店员详情页面
82 - static String personnel_detail_page_sim = "/personnel_detail_page_sim"; //店员详情页面 80 + static String personnel_detail_page_sim =
  81 + "/personnel_detail_page_sim"; //店员详情页面
83 82
84 -  
85 static String personnel_password_page = "/personnel_password_page"; //密码展示页 83 static String personnel_password_page = "/personnel_password_page"; //密码展示页
86 static String personnel_password_edit_page = 84 static String personnel_password_edit_page =
87 "/personnel_password_edit_page"; //密码修改页 85 "/personnel_password_edit_page"; //密码修改页
@@ -91,22 +89,20 @@ static String home_sim = "/home_sim"; //銝駁△_ @@ -91,22 +89,20 @@ static String home_sim = "/home_sim"; //銝駁△_
91 static String store_customer_page = "/store_customer_page"; //全店客情 89 static String store_customer_page = "/store_customer_page"; //全店客情
92 static String my_customer_page = "/my_customer_page"; //我的客情 90 static String my_customer_page = "/my_customer_page"; //我的客情
93 static String customer_list_page = "/customer_list_page"; //客情列表 91 static String customer_list_page = "/customer_list_page"; //客情列表
94 - static String customer_list_page_sim = "/customer_list_page_sim"; //客情列表  
95 - 92 + static String customer_list_page_sim = "/customer_list_page_sim"; //客情列表
  93 +
96 static String customer_set_page = "/customer_set_page"; //客情设置 94 static String customer_set_page = "/customer_set_page"; //客情设置
97 static String marketing_records_page = "/marketing_records_page"; //全店营销记录 95 static String marketing_records_page = "/marketing_records_page"; //全店营销记录
98 static String marketing_records_detail_page = 96 static String marketing_records_detail_page =
99 "/marketing_records_detail_page"; //全店营销记录详情 97 "/marketing_records_detail_page"; //全店营销记录详情
100 static String make_marketing_page = "/make_marketing_page"; //创建营销 98 static String make_marketing_page = "/make_marketing_page"; //创建营销
101 static String customer_detail_page = "/customer_detail_page"; //客户详情 99 static String customer_detail_page = "/customer_detail_page"; //客户详情
102 -static String customer_detail_page_sim = "/customer_detail_page_sim"; //客户详情  
103 - 100 + static String customer_detail_page_sim = "/customer_detail_page_sim"; //客户详情
  101 +
104 static String customer_edit_detail_page = 102 static String customer_edit_detail_page =
105 "/customer_edit_detail_page"; //编辑客户详情 103 "/customer_edit_detail_page"; //编辑客户详情
106 104
107 -  
108 -  
109 - static String customer_edit_detail_page_sim = 105 + static String customer_edit_detail_page_sim =
110 "/customer_edit_detail_page_sim"; //编辑客户详情 106 "/customer_edit_detail_page_sim"; //编辑客户详情
111 107
112 static String festival_edit_page = "/festival_edit_page"; //编辑纪念日 108 static String festival_edit_page = "/festival_edit_page"; //编辑纪念日
@@ -114,23 +110,22 @@ static String customer_detail_page_sim = "/customer_detail_page_sim"; //摰Ｘ霂 @@ -114,23 +110,22 @@ static String customer_detail_page_sim = "/customer_detail_page_sim"; //摰Ｘ霂
114 110
115 static String my_customer_list_page = "/my_customer_list_page"; //客情列表 111 static String my_customer_list_page = "/my_customer_list_page"; //客情列表
116 static String my_customer_list_page_sim = "/my_customer_list_page_sim"; //客情列表 112 static String my_customer_list_page_sim = "/my_customer_list_page_sim"; //客情列表
117 - 113 +
118 static String my_marketing_records_page = 114 static String my_marketing_records_page =
119 "/my_marketing_records_page"; //全店营销记录 115 "/my_marketing_records_page"; //全店营销记录
120 static String my_marketing_records_detail_page = 116 static String my_marketing_records_detail_page =
121 "/my_marketing_records_detail_page"; //全店营销记录详情 117 "/my_marketing_records_detail_page"; //全店营销记录详情
122 static String my_make_marketing_page = "/my_make_marketing_page"; //创建营销 118 static String my_make_marketing_page = "/my_make_marketing_page"; //创建营销
123 static String my_customer_detail_page = "/my_customer_detail_page"; //客户详情 119 static String my_customer_detail_page = "/my_customer_detail_page"; //客户详情
124 - static String my_customer_detail_page_sim = "/my_customer_detail_page_sim"; //客户详情  
125 - 120 + static String my_customer_detail_page_sim =
  121 + "/my_customer_detail_page_sim"; //客户详情
  122 +
126 static String my_customer_edit_detail_page = 123 static String my_customer_edit_detail_page =
127 "/my_customer_edit_detail_page"; //编辑客户详情 124 "/my_customer_edit_detail_page"; //编辑客户详情
128 125
129 - static String my_customer_edit_detail_page_sim = 126 + static String my_customer_edit_detail_page_sim =
130 "/my_customer_edit_detail_page_sim"; //编辑客户详情 127 "/my_customer_edit_detail_page_sim"; //编辑客户详情
131 128
132 -  
133 -  
134 static String my_festival_edit_page = "/my_festival_edit_page"; //编辑纪念日 129 static String my_festival_edit_page = "/my_festival_edit_page"; //编辑纪念日
135 static String my_customer_order_page = "/my_customer_order_page"; //客户订单 130 static String my_customer_order_page = "/my_customer_order_page"; //客户订单
136 static String show_customer_list_page = 131 static String show_customer_list_page =
@@ -143,8 +138,9 @@ static String customer_detail_page_sim = "/customer_detail_page_sim"; //摰Ｘ霂 @@ -143,8 +138,9 @@ static String customer_detail_page_sim = "/customer_detail_page_sim"; //摰Ｘ霂
143 static String my_show_customer_list_page = 138 static String my_show_customer_list_page =
144 "/my_show_customer_list_page"; //仅展示的客户列表----我的 139 "/my_show_customer_list_page"; //仅展示的客户列表----我的
145 static String table_manager_page = "/table_manager_page"; //客情再次预订跳转的桌位预订页面 140 static String table_manager_page = "/table_manager_page"; //客情再次预订跳转的桌位预订页面
146 - static String table_manager_page_sim = "/table_manager_page_sim"; //客情再次预订跳转的桌位预订页面  
147 - 141 + static String table_manager_page_sim =
  142 + "/table_manager_page_sim"; //客情再次预订跳转的桌位预订页面
  143 +
148 static String account_login_page = "/account_login_page"; //账号登录页面 144 static String account_login_page = "/account_login_page"; //账号登录页面
149 static String my_table_manager_home_page = 145 static String my_table_manager_home_page =
150 "/my_table_manager_home_page"; //我的---桌位管理 146 "/my_table_manager_home_page"; //我的---桌位管理
@@ -234,9 +230,9 @@ static String customer_detail_page_sim = "/customer_detail_page_sim"; //摰Ｘ霂 @@ -234,9 +230,9 @@ static String customer_detail_page_sim = "/customer_detail_page_sim"; //摰Ｘ霂
234 "/marketing_center_home_page"; //我的---营销中心 230 "/marketing_center_home_page"; //我的---营销中心
235 static String first_image_page = "/first_image_page"; //预订安排通知定制------首图形象展示 231 static String first_image_page = "/first_image_page"; //预订安排通知定制------首图形象展示
236 static String book_info_page = "/book_info_page"; //预订安排通知定制------预订信息展示 232 static String book_info_page = "/book_info_page"; //预订安排通知定制------预订信息展示
237 - static String book_info_page_sim = "/book_info_page_sim"; //预订安排通知定制------预订信息展示 233 + static String book_info_page_sim =
  234 + "/book_info_page_sim"; //预订安排通知定制------预订信息展示
238 235
239 -  
240 static String store_introduce_page = 236 static String store_introduce_page =
241 "/store_introduce_page"; //预订安排通知定制------店铺介绍 237 "/store_introduce_page"; //预订安排通知定制------店铺介绍
242 static String chef_introduce_page = 238 static String chef_introduce_page =
@@ -248,7 +244,6 @@ static String customer_detail_page_sim = "/customer_detail_page_sim"; //摰Ｘ霂 @@ -248,7 +244,6 @@ static String customer_detail_page_sim = "/customer_detail_page_sim"; //摰Ｘ霂
248 244
249 static String marking_interaction_page_sim = 245 static String marking_interaction_page_sim =
250 "/marking_interaction_page_sim"; //预订安排通知定制------客户互动及店铺推广 246 "/marking_interaction_page_sim"; //预订安排通知定制------客户互动及店铺推广
251 -  
252 247
253 static String marking_coupon_select_page = 248 static String marking_coupon_select_page =
254 "/marking_coupon_select_page"; //预订安排通知定制------优惠券选择 249 "/marking_coupon_select_page"; //预订安排通知定制------优惠券选择
@@ -329,8 +324,7 @@ static String customer_detail_page_sim = "/customer_detail_page_sim"; //摰Ｘ霂 @@ -329,8 +324,7 @@ static String customer_detail_page_sim = "/customer_detail_page_sim"; //摰Ｘ霂
329 static String customer_notice_setting_page = 324 static String customer_notice_setting_page =
330 "/customer_notice_setting_page"; // 客户通知配置页 325 "/customer_notice_setting_page"; // 客户通知配置页
331 326
332 -  
333 - static String customer_notice_setting_page_sim = 327 + static String customer_notice_setting_page_sim =
334 "/customer_notice_setting_page_sim"; // 客户通知配置页 328 "/customer_notice_setting_page_sim"; // 客户通知配置页
335 329
336 static String order_setting_manager_page = 330 static String order_setting_manager_page =
@@ -346,13 +340,12 @@ static String customer_detail_page_sim = "/customer_detail_page_sim"; //摰Ｘ霂 @@ -346,13 +340,12 @@ static String customer_detail_page_sim = "/customer_detail_page_sim"; //摰Ｘ霂
346 340
347 static String invitation_theme_home_page = 341 static String invitation_theme_home_page =
348 "/invitation_theme_home_page"; //邀请函主题选择 342 "/invitation_theme_home_page"; //邀请函主题选择
349 -static String invitation_theme_home_page_sim = 343 + static String invitation_theme_home_page_sim =
350 "/invitation_theme_home_page_sim"; //邀请函主题选择 344 "/invitation_theme_home_page_sim"; //邀请函主题选择
351 -  
352 345
353 static String invitation_theme_home_preview_page = 346 static String invitation_theme_home_preview_page =
354 "/invitation_theme_home_preview_page"; //邀请函主题选择预览页 347 "/invitation_theme_home_preview_page"; //邀请函主题选择预览页
355 -static String invitation_theme_home_preview_page_sim = 348 + static String invitation_theme_home_preview_page_sim =
356 "/invitation_theme_home_preview_page_sim"; //邀请函主题选择预览页 349 "/invitation_theme_home_preview_page_sim"; //邀请函主题选择预览页
357 static String book_deposit_page = "/book_deposit_page"; //预订订金 350 static String book_deposit_page = "/book_deposit_page"; //预订订金
358 351
@@ -365,11 +358,9 @@ static String invitation_theme_home_preview_page_sim = @@ -365,11 +358,9 @@ static String invitation_theme_home_preview_page_sim =
365 static String sms_template_setting_page = 358 static String sms_template_setting_page =
366 "/sms_template_setting_page"; //短信模版设置 359 "/sms_template_setting_page"; //短信模版设置
367 360
368 - static String sms_template_setting_page_sim = 361 + static String sms_template_setting_page_sim =
369 "/sms_template_setting_page_sim"; //短信模版设置 362 "/sms_template_setting_page_sim"; //短信模版设置
370 363
371 -  
372 -  
373 static String coupon_poster_page = "/coupon_poster_page"; //优惠券海报 364 static String coupon_poster_page = "/coupon_poster_page"; //优惠券海报
374 365
375 static String input_name_phone_setting_page = 366 static String input_name_phone_setting_page =
@@ -378,22 +369,13 @@ static String invitation_theme_home_preview_page_sim = @@ -378,22 +369,13 @@ static String invitation_theme_home_preview_page_sim =
378 static String month_order_home_page = 369 static String month_order_home_page =
379 "/month_order_home_page"; //月度订单 全店和分经理显示 370 "/month_order_home_page"; //月度订单 全店和分经理显示
380 371
381 -  
382 - static String invication_addition_page = 372 + static String invication_addition_page =
383 "/invication_addition_page"; //预订信息模块设置-自定义图文默认 373 "/invication_addition_page"; //预订信息模块设置-自定义图文默认
384 374
385 - static String payment_setting_page = 375 + static String payment_setting_page =
386 "/payment_setting_page"; //在客户预订通知中，增加支付订金功能 376 "/payment_setting_page"; //在客户预订通知中，增加支付订金功能
387 -static String select_table_f_or_reserve = 377 + static String select_table_f_or_reserve =
388 "/select_table_f_or_reserve"; //在客户预订通知中，增加支付订金功能 378 "/select_table_f_or_reserve"; //在客户预订通知中，增加支付订金功能
389 -  
390 -  
391 -  
392 -  
393 -  
394 -  
395 -  
396 -  
397 379
398 static void configureRoutes(FluroRouter router) { 380 static void configureRoutes(FluroRouter router) {
399 router.notFoundHandler = new Handler( 381 router.notFoundHandler = new Handler(
@@ -403,19 +385,19 @@ static String select_table_f_or_reserve = @@ -403,19 +385,19 @@ static String select_table_f_or_reserve =
403 }); 385 });
404 router.define(login, handler: loginHandler); 386 router.define(login, handler: loginHandler);
405 router.define(home, handler: homeHandler); 387 router.define(home, handler: homeHandler);
406 -router.define(home_sim, handler: homeSimHandler);  
407 - 388 + router.define(home_sim, handler: homeSimHandler);
  389 +
408 router.define(handle_online_page, handler: handleOnlineHandler); 390 router.define(handle_online_page, handler: handleOnlineHandler);
409 - router.define(handle_online_page_sim, handler: handleOnlineSimHandler); 391 + router.define(handle_online_page_sim, handler: handleOnlineSimHandler);
410 router.define(reserve_detail, handler: reserveDetailHandler); 392 router.define(reserve_detail, handler: reserveDetailHandler);
411 router.define(reserve_detail_sim, handler: reserveDetailSimHandler); 393 router.define(reserve_detail_sim, handler: reserveDetailSimHandler);
412 router.define(select_table, handler: handleSelectTableHandler); 394 router.define(select_table, handler: handleSelectTableHandler);
413 router.define(select_table_f, handler: handleSelectTableFHandler); 395 router.define(select_table_f, handler: handleSelectTableFHandler);
414 -router.define(select_table_f_or_reserve, handler: handleSelectTableFOrReserveHandler);  
415 - 396 +// router.define(select_table_f_or_reserve, handler: handleSelectTableFOrReserveHandler);
  397 +
416 router.define(invication, handler: handleInvicationHandler); 398 router.define(invication, handler: handleInvicationHandler);
417 -router.define(invication_sim, handler: handleInvicationSimHandler);  
418 - 399 + router.define(invication_sim, handler: handleInvicationSimHandler);
  400 +
419 router.define(sms, handler: handleSmsHandler); 401 router.define(sms, handler: handleSmsHandler);
420 router.define(webview, handler: handleWebviewHandler); 402 router.define(webview, handler: handleWebviewHandler);
421 router.define(web_page, handler: webPageHandler); 403 router.define(web_page, handler: webPageHandler);
@@ -436,8 +418,8 @@ router.define(invication_sim, handler: handleInvicationSimHandler); @@ -436,8 +418,8 @@ router.define(invication_sim, handler: handleInvicationSimHandler);
436 router.define(coupon_detail, handler: handleCouponDetailPageHandler); 418 router.define(coupon_detail, handler: handleCouponDetailPageHandler);
437 router.define(base_info, handler: baseInfoPageHandler); 419 router.define(base_info, handler: baseInfoPageHandler);
438 420
439 - router.define(base_info_sim, handler: baseInfoPageSimHandler);  
440 - 421 + router.define(base_info_sim, handler: baseInfoPageSimHandler);
  422 +
441 router.define(binding_phone, handler: bindingPhonePageHandler); 423 router.define(binding_phone, handler: bindingPhonePageHandler);
442 router.define(if_need_create_store, handler: ifNeedCreateStorePageHandler); 424 router.define(if_need_create_store, handler: ifNeedCreateStorePageHandler);
443 router.define(create_store, handler: createStorePageHandler); 425 router.define(create_store, handler: createStorePageHandler);
@@ -465,8 +447,8 @@ router.define(invication_sim, handler: handleInvicationSimHandler); @@ -465,8 +447,8 @@ router.define(invication_sim, handler: handleInvicationSimHandler);
465 router.define(sms_recharge_page, handler: smsRechargePageHandler); 447 router.define(sms_recharge_page, handler: smsRechargePageHandler);
466 router.define(store_base_info_page, handler: storeBaseInfoPageHandler); 448 router.define(store_base_info_page, handler: storeBaseInfoPageHandler);
467 449
468 -  
469 - router.define(store_base_info_page_sim, handler: storeBaseInfoPageSimHandler); 450 + router.define(store_base_info_page_sim,
  451 + handler: storeBaseInfoPageSimHandler);
470 router.define(room_type_manage_page, handler: roomTypeManagePageHandler); 452 router.define(room_type_manage_page, handler: roomTypeManagePageHandler);
471 router.define(room_type_create_page, handler: roomTypeCreatePageHandler); 453 router.define(room_type_create_page, handler: roomTypeCreatePageHandler);
472 router.define(room_type_select_table_page, 454 router.define(room_type_select_table_page,
@@ -475,11 +457,13 @@ router.define(invication_sim, handler: handleInvicationSimHandler); @@ -475,11 +457,13 @@ router.define(invication_sim, handler: handleInvicationSimHandler);
475 router.define(menu_category_page, handler: menuCategoryPageHandle); 457 router.define(menu_category_page, handler: menuCategoryPageHandle);
476 router.define(menu_add_dishes_page, handler: menuAddDishesPageHandle); 458 router.define(menu_add_dishes_page, handler: menuAddDishesPageHandle);
477 router.define(personnel_manage_page, handler: personnelManagePageHandle); 459 router.define(personnel_manage_page, handler: personnelManagePageHandle);
478 -  
479 - router.define(personnel_manage_page_sim, handler: personnelManagePageSimHandle); 460 +
  461 + router.define(personnel_manage_page_sim,
  462 + handler: personnelManagePageSimHandle);
480 router.define(personnel_detail_page, handler: personnelDetailPageHandle); 463 router.define(personnel_detail_page, handler: personnelDetailPageHandle);
481 - router.define(personnel_detail_page_sim, handler: personnelDetailPageSimHandle);  
482 - 464 + router.define(personnel_detail_page_sim,
  465 + handler: personnelDetailPageSimHandle);
  466 +
483 router.define(personnel_password_page, 467 router.define(personnel_password_page,
484 handler: personnelPasswordPageHandle); 468 handler: personnelPasswordPageHandle);
485 router.define(personnel_password_edit_page, 469 router.define(personnel_password_edit_page,
@@ -490,7 +474,6 @@ router.define(invication_sim, handler: handleInvicationSimHandler); @@ -490,7 +474,6 @@ router.define(invication_sim, handler: handleInvicationSimHandler);
490 router.define(store_customer_page, handler: storeCustomerPageHandle); 474 router.define(store_customer_page, handler: storeCustomerPageHandle);
491 router.define(customer_list_page, handler: customerListPageHandle); 475 router.define(customer_list_page, handler: customerListPageHandle);
492 476
493 -  
494 router.define(customer_list_page_sim, handler: customerListPageSimHandle); 477 router.define(customer_list_page_sim, handler: customerListPageSimHandle);
495 router.define(customer_set_page, handler: customerSettingPageHandle); 478 router.define(customer_set_page, handler: customerSettingPageHandle);
496 router.define(marketing_records_page, handler: marketingRecordsPageHandle); 479 router.define(marketing_records_page, handler: marketingRecordsPageHandle);
@@ -498,33 +481,35 @@ router.define(invication_sim, handler: handleInvicationSimHandler); @@ -498,33 +481,35 @@ router.define(invication_sim, handler: handleInvicationSimHandler);
498 handler: marketingRecordsDetailPageHandle); 481 handler: marketingRecordsDetailPageHandle);
499 router.define(make_marketing_page, handler: makeMarkingPageHandle); 482 router.define(make_marketing_page, handler: makeMarkingPageHandle);
500 router.define(customer_detail_page, handler: customerDetailPageHandle); 483 router.define(customer_detail_page, handler: customerDetailPageHandle);
501 - router.define(customer_detail_page_sim, handler: customerDetailPageSimHandle);  
502 - 484 + router.define(customer_detail_page_sim,
  485 + handler: customerDetailPageSimHandle);
  486 +
503 router.define(customer_edit_detail_page, 487 router.define(customer_edit_detail_page,
504 handler: customerDetailEditPageHandle); 488 handler: customerDetailEditPageHandle);
505 - router.define(customer_edit_detail_page_sim, 489 + router.define(customer_edit_detail_page_sim,
506 handler: customerDetailEditPageSimHandle); 490 handler: customerDetailEditPageSimHandle);
507 - 491 +
508 router.define(festival_edit_page, handler: festivalEditPageHandle); 492 router.define(festival_edit_page, handler: festivalEditPageHandle);
509 router.define(customer_order_page, handler: customerOrderPageHandle); 493 router.define(customer_order_page, handler: customerOrderPageHandle);
510 router.define(my_customer_page, handler: myCustomerPageHandle); 494 router.define(my_customer_page, handler: myCustomerPageHandle);
511 495
512 router.define(my_customer_list_page, handler: myCustomerListPageHandle); 496 router.define(my_customer_list_page, handler: myCustomerListPageHandle);
513 -  
514 - router.define(my_customer_list_page_sim, handler: myCustomerListPageSimHandle); 497 +
  498 + router.define(my_customer_list_page_sim,
  499 + handler: myCustomerListPageSimHandle);
515 router.define(my_marketing_records_page, 500 router.define(my_marketing_records_page,
516 handler: myMarketingRecordsPageHandle); 501 handler: myMarketingRecordsPageHandle);
517 router.define(my_marketing_records_detail_page, 502 router.define(my_marketing_records_detail_page,
518 handler: myMarketingRecordsDetailPageHandle); 503 handler: myMarketingRecordsDetailPageHandle);
519 router.define(my_make_marketing_page, handler: myMakeMarkingPageHandle); 504 router.define(my_make_marketing_page, handler: myMakeMarkingPageHandle);
520 router.define(my_customer_detail_page, handler: myCustomerDetailPageHandle); 505 router.define(my_customer_detail_page, handler: myCustomerDetailPageHandle);
521 - router.define(my_customer_detail_page_sim, handler: myCustomerDetailPageSimHandle);  
522 - 506 + router.define(my_customer_detail_page_sim,
  507 + handler: myCustomerDetailPageSimHandle);
  508 +
523 router.define(my_customer_edit_detail_page, 509 router.define(my_customer_edit_detail_page,
524 handler: myCustomerDetailEditPageHandle); 510 handler: myCustomerDetailEditPageHandle);
525 511
526 -  
527 - router.define(my_customer_edit_detail_page_sim, 512 + router.define(my_customer_edit_detail_page_sim,
528 handler: myCustomerDetailEditPagSimHandle); 513 handler: myCustomerDetailEditPagSimHandle);
529 router.define(my_festival_edit_page, handler: myFestivalEditPageHandle); 514 router.define(my_festival_edit_page, handler: myFestivalEditPageHandle);
530 router.define(my_customer_order_page, handler: myCustomerOrderPageHandle); 515 router.define(my_customer_order_page, handler: myCustomerOrderPageHandle);
@@ -537,7 +522,7 @@ router.define(invication_sim, handler: handleInvicationSimHandler); @@ -537,7 +522,7 @@ router.define(invication_sim, handler: handleInvicationSimHandler);
537 handler: myShowCustomerListPageHandle); 522 handler: myShowCustomerListPageHandle);
538 router.define(table_manager_page, handler: tableManagerPageHandle); 523 router.define(table_manager_page, handler: tableManagerPageHandle);
539 router.define(table_manager_page_sim, handler: tableManagerPageSimHandle); 524 router.define(table_manager_page_sim, handler: tableManagerPageSimHandle);
540 - 525 +
541 router.define(account_login_page, handler: accountLoginPageHandle); 526 router.define(account_login_page, handler: accountLoginPageHandle);
542 router.define(my_table_manager_home_page, 527 router.define(my_table_manager_home_page,
543 handler: myTableManagerHomePageHandle); 528 handler: myTableManagerHomePageHandle);
@@ -619,9 +604,7 @@ router.define(invication_sim, handler: handleInvicationSimHandler); @@ -619,9 +604,7 @@ router.define(invication_sim, handler: handleInvicationSimHandler);
619 604
620 router.define(book_info_page, handler: bookInfoPageHandle); 605 router.define(book_info_page, handler: bookInfoPageHandle);
621 606
622 -  
623 -  
624 - router.define(book_info_page_sim, handler: bookInfoPageSimHandle); 607 + router.define(book_info_page_sim, handler: bookInfoPageSimHandle);
625 router.define(store_introduce_page, handler: storeIntroducePageHandle); 608 router.define(store_introduce_page, handler: storeIntroducePageHandle);
626 router.define(chef_introduce_page, handler: chefIntroducePageHandle); 609 router.define(chef_introduce_page, handler: chefIntroducePageHandle);
627 610
@@ -629,8 +612,7 @@ router.define(invication_sim, handler: handleInvicationSimHandler); @@ -629,8 +612,7 @@ router.define(invication_sim, handler: handleInvicationSimHandler);
629 router.define(marking_interaction_page, 612 router.define(marking_interaction_page,
630 handler: markingInteractionPageHandle); 613 handler: markingInteractionPageHandle);
631 614
632 -  
633 - router.define(marking_interaction_page_sim, 615 + router.define(marking_interaction_page_sim,
634 handler: markingInteractionPageSimHandle); 616 handler: markingInteractionPageSimHandle);
635 router.define(marking_coupon_select_page, 617 router.define(marking_coupon_select_page,
636 handler: markingCouponSelectPageHandle); 618 handler: markingCouponSelectPageHandle);
@@ -680,9 +662,7 @@ router.define(invication_sim, handler: handleInvicationSimHandler); @@ -680,9 +662,7 @@ router.define(invication_sim, handler: handleInvicationSimHandler);
680 router.define(customer_notice_setting_page, 662 router.define(customer_notice_setting_page,
681 handler: customerNoticeSettingPageHandle); 663 handler: customerNoticeSettingPageHandle);
682 664
683 -  
684 -  
685 - router.define( customer_notice_setting_page_sim, 665 + router.define(customer_notice_setting_page_sim,
686 handler: customerNoticeSettingPageSimHandle); 666 handler: customerNoticeSettingPageSimHandle);
687 667
688 router.define(order_setting_manager_page, 668 router.define(order_setting_manager_page,
@@ -700,11 +680,11 @@ router.define(invication_sim, handler: handleInvicationSimHandler); @@ -700,11 +680,11 @@ router.define(invication_sim, handler: handleInvicationSimHandler);
700 680
701 router.define(invitation_theme_home_page, 681 router.define(invitation_theme_home_page,
702 handler: invitationThemeHomePageHandle); 682 handler: invitationThemeHomePageHandle);
703 - router.define(invitation_theme_home_page_sim, 683 + router.define(invitation_theme_home_page_sim,
704 handler: invitationThemeHomePageSimHandle); 684 handler: invitationThemeHomePageSimHandle);
705 router.define(invitation_theme_home_preview_page, 685 router.define(invitation_theme_home_preview_page,
706 handler: invitationThemeHomePreviewPageHandle); 686 handler: invitationThemeHomePreviewPageHandle);
707 - router.define(invitation_theme_home_preview_page_sim, 687 + router.define(invitation_theme_home_preview_page_sim,
708 handler: invitationThemeHomePreviewPageSimHandle); 688 handler: invitationThemeHomePreviewPageSimHandle);
709 router.define(book_deposit_page, handler: bookDepositPageHandle); 689 router.define(book_deposit_page, handler: bookDepositPageHandle);
710 router.define(verify_food_page, handler: verifyFoodPageHandle); 690 router.define(verify_food_page, handler: verifyFoodPageHandle);
@@ -716,24 +696,18 @@ router.define(invication_sim, handler: handleInvicationSimHandler); @@ -716,24 +696,18 @@ router.define(invication_sim, handler: handleInvicationSimHandler);
716 router.define(sms_template_setting_page, 696 router.define(sms_template_setting_page,
717 handler: smsTemplateSettingPageHandle); 697 handler: smsTemplateSettingPageHandle);
718 698
719 - router.define(sms_template_setting_page_sim, 699 + router.define(sms_template_setting_page_sim,
720 handler: smsTemplateSettingPageSimHandle); 700 handler: smsTemplateSettingPageSimHandle);
721 701
722 router.define(coupon_poster_page, handler: couponPosterPageHandle); 702 router.define(coupon_poster_page, handler: couponPosterPageHandle);
723 703
  704 + router.define(input_name_phone_setting_page,
  705 + handler: inputNamePhoneSettingPageHandle);
724 706
725 - router.define(input_name_phone_setting_page, handler: inputNamePhoneSettingPageHandle);  
726 -  
727 router.define(month_order_home_page, handler: monthOrderHomePageHandle); 707 router.define(month_order_home_page, handler: monthOrderHomePageHandle);
728 708
729 - router.define(invication_addition_page, handler: invicationAdditionPageHandle);  
730 - router.define(payment_setting_page, handler: paymentSettingPageHandle);  
731 -  
732 -  
733 -  
734 -  
735 -  
736 -  
737 - 709 + router.define(invication_addition_page,
  710 + handler: invicationAdditionPageHandle);
  711 + router.define(payment_setting_page, handler: paymentSettingPageHandle);
738 } 712 }
739 } 713 }