桌位排序问题&预订订金不可修改&自定义图文换行

@@ -1225,7 +1225,7 @@ else if (element.payType == '微信预订通知' && element.tradeState == 'SUCCE
                           border:
                           border:
                               OutlineInputBorder(borderSide: BorderSide.none),
                               OutlineInputBorder(borderSide: BorderSide.none),
                         ),
                         ),
-                        keyboardType: TextInputType.text,
+                        keyboardType: TextInputType.multiline,
                         onChanged: (value) {
                         onChanged: (value) {
                           setState(() {
                           setState(() {
                             currentRemark = value ?? "";
                             currentRemark = value ?? "";

@@ -184,7 +184,7 @@ class _VerifyFoodPageState extends State<VerifyFoodPage> {
                                 border: OutlineInputBorder(
                                 border: OutlineInputBorder(
                                     borderSide: BorderSide.none),
                                     borderSide: BorderSide.none),
                               ),
                               ),
-                              keyboardType: TextInputType.text,
+                              keyboardType: TextInputType.multiline,
                               onChanged: (value) {
                               onChanged: (value) {
                                 // setState(() {
                                 // setState(() {
                                 //   currentRemark = value ?? "";
                                 //   currentRemark = value ?? "";

@@ -901,7 +901,7 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
               contentPadding: EdgeInsets.zero,
               contentPadding: EdgeInsets.zero,
               border: OutlineInputBorder(borderSide: BorderSide.none),
               border: OutlineInputBorder(borderSide: BorderSide.none),
             ),
             ),
-            keyboardType: TextInputType.text,
+            keyboardType: TextInputType.multiline,
             onChanged: (value) {}),
             onChanged: (value) {}),
       ),
       ),
     );
     );

@@ -391,7 +391,7 @@ class _InvicationAdditionPageState extends State<InvicationAdditionPage> {
                         contentPadding: EdgeInsets.zero,
                         contentPadding: EdgeInsets.zero,
                         border: OutlineInputBorder(borderSide: BorderSide.none),
                         border: OutlineInputBorder(borderSide: BorderSide.none),
                       ),
                       ),
-                      keyboardType: TextInputType.text,
+                      keyboardType: TextInputType.multiline,
                       onChanged: (value) {
                       onChanged: (value) {
                         item.content = value;
                         item.content = value;
                       })),
                       })),

@@ -455,6 +455,7 @@ class InvicationPageState extends State<InvicationPage>
 
 
   @override
   @override
   void dispose() {
   void dispose() {
+    detailModel.depositId = null;
     // App.sp.remove('notebook_timer');
     // App.sp.remove('notebook_timer');
     if (countdownTime >= 1) {
     if (countdownTime >= 1) {
       //缓存当前订单的剩余倒计时时间
       //缓存当前订单的剩余倒计时时间

@@ -700,7 +700,7 @@ class _BookInfoPageState extends State<BookInfoPage> {
                                 border: OutlineInputBorder(
                                 border: OutlineInputBorder(
                                     borderSide: BorderSide.none),
                                     borderSide: BorderSide.none),
                               ),
                               ),
-                              keyboardType: TextInputType.text,
+                              keyboardType: TextInputType.multiline,
                               onChanged: (value) {
                               onChanged: (value) {
                                 setState(() {
                                 setState(() {
                                   // currentRemark = value ?? "";
                                   // currentRemark = value ?? "";
@@ -1006,7 +1006,7 @@ class _BookInfoPageState extends State<BookInfoPage> {
                                 border: OutlineInputBorder(
                                 border: OutlineInputBorder(
                                     borderSide: BorderSide.none),
                                     borderSide: BorderSide.none),
                               ),
                               ),
-                              keyboardType: TextInputType.text,
+                              keyboardType: TextInputType.multiline,
                               onChanged: (value) {
                               onChanged: (value) {
                                 setState(() {
                                 setState(() {
                                   // currentRemark = value ?? "";
                                   // currentRemark = value ?? "";

@@ -571,7 +571,7 @@ class _ChefIntroducePageState extends State<ChefIntroducePage> {
                               border: OutlineInputBorder(
                               border: OutlineInputBorder(
                                   borderSide: BorderSide.none),
                                   borderSide: BorderSide.none),
                             ),
                             ),
-                            keyboardType: TextInputType.text,
+                            keyboardType: TextInputType.multiline,
                             onChanged: (value) {
                             onChanged: (value) {
                               setState(() {
                               setState(() {
                                 // currentRemark = value ?? "";
                                 // currentRemark = value ?? "";

@@ -319,7 +319,7 @@ class _FinalPlanDishPageState extends State<FinalPlanDishPage> {
                             contentPadding: EdgeInsets.zero,
                             contentPadding: EdgeInsets.zero,
                           ),
                           ),
                           keyboardType:
                           keyboardType:
-                              TextInputType.numberWithOptions(decimal: true),
+                              TextInputType.multiline,
                           textInputAction: TextInputAction.done,
                           textInputAction: TextInputAction.done,
 
 
                           onChanged: (value) {
                           onChanged: (value) {

@@ -164,7 +164,7 @@ class _StatisticsSmsPageState extends State<StatisticsSmsPage> {
                                           .requestFocus(FocusNode()); //隐藏键盘
                                           .requestFocus(FocusNode()); //隐藏键盘
                                       // _updateMoney();
                                       // _updateMoney();
                                     },
                                     },
-                                    keyboardType: TextInputType.text,
+                                    keyboardType: TextInputType.multiline,
                                   ))
                                   ))
                             ],
                             ],
                           )),
                           )),

@@ -2281,7 +2281,7 @@ class _OrderEditListShowPageState extends State<OrderEditListShowPage> {
                                         borderSide: BorderSide.none),
                                         borderSide: BorderSide.none),
                                     contentPadding: EdgeInsets.zero,
                                     contentPadding: EdgeInsets.zero,
                                   ),
                                   ),
-                                  keyboardType: TextInputType.text,
+                                  keyboardType: TextInputType.multiline,
                                   textInputAction: TextInputAction.done,
                                   textInputAction: TextInputAction.done,
 
 
                                   onChanged: (value) {
                                   onChanged: (value) {

@@ -2053,7 +2053,7 @@ class _NoteBookChangeFPageSimState extends State<NoteBookChangeFPageSim> {
                                   border: OutlineInputBorder(
                                   border: OutlineInputBorder(
                                       borderSide: BorderSide.none),
                                       borderSide: BorderSide.none),
                                 ),
                                 ),
-                                keyboardType: TextInputType.text,
+                                keyboardType: TextInputType.multiline,
                                 onChanged: (value) {
                                 onChanged: (value) {
                                   setState(() {
                                   setState(() {
                                     currentRemark = value ?? "";
                                     currentRemark = value ?? "";

@@ -1215,7 +1215,7 @@ class NotebookDetailPageSimState extends State<NotebookDetailPageSim> {
                           border:
                           border:
                               OutlineInputBorder(borderSide: BorderSide.none),
                               OutlineInputBorder(borderSide: BorderSide.none),
                         ),
                         ),
-                        keyboardType: TextInputType.text,
+                        keyboardType: TextInputType.multiline,
                         onChanged: (value) {
                         onChanged: (value) {
                           setState(() {
                           setState(() {
                             currentRemark = value ?? "";
                             currentRemark = value ?? "";

@@ -700,7 +700,7 @@ class _BookInfoPageSimState extends State<BookInfoPageSim> {
                                 border: OutlineInputBorder(
                                 border: OutlineInputBorder(
                                     borderSide: BorderSide.none),
                                     borderSide: BorderSide.none),
                               ),
                               ),
-                              keyboardType: TextInputType.text,
+                              keyboardType: TextInputType.multiline,
                               onChanged: (value) {
                               onChanged: (value) {
                                 setState(() {
                                 setState(() {
                                   // currentRemark = value ?? "";
                                   // currentRemark = value ?? "";
@@ -1006,7 +1006,7 @@ class _BookInfoPageSimState extends State<BookInfoPageSim> {
                                 border: OutlineInputBorder(
                                 border: OutlineInputBorder(
                                     borderSide: BorderSide.none),
                                     borderSide: BorderSide.none),
                               ),
                               ),
-                              keyboardType: TextInputType.text,
+                              keyboardType: TextInputType.multiline,
                               onChanged: (value) {
                               onChanged: (value) {
                                 setState(() {
                                 setState(() {
                                   // currentRemark = value ?? "";
                                   // currentRemark = value ?? "";

@@ -714,7 +714,10 @@ class TableManagerModel with ChangeNotifier {
         print(e);
         print(e);
       }
       }
 
 
-      print(tableOuterList);
+      tablesAll = [];
+      tableOuterList.forEach((e) {
+        tablesAll.addAll(e.list);
+      });
     }
     }
 
 
     App.sp.setString('table_list', json.encode(tableOuterList));
     App.sp.setString('table_list', json.encode(tableOuterList));