xt / Flutter-ReserveApp · Commits

Go to a project

Commit 8fbb8d70e737ceefd59ed422a28310f5c2d895de

Authored by wdn127929
1 parent c8f4d1b8
build: skipped

2/2.1

Inline Side-by-side
Showing 8 changed files with 573 additions and 11 deletions
@@ -12,14 +12,14 @@ if (flutterRoot == null) { @@ -12,14 +12,14 @@ if (flutterRoot == null) {
12 } 12 }
13 13
14 14
15 -def flutterVersionCode = "422" 15 +def flutterVersionCode = "430"
16 if (flutterVersionCode == null) { 16 if (flutterVersionCode == null) {
17 - flutterVersionCode = '422' 17 + flutterVersionCode = '430'
18 } 18 }
19 19
20 -def flutterVersionName = "4.2.2" 20 +def flutterVersionName = "4.3.0"
21 if (flutterVersionName == null) { 21 if (flutterVersionName == null) {
22 - flutterVersionName = '4.2.2' 22 + flutterVersionName = '4.3.0'
23 } 23 }
24 apply plugin: 'com.android.application' 24 apply plugin: 'com.android.application'
25 apply plugin: 'kotlin-android' 25 apply plugin: 'kotlin-android'
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
22 22
23 <application 23 <application
24 24
25 - android:label="周到安排商家" 25 + android:label="一键订"
26 tools:replace="android:label" 26 tools:replace="android:label"
27 android:icon="@mipmap/ic_launcher"> 27 android:icon="@mipmap/ic_launcher">
28 <activity 28 <activity
@@ -47,6 +47,7 @@ import 'package:one_key/models/table.dart' as t; @@ -47,6 +47,7 @@ import 'package:one_key/models/table.dart' as t;
47 47
48 import '../../app.dart'; 48 import '../../app.dart';
49 49
  50 +import '../../utils/screen_util.dart';
50 import '../../widgets/special_text/my_extended_text_selection_controls.dart'; 51 import '../../widgets/special_text/my_extended_text_selection_controls.dart';
51 52
52 class NotebookDetailPage extends StatefulWidget { 53 class NotebookDetailPage extends StatefulWidget {
@@ -110,8 +111,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -110,8 +111,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
110 WidgetsBinding.instance.addPostFrameCallback((_) async { 111 WidgetsBinding.instance.addPostFrameCallback((_) async {
111 _myExtendedMaterialTextSelectionControls = 112 _myExtendedMaterialTextSelectionControls =
112 MyTextSelectionControls(callback: (value) { 113 MyTextSelectionControls(callback: (value) {
113 -  
114 - detailModel.phoneController.value = TextEditingValue( 114 + detailModel.phoneController.value = TextEditingValue(
115 text: value, 115 text: value,
116 selection: TextSelection.fromPosition(TextPosition( 116 selection: TextSelection.fromPosition(TextPosition(
117 affinity: TextAffinity.downstream, 117 affinity: TextAffinity.downstream,
@@ -2609,6 +2609,50 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -2609,6 +2609,50 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
2609 ? SizedBox() 2609 ? SizedBox()
2610 : Row( 2610 : Row(
2611 children: [ 2611 children: [
  2612 + detailEntity.order.cookbooklist
  2613 + .length ==
  2614 + 0
  2615 + ? Expanded(
  2616 + flex: 1,
  2617 + child: InkWell(
  2618 + onTap: () {
  2619 + NavigatorUtil
  2620 + .goOrderAdvanceHomePage(
  2621 + context,
  2622 + );
  2623 + },
  2624 + child: Container(
  2625 + margin: EdgeInsets.only(
  2626 + right: ScreenUtil()
  2627 + .setWidth(20)),
  2628 + decoration: BoxDecoration(
  2629 + color: MyColours
  2630 + .color_ffffff,
  2631 + border: Border.all(
  2632 + width: w(1),
  2633 + color: MyColours
  2634 + .color_438E93),
  2635 + borderRadius:
  2636 + BorderRadius.circular(
  2637 + ScreenUtil()
  2638 + .setWidth(
  2639 + 10)),
  2640 + ),
  2641 + child: Align(
  2642 + alignment:
  2643 + Alignment.center,
  2644 + child: Text('预点菜',
  2645 + style: TextStyle(
  2646 + color: MyColours
  2647 + .color_438E93,
  2648 + fontSize:
  2649 + ScreenUtil()
  2650 + .setSp(
  2651 + 34))),
  2652 + ),
  2653 + ),
  2654 + ))
  2655 + : SizedBox(),
2612 Expanded( 2656 Expanded(
2613 flex: 2, 2657 flex: 2,
2614 child: InkWell( 2658 child: InkWell(
  1 +import 'package:flutter/material.dart';
  2 +import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart';
  3 +import 'package:flutter_screenutil/flutter_screenutil.dart';
  4 +import 'package:one_key/route/navigator_util.dart';
  5 +import 'package:one_key/utils/utils.dart';
  6 +import 'package:one_key/widgets/MyDivider.dart';
  7 +import 'package:one_key/widgets/h_empty_view.dart';
  8 +import 'package:one_key/widgets/system_app_bar.dart';
  9 +import 'package:one_key/widgets/v_empty_view.dart';
  10 +
  11 +import '../../../res/colors.dart';
  12 +import '../../../utils/screen_util.dart';
  13 +import '../../../widgets/round_button.dart';
  14 +
  15 +/**
  16 + * 订座详情---预点菜入口
  17 + */
  18 +
  19 +class OrderAdvanceHomePage extends StatefulWidget {
  20 + OrderAdvanceHomePage({Key key}) : super(key: key);
  21 +
  22 + @override
  23 + _OrderAdvanceHomePageState createState() => _OrderAdvanceHomePageState();
  24 +}
  25 +
  26 +class _OrderAdvanceHomePageState extends State<OrderAdvanceHomePage> {
  27 + TextEditingController noFoodController = TextEditingController();
  28 + TextEditingController likeController = TextEditingController();
  29 +
  30 + TextEditingController serviceController = TextEditingController();
  31 +
  32 + @override
  33 + void initState() {
  34 + super.initState();
  35 + }
  36 +
  37 + Widget _selectItem(String title, bool select, String hintText,
  38 + TextEditingController controller) {
  39 + return Row(
  40 + children: [
  41 + HEmptyView(86),
  42 + Image.asset(
  43 + Utils.getImgPath(
  44 + select ? 'plan_dish_select' : 'plan_dish_unselect'),
  45 + width: w(20)),
  46 + HEmptyView(10),
  47 + Text(
  48 + title,
  49 + style: TextStyle(fontSize: font(16), color: MyColours.color_515151),
  50 + ),
  51 + HEmptyView(20),
  52 + select
  53 + ? Expanded(
  54 + child: TextField(
  55 + maxLines: 1,
  56 + controller: controller,
  57 + // focusNode: _focusNode,
  58 + // autofocus: true,
  59 +
  60 + style: TextStyle(
  61 + color: MyColours.color_438E93, fontSize: font(14)),
  62 + textAlign: TextAlign.right,
  63 + textAlignVertical: TextAlignVertical.center,
  64 + decoration: InputDecoration(
  65 + hintText: hintText,
  66 + hintStyle: TextStyle(
  67 + color: MyColours.color_438E93,
  68 + fontSize: font(14),
  69 + ),
  70 + isCollapsed: true, //重点，相当于高度包裹的意思，必须设置为true，不然有默认奇妙的最小高度
  71 + border: OutlineInputBorder(borderSide: BorderSide.none),
  72 + contentPadding: EdgeInsets.zero,
  73 + ),
  74 + keyboardType: TextInputType.numberWithOptions(),
  75 + textInputAction: TextInputAction.done,
  76 +
  77 + onChanged: (value) {
  78 + // setState(() {});
  79 + // _searchSellerLocation();
  80 + // customerProvider.searchData(value);
  81 + },
  82 + onEditingComplete: () {
  83 + FocusScope.of(context).requestFocus(FocusNode()); //点击空白处隐藏键盘
  84 + // contantShowModel.searchData(
  85 + // contantShowModel.controller.text);
  86 + // _searchSellerLocation();
  87 + // _focusNode.unfocus();
  88 + },
  89 + ))
  90 + : SizedBox(),
  91 + select
  92 + ? Text(
  93 + '元',
  94 + style: TextStyle(
  95 + fontSize: font(16), color: MyColours.color_515151),
  96 + )
  97 + : SizedBox(),
  98 + ],
  99 + );
  100 + }
  101 +
  102 + ///忌口和喜好
  103 + Widget _textMulLine(
  104 + String title, String hintText, TextEditingController controller) {
  105 + return Container(
  106 + // height: ScreenUtil().setWidth(380),
  107 + child: Row(
  108 + children: [
  109 + Text(
  110 + title,
  111 + textAlign: TextAlign.left,
  112 + style: TextStyle(
  113 + color: MyColours.color_333333,
  114 + fontSize: ScreenUtil().setSp(28)),
  115 + ),
  116 + HEmptyView(54),
  117 + Expanded(
  118 + child: TextField(
  119 + controller: controller,
  120 + // keyboardType: TextInputType.number, //键盘类型，数字键盘
  121 + maxLines: 2,
  122 + // maxLength: 50,
  123 +
  124 + // maxLengthEnforced: true,
  125 + style: TextStyle(
  126 + fontSize: ScreenUtil().setSp(28),
  127 + color: title == '喜好'
  128 + ? MyColours.color_438E93
  129 + : title == '忌口'
  130 + ? MyColours.color_E34D59
  131 + : MyColours.color_333333), //输入文本的样式
  132 + decoration: InputDecoration(
  133 + contentPadding:
  134 + EdgeInsets.symmetric(horizontal: w(11), vertical: w(8)),
  135 + hintText: hintText,
  136 + hintStyle: TextStyle(
  137 + color: MyColours.color_999999,
  138 + fontSize: ScreenUtil().setSp(28),
  139 + ),
  140 + // fillColor: MyColours.color_F9F9F9,
  141 + // fillColor: Colors.red,
  142 + // filled: true,
  143 + enabledBorder: OutlineInputBorder(
  144 + //未选中时候的颜色
  145 + borderRadius: BorderRadius.circular(ScreenUtil().setWidth(20)),
  146 + borderSide: BorderSide(
  147 + color: MyColours.color_cccccc,
  148 + width: ScreenUtil().setWidth(2)),
  149 + ),
  150 + focusedBorder: OutlineInputBorder(
  151 + //选中时外边框颜色
  152 + borderRadius: BorderRadius.circular(ScreenUtil().setWidth(20)),
  153 + borderSide: BorderSide(
  154 + color: MyColours.app_main,
  155 + ),
  156 + ),
  157 + // border: OutlineInputBorder(
  158 + // borderRadius:
  159 + // BorderRadius.circular(ScreenUtil().setWidth(20)),
  160 + // borderSide: BorderSide(
  161 + // color: Colors.red, width: ScreenUtil().setWidth(2))),
  162 + ),
  163 + onChanged: (value) {},
  164 + )),
  165 + ],
  166 + ),
  167 + );
  168 + }
  169 +
  170 + /// 查看排菜单,分享排菜单按钮
  171 + Widget _cancelAndChangeBtn(GestureTapCallback onTap, String title,
  172 + {Color bgColor = MyColours.color_ffffff,
  173 + double width,
  174 + Color fontColor = MyColours.color_199095}) {
  175 + return InkWell(
  176 + onTap: onTap,
  177 + child: Container(
  178 + width: width,
  179 + decoration: BoxDecoration(
  180 + color: bgColor,
  181 + border: Border.all(
  182 + color: Colors.transparent, width: ScreenUtil().setWidth(2)),
  183 + borderRadius: BorderRadius.circular(ScreenUtil().setWidth(10)),
  184 + ),
  185 + child: Align(
  186 + alignment: Alignment.center,
  187 + child: Text(title,
  188 + style: TextStyle(
  189 + color: fontColor,
  190 + fontSize: title == '查看排菜单'
  191 + ? ScreenUtil().setSp(32)
  192 + : ScreenUtil().setSp(36))),
  193 + ),
  194 + ),
  195 + );
  196 + }
  197 +
  198 + @override
  199 + Widget build(BuildContext context) {
  200 + return KeyboardDismissOnTap(
  201 + // dismissOnCapturedTaps: true,
  202 + child: Scaffold(
  203 + appBar: SystemAppBar('预点菜'),
  204 + backgroundColor: MyColours.color_ffffff,
  205 + body: Column(
  206 + children: [
  207 + Expanded(
  208 + child: SingleChildScrollView(
  209 + // controller: controller,
  210 + child: Padding(
  211 + padding: EdgeInsets.symmetric(horizontal: w(20)),
  212 + child: Column(
  213 + crossAxisAlignment: CrossAxisAlignment.start,
  214 + children: [
  215 + Container(
  216 + height: w(48),
  217 + child: Row(
  218 + children: [
  219 + Text(
  220 + '就餐时段',
  221 + style: TextStyle(
  222 + fontSize: font(16),
  223 + color: MyColours.color_515151),
  224 + ),
  225 + Spacer(),
  226 + Text(
  227 + '2022-11-08 午餐',
  228 + style: TextStyle(
  229 + fontSize: font(16),
  230 + color: MyColours.color_99515151),
  231 + ),
  232 + ],
  233 + ),
  234 + ),
  235 + MyDivider(
  236 + double.infinity,
  237 + w(1),
  238 + color: MyColours.color_DBDBDB,
  239 + ),
  240 + Container(
  241 + height: w(48),
  242 + child: Row(
  243 + children: [
  244 + Text(
  245 + '就餐人数',
  246 + style: TextStyle(
  247 + fontSize: font(16),
  248 + color: MyColours.color_515151),
  249 + ),
  250 + Spacer(),
  251 + Image.asset(
  252 + Utils.getImgPath('plan_dish_minus'),
  253 + width: w(16),
  254 + ),
  255 + Container(
  256 + width: w(50),
  257 + // constraints: BoxConstraints(minWidth: w(20)),
  258 + child: TextField(
  259 + maxLines: 1,
  260 + // controller:
  261 + // focusNode: _focusNode,
  262 + // autofocus: true,
  263 +
  264 + style: TextStyle(
  265 + color: MyColours.color_438E93,
  266 + fontSize: font(16)),
  267 + textAlign: TextAlign.center,
  268 + // textAlignVertical: TextAlignVertical.center,
  269 + decoration: InputDecoration(
  270 + hintText: "人数",
  271 + hintStyle: TextStyle(
  272 + color: MyColours.color_999999,
  273 + fontSize: font(16),
  274 + ),
  275 + // isCollapsed:
  276 + // true, //重点，相当于高度包裹的意思，必须设置为true，不然有默认奇妙的最小高度
  277 + border: OutlineInputBorder(
  278 + borderSide: BorderSide.none),
  279 + contentPadding: EdgeInsets.zero,
  280 + ),
  281 + keyboardType: TextInputType.number,
  282 + textInputAction: TextInputAction.done,
  283 +
  284 + onChanged: (value) {
  285 + // setState(() {});
  286 + // _searchSellerLocation();
  287 + // customerProvider.searchData(value);
  288 + },
  289 + onEditingComplete: () {
  290 + FocusScope.of(context)
  291 + .requestFocus(FocusNode()); //点击空白处隐藏键盘
  292 + // contantShowModel.searchData(
  293 + // contantShowModel.controller.text);
  294 + // _searchSellerLocation();
  295 + // _focusNode.unfocus();
  296 + },
  297 + )),
  298 + Image.asset(
  299 + Utils.getImgPath('plan_dish_add'),
  300 + width: w(16),
  301 + ),
  302 + ],
  303 + ),
  304 + ),
  305 + VEmptyView(24),
  306 + Text(
  307 + '用餐标准',
  308 + style: TextStyle(
  309 + fontSize: font(16), color: MyColours.color_515151),
  310 + ),
  311 + VEmptyView(48),
  312 + _selectItem('预计人均', false, '点击这里输入预计人均金额', null),
  313 + VEmptyView(30),
  314 + _selectItem('预计总价', true, '点击这里输入预计总金额', null),
  315 + VEmptyView(46),
  316 + MyDivider(
  317 + double.infinity,
  318 + w(1),
  319 + color: MyColours.color_DBDBDB,
  320 + ),
  321 + Container(
  322 + padding: EdgeInsets.symmetric(vertical: w(10)),
  323 + child: Row(
  324 + mainAxisAlignment: MainAxisAlignment.spaceBetween,
  325 + children: [
  326 + Text(
  327 + '客户偏好参考',
  328 + style: TextStyle(
  329 + fontSize: font(16),
  330 + color: MyColours.color_515151),
  331 + ),
  332 + Image.asset(
  333 + Utils.getImgPath('merge_arrow'),
  334 + width: w(20),
  335 + )
  336 + ],
  337 + ),
  338 + ),
  339 + VEmptyView(32),
  340 + _textMulLine('喜好', '点这里输入客户喜好的东西，请用逗号隔开。', likeController),
  341 + VEmptyView(20),
  342 + _textMulLine('忌口', '点这里输入客户忌口的东西，请用逗号隔开。', noFoodController),
  343 + VEmptyView(20),
  344 + _textMulLine('服务', '点这里输入客户需要的服务，如安静的包间、远离厕所等，请用逗号隔开。', serviceController),
  345 + ],
  346 + ),
  347 + ),
  348 + ),
  349 + ),
  350 + Column(children: [
  351 + Container(
  352 + // width: double.infinity,
  353 + height: ScreenUtil().setWidth(84),
  354 + decoration: BoxDecoration(
  355 + color: MyColours.color_ffffff,
  356 + borderRadius: BorderRadius.circular(ScreenUtil().setWidth(10)),
  357 + ),
  358 + margin: EdgeInsets.symmetric(
  359 + vertical: ScreenUtil().setHeight(20),
  360 + horizontal: ScreenUtil().setHeight(40)),
  361 + child: Row(
  362 + children: [
  363 + Expanded(
  364 + flex: 1,
  365 + child: InkWell(
  366 + onTap: () {
  367 + // NavigatorUtil
  368 + // .goOrderAdvanceHomePage(
  369 + // context,
  370 + // );
  371 + },
  372 + child: Container(
  373 + margin:
  374 + EdgeInsets.only(right: ScreenUtil().setWidth(20)),
  375 + decoration: BoxDecoration(
  376 + color: MyColours.color_ffffff,
  377 + border: Border.all(
  378 + width: w(1), color: MyColours.color_438E93),
  379 + borderRadius: BorderRadius.circular(
  380 + ScreenUtil().setWidth(10)),
  381 + ),
  382 + child: Align(
  383 + alignment: Alignment.center,
  384 + child: Text('客户自己点',
  385 + style: TextStyle(
  386 + color: MyColours.color_438E93,
  387 + fontSize: ScreenUtil().setSp(32))),
  388 + ),
  389 + ),
  390 + )),
  391 + Expanded(
  392 + flex: 2,
  393 + child: InkWell(
  394 + onTap: () {
  395 + // NavigatorUtil
  396 + // .goInvicationPage(
  397 + // context,
  398 + // detailEntity.id,
  399 + // );
  400 + },
  401 + child: Container(
  402 + decoration: BoxDecoration(
  403 + color: MyColours.color_199095,
  404 + borderRadius: BorderRadius.circular(
  405 + ScreenUtil().setWidth(10)),
  406 + ),
  407 + child: Align(
  408 + alignment: Alignment.center,
  409 + child: Text('经理排菜',
  410 + style: TextStyle(
  411 + color: MyColours.color_ffffff,
  412 + fontSize: ScreenUtil().setSp(36))),
  413 + ),
  414 + ),
  415 + )),
  416 + ],
  417 + ),
  418 + ),
  419 + Container(
  420 + width: double.infinity,
  421 + height: ScreenUtil().setWidth(84),
  422 + margin:
  423 + EdgeInsets.symmetric(horizontal: ScreenUtil().setHeight(40)),
  424 + decoration: BoxDecoration(
  425 + border: Border.all(
  426 + color:
  427 + true ? MyColours.color_999999 : MyColours.color_199095,
  428 + width: ScreenUtil().setWidth(2)),
  429 + borderRadius: BorderRadius.circular(ScreenUtil().setWidth(10)),
  430 + ),
  431 + // child: Text('fff'),
  432 + child: Material(
  433 + color: Colors.transparent,
  434 + child: Row(
  435 + children: [
  436 + Expanded(
  437 + child: _cancelAndChangeBtn(() {}, '查看排菜单',
  438 + fontColor: true
  439 + ? MyColours.color_999999
  440 + : MyColours.color_199095)),
  441 + MyDivider(
  442 + ScreenUtil().setWidth(2),
  443 + ScreenUtil().setWidth(50),
  444 + color: true
  445 + ? MyColours.color_999999
  446 + : MyColours.color_199095,
  447 + ),
  448 + Expanded(
  449 + child: _cancelAndChangeBtn(() {
  450 + // if (userModel.user.role_name != '管理员' &&
  451 + // userModel.user.role_name != '店长' &&
  452 + // widget.uid != "null" &&
  453 + // widget.uid !=
  454 + // userModel.user.openid) {
  455 + // } else {
  456 + // _showCancelWidget(context);
  457 + // }
  458 + }, '分享排菜单',
  459 + fontColor: true
  460 + ? MyColours.color_999999
  461 + : MyColours.color_199095)),
  462 + ],
  463 + )),
  464 + ),
  465 + VEmptyView(ScreenUtil().setWidth(60))
  466 + ])
  467 + ],
  468 + ),
  469 + ));
  470 + }
  471 +}
1 import 'package:flutter/material.dart'; 1 import 'package:flutter/material.dart';
2 2
3 class MyColours { 3 class MyColours {
  4 + static const Color color_99515151 = Color(0x99515151);
4 static const Color color_F7C797 = Color(0xffF7C797); 5 static const Color color_F7C797 = Color(0xffF7C797);
5 static const Color color_FEF3E6 = Color(0xffFEF3E6); 6 static const Color color_FEF3E6 = Color(0xffFEF3E6);
6 static const Color color_66000000 = Color(0x66000000); 7 static const Color color_66000000 = Color(0x66000000);
@@ -1205,4 +1205,23 @@ class NavigatorUtil { @@ -1205,4 +1205,23 @@ class NavigatorUtil {
1205 return _navigateTo(context, "${Routes.final_plan_dish_page}", 1205 return _navigateTo(context, "${Routes.final_plan_dish_page}",
1206 replace: replace); 1206 replace: replace);
1207 } 1207 }
  1208 +
  1209 + ///经理排菜-首页
  1210 +
  1211 + static Future<dynamic> goOrderAdvanceHomePage(
  1212 + BuildContext context, {
  1213 + replace = false,
  1214 + }) {
  1215 + // if (invoice != null) {
  1216 + // return _navigateTo(context,
  1217 + // "${Routes.order_advance_home_page}?invoice=${FluroConvertUtils.object2string(invoice)}",
  1218 + // replace: replace);
  1219 + // }
  1220 + // if (object != null) {
  1221 + // return _navigateTo(context,
  1222 + // "${Routes.order_advance_home_page}?tids=$tids&tableidNow=$tableidNow&fromPage=$fromPage&canChoose=$canChoose&object=${FluroConvertUtils.object2string(object)}");
  1223 + // }
  1224 + return _navigateTo(context, "${Routes.order_advance_home_page}",
  1225 + replace: replace);
  1226 + }
1208 } 1227 }
@@ -179,6 +179,7 @@ import '../pages/my/plan_dish/my_plan_dish_home_page.dart'; @@ -179,6 +179,7 @@ import '../pages/my/plan_dish/my_plan_dish_home_page.dart';
179 import '../pages/my/plan_dish/plan_new_dish_first_page.dart'; 179 import '../pages/my/plan_dish/plan_new_dish_first_page.dart';
180 import '../pages/my/plan_dish/plan_new_dish_page.dart'; 180 import '../pages/my/plan_dish/plan_new_dish_page.dart';
181 import '../pages/my/table_manage/merge_table_select_page.dart'; 181 import '../pages/my/table_manage/merge_table_select_page.dart';
  182 +import '../pages/order_advance/order_advance_home_page.dart';
182 import '../provider/feast_model.dart'; 183 import '../provider/feast_model.dart';
183 import '../provider/plan_dish_provider.dart'; 184 import '../provider/plan_dish_provider.dart';
184 185
@@ -1911,3 +1912,24 @@ var finalPlanDishPageHandle = new Handler( @@ -1911,3 +1912,24 @@ var finalPlanDishPageHandle = new Handler(
1911 return ChangeNotifierProvider<PlanDishProvider>( 1912 return ChangeNotifierProvider<PlanDishProvider>(
1912 create: (_) => PlanDishProvider(), child: FinalPlanDishPage()); 1913 create: (_) => PlanDishProvider(), child: FinalPlanDishPage());
1913 }); 1914 });
  1915 +
  1916 +///经理排菜---首页
  1917 +var orderAdvanceHomePageHandle = new Handler(
  1918 + handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) {
  1919 + // String fromPage = params["fromPage"].first;
  1920 + // String tids = params["tids"].first;
  1921 +
  1922 + // String tableidNow = params["tableidNow"].first;
  1923 + // bool canChoose = params["canChoose"].first == "true" ? true : false;
  1924 + // List<TableList> res = [];
  1925 + // if (params.keys.contains('object')) {
  1926 + // Map object = FluroConvertUtils.string2map(params["object"].first);
  1927 + // List temp = object['object'];
  1928 +
  1929 + // for (var item in temp) {
  1930 + // res.add(TableList.fromJson(item));
  1931 + // }
  1932 + // }
  1933 + return ChangeNotifierProvider<PlanDishProvider>(
  1934 + create: (_) => PlanDishProvider(), child: OrderAdvanceHomePage());
  1935 +});
@@ -161,15 +161,19 @@ class Routes { @@ -161,15 +161,19 @@ class Routes {
161 static String merge_table_select_page = 161 static String merge_table_select_page =
162 "/merge_table_select_page"; //桌位管理---合并桌位选择桌位页面 162 "/merge_table_select_page"; //桌位管理---合并桌位选择桌位页面
163 /** 163 /**
164 - * 排菜 164 + * 排菜管理
165 */ 165 */
166 166
167 static String my_plan_dish_home_page = "/my_plan_dish_home_page"; //我的-我的排菜 167 static String my_plan_dish_home_page = "/my_plan_dish_home_page"; //我的-我的排菜
168 static String plan_new_dish_first_page = 168 static String plan_new_dish_first_page =
169 "/plan_new_dish_first_page"; //我的-我的排菜-创建新排菜前置条件录入 169 "/plan_new_dish_first_page"; //我的-我的排菜-创建新排菜前置条件录入
170 static String plan_new_dish_page = "/plan_new_dish_page"; //排菜菜单点菜 170 static String plan_new_dish_page = "/plan_new_dish_page"; //排菜菜单点菜
171 -static String final_plan_dish_page = "/final_plan_dish_page"; //排菜单  
172 - 171 + static String final_plan_dish_page = "/final_plan_dish_page"; //排菜单
  172 +
  173 + /**
  174 + * 经理排菜
  175 + */
  176 + static String order_advance_home_page = "/order_advance_home_page"; //经理预点菜首页
173 177
174 static void configureRoutes(FluroRouter router) { 178 static void configureRoutes(FluroRouter router) {
175 router.notFoundHandler = new Handler( 179 router.notFoundHandler = new Handler(
@@ -334,7 +338,8 @@ static String final_plan_dish_page = "/final_plan_dish_page"; //排菜单 @@ -334,7 +338,8 @@ static String final_plan_dish_page = "/final_plan_dish_page"; //排菜单
334 router.define(plan_new_dish_first_page, 338 router.define(plan_new_dish_first_page,
335 handler: planNewDishFirstPageHandle); 339 handler: planNewDishFirstPageHandle);
336 router.define(plan_new_dish_page, handler: planNewDishPageHandle); 340 router.define(plan_new_dish_page, handler: planNewDishPageHandle);
337 - router.define(final_plan_dish_page, handler: finalPlanDishPageHandle); 341 + router.define(final_plan_dish_page, handler: finalPlanDishPageHandle);
  342 + router.define(order_advance_home_page, handler: orderAdvanceHomePageHandle);
338 343
339 } 344 }
340 } 345 }