xt / Flutter-ReserveApp · Commits

Go to a project

Commit 622ea624b9dd30cb3fd739beefabc46a1a8b503c

Authored by weixin_45529955
1 parent 8bedf33e
build: skipped

我的页面UI桌位合并

Inline Side-by-side
Showing 13 changed files with 256 additions and 150 deletions
@@ -535,7 +535,7 @@ @@ -535,7 +535,7 @@
535 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 535 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
536 CLANG_ENABLE_MODULES = YES; 536 CLANG_ENABLE_MODULES = YES;
537 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 537 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
538 - CURRENT_PROJECT_VERSION = 5641; 538 + CURRENT_PROJECT_VERSION = 5642;
539 DEVELOPMENT_TEAM = 8J59HM8B82; 539 DEVELOPMENT_TEAM = 8J59HM8B82;
540 ENABLE_BITCODE = NO; 540 ENABLE_BITCODE = NO;
541 INFOPLIST_FILE = Runner/Info.plist; 541 INFOPLIST_FILE = Runner/Info.plist;
@@ -718,7 +718,7 @@ @@ -718,7 +718,7 @@
718 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 718 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
719 CLANG_ENABLE_MODULES = YES; 719 CLANG_ENABLE_MODULES = YES;
720 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 720 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
721 - CURRENT_PROJECT_VERSION = 5641; 721 + CURRENT_PROJECT_VERSION = 5642;
722 DEVELOPMENT_TEAM = 8J59HM8B82; 722 DEVELOPMENT_TEAM = 8J59HM8B82;
723 ENABLE_BITCODE = NO; 723 ENABLE_BITCODE = NO;
724 INFOPLIST_FILE = Runner/Info.plist; 724 INFOPLIST_FILE = Runner/Info.plist;
@@ -744,7 +744,7 @@ @@ -744,7 +744,7 @@
744 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 744 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
745 CLANG_ENABLE_MODULES = YES; 745 CLANG_ENABLE_MODULES = YES;
746 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 746 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
747 - CURRENT_PROJECT_VERSION = 5641; 747 + CURRENT_PROJECT_VERSION = 5642;
748 DEVELOPMENT_TEAM = 8J59HM8B82; 748 DEVELOPMENT_TEAM = 8J59HM8B82;
749 ENABLE_BITCODE = NO; 749 ENABLE_BITCODE = NO;
750 INFOPLIST_FILE = Runner/Info.plist; 750 INFOPLIST_FILE = Runner/Info.plist;
@@ -72,7 +72,7 @@ class Constant { @@ -72,7 +72,7 @@ class Constant {
72 '包间置满': [ 72 '包间置满': [
73 '管理员', 73 '管理员',
74 '店长', 74 '店长',
75 - '客户经理', 75 + // '客户经理',
76 ], 76 ],
77 '宴会管理': [ 77 '宴会管理': [
78 '管理员', 78 '管理员',
@@ -86,6 +86,10 @@ class Constant { @@ -86,6 +86,10 @@ class Constant {
86 '管理员', 86 '管理员',
87 '店长', 87 '店长',
88 ], 88 ],
  89 + '桌位设置': [
  90 + '管理员',
  91 + '店长',
  92 + ],
89 '创建宴会': ['管理员', '店长', '客户经理', '收银员', '服务员', '前台'], 93 '创建宴会': ['管理员', '店长', '客户经理', '收银员', '服务员', '前台'],
90 '编辑宴会': ['管理员', '店长', '客户经理', '收银员', '服务员', '前台'], 94 '编辑宴会': ['管理员', '店长', '客户经理', '收银员', '服务员', '前台'],
91 '丢单': ['管理员', '店长', '客户经理', '收银员', '服务员', '前台'], 95 '丢单': ['管理员', '店长', '客户经理', '收银员', '服务员', '前台'],
@@ -101,7 +101,10 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { @@ -101,7 +101,10 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
101 101
102 // _getSellerById(); 102 // _getSellerById();
103 103
104 - if (Provider.of<UserModel>(context,listen: false).user!.role_name_addition == '迎宾') { 104 + if (Provider.of<UserModel>(context, listen: false)
  105 + .user!
  106 + .role_name_addition ==
  107 + '迎宾') {
105 _getAuthUserLists(showLoading: false); 108 _getAuthUserLists(showLoading: false);
106 } 109 }
107 getMyPageCountData(); 110 getMyPageCountData();
@@ -1428,68 +1431,23 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { @@ -1428,68 +1431,23 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
1428 return; 1431 return;
1429 } 1432 }
1430 if (Utils.getAuthority( 1433 if (Utils.getAuthority(
1431 - context, '桌位管理')) {  
1432 - NavigatorUtil  
1433 - .goMyTableManagerHomePage(  
1434 - context); 1434 + context, '桌位设置')) {
  1435 + NavigatorUtil.goTableHome(context);
1435 } 1436 }
1436 }, 1437 },
1437 child: _item( 1438 child: _item(
1438 outDay == '0' || 1439 outDay == '0' ||
1439 !Utils.getAuthority( 1440 !Utils.getAuthority(
1440 - context, '桌位管理')  
1441 - ? Utils.getImgPath('zwgl_un')  
1442 - : Utils.getImgPath('zwgl'),  
1443 - '桌位管理', 1441 + context, '桌位设置')
  1442 + ? Utils.getImgPath(
  1443 + 'table_home_un')
  1444 + : Utils.getImgPath('table_home'),
  1445 + '桌位设置',
1444 isRowLow: outDay == '0' || 1446 isRowLow: outDay == '0' ||
1445 !Utils.getAuthority( 1447 !Utils.getAuthority(
1446 - context, '桌位管理')), 1448 + context, '桌位设置')),
1447 ), 1449 ),
1448 InkWell( 1450 InkWell(
1449 - onTap: () async {  
1450 - if (outDay == '0') {  
1451 - return;  
1452 - }  
1453 - if (Utils.getAuthority(  
1454 - context, '桌位照片')) {  
1455 - // Map temp =  
1456 - await NavigatorUtil  
1457 - .goPhotoManagerSelectTablePage(  
1458 - context,  
1459 - "",  
1460 - DateTime.now()  
1461 - .millisecondsSinceEpoch,  
1462 - "1",  
1463 - canChoose: true,  
1464 - object: null,  
1465 - fromPage: "tablePhoto",  
1466 - tid: '');  
1467 - // if (temp != null && temp['tid'] != '') {  
1468 - // // print(temp['tid']);  
1469 - // // print(temp['tname']);  
1470 - // // tname = temp['tname'];  
1471 - // // tid = temp['tid'];  
1472 - // // _getTablePhoto(context, temp['tid'], showLoading: true)  
1473 - }  
1474 - },  
1475 - child: _item(  
1476 - outDay == '0' ||  
1477 - !Utils.getAuthority(  
1478 - context, '桌位照片')  
1479 - ? Utils.getImgPath('zwzp_un')  
1480 - : Utils.getImgPath('zwzp'),  
1481 - '桌位照片',  
1482 - isRowLow: outDay == '0' ||  
1483 - !Utils.getAuthority(  
1484 - context, '桌位照片')))  
1485 - ],  
1486 - ),  
1487 - VEmptyView(68),  
1488 - Row(  
1489 - mainAxisAlignment:  
1490 - MainAxisAlignment.spaceBetween,  
1491 - children: [  
1492 - InkWell(  
1493 onTap: () { 1451 onTap: () {
1494 if (outDay == '0') { 1452 if (outDay == '0') {
1495 return; 1453 return;
@@ -1510,6 +1468,50 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { @@ -1510,6 +1468,50 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
1510 isRowLow: outDay == '0' || 1468 isRowLow: outDay == '0' ||
1511 !Utils.getAuthority( 1469 !Utils.getAuthority(
1512 context, '员工管理'))), 1470 context, '员工管理'))),
  1471 + // InkWell(
  1472 + // onTap: () async {
  1473 + // if (outDay == '0') {
  1474 + // return;
  1475 + // }
  1476 + // if (Utils.getAuthority(
  1477 + // context, '桌位照片')) {
  1478 + // // Map temp =
  1479 + // await NavigatorUtil
  1480 + // .goPhotoManagerSelectTablePage(
  1481 + // context,
  1482 + // "",
  1483 + // DateTime.now()
  1484 + // .millisecondsSinceEpoch,
  1485 + // "1",
  1486 + // canChoose: true,
  1487 + // object: null,
  1488 + // fromPage: "tablePhoto",
  1489 + // tid: '');
  1490 + // // if (temp != null && temp['tid'] != '') {
  1491 + // // // print(temp['tid']);
  1492 + // // // print(temp['tname']);
  1493 + // // // tname = temp['tname'];
  1494 + // // // tid = temp['tid'];
  1495 + // // // _getTablePhoto(context, temp['tid'], showLoading: true)
  1496 + // }
  1497 + // },
  1498 + // child: _item(
  1499 + // outDay == '0' ||
  1500 + // !Utils.getAuthority(
  1501 + // context, '桌位照片')
  1502 + // ? Utils.getImgPath('zwzp_un')
  1503 + // : Utils.getImgPath('zwzp'),
  1504 + // '桌位照片',
  1505 + // isRowLow: outDay == '0' ||
  1506 + // !Utils.getAuthority(
  1507 + // context, '桌位照片')))
  1508 + ],
  1509 + ),
  1510 + VEmptyView(68),
  1511 + Row(
  1512 + mainAxisAlignment:
  1513 + MainAxisAlignment.spaceBetween,
  1514 + children: [
1513 InkWell( 1515 InkWell(
1514 onTap: () { 1516 onTap: () {
1515 if (outDay == '0') { 1517 if (outDay == '0') {
@@ -1537,56 +1539,6 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { @@ -1537,56 +1539,6 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
1537 return; 1539 return;
1538 } 1540 }
1539 if (Utils.getAuthority( 1541 if (Utils.getAuthority(
1540 - context, '包间类型')) {  
1541 - NavigatorUtil.goRoomTypeManagePage(  
1542 - context);  
1543 - }  
1544 - },  
1545 - child: _item(  
1546 - outDay == '0' ||  
1547 - !Utils.getAuthority(  
1548 - context, '包间类型')  
1549 - ? Utils.getImgPath('bjlx_un')  
1550 - : Utils.getImgPath('bjlx'),  
1551 - '包间类型',  
1552 - isRowLow: outDay == '0' ||  
1553 - !Utils.getAuthority(  
1554 - context, '包间类型'))),  
1555 - InkWell(  
1556 - onTap: () {  
1557 - if (outDay == '0') {  
1558 - return;  
1559 - }  
1560 - if (Utils.getAuthority(  
1561 - context, '包间置满')) {  
1562 - NavigatorUtil  
1563 - .goStoreTypeFillManagePage(  
1564 - context);  
1565 - }  
1566 - },  
1567 - child: _item(  
1568 - outDay == '0' ||  
1569 - !Utils.getAuthority(  
1570 - context, '包间置满')  
1571 - ? Utils.getImgPath('bjzm_un')  
1572 - : Utils.getImgPath('bjzm'),  
1573 - '包间置满',  
1574 - isRowLow: outDay == '0' ||  
1575 - !Utils.getAuthority(  
1576 - context, '包间置满')))  
1577 - ],  
1578 - ),  
1579 - VEmptyView(68),  
1580 - Row(  
1581 - mainAxisAlignment:  
1582 - MainAxisAlignment.spaceBetween,  
1583 - children: [  
1584 - InkWell(  
1585 - onTap: () {  
1586 - if (outDay == '0') {  
1587 - return;  
1588 - }  
1589 - if (Utils.getAuthority(  
1590 context, '宴会管理')) { 1542 context, '宴会管理')) {
1591 NavigatorUtil.goFeastManageHomePage( 1543 NavigatorUtil.goFeastManageHomePage(
1592 context); 1544 context);
@@ -1648,6 +1600,56 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { @@ -1648,6 +1600,56 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
1648 isRowLow: outDay == '0' || 1600 isRowLow: outDay == '0' ||
1649 !Utils.getAuthority( 1601 !Utils.getAuthority(
1650 context, '评价管理'))), 1602 context, '评价管理'))),
  1603 + // InkWell(
  1604 + // onTap: () {
  1605 + // if (outDay == '0') {
  1606 + // return;
  1607 + // }
  1608 + // if (Utils.getAuthority(
  1609 + // context, '包间类型')) {
  1610 + // NavigatorUtil.goRoomTypeManagePage(
  1611 + // context);
  1612 + // }
  1613 + // },
  1614 + // child: _item(
  1615 + // outDay == '0' ||
  1616 + // !Utils.getAuthority(
  1617 + // context, '包间类型')
  1618 + // ? Utils.getImgPath('bjlx_un')
  1619 + // : Utils.getImgPath('bjlx'),
  1620 + // '包间类型',
  1621 + // isRowLow: outDay == '0' ||
  1622 + // !Utils.getAuthority(
  1623 + // context, '包间类型'))),
  1624 + // InkWell(
  1625 + // onTap: () {
  1626 + // if (outDay == '0') {
  1627 + // return;
  1628 + // }
  1629 + // if (Utils.getAuthority(
  1630 + // context, '包间置满')) {
  1631 + // NavigatorUtil
  1632 + // .goStoreTypeFillManagePage(
  1633 + // context);
  1634 + // }
  1635 + // },
  1636 + // child: _item(
  1637 + // outDay == '0' ||
  1638 + // !Utils.getAuthority(
  1639 + // context, '包间置满')
  1640 + // ? Utils.getImgPath('bjzm_un')
  1641 + // : Utils.getImgPath('bjzm'),
  1642 + // '包间置满',
  1643 + // isRowLow: outDay == '0' ||
  1644 + // !Utils.getAuthority(
  1645 + // context, '包间置满')))
  1646 + ],
  1647 + ),
  1648 + VEmptyView(68),
  1649 + Row(
  1650 + mainAxisAlignment:
  1651 + MainAxisAlignment.spaceBetween,
  1652 + children: [
1651 InkWell( 1653 InkWell(
1652 onTap: () { 1654 onTap: () {
1653 if (outDay == '0') { 1655 if (outDay == '0') {
@@ -1670,6 +1672,12 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { @@ -1670,6 +1672,12 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
1670 isRowLow: outDay == '0' || 1672 isRowLow: outDay == '0' ||
1671 !Utils.getAuthority( 1673 !Utils.getAuthority(
1672 context, '收银管理'))), 1674 context, '收银管理'))),
  1675 + InkWell(
  1676 + onTap: () {}, child: _item('', '空空空空')),
  1677 + InkWell(
  1678 + onTap: () {}, child: _item('', '空空空空')),
  1679 + InkWell(
  1680 + onTap: () {}, child: _item('', '空空空空')),
1673 ], 1681 ],
1674 ) 1682 )
1675 ], 1683 ],
@@ -94,7 +94,7 @@ class PhotoManagerPageState extends State<PhotoManagerPage> { @@ -94,7 +94,7 @@ class PhotoManagerPageState extends State<PhotoManagerPage> {
94 94
95 @override 95 @override
96 void dispose() { 96 void dispose() {
97 - EventBus().emit('changeStatusColor'); 97 + // EventBus().emit('changeStatusColor');
98 super.dispose(); 98 super.dispose();
99 bus.off("refresh_photo_manager"); 99 bus.off("refresh_photo_manager");
100 } 100 }
@@ -38,7 +38,7 @@ class _RoomTypeManagePageState extends State<RoomTypeManagePage> { @@ -38,7 +38,7 @@ class _RoomTypeManagePageState extends State<RoomTypeManagePage> {
38 @override 38 @override
39 void dispose() { 39 void dispose() {
40 // TODO: implement dispose 40 // TODO: implement dispose
41 - EventBus().emit('changeStatusColor'); 41 + // EventBus().emit('changeStatusColor');
42 super.dispose(); 42 super.dispose();
43 EventBus().off('table_manage_page'); 43 EventBus().off('table_manage_page');
44 } 44 }
@@ -81,7 +81,7 @@ class StoreTypeFillManagePageState extends State<StoreTypeFillManagePage> { @@ -81,7 +81,7 @@ class StoreTypeFillManagePageState extends State<StoreTypeFillManagePage> {
81 void dispose() { 81 void dispose() {
82 // TODO: implement dispose 82 // TODO: implement dispose
83 // _calendarController.dispose(); 83 // _calendarController.dispose();
84 - EventBus().emit('changeStatusColor'); 84 + // EventBus().emit('changeStatusColor');
85 super.dispose(); 85 super.dispose();
86 } 86 }
87 87
@@ -98,10 +98,10 @@ class StoreTypeFillManagePageState extends State<StoreTypeFillManagePage> { @@ -98,10 +98,10 @@ class StoreTypeFillManagePageState extends State<StoreTypeFillManagePage> {
98 //初始化时间 98 //初始化时间
99 initTimeTable({bool needInit = true}) { 99 initTimeTable({bool needInit = true}) {
100 String? morning = "00:00-00:00"; //早市时间段 100 String? morning = "00:00-00:00"; //早市时间段
101 - String? noon="00:00-00:00"; //午市时间段  
102 - String? night="00:00-00:00"; //晚市时间段  
103 - String? meal1="00:00-00:00"; //晚市时间段  
104 - String? meal2="00:00-00:00"; //晚市时间段 101 + String? noon = "00:00-00:00"; //午市时间段
  102 + String? night = "00:00-00:00"; //晚市时间段
  103 + String? meal1 = "00:00-00:00"; //晚市时间段
  104 + String? meal2 = "00:00-00:00"; //晚市时间段
105 if (storeBaseIndoProvider.dayDateData != null && 105 if (storeBaseIndoProvider.dayDateData != null &&
106 storeBaseIndoProvider.dayDateData!.length > 0) { 106 storeBaseIndoProvider.dayDateData!.length > 0) {
107 pageState = PageState.Success; 107 pageState = PageState.Success;
  1 +import 'package:contacts_service/contacts_service.dart';
  2 +import 'package:flutter/material.dart';
  3 +import 'package:one_key/res/colors.dart';
  4 +import 'package:one_key/route/navigator_util.dart';
  5 +import 'package:one_key/utils/event_bus.dart';
  6 +import 'package:one_key/utils/screen_util.dart';
  7 +import 'package:one_key/utils/utils.dart';
  8 +import 'package:one_key/widgets/system_app_bar.dart';
  9 +
  10 +/**
  11 + * 桌位设置
  12 + */
  13 +
  14 +class TableHome extends StatefulWidget {
  15 + const TableHome({super.key});
  16 +
  17 + @override
  18 + State<TableHome> createState() => _TableHomeState();
  19 +}
  20 +
  21 +class _TableHomeState extends State<TableHome> {
  22 + @override
  23 + void dispose() {
  24 + // TODO: implement dispose
  25 + // controller.removeListener(scheduleRebuild);
  26 + EventBus().emit('changeStatusColor');
  27 + super.dispose();
  28 + // EventBus().off("refresh_tablePhoto");
  29 + }
  30 +
  31 + _item(String title, {GestureTapCallback? onTap}) {
  32 + return InkWell(
  33 + onTap: onTap,
  34 + child: Container(
  35 + height: w(48),
  36 + margin: EdgeInsets.only(top: w(12), left: w(16)),
  37 + padding: EdgeInsets.only(top: 12, bottom: 12, right: 16),
  38 + decoration: BoxDecoration(
  39 + border: Border(
  40 + bottom: BorderSide(
  41 + color: MyColours.color_E7E7E7, width: w(0.5)))),
  42 + child: Row(
  43 + mainAxisAlignment: MainAxisAlignment.spaceBetween,
  44 + children: [
  45 + Text(
  46 + title,
  47 + style: TextStyle(
  48 + fontSize: font(16), color: MyColours.color_515151),
  49 + ),
  50 + Image.asset(
  51 + "assets/arrow_right_new.png",
  52 + width: w(7),
  53 + height: w(11),
  54 + )
  55 + ],
  56 + ),
  57 + ));
  58 + }
  59 +
  60 + @override
  61 + Widget build(BuildContext context) {
  62 + return Scaffold(
  63 + appBar: SystemAppBar('桌位设置'),
  64 + backgroundColor: MyColours.color_ffffff,
  65 + body: SingleChildScrollView(
  66 + child: Column(
  67 + children: [
  68 + _item('桌位管理', onTap: () {
  69 + NavigatorUtil.goMyTableManagerHomePage(context);
  70 + }),
  71 + _item('桌位照片', onTap: () async {
  72 + await NavigatorUtil.goPhotoManagerSelectTablePage(
  73 + context, "", DateTime.now().millisecondsSinceEpoch, "1",
  74 + canChoose: true,
  75 + object: null,
  76 + fromPage: "tablePhoto",
  77 + tid: '');
  78 + }),
  79 + _item('包间类型', onTap: () {
  80 + NavigatorUtil.goRoomTypeManagePage(context);
  81 + }),
  82 + _item('包间置满', onTap: () {
  83 + NavigatorUtil.goStoreTypeFillManagePage(context);
  84 + })
  85 + ],
  86 + ),
  87 + ),
  88 + );
  89 + }
  90 +}
@@ -105,7 +105,7 @@ class MyTableManagerHomePageState extends State<MyTableManagerHomePage> { @@ -105,7 +105,7 @@ class MyTableManagerHomePageState extends State<MyTableManagerHomePage> {
105 void dispose() { 105 void dispose() {
106 // TODO: implement dispose 106 // TODO: implement dispose
107 // controller.removeListener(scheduleRebuild); 107 // controller.removeListener(scheduleRebuild);
108 - EventBus().emit('changeStatusColor'); 108 + // EventBus().emit('changeStatusColor');
109 super.dispose(); 109 super.dispose();
110 EventBus().off("refresh_table_area"); 110 EventBus().off("refresh_table_area");
111 // EventBus().off("refresh_tablePhoto"); 111 // EventBus().off("refresh_tablePhoto");
@@ -1093,7 +1093,10 @@ class NavigatorUtil { @@ -1093,7 +1093,10 @@ class NavigatorUtil {
1093 ///优惠券----可发放员工 1093 ///优惠券----可发放员工
1094 static Future<dynamic> goCouponToPersonnalPage( 1094 static Future<dynamic> goCouponToPersonnalPage(
1095 BuildContext context, String? uids, 1095 BuildContext context, String? uids,
1096 - {replace = false,bool needSave = false, bool onlyShow = false,String id = ''}) { 1096 + {replace = false,
  1097 + bool needSave = false,
  1098 + bool onlyShow = false,
  1099 + String id = ''}) {
1097 return _navigateTo(context, 1100 return _navigateTo(context,
1098 "${Routes.coupon_to_personnel_page}?uids=$uids&onlyShow=$onlyShow&needSave=$needSave&id=$id", 1101 "${Routes.coupon_to_personnel_page}?uids=$uids&onlyShow=$onlyShow&needSave=$needSave&id=$id",
1099 replace: replace); 1102 replace: replace);
@@ -2400,28 +2403,24 @@ class NavigatorUtil { @@ -2400,28 +2403,24 @@ class NavigatorUtil {
2400 replace: replace); 2403 replace: replace);
2401 } 2404 }
2402 2405
2403 -///会员充值交易详情 2406 + ///会员充值交易详情
2404 static Future<dynamic> goVipRecordDetailPage( 2407 static Future<dynamic> goVipRecordDetailPage(
2405 BuildContext context, 2408 BuildContext context,
2406 // String? status, 2409 // String? status,
2407 String? id, { 2410 String? id, {
2408 replace = false, 2411 replace = false,
2409 }) { 2412 }) {
2410 - return _navigateTo(context,  
2411 - "${Routes.vip_record_detail_page}?id=$id", 2413 + return _navigateTo(context, "${Routes.vip_record_detail_page}?id=$id",
2412 replace: replace); 2414 replace: replace);
2413 } 2415 }
2414 2416
2415 -  
2416 - ///预订订金交易详情 2417 + ///预订订金交易详情
2417 static Future<dynamic> goDepositRecordDetailPage( 2418 static Future<dynamic> goDepositRecordDetailPage(
2418 BuildContext context, 2419 BuildContext context,
2419 -  
2420 String? id, { 2420 String? id, {
2421 replace = false, 2421 replace = false,
2422 }) { 2422 }) {
2423 - return _navigateTo(context,  
2424 - "${Routes.deposit_record_detail_page}?id=$id", 2423 + return _navigateTo(context, "${Routes.deposit_record_detail_page}?id=$id",
2425 replace: replace); 2424 replace: replace);
2426 } 2425 }
2427 2426
@@ -2452,26 +2451,18 @@ class NavigatorUtil { @@ -2452,26 +2451,18 @@ class NavigatorUtil {
2452 replace: replace); 2451 replace: replace);
2453 } 2452 }
2454 2453
2455 -  
2456 -  
2457 -  
2458 -  
2459 -  
2460 -  
2461 -  
2462 static Future<dynamic> goSetBirthdayPage( 2454 static Future<dynamic> goSetBirthdayPage(
2463 - BuildContext context,String? gid, String? lunar, String? solar, {  
2464 - replace = false,  
2465 - String from = 'store'  
2466 - }) {  
2467 - return _navigateTo(context, "${Routes.set_birthday_page}?gid=$gid&lunar=$lunar&solar=$solar&from=$from", 2455 + BuildContext context, String? gid, String? lunar, String? solar,
  2456 + {replace = false, String from = 'store'}) {
  2457 + return _navigateTo(context,
  2458 + "${Routes.set_birthday_page}?gid=$gid&lunar=$lunar&solar=$solar&from=$from",
2468 replace: replace); 2459 replace: replace);
2469 } 2460 }
2470 2461
2471 -  
2472 -  
2473 -  
2474 -  
2475 -  
2476 - 2462 + static Future<dynamic> goTableHome(
  2463 + BuildContext context, {
  2464 + replace = false,
  2465 + }) {
  2466 + return _navigateTo(context, "${Routes.table_home}", replace: replace);
  2467 + }
2477 } 2468 }
@@ -116,6 +116,7 @@ import 'package:one_key/pages/my/store_base_info_page.dart'; @@ -116,6 +116,7 @@ import 'package:one_key/pages/my/store_base_info_page.dart';
116 import 'package:one_key/pages/my/store_base_info_page_old.dart'; 116 import 'package:one_key/pages/my/store_base_info_page_old.dart';
117 import 'package:one_key/pages/my/store_type_fill_manage_page.dart'; 117 import 'package:one_key/pages/my/store_type_fill_manage_page.dart';
118 import 'package:one_key/pages/my/store_wine_manage/create_store_wine_page.dart'; 118 import 'package:one_key/pages/my/store_wine_manage/create_store_wine_page.dart';
  119 +import 'package:one_key/pages/my/table_home.dart';
119 import 'package:one_key/pages/my/table_manage/areas_select_page.dart'; 120 import 'package:one_key/pages/my/table_manage/areas_select_page.dart';
120 import 'package:one_key/pages/my/table_manage/my_areas_manage_page.dart'; 121 import 'package:one_key/pages/my/table_manage/my_areas_manage_page.dart';
121 import 'package:one_key/pages/my/table_manage/my_table_manage_home_page.dart'; 122 import 'package:one_key/pages/my/table_manage/my_table_manage_home_page.dart';
@@ -4265,8 +4266,8 @@ var setBirthdayPageHandle = new Handler( @@ -4265,8 +4266,8 @@ var setBirthdayPageHandle = new Handler(
4265 4266
4266 String? solar = params["solar"]!.first as String; 4267 String? solar = params["solar"]!.first as String;
4267 String? lunar = params["lunar"]!.first as String; 4268 String? lunar = params["lunar"]!.first as String;
4268 -  
4269 - String? from = params["from"]!.first as String; 4269 +
  4270 + String? from = params["from"]!.first as String;
4270 // String status = params["status"]!.first as String; 4271 // String status = params["status"]!.first as String;
4271 // bool isMine = 4272 // bool isMine =
4272 // FluroConvertUtils.string2bool(params["isMine"]!.first as String); 4273 // FluroConvertUtils.string2bool(params["isMine"]!.first as String);
@@ -4280,11 +4281,12 @@ var setBirthdayPageHandle = new Handler( @@ -4280,11 +4281,12 @@ var setBirthdayPageHandle = new Handler(
4280 return ChangeNotifierProvider<CustomerProvider>( 4281 return ChangeNotifierProvider<CustomerProvider>(
4281 create: (_) => CustomerProvider(), 4282 create: (_) => CustomerProvider(),
4282 child: SetBirthdayPage( 4283 child: SetBirthdayPage(
4283 - gid: gid,  
4284 - birthdayLunar: lunar,  
4285 - birthdaySolar: solar,  
4286 - from:from  
4287 - )); 4284 + gid: gid, birthdayLunar: lunar, birthdaySolar: solar, from: from));
  4285 +});
  4286 +
  4287 +var tableHomeHandle = new Handler(
  4288 + handlerFunc: (BuildContext? context, Map<String, List<Object>> params) {
  4289 + return TableHome();
4288 }); 4290 });
4289 4291
4290 ///支付返券 4292 ///支付返券
@@ -429,6 +429,13 @@ class Routes { @@ -429,6 +429,13 @@ class Routes {
429 429
430 static String set_birthday_page = "/set_birthday_page"; //客户生日 430 static String set_birthday_page = "/set_birthday_page"; //客户生日
431 431
  432 +
  433 +
  434 +
  435 +
  436 +
  437 + static String table_home = "/table_home"; // 桌位设置
  438 +
432 static void configureRoutes(FluroRouter router) { 439 static void configureRoutes(FluroRouter router) {
433 router.notFoundHandler = new Handler( 440 router.notFoundHandler = new Handler(
434 handlerFunc: (BuildContext? context, Map<String, List<String>> params) { 441 handlerFunc: (BuildContext? context, Map<String, List<String>> params) {
@@ -812,6 +819,10 @@ class Routes { @@ -812,6 +819,10 @@ class Routes {
812 819
813 router.define(set_birthday_page, handler: setBirthdayPageHandle); 820 router.define(set_birthday_page, handler: setBirthdayPageHandle);
814 821
  822 +
  823 + router.define(table_home, handler: tableHomeHandle);
  824 +
  825 +
815 826
816 } 827 }
817 } 828 }