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 @@
CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 491;
CURRENT_PROJECT_VERSION = 492;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -656,7 +656,7 @@
CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 491;
CURRENT_PROJECT_VERSION = 492;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -692,7 +692,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 491;
CURRENT_PROJECT_VERSION = 492;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ...
... ... @@ -92,6 +92,7 @@ class _EnterStorePhonePageState extends State<EnterStorePhonePage> {
FocusScope.of(context).requestFocus(FocusNode()); //点击空白处隐藏键盘
},
child: Container(
color: MyColours.color_ffffff,
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(70),
vertical: ScreenUtil().setWidth(60)),
... ...
... ... @@ -360,7 +360,7 @@ class _MonthOrderPageState extends State<MonthOrderPage> {
),
HEmptyView(10),
Text(
'到客${customerProvider.monthStaticsData.totalDaoKe}',
'到客${customerProvider.monthStaticsData.totalDaoKe??'0'}',
style: TextStyle(
color: MyColours.color_515151,
fontSize: font(
... ...
... ... @@ -540,8 +540,8 @@ class DialogUtil {
margin:
EdgeInsets.only(bottom: ScreenUtil().setWidth(150)),
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(50)),
height: ScreenUtil().setWidth(238 * 2),
horizontal: ScreenUtil().setWidth(40)),
// height: ScreenUtil().setWidth(238 * 2),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(
ScreenUtil().setWidth(16))),
... ... @@ -550,6 +550,7 @@ class DialogUtil {
borderRadius: BorderRadius.all(Radius.circular(
ScreenUtil().setWidth(16)))), //设置圆角
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
VEmptyView(64),
Container(
... ... @@ -1100,51 +1101,60 @@ class DialogUtil {
barrierDismissible: true,
builder: (BuildContext context) {
return Center(
child: Container(
height: ScreenUtil().setWidth(400),
width: ScreenUtil().setWidth(280 * 2),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(ScreenUtil().setWidth(10))),
child: Card(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.all(
Radius.circular(ScreenUtil().setWidth(10)))), //设置圆角
child: Column(children: [
Expanded(
child: ListView(
child: Container(
// height: ScreenUtil().setWidth(400),
width: ScreenUtil().setWidth(280 * 2),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(ScreenUtil().setWidth(10))),
child: Card(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.all(
Radius.circular(ScreenUtil().setWidth(10)))), //设置圆角
child: Column(mainAxisSize: MainAxisSize.min, children: [
// ListView(
// padding: EdgeInsets.symmetric(
// horizontal: ScreenUtil().setWidth(40),
// vertical: ScreenUtil().setWidth(40)),
// shrinkWrap: true,
// children: [
// Wrap(
// children: tableListChangeWidget(tables, (v) {}),
// spacing: ScreenUtil().setWidth(20),
// runSpacing: ScreenUtil().setWidth(20),
// // alignment: WrapAlignment.start,
// // runAlignment: WrapAlignment.end,
// ),
// ],
// ),
Padding(
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(40),
vertical: ScreenUtil().setWidth(40)),
shrinkWrap: true,
children: [
Wrap(
children: tableListChangeWidget(tables, (v) {}),
spacing: ScreenUtil().setWidth(20),
runSpacing: ScreenUtil().setWidth(20),
// alignment: WrapAlignment.start,
// runAlignment: WrapAlignment.end,
),
],
)),
MyDivider(double.infinity, ScreenUtil().setWidth(2)),
InkWell(
onTap: () {
Navigator.pop(context);
},
child: Container(
width: double.infinity,
alignment: Alignment.center,
padding: EdgeInsets.symmetric(
vertical: ScreenUtil().setWidth(40)),
child: Text('确定',
style: TextStyle(
color: Color.fromRGBO(42, 96, 244, 1),
fontSize: ScreenUtil().setSp(30))),
),
)
])),
),
);
child: Wrap(
children: tableListChangeWidget(tables, (v) {}),
spacing: ScreenUtil().setWidth(20),
runSpacing: ScreenUtil().setWidth(20),
// alignment: WrapAlignment.start,
// runAlignment: WrapAlignment.end,
)),
MyDivider(double.infinity, ScreenUtil().setWidth(2)),
InkWell(
onTap: () {
Navigator.pop(context);
},
child: Container(
width: double.infinity,
alignment: Alignment.center,
padding: EdgeInsets.symmetric(
vertical: ScreenUtil().setWidth(40)),
child: Text('确定',
style: TextStyle(
color: Color.fromRGBO(42, 96, 244, 1),
fontSize: ScreenUtil().setSp(30))),
),
)
])),
));
},
);
}
... ... @@ -1157,7 +1167,7 @@ class DialogUtil {
builder: (BuildContext context) {
return Center(
child: Container(
height: ScreenUtil().setWidth(400),
// height: ScreenUtil().setWidth(400),
width: ScreenUtil().setWidth(280 * 2),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(ScreenUtil().setWidth(10))),
... ... @@ -1165,23 +1175,24 @@ class DialogUtil {
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.all(
Radius.circular(ScreenUtil().setWidth(10)))), //设置圆角
child: Column(children: [
Expanded(
child: ListView(
child: Column(mainAxisSize: MainAxisSize.min, children: [
Padding(
// child: ListView(
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(40),
vertical: ScreenUtil().setWidth(40)),
shrinkWrap: true,
children: [
Wrap(
children: tableListWidget(tables, (v) {}),
spacing: ScreenUtil().setWidth(20),
runSpacing: ScreenUtil().setWidth(20),
// alignment: WrapAlignment.start,
// runAlignment: WrapAlignment.end,
),
],
)),
// shrinkWrap: true,
// children: [
child: Wrap(
children: tableListWidget(tables, (v) {}),
spacing: ScreenUtil().setWidth(20),
runSpacing: ScreenUtil().setWidth(20),
// alignment: WrapAlignment.start,
// runAlignment: WrapAlignment.end,
),
// ],
// )
),
MyDivider(double.infinity, ScreenUtil().setWidth(2)),
InkWell(
onTap: () {
... ... @@ -1263,7 +1274,7 @@ class DialogUtil {
child: Container(
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(50)),
height: ScreenUtil().setWidth(218 * 2 + 10),
// height: ScreenUtil().setWidth(218 * 2 + 10),
decoration: BoxDecoration(
borderRadius:
BorderRadius.circular(ScreenUtil().setWidth(16))),
... ... @@ -1273,6 +1284,7 @@ class DialogUtil {
Radius.circular(ScreenUtil().setWidth(10)))), //设置圆角
child: Container(
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
VEmptyView(64),
Container(
... ... @@ -1463,6 +1475,7 @@ class DialogUtil {
Radius.circular(ScreenUtil().setWidth(10)))), //设置圆角
child: Container(
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
VEmptyView(64),
Container(
... ... @@ -1772,7 +1785,7 @@ class DialogUtil {
child: Container(
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(50)),
height: ScreenUtil().setWidth(346 * 2),
// height: ScreenUtil().setWidth(346 * 2),
decoration: BoxDecoration(
borderRadius:
BorderRadius.circular(ScreenUtil().setWidth(16))),
... ... @@ -1783,6 +1796,7 @@ class DialogUtil {
Radius.circular(ScreenUtil().setWidth(10)))), //设置圆角
child: Container(
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
VEmptyView(64),
Container(
... ... @@ -2022,7 +2036,7 @@ class DialogUtil {
child: Container(
padding:
EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(50)),
height: ScreenUtil().setWidth(207 * 2 + 10),
// height: ScreenUtil().setWidth(207 * 2 + 10),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(ScreenUtil().setWidth(10))),
child: Card(
... ... @@ -2034,6 +2048,7 @@ class DialogUtil {
Container(
padding: EdgeInsets.all(ScreenUtil().setWidth(40)),
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
Container(
// height: ScreenUtil().setWidth(48),
... ... @@ -2398,9 +2413,9 @@ class DialogUtil {
EdgeInsets.only(bottom: ScreenUtil().setWidth(150)),
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(50)),
height: mulCreate
? ScreenUtil().setWidth(310 * 2)
: ScreenUtil().setWidth(346 * 2),
// height: mulCreate
// ? ScreenUtil().setWidth(310 * 2)
// : ScreenUtil().setWidth(346 * 2),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(
ScreenUtil().setWidth(10))),
... ... @@ -2409,6 +2424,7 @@ class DialogUtil {
borderRadius: BorderRadius.all(Radius.circular(
ScreenUtil().setWidth(10)))), //设置圆角
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
VEmptyView(40),
Container(
... ... @@ -2874,6 +2890,7 @@ class DialogUtil {
ScreenUtil().setWidth(10)))), //设置圆角
child: Container(
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
VEmptyView(54),
Container(
... ... @@ -3436,7 +3453,7 @@ class DialogUtil {
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(50)),
margin: EdgeInsets.only(bottom: ScreenUtil().setWidth(150)),
height: ScreenUtil().setWidth(226 * 2),
// height: ScreenUtil().setWidth(226 * 2),
decoration: BoxDecoration(
borderRadius:
BorderRadius.circular(ScreenUtil().setWidth(10))),
... ... @@ -3445,6 +3462,7 @@ class DialogUtil {
borderRadius: BorderRadius.all(Radius.circular(
ScreenUtil().setWidth(10)))), //设置圆角
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
VEmptyView(64),
Container(
... ... @@ -3631,7 +3649,7 @@ class DialogUtil {
horizontal: ScreenUtil().setWidth(50)),
margin:
EdgeInsets.only(bottom: ScreenUtil().setWidth(150)),
height: ScreenUtil().setWidth(212 * 2),
// height: ScreenUtil().setWidth(212 * 2),
decoration: BoxDecoration(
borderRadius:
BorderRadius.circular(ScreenUtil().setWidth(10))),
... ... @@ -3641,6 +3659,7 @@ class DialogUtil {
ScreenUtil().setWidth(10)))), //设置圆角
child: Container(
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
VEmptyView(64),
Container(
... ... @@ -3788,7 +3807,7 @@ class DialogUtil {
// margin: EdgeInsets.only(top: ScreenUtil().setWidth(500)),
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(50)),
height: ScreenUtil().setWidth(286 * 2),
// height: ScreenUtil().setWidth(286 * 2),
decoration: BoxDecoration(
borderRadius:
BorderRadius.circular(ScreenUtil().setWidth(10))),
... ... @@ -3797,6 +3816,7 @@ class DialogUtil {
borderRadius: BorderRadius.all(
Radius.circular(ScreenUtil().setWidth(10)))), //设置圆角
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
VEmptyView(54),
Container(
... ... @@ -4153,13 +4173,14 @@ class DialogUtil {
child: Container(
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(50)),
height: ScreenUtil().setWidth(326 * 2) +
ScreenUtil().setWidth(50 * 2),
// height: ScreenUtil().setWidth(326 * 2) +
// ScreenUtil().setWidth(50 * 2),
decoration: BoxDecoration(
borderRadius:
BorderRadius.circular(ScreenUtil().setWidth(10))),
child: Stack(children: [
Column(
mainAxisSize: MainAxisSize.min,
children: [
Card(
shape: RoundedRectangleBorder(
... ... @@ -4477,10 +4498,10 @@ class DialogUtil {
// list.insert(0, '立即在线预订');
Widget dialog = Container(
width: double.infinity,
height: ScreenUtil().setWidth(114) * 2 +
ScreenUtil().setWidth(114) +
ScreenUtil().setWidth(70) -
ScreenUtil().setWidth(104),
// height: ScreenUtil().setWidth(114) * 2 +
// ScreenUtil().setWidth(114) +
// ScreenUtil().setWidth(70) -
// ScreenUtil().setWidth(104),
color: Colors.transparent,
// decoration: BoxDecoration(
// color: MyColours.color_ffffff,
... ... @@ -4488,6 +4509,7 @@ class DialogUtil {
// topLeft: Radius.circular(ScreenUtil().setWidth(40)),
// topRight: Radius.circular(ScreenUtil().setWidth(40)))),
child: Column(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
VEmptyView(60),
// Container(
... ... @@ -4935,6 +4957,7 @@ class DialogUtil {
return Container(
color: MyColours.color_ffffff,
child: Column(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
TableCalendar(
// rowHeight: ScreenUtil().setWidth(100),
... ... @@ -5263,7 +5286,7 @@ class DialogUtil {
});
return SizedBox(
width: double.infinity,
height: ScreenUtil().setWidth(975),
// height: ScreenUtil().setWidth(975),
child: widget,
);
});
... ... @@ -5294,7 +5317,7 @@ class DialogUtil {
builder: (context) {
Widget widget = Container(
width: double.infinity,
height: ScreenUtil().setHeight(233),
// height: ScreenUtil().setHeight(233),
color: MyColours.color_f1f1f1,
child: Row(
children: <Widget>[
... ... @@ -5837,6 +5860,7 @@ class DialogUtil {
color: MyColours.color_ffffff,
child: Stack(children: [
Column(
mainAxisSize: MainAxisSize.min,
children: [
VEmptyView(24),
Text(
... ... @@ -6060,7 +6084,7 @@ class DialogUtil {
builder: (BuildContext context) {
return Center(
child: Container(
height: ScreenUtil().setWidth(height),
// height: ScreenUtil().setWidth(height),
width: ScreenUtil().setWidth(280 * 2),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(ScreenUtil().setWidth(10))),
... ... @@ -6069,6 +6093,7 @@ class DialogUtil {
borderRadius: BorderRadius.all(
Radius.circular(ScreenUtil().setWidth(10)))), //设置圆角
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
VEmptyView(20),
InkWell(
... ... @@ -6271,7 +6296,7 @@ class DialogUtil {
child: Container(
padding:
EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(72)),
height: ScreenUtil().setWidth(height),
// height: ScreenUtil().setWidth(height),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(ScreenUtil().setWidth(30))),
child: Card(
... ... @@ -6279,6 +6304,7 @@ class DialogUtil {
borderRadius: BorderRadius.all(
Radius.circular(ScreenUtil().setWidth(30)))), //设置圆角
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
VEmptyView(40),
Container(
... ... @@ -6376,6 +6402,7 @@ class DialogUtil {
Radius.circular(ScreenUtil().setWidth(10)))), //设置圆角
child: Container(
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
VEmptyView(64),
Container(
... ... @@ -6525,6 +6552,7 @@ class DialogUtil {
child: Container(
// padding: EdgeInsets.symmetric(horizontal: w(20)),
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
VEmptyView(64),
Container(
... ... @@ -6654,7 +6682,7 @@ class DialogUtil {
builder: (BuildContext context) {
return Center(
child: Container(
height: ScreenUtil().setWidth(height),
// height: ScreenUtil().setWidth(height),
width: ScreenUtil().setWidth(280 * 2),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(ScreenUtil().setWidth(20))),
... ... @@ -6663,6 +6691,7 @@ class DialogUtil {
borderRadius: BorderRadius.all(
Radius.circular(ScreenUtil().setWidth(20)))), //设置圆角
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
VEmptyView(40),
Container(
... ... @@ -6994,7 +7023,7 @@ class DialogUtil {
child: Container(
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(72)),
height: ScreenUtil().setWidth(height),
// height: ScreenUtil().setWidth(height),
decoration: BoxDecoration(
borderRadius:
BorderRadius.circular(ScreenUtil().setWidth(30))),
... ... @@ -7007,6 +7036,7 @@ class DialogUtil {
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(40)),
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
// VEmptyView(60),
Stack(children: [
... ... @@ -7686,7 +7716,7 @@ class DialogUtil {
child: Container(
padding:
EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(72)),
height: ScreenUtil().setWidth(height),
// height: ScreenUtil().setWidth(height),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(ScreenUtil().setWidth(30))),
child: Card(
... ... @@ -7694,6 +7724,7 @@ class DialogUtil {
borderRadius: BorderRadius.all(
Radius.circular(ScreenUtil().setWidth(30)))), //设置圆角
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
VEmptyView(60),
Container(
... ...