调整桌位顶部高度&& 取消默认选中顾客取消

weixin_45529955
1 parent b2515336
Showing 6 changed files with 22 additions and 16 deletions
lib/pages/detail/notebook_detail_page.dart
lib/pages/notebook/notebook_page.dart
lib/pages/table/table_manager_page.dart
lib/pages_sim/detail/notebook_detail_page.dart
lib/pages_sim/notebook/notebook_item_f.dart
lib/pages_sim/notebook/notebook_item_f_simple.dart
--- a/lib/pages/detail/notebook_detail_page.dart
View file @c998155
+++ b/lib/pages/detail/notebook_detail_page.dart
View file @c998155
@@ -976,7 +976,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage>
     isShowTF = false;
     // paddingBottom = ScreenUtil().screenHeight.ceil() - 138 - 340;
     cancelReasonList = [
-      {'title': '顾客取消', 'select': false},
+      {'title': '顾客取消', 'select': true},
       {'title': '顾客行程有变', 'select': false},
       {'title': '操作失误', 'select': false},
       {'title': '信息填写有误', 'select': false},
@@ -1312,6 +1312,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage>
   ///取消预订弹框
   _showCancelWidget(context, phone) {
+    BuildContext pageContext = context;
     _scrollController = ScrollController();
     showGeneralDialog(
         context: context,
@@ -1612,8 +1613,9 @@ class NotebookDetailPageState extends State<NotebookDetailPage>
                                       print(oldInfo);
+                                      Navigator.of(context).pop();
                                       DialogUtil.cupertinoAlertDialogCancelReseve(
-                                          context,
+                                          pageContext,
                                           title: '',
                                           // content1:
                                           //     '确定要将${oldInfo}的预订 变更为 ${newInfo}？',
@@ -1621,8 +1623,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage>
                                           lTitle: '取消',
                                           lCallback: () {},
                                           rTitle: '确定', rCallback: () async {
-                                        Navigator.of(context).pop();
-                                        Loading.showLoading(context);
+                                        Loading.showLoading(pageContext);
                                         await setReserveStatus('4',
                                             desc: desc, phone: phone);
@@ -1636,7 +1637,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage>
                                           };
                                           await detailModel!.setReserveDeposit(
-                                              context, pramas);
+                                              pageContext, pramas);
                                         }
                                       });
                                     }),
--- a/lib/pages/notebook/notebook_page.dart
View file @c998155
+++ b/lib/pages/notebook/notebook_page.dart
View file @c998155
@@ -916,7 +916,7 @@ class NoteBookPageState extends State<NoteBookPage> {
   _showCancelWidget(context, NoteBookOnlySunModel notebook,
       List<ReserveDepositSunModel> reserveDepositList) {
     List<Map<String, dynamic>> cancelReasonList = [
-      {'title': '顾客取消', 'select': false},
+      {'title': '顾客取消', 'select': true},
       {'title': '顾客行程有变', 'select': false},
       {'title': '操作失误', 'select': false},
       {'title': '信息填写有误', 'select': false},
@@ -936,6 +936,7 @@ class NoteBookPageState extends State<NoteBookPage> {
     FocusNode _cancelNode = FocusNode();
     TextEditingController _cancelController = TextEditingController();
     String? desc2 = '';
+    BuildContext pageContext = context;
     showGeneralDialog(
         context: context,
         barrierDismissible: false,
@@ -1241,8 +1242,9 @@ class NoteBookPageState extends State<NoteBookPage> {
                                       print(oldInfo);
+                                      Navigator.of(context).pop();
                                       DialogUtil.cupertinoAlertDialogCancelReseve(
-                                          context,
+                                          pageContext,
                                           title: '',
                                           // content1:
                                           //     '确定要将${oldInfo}的预订 变更为 ${newInfo}？',
@@ -1250,8 +1252,7 @@ class NoteBookPageState extends State<NoteBookPage> {
                                           lTitle: '取消',
                                           lCallback: () {},
                                           rTitle: '确定', rCallback: () async {
-                                        Navigator.of(context).pop();
-                                        Loading.showLoading(context);
+                                        Loading.showLoading(pageContext);
                                         await setReserveStatus(
                                           '4',
@@ -1268,7 +1269,7 @@ class NoteBookPageState extends State<NoteBookPage> {
                                           };
                                           await detailModel.setReserveDeposit(
-                                              context, pramas);
+                                              pageContext, pramas);
                                         }
                                       });
                                     }),
--- a/lib/pages/table/table_manager_page.dart
View file @c998155
+++ b/lib/pages/table/table_manager_page.dart
View file @c998155
@@ -4411,6 +4411,8 @@ class TableManagerPageState extends State<TableManagerPage>
               child: Container(
                   alignment: Alignment.center,
                   width: double.infinity,
+                  height: (ScreenUtil().screenWidth - w(10) - w(18)) / 4 * 0.4 +
+                      ScreenUtil().setWidth(20),
                   // width: width,
                   // padding: padding,
                   // height: ScreenUtil().setWidth(height),
@@ -4424,6 +4426,7 @@ class TableManagerPageState extends State<TableManagerPage>
                     width: w(1),
                   ))),
                   child: Column(
+                    mainAxisAlignment: MainAxisAlignment.center,
                     children: [
                       Text(
                         element.mname ?? '',
@@ -4554,8 +4557,9 @@ class TableManagerPageState extends State<TableManagerPage>
                       child: Container(
                           // height: w(35),
                           height: (ScreenUtil().screenWidth - w(10) - w(18)) /
-                              4 *
-                              0.6,
+                                  4 *
+                                  0.6 +
+                              ScreenUtil().setWidth(10),
                           padding: EdgeInsets.symmetric(
                             horizontal: w(10),
                             // vertical: ScreenUtil().setWidth(20)
@@ -4593,7 +4597,7 @@ class TableManagerPageState extends State<TableManagerPage>
                             ],
                           )),
                     )),
-                VEmptyView(2),
+                VEmptyView(5),
                 if (storeBaseIndoProvider.dayDateData != null)
                   Container(
                     padding: EdgeInsets.symmetric(
--- a/lib/pages_sim/detail/notebook_detail_page.dart
View file @c998155
+++ b/lib/pages_sim/detail/notebook_detail_page.dart
View file @c998155
@@ -729,7 +729,7 @@ class NotebookDetailPageSimState extends State<NotebookDetailPageSim>
     isShowTF = false;
     // paddingBottom = ScreenUtil().screenHeight.ceil() - 138 - 340;
     cancelReasonList = [
-      {'title': '顾客取消', 'select': false},
+      {'title': '顾客取消', 'select': true},
       {'title': '顾客行程有变', 'select': false},
       {'title': '操作失误', 'select': false},
       {'title': '信息填写有误', 'select': false},
--- a/lib/pages_sim/notebook/notebook_item_f.dart
View file @c998155
+++ b/lib/pages_sim/notebook/notebook_item_f.dart
View file @c998155
@@ -100,7 +100,7 @@ class NoteBookItemFSimState extends State<NoteBookItemFSim>
     // isShowTF = false;
     // paddingBottom = ScreenUtil().screenHeight.ceil() - 138 - 340;
     cancelReasonList = [
-      {'title': '顾客取消', 'select': false},
+      {'title': '顾客取消', 'select': true},
       {'title': '顾客行程有变', 'select': false},
       {'title': '信息填写有误', 'select': false},
       {'title': '操作失误', 'select': false},
--- a/lib/pages_sim/notebook/notebook_item_f_simple.dart
View file @c998155
+++ b/lib/pages_sim/notebook/notebook_item_f_simple.dart
View file @c998155
@@ -112,7 +112,7 @@ class NoteBookItemSimpleSimState extends State<NoteBookItemSimpleSim>
     // isShowTF = false;
     // paddingBottom = ScreenUtil().screenHeight.ceil() - 138 - 340;
     cancelReasonList = [
-      {'title': '顾客取消', 'select': false},
+      {'title': '顾客取消', 'select': true},
       {'title': '顾客行程有变', 'select': false},
       {'title': '信息填写有误', 'select': false},
       {'title': '操作失误', 'select': false},