xt / Flutter-ReserveApp · Commits

Go to a project

Commit 033e5f81bc2215c849db53c70fc074048e27e977

Authored by wdn127929
1 parent 2b02a47c
build: skipped

我的排菜首页+创建新排菜前置条件录入

Inline Side-by-side
Showing 11 changed files with 559 additions and 48 deletions
@@ -146,16 +146,24 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { @@ -146,16 +146,24 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
146 Widget _item(String name, String title, {bool isRowLow = false}) { 146 Widget _item(String name, String title, {bool isRowLow = false}) {
147 return Column( 147 return Column(
148 children: [ 148 children: [
149 - Image.asset(  
150 - name,  
151 - width: ScreenUtil().setWidth(32 * 2),  
152 - ), 149 + name == ''
  150 + ? Container(
  151 + width: ScreenUtil().setWidth(32 * 2),
  152 + )
  153 + : Image.asset(
  154 + name,
  155 + width: ScreenUtil().setWidth(32 * 2),
  156 + ),
153 VEmptyView(20), 157 VEmptyView(20),
154 Text( 158 Text(
155 title, 159 title,
156 style: TextStyle( 160 style: TextStyle(
157 fontWeight: FontWeight.bold, 161 fontWeight: FontWeight.bold,
158 - color: isRowLow ? MyColours.color_999999 : MyColours.color_515151, 162 + color: title == '空空空空'
  163 + ? Colors.transparent
  164 + : isRowLow
  165 + ? MyColours.color_999999
  166 + : MyColours.color_515151,
159 fontSize: ScreenUtil().setWidth(24)), 167 fontSize: ScreenUtil().setWidth(24)),
160 ) 168 )
161 ], 169 ],
@@ -609,35 +617,58 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { @@ -609,35 +617,58 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
609 color: MyColours.color_ffffff, 617 color: MyColours.color_ffffff,
610 borderRadius: BorderRadius.circular( 618 borderRadius: BorderRadius.circular(
611 ScreenUtil().setWidth(14))), 619 ScreenUtil().setWidth(14))),
612 - child: Row(  
613 - mainAxisAlignment: MainAxisAlignment.spaceEvenly,  
614 - children: [  
615 - InkWell(  
616 - onTap: () {  
617 - NavigatorUtil.goBaseInfoPage(  
618 - context, FromPage.FromPageMyPage);  
619 - },  
620 - child:  
621 - _item(Utils.getImgPath('grxx'), '个人信息')),  
622 - InkWell(  
623 - onTap: () {  
624 - NavigatorUtil.goMyCustomerPage(context);  
625 - },  
626 - child:  
627 - _item(Utils.getImgPath('wdkq'), '我的客情')),  
628 - InkWell(  
629 - onTap: () {  
630 - NavigatorUtil.goCouponPage(context);  
631 - },  
632 - child: _item(Utils.getImgPath('yhq'), '优惠券')),  
633 - InkWell(  
634 - onTap: () {  
635 - NavigatorUtil.goRemarkManagerPage(context);  
636 - },  
637 - child:  
638 - _item(Utils.getImgPath('cybz'), '常用备注'))  
639 - ],  
640 - ), 620 + child: Column(children: [
  621 + Row(
  622 + mainAxisAlignment: MainAxisAlignment.spaceEvenly,
  623 + children: [
  624 + InkWell(
  625 + onTap: () {
  626 + NavigatorUtil.goBaseInfoPage(
  627 + context, FromPage.FromPageMyPage);
  628 + },
  629 + child: _item(
  630 + Utils.getImgPath('grxx'), '个人信息')),
  631 + InkWell(
  632 + onTap: () {
  633 + NavigatorUtil.goMyCustomerPage(context);
  634 + },
  635 + child: _item(
  636 + Utils.getImgPath('wdkq'), '我的客情')),
  637 + InkWell(
  638 + onTap: () {
  639 + NavigatorUtil.goCouponPage(context);
  640 + },
  641 + child:
  642 + _item(Utils.getImgPath('yhq'), '优惠券')),
  643 + InkWell(
  644 + onTap: () {
  645 + NavigatorUtil.goRemarkManagerPage(
  646 + context);
  647 + },
  648 + child: _item(
  649 + Utils.getImgPath('cybz'), '常用备注')),
  650 + ],
  651 + ),
  652 + VEmptyView(68),
  653 + Row(
  654 + mainAxisAlignment:
  655 + MainAxisAlignment.spaceEvenly,
  656 + children: [
  657 + InkWell(
  658 + onTap: () {
  659 + NavigatorUtil.goMyPlanDishHomePage(
  660 + context);
  661 + },
  662 + child: _item(
  663 + Utils.getImgPath('cdgl'), '我的排菜')),
  664 + InkWell(
  665 + onTap: () {}, child: _item('', '空空空空')),
  666 + InkWell(
  667 + onTap: () {}, child: _item('', '空空空空')),
  668 + InkWell(
  669 + onTap: () {}, child: _item('', '空空空空')),
  670 + ])
  671 + ]),
641 )), 672 )),
642 VEmptyView(20), 673 VEmptyView(20),
643 674
  1 +import 'package:flutter/material.dart';
  2 +import 'package:one_key/res/colors.dart';
  3 +import 'package:one_key/route/navigator_util.dart';
  4 +import 'package:one_key/utils/utils.dart';
  5 +import 'package:one_key/widgets/MyDivider.dart';
  6 +import 'package:one_key/widgets/h_empty_view.dart';
  7 +import 'package:one_key/widgets/round_button.dart';
  8 +import 'package:one_key/widgets/system_app_bar.dart';
  9 +import 'package:one_key/widgets/v_empty_view.dart';
  10 +
  11 +import '../../../utils/dialog_util.dart';
  12 +import '../../../utils/screen_util.dart';
  13 +
  14 +/**
  15 + *
  16 + * 我的排菜首页
  17 + */
  18 +class MyPlanDishHomePage extends StatefulWidget {
  19 + MyPlanDishHomePage({Key key}) : super(key: key);
  20 +
  21 + @override
  22 + _MyPlanDishHomePageState createState() => _MyPlanDishHomePageState();
  23 +}
  24 +
  25 +class _MyPlanDishHomePageState extends State<MyPlanDishHomePage> {
  26 + @override
  27 + Widget build(BuildContext context) {
  28 + return Scaffold(
  29 + appBar: SystemAppBar('我的排菜'),
  30 + backgroundColor: MyColours.color_ffffff,
  31 + body: Column(
  32 + children: [
  33 + MyDivider(
  34 + double.infinity,
  35 + w(1),
  36 + color: MyColours.color_DBDBDB,
  37 + ),
  38 + Expanded(
  39 + child: ListView.builder(
  40 + itemCount: 10,
  41 + itemBuilder: (context, index) {
  42 + return Container(
  43 + decoration: BoxDecoration(
  44 + border: Border(
  45 + bottom: BorderSide(
  46 + color: MyColours.color_DBDBDB, width: w(1)))),
  47 + child: Padding(
  48 + padding: EdgeInsets.only(
  49 + left: w(20), right: w(20), top: w(15), bottom: w(3)),
  50 + child: Column(
  51 + children: [
  52 + Row(
  53 + children: [
  54 + Expanded(
  55 + child: Text(
  56 + '8人聚会餐',
  57 + maxLines: 3,
  58 + style: TextStyle(
  59 + fontSize: font(16),
  60 + color: MyColours.color_515151),
  61 + overflow: TextOverflow.ellipsis,
  62 + )),
  63 + HEmptyView(22),
  64 + Text('1200元/8人',
  65 + style: TextStyle(
  66 + fontSize: font(14),
  67 + color: MyColours.color_515151)),
  68 + HEmptyView(22),
  69 + InkWell(
  70 + onTap: () {
  71 + //弹框确认是否删除
  72 + DialogUtil.cupertinoAlertDialog(context,
  73 + title: "",
  74 + content: "是否确定删除该排菜？",
  75 + rTitle: "确定删除", rCallback: () {
  76 + // Navigator.pop(context);
  77 + // _delGuestInfocDay(model.cday[index].id);
  78 + });
  79 + },
  80 + child: Padding(
  81 + padding: EdgeInsets.only(left: w(11)),
  82 + child: Image.asset(
  83 + Utils.getImgPath('f_delete_red'),
  84 + width: w(17),
  85 + )))
  86 + ],
  87 + ),
  88 + VEmptyView(22),
  89 + Text(
  90 + '铁锅炖大鹅，白山叫花鸡，主席红烧肉，清蒸鲈鱼，荷塘小炒，松仁玉米，咸蛋黄焗南瓜，黑椒牛柳，夫妻肺片，蒜泥茄子，卤水拼盘，东北大拉皮，西湖牛肉羹，扬州炒饭，咸蛋黄焗南瓜，黑椒牛柳，夫妻肺片，蒜泥茄子，卤水拼盘，东北大拉皮，西湖牛肉羹，扬州炒饭',
  91 + maxLines: 3,
  92 + style: TextStyle(
  93 + fontSize: font(12),
  94 + color: MyColours.color_515151),
  95 + overflow: TextOverflow.ellipsis,
  96 + ),
  97 + VEmptyView(8),
  98 + Row(
  99 + children: [
  100 + Container(
  101 + height: w(24),
  102 + padding: EdgeInsets.only(top: w(6)),
  103 + child: Text('更新时间：2022-11-08',
  104 + style: TextStyle(
  105 + fontSize: font(12),
  106 + color: MyColours.color_515151)),
  107 + ),
  108 + Spacer(),
  109 + RoundButton(
  110 + text: '复用',
  111 + width: w(80),
  112 + height: w(30),
  113 + fontSize: 24,
  114 + gradientStart: MyColours.color_ffffff,
  115 + gradientEnd: MyColours.color_ffffff,
  116 + borderColor: MyColours.color_438E93,
  117 + textColor: MyColours.color_438E93,
  118 + radius: r(5),
  119 + isBold: false,
  120 + ),
  121 + HEmptyView(20),
  122 + RoundButton(
  123 + text: '修改',
  124 + width: w(80),
  125 + height: w(30),
  126 + fontSize: 24,
  127 + gradientStart: MyColours.color_ffffff,
  128 + gradientEnd: MyColours.color_ffffff,
  129 + borderColor: MyColours.color_438E93,
  130 + textColor: MyColours.color_438E93,
  131 + radius: r(5),
  132 + isBold: false,
  133 + )
  134 + ],
  135 + )
  136 + ],
  137 + ),
  138 + ),
  139 + );
  140 + }),
  141 + ),
  142 + Padding(
  143 + padding: EdgeInsets.only(
  144 + top: w(12), bottom: w(25), left: w(45), right: w(45)),
  145 + child: RoundButton(
  146 + text: '创建新排菜',
  147 + gradientStart: MyColours.color_438E93,
  148 + gradientEnd: MyColours.color_438E93,
  149 + width: double.infinity,
  150 + height: w(43),
  151 + radius: r(5),
  152 + fontSize: 36,
  153 + isBold: false,
  154 + onPressed: () {
  155 + NavigatorUtil.goPlanNewDishFirstPage(context);
  156 + },
  157 + ),
  158 + )
  159 + ],
  160 + ),
  161 + );
  162 + }
  163 +}
  1 +import 'package:flutter/material.dart';
  2 +import 'package:one_key/utils/utils.dart';
  3 +import 'package:one_key/widgets/MyDivider.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 '../../../res/colors.dart';
  9 +import '../../../utils/screen_util.dart';
  10 +import '../../../widgets/round_button.dart';
  11 +
  12 +/***
  13 + * 4.2我的-我的排菜-创建新排菜前置条件录入
  14 + */
  15 +
  16 +class PlanNewDishFirstPage extends StatefulWidget {
  17 + PlanNewDishFirstPage({Key key}) : super(key: key);
  18 +
  19 + @override
  20 + _PlanNewDishFirstPageState createState() => _PlanNewDishFirstPageState();
  21 +}
  22 +
  23 +class _PlanNewDishFirstPageState extends State<PlanNewDishFirstPage> {
  24 + Widget _selectItem(String title, bool select, String hintText,
  25 + TextEditingController controller) {
  26 + return Row(
  27 + children: [
  28 + HEmptyView(86),
  29 + Image.asset(Utils.getImgPath(select ? 'plan_dish_select' : 'plan_dish_unselect'),
  30 + width: w(20)),
  31 + HEmptyView(10),
  32 + Text(
  33 + title,
  34 + style: TextStyle(fontSize: font(16), color: MyColours.color_515151),
  35 + ),
  36 + HEmptyView(20),
  37 + select
  38 + ? Expanded(
  39 + child: TextField(
  40 + maxLines: 1,
  41 + controller: controller,
  42 + // focusNode: _focusNode,
  43 + // autofocus: true,
  44 +
  45 + style: TextStyle(
  46 + color: MyColours.color_438E93, fontSize: font(14)),
  47 + textAlign: TextAlign.right,
  48 + textAlignVertical: TextAlignVertical.center,
  49 + decoration: InputDecoration(
  50 + hintText: hintText,
  51 + hintStyle: TextStyle(
  52 + color: MyColours.color_438E93,
  53 + fontSize: font(14),
  54 + ),
  55 + isCollapsed: true, //重点，相当于高度包裹的意思，必须设置为true，不然有默认奇妙的最小高度
  56 + border: OutlineInputBorder(borderSide: BorderSide.none),
  57 + contentPadding: EdgeInsets.zero,
  58 + ),
  59 + keyboardType: TextInputType.numberWithOptions(),
  60 + textInputAction: TextInputAction.done,
  61 +
  62 + onChanged: (value) {
  63 + // setState(() {});
  64 + // _searchSellerLocation();
  65 + // customerProvider.searchData(value);
  66 + },
  67 + onEditingComplete: () {
  68 + FocusScope.of(context).requestFocus(FocusNode()); //点击空白处隐藏键盘
  69 + // contantShowModel.searchData(
  70 + // contantShowModel.controller.text);
  71 + // _searchSellerLocation();
  72 + // _focusNode.unfocus();
  73 + },
  74 + ))
  75 + : SizedBox(),
  76 + select
  77 + ? Text(
  78 + '元',
  79 + style: TextStyle(
  80 + fontSize: font(16), color: MyColours.color_515151),
  81 + )
  82 + : SizedBox(),
  83 + ],
  84 + );
  85 + }
  86 +
  87 + @override
  88 + Widget build(BuildContext context) {
  89 + return Scaffold(
  90 + appBar: SystemAppBar('预点菜'),
  91 + backgroundColor: MyColours.color_ffffff,
  92 + body: Column(
  93 + children: [
  94 + Padding(
  95 + padding: EdgeInsets.symmetric(horizontal: w(20)),
  96 + child: MyDivider(
  97 + double.infinity,
  98 + w(1),
  99 + color: MyColours.color_DBDBDB,
  100 + )),
  101 + Expanded(
  102 + child: SingleChildScrollView(
  103 + // controller: controller,
  104 + child: Padding(
  105 + padding: EdgeInsets.symmetric(horizontal: w(20)),
  106 + child: Column(
  107 + crossAxisAlignment: CrossAxisAlignment.start,
  108 + children: [
  109 + Container(
  110 + height: w(48),
  111 + child: Row(
  112 + children: [
  113 + Text(
  114 + '就餐人数',
  115 + style: TextStyle(
  116 + fontSize: font(16),
  117 + color: MyColours.color_515151),
  118 + ),
  119 + Spacer(),
  120 + Image.asset(
  121 + Utils.getImgPath('plan_dish_minus'),
  122 + width: w(16),
  123 + ),
  124 + Container(
  125 + width: w(50),
  126 + // constraints: BoxConstraints(minWidth: w(20)),
  127 + child: TextField(
  128 + maxLines: 1,
  129 + // controller:
  130 + // focusNode: _focusNode,
  131 + // autofocus: true,
  132 +
  133 + style: TextStyle(
  134 + color: MyColours.color_438E93,
  135 + fontSize: font(16)),
  136 + textAlign: TextAlign.center,
  137 + // textAlignVertical: TextAlignVertical.center,
  138 + decoration: InputDecoration(
  139 + hintText: "人数",
  140 + hintStyle: TextStyle(
  141 + color: MyColours.color_999999,
  142 + fontSize: font(16),
  143 + ),
  144 + // isCollapsed:
  145 + // true, //重点，相当于高度包裹的意思，必须设置为true，不然有默认奇妙的最小高度
  146 + border: OutlineInputBorder(
  147 + borderSide: BorderSide.none),
  148 + contentPadding: EdgeInsets.zero,
  149 + ),
  150 + keyboardType: TextInputType.number,
  151 + textInputAction: TextInputAction.done,
  152 +
  153 + onChanged: (value) {
  154 + // setState(() {});
  155 + // _searchSellerLocation();
  156 + // customerProvider.searchData(value);
  157 + },
  158 + onEditingComplete: () {
  159 + FocusScope.of(context)
  160 + .requestFocus(FocusNode()); //点击空白处隐藏键盘
  161 + // contantShowModel.searchData(
  162 + // contantShowModel.controller.text);
  163 + // _searchSellerLocation();
  164 + // _focusNode.unfocus();
  165 + },
  166 + )),
  167 + Image.asset(
  168 + Utils.getImgPath('plan_dish_add'),
  169 + width: w(16),
  170 + ),
  171 + ],
  172 + ),
  173 + ),
  174 + VEmptyView(24),
  175 + Text(
  176 + '用餐标准',
  177 + style: TextStyle(
  178 + fontSize: font(16), color: MyColours.color_515151),
  179 + ),
  180 + VEmptyView(48),
  181 + _selectItem('预计人均', false, '点击这里输入预计人均金额', null),
  182 + VEmptyView(30),
  183 + _selectItem('预计总价', true, '点击这里输入预计总金额', null),
  184 + VEmptyView(46),
  185 + MyDivider(
  186 + double.infinity,
  187 + w(1),
  188 + color: MyColours.color_DBDBDB,
  189 + ),
  190 + ],
  191 + ),
  192 + ),
  193 + ),
  194 + ),
  195 + Padding(
  196 + padding: EdgeInsets.only(
  197 + top: w(12), bottom: w(25), left: w(45), right: w(45)),
  198 + child: RoundButton(
  199 + text: '菜单点菜',
  200 + gradientStart: MyColours.color_438E93,
  201 + gradientEnd: MyColours.color_438E93,
  202 + width: double.infinity,
  203 + height: w(43),
  204 + radius: r(5),
  205 + fontSize: 36,
  206 + isBold: false,
  207 + ),
  208 + )
  209 + ],
  210 + ),
  211 + );
  212 + }
  213 +}
  1 +import 'package:flutter/material.dart';
  2 +/**
  3 + * 预排菜
  4 + */
  5 +class PlanDishProvider extends ChangeNotifier {}
@@ -858,7 +858,7 @@ class NavigatorUtil { @@ -858,7 +858,7 @@ class NavigatorUtil {
858 858
859 ///宴会----新建宴会 859 ///宴会----新建宴会
860 static Future<dynamic> goFeastCreatePage(BuildContext context, 860 static Future<dynamic> goFeastCreatePage(BuildContext context,
861 - {replace = false, bool isCreate = false, Map banquetDetail,String rid}) { 861 + {replace = false, bool isCreate = false, Map banquetDetail, String rid}) {
862 if (banquetDetail != null) { 862 if (banquetDetail != null) {
863 return _navigateTo(context, 863 return _navigateTo(context,
864 "${Routes.feast_create_page}?isCreate=$isCreate&rid=$rid&banquetDetail=${FluroConvertUtils.object2string(banquetDetail)}", 864 "${Routes.feast_create_page}?isCreate=$isCreate&rid=$rid&banquetDetail=${FluroConvertUtils.object2string(banquetDetail)}",
@@ -1124,4 +1124,45 @@ class NavigatorUtil { @@ -1124,4 +1124,45 @@ class NavigatorUtil {
1124 "${Routes.merge_table_select_page}?tids=$tids&tableidNow=$tableidNow&fromPage=$fromPage&canChoose=$canChoose", 1124 "${Routes.merge_table_select_page}?tids=$tids&tableidNow=$tableidNow&fromPage=$fromPage&canChoose=$canChoose",
1125 replace: replace); 1125 replace: replace);
1126 } 1126 }
  1127 + /**
  1128 + * 排菜
  1129 + */
  1130 +
  1131 + ///我的---我的排菜
  1132 + static Future<dynamic> goMyPlanDishHomePage(
  1133 + BuildContext context, {
  1134 + replace = false,
  1135 + }) {
  1136 + // if (invoice != null) {
  1137 + // return _navigateTo(context,
  1138 + // "${Routes.merge_table_select_page}?invoice=${FluroConvertUtils.object2string(invoice)}",
  1139 + // replace: replace);
  1140 + // }
  1141 + // if (object != null) {
  1142 + // return _navigateTo(context,
  1143 + // "${Routes.my_plan_dish_home_page}?tids=$tids&tableidNow=$tableidNow&fromPage=$fromPage&canChoose=$canChoose&object=${FluroConvertUtils.object2string(object)}");
  1144 + // }
  1145 + return _navigateTo(context, "${Routes.my_plan_dish_home_page}",
  1146 + replace: replace);
  1147 + }
  1148 +
  1149 + ///我的-我的排菜-创建新排菜前置条件录入
  1150 + ///
  1151 +
  1152 + static Future<dynamic> goPlanNewDishFirstPage(
  1153 + BuildContext context, {
  1154 + replace = false,
  1155 + }) {
  1156 + // if (invoice != null) {
  1157 + // return _navigateTo(context,
  1158 + // "${Routes.plan_new_dish_first_page}?invoice=${FluroConvertUtils.object2string(invoice)}",
  1159 + // replace: replace);
  1160 + // }
  1161 + // if (object != null) {
  1162 + // return _navigateTo(context,
  1163 + // "${Routes.plan_new_dish_first_page}?tids=$tids&tableidNow=$tableidNow&fromPage=$fromPage&canChoose=$canChoose&object=${FluroConvertUtils.object2string(object)}");
  1164 + // }
  1165 + return _navigateTo(context, "${Routes.plan_new_dish_first_page}",
  1166 + replace: replace);
  1167 + }
1127 } 1168 }
@@ -174,8 +174,11 @@ import '../pages/my/feast_manage/feast_setmeal_manage_edit_page.dart'; @@ -174,8 +174,11 @@ import '../pages/my/feast_manage/feast_setmeal_manage_edit_page.dart';
174 import '../pages/my/feast_manage/feast_type_page.dart'; 174 import '../pages/my/feast_manage/feast_type_page.dart';
175 import '../pages/my/feast_manage/feast_wine_manage_edit_page.dart'; 175 import '../pages/my/feast_manage/feast_wine_manage_edit_page.dart';
176 import '../pages/my/feast_manage/feast_wine_manage_page.dart'; 176 import '../pages/my/feast_manage/feast_wine_manage_page.dart';
  177 +import '../pages/my/plan_dish/my_plan_dish_home_page.dart';
  178 +import '../pages/my/plan_dish/plan_new_dish_first_page.dart';
177 import '../pages/my/table_manage/merge_table_select_page.dart'; 179 import '../pages/my/table_manage/merge_table_select_page.dart';
178 import '../provider/feast_model.dart'; 180 import '../provider/feast_model.dart';
  181 +import '../provider/plan_dish_provider.dart';
179 182
180 // 登录页 183 // 登录页
181 var loginHandler = new Handler( 184 var loginHandler = new Handler(
@@ -1390,17 +1393,16 @@ var feastCreatePageHandle = new Handler( @@ -1390,17 +1393,16 @@ var feastCreatePageHandle = new Handler(
1390 // }); 1393 // });
1391 1394
1392 banquetDetail = GetBanquetByIdNewSunModel.fromJson(temp); 1395 banquetDetail = GetBanquetByIdNewSunModel.fromJson(temp);
1393 -  
1394 1396
1395 -  
1396 - String rid = params["rid"].first;  
1397 - return ChangeNotifierProvider<FeastModel>(  
1398 - create: (_) => FeastModel(),  
1399 - child: FeastCreatePage(banquetDetail: banquetDetail,isCreate:isCreate,rid:rid)); 1397 + String rid = params["rid"].first;
  1398 + return ChangeNotifierProvider<FeastModel>(
  1399 + create: (_) => FeastModel(),
  1400 + child: FeastCreatePage(
  1401 + banquetDetail: banquetDetail, isCreate: isCreate, rid: rid));
1400 } 1402 }
1401 return ChangeNotifierProvider<FeastModel>( 1403 return ChangeNotifierProvider<FeastModel>(
1402 create: (_) => FeastModel(), 1404 create: (_) => FeastModel(),
1403 - child: FeastCreatePage(banquetDetail: banquetDetail,isCreate:isCreate)); 1405 + child: FeastCreatePage(banquetDetail: banquetDetail, isCreate: isCreate));
1404 }); 1406 });
1405 1407
1406 ///宴会----添加定金 1408 ///宴会----添加定金
@@ -1819,3 +1821,50 @@ var mergeTableSelectPageHandle = new Handler( @@ -1819,3 +1821,50 @@ var mergeTableSelectPageHandle = new Handler(
1819 fromPage: fromPage, 1821 fromPage: fromPage,
1820 tids: tids)); 1822 tids: tids));
1821 }); 1823 });
  1824 +
  1825 +/**
  1826 + * 排菜
  1827 + */
  1828 +
  1829 +///我的----我的排菜首页
  1830 +var myPlanDishHomePageHandle = new Handler(
  1831 + handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) {
  1832 + // String fromPage = params["fromPage"].first;
  1833 + // String tids = params["tids"].first;
  1834 +
  1835 + // String tableidNow = params["tableidNow"].first;
  1836 + // bool canChoose = params["canChoose"].first == "true" ? true : false;
  1837 + // List<TableList> res = [];
  1838 + // if (params.keys.contains('object')) {
  1839 + // Map object = FluroConvertUtils.string2map(params["object"].first);
  1840 + // List temp = object['object'];
  1841 +
  1842 + // for (var item in temp) {
  1843 + // res.add(TableList.fromJson(item));
  1844 + // }
  1845 + // }
  1846 + return ChangeNotifierProvider<PlanDishProvider>(
  1847 + create: (_) => PlanDishProvider(), child: MyPlanDishHomePage());
  1848 +});
  1849 +
  1850 +
  1851 +///我的-我的排菜-创建新排菜前置条件录入
  1852 +var planNewDishFirstPageHandle = new Handler(
  1853 + handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) {
  1854 + // String fromPage = params["fromPage"].first;
  1855 + // String tids = params["tids"].first;
  1856 +
  1857 + // String tableidNow = params["tableidNow"].first;
  1858 + // bool canChoose = params["canChoose"].first == "true" ? true : false;
  1859 + // List<TableList> res = [];
  1860 + // if (params.keys.contains('object')) {
  1861 + // Map object = FluroConvertUtils.string2map(params["object"].first);
  1862 + // List temp = object['object'];
  1863 +
  1864 + // for (var item in temp) {
  1865 + // res.add(TableList.fromJson(item));
  1866 + // }
  1867 + // }
  1868 + return ChangeNotifierProvider<PlanDishProvider>(
  1869 + create: (_) => PlanDishProvider(), child: PlanNewDishFirstPage());
  1870 +});
@@ -155,10 +155,17 @@ class Routes { @@ -155,10 +155,17 @@ class Routes {
155 "/feast_qy_menu_show_page"; //宴会-----新建宴会---签约菜单信息 155 "/feast_qy_menu_show_page"; //宴会-----新建宴会---签约菜单信息
156 static String feast_detail_page = "/feast_detail_page"; //宴会-----详情 156 static String feast_detail_page = "/feast_detail_page"; //宴会-----详情
157 157
158 - static String feast_invoice_detail_page = "/feast_invoice_detail_page"; //宴会-----发票详情 158 + static String feast_invoice_detail_page =
  159 + "/feast_invoice_detail_page"; //宴会-----发票详情
159 160
160 - static String merge_table_select_page = "/merge_table_select_page"; //桌位管理---合并桌位选择桌位页面 161 + static String merge_table_select_page =
  162 + "/merge_table_select_page"; //桌位管理---合并桌位选择桌位页面
  163 + /**
  164 + * 排菜
  165 + */
161 166
  167 + static String my_plan_dish_home_page = "/my_plan_dish_home_page"; //我的-我的排菜
  168 +static String plan_new_dish_first_page = "/plan_new_dish_first_page"; //我的-我的排菜-创建新排菜前置条件录入
162 169
163 170
164 static void configureRoutes(FluroRouter router) { 171 static void configureRoutes(FluroRouter router) {
@@ -316,12 +323,14 @@ class Routes { @@ -316,12 +323,14 @@ class Routes {
316 router.define(feast_qy_menu_show_page, handler: feastQYMenuPageHandle); 323 router.define(feast_qy_menu_show_page, handler: feastQYMenuPageHandle);
317 324
318 router.define(feast_detail_page, handler: feastDetailPageHandle); 325 router.define(feast_detail_page, handler: feastDetailPageHandle);
319 -router.define(feast_invoice_detail_page, handler: feastInvoiceDetailPageHandle);  
320 -router.define(merge_table_select_page, handler: mergeTableSelectPageHandle);  
321 -  
322 - 326 + router.define(feast_invoice_detail_page,
  327 + handler: feastInvoiceDetailPageHandle);
  328 + router.define(merge_table_select_page, handler: mergeTableSelectPageHandle);
323 329
  330 + router.define(my_plan_dish_home_page, handler: myPlanDishHomePageHandle);
  331 + router.define(plan_new_dish_first_page, handler: planNewDishFirstPageHandle);
324 332
325 333
  334 +
326 } 335 }
327 } 336 }