xt / Flutter-ReserveApp · Commits

Go to a project

Commit c375575dc81a89b8bc8fa4e6a403646c2946efcb

Authored by wdn127929
1 parent caaa04b6
build: skipped

桌位管理页面越界处理

Inline Side-by-side
Showing 4 changed files with 184 additions and 174 deletions
@@ -18,19 +18,19 @@ if (flutterRoot == null) { @@ -18,19 +18,19 @@ if (flutterRoot == null) {
18 18
19 19
20 20
21 -def flutterVersionCode = "516" 21 +def flutterVersionCode = "517"
22 if (flutterVersionCode == null) { 22 if (flutterVersionCode == null) {
23 - flutterVersionCode = '516' 23 + flutterVersionCode = '517'
24 24
25 25
26 26
27 } 27 }
28 28
29 29
30 -def flutterVersionName = "5.1.6" 30 +def flutterVersionName = "5.1.7"
31 31
32 if (flutterVersionName == null) { 32 if (flutterVersionName == null) {
33 - flutterVersionName = '5.1.6' 33 + flutterVersionName = '5.1.7'
34 34
35 35
36 } 36 }
@@ -379,38 +379,38 @@ class _MyMakeMarkingPageState extends State<MyMakeMarkingPage> { @@ -379,38 +379,38 @@ class _MyMakeMarkingPageState extends State<MyMakeMarkingPage> {
379 }, 379 },
380 ), 380 ),
381 VEmptyView(20), 381 VEmptyView(20),
382 - Container(  
383 - padding: EdgeInsets.only(left: w(10), right: w(10), bottom: w(10)),  
384 - decoration: BoxDecoration(  
385 - borderRadius: BorderRadius.circular(r(5)),  
386 - border: Border.all(width: w(1), color: MyColours.color_F8F7F3)),  
387 - child: Column(  
388 - crossAxisAlignment: CrossAxisAlignment.start,  
389 - children: [  
390 - Container(  
391 - height: w(34),  
392 - alignment: Alignment.centerLeft,  
393 - child: Text(  
394 - '常用模版',  
395 - style: TextStyle(  
396 - color: MyColours.color_515151,  
397 - fontSize: font(12),  
398 - ),  
399 - ),  
400 - ),  
401 - VEmptyView(10),  
402 - Padding(  
403 - padding: EdgeInsets.only(left: w(10)),  
404 - child: Wrap(  
405 - spacing: w(10),  
406 - runSpacing: w(5),  
407 - children: _templateUI(),  
408 - ),  
409 - )  
410 - ],  
411 - ),  
412 - ),  
413 - VEmptyView(50), 382 + // Container(
  383 + // padding: EdgeInsets.only(left: w(10), right: w(10), bottom: w(10)),
  384 + // decoration: BoxDecoration(
  385 + // borderRadius: BorderRadius.circular(r(5)),
  386 + // border: Border.all(width: w(1), color: MyColours.color_F8F7F3)),
  387 + // child: Column(
  388 + // crossAxisAlignment: CrossAxisAlignment.start,
  389 + // children: [
  390 + // Container(
  391 + // height: w(34),
  392 + // alignment: Alignment.centerLeft,
  393 + // child: Text(
  394 + // '常用模版',
  395 + // style: TextStyle(
  396 + // color: MyColours.color_515151,
  397 + // fontSize: font(12),
  398 + // ),
  399 + // ),
  400 + // ),
  401 + // VEmptyView(10),
  402 + // Padding(
  403 + // padding: EdgeInsets.only(left: w(10)),
  404 + // child: Wrap(
  405 + // spacing: w(10),
  406 + // runSpacing: w(5),
  407 + // children: _templateUI(),
  408 + // ),
  409 + // )
  410 + // ],
  411 + // ),
  412 + // ),
  413 + // VEmptyView(50),
