xt / Flutter-ReserveApp · Commits

Go to a project

Commit caad8c6d73d1fb47d577b318020374c2475909cf

Authored by wdn127929
1 parent 85b78bc0
build: skipped

dialog mainAxisSize: MainAxisSize.min,

Inline Side-by-side
Showing 4 changed files with 117 additions and 85 deletions
@@ -510,7 +510,7 @@ @@ -510,7 +510,7 @@
510 CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements; 510 CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
511 CODE_SIGN_IDENTITY = "Apple Development"; 511 CODE_SIGN_IDENTITY = "Apple Development";
512 CODE_SIGN_STYLE = Automatic; 512 CODE_SIGN_STYLE = Automatic;
513 - CURRENT_PROJECT_VERSION = 491; 513 + CURRENT_PROJECT_VERSION = 492;
514 DEVELOPMENT_TEAM = 8J59HM8B82; 514 DEVELOPMENT_TEAM = 8J59HM8B82;
515 ENABLE_BITCODE = NO; 515 ENABLE_BITCODE = NO;
516 FLUTTER_BUILD_MODE = release; 516 FLUTTER_BUILD_MODE = release;
@@ -656,7 +656,7 @@ @@ -656,7 +656,7 @@
656 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements"; 656 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
657 CODE_SIGN_IDENTITY = "Apple Development"; 657 CODE_SIGN_IDENTITY = "Apple Development";
658 CODE_SIGN_STYLE = Automatic; 658 CODE_SIGN_STYLE = Automatic;
659 - CURRENT_PROJECT_VERSION = 491; 659 + CURRENT_PROJECT_VERSION = 492;
660 DEVELOPMENT_TEAM = 8J59HM8B82; 660 DEVELOPMENT_TEAM = 8J59HM8B82;
661 ENABLE_BITCODE = NO; 661 ENABLE_BITCODE = NO;
662 FLUTTER_BUILD_MODE = release; 662 FLUTTER_BUILD_MODE = release;
@@ -692,7 +692,7 @@ @@ -692,7 +692,7 @@
692 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 692 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
693 CODE_SIGN_IDENTITY = "Apple Development"; 693 CODE_SIGN_IDENTITY = "Apple Development";
694 CODE_SIGN_STYLE = Automatic; 694 CODE_SIGN_STYLE = Automatic;
695 - CURRENT_PROJECT_VERSION = 491; 695 + CURRENT_PROJECT_VERSION = 492;
696 DEVELOPMENT_TEAM = 8J59HM8B82; 696 DEVELOPMENT_TEAM = 8J59HM8B82;
697 ENABLE_BITCODE = NO; 697 ENABLE_BITCODE = NO;
698 FLUTTER_BUILD_MODE = release; 698 FLUTTER_BUILD_MODE = release;
@@ -92,6 +92,7 @@ class _EnterStorePhonePageState extends State<EnterStorePhonePage> { @@ -92,6 +92,7 @@ class _EnterStorePhonePageState extends State<EnterStorePhonePage> {
92 FocusScope.of(context).requestFocus(FocusNode()); //点击空白处隐藏键盘 92 FocusScope.of(context).requestFocus(FocusNode()); //点击空白处隐藏键盘
93 }, 93 },
94 child: Container( 94 child: Container(
  95 + color: MyColours.color_ffffff,
95 padding: EdgeInsets.symmetric( 96 padding: EdgeInsets.symmetric(
96 horizontal: ScreenUtil().setWidth(70), 97 horizontal: ScreenUtil().setWidth(70),
97 vertical: ScreenUtil().setWidth(60)), 98 vertical: ScreenUtil().setWidth(60)),
@@ -360,7 +360,7 @@ class _MonthOrderPageState extends State<MonthOrderPage> { @@ -360,7 +360,7 @@ class _MonthOrderPageState extends State<MonthOrderPage> {
360 ), 360 ),
361 HEmptyView(10), 361 HEmptyView(10),
362 Text( 362 Text(
363 - '到客${customerProvider.monthStaticsData.totalDaoKe}', 363 + '到客${customerProvider.monthStaticsData.totalDaoKe??'0'}',
364 style: TextStyle( 364 style: TextStyle(
365 color: MyColours.color_515151, 365 color: MyColours.color_515151,
366 fontSize: font( 366 fontSize: font(
@@ -540,8 +540,8 @@ class DialogUtil { @@ -540,8 +540,8 @@ class DialogUtil {
540 margin: 540 margin:
541 EdgeInsets.only(bottom: ScreenUtil().setWidth(150)), 541 EdgeInsets.only(bottom: ScreenUtil().setWidth(150)),
542 padding: EdgeInsets.symmetric( 542 padding: EdgeInsets.symmetric(
543 - horizontal: ScreenUtil().setWidth(50)),  
544 - height: ScreenUtil().setWidth(238 * 2), 543 + horizontal: ScreenUtil().setWidth(40)),
  544 + // height: ScreenUtil().setWidth(238 * 2),
545 decoration: BoxDecoration( 545 decoration: BoxDecoration(
546 borderRadius: BorderRadius.circular( 546 borderRadius: BorderRadius.circular(
547 ScreenUtil().setWidth(16))), 547 ScreenUtil().setWidth(16))),
@@ -550,6 +550,7 @@ class DialogUtil { @@ -550,6 +550,7 @@ class DialogUtil {
550 borderRadius: BorderRadius.all(Radius.circular( 550 borderRadius: BorderRadius.all(Radius.circular(
551 ScreenUtil().setWidth(16)))), //设置圆角 551 ScreenUtil().setWidth(16)))), //设置圆角
552 child: Column( 552 child: Column(
  553 + mainAxisSize: MainAxisSize.min,
553 children: [ 554 children: [
554 VEmptyView(64), 555 VEmptyView(64),
555 Container( 556 Container(
@@ -1100,51 +1101,60 @@ class DialogUtil { @@ -1100,51 +1101,60 @@ class DialogUtil {
1100 barrierDismissible: true, 1101 barrierDismissible: true,
1101 builder: (BuildContext context) { 1102 builder: (BuildContext context) {
1102 return Center( 1103 return Center(
1103 - child: Container(  
1104 - height: ScreenUtil().setWidth(400),  
1105 - width: ScreenUtil().setWidth(280 * 2),  
1106 - decoration: BoxDecoration(  
1107 - borderRadius: BorderRadius.circular(ScreenUtil().setWidth(10))),  
1108 - child: Card(  
1109 - shape: RoundedRectangleBorder(  
1110 - borderRadius: BorderRadius.all(  
1111 - Radius.circular(ScreenUtil().setWidth(10)))), //设置圆角  
1112 - child: Column(children: [  
1113 - Expanded(  
1114 - child: ListView( 1104 + child: Container(
  1105 + // height: ScreenUtil().setWidth(400),
  1106 + width: ScreenUtil().setWidth(280 * 2),
  1107 + decoration: BoxDecoration(
  1108 + borderRadius: BorderRadius.circular(ScreenUtil().setWidth(10))),
  1109 + child: Card(
  1110 + shape: RoundedRectangleBorder(
  1111 + borderRadius: BorderRadius.all(
  1112 + Radius.circular(ScreenUtil().setWidth(10)))), //设置圆角
  1113 + child: Column(mainAxisSize: MainAxisSize.min, children: [
  1114 + // ListView(
  1115 + // padding: EdgeInsets.symmetric(
  1116 + // horizontal: ScreenUtil().setWidth(40),
  1117 + // vertical: ScreenUtil().setWidth(40)),
  1118 + // shrinkWrap: true,
  1119 + // children: [
  1120 + // Wrap(
  1121 + // children: tableListChangeWidget(tables, (v) {}),
  1122 + // spacing: ScreenUtil().setWidth(20),
  1123 + // runSpacing: ScreenUtil().setWidth(20),
  1124 + // // alignment: WrapAlignment.start,
  1125 + // // runAlignment: WrapAlignment.end,
  1126 + // ),
  1127 + // ],
  1128 + // ),
  1129 + Padding(
1115 padding: EdgeInsets.symmetric( 1130 padding: EdgeInsets.symmetric(
1116 horizontal: ScreenUtil().setWidth(40), 1131 horizontal: ScreenUtil().setWidth(40),
1117 vertical: ScreenUtil().setWidth(40)), 1132 vertical: ScreenUtil().setWidth(40)),
1118 - shrinkWrap: true,  
1119 - children: [  
1120 - Wrap(  
1121 - children: tableListChangeWidget(tables, (v) {}),  
1122 - spacing: ScreenUtil().setWidth(20),  
1123 - runSpacing: ScreenUtil().setWidth(20),  
1124 - // alignment: WrapAlignment.start,  
1125 - // runAlignment: WrapAlignment.end,  
1126 - ),  
1127 - ],  
1128 - )),  
1129 - MyDivider(double.infinity, ScreenUtil().setWidth(2)),  
1130 - InkWell(  
1131 - onTap: () {  
1132 - Navigator.pop(context);  
1133 - },  
1134 - child: Container(  
1135 - width: double.infinity,  
1136 - alignment: Alignment.center,  
1137 - padding: EdgeInsets.symmetric(  
1138 - vertical: ScreenUtil().setWidth(40)),  
1139 - child: Text('确定',  
1140 - style: TextStyle(  
1141 - color: Color.fromRGBO(42, 96, 244, 1),  
1142 - fontSize: ScreenUtil().setSp(30))),  
1143 - ),  
1144 - )  
1145 - ])),  
1146 - ),  
1147 - ); 1133 + child: Wrap(
  1134 + children: tableListChangeWidget(tables, (v) {}),
  1135 + spacing: ScreenUtil().setWidth(20),
  1136 + runSpacing: ScreenUtil().setWidth(20),
  1137 + // alignment: WrapAlignment.start,
  1138 + // runAlignment: WrapAlignment.end,
  1139 + )),
  1140 + MyDivider(double.infinity, ScreenUtil().setWidth(2)),
  1141 + InkWell(
  1142 + onTap: () {
  1143 + Navigator.pop(context);
  1144 + },
  1145 + child: Container(
  1146 + width: double.infinity,
  1147 + alignment: Alignment.center,
  1148 + padding: EdgeInsets.symmetric(
  1149 + vertical: ScreenUtil().setWidth(40)),
  1150 + child: Text('确定',
  1151 + style: TextStyle(
  1152 + color: Color.fromRGBO(42, 96, 244, 1),
  1153 + fontSize: ScreenUtil().setSp(30))),
  1154 + ),
  1155 + )
  1156 + ])),
  1157 + ));
1148 }, 1158 },
1149 ); 1159 );
1150 } 1160 }
@@ -1157,7 +1167,7 @@ class DialogUtil { @@ -1157,7 +1167,7 @@ class DialogUtil {
1157 builder: (BuildContext context) { 1167 builder: (BuildContext context) {
1158 return Center( 1168 return Center(
1159 child: Container( 1169 child: Container(
1160 - height: ScreenUtil().setWidth(400), 1170 + // height: ScreenUtil().setWidth(400),
1161 width: ScreenUtil().setWidth(280 * 2), 1171 width: ScreenUtil().setWidth(280 * 2),
1162 decoration: BoxDecoration( 1172 decoration: BoxDecoration(
1163 borderRadius: BorderRadius.circular(ScreenUtil().setWidth(10))), 1173 borderRadius: BorderRadius.circular(ScreenUtil().setWidth(10))),
@@ -1165,23 +1175,24 @@ class DialogUtil { @@ -1165,23 +1175,24 @@ class DialogUtil {
1165 shape: RoundedRectangleBorder( 1175 shape: RoundedRectangleBorder(
1166 borderRadius: BorderRadius.all( 1176 borderRadius: BorderRadius.all(
1167 Radius.circular(ScreenUtil().setWidth(10)))), //设置圆角 1177 Radius.circular(ScreenUtil().setWidth(10)))), //设置圆角
1168 - child: Column(children: [  
1169 - Expanded(  
1170 - child: ListView( 1178 + child: Column(mainAxisSize: MainAxisSize.min, children: [
  1179 + Padding(
  1180 + // child: ListView(
1171 padding: EdgeInsets.symmetric( 1181 padding: EdgeInsets.symmetric(
1172 horizontal: ScreenUtil().setWidth(40), 1182 horizontal: ScreenUtil().setWidth(40),
1173 vertical: ScreenUtil().setWidth(40)), 1183 vertical: ScreenUtil().setWidth(40)),
1174 - shrinkWrap: true,  
1175 - children: [  
1176 - Wrap(  
1177 - children: tableListWidget(tables, (v) {}),  
1178 - spacing: ScreenUtil().setWidth(20),  
1179 - runSpacing: ScreenUtil().setWidth(20),  
1180 - // alignment: WrapAlignment.start,  
1181 - // runAlignment: WrapAlignment.end,  
1182 - ),  
1183 - ],  
1184 - )), 1184 + // shrinkWrap: true,
  1185 + // children: [
  1186 + child: Wrap(
  1187 + children: tableListWidget(tables, (v) {}),
  1188 + spacing: ScreenUtil().setWidth(20),
  1189 + runSpacing: ScreenUtil().setWidth(20),
  1190 + // alignment: WrapAlignment.start,
  1191 + // runAlignment: WrapAlignment.end,
  1192 + ),
  1193 + // ],
  1194 + // )
  1195 + ),
1185 MyDivider(double.infinity, ScreenUtil().setWidth(2)), 1196 MyDivider(double.infinity, ScreenUtil().setWidth(2)),
1186 InkWell( 1197 InkWell(
1187 onTap: () { 1198 onTap: () {
@@ -1263,7 +1274,7 @@ class DialogUtil { @@ -1263,7 +1274,7 @@ class DialogUtil {
1263 child: Container( 1274 child: Container(
1264 padding: EdgeInsets.symmetric( 1275 padding: EdgeInsets.symmetric(
1265 horizontal: ScreenUtil().setWidth(50)), 1276 horizontal: ScreenUtil().setWidth(50)),
1266 - height: ScreenUtil().setWidth(218 * 2 + 10), 1277 + // height: ScreenUtil().setWidth(218 * 2 + 10),
1267 decoration: BoxDecoration( 1278 decoration: BoxDecoration(
1268 borderRadius: 1279 borderRadius:
1269 BorderRadius.circular(ScreenUtil().setWidth(16))), 1280 BorderRadius.circular(ScreenUtil().setWidth(16))),
@@ -1273,6 +1284,7 @@ class DialogUtil { @@ -1273,6 +1284,7 @@ class DialogUtil {
1273 Radius.circular(ScreenUtil().setWidth(10)))), //设置圆角 1284 Radius.circular(ScreenUtil().setWidth(10)))), //设置圆角
1274 child: Container( 1285 child: Container(
1275 child: Column( 1286 child: Column(
  1287 + mainAxisSize: MainAxisSize.min,
1276 children: [ 1288 children: [
1277 VEmptyView(64), 1289 VEmptyView(64),
1278 Container( 1290 Container(
@@ -1463,6 +1475,7 @@ class DialogUtil { @@ -1463,6 +1475,7 @@ class DialogUtil {
1463 Radius.circular(ScreenUtil().setWidth(10)))), //设置圆角 1475 Radius.circular(ScreenUtil().setWidth(10)))), //设置圆角
1464 child: Container( 1476 child: Container(
1465 child: Column( 1477 child: Column(
  1478 + mainAxisSize: MainAxisSize.min,
1466 children: [ 1479 children: [
1467 VEmptyView(64), 1480 VEmptyView(64),
1468 Container( 1481 Container(
@@ -1772,7 +1785,7 @@ class DialogUtil { @@ -1772,7 +1785,7 @@ class DialogUtil {
1772 child: Container( 1785 child: Container(
1773 padding: EdgeInsets.symmetric( 1786 padding: EdgeInsets.symmetric(
1774 horizontal: ScreenUtil().setWidth(50)), 1787 horizontal: ScreenUtil().setWidth(50)),
1775 - height: ScreenUtil().setWidth(346 * 2), 1788 + // height: ScreenUtil().setWidth(346 * 2),
1776 decoration: BoxDecoration( 1789 decoration: BoxDecoration(
1777 borderRadius: 1790 borderRadius:
1778 BorderRadius.circular(ScreenUtil().setWidth(16))), 1791 BorderRadius.circular(ScreenUtil().setWidth(16))),
@@ -1783,6 +1796,7 @@ class DialogUtil { @@ -1783,6 +1796,7 @@ class DialogUtil {
1783 Radius.circular(ScreenUtil().setWidth(10)))), //设置圆角 1796 Radius.circular(ScreenUtil().setWidth(10)))), //设置圆角
1784 child: Container( 1797 child: Container(
1785 child: Column( 1798 child: Column(
  1799 + mainAxisSize: MainAxisSize.min,
1786 children: [ 1800 children: [
1787 VEmptyView(64), 1801 VEmptyView(64),
1788 Container( 1802 Container(
@@ -2022,7 +2036,7 @@ class DialogUtil { @@ -2022,7 +2036,7 @@ class DialogUtil {
2022 child: Container( 2036 child: Container(
2023 padding: 2037 padding:
2024 EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(50)), 2038 EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(50)),
2025 - height: ScreenUtil().setWidth(207 * 2 + 10), 2039 + // height: ScreenUtil().setWidth(207 * 2 + 10),
2026 decoration: BoxDecoration( 2040 decoration: BoxDecoration(
2027 borderRadius: BorderRadius.circular(ScreenUtil().setWidth(10))), 2041 borderRadius: BorderRadius.circular(ScreenUtil().setWidth(10))),
2028 child: Card( 2042 child: Card(
@@ -2034,6 +2048,7 @@ class DialogUtil { @@ -2034,6 +2048,7 @@ class DialogUtil {
2034 Container( 2048 Container(
2035 padding: EdgeInsets.all(ScreenUtil().setWidth(40)), 2049 padding: EdgeInsets.all(ScreenUtil().setWidth(40)),
2036 child: Column( 2050 child: Column(
  2051 + mainAxisSize: MainAxisSize.min,
2037 children: [ 2052 children: [
2038 Container( 2053 Container(
2039 // height: ScreenUtil().setWidth(48), 2054 // height: ScreenUtil().setWidth(48),
@@ -2398,9 +2413,9 @@ class DialogUtil { @@ -2398,9 +2413,9 @@ class DialogUtil {
2398 EdgeInsets.only(bottom: ScreenUtil().setWidth(150)), 2413 EdgeInsets.only(bottom: ScreenUtil().setWidth(150)),
2399 padding: EdgeInsets.symmetric( 2414 padding: EdgeInsets.symmetric(
2400 horizontal: ScreenUtil().setWidth(50)), 2415 horizontal: ScreenUtil().setWidth(50)),
2401 - height: mulCreate  
2402 - ? ScreenUtil().setWidth(310 * 2)  
2403 - : ScreenUtil().setWidth(346 * 2), 2416 + // height: mulCreate
  2417 + // ? ScreenUtil().setWidth(310 * 2)
  2418 + // : ScreenUtil().setWidth(346 * 2),
2404 decoration: BoxDecoration( 2419 decoration: BoxDecoration(
2405 borderRadius: BorderRadius.circular( 2420 borderRadius: BorderRadius.circular(
2406 ScreenUtil().setWidth(10))), 2421 ScreenUtil().setWidth(10))),
@@ -2409,6 +2424,7 @@ class DialogUtil { @@ -2409,6 +2424,7 @@ class DialogUtil {
2409 borderRadius: BorderRadius.all(Radius.circular( 2424 borderRadius: BorderRadius.all(Radius.circular(
2410 ScreenUtil().setWidth(10)))), //设置圆角 2425 ScreenUtil().setWidth(10)))), //设置圆角
2411 child: Column( 2426 child: Column(
  2427 + mainAxisSize: MainAxisSize.min,
2412 children: [ 2428 children: [
2413 VEmptyView(40), 2429 VEmptyView(40),
2414 Container( 2430 Container(
@@ -2874,6 +2890,7 @@ class DialogUtil { @@ -2874,6 +2890,7 @@ class DialogUtil {
2874 ScreenUtil().setWidth(10)))), //设置圆角 2890 ScreenUtil().setWidth(10)))), //设置圆角
2875 child: Container( 2891 child: Container(
2876 child: Column( 2892 child: Column(
  2893 + mainAxisSize: MainAxisSize.min,
2877 children: [ 2894 children: [
2878 VEmptyView(54), 2895 VEmptyView(54),
2879 Container( 2896 Container(
@@ -3436,7 +3453,7 @@ class DialogUtil { @@ -3436,7 +3453,7 @@ class DialogUtil {
3436 padding: EdgeInsets.symmetric( 3453 padding: EdgeInsets.symmetric(
3437 horizontal: ScreenUtil().setWidth(50)), 3454 horizontal: ScreenUtil().setWidth(50)),
3438 margin: EdgeInsets.only(bottom: ScreenUtil().setWidth(150)), 3455 margin: EdgeInsets.only(bottom: ScreenUtil().setWidth(150)),
3439 - height: ScreenUtil().setWidth(226 * 2), 3456 + // height: ScreenUtil().setWidth(226 * 2),
3440 decoration: BoxDecoration( 3457 decoration: BoxDecoration(
3441 borderRadius: 3458 borderRadius:
3442 BorderRadius.circular(ScreenUtil().setWidth(10))), 3459 BorderRadius.circular(ScreenUtil().setWidth(10))),
@@ -3445,6 +3462,7 @@ class DialogUtil { @@ -3445,6 +3462,7 @@ class DialogUtil {
3445 borderRadius: BorderRadius.all(Radius.circular( 3462 borderRadius: BorderRadius.all(Radius.circular(
3446 ScreenUtil().setWidth(10)))), //设置圆角 3463 ScreenUtil().setWidth(10)))), //设置圆角
3447 child: Column( 3464 child: Column(
  3465 + mainAxisSize: MainAxisSize.min,
3448 children: [ 3466 children: [
3449 VEmptyView(64), 3467 VEmptyView(64),
3450 Container( 3468 Container(
@@ -3631,7 +3649,7 @@ class DialogUtil { @@ -3631,7 +3649,7 @@ class DialogUtil {
3631 horizontal: ScreenUtil().setWidth(50)), 3649 horizontal: ScreenUtil().setWidth(50)),
3632 margin: 3650 margin:
3633 EdgeInsets.only(bottom: ScreenUtil().setWidth(150)), 3651 EdgeInsets.only(bottom: ScreenUtil().setWidth(150)),
3634 - height: ScreenUtil().setWidth(212 * 2), 3652 + // height: ScreenUtil().setWidth(212 * 2),
3635 decoration: BoxDecoration( 3653 decoration: BoxDecoration(
3636 borderRadius: 3654 borderRadius:
3637 BorderRadius.circular(ScreenUtil().setWidth(10))), 3655 BorderRadius.circular(ScreenUtil().setWidth(10))),
@@ -3641,6 +3659,7 @@ class DialogUtil { @@ -3641,6 +3659,7 @@ class DialogUtil {
3641 ScreenUtil().setWidth(10)))), //设置圆角 3659 ScreenUtil().setWidth(10)))), //设置圆角
3642 child: Container( 3660 child: Container(
3643 child: Column( 3661 child: Column(
  3662 + mainAxisSize: MainAxisSize.min,
3644 children: [ 3663 children: [
3645 VEmptyView(64), 3664 VEmptyView(64),
3646 Container( 3665 Container(
@@ -3788,7 +3807,7 @@ class DialogUtil { @@ -3788,7 +3807,7 @@ class DialogUtil {
3788 // margin: EdgeInsets.only(top: ScreenUtil().setWidth(500)), 3807 // margin: EdgeInsets.only(top: ScreenUtil().setWidth(500)),
3789 padding: EdgeInsets.symmetric( 3808 padding: EdgeInsets.symmetric(
3790 horizontal: ScreenUtil().setWidth(50)), 3809 horizontal: ScreenUtil().setWidth(50)),
3791 - height: ScreenUtil().setWidth(286 * 2), 3810 + // height: ScreenUtil().setWidth(286 * 2),
3792 decoration: BoxDecoration( 3811 decoration: BoxDecoration(
3793 borderRadius: 3812 borderRadius:
3794 BorderRadius.circular(ScreenUtil().setWidth(10))), 3813 BorderRadius.circular(ScreenUtil().setWidth(10))),
@@ -3797,6 +3816,7 @@ class DialogUtil { @@ -3797,6 +3816,7 @@ class DialogUtil {
3797 borderRadius: BorderRadius.all( 3816 borderRadius: BorderRadius.all(
3798 Radius.circular(ScreenUtil().setWidth(10)))), //设置圆角 3817 Radius.circular(ScreenUtil().setWidth(10)))), //设置圆角
3799 child: Column( 3818 child: Column(
  3819 + mainAxisSize: MainAxisSize.min,
3800 children: [ 3820 children: [
3801 VEmptyView(54), 3821 VEmptyView(54),
3802 Container( 3822 Container(
@@ -4153,13 +4173,14 @@ class DialogUtil { @@ -4153,13 +4173,14 @@ class DialogUtil {
4153 child: Container( 4173 child: Container(
4154 padding: EdgeInsets.symmetric( 4174 padding: EdgeInsets.symmetric(
4155 horizontal: ScreenUtil().setWidth(50)), 4175 horizontal: ScreenUtil().setWidth(50)),
4156 - height: ScreenUtil().setWidth(326 * 2) +  
4157 - ScreenUtil().setWidth(50 * 2), 4176 + // height: ScreenUtil().setWidth(326 * 2) +
  4177 + // ScreenUtil().setWidth(50 * 2),
4158 decoration: BoxDecoration( 4178 decoration: BoxDecoration(
4159 borderRadius: 4179 borderRadius:
4160 BorderRadius.circular(ScreenUtil().setWidth(10))), 4180 BorderRadius.circular(ScreenUtil().setWidth(10))),
4161 child: Stack(children: [ 4181 child: Stack(children: [
4162 Column( 4182 Column(
  4183 + mainAxisSize: MainAxisSize.min,
4163 children: [ 4184 children: [
4164 Card( 4185 Card(
4165 shape: RoundedRectangleBorder( 4186 shape: RoundedRectangleBorder(
@@ -4477,10 +4498,10 @@ class DialogUtil { @@ -4477,10 +4498,10 @@ class DialogUtil {
4477 // list.insert(0, '立即在线预订'); 4498 // list.insert(0, '立即在线预订');
4478 Widget dialog = Container( 4499 Widget dialog = Container(
4479 width: double.infinity, 4500 width: double.infinity,
4480 - height: ScreenUtil().setWidth(114) * 2 +  
4481 - ScreenUtil().setWidth(114) +  
4482 - ScreenUtil().setWidth(70) -  
4483 - ScreenUtil().setWidth(104), 4501 + // height: ScreenUtil().setWidth(114) * 2 +
  4502 + // ScreenUtil().setWidth(114) +
  4503 + // ScreenUtil().setWidth(70) -
  4504 + // ScreenUtil().setWidth(104),
4484 color: Colors.transparent, 4505 color: Colors.transparent,
4485 // decoration: BoxDecoration( 4506 // decoration: BoxDecoration(
4486 // color: MyColours.color_ffffff, 4507 // color: MyColours.color_ffffff,
@@ -4488,6 +4509,7 @@ class DialogUtil { @@ -4488,6 +4509,7 @@ class DialogUtil {
4488 // topLeft: Radius.circular(ScreenUtil().setWidth(40)), 4509 // topLeft: Radius.circular(ScreenUtil().setWidth(40)),
4489 // topRight: Radius.circular(ScreenUtil().setWidth(40)))), 4510 // topRight: Radius.circular(ScreenUtil().setWidth(40)))),
4490 child: Column( 4511 child: Column(
  4512 + mainAxisSize: MainAxisSize.min,
4491 children: <Widget>[ 4513 children: <Widget>[
4492 VEmptyView(60), 4514 VEmptyView(60),
4493 // Container( 4515 // Container(
@@ -4935,6 +4957,7 @@ class DialogUtil { @@ -4935,6 +4957,7 @@ class DialogUtil {
4935 return Container( 4957 return Container(
4936 color: MyColours.color_ffffff, 4958 color: MyColours.color_ffffff,
4937 child: Column( 4959 child: Column(
  4960 + mainAxisSize: MainAxisSize.min,
4938 children: <Widget>[ 4961 children: <Widget>[
4939 TableCalendar( 4962 TableCalendar(
4940 // rowHeight: ScreenUtil().setWidth(100), 4963 // rowHeight: ScreenUtil().setWidth(100),
@@ -5263,7 +5286,7 @@ class DialogUtil { @@ -5263,7 +5286,7 @@ class DialogUtil {
5263 }); 5286 });
5264 return SizedBox( 5287 return SizedBox(
5265 width: double.infinity, 5288 width: double.infinity,
5266 - height: ScreenUtil().setWidth(975), 5289 + // height: ScreenUtil().setWidth(975),
5267 child: widget, 5290 child: widget,
5268 ); 5291 );
5269 }); 5292 });
@@ -5294,7 +5317,7 @@ class DialogUtil { @@ -5294,7 +5317,7 @@ class DialogUtil {
5294 builder: (context) { 5317 builder: (context) {
5295 Widget widget = Container( 5318 Widget widget = Container(
5296 width: double.infinity, 5319 width: double.infinity,
5297 - height: ScreenUtil().setHeight(233), 5320 + // height: ScreenUtil().setHeight(233),
5298 color: MyColours.color_f1f1f1, 5321 color: MyColours.color_f1f1f1,
5299 child: Row( 5322 child: Row(
5300 children: <Widget>[ 5323 children: <Widget>[
@@ -5837,6 +5860,7 @@ class DialogUtil { @@ -5837,6 +5860,7 @@ class DialogUtil {
5837 color: MyColours.color_ffffff, 5860 color: MyColours.color_ffffff,
5838 child: Stack(children: [ 5861 child: Stack(children: [
5839 Column( 5862 Column(
  5863 + mainAxisSize: MainAxisSize.min,
5840 children: [ 5864 children: [
5841 VEmptyView(24), 5865 VEmptyView(24),
5842 Text( 5866 Text(
@@ -6060,7 +6084,7 @@ class DialogUtil { @@ -6060,7 +6084,7 @@ class DialogUtil {
6060 builder: (BuildContext context) { 6084 builder: (BuildContext context) {
6061 return Center( 6085 return Center(
6062 child: Container( 6086 child: Container(
6063 - height: ScreenUtil().setWidth(height), 6087 + // height: ScreenUtil().setWidth(height),
6064 width: ScreenUtil().setWidth(280 * 2), 6088 width: ScreenUtil().setWidth(280 * 2),
6065 decoration: BoxDecoration( 6089 decoration: BoxDecoration(
6066 borderRadius: BorderRadius.circular(ScreenUtil().setWidth(10))), 6090 borderRadius: BorderRadius.circular(ScreenUtil().setWidth(10))),
@@ -6069,6 +6093,7 @@ class DialogUtil { @@ -6069,6 +6093,7 @@ class DialogUtil {
6069 borderRadius: BorderRadius.all( 6093 borderRadius: BorderRadius.all(
6070 Radius.circular(ScreenUtil().setWidth(10)))), //设置圆角 6094 Radius.circular(ScreenUtil().setWidth(10)))), //设置圆角
6071 child: Column( 6095 child: Column(
  6096 + mainAxisSize: MainAxisSize.min,
6072 children: [ 6097 children: [
6073 VEmptyView(20), 6098 VEmptyView(20),
6074 InkWell( 6099 InkWell(
@@ -6271,7 +6296,7 @@ class DialogUtil { @@ -6271,7 +6296,7 @@ class DialogUtil {
6271 child: Container( 6296 child: Container(
6272 padding: 6297 padding:
6273 EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(72)), 6298 EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(72)),
6274 - height: ScreenUtil().setWidth(height), 6299 + // height: ScreenUtil().setWidth(height),
6275 decoration: BoxDecoration( 6300 decoration: BoxDecoration(
6276 borderRadius: BorderRadius.circular(ScreenUtil().setWidth(30))), 6301 borderRadius: BorderRadius.circular(ScreenUtil().setWidth(30))),
6277 child: Card( 6302 child: Card(
@@ -6279,6 +6304,7 @@ class DialogUtil { @@ -6279,6 +6304,7 @@ class DialogUtil {
6279 borderRadius: BorderRadius.all( 6304 borderRadius: BorderRadius.all(
6280 Radius.circular(ScreenUtil().setWidth(30)))), //设置圆角 6305 Radius.circular(ScreenUtil().setWidth(30)))), //设置圆角
6281 child: Column( 6306 child: Column(
  6307 + mainAxisSize: MainAxisSize.min,
6282 children: [ 6308 children: [
6283 VEmptyView(40), 6309 VEmptyView(40),
6284 Container( 6310 Container(
@@ -6376,6 +6402,7 @@ class DialogUtil { @@ -6376,6 +6402,7 @@ class DialogUtil {
6376 Radius.circular(ScreenUtil().setWidth(10)))), //设置圆角 6402 Radius.circular(ScreenUtil().setWidth(10)))), //设置圆角
6377 child: Container( 6403 child: Container(
6378 child: Column( 6404 child: Column(
  6405 + mainAxisSize: MainAxisSize.min,
6379 children: [ 6406 children: [
6380 VEmptyView(64), 6407 VEmptyView(64),
6381 Container( 6408 Container(
@@ -6525,6 +6552,7 @@ class DialogUtil { @@ -6525,6 +6552,7 @@ class DialogUtil {
6525 child: Container( 6552 child: Container(
6526 // padding: EdgeInsets.symmetric(horizontal: w(20)), 6553 // padding: EdgeInsets.symmetric(horizontal: w(20)),
6527 child: Column( 6554 child: Column(
  6555 + mainAxisSize: MainAxisSize.min,
6528 children: [ 6556 children: [
6529 VEmptyView(64), 6557 VEmptyView(64),
6530 Container( 6558 Container(
@@ -6654,7 +6682,7 @@ class DialogUtil { @@ -6654,7 +6682,7 @@ class DialogUtil {
6654 builder: (BuildContext context) { 6682 builder: (BuildContext context) {
6655 return Center( 6683 return Center(
6656 child: Container( 6684 child: Container(
6657 - height: ScreenUtil().setWidth(height), 6685 + // height: ScreenUtil().setWidth(height),
6658 width: ScreenUtil().setWidth(280 * 2), 6686 width: ScreenUtil().setWidth(280 * 2),
6659 decoration: BoxDecoration( 6687 decoration: BoxDecoration(
6660 borderRadius: BorderRadius.circular(ScreenUtil().setWidth(20))), 6688 borderRadius: BorderRadius.circular(ScreenUtil().setWidth(20))),
@@ -6663,6 +6691,7 @@ class DialogUtil { @@ -6663,6 +6691,7 @@ class DialogUtil {
6663 borderRadius: BorderRadius.all( 6691 borderRadius: BorderRadius.all(
6664 Radius.circular(ScreenUtil().setWidth(20)))), //设置圆角 6692 Radius.circular(ScreenUtil().setWidth(20)))), //设置圆角
6665 child: Column( 6693 child: Column(
  6694 + mainAxisSize: MainAxisSize.min,
6666 children: [ 6695 children: [
6667 VEmptyView(40), 6696 VEmptyView(40),
6668 Container( 6697 Container(
@@ -6994,7 +7023,7 @@ class DialogUtil { @@ -6994,7 +7023,7 @@ class DialogUtil {
6994 child: Container( 7023 child: Container(
6995 padding: EdgeInsets.symmetric( 7024 padding: EdgeInsets.symmetric(
6996 horizontal: ScreenUtil().setWidth(72)), 7025 horizontal: ScreenUtil().setWidth(72)),
6997 - height: ScreenUtil().setWidth(height), 7026 + // height: ScreenUtil().setWidth(height),
6998 decoration: BoxDecoration( 7027 decoration: BoxDecoration(
6999 borderRadius: 7028 borderRadius:
7000 BorderRadius.circular(ScreenUtil().setWidth(30))), 7029 BorderRadius.circular(ScreenUtil().setWidth(30))),
@@ -7007,6 +7036,7 @@ class DialogUtil { @@ -7007,6 +7036,7 @@ class DialogUtil {
7007 padding: EdgeInsets.symmetric( 7036 padding: EdgeInsets.symmetric(
7008 horizontal: ScreenUtil().setWidth(40)), 7037 horizontal: ScreenUtil().setWidth(40)),
7009 child: Column( 7038 child: Column(
  7039 + mainAxisSize: MainAxisSize.min,
7010 children: [ 7040 children: [
7011 // VEmptyView(60), 7041 // VEmptyView(60),
7012 Stack(children: [ 7042 Stack(children: [
@@ -7686,7 +7716,7 @@ class DialogUtil { @@ -7686,7 +7716,7 @@ class DialogUtil {
7686 child: Container( 7716 child: Container(
7687 padding: 7717 padding:
7688 EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(72)), 7718 EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(72)),
7689 - height: ScreenUtil().setWidth(height), 7719 + // height: ScreenUtil().setWidth(height),
7690 decoration: BoxDecoration( 7720 decoration: BoxDecoration(
7691 borderRadius: BorderRadius.circular(ScreenUtil().setWidth(30))), 7721 borderRadius: BorderRadius.circular(ScreenUtil().setWidth(30))),
7692 child: Card( 7722 child: Card(
@@ -7694,6 +7724,7 @@ class DialogUtil { @@ -7694,6 +7724,7 @@ class DialogUtil {
7694 borderRadius: BorderRadius.all( 7724 borderRadius: BorderRadius.all(
7695 Radius.circular(ScreenUtil().setWidth(30)))), //设置圆角 7725 Radius.circular(ScreenUtil().setWidth(30)))), //设置圆角
7696 child: Column( 7726 child: Column(
  7727 + mainAxisSize: MainAxisSize.min,
7697 children: [ 7728 children: [
7698 VEmptyView(60), 7729 VEmptyView(60),
7699 Container( 7730 Container(