xt / Flutter-ReserveApp · Commits

Go to a project

Commit 2a064d0bdbb4269bce0eadfd85ee8c57db84ac88

Authored by wdn127929
1 parent df52693b
build: skipped

新版

Inline Side-by-side
Showing 30 changed files with 1019 additions and 425 deletions
@@ -18,19 +18,19 @@ if (flutterRoot == null) { @@ -18,19 +18,19 @@ if (flutterRoot == null) {
18 18
19 19
20 20
21 -def flutterVersionCode = "534" 21 +def flutterVersionCode = "541"
22 if (flutterVersionCode == null) { 22 if (flutterVersionCode == null) {
23 - flutterVersionCode = '534' 23 + flutterVersionCode = '541'
24 24
25 25
26 26
27 } 27 }
28 28
29 29
30 -def flutterVersionName = "5.3.4" 30 +def flutterVersionName = "5.4.1"
31 31
32 if (flutterVersionName == null) { 32 if (flutterVersionName == null) {
33 - flutterVersionName = '5.3.4' 33 + flutterVersionName = '5.4.1'
34 34
35 35
36 } 36 }

1.8 KB | W: | H:

3.66 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

1.31 KB | W: | H:

1.9 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

680 Bytes | W: | H:

1.77 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

1.81 KB | W: | H:

3.58 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

1.79 KB | W: | H:

3.2 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

4.59 KB | W: | H:

2.99 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

2.95 KB | W: | H:

3.77 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

4.51 KB | W: | H:

3.63 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

4.24 KB | W: | H:

3.18 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

2.36 KB | W: | H:

3.82 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

2.34 KB | W: | H:

2.74 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

2.53 KB | W: | H:

3.53 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

2.32 KB | W: | H:

3.25 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

2.24 KB | W: | H:

2.89 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
@@ -38,12 +38,16 @@ class Constant { @@ -38,12 +38,16 @@ class Constant {
38 '有效期': ['管理员', '店长', '客户经理', '收银员', '服务员', '前台'], 38 '有效期': ['管理员', '店长', '客户经理', '收银员', '服务员', '前台'],
39 '个人信息': ['管理员', '店长', '客户经理', '收银员', '服务员', '前台'], 39 '个人信息': ['管理员', '店长', '客户经理', '收银员', '服务员', '前台'],
40 '我的客情': ['管理员', '店长', '客户经理', '收银员', '服务员', '前台'], 40 '我的客情': ['管理员', '店长', '客户经理', '收银员', '服务员', '前台'],
  41 + '客情管理': ['管理员', '店长', '客户经理', '收银员', '服务员', '前台'],
41 '优惠券': ['管理员', '店长', '客户经理', '收银员', '服务员', '前台'], 42 '优惠券': ['管理员', '店长', '客户经理', '收银员', '服务员', '前台'],
42 '常用备注': ['管理员', '店长', '客户经理', '收银员', '服务员', '前台'], 43 '常用备注': ['管理员', '店长', '客户经理', '收银员', '服务员', '前台'],
43 '套餐排菜': ['管理员', '店长', '客户经理', '收银员', '服务员', '前台'], 44 '套餐排菜': ['管理员', '店长', '客户经理', '收银员', '服务员', '前台'],
44 '客户存酒': ['管理员', '店长', '客户经理', '收银员', '服务员', '前台'], 45 '客户存酒': ['管理员', '店长', '客户经理', '收银员', '服务员', '前台'],
45 '店铺信息': ['管理员', '店长'], 46 '店铺信息': ['管理员', '店长'],
46 '全店客情': ['管理员', '店长'], 47 '全店客情': ['管理员', '店长'],
  48 + '客户分析': ['管理员', '店长'],
  49 + '预订统计': ['管理员', '店长'],
  50 + '订单分析': ['管理员', '店长', '客户经理', '收银员', '服务员', '前台'],
47 '桌位管理': ['管理员', '店长', '客户经理'], 51 '桌位管理': ['管理员', '店长', '客户经理'],
48 '桌位照片': [ 52 '桌位照片': [
49 '管理员', 53 '管理员',
@@ -70,6 +74,11 @@ class Constant { @@ -70,6 +74,11 @@ class Constant {
70 '店长', 74 '店长',
71 '客户经理', 75 '客户经理',
72 ], 76 ],
  77 + '桌位设置': [
  78 + '管理员',
  79 + '店长',
  80 + '客户经理',
  81 + ],
73 '宴会管理': [ 82 '宴会管理': [
74 '管理员', 83 '管理员',
75 '店长', 84 '店长',
@@ -80,6 +89,16 @@ class Constant { @@ -80,6 +89,16 @@ class Constant {
80 '店长', 89 '店长',
81 '客户经理', 90 '客户经理',
82 ], 91 ],
  92 + '客户通知': [
  93 + '管理员',
  94 + '店长',
  95 + ],
  96 +
  97 + '充值优惠': [
  98 + '管理员',
  99 + '店长',
  100 + '客户经理',
  101 + ],
83 '评价管理': [ 102 '评价管理': [
84 '管理员', 103 '管理员',
85 '店长', 104 '店长',
@@ -181,7 +181,7 @@ class _MarketingCenterHomePageState extends State<MarketingCenterHomePage> { @@ -181,7 +181,7 @@ class _MarketingCenterHomePageState extends State<MarketingCenterHomePage> {
181 children: [ 181 children: [
182 InkWell( 182 InkWell(
183 onTap: () { 183 onTap: () {
184 - if (!collectStoreProvider.sellerCoupon) { 184 + if (!collectStoreProvider.sellerRecharge) {
185 //没有购买优惠券模块 185 //没有购买优惠券模块
186 //提示购买 186 //提示购买
187 187
@@ -245,7 +245,6 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { @@ -245,7 +245,6 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
245 edate = DateTime.fromMillisecondsSinceEpoch( 245 edate = DateTime.fromMillisecondsSinceEpoch(
246 int.parse(collectStoreProvider.sellerNormalEdate) * 1000); 246 int.parse(collectStoreProvider.sellerNormalEdate) * 1000);
247 247
248 -  
249 DateTime datenow = DateTime.now(); 248 DateTime datenow = DateTime.now();
250 249
251 //比较相差的天数 250 //比较相差的天数
@@ -357,14 +356,14 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { @@ -357,14 +356,14 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
357 356
358 int differenceSeconds = edate.difference(datenow).inSeconds; 357 int differenceSeconds = edate.difference(datenow).inSeconds;
359 358
360 - if (difference < 0 || (difference == 0 && differenceSeconds <= 0)) {  
361 - //过期  
362 - outDay = '0';  
363 - } else if (difference == 0 && differenceSeconds > 0) {  
364 - outDay = '1';  
365 - } else {  
366 - outDay = difference.toString();  
367 - } 359 + if (difference < 0 || (difference == 0 && differenceSeconds <= 0)) {
  360 + //过期
  361 + outDay = '0';
  362 + } else if (difference == 0 && differenceSeconds > 0) {
  363 + outDay = '1';
  364 + } else {
  365 + outDay = difference.toString();
  366 + }
368 367
369 // print(outDay); 368 // print(outDay);
370 } else { 369 } else {
@@ -391,14 +390,14 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { @@ -391,14 +390,14 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
391 edate = DateTime.fromMillisecondsSinceEpoch( 390 edate = DateTime.fromMillisecondsSinceEpoch(
392 int.parse(collectStoreProvider.sellerNormalEdate) * 1000); 391 int.parse(collectStoreProvider.sellerNormalEdate) * 1000);
393 392
394 - DateTime datenow = DateTime.now(); 393 + DateTime datenow = DateTime.now();
395 394
396 //比较相差的天数 395 //比较相差的天数
397 int difference = edate.difference(datenow).inDays; 396 int difference = edate.difference(datenow).inDays;
398 397
399 int differenceSeconds = edate.difference(datenow).inSeconds; 398 int differenceSeconds = edate.difference(datenow).inSeconds;
400 399
401 - if (difference < 0 || (difference == 0 && differenceSeconds <= 0)) { 400 + if (difference < 0 || (difference == 0 && differenceSeconds <= 0)) {
402 //过期 401 //过期
403 outDay = '0'; 402 outDay = '0';
404 } else if (difference == 0 && differenceSeconds > 0) { 403 } else if (difference == 0 && differenceSeconds > 0) {
@@ -1088,19 +1087,10 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { @@ -1088,19 +1087,10 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
1088 // VEmptyView(10), 1087 // VEmptyView(10),
1089 1088
1090 Padding( 1089 Padding(
1091 - padding: EdgeInsets.symmetric(  
1092 - vertical: ScreenUtil().setWidth(16)),  
1093 - child: Text(  
1094 - '我的内容',  
1095 - style: TextStyle(  
1096 - fontWeight: FontWeight.bold,  
1097 - fontSize: ScreenUtil().setSp(32),  
1098 - color: MyColours.color_515151),  
1099 - )),  
1100 - Padding(  
1101 - padding: EdgeInsets.symmetric(  
1102 - horizontal: ScreenUtil().setWidth(12 * 2),  
1103 - vertical: ScreenUtil().setWidth(20)), 1090 + padding: EdgeInsets.only(
  1091 + left: w(12),
  1092 + right: w(12),
  1093 + bottom: ScreenUtil().setWidth(20)),
1104 child: Container( 1094 child: Container(
1105 padding: EdgeInsets.symmetric( 1095 padding: EdgeInsets.symmetric(
1106 vertical: ScreenUtil().setWidth(19 * 2)), 1096 vertical: ScreenUtil().setWidth(19 * 2)),
@@ -1113,90 +1103,76 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { @@ -1113,90 +1103,76 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
1113 mainAxisAlignment: MainAxisAlignment.spaceEvenly, 1103 mainAxisAlignment: MainAxisAlignment.spaceEvenly,
1114 children: [ 1104 children: [
1115 InkWell( 1105 InkWell(
1116 - onTap: () {  
1117 - if (outDay == '0') {  
1118 - return;  
1119 - }  
1120 -  
1121 - if (Utils.getAuthority(context, '个人信息')) {  
1122 - NavigatorUtil.goBaseInfoPage(  
1123 - context, FromPage.FromPageMyPage);  
1124 - }  
1125 - },  
1126 - child: _item(  
1127 - !Utils.getAuthority(context, '个人信息') ||  
1128 - outDay == '0'  
1129 - ? Utils.getImgPath('grxx_un')  
1130 - : Utils.getImgPath('grxx'),  
1131 - '个人信息',  
1132 - isRowLow: outDay == '0' ||  
1133 - !Utils.getAuthority(context, '个人信息')),  
1134 - ),  
1135 - InkWell(  
1136 - onTap: () { 1106 + onTap: () async {
1137 if (outDay == '0') { 1107 if (outDay == '0') {
1138 return; 1108 return;
1139 } 1109 }
1140 -  
1141 - if (Utils.getAuthority(context, '我的客情')) {  
1142 - if (collectStoreProvider  
1143 - .sellerNormalSpecial) {  
1144 - //标准版  
1145 - if (collectStoreProvider  
1146 - .sellerPreserve ||  
1147 - collectStoreProvider  
1148 - .sellerMarketing) {  
1149 - NavigatorUtil.goMyCustomerPage(  
1150 - context);  
1151 - } else {  
1152 - NavigatorUtil  
1153 - .goMyCustomerListPageSim(  
1154 - context);  
1155 - }  
1156 - } else {  
1157 - NavigatorUtil.goMyCustomerPage(  
1158 - context);  
1159 - } 1110 + if (Utils.getAuthority(context, '店铺信息')) {
  1111 + await NavigatorUtil.goStoreBaseInfoPage(
  1112 + context);
  1113 + // print(image['image']);
  1114 + // UserModel userModel =
  1115 + // Provider.of<UserModel>(context,
  1116 + // listen: false);
  1117 + // User user = userModel.user;
  1118 + // user.sellerimage = image['image'];
  1119 + // await App.sp.setString('user',
  1120 + // json.encode(user.toJson()));
  1121 + // print(userModel.user);
  1122 + setState(() {});
1160 } 1123 }
1161 }, 1124 },
1162 child: _item( 1125 child: _item(
1163 outDay == '0' || 1126 outDay == '0' ||
1164 !Utils.getAuthority( 1127 !Utils.getAuthority(
1165 - context, '我的客情')  
1166 - ? Utils.getImgPath('wdkq_un')  
1167 - : Utils.getImgPath('wdkq'),  
1168 - '我的客情', 1128 + context, '店铺信息')
  1129 + ? Utils.getImgPath('dpxx_un')
  1130 + : Utils.getImgPath('dpxx'),
  1131 + '店铺信息',
1169 isRowLow: outDay == '0' || 1132 isRowLow: outDay == '0' ||
1170 !Utils.getAuthority( 1133 !Utils.getAuthority(
1171 - context, '我的客情'))), 1134 + context, '店铺信息'))),
1172 InkWell( 1135 InkWell(
1173 onTap: () { 1136 onTap: () {
1174 if (outDay == '0') { 1137 if (outDay == '0') {
1175 return; 1138 return;
1176 } 1139 }
1177 - if (!collectStoreProvider.sellerCoupon) {  
1178 - //没有购买优惠券模块  
1179 - //提示购买  
1180 -  
1181 - DialogUtil.showSellerVersionBuyDialog(  
1182 - context, '优惠券营销', (v) {});  
1183 - return;  
1184 - }  
1185 -  
1186 - if (Utils.getAuthority(context, '优惠券')) {  
1187 - NavigatorUtil.goCouponPage(context); 1140 + if (Utils.getAuthority(context, '员工管理')) {
  1141 + NavigatorUtil.goPersonnelManagePage(
  1142 + context);
1188 } 1143 }
1189 }, 1144 },
1190 child: _item( 1145 child: _item(
1191 outDay == '0' || 1146 outDay == '0' ||
1192 !Utils.getAuthority( 1147 !Utils.getAuthority(
1193 - context, '优惠券')  
1194 - ? Utils.getImgPath('yhq_un')  
1195 - : Utils.getImgPath('yhq'),  
1196 - '优惠券', 1148 + context, '员工管理')
  1149 + ? Utils.getImgPath('yggl_un')
  1150 + : Utils.getImgPath('yggl'),
  1151 + '员工管理',
1197 isRowLow: outDay == '0' || 1152 isRowLow: outDay == '0' ||
1198 !Utils.getAuthority( 1153 !Utils.getAuthority(
1199 - context, '优惠券'))), 1154 + context, '员工管理'))),
  1155 + InkWell(
  1156 + onTap: () {
  1157 + if (outDay == '0') {
  1158 + return;
  1159 + }
  1160 +
  1161 + if (Utils.getAuthority(context, '桌位设置')) {
  1162 + NavigatorUtil.goTableSettingHomePage(
  1163 + context);
  1164 + }
  1165 + },
  1166 + child: _item(
  1167 + outDay == '0' ||
  1168 + !Utils.getAuthority(
  1169 + context, '桌位设置')
  1170 + ? Utils.getImgPath('zwgl_un')
  1171 + : Utils.getImgPath('zwgl'),
  1172 + '桌位设置',
  1173 + isRowLow: outDay == '0' ||
  1174 + !Utils.getAuthority(context, '桌位设置')),
  1175 + ),
1200 InkWell( 1176 InkWell(
1201 onTap: () { 1177 onTap: () {
1202 if (outDay == '0') { 1178 if (outDay == '0') {
@@ -1218,88 +1194,36 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { @@ -1218,88 +1194,36 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
1218 isRowLow: outDay == '0' || 1194 isRowLow: outDay == '0' ||
1219 !Utils.getAuthority( 1195 !Utils.getAuthority(
1220 context, '常用备注'))), 1196 context, '常用备注'))),
  1197 + InkWell(
  1198 + onTap: () {
  1199 + if (outDay == '0') {
  1200 + return;
  1201 + }
  1202 +
  1203 + if (Utils.getAuthority(context, '个人信息')) {
  1204 + NavigatorUtil.goBaseInfoPage(
  1205 + context, FromPage.FromPageMyPage);
  1206 + }
  1207 + },
  1208 + child: _item(
  1209 + !Utils.getAuthority(context, '个人信息') ||
  1210 + outDay == '0'
  1211 + ? Utils.getImgPath('grxx_un')
  1212 + : Utils.getImgPath('grxx'),
  1213 + '个人信息',
  1214 + isRowLow: outDay == '0' ||
  1215 + !Utils.getAuthority(context, '个人信息')),
  1216 + ),
  1217 +
1221 ], 1218 ],
1222 ), 1219 ),
1223 - VEmptyView(68),  
1224 - Row(  
1225 - mainAxisAlignment:  
1226 - MainAxisAlignment.spaceEvenly,  
1227 - children: [  
1228 - InkWell(  
1229 - onTap: () {  
1230 - if (!collectStoreProvider  
1231 - .sellerOrderManager) {  
1232 - //没有购买经理排菜模块  
1233 - //提示购买  
1234 -  
1235 - DialogUtil.showSellerVersionBuyDialog(  
1236 - context, '经理排菜', (v) {});  
1237 - return;  
1238 - }  
1239 - if (outDay == '0') {  
1240 - return;  
1241 - }  
1242 - if (Utils.getAuthority(  
1243 - context, '套餐排菜')) {  
1244 - NavigatorUtil.goMyPlanDishHomePage(  
1245 - context);  
1246 - }  
1247 - },  
1248 - child: _item(  
1249 - outDay == '0' ||  
1250 - !Utils.getAuthority(  
1251 - context, '套餐排菜')  
1252 - ? Utils.getImgPath('cdgl_un')  
1253 - : Utils.getImgPath('cdgl'),  
1254 - '套餐排菜',  
1255 - isRowLow: outDay == '0' ||  
1256 - !Utils.getAuthority(  
1257 - context, '套餐排菜'))),  
1258 - InkWell(  
1259 - onTap: () {  
1260 - if (outDay == '0') {  
1261 - return;  
1262 - }  
1263 - if (Utils.getAuthority(  
1264 - context, '客户存酒')) {  
1265 - NavigatorUtil  
1266 - .goStoreWineManageHomePage(  
1267 - context);  
1268 - }  
1269 - },  
1270 - child: _item(  
1271 - outDay == '0' ||  
1272 - !Utils.getAuthority(  
1273 - context, '客户存酒')  
1274 - ? Utils.getImgPath('khcj_un')  
1275 - : Utils.getImgPath('khcj'),  
1276 - '客户存酒',  
1277 - isRowLow: outDay == '0' ||  
1278 - !Utils.getAuthority(  
1279 - context, '客户存酒'))),  
1280 - InkWell(  
1281 - onTap: () {}, child: _item('', '空空空空')),  
1282 - InkWell(  
1283 - onTap: () {}, child: _item('', '空空空空')),  
1284 - ])  
1285 ]), 1220 ]),
1286 )), 1221 )),
1287 - VEmptyView(20),  
1288 1222
1289 Padding( 1223 Padding(
1290 padding: EdgeInsets.symmetric( 1224 padding: EdgeInsets.symmetric(
1291 - vertical: ScreenUtil().setWidth(16)),  
1292 - child: Text(  
1293 - '店铺相关',  
1294 - style: TextStyle(  
1295 - fontWeight: FontWeight.bold,  
1296 - fontSize: ScreenUtil().setSp(32),  
1297 - color: MyColours.color_515151),  
1298 - )),  
1299 - Padding(  
1300 - padding: EdgeInsets.symmetric(  
1301 horizontal: ScreenUtil().setWidth(12 * 2), 1225 horizontal: ScreenUtil().setWidth(12 * 2),
1302 - vertical: ScreenUtil().setWidth(20)), 1226 + vertical: ScreenUtil().setWidth(40)),
1303 child: Container( 1227 child: Container(
1304 padding: EdgeInsets.symmetric( 1228 padding: EdgeInsets.symmetric(
1305 horizontal: ScreenUtil().setWidth(24 * 2), 1229 horizontal: ScreenUtil().setWidth(24 * 2),
@@ -1315,135 +1239,112 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { @@ -1315,135 +1239,112 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
1315 MainAxisAlignment.spaceBetween, 1239 MainAxisAlignment.spaceBetween,
1316 children: [ 1240 children: [
1317 InkWell( 1241 InkWell(
1318 - onTap: () async { 1242 + onTap: () {
1319 if (outDay == '0') { 1243 if (outDay == '0') {
1320 return; 1244 return;
1321 } 1245 }
1322 if (Utils.getAuthority( 1246 if (Utils.getAuthority(
1323 - context, '店铺信息')) {  
1324 - await NavigatorUtil  
1325 - .goStoreBaseInfoPage(context);  
1326 - // print(image['image']);  
1327 - // UserModel userModel =  
1328 - // Provider.of<UserModel>(context,  
1329 - // listen: false);  
1330 - // User user = userModel.user;  
1331 - // user.sellerimage = image['image'];  
1332 - // await App.sp.setString('user',  
1333 - // json.encode(user.toJson()));  
1334 - // print(userModel.user);  
1335 - setState(() {}); 1247 + context, '菜单管理')) {
  1248 + NavigatorUtil.goMenuManagePage(
  1249 + context);
1336 } 1250 }
1337 }, 1251 },
1338 child: _item( 1252 child: _item(
1339 outDay == '0' || 1253 outDay == '0' ||
1340 !Utils.getAuthority( 1254 !Utils.getAuthority(
1341 - context, '店铺信息')  
1342 - ? Utils.getImgPath('dpxx_un')  
1343 - : Utils.getImgPath('dpxx'),  
1344 - '店铺信息', 1255 + context, '菜单管理')
  1256 + ? Utils.getImgPath('cdgl_un')
  1257 + : Utils.getImgPath('cdgl'),
  1258 + '菜单管理',
1345 isRowLow: outDay == '0' || 1259 isRowLow: outDay == '0' ||
1346 !Utils.getAuthority( 1260 !Utils.getAuthority(
1347 - context, '店铺信息'))), 1261 + context, '菜单管理'))),
1348 InkWell( 1262 InkWell(
1349 onTap: () { 1263 onTap: () {
  1264 + if (!collectStoreProvider
  1265 + .sellerOrderManager) {
  1266 + //没有购买经理排菜模块
  1267 + //提示购买
  1268 +
  1269 + DialogUtil
  1270 + .showSellerVersionBuyDialog(
  1271 + context, '经理排菜', (v) {});
  1272 + return;
  1273 + }
1350 if (outDay == '0') { 1274 if (outDay == '0') {
1351 return; 1275 return;
1352 } 1276 }
1353 if (Utils.getAuthority( 1277 if (Utils.getAuthority(
1354 - context, '全店客情')) {  
1355 - if (collectStoreProvider  
1356 - .sellerNormalSpecial) {  
1357 - //标准版  
1358 -  
1359 - if (collectStoreProvider  
1360 - .sellerPreserve ||  
1361 - collectStoreProvider  
1362 - .sellerMarketing) {  
1363 - NavigatorUtil  
1364 - .goStoreCustomerPage(  
1365 - context);  
1366 - } else {  
1367 - NavigatorUtil  
1368 - .goCustomerListPageSim(  
1369 - context);  
1370 - }  
1371 - } else {  
1372 - NavigatorUtil.goStoreCustomerPage(  
1373 - context);  
1374 - } 1278 + context, '套餐排菜')) {
  1279 + NavigatorUtil.goMyPlanDishHomePage(
  1280 + context);
1375 } 1281 }
1376 }, 1282 },
1377 child: _item( 1283 child: _item(
1378 outDay == '0' || 1284 outDay == '0' ||
1379 !Utils.getAuthority( 1285 !Utils.getAuthority(
1380 - context, '全店客情')  
1381 - ? Utils.getImgPath('qdkq_un')  
1382 - : Utils.getImgPath('qdkq'),  
1383 - '全店客情', 1286 + context, '套餐排菜')
  1287 + ? Utils.getImgPath('cdgl_un')
  1288 + : Utils.getImgPath('pccd'),
  1289 + '排菜菜单',
1384 isRowLow: outDay == '0' || 1290 isRowLow: outDay == '0' ||
1385 !Utils.getAuthority( 1291 !Utils.getAuthority(
1386 - context, '全店客情'))), 1292 + context, '套餐排菜'))),
1387 InkWell( 1293 InkWell(
1388 - onTap: () {  
1389 - if (outDay == '0') {  
1390 - return;  
1391 - }  
1392 - if (Utils.getAuthority(  
1393 - context, '桌位管理')) {  
1394 - NavigatorUtil  
1395 - .goMyTableManagerHomePage(  
1396 - context);  
1397 - }  
1398 - },  
1399 - child: _item(  
1400 - outDay == '0' ||  
1401 - !Utils.getAuthority(  
1402 - context, '桌位管理')  
1403 - ? Utils.getImgPath('zwgl_un')  
1404 - : Utils.getImgPath('zwgl'),  
1405 - '桌位管理',  
1406 - isRowLow: outDay == '0' ||  
1407 - !Utils.getAuthority(  
1408 - context, '桌位管理')),  
1409 - ), 1294 + onTap: () {
  1295 + if (outDay == '0') {
  1296 + return;
  1297 + }
  1298 + if (Utils.getAuthority(
  1299 + context, '评价管理')) {
  1300 + NavigatorUtil
  1301 + .goCommentManageHomePage(
  1302 + context);
  1303 + }
  1304 + },
  1305 + child: _item(
  1306 + outDay == '0' ||
  1307 + !Utils.getAuthority(
  1308 + context, '评价管理')
  1309 + ? Utils.getImgPath(
  1310 + 'my_comment_un')
  1311 + : Utils.getImgPath(
  1312 + 'my_comment'),
  1313 + '评价管理',
  1314 + isRowLow: outDay == '0' ||
  1315 + !Utils.getAuthority(
  1316 + context, '评价管理'))),
1410 InkWell( 1317 InkWell(
1411 - onTap: () async { 1318 + onTap: () {
1412 if (outDay == '0') { 1319 if (outDay == '0') {
1413 return; 1320 return;
1414 } 1321 }
  1322 + if (!collectStoreProvider
  1323 + .sellerCoupon) {
  1324 + //没有购买优惠券模块
  1325 + //提示购买
  1326 +
  1327 + DialogUtil
  1328 + .showSellerVersionBuyDialog(
  1329 + context, '优惠券营销', (v) {});
  1330 + return;
  1331 + }
  1332 +
1415 if (Utils.getAuthority( 1333 if (Utils.getAuthority(
1416 - context, '桌位照片')) {  
1417 - // Map temp =  
1418 - await NavigatorUtil  
1419 - .goPhotoManagerSelectTablePage(  
1420 - context,  
1421 - "",  
1422 - DateTime.now()  
1423 - .millisecondsSinceEpoch,  
1424 - "1",  
1425 - canChoose: true,  
1426 - object: null,  
1427 - fromPage: "tablePhoto",  
1428 - tid: '');  
1429 - // if (temp != null && temp['tid'] != '') {  
1430 - // // print(temp['tid']);  
1431 - // // print(temp['tname']);  
1432 - // // tname = temp['tname'];  
1433 - // // tid = temp['tid'];  
1434 - // // _getTablePhoto(context, temp['tid'], showLoading: true) 1334 + context, '优惠券')) {
  1335 + NavigatorUtil.goCouponPage(context);
1435 } 1336 }
1436 }, 1337 },
1437 child: _item( 1338 child: _item(
1438 outDay == '0' || 1339 outDay == '0' ||
1439 !Utils.getAuthority( 1340 !Utils.getAuthority(
1440 - context, '桌位照片')  
1441 - ? Utils.getImgPath('zwzp_un')  
1442 - : Utils.getImgPath('zwzp'),  
1443 - '桌位照片', 1341 + context, '优惠券')
  1342 + ? Utils.getImgPath('yhq_un')
  1343 + : Utils.getImgPath('yhq'),
  1344 + '优惠券',
1444 isRowLow: outDay == '0' || 1345 isRowLow: outDay == '0' ||
1445 !Utils.getAuthority( 1346 !Utils.getAuthority(
1446 - context, '桌位照片'))) 1347 + context, '优惠券'))),
1447 ], 1348 ],
1448 ), 1349 ),
1449 VEmptyView(68), 1350 VEmptyView(68),
@@ -1456,86 +1357,224 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { @@ -1456,86 +1357,224 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
1456 if (outDay == '0') { 1357 if (outDay == '0') {
1457 return; 1358 return;
1458 } 1359 }
  1360 + if (!collectStoreProvider
  1361 + .sellerRecharge) {
  1362 + //没有购买优惠券模块
  1363 + //提示购买
  1364 +
  1365 + DialogUtil
  1366 + .showSellerVersionBuyDialog(
  1367 + context, '储值营销', (v) {});
  1368 + return;
  1369 + }
  1370 +
1459 if (Utils.getAuthority( 1371 if (Utils.getAuthority(
1460 - context, '员工管理')) {  
1461 - NavigatorUtil.goPersonnelManagePage( 1372 + context, '充值优惠')) {
  1373 + NavigatorUtil.goRechargeHomePage(
1462 context); 1374 context);
1463 } 1375 }
1464 }, 1376 },
1465 child: _item( 1377 child: _item(
1466 outDay == '0' || 1378 outDay == '0' ||
1467 !Utils.getAuthority( 1379 !Utils.getAuthority(
1468 - context, '员工管理')  
1469 - ? Utils.getImgPath('yggl_un')  
1470 - : Utils.getImgPath('yggl'),  
1471 - '员工管理', 1380 + context, '充值优惠')
  1381 + ? Utils.getImgPath('yhq_un')
  1382 + : Utils.getImgPath('czyh'),
  1383 + '充值优惠',
1472 isRowLow: outDay == '0' || 1384 isRowLow: outDay == '0' ||
1473 !Utils.getAuthority( 1385 !Utils.getAuthority(
1474 - context, '员工管理'))), 1386 + context, '充值优惠'))),
1475 InkWell( 1387 InkWell(
1476 onTap: () { 1388 onTap: () {
1477 if (outDay == '0') { 1389 if (outDay == '0') {
1478 return; 1390 return;
1479 } 1391 }
1480 if (Utils.getAuthority( 1392 if (Utils.getAuthority(
1481 - context, '菜单管理')) {  
1482 - NavigatorUtil.goMenuManagePage(  
1483 - context); 1393 + context, '客户存酒')) {
  1394 + NavigatorUtil
  1395 + .goStoreWineManageHomePage(
  1396 + context);
1484 } 1397 }
1485 }, 1398 },
1486 child: _item( 1399 child: _item(
1487 outDay == '0' || 1400 outDay == '0' ||
1488 !Utils.getAuthority( 1401 !Utils.getAuthority(
1489 - context, '菜单管理')  
1490 - ? Utils.getImgPath('cdgl_un')  
1491 - : Utils.getImgPath('cdgl'),  
1492 - '菜单管理', 1402 + context, '客户存酒')
  1403 + ? Utils.getImgPath('khcj_un')
  1404 + : Utils.getImgPath('khcj'),
  1405 + '客户存酒',
1493 isRowLow: outDay == '0' || 1406 isRowLow: outDay == '0' ||
1494 !Utils.getAuthority( 1407 !Utils.getAuthority(
1495 - context, '菜单管理'))), 1408 + context, '客户存酒'))),
1496 InkWell( 1409 InkWell(
1497 onTap: () { 1410 onTap: () {
1498 if (outDay == '0') { 1411 if (outDay == '0') {
1499 return; 1412 return;
1500 } 1413 }
1501 if (Utils.getAuthority( 1414 if (Utils.getAuthority(
1502 - context, '包间类型')) {  
1503 - NavigatorUtil.goRoomTypeManagePage( 1415 + context, '宴会管理')) {
  1416 + NavigatorUtil.goFeastManageHomePage(
1504 context); 1417 context);
1505 } 1418 }
1506 }, 1419 },
1507 child: _item( 1420 child: _item(
1508 outDay == '0' || 1421 outDay == '0' ||
1509 !Utils.getAuthority( 1422 !Utils.getAuthority(
1510 - context, '包间类型')  
1511 - ? Utils.getImgPath('bjlx_un')  
1512 - : Utils.getImgPath('bjlx'),  
1513 - '包间类型', 1423 + context, '宴会管理')
  1424 + ? Utils.getImgPath('yhgl_un')
  1425 + : Utils.getImgPath('yhgl'),
  1426 + '宴会管理',
1514 isRowLow: outDay == '0' || 1427 isRowLow: outDay == '0' ||
1515 !Utils.getAuthority( 1428 !Utils.getAuthority(
1516 - context, '包间类型'))), 1429 + context, '宴会管理'))),
  1430 + InkWell(
  1431 + onTap: () {}, child: _item('', '空空空空')),
  1432 + ],
  1433 + ),
  1434 + ],
  1435 + ))),
  1436 +
  1437 + Padding(
  1438 + padding: EdgeInsets.symmetric(
  1439 + horizontal: ScreenUtil().setWidth(12 * 2),
  1440 + vertical: ScreenUtil().setWidth(40)),
  1441 + child: Container(
  1442 + padding: EdgeInsets.symmetric(
  1443 + horizontal: ScreenUtil().setWidth(24 * 2),
  1444 + vertical: ScreenUtil().setWidth(19 * 2)),
  1445 + decoration: BoxDecoration(
  1446 + color: MyColours.color_ffffff,
  1447 + borderRadius: BorderRadius.circular(
  1448 + ScreenUtil().setWidth(14))),
  1449 + child: Column(
  1450 + children: [
  1451 + Row(
  1452 + mainAxisAlignment:
  1453 + MainAxisAlignment.spaceBetween,
  1454 + children: [
1517 InkWell( 1455 InkWell(
1518 onTap: () { 1456 onTap: () {
1519 if (outDay == '0') { 1457 if (outDay == '0') {
1520 return; 1458 return;
1521 } 1459 }
1522 if (Utils.getAuthority( 1460 if (Utils.getAuthority(
1523 - context, '包间置满')) {  
1524 - NavigatorUtil  
1525 - .goStoreTypeFillManagePage(  
1526 - context); 1461 + context, '客情管理')) {
  1462 + // 是全店客情
  1463 + if (Utils.getAuthority(
  1464 + context, '全店客情')) {
  1465 + if (collectStoreProvider
  1466 + .sellerNormalSpecial) {
  1467 + //标准版
  1468 +
  1469 + if (collectStoreProvider
  1470 + .sellerPreserve ||
  1471 + collectStoreProvider
  1472 + .sellerMarketing) {
  1473 + NavigatorUtil
  1474 + .goStoreCustomerPage(
  1475 + context);
  1476 + } else {
  1477 + //标准版没有开通客情模块的，跳转到极速版本的页面
  1478 + NavigatorUtil
  1479 + .goCustomerListPageSim(
  1480 + context);
  1481 + }
  1482 + } else {
  1483 + NavigatorUtil
  1484 + .goStoreCustomerPage(
  1485 + context);
  1486 + }
  1487 + } else {
  1488 + if (Utils.getAuthority(
  1489 + context, '我的客情')) {
  1490 + if (collectStoreProvider
  1491 + .sellerNormalSpecial) {
  1492 + //标准版
  1493 + if (collectStoreProvider
  1494 + .sellerPreserve ||
  1495 + collectStoreProvider
  1496 + .sellerMarketing) {
  1497 + NavigatorUtil
  1498 + .goMyCustomerPage(
  1499 + context);
  1500 + } else {
  1501 + NavigatorUtil
  1502 + .goMyCustomerListPageSim(
  1503 + context);
  1504 + }
  1505 + } else {
  1506 + NavigatorUtil
  1507 + .goMyCustomerPage(
  1508 + context);
  1509 + }
  1510 + }
  1511 + }
1527 } 1512 }
1528 }, 1513 },
1529 child: _item( 1514 child: _item(
1530 outDay == '0' || 1515 outDay == '0' ||
1531 !Utils.getAuthority( 1516 !Utils.getAuthority(
1532 - context, '包间置满')  
1533 - ? Utils.getImgPath('bjzm_un')  
1534 - : Utils.getImgPath('bjzm'),  
1535 - '包间置满', 1517 + context, '客情管理')
  1518 + ? Utils.getImgPath('qdkq_un')
  1519 + : Utils.getImgPath('kqgl'),
  1520 + '客情管理',
  1521 + isRowLow: outDay == '0' ||
  1522 + !Utils.getAuthority(
  1523 + context, '客情管理'))),
  1524 + InkWell(
  1525 + onTap: () async {
  1526 + if (outDay == '0') {
  1527 + return;
  1528 + }
  1529 + if (Utils.getAuthority(
  1530 + context, '客户分析')) {}
  1531 + },
  1532 + child: _item(
  1533 + outDay == '0' ||
  1534 + !Utils.getAuthority(
  1535 + context, '客户分析')
  1536 + ? Utils.getImgPath('zwzp_un')
  1537 + : Utils.getImgPath('khfx'),
  1538 + '客户分析',
  1539 + isRowLow: outDay == '0' ||
  1540 + !Utils.getAuthority(
  1541 + context, '客户分析'))),
  1542 + InkWell(
  1543 + onTap: () async {
  1544 + if (outDay == '0') {
  1545 + return;
  1546 + }
  1547 + if (Utils.getAuthority(
  1548 + context, '预订统计')) {}
  1549 + },
  1550 + child: _item(
  1551 + outDay == '0' ||
  1552 + !Utils.getAuthority(
  1553 + context, '预订统计')
  1554 + ? Utils.getImgPath('zwzp_un')
  1555 + : Utils.getImgPath('ydtj'),
  1556 + '预订统计',
  1557 + isRowLow: outDay == '0' ||
  1558 + !Utils.getAuthority(
  1559 + context, '预订统计'))),
  1560 + InkWell(
  1561 + onTap: () async {
  1562 + if (outDay == '0') {
  1563 + return;
  1564 + }
  1565 + if (Utils.getAuthority(
  1566 + context, '订单分析')) {}
  1567 + },
  1568 + child: _item(
  1569 + outDay == '0' ||
  1570 + !Utils.getAuthority(
  1571 + context, '订单分析')
  1572 + ? Utils.getImgPath('zwzp_un')
  1573 + : Utils.getImgPath('ddfx'),
  1574 + '订单分析',
1536 isRowLow: outDay == '0' || 1575 isRowLow: outDay == '0' ||
1537 !Utils.getAuthority( 1576 !Utils.getAuthority(
1538 - context, '包间置满'))) 1577 + context, '订单分析'))),
1539 ], 1578 ],
1540 ), 1579 ),
1541 VEmptyView(68), 1580 VEmptyView(68),
@@ -1549,21 +1588,21 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { @@ -1549,21 +1588,21 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
1549 return; 1588 return;
1550 } 1589 }
1551 if (Utils.getAuthority( 1590 if (Utils.getAuthority(
1552 - context, '宴会管理')) {  
1553 - NavigatorUtil.goFeastManageHomePage(  
1554 - context); 1591 + context, '客户通知')) {
  1592 + // NavigatorUtil.goMenuManagePage(
  1593 + // context);
1555 } 1594 }
1556 }, 1595 },
1557 child: _item( 1596 child: _item(
1558 outDay == '0' || 1597 outDay == '0' ||
1559 !Utils.getAuthority( 1598 !Utils.getAuthority(
1560 - context, '宴会管理')  
1561 - ? Utils.getImgPath('yhgl_un')  
1562 - : Utils.getImgPath('yhgl'),  
1563 - '宴会管理', 1599 + context, '客户通知')
  1600 + ? Utils.getImgPath('cdgl_un')
  1601 + : Utils.getImgPath('khtz'),
  1602 + '客户通知',
1564 isRowLow: outDay == '0' || 1603 isRowLow: outDay == '0' ||
1565 !Utils.getAuthority( 1604 !Utils.getAuthority(
1566 - context, '宴会管理'))), 1605 + context, '客户通知'))),
1567 InkWell( 1606 InkWell(
1568 onTap: () { 1607 onTap: () {
1569 if (outDay == '0') { 1608 if (outDay == '0') {
@@ -1581,46 +1620,20 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { @@ -1581,46 +1620,20 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
1581 !Utils.getAuthority( 1620 !Utils.getAuthority(
1582 context, '营销中心') 1621 context, '营销中心')
1583 ? Utils.getImgPath('bjzm_un') 1622 ? Utils.getImgPath('bjzm_un')
1584 - : Utils.getImgPath('bjzm'), 1623 + : Utils.getImgPath('yxzx'),
1585 '营销中心', 1624 '营销中心',
1586 isRowLow: outDay == '0' || 1625 isRowLow: outDay == '0' ||
1587 !Utils.getAuthority( 1626 !Utils.getAuthority(
1588 context, '营销中心'))), 1627 context, '营销中心'))),
1589 InkWell( 1628 InkWell(
1590 - onTap: () {  
1591 - if (outDay == '0') {  
1592 - return;  
1593 - }  
1594 - if (Utils.getAuthority(  
1595 - context, '评价管理')) {  
1596 - NavigatorUtil  
1597 - .goCommentManageHomePage(  
1598 - context);  
1599 - }  
1600 - },  
1601 - child: _item(  
1602 - outDay == '0' ||  
1603 - !Utils.getAuthority(  
1604 - context, '评价管理')  
1605 - ? Utils.getImgPath(  
1606 - 'my_comment_un')  
1607 - : Utils.getImgPath(  
1608 - 'my_comment'),  
1609 - '评价管理',  
1610 - isRowLow: outDay == '0' ||  
1611 - !Utils.getAuthority(  
1612 - context, '评价管理'))),  
1613 - // InkWell(  
1614 - // onTap: () {}, child: _item('', '空空空空')), 1629 + onTap: () {}, child: _item('', '空空空空')),
1615 InkWell( 1630 InkWell(
1616 onTap: () {}, child: _item('', '空空空空')), 1631 onTap: () {}, child: _item('', '空空空空')),
1617 ], 1632 ],
1618 - ) 1633 + ),
1619 ], 1634 ],
1620 ))), 1635 ))),
1621 1636
1622 - VEmptyView(20),  
1623 -  
1624 Padding( 1637 Padding(
1625 padding: EdgeInsets.symmetric( 1638 padding: EdgeInsets.symmetric(
1626 vertical: ScreenUtil().setWidth(16)), 1639 vertical: ScreenUtil().setWidth(16)),
  1 +import 'package:flutter/material.dart';
  2 +import 'package:one_key/res/colors.dart';
  3 +import 'package:one_key/utils/utils.dart';
  4 +import 'package:one_key/widgets/h_empty_view.dart';
  5 +import 'package:one_key/widgets/system_app_bar.dart';
  6 +import 'package:one_key/widgets/v_empty_view.dart';
  7 +
  8 +import '../../route/navigator_util.dart';
  9 +import '../../utils/screen_util.dart';
  10 +
  11 +/**
  12 + * 桌位设置home页，桌位管理、桌位照片、包间类型、包间置满
  13 + */
  14 +class TableSettingHomePage extends StatefulWidget {
  15 + const TableSettingHomePage({Key key}) : super(key: key);
  16 +
  17 + @override
  18 + State<TableSettingHomePage> createState() => _TableSettingHomePageState();
  19 +}
  20 +
  21 +class _TableSettingHomePageState extends State<TableSettingHomePage> {
  22 + _itemWidget(String title, {GestureTapCallback onTap}) {
  23 + return InkWell(
  24 + onTap: onTap,
  25 + child: Container(
  26 + height: w(47),
  27 + margin: EdgeInsets.only(bottom: w(12), left: w(16)),
  28 + decoration: BoxDecoration(
  29 + border: Border(
  30 + bottom: BorderSide(
  31 + color: MyColours.color_E7E7E7, width: w(1)))),
  32 + child: Row(
  33 + mainAxisAlignment: MainAxisAlignment.spaceBetween,
  34 + children: [
  35 + Text(
  36 + title,
  37 + style: TextStyle(
  38 + color: MyColours.color_515151, fontSize: font(16)),
  39 + ),
  40 + Padding(
  41 + padding: EdgeInsets.only(right: w(12)),
  42 + child: Image.asset(
  43 + "assets/arrow_right_new.png",
  44 + width: w(7),
  45 + height: w(11),
  46 + ),
  47 + )
  48 + ],
  49 + )));
  50 + }
  51 +
  52 + @override
  53 + Widget build(BuildContext context) {
  54 + return Scaffold(
  55 + backgroundColor: MyColours.color_ffffff,
  56 + appBar: SystemAppBar('桌位设置'),
  57 + body: SingleChildScrollView(
  58 + child: Column(
  59 + children: [
  60 + VEmptyView(60),
  61 + _itemWidget('桌位管理', onTap: () {
  62 + NavigatorUtil.goMyTableManagerHomePage(context);
  63 + }),
  64 + _itemWidget('桌位照片', onTap: () async {
  65 + await NavigatorUtil.goPhotoManagerSelectTablePage(
  66 + context, "", DateTime.now().millisecondsSinceEpoch, "1",
  67 + canChoose: true,
  68 + object: null,
  69 + fromPage: "tablePhoto",
  70 + tid: '');
  71 + }),
  72 + _itemWidget('包间类型', onTap: () {
  73 + NavigatorUtil.goRoomTypeManagePage(context);
  74 + }),
  75 + _itemWidget('包间置满', onTap: () {
  76 + NavigatorUtil.goStoreTypeFillManagePage(context);
  77 + }),
  78 + ],
  79 + ),
  80 + ),
  81 + );
  82 + }
  83 +}
@@ -174,6 +174,7 @@ class NavigatorUtil { @@ -174,6 +174,7 @@ class NavigatorUtil {
174 return _navigateTo(context, 174 return _navigateTo(context,
175 "${Routes.photo_manager_page}?rid=$rid&tid=$tid&dateTime=$dateTime&fromPage=$fromPage&ddate_slot=$ddate_slot&canChoose=$canChoose"); 175 "${Routes.photo_manager_page}?rid=$rid&tid=$tid&dateTime=$dateTime&fromPage=$fromPage&ddate_slot=$ddate_slot&canChoose=$canChoose");
176 } 176 }
  177 +
177 /// 选择桌位——一次性接口获取 178 /// 选择桌位——一次性接口获取
178 static Future goSelectTableFPageOrRerserve( 179 static Future goSelectTableFPageOrRerserve(
179 BuildContext context, String rid, int dateTime, String ddate_slot, 180 BuildContext context, String rid, int dateTime, String ddate_slot,
@@ -193,6 +194,7 @@ class NavigatorUtil { @@ -193,6 +194,7 @@ class NavigatorUtil {
193 return _navigateTo(context, 194 return _navigateTo(context,
194 "${Routes.select_table_f_or_reserve}?rid=$rid&ridFeast=$ridFeast&tid=$tid&dateTime=$dateTime&fromPage=$fromPage&ddate_slot=$ddate_slot&canChoose=$canChoose&hmS=$hmS&hmE=$hmE&source=$source"); 195 "${Routes.select_table_f_or_reserve}?rid=$rid&ridFeast=$ridFeast&tid=$tid&dateTime=$dateTime&fromPage=$fromPage&ddate_slot=$ddate_slot&canChoose=$canChoose&hmS=$hmS&hmE=$hmE&source=$source");
195 } 196 }
  197 +
196 /// 选择桌位——方硕新修改的选择桌位页面 198 /// 选择桌位——方硕新修改的选择桌位页面
197 static Future goSelectTableFPage( 199 static Future goSelectTableFPage(
198 BuildContext context, String rid, int dateTime, String ddate_slot, 200 BuildContext context, String rid, int dateTime, String ddate_slot,
@@ -274,11 +276,10 @@ class NavigatorUtil { @@ -274,11 +276,10 @@ class NavigatorUtil {
274 "${Routes.change_detail_f}?detail=${FluroConvertUtils.object2string(detailEntity)}&rid=$rid&back=${back}", 276 "${Routes.change_detail_f}?detail=${FluroConvertUtils.object2string(detailEntity)}&rid=$rid&back=${back}",
275 replace: replace); 277 replace: replace);
276 } 278 }
277 -  
278 - /// 变更预订——方硕新修改页面 279 +
  280 + /// 变更预订——方硕新修改页面
279 static void goNoteBookChangeFPageOnly( 281 static void goNoteBookChangeFPageOnly(
280 BuildContext context, 282 BuildContext context,
281 -  
282 String rid, { 283 String rid, {
283 replace = false, 284 replace = false,
284 bool back = false, 285 bool back = false,
@@ -287,8 +288,7 @@ class NavigatorUtil { @@ -287,8 +288,7 @@ class NavigatorUtil {
287 // //内部预订 288 // //内部预订
288 // detailEntity.isSetDdate = "1"; 289 // detailEntity.isSetDdate = "1";
289 // } 290 // }
290 - _navigateTo(context,  
291 - "${Routes.change_detail_f_only}?rid=$rid&back=${back}", 291 + _navigateTo(context, "${Routes.change_detail_f_only}?rid=$rid&back=${back}",
292 replace: replace); 292 replace: replace);
293 } 293 }
294 294
@@ -418,8 +418,6 @@ class NavigatorUtil { @@ -418,8 +418,6 @@ class NavigatorUtil {
418 String position, { 418 String position, {
419 replace = false, 419 replace = false,
420 }) { 420 }) {
421 -  
422 -  
423 return _navigateTo(context, 421 return _navigateTo(context,
424 "${Routes.base_info_personnal_page}?sunModel=${FluroConvertUtils.object2string(sunModel)}&position=${Uri.encodeComponent(position)}", 422 "${Routes.base_info_personnal_page}?sunModel=${FluroConvertUtils.object2string(sunModel)}&position=${Uri.encodeComponent(position)}",
425 replace: replace); 423 replace: replace);
@@ -567,9 +565,7 @@ class NavigatorUtil { @@ -567,9 +565,7 @@ class NavigatorUtil {
567 replace: replace); 565 replace: replace);
568 } 566 }
569 567
570 -  
571 -  
572 - /// 包间类型置满 568 + /// 包间类型置满
573 static Future<dynamic> goStoreTypeFillManagePageSim(BuildContext context, 569 static Future<dynamic> goStoreTypeFillManagePageSim(BuildContext context,
574 {replace = false}) { 570 {replace = false}) {
575 return _navigateTo(context, "${Routes.store_type_fill_manage_page_sim}", 571 return _navigateTo(context, "${Routes.store_type_fill_manage_page_sim}",
@@ -579,9 +575,7 @@ class NavigatorUtil { @@ -579,9 +575,7 @@ class NavigatorUtil {
579 /// 短信余额显示 575 /// 短信余额显示
580 static Future<dynamic> goSmsManagePage(BuildContext context, 576 static Future<dynamic> goSmsManagePage(BuildContext context,
581 {replace = false}) { 577 {replace = false}) {
582 - return _navigateTo(context,  
583 - "${Routes.sms_manager_page}",  
584 - replace: replace); 578 + return _navigateTo(context, "${Routes.sms_manager_page}", replace: replace);
585 } 579 }
586 580
587 /// 短信充值 581 /// 短信充值
@@ -889,8 +883,10 @@ class NavigatorUtil { @@ -889,8 +883,10 @@ class NavigatorUtil {
889 /// 我的客情列表 883 /// 我的客情列表
890 static Future<dynamic> goMyCustomerListPage( 884 static Future<dynamic> goMyCustomerListPage(
891 BuildContext context, FromPage fromPage, String uid, 885 BuildContext context, FromPage fromPage, String uid,
892 - {replace = false, bool needBtn = false, String index = '0',String labels = ''}) {  
893 - 886 + {replace = false,
  887 + bool needBtn = false,
  888 + String index = '0',
  889 + String labels = ''}) {
894 return _navigateTo(context, 890 return _navigateTo(context,
895 "${Routes.my_customer_list_page}?fromPage=${FluroConvertUtils.enumToString(fromPage)}&index=${index}&uid=${uid}&labels=${Uri.encodeComponent(labels)}", 891 "${Routes.my_customer_list_page}?fromPage=${FluroConvertUtils.enumToString(fromPage)}&index=${index}&uid=${uid}&labels=${Uri.encodeComponent(labels)}",
896 replace: replace); 892 replace: replace);
@@ -931,15 +927,12 @@ class NavigatorUtil { @@ -931,15 +927,12 @@ class NavigatorUtil {
931 } 927 }
932 928
933 /// 我的创建营销 929 /// 我的创建营销
934 - static Future<dynamic> goMyMakeMarkingPage(  
935 - BuildContext context,  
936 - String uid, {  
937 - replace = false,  
938 - SelfList selfList,  
939 - FromPage fromPage,  
940 - String homeGid = '',  
941 - String labels = ''  
942 - }) { 930 + static Future<dynamic> goMyMakeMarkingPage(BuildContext context, String uid,
  931 + {replace = false,
  932 + SelfList selfList,
  933 + FromPage fromPage,
  934 + String homeGid = '',
  935 + String labels = ''}) {
943 return _navigateTo(context, 936 return _navigateTo(context,
944 "${Routes.my_make_marketing_page}?selfList=${FluroConvertUtils.object2string(selfList)}&fromPage=${FluroConvertUtils.enumToString(fromPage)}&homeGid=$homeGid&uid=$uid&labels=${Uri.encodeComponent(labels)}", 937 "${Routes.my_make_marketing_page}?selfList=${FluroConvertUtils.object2string(selfList)}&fromPage=${FluroConvertUtils.enumToString(fromPage)}&homeGid=$homeGid&uid=$uid&labels=${Uri.encodeComponent(labels)}",
945 replace: replace); 938 replace: replace);
@@ -1439,7 +1432,7 @@ class NavigatorUtil { @@ -1439,7 +1432,7 @@ class NavigatorUtil {
1439 replace: replace); 1432 replace: replace);
1440 } 1433 }
1441 1434
1442 - ///经理排菜-首页 1435 + ///经理排菜-首页
1443 /// 1436 ///
1444 1437
1445 static Future<dynamic> goOrderAdvanceHomePage( 1438 static Future<dynamic> goOrderAdvanceHomePage(
@@ -1758,14 +1751,13 @@ class NavigatorUtil { @@ -1758,14 +1751,13 @@ class NavigatorUtil {
1758 } 1751 }
1759 1752
1760 ///我的------存酒详情 1753 ///我的------存酒详情
1761 - static Future<dynamic> goWineDetailPage(  
1762 - BuildContext context, String idstr,  
1763 - {bool isStoreWine,replace = false, bool onlyShow = false}) {  
1764 - if(isStoreWine == null){  
1765 - return _navigateTo(context,  
1766 - "${Routes.wine_detail_page}?idstr=$idstr&onlyShow=${onlyShow}",  
1767 - replace: replace);  
1768 - } 1754 + static Future<dynamic> goWineDetailPage(BuildContext context, String idstr,
  1755 + {bool isStoreWine, replace = false, bool onlyShow = false}) {
  1756 + if (isStoreWine == null) {
  1757 + return _navigateTo(context,
  1758 + "${Routes.wine_detail_page}?idstr=$idstr&onlyShow=${onlyShow}",
  1759 + replace: replace);
  1760 + }
1769 return _navigateTo(context, 1761 return _navigateTo(context,
1770 "${Routes.wine_detail_page}?idstr=$idstr&isStoreWine=${isStoreWine}&onlyShow=${onlyShow}", 1762 "${Routes.wine_detail_page}?idstr=$idstr&isStoreWine=${isStoreWine}&onlyShow=${onlyShow}",
1771 replace: replace); 1763 replace: replace);
@@ -1774,17 +1766,20 @@ class NavigatorUtil { @@ -1774,17 +1766,20 @@ class NavigatorUtil {
1774 ///我的------存酒记录 1766 ///我的------存酒记录
1775 static Future<dynamic> goOutStoreRecordPage( 1767 static Future<dynamic> goOutStoreRecordPage(
1776 BuildContext context, 1768 BuildContext context,
1777 - String idstr, bool isStoreWine,{ 1769 + String idstr,
  1770 + bool isStoreWine, {
1778 replace = false, 1771 replace = false,
1779 }) { 1772 }) {
1780 - return _navigateTo(context, "${Routes.out_store_record_page}?idstr=$idstr&isStoreWine=${isStoreWine}", 1773 + return _navigateTo(context,
  1774 + "${Routes.out_store_record_page}?idstr=$idstr&isStoreWine=${isStoreWine}",
1781 replace: replace); 1775 replace: replace);
1782 } 1776 }
1783 1777
1784 ///我的------申请出库 1778 ///我的------申请出库
1785 static Future<dynamic> goApplyOutStorePage( 1779 static Future<dynamic> goApplyOutStorePage(
1786 BuildContext context, 1780 BuildContext context,
1787 - WineManageModel wineManageDetail,bool isStoreWine, { 1781 + WineManageModel wineManageDetail,
  1782 + bool isStoreWine, {
1788 Map object, 1783 Map object,
1789 replace = false, 1784 replace = false,
1790 }) { 1785 }) {
@@ -1810,7 +1805,8 @@ class NavigatorUtil { @@ -1810,7 +1805,8 @@ class NavigatorUtil {
1810 ///我的------出库记录列表详情页 1805 ///我的------出库记录列表详情页
1811 static Future<dynamic> goOutStoreRecordDetailPage( 1806 static Future<dynamic> goOutStoreRecordDetailPage(
1812 BuildContext context, 1807 BuildContext context,
1813 - OutWineRecordSunModel outWineRecordSunModel,bool isStoreWine, { 1808 + OutWineRecordSunModel outWineRecordSunModel,
  1809 + bool isStoreWine, {
1814 replace = false, 1810 replace = false,
1815 }) { 1811 }) {
1816 return _navigateTo(context, 1812 return _navigateTo(context,
@@ -2110,7 +2106,6 @@ class NavigatorUtil { @@ -2110,7 +2106,6 @@ class NavigatorUtil {
2110 replace: replace); 2106 replace: replace);
2111 } 2107 }
2112 2108
2113 -  
2114 /// 邀请函主题选择 2109 /// 邀请函主题选择
2115 static Future<dynamic> goInvitationThemeHomePageSim( 2110 static Future<dynamic> goInvitationThemeHomePageSim(
2116 BuildContext context, { 2111 BuildContext context, {
@@ -2130,8 +2125,8 @@ class NavigatorUtil { @@ -2130,8 +2125,8 @@ class NavigatorUtil {
2130 "${Routes.invitation_theme_home_preview_page}?themeSunModel=${FluroConvertUtils.object2string(themeSunModel)}", 2125 "${Routes.invitation_theme_home_preview_page}?themeSunModel=${FluroConvertUtils.object2string(themeSunModel)}",
2131 replace: replace); 2126 replace: replace);
2132 } 2127 }
2133 -  
2134 - /// 邀请函主题选择预览 2128 +
  2129 + /// 邀请函主题选择预览
2135 static Future<dynamic> goInvitationThemeHomePreviewPageSim( 2130 static Future<dynamic> goInvitationThemeHomePreviewPageSim(
2136 BuildContext context, 2131 BuildContext context,
2137 SellerTemplateColorListSunModel themeSunModel, { 2132 SellerTemplateColorListSunModel themeSunModel, {
@@ -2145,7 +2140,6 @@ class NavigatorUtil { @@ -2145,7 +2140,6 @@ class NavigatorUtil {
2145 ///预订----添加订金 2140 ///预订----添加订金
2146 static Future<dynamic> goBookDepositPage(BuildContext context, String rid, 2141 static Future<dynamic> goBookDepositPage(BuildContext context, String rid,
2147 {replace = false, 2142 {replace = false,
2148 -  
2149 bool isNew = true, 2143 bool isNew = true,
2150 BookDepositSunModel bookDepositModel}) { 2144 BookDepositSunModel bookDepositModel}) {
2151 return _navigateTo(context, 2145 return _navigateTo(context,
@@ -2249,68 +2243,64 @@ class NavigatorUtil { @@ -2249,68 +2243,64 @@ class NavigatorUtil {
2249 replace: replace); 2243 replace: replace);
2250 } 2244 }
2251 2245
2252 - //预订信息模块设置-自定义图文默认 2246 + //预订信息模块设置-自定义图文默认
2253 static Future<dynamic> goPaymentSettingPage( 2247 static Future<dynamic> goPaymentSettingPage(
2254 BuildContext context, { 2248 BuildContext context, {
2255 -  
2256 replace = false, 2249 replace = false,
2257 }) { 2250 }) {
2258 return _navigateTo(context, "${Routes.payment_setting_page}", 2251 return _navigateTo(context, "${Routes.payment_setting_page}",
2259 replace: replace); 2252 replace: replace);
2260 } 2253 }
2261 2254
2262 -  
2263 -  
2264 - //小程序通知卡片样式 2255 + //小程序通知卡片样式
2265 static Future<dynamic> goMiniprogramSettingPage( 2256 static Future<dynamic> goMiniprogramSettingPage(
2266 BuildContext context, { 2257 BuildContext context, {
2267 -  
2268 replace = false, 2258 replace = false,
2269 }) { 2259 }) {
2270 return _navigateTo(context, "${Routes.mini_program_setting_page}", 2260 return _navigateTo(context, "${Routes.mini_program_setting_page}",
2271 replace: replace); 2261 replace: replace);
2272 } 2262 }
2273 2263
2274 - //存酒设置模版 2264 + //存酒设置模版
2275 static Future<dynamic> goWineSettingMsgPage( 2265 static Future<dynamic> goWineSettingMsgPage(
2276 BuildContext context, { 2266 BuildContext context, {
2277 -  
2278 replace = false, 2267 replace = false,
2279 }) { 2268 }) {
2280 return _navigateTo(context, "${Routes.wine_setting_msg_page}", 2269 return _navigateTo(context, "${Routes.wine_setting_msg_page}",
2281 replace: replace); 2270 replace: replace);
2282 } 2271 }
2283 2272
2284 -  
2285 -  
2286 -///多时段预订设置列表  
2287 - static Future<dynamic> goBookTimeSettingListPage( 2273 + ///多时段预订设置列表
  2274 + static Future<dynamic> goBookTimeSettingListPage(
2288 BuildContext context, { 2275 BuildContext context, {
2289 -  
2290 replace = false, 2276 replace = false,
2291 }) { 2277 }) {
2292 return _navigateTo(context, "${Routes.book_time_setting_list_page}", 2278 return _navigateTo(context, "${Routes.book_time_setting_list_page}",
2293 replace: replace); 2279 replace: replace);
2294 } 2280 }
2295 2281
2296 -  
2297 -  
2298 -  
2299 -///多时段预订设置列表编辑页面  
2300 - static Future<dynamic> goBookTimeSettingEditPage(  
2301 - BuildContext context, {  
2302 - MealListSunModel sunModel,  
2303 - 2282 + ///多时段预订设置列表编辑页面
  2283 + static Future<dynamic> goBookTimeSettingEditPage(
  2284 + BuildContext context, {
  2285 + MealListSunModel sunModel,
2304 replace = false, 2286 replace = false,
2305 }) { 2287 }) {
2306 - if(sunModel != null){  
2307 -return _navigateTo(context, "${Routes.book_time_setting_edit_page}?sunModel=${FluroConvertUtils.object2string(sunModel)}",  
2308 - replace: replace); 2288 + if (sunModel != null) {
  2289 + return _navigateTo(context,
  2290 + "${Routes.book_time_setting_edit_page}?sunModel=${FluroConvertUtils.object2string(sunModel)}",
  2291 + replace: replace);
2309 } 2292 }
2310 return _navigateTo(context, "${Routes.book_time_setting_edit_page}", 2293 return _navigateTo(context, "${Routes.book_time_setting_edit_page}",
2311 replace: replace); 2294 replace: replace);
2312 -  
2313 } 2295 }
2314 2296
2315 - 2297 + ///桌位设置home页面
  2298 + static Future<dynamic> goTableSettingHomePage(
  2299 + BuildContext context, {
  2300 + MealListSunModel sunModel,
  2301 + replace = false,
  2302 + }) {
  2303 + return _navigateTo(context, "${Routes.table_setting_home_page}",
  2304 + replace: replace);
  2305 + }
2316 } 2306 }
@@ -269,6 +269,7 @@ import '../pages/my/store_wine_manage/wine_detail_page.dart'; @@ -269,6 +269,7 @@ import '../pages/my/store_wine_manage/wine_detail_page.dart';
269 import '../pages/my/store_wine_manage/wine_setting_msg_page.dart'; 269 import '../pages/my/store_wine_manage/wine_setting_msg_page.dart';
270 import '../pages/my/store_wine_manage/wine_setting_page.dart'; 270 import '../pages/my/store_wine_manage/wine_setting_page.dart';
271 import '../pages/my/table_manage/merge_table_select_page.dart'; 271 import '../pages/my/table_manage/merge_table_select_page.dart';
  272 +import '../pages/my/table_setting_home_page.dart';
272 import '../pages/order_advance/customer_detail_page.dart'; 273 import '../pages/order_advance/customer_detail_page.dart';
273 import '../pages/order_advance/order_advance_home_page.dart'; 274 import '../pages/order_advance/order_advance_home_page.dart';
274 import '../pages/order_advance/order_create_temporary_page.dart'; 275 import '../pages/order_advance/order_create_temporary_page.dart';
@@ -3968,3 +3969,27 @@ var bookTimeSettingEditPageHandle = new Handler( @@ -3968,3 +3969,27 @@ var bookTimeSettingEditPageHandle = new Handler(
3968 3969
3969 3970
3970 3971
  3972 +
  3973 +
  3974 +
  3975 +///桌位设置home页面
  3976 +var tableSettingHomePageHandle = new Handler(
  3977 + handlerFunc: (BuildContext context, Map<String, List<Object>> params) {
  3978 + // String rid = params["rid"].first;
  3979 + // // String smsTemplate = params["smsTemplate"].first;
  3980 + // CouponUse use = CouponUse.fromJson(
  3981 + // json.decode(FluroConvertUtils.fluroCnParamsDecode(params["use"].first)));
  3982 +
  3983 + // if (params.keys.contains('sunModel')) {
  3984 + // MealListSunModel sunModel = MealListSunModel.fromJson(json.decode(
  3985 + // FluroConvertUtils.fluroCnParamsDecode(params["sunModel"].first)));
  3986 + // return ChangeNotifierProvider<StoreBaseIndoProvider>(
  3987 + // create: (_) => StoreBaseIndoProvider(),
  3988 + // child: BookTimeSettingEditPage(sunModel));
  3989 + // }
  3990 + return TableSettingHomePage();
  3991 +
  3992 +});
  3993 +
  3994 +
  3995 +
@@ -19,7 +19,6 @@ class Routes { @@ -19,7 +19,6 @@ class Routes {
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 21
22 -  
23 static String invication = "/invication"; //邀请函 22 static String invication = "/invication"; //邀请函
24 23
25 static String invication_sim = "/invication_sim"; //邀请函 24 static String invication_sim = "/invication_sim"; //邀请函
@@ -63,7 +62,7 @@ class Routes { @@ -63,7 +62,7 @@ class Routes {
63 static String store_type_fill_manage_page = 62 static String store_type_fill_manage_page =
64 "/store_type_fill_manage_page"; //包间置满管理 63 "/store_type_fill_manage_page"; //包间置满管理
65 64
66 - static String store_type_fill_manage_page_sim = 65 + static String store_type_fill_manage_page_sim =
67 "/store_type_fill_manage_page_sim"; //包间置满管理 66 "/store_type_fill_manage_page_sim"; //包间置满管理
68 static String sms_manager_page = "/sms_manager_page"; //短信充值 67 static String sms_manager_page = "/sms_manager_page"; //短信充值
69 static String sms_recharge_page = "/sms_recharge_page"; //短信充值 68 static String sms_recharge_page = "/sms_recharge_page"; //短信充值
@@ -90,9 +89,7 @@ class Routes { @@ -90,9 +89,7 @@ class Routes {
90 "/personnel_password_edit_page"; //密码修改页 89 "/personnel_password_edit_page"; //密码修改页
91 static String change_detail_f = "/change_detail_f"; //变更预订_方硕新修改页面 90 static String change_detail_f = "/change_detail_f"; //变更预订_方硕新修改页面
92 91
93 -  
94 -  
95 - static String change_detail_f_only = "/change_detail_f_only"; //变更预订_方硕新修改页面 92 + static String change_detail_f_only = "/change_detail_f_only"; //变更预订_方硕新修改页面
96 static String photo_manager_page = "/photo_manager_page"; //照片管理 93 static String photo_manager_page = "/photo_manager_page"; //照片管理
97 static String edit_reserver_page = "/edit_reserver_page"; //填写预订联系人 94 static String edit_reserver_page = "/edit_reserver_page"; //填写预订联系人
98 static String store_customer_page = "/store_customer_page"; //全店客情 95 static String store_customer_page = "/store_customer_page"; //全店客情
@@ -220,7 +217,7 @@ class Routes { @@ -220,7 +217,7 @@ class Routes {
220 */ 217 */
221 static String order_advance_home_page = "/order_advance_home_page"; //经理预点菜首页 218 static String order_advance_home_page = "/order_advance_home_page"; //经理预点菜首页
222 // static String order_advance_home_page_sim = "/order_advance_home_page_sim"; //经理预点菜首页 219 // static String order_advance_home_page_sim = "/order_advance_home_page_sim"; //经理预点菜首页
223 - 220 +
224 static String order_advance_edit_page = "/order_advance_edit_page"; //经理预点菜编辑 221 static String order_advance_edit_page = "/order_advance_edit_page"; //经理预点菜编辑
225 static String order_preview_page = "/order_preview_page"; //预览页 222 static String order_preview_page = "/order_preview_page"; //预览页
226 static String order_edit_list_show_page = 223 static String order_edit_list_show_page =
@@ -391,23 +388,15 @@ class Routes { @@ -391,23 +388,15 @@ class Routes {
391 static String mini_program_setting_page = 388 static String mini_program_setting_page =
392 "/mini_program_setting_page"; //小程序封面样式设置 389 "/mini_program_setting_page"; //小程序封面样式设置
393 390
394 - static String wine_setting_msg_page =  
395 - "/wine_setting_msg_page"; //存酒短信模版设置  
396 - 391 + static String wine_setting_msg_page = "/wine_setting_msg_page"; //存酒短信模版设置
397 392
398 - static String book_time_setting_list_page = 393 + static String book_time_setting_list_page =
399 "/book_time_setting_list_page"; //多时段预订列表 394 "/book_time_setting_list_page"; //多时段预订列表
400 395
401 -  
402 - static String book_time_setting_edit_page = 396 + static String book_time_setting_edit_page =
403 "/book_time_setting_edit_page"; //多时段预订列表编辑页面 397 "/book_time_setting_edit_page"; //多时段预订列表编辑页面
404 -  
405 -  
406 -  
407 -  
408 -  
409 -  
410 - 398 + static String table_setting_home_page =
  399 + '/table_setting_home_page'; //桌位设置home页
411 400
412 static void configureRoutes(FluroRouter router) { 401 static void configureRoutes(FluroRouter router) {
413 router.notFoundHandler = new Handler( 402 router.notFoundHandler = new Handler(
@@ -425,7 +414,8 @@ class Routes { @@ -425,7 +414,8 @@ class Routes {
425 router.define(reserve_detail_sim, handler: reserveDetailSimHandler); 414 router.define(reserve_detail_sim, handler: reserveDetailSimHandler);
426 router.define(select_table, handler: handleSelectTableHandler); 415 router.define(select_table, handler: handleSelectTableHandler);
427 router.define(select_table_f, handler: handleSelectTableFHandler); 416 router.define(select_table_f, handler: handleSelectTableFHandler);
428 -router.define(select_table_f_or_reserve, handler: handleSelectTableFOrReserveHandler); 417 + router.define(select_table_f_or_reserve,
  418 + handler: handleSelectTableFOrReserveHandler);
429 419
430 router.define(invication, handler: handleInvicationHandler); 420 router.define(invication, handler: handleInvicationHandler);
431 router.define(invication_sim, handler: handleInvicationSimHandler); 421 router.define(invication_sim, handler: handleInvicationSimHandler);
@@ -478,8 +468,6 @@ router.define(select_table_f_or_reserve, handler: handleSelectTableFOrReserveHan @@ -478,8 +468,6 @@ router.define(select_table_f_or_reserve, handler: handleSelectTableFOrReserveHan
478 router.define(store_type_fill_manage_page_sim, 468 router.define(store_type_fill_manage_page_sim,
479 handler: storeTypeFillManagePageSimHandler); 469 handler: storeTypeFillManagePageSimHandler);
480 470
481 -  
482 -  
483 router.define(sms_manager_page, handler: smsManagerPageHandler); 471 router.define(sms_manager_page, handler: smsManagerPageHandler);
484 router.define(sms_recharge_page, handler: smsRechargePageHandler); 472 router.define(sms_recharge_page, handler: smsRechargePageHandler);
485 router.define(store_base_info_page, handler: storeBaseInfoPageHandler); 473 router.define(store_base_info_page, handler: storeBaseInfoPageHandler);
@@ -506,8 +494,8 @@ router.define(select_table_f_or_reserve, handler: handleSelectTableFOrReserveHan @@ -506,8 +494,8 @@ router.define(select_table_f_or_reserve, handler: handleSelectTableFOrReserveHan
506 router.define(personnel_password_edit_page, 494 router.define(personnel_password_edit_page,
507 handler: personnelPasswordEditPageHandle); 495 handler: personnelPasswordEditPageHandle);
508 router.define(change_detail_f, handler: noteBookChangeFPageHandle); 496 router.define(change_detail_f, handler: noteBookChangeFPageHandle);
509 - router.define(change_detail_f_only, handler: noteBookChangeFPageOnlyHandle);  
510 - 497 + router.define(change_detail_f_only, handler: noteBookChangeFPageOnlyHandle);
  498 +
511 router.define(photo_manager_page, handler: photoManagerPageHandle); 499 router.define(photo_manager_page, handler: photoManagerPageHandle);
512 router.define(edit_reserver_page, handler: editReserverPageHandle); 500 router.define(edit_reserver_page, handler: editReserverPageHandle);
513 router.define(store_customer_page, handler: storeCustomerPageHandle); 501 router.define(store_customer_page, handler: storeCustomerPageHandle);
@@ -621,7 +609,6 @@ router.define(select_table_f_or_reserve, handler: handleSelectTableFOrReserveHan @@ -621,7 +609,6 @@ router.define(select_table_f_or_reserve, handler: handleSelectTableFOrReserveHan
621 router.define(final_plan_dish_page, handler: finalPlanDishPageHandle); 609 router.define(final_plan_dish_page, handler: finalPlanDishPageHandle);
622 router.define(order_advance_home_page, handler: orderAdvanceHomePageHandle); 610 router.define(order_advance_home_page, handler: orderAdvanceHomePageHandle);
623 // router.define(order_advance_home_page_sim, handler: orderAdvanceHomePageSimHandle); 611 // router.define(order_advance_home_page_sim, handler: orderAdvanceHomePageSimHandle);
624 -  
625 612
626 router.define(order_advance_edit_page, handler: orderAdvanceEidtPageHandle); 613 router.define(order_advance_edit_page, handler: orderAdvanceEidtPageHandle);
627 router.define(order_preview_page, handler: orderPreviewPageHandle); 614 router.define(order_preview_page, handler: orderPreviewPageHandle);
@@ -751,18 +738,21 @@ router.define(select_table_f_or_reserve, handler: handleSelectTableFOrReserveHan @@ -751,18 +738,21 @@ router.define(select_table_f_or_reserve, handler: handleSelectTableFOrReserveHan
751 handler: invicationAdditionPageHandle); 738 handler: invicationAdditionPageHandle);
752 router.define(payment_setting_page, handler: paymentSettingPageHandle); 739 router.define(payment_setting_page, handler: paymentSettingPageHandle);
753 740
754 - router.define(mini_program_setting_page, handler: miniprogramSettingPageHandle);  
755 - router.define(wine_setting_msg_page, handler:wineSettingMsgPageHandle); 741 + router.define(mini_program_setting_page,
  742 + handler: miniprogramSettingPageHandle);
  743 + router.define(wine_setting_msg_page, handler: wineSettingMsgPageHandle);
  744 +
  745 + router.define(book_time_setting_list_page,
  746 + handler: bookTimeSettingListPageHandle);
756 747
757 - router.define(book_time_setting_list_page, handler:bookTimeSettingListPageHandle);  
758 -  
759 -  
760 - router.define(book_time_setting_edit_page, handler:bookTimeSettingEditPageHandle); 748 + router.define(book_time_setting_edit_page,
  749 + handler: bookTimeSettingEditPageHandle);
761 750
  751 + router.define(table_setting_home_page,
  752 + handler: tableSettingHomePageHandle);
762 753
763 754
764 -  
765 755
766 - 756 +
767 } 757 }
768 } 758 }
  1 +# Generated by pub
  2 +# See https://dart.dev/tools/pub/glossary#lockfile
  3 +packages:
  4 + _fe_analyzer_shared:
  5 + dependency: transitive
  6 + description:
  7 + name: _fe_analyzer_shared
  8 + url: "https://pub.flutter-io.cn"
  9 + source: hosted
  10 + version: "22.0.0"
  11 + analyzer:
  12 + dependency: transitive
  13 + description:
  14 + name: analyzer
  15 + url: "https://pub.flutter-io.cn"
  16 + source: hosted
  17 + version: "1.7.2"
  18 + args:
  19 + dependency: transitive
  20 + description:
  21 + name: args
  22 + url: "https://pub.flutter-io.cn"
  23 + source: hosted
  24 + version: "2.4.1"
  25 + async:
  26 + dependency: transitive
  27 + description:
  28 + name: async
  29 + url: "https://pub.flutter-io.cn"
  30 + source: hosted
  31 + version: "2.11.0"
  32 + boolean_selector:
  33 + dependency: transitive
  34 + description:
  35 + name: boolean_selector
  36 + url: "https://pub.flutter-io.cn"
  37 + source: hosted
  38 + version: "2.1.1"
  39 + build:
  40 + dependency: transitive
  41 + description:
  42 + name: build
  43 + url: "https://pub.flutter-io.cn"
  44 + source: hosted
  45 + version: "2.0.3"
  46 + build_config:
  47 + dependency: transitive
  48 + description:
  49 + name: build_config
  50 + url: "https://pub.flutter-io.cn"
  51 + source: hosted
  52 + version: "0.4.7"
  53 + build_daemon:
  54 + dependency: transitive
  55 + description:
  56 + name: build_daemon
  57 + url: "https://pub.flutter-io.cn"
  58 + source: hosted
  59 + version: "2.1.10"
  60 + build_resolvers:
  61 + dependency: transitive
  62 + description:
  63 + name: build_resolvers
  64 + url: "https://pub.flutter-io.cn"
  65 + source: hosted
  66 + version: "2.0.4"
  67 + build_runner:
  68 + dependency: "direct dev"
  69 + description:
  70 + name: build_runner
  71 + url: "https://pub.flutter-io.cn"
  72 + source: hosted
  73 + version: "1.12.2"
  74 + build_runner_core:
  75 + dependency: transitive
  76 + description:
  77 + name: build_runner_core
  78 + url: "https://pub.flutter-io.cn"
  79 + source: hosted
  80 + version: "6.1.12"
  81 + built_collection:
  82 + dependency: transitive
  83 + description:
  84 + name: built_collection
  85 + url: "https://pub.flutter-io.cn"
  86 + source: hosted
  87 + version: "5.1.1"
  88 + built_value:
  89 + dependency: transitive
  90 + description:
  91 + name: built_value
  92 + url: "https://pub.flutter-io.cn"
  93 + source: hosted
  94 + version: "8.8.0"
  95 + checked_yaml:
  96 + dependency: transitive
  97 + description:
  98 + name: checked_yaml
  99 + url: "https://pub.flutter-io.cn"
  100 + source: hosted
  101 + version: "2.0.1"
  102 + cli_util:
  103 + dependency: transitive
  104 + description:
  105 + name: cli_util
  106 + url: "https://pub.flutter-io.cn"
  107 + source: hosted
  108 + version: "0.3.5"
  109 + code_builder:
  110 + dependency: transitive
  111 + description:
  112 + name: code_builder
  113 + url: "https://pub.flutter-io.cn"
  114 + source: hosted
  115 + version: "3.7.0"
  116 + collection:
  117 + dependency: transitive
  118 + description:
  119 + name: collection
  120 + url: "https://pub.flutter-io.cn"
  121 + source: hosted
  122 + version: "1.18.0"
  123 + convert:
  124 + dependency: transitive
  125 + description:
  126 + name: convert
  127 + url: "https://pub.flutter-io.cn"
  128 + source: hosted
  129 + version: "3.1.1"
  130 + coverage:
  131 + dependency: "direct dev"
  132 + description:
  133 + name: coverage
  134 + url: "https://pub.flutter-io.cn"
  135 + source: hosted
  136 + version: "1.0.3"
  137 + crypto:
  138 + dependency: transitive
  139 + description:
  140 + name: crypto
  141 + url: "https://pub.flutter-io.cn"
  142 + source: hosted
  143 + version: "3.0.2"
  144 + dart_style:
  145 + dependency: transitive
  146 + description:
  147 + name: dart_style
  148 + url: "https://pub.flutter-io.cn"
  149 + source: hosted
  150 + version: "2.1.1"
  151 + file:
  152 + dependency: transitive
  153 + description:
  154 + name: file
  155 + url: "https://pub.flutter-io.cn"
  156 + source: hosted
  157 + version: "6.1.4"
  158 + fixnum:
  159 + dependency: transitive
  160 + description:
  161 + name: fixnum
  162 + url: "https://pub.flutter-io.cn"
  163 + source: hosted
  164 + version: "1.0.1"
  165 + frontend_server_client:
  166 + dependency: transitive
  167 + description:
  168 + name: frontend_server_client
  169 + url: "https://pub.flutter-io.cn"
  170 + source: hosted
  171 + version: "2.1.3"
  172 + glob:
  173 + dependency: transitive
  174 + description:
  175 + name: glob
  176 + url: "https://pub.flutter-io.cn"
  177 + source: hosted
  178 + version: "2.1.1"
  179 + graphs:
  180 + dependency: transitive
  181 + description:
  182 + name: graphs
  183 + url: "https://pub.flutter-io.cn"
  184 + source: hosted
  185 + version: "1.0.0"
  186 + http:
  187 + dependency: "direct main"
  188 + description:
  189 + name: http
  190 + url: "https://pub.flutter-io.cn"
  191 + source: hosted
  192 + version: "0.13.5"
  193 + http_multi_server:
  194 + dependency: transitive
  195 + description:
  196 + name: http_multi_server
  197 + url: "https://pub.flutter-io.cn"
  198 + source: hosted
  199 + version: "3.2.1"
  200 + http_parser:
  201 + dependency: transitive
  202 + description:
  203 + name: http_parser
  204 + url: "https://pub.flutter-io.cn"
  205 + source: hosted
  206 + version: "4.0.2"
  207 + io:
  208 + dependency: transitive
  209 + description:
  210 + name: io
  211 + url: "https://pub.flutter-io.cn"
  212 + source: hosted
  213 + version: "1.0.4"
  214 + js:
  215 + dependency: transitive
  216 + description:
  217 + name: js
  218 + url: "https://pub.flutter-io.cn"
  219 + source: hosted
  220 + version: "0.6.5"
  221 + json_annotation:
  222 + dependency: "direct main"
  223 + description:
  224 + name: json_annotation
  225 + url: "https://pub.flutter-io.cn"
  226 + source: hosted
  227 + version: "4.1.0"
  228 + json_serializable:
  229 + dependency: "direct dev"
  230 + description:
  231 + name: json_serializable
  232 + url: "https://pub.flutter-io.cn"
  233 + source: hosted
  234 + version: "4.1.4"
  235 + logging:
  236 + dependency: transitive
  237 + description:
  238 + name: logging
  239 + url: "https://pub.flutter-io.cn"
  240 + source: hosted
  241 + version: "1.1.1"
  242 + matcher:
  243 + dependency: transitive
  244 + description:
  245 + name: matcher
  246 + url: "https://pub.flutter-io.cn"
  247 + source: hosted
  248 + version: "0.12.11"
  249 + meta:
  250 + dependency: "direct main"
  251 + description:
  252 + name: meta
  253 + url: "https://pub.flutter-io.cn"
  254 + source: hosted
  255 + version: "1.16.0"
  256 + mime:
  257 + dependency: transitive
  258 + description:
  259 + name: mime
  260 + url: "https://pub.flutter-io.cn"
  261 + source: hosted
  262 + version: "1.0.4"
  263 + node_preamble:
  264 + dependency: transitive
  265 + description:
  266 + name: node_preamble
  267 + url: "https://pub.flutter-io.cn"
  268 + source: hosted
  269 + version: "2.0.2"
  270 + package_config:
  271 + dependency: transitive
  272 + description:
  273 + name: package_config
  274 + url: "https://pub.flutter-io.cn"
  275 + source: hosted
  276 + version: "2.1.0"
  277 + path:
  278 + dependency: transitive
  279 + description:
  280 + name: path
  281 + url: "https://pub.flutter-io.cn"
  282 + source: hosted
  283 + version: "1.8.3"
  284 + pedantic:
  285 + dependency: "direct dev"
  286 + description:
  287 + name: pedantic
  288 + url: "https://pub.flutter-io.cn"
  289 + source: hosted
  290 + version: "1.11.1"
  291 + pool:
  292 + dependency: transitive
  293 + description:
  294 + name: pool
  295 + url: "https://pub.flutter-io.cn"
  296 + source: hosted
  297 + version: "1.5.1"
  298 + pub_semver:
  299 + dependency: transitive
  300 + description:
  301 + name: pub_semver
  302 + url: "https://pub.flutter-io.cn"
  303 + source: hosted
  304 + version: "2.1.4"
  305 + pubspec_parse:
  306 + dependency: transitive
  307 + description:
  308 + name: pubspec_parse
  309 + url: "https://pub.flutter-io.cn"
  310 + source: hosted
  311 + version: "1.1.0"
  312 + shelf:
  313 + dependency: transitive
  314 + description:
  315 + name: shelf
  316 + url: "https://pub.flutter-io.cn"
  317 + source: hosted
  318 + version: "1.4.1"
  319 + shelf_packages_handler:
  320 + dependency: transitive
  321 + description:
  322 + name: shelf_packages_handler
  323 + url: "https://pub.flutter-io.cn"
  324 + source: hosted
  325 + version: "3.0.2"
  326 + shelf_static:
  327 + dependency: transitive
  328 + description:
  329 + name: shelf_static
  330 + url: "https://pub.flutter-io.cn"
  331 + source: hosted
  332 + version: "1.1.2"
  333 + shelf_web_socket:
  334 + dependency: transitive
  335 + description:
  336 + name: shelf_web_socket
  337 + url: "https://pub.flutter-io.cn"
  338 + source: hosted
  339 + version: "1.0.4"
  340 + source_gen:
  341 + dependency: transitive
  342 + description:
  343 + name: source_gen
  344 + url: "https://pub.flutter-io.cn"
  345 + source: hosted
  346 + version: "1.0.3"
  347 + source_map_stack_trace:
  348 + dependency: transitive
  349 + description:
  350 + name: source_map_stack_trace
  351 + url: "https://pub.flutter-io.cn"
  352 + source: hosted
  353 + version: "2.1.1"
  354 + source_maps:
  355 + dependency: transitive
  356 + description:
  357 + name: source_maps
  358 + url: "https://pub.flutter-io.cn"
  359 + source: hosted
  360 + version: "0.10.12"
  361 + source_span:
  362 + dependency: transitive
  363 + description:
  364 + name: source_span
  365 + url: "https://pub.flutter-io.cn"
  366 + source: hosted
  367 + version: "1.10.0"
  368 + stack_trace:
  369 + dependency: transitive
  370 + description:
  371 + name: stack_trace
  372 + url: "https://pub.flutter-io.cn"
  373 + source: hosted
  374 + version: "1.11.1"
  375 + stream_channel:
  376 + dependency: transitive
  377 + description:
  378 + name: stream_channel
  379 + url: "https://pub.flutter-io.cn"
  380 + source: hosted
  381 + version: "2.1.1"
  382 + stream_transform:
  383 + dependency: transitive
  384 + description:
  385 + name: stream_transform
  386 + url: "https://pub.flutter-io.cn"
  387 + source: hosted
  388 + version: "2.1.0"
  389 + string_scanner:
  390 + dependency: transitive
  391 + description:
  392 + name: string_scanner
  393 + url: "https://pub.flutter-io.cn"
  394 + source: hosted
  395 + version: "1.2.0"
  396 + term_glyph:
  397 + dependency: transitive
  398 + description:
  399 + name: term_glyph
  400 + url: "https://pub.flutter-io.cn"
  401 + source: hosted
  402 + version: "1.2.1"
  403 + test:
  404 + dependency: "direct dev"
  405 + description:
  406 + name: test
  407 + url: "https://pub.flutter-io.cn"
  408 + source: hosted
  409 + version: "1.18.1"
  410 + test_api:
  411 + dependency: transitive
  412 + description:
  413 + name: test_api
  414 + url: "https://pub.flutter-io.cn"
  415 + source: hosted
  416 + version: "0.4.5"
  417 + test_core:
  418 + dependency: transitive
  419 + description:
  420 + name: test_core
  421 + url: "https://pub.flutter-io.cn"
  422 + source: hosted
  423 + version: "0.4.4"
  424 + timing:
  425 + dependency: transitive
  426 + description:
  427 + name: timing
  428 + url: "https://pub.flutter-io.cn"
  429 + source: hosted
  430 + version: "1.0.0"
  431 + typed_data:
  432 + dependency: transitive
  433 + description:
  434 + name: typed_data
  435 + url: "https://pub.flutter-io.cn"
  436 + source: hosted
  437 + version: "1.3.2"
  438 + vm_service:
  439 + dependency: transitive
  440 + description:
  441 + name: vm_service
  442 + url: "https://pub.flutter-io.cn"
  443 + source: hosted
  444 + version: "7.5.0"
  445 + watcher:
  446 + dependency: transitive
  447 + description:
  448 + name: watcher
  449 + url: "https://pub.flutter-io.cn"
  450 + source: hosted
  451 + version: "1.0.2"
  452 + web_socket_channel:
  453 + dependency: transitive
  454 + description:
  455 + name: web_socket_channel
  456 + url: "https://pub.flutter-io.cn"
  457 + source: hosted
  458 + version: "2.4.0"
  459 + webkit_inspection_protocol:
  460 + dependency: transitive
  461 + description:
  462 + name: webkit_inspection_protocol
  463 + url: "https://pub.flutter-io.cn"
  464 + source: hosted
  465 + version: "1.2.0"
  466 + yaml:
  467 + dependency: transitive
  468 + description:
  469 + name: yaml
  470 + url: "https://pub.flutter-io.cn"
  471 + source: hosted
  472 + version: "3.1.1"
  473 +sdks:
  474 + dart: ">=2.18.0 <3.0.0"