414 Row( 414 Row(
415 mainAxisAlignment: MainAxisAlignment.spaceBetween, 415 mainAxisAlignment: MainAxisAlignment.spaceBetween,
416 children: [ 416 children: [
@@ -448,7 +448,7 @@ class _MyMakeMarkingPageState extends State<MyMakeMarkingPage> { @@ -448,7 +448,7 @@ class _MyMakeMarkingPageState extends State<MyMakeMarkingPage> {
448 width: ScreenUtil().setWidth(44)), 448 width: ScreenUtil().setWidth(44)),
449 HEmptyView(15), 449 HEmptyView(15),
450 Text( 450 Text(
451 - '在当前位置插入优惠', 451 + '营销加入优惠', //'在当前位置插入优惠',
452 style: TextStyle( 452 style: TextStyle(
453 fontSize: ScreenUtil().setSp(32), 453 fontSize: ScreenUtil().setSp(32),
454 fontWeight: FontWeight.bold, 454 fontWeight: FontWeight.bold,
@@ -482,25 +482,27 @@ class _MyMakeMarkingPageState extends State<MyMakeMarkingPage> { @@ -482,25 +482,27 @@ class _MyMakeMarkingPageState extends State<MyMakeMarkingPage> {
482 customerMakingProvider.couponSelectIndex]; 482 customerMakingProvider.couponSelectIndex];
483 }); 483 });
484 484
485 - var cursorPos = customerMakingProvider  
486 - .controller.selection.base.offset; //获取到光标的在字符串的位置  
487 -  
488 - String textAfterCursor = customerMakingProvider  
489 - .controller.text  
490 - .substring(cursorPos); //把字符串从光标的位置截取,光标后面的  
491 -  
492 - String textBeforeCursor = customerMakingProvider  
493 - .controller.text  
494 - .substring(0, cursorPos); //光标前面的字符串  
495 - customerMakingProvider.controller.text =  
496 - textBeforeCursor +  
497 - "http://www.baidu.com" +  
498 - textAfterCursor; //把想要的插入的内容拼接在光标位置处  
499 -  
500 - customerMakingProvider.controller.selection =  
501 - TextSelection.collapsed(  
502 - offset: customerMakingProvider  
503 - .controller.text.length); 485 + // *************开始直接插入会报错***********还没有改
  486 +
  487 + // var cursorPos = customerMakingProvider
  488 + // .controller.selection.base.offset; //获取到光标的在字符串的位置
  489 +
  490 + // String textAfterCursor = customerMakingProvider
  491 + // .controller.text
  492 + // .substring(cursorPos); //把字符串从光标的位置截取,光标后面的
  493 +
  494 + // String textBeforeCursor = customerMakingProvider
  495 + // .controller.text
  496 + // .substring(0, cursorPos); //光标前面的字符串
  497 + // customerMakingProvider.controller.text =
  498 + // textBeforeCursor +
  499 + // "http://www.baidu.com" +
  500 + // textAfterCursor; //把想要的插入的内容拼接在光标位置处
  501 +
  502 + // customerMakingProvider.controller.selection =
  503 + // TextSelection.collapsed(
  504 + // offset: customerMakingProvider
  505 + // .controller.text.length);
504 } 506 }
505 }, 507 },
506 selecteds: customerMakingProvider 508 selecteds: customerMakingProvider
@@ -360,38 +360,38 @@ class _MakeMarkingPageState extends State<MakeMarkingPage> { @@ -360,38 +360,38 @@ class _MakeMarkingPageState extends State<MakeMarkingPage> {
360 }, 360 },
361 ), 361 ),
362 VEmptyView(20), 362 VEmptyView(20),
363 - Container(  
364 - padding: EdgeInsets.only(left: w(10), right: w(10), bottom: w(10)),  
365 - decoration: BoxDecoration(  
366 - borderRadius: BorderRadius.circular(r(5)),  
367 - border: Border.all(width: w(1), color: MyColours.color_F8F7F3)),  
368 - child: Column(  
369 - crossAxisAlignment: CrossAxisAlignment.start,  
370 - children: [  
371 - Container(  
372 - height: w(34),  
373 - alignment: Alignment.centerLeft,  
374 - child: Text(  
375 - '常用模版',  
376 - style: TextStyle(  
377 - color: MyColours.color_515151,  
378 - fontSize: font(12),  
379 - ),  
380 - ),  
381 - ),  
382 - VEmptyView(10),  
383 - Padding(  
384 - padding: EdgeInsets.only(left: w(10)),  
385 - child: Wrap(  
386 - spacing: w(10),  
387 - runSpacing: w(5),  
388 - children: _templateUI(),  
389 - ),  
390 - )  
391 - ],  
392 - ),  
393 - ),  
394 - VEmptyView(50), 363 + // Container(
  364 + // padding: EdgeInsets.only(left: w(10), right: w(10), bottom: w(10)),
  365 + // decoration: BoxDecoration(
  366 + // borderRadius: BorderRadius.circular(r(5)),
  367 + // border: Border.all(width: w(1), color: MyColours.color_F8F7F3)),
  368 + // child: Column(
  369 + // crossAxisAlignment: CrossAxisAlignment.start,
  370 + // children: [
  371 + // Container(
  372 + // height: w(34),
  373 + // alignment: Alignment.centerLeft,
  374 + // child: Text(
  375 + // '常用模版',
  376 + // style: TextStyle(
  377 + // color: MyColours.color_515151,
  378 + // fontSize: font(12),
  379 + // ),
  380 + // ),
  381 + // ),
  382 + // VEmptyView(10),
  383 + // Padding(
  384 + // padding: EdgeInsets.only(left: w(10)),
  385 + // child: Wrap(
  386 + // spacing: w(10),
  387 + // runSpacing: w(5),
  388 + // children: _templateUI(),
  389 + // ),
  390 + // )
  391 + // ],
  392 + // ),
  393 + // ),
  394 + // VEmptyView(50),
395 Row( 395 Row(
396 mainAxisAlignment: MainAxisAlignment.spaceBetween, 396 mainAxisAlignment: MainAxisAlignment.spaceBetween,
397 children: [ 397 children: [
@@ -429,7 +429,7 @@ class _MakeMarkingPageState extends State<MakeMarkingPage> { @@ -429,7 +429,7 @@ class _MakeMarkingPageState extends State<MakeMarkingPage> {
429 width: ScreenUtil().setWidth(44)), 429 width: ScreenUtil().setWidth(44)),
430 HEmptyView(15), 430 HEmptyView(15),
431 Text( 431 Text(
432 - '在当前位置插入优惠', 432 + '营销加入优惠', //'在当前位置插入优惠',
433 style: TextStyle( 433 style: TextStyle(
434 fontSize: ScreenUtil().setSp(32), 434 fontSize: ScreenUtil().setSp(32),
435 fontWeight: FontWeight.bold, 435 fontWeight: FontWeight.bold,
@@ -462,25 +462,28 @@ class _MakeMarkingPageState extends State<MakeMarkingPage> { @@ -462,25 +462,28 @@ class _MakeMarkingPageState extends State<MakeMarkingPage> {
462 customerMakingProvider.youhui = couponList[ 462 customerMakingProvider.youhui = couponList[
463 customerMakingProvider.couponSelectIndex]; 463 customerMakingProvider.couponSelectIndex];
464 }); 464 });
465 - var cursorPos = customerMakingProvider  
466 - .controller.selection.base.offset; //获取到光标的在字符串的位置  
467 -  
468 - String textAfterCursor = customerMakingProvider  
469 - .controller.text  
470 - .substring(cursorPos); //把字符串从光标的位置截取,光标后面的  
471 -  
472 - String textBeforeCursor = customerMakingProvider  
473 - .controller.text  
474 - .substring(0, cursorPos); //光标前面的字符串  
475 - customerMakingProvider.controller.text =  
476 - textBeforeCursor +  
477 - "http://www.baidu.com" +  
478 - textAfterCursor; //把想要的插入的内容拼接在光标位置处  
479 -  
480 - customerMakingProvider.controller.selection =  
481 - TextSelection.collapsed(  
482 - offset: customerMakingProvider  
483 - .controller.text.length); 465 +
  466 + // *************开始直接插入会报错***********还没有改
  467 +
  468 + // var cursorPos = customerMakingProvider
  469 + // .controller.selection.base.offset; //获取到光标的在字符串的位置
  470 +
  471 + // String textAfterCursor = customerMakingProvider
  472 + // .controller.text
  473 + // .substring(cursorPos); //把字符串从光标的位置截取,光标后面的
  474 +
  475 + // String textBeforeCursor = customerMakingProvider
  476 + // .controller.text
  477 + // .substring(0, cursorPos); //光标前面的字符串
  478 + // customerMakingProvider.controller.text =
  479 + // textBeforeCursor +
  480 + // "http://www.baidu.com" +
  481 + // textAfterCursor; //把想要的插入的内容拼接在光标位置处
  482 +
  483 + // customerMakingProvider.controller.selection =
  484 + // TextSelection.collapsed(
  485 + // offset: customerMakingProvider
  486 + // .controller.text.length);
484 } 487 }
485 }, 488 },
486 selecteds: customerMakingProvider 489 selecteds: customerMakingProvider
@@ -126,7 +126,7 @@ class MyTableManagerHomePageState extends State<MyTableManagerHomePage> { @@ -126,7 +126,7 @@ class MyTableManagerHomePageState extends State<MyTableManagerHomePage> {
126 'id': table.id, 126 'id': table.id,
127 'name': value['name'], 127 'name': value['name'],
128 'tid': tid, 128 'tid': tid,
129 - 'rid':value['rid'] 129 + 'rid': value['rid']
130 }; 130 };
131 131
132 if (value['pnumMin'] != '') { 132 if (value['pnumMin'] != '') {
@@ -868,7 +868,6 @@ class MyTableManagerHomePageState extends State<MyTableManagerHomePage> { @@ -868,7 +868,6 @@ class MyTableManagerHomePageState extends State<MyTableManagerHomePage> {
868 ScreenUtil().setSp(32), 868 ScreenUtil().setSp(32),
869 color: 869 color:
870 MyColours.color_BFC4D4)), 870 MyColours.color_BFC4D4)),
871 -  
872 ], 871 ],
873 )), 872 )),
874 Align( 873 Align(
@@ -1073,82 +1072,88 @@ class MyTableManagerHomePageState extends State<MyTableManagerHomePage> { @@ -1073,82 +1072,88 @@ class MyTableManagerHomePageState extends State<MyTableManagerHomePage> {
1073 0 1072 0
1074 ? VEmptyView(20) 1073 ? VEmptyView(20)
1075 : VEmptyView(60), 1074 : VEmptyView(60),
1076 - Expanded(  
1077 - child: Column(  
1078 - children: [  
1079 - // Expanded(  
1080 - // child:  
1081 - item(tableManagerModel  
1082 - .selectNumber),  
1083 - if (tableManagerModel  
1084 - .tableOuterList[  
1085 - tableManagerModel  
1086 - .selectNumber]  
1087 - .list  
1088 - .length ==  
1089 - 0)  
1090 - Expanded(  
1091 - child: Padding(  
1092 - padding: EdgeInsets.only(  
1093 - left: ScreenUtil()  
1094 - .setWidth(50)),  
1095 - child: Column(  
1096 - crossAxisAlignment:  
1097 - CrossAxisAlignment  
1098 - .start, 1075 +
  1076 + // Expanded(
  1077 + // child:
  1078 + if (tableManagerModel
  1079 + .tableOuterList[
  1080 + tableManagerModel
  1081 + .selectNumber]
  1082 + .list
  1083 + .length >
  1084 + 0)
  1085 + Expanded(
  1086 + child: item(tableManagerModel
  1087 + .selectNumber)),
  1088 + if (tableManagerModel
  1089 + .tableOuterList[
  1090 + tableManagerModel
  1091 + .selectNumber]
  1092 + .list
  1093 + .length ==
  1094 + 0)
  1095 + Expanded(
  1096 + child: Padding(
  1097 + padding: EdgeInsets.only(
  1098 + left: ScreenUtil()
  1099 + .setWidth(50)),
  1100 + child: Column(
  1101 + crossAxisAlignment:
  1102 + CrossAxisAlignment
  1103 + .start,
  1104 + children: [
  1105 + VEmptyView(60),
  1106 + Row(
1099 children: [ 1107 children: [
1100 - VEmptyView(60),  
1101 - Row(  
1102 - children: [  
1103 - Text(  
1104 - '1、添加区域（如：一楼、二楼、东厅等）',  
1105 - style: TextStyle(  
1106 - decoration:  
1107 - TextDecoration  
1108 - .lineThrough,  
1109 - fontSize:  
1110 - ScreenUtil().setSp(  
1111 - 32),  
1112 - color: MyColours  
1113 - .color_BFC4D4))  
1114 - ],  
1115 - ),  
1116 - VEmptyView(40),  
1117 - Text('2、选择要添加桌位的区域', 1108 + Text(
  1109 + '1、添加区域（如：一楼、二楼、东厅等）',
1118 style: TextStyle( 1110 style: TextStyle(
  1111 + decoration:
  1112 + TextDecoration
  1113 + .lineThrough,
1119 fontSize: ScreenUtil() 1114 fontSize: ScreenUtil()
1120 .setSp( 1115 .setSp(
1121 32), 1116 32),
1122 color: MyColours 1117 color: MyColours
1123 - .color_BFC4D4)),  
1124 - VEmptyView(40),  
1125 - Text('3、点击“+”号添加桌位',  
1126 - style: TextStyle(  
1127 - fontSize: ScreenUtil() 1118 + .color_BFC4D4))
  1119 + ],
  1120 + ),
  1121 + VEmptyView(40),
  1122 + Text('2、选择要添加桌位的区域',
  1123 + style: TextStyle(
  1124 + fontSize:
  1125 + ScreenUtil()
1128 .setSp( 1126 .setSp(
1129 32), 1127 32),
1130 - color: MyColours  
1131 - .color_BFC4D4)),  
1132 - VEmptyView(40),  
1133 - Align(  
1134 - alignment:  
1135 - Alignment  
1136 - .center,  
1137 - child:  
1138 - Image.asset(  
1139 - "assets/empty_search.png",  
1140 - width: ScreenUtil() 1128 + color: MyColours
  1129 + .color_BFC4D4)),
  1130 + VEmptyView(40),
  1131 + Text('3、点击“+”号添加桌位',
  1132 + style: TextStyle(
  1133 + fontSize:
  1134 + ScreenUtil()
  1135 + .setSp(
  1136 + 32),
  1137 + color: MyColours
  1138 + .color_BFC4D4)),
  1139 + VEmptyView(40),
  1140 + Align(
  1141 + alignment: Alignment
  1142 + .center,
  1143 + child: Image.asset(
  1144 + "assets/empty_search.png",
  1145 + width:
  1146 + ScreenUtil()
1141 .setWidth( 1147 .setWidth(
1142 520), 1148 520),
1143 - height: ScreenUtil() 1149 + height:
  1150 + ScreenUtil()
1144 .setWidth( 1151 .setWidth(
1145 384), 1152 384),
1146 - )),  
1147 - // Spacer(),  
1148 - ],  
1149 - ))),  
1150 - ],  
1151 - )) 1153 + )),
  1154 + // Spacer(),
  1155 + ],
  1156 + ))),
1152 ], 1157 ],
1153 ))), 1158 ))),
1154 ])), 1159 ])),