合并

@@ -327,15 +327,15 @@ class HandleOnlinePageState extends State<HandleOnlinePage> {
                                       height: 76,
                                       height: 76,
                                       fontSize: 34,
                                       fontSize: 34,
                                       onPress: () async {
                                       onPress: () async {
-                                        String tid = await NavigatorUtil
+                                        Map map = await NavigatorUtil
                                             .goSelectTablePage(
                                             .goSelectTablePage(
                                                 context,
                                                 context,
                                                 widget.rid,
                                                 widget.rid,
                                                 int.parse(detailEntity.ddate) *
                                                 int.parse(detailEntity.ddate) *
                                                     1000,
                                                     1000,
                                                 detailEntity.ddate_solt);
                                                 detailEntity.ddate_solt);
-                                        if (tid != null) {
-                                          setReserveStatus("5", tid: tid);
+                                        if (map['tid'] != null) {
+                                          setReserveStatus("5", tid: map['tid']);
                                         }
                                         }
                                       },
                                       },
                                     ),
                                     ),

@@ -224,11 +224,8 @@ class SelectTablePageState extends State<SelectTablePage> {
                                   onSelected: (table) {
                                   onSelected: (table) {
                                     if ((table as t.Table).selected) {
                                     if ((table as t.Table).selected) {
                                       selectTables.add(table);
                                       selectTables.add(table);
-                                      Map<String, dynamic> temp =
-                                          modelToJson(table);
-                                      TableList tableList =
-                                          TableList.fromJson(temp);
-                                      widget.tableList.add(tableList);
+                                      widget.tableList
+                                          .add(tableToTableList(table));
                                     } else {
                                     } else {
                                       widget.tableList
                                       widget.tableList
                                           .removeWhere((t) => t.id == table.id);
                                           .removeWhere((t) => t.id == table.id);
@@ -281,25 +278,24 @@ class SelectTablePageState extends State<SelectTablePage> {
     );
     );
   }
   }
 
 
-  modelToJson(t.Table table) {
-    Map res = {
-      'id': table.id,
-      'rid': table.rid,
-      'tid': table.tid,
-      'name': table.name,
-      'tablePnum': table.table_pnum,
-      'sellerid': null,
-      'qrcode': null,
-      'mostPnum': table.most_pnum,
-      'hot': null,
-      'orderO': table.order_o,
-      'status': table.status,
-      'enable': table.enable,
-      'spell': table.spell,
-      'cdate': null,
-      'rname': table.rname,
-      'regionName': null
-    };
-    return res;
+  tableToTableList(t.Table table) {
+    TableList _tableList;
+    _tableList.id = table.id;
+    _tableList.rid = table.rid;
+    _tableList.tid = table.tid;
+    _tableList.name = table.name;
+    _tableList.tablePnum = table.table_pnum;
+    _tableList.sellerid = null;
+    _tableList.qrcode = null;
+    _tableList.mostPnum = table.most_pnum;
+    _tableList.hot = null;
+    _tableList.orderO = table.order_o;
+    _tableList.status = table.status;
+    _tableList.enable = table.enable;
+    _tableList.spell = table.spell;
+    _tableList.cdate = null;
+    _tableList.rname = table.rname;
+    _tableList.regionName = null;
+    return _tableList;
   }
   }
 }
 }

@@ -59,11 +59,14 @@ var handleSelectTableHandler = new Handler(
       DateTime.fromMillisecondsSinceEpoch(int.parse(params["dateTime"].first));
       DateTime.fromMillisecondsSinceEpoch(int.parse(params["dateTime"].first));
   String ddate_slot = params["ddate_slot"].first;
   String ddate_slot = params["ddate_slot"].first;
   bool canChoose = params["canChoose"].first == "true" ? true : false;
   bool canChoose = params["canChoose"].first == "true" ? true : false;
-  Map object = FluroConvertUtils.string2map(params["object"].first);
-  List temp = object['object'];
   List<TableList> res = [];
   List<TableList> res = [];
-  for (var item in temp) {
-    res.add(TableList.fromJson(item));
+  if (params.keys.contains('object')) {
+    Map object = FluroConvertUtils.string2map(params["object"].first);
+    List temp = object['object'];
+
+    for (var item in temp) {
+      res.add(TableList.fromJson(item));
+    }
   }
   }
 
 
   // return SelectTablePage(rid, dateTime, ddate_slot,canChoose: canChoose);
   // return SelectTablePage(rid, dateTime, ddate_slot,canChoose: canChoose);
@@ -101,10 +104,10 @@ var handleWebviewHandler = new Handler(
 // 协议
 // 协议
 var webPageHandler = new Handler(
 var webPageHandler = new Handler(
     handlerFunc: (BuildContext context, Map<String, List<Object>> params) {
     handlerFunc: (BuildContext context, Map<String, List<Object>> params) {
-      String _title = params["title"].first;
-      String _url = params["url"].first;
-      return WebPage(title: _title, url: _url);
-    });
+  String _title = params["title"].first;
+  String _url = params["url"].first;
+  return WebPage(title: _title, url: _url);
+});
 
 
 // 跳转到变更预订
 // 跳转到变更预订
 var handleChangeDetailHandler = new Handler(
 var handleChangeDetailHandler = new Handler(

@@ -54,8 +54,13 @@ class NavigatorUtil {
   static Future goSelectTablePage(
   static Future goSelectTablePage(
       BuildContext context, String rid, int dateTime, String ddate_slot,
       BuildContext context, String rid, int dateTime, String ddate_slot,
       {bool canChoose = false, Map object}) {
       {bool canChoose = false, Map object}) {
+    if (object != null) {
+      return _navigateTo(context,
+          "${Routes.select_table}?rid=$rid&dateTime=$dateTime&ddate_slot=$ddate_slot&canChoose=$canChoose&object=${FluroConvertUtils.object2string(object)}");
+    }
+    // object = {'object': [], "tid": ''};
     return _navigateTo(context,
     return _navigateTo(context,
-        "${Routes.select_table}?rid=$rid&dateTime=$dateTime&ddate_slot=$ddate_slot&canChoose=$canChoose&object=${FluroConvertUtils.object2string(object)}");
+        "${Routes.select_table}?rid=$rid&dateTime=$dateTime&ddate_slot=$ddate_slot&canChoose=$canChoose");
   }
   }
 
 
   /// 邀请函
   /// 邀请函
@@ -77,8 +82,6 @@ class NavigatorUtil {
     _navigateTo(context, "${Routes.webview}");
     _navigateTo(context, "${Routes.webview}");
   }
   }
 
 
- 
-
   ///协议
   ///协议
   static Future<dynamic> goWebPage(
   static Future<dynamic> goWebPage(
       BuildContext context, String title, String url) {
       BuildContext context, String title, String url) {