经理排菜，首页，获取店内常点数据

@@ -12,8 +12,8 @@ class Table {
   String rid; //关联区域id
   String rid; //关联区域id
   String tid; //桌位类型 1散座 2包间 3卡座
   String tid; //桌位类型 1散座 2包间 3卡座
   String name; //桌位名称
   String name; //桌位名称
-  String table_pnum; //桌位最少可做人数
-  String most_pnum; //桌位最多可做人数
+  String table_pnum; //桌位最少可坐人数
+  String most_pnum; //桌位最多可坐人数
   String order_o; //桌位排序编号
   String order_o; //桌位排序编号
   String status; //桌位状态 0未使用 1使用中 2已删除
   String status; //桌位状态 0未使用 1使用中 2已删除
   String tablestatus; //桌位状态 0未使用 1使用中 2已删除
   String tablestatus; //桌位状态 0未使用 1使用中 2已删除
@@ -21,7 +21,7 @@ class Table {
   String spell; //1拼桌
   String spell; //1拼桌
   String rname; //关联区域名称
   String rname; //关联区域名称
   dynamic isExitsClass; //表示这个桌子已经关联到包间分类了   null是没有
   dynamic isExitsClass; //表示这个桌子已经关联到包间分类了   null是没有
-  String max; //最多可做人数
+  String max; //最多可坐人数
   String low; //最低消费
   String low; //最低消费
   String sign; //标签 桌位状态 0：待确认，1：已订座，2：确认到店，3：用餐完成，4：取消预订,5：安排包间，6拒绝订单
   String sign; //标签 桌位状态 0：待确认，1：已订座，2：确认到店，3：用餐完成，4：取消预订,5：安排包间，6拒绝订单
   String reserver; //订餐人
   String reserver; //订餐人

@@ -94,8 +94,8 @@ class TableList extends Object {
   @JsonKey(name: 'region_name')
   @JsonKey(name: 'region_name')
   String regionName;
   String regionName;
 
 
-  String table_pnum; //桌位最少可做人数
-  String most_pnum; //桌位最多可做人数
+  String table_pnum; //桌位最少可坐人数
+  String most_pnum; //桌位最多可坐人数
   String low; //最低消费
   String low; //最低消费
 
 
   //获取桌位类型
   //获取桌位类型
@@ -113,7 +113,7 @@ class TableList extends Object {
   String reserver; //订餐人
   String reserver; //订餐人
   // String notebookId; //桌位对应的预订id
   // String notebookId; //桌位对应的预订id
   bool selected = false; //是否选中
   bool selected = false; //是否选中
-  // String max; //最多可做人数
+  // String max; //最多可坐人数
   String sign; //标签 桌位状态 0：待确认，1：已订座，2：确认到店，3：用餐完成，4：取消预订,5：安排包间，6拒绝订单
   String sign; //标签 桌位状态 0：待确认，1：已订座，2：确认到店，3：用餐完成，4：取消预订,5：安排包间，6拒绝订单
 
 
   // String get maxText {
   // String get maxText {

@@ -293,7 +293,7 @@ class SelectTableFPageOrReserveState extends State<SelectTableFPageOrReserve> {
             child: Consumer<TableManagerModelOrReserve>(
             child: Consumer<TableManagerModelOrReserve>(
                 builder: (context, model, child) {
                 builder: (context, model, child) {
               if (model.pageStateOrReserve != PageState.Success) {
               if (model.pageStateOrReserve != PageState.Success) {
-                Expanded(
+             return   Expanded(
                     child: ExceptionPage(
                     child: ExceptionPage(
                   pageState: model.pageStateOrReserve,
                   pageState: model.pageStateOrReserve,
                   callback: () {
                   callback: () {

@@ -48,11 +48,16 @@ class _FeastFollowUpPageState extends State<FeastFollowUpPage> {
     WidgetsBinding.instance.addPostFrameCallback((_) {
     WidgetsBinding.instance.addPostFrameCallback((_) {
       _getBanquetBeFollow();
       _getBanquetBeFollow();
     });
     });
+
+    bus.on('refresh_follow_feast', (arg) { 
+          _getBanquetBeFollow();
+    });
   }
   }
 
 
   @override
   @override
   void dispose() {
   void dispose() {
     super.dispose();
     super.dispose();
+    bus.off('refresh_follow_feast');
     Utils.changeStatusColor(color: MyColours.color_ffffff);
     Utils.changeStatusColor(color: MyColours.color_ffffff);
   }
   }
 
 

@@ -387,7 +387,7 @@ class _RoomTypeCreatePageState extends State<RoomTypeCreatePage> {
                                 padding: EdgeInsets.symmetric(
                                 padding: EdgeInsets.symmetric(
                                   horizontal: ScreenUtil().setWidth(40),
                                   horizontal: ScreenUtil().setWidth(40),
                                 ),
                                 ),
-                                child: _textfield('最多可做人数', '例如：6',
+                                child: _textfield('最多可坐人数', '例如：6',
                                     _maxNumController, _maxNumFocusNode, '人',
                                     _maxNumController, _maxNumFocusNode, '人',
                                     needStar: false,
                                     needStar: false,
                                     inputType: TextInputType.numberWithOptions(
                                     inputType: TextInputType.numberWithOptions(

@@ -503,7 +503,7 @@ class _OrderAdvanceHomePageState extends State<OrderAdvanceHomePage> {
 
 
     if (_planDishProvider.planCookByRidSunModel != null &&
     if (_planDishProvider.planCookByRidSunModel != null &&
         _planDishProvider.planCookByRidSunModel?.pnum != '' &&
         _planDishProvider.planCookByRidSunModel?.pnum != '' &&
-        _planDishProvider.planCookByRidSunModel.pnum == null) {
+        _planDishProvider.planCookByRidSunModel.pnum != null) {
       Map<String, String> params = {
       Map<String, String> params = {
         "pnum": _planDishProvider.planCookByRidSunModel.pnum,
         "pnum": _planDishProvider.planCookByRidSunModel.pnum,
         "sid": Provider.of<UserModel>(context, listen: false).user.sellerid,
         "sid": Provider.of<UserModel>(context, listen: false).user.sellerid,

@@ -83,8 +83,10 @@ class PlanDishProvider extends ChangeNotifier {
       } else {
       } else {
         List menu = baseResp.data[0]['list'];
         List menu = baseResp.data[0]['list'];
         for (int i = 0; i < menu.length; i++) {
         for (int i = 0; i < menu.length; i++) {
-          menuModel.add(MenuModel.fromJson(menu[i]));
-          menuModelOld.add(MenuModel.fromJson(menu[i]));
+          if (menu[i]['class_type'] != '1') {
+            menuModel.add(MenuModel.fromJson(menu[i]));
+            menuModelOld.add(MenuModel.fromJson(menu[i]));
+          }
         }
         }
         print(menuModel);
         print(menuModel);
         pageState = PageState.Success;
         pageState = PageState.Success;
@@ -355,10 +357,10 @@ class PlanDishProvider extends ChangeNotifier {
   }
   }
 
 
   Future<bool> getSellerOften(BuildContext context, Map<String, String> params,
   Future<bool> getSellerOften(BuildContext context, Map<String, String> params,
-      {showLoading = false,bool selfDismiss = false}) async {
+      {showLoading = false, bool selfDismiss = false}) async {
     BaseResp<dynamic> baseResp = await DioUtil()
     BaseResp<dynamic> baseResp = await DioUtil()
         .request<dynamic>(context, Method.post, HttpUrl.get_seller_often,
         .request<dynamic>(context, Method.post, HttpUrl.get_seller_often,
-            data: params, showLoading: showLoading,selfDismiss: selfDismiss)
+            data: params, showLoading: showLoading, selfDismiss: selfDismiss)
         .catchError((error) {
         .catchError((error) {
       print(error.toString());
       print(error.toString());
       if (error is MyError) {}
       if (error is MyError) {}
@@ -405,7 +407,7 @@ class PlanDishProvider extends ChangeNotifier {
                   cook.memberPrice == null || cook.memberPrice == '0'
                   cook.memberPrice == null || cook.memberPrice == '0'
                       ? cook.price
                       ? cook.price
                       : cook.memberPrice;
                       : cook.memberPrice;
-              member_price += double.parse(cookData.member_price);
+              member_price += double.parse(cookData.member_price ?? '0');
 
 
               cookData.name = cook.name;
               cookData.name = cook.name;
               cookData.unit = cook.unit;
               cookData.unit = cook.unit;
@@ -502,7 +504,7 @@ class PlanDishProvider extends ChangeNotifier {
                   cook.memberPrice == null || cook.memberPrice == '0'
                   cook.memberPrice == null || cook.memberPrice == '0'
                       ? cook.price
                       ? cook.price
                       : cook.memberPrice;
                       : cook.memberPrice;
-              member_price += double.parse(cookData.member_price);
+              member_price += double.parse(cookData.member_price ?? '0');
               cookData.name = cook.name;
               cookData.name = cook.name;
               cookData.unit = cook.unit;
               cookData.unit = cook.unit;
               cookData.image = cook.image;
               cookData.image = cook.image;