xt / Flutter-ReserveApp · Commits

Go to a project

Commit cb6f643a2a7bbe271a6e7142feb4f2bf6164466e

Authored by wdn127929
1 parent cd210db2
build: skipped

修复之前UI bug

Inline Side-by-side
Showing 3 changed files with 26 additions and 27 deletions
... ... @@ -60,8 +60,6 @@ class TableManagerPageState extends State<TableManagerPage> {
final ItemPositionsListener itemPositionsListener =
ItemPositionsListener.create();
@override
void initState() {
// TODO: implement initState
... ... @@ -74,7 +72,6 @@ class TableManagerPageState extends State<TableManagerPage> {
// personNumList.add('30以上');
WidgetsBinding.instance.addPostFrameCallback((_) {
tableManagerModel.initTime(context);
EventBus().on("refresh_tablemanager", (arg) {
... ... @@ -355,12 +352,13 @@ class TableManagerPageState extends State<TableManagerPage> {
return Expanded(
flex: 1,
child: Container(
// constraints: BoxConstraints(maxHeight: ScreenUtil().setWidth(300)),
// constraints: BoxConstraints(minHeight: ScreenUtil().setWidth(600)),
// height: ScreenUtil().setWidth(400),
width: double.infinity,
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(40),
vertical: ScreenUtil().setWidth(30)),
padding: EdgeInsets.only(
left: ScreenUtil().setWidth(40),
right: ScreenUtil().setWidth(40),
top: ScreenUtil().setWidth(30)),
decoration: BoxDecoration(
color: MyColours.color_ffffff,
boxShadow: [
... ... @@ -384,14 +382,14 @@ class TableManagerPageState extends State<TableManagerPage> {
color: MyColours.color_333333,
fontSize: ScreenUtil().setSp(28)),
),
VEmptyView(20),
VEmptyView(15),
Text(
'已选桌位：',
style: TextStyle(
color: MyColours.color_333333,
fontSize: ScreenUtil().setSp(26)),
),
VEmptyView(20),
VEmptyView(15),
Expanded(
child: Container(
width: ScreenUtil.screenWidthDp -
... ... @@ -429,6 +427,9 @@ class TableManagerPageState extends State<TableManagerPage> {
Container(
// width: ScreenUtil().setWidth(100),
// color: Colors.red,
constraints: BoxConstraints(
minHeight: ScreenUtil().setWidth(500),
),
child: Column(
children: [
RoundButton(
... ... @@ -553,9 +554,10 @@ class TableManagerPageState extends State<TableManagerPage> {
tableManagerModel.notifyListeners();
},
child: Padding(
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(40),
vertical: ScreenUtil().setWidth(30)),
padding: EdgeInsets.only(
left: ScreenUtil().setWidth(30),
right: ScreenUtil().setWidth(30),
top: ScreenUtil().setWidth(15)),
child: Text(
'取消重置',
style: TextStyle(
... ... @@ -699,7 +701,12 @@ class TableManagerPageState extends State<TableManagerPage> {
// ),
HEmptyView(20),
Container(
width: ScreenUtil().setWidth(206),
width: btnNum == 3 &&
(tableManagerModel.currTimeIndex == 3 ||
tableManagerModel.currTimeIndex == 1)
? ScreenUtil().setWidth(206) +
ScreenUtil().setWidth(4)
: ScreenUtil().setWidth(206),
height: ScreenUtil().setWidth(74),
decoration: BoxDecoration(
color: Color.fromRGBO(232, 232, 232, 1),
... ... @@ -727,7 +734,7 @@ class TableManagerPageState extends State<TableManagerPage> {
"00:00-00:00"
? true
: false,
width: ScreenUtil().setWidth(200) / btnNum,
width: ScreenUtil().setWidth(206) / btnNum,
onPress: () {
if (tableManagerModel.currTimeIndex == 1)
return;
... ... @@ -753,7 +760,7 @@ class TableManagerPageState extends State<TableManagerPage> {
? 1
: 0,
fontSize: 28,
width: ScreenUtil().setWidth(200) / btnNum,
width: ScreenUtil().setWidth(206) / btnNum,
left:
tableManagerModel.morning == "00:00-00:00"
? true
... ... @@ -792,7 +799,7 @@ class TableManagerPageState extends State<TableManagerPage> {
? 1
: 0,
fontSize: 28,
width: ScreenUtil().setWidth(200) / btnNum,
width: ScreenUtil().setWidth(206) / btnNum,
onPress: () {
if (tableManagerModel.currTimeIndex == 3)
return;
... ... @@ -830,7 +837,7 @@ class TableManagerPageState extends State<TableManagerPage> {
children: [
Container(
color: MyColours.color_ffffff,
height: ScreenUtil().setWidth(90),
height: ScreenUtil().setWidth(92),
margin: EdgeInsets.only(
bottom: ScreenUtil().setWidth(30)),
child: Row(
... ... @@ -1046,7 +1053,7 @@ class TableManagerPageState extends State<TableManagerPage> {
'仅看\n空座',
style: TextStyle(
fontSize:
ScreenUtil().setSp(30),
ScreenUtil().setSp(28),
color: MyColours.color_333333,
),
),
... ...
... ... @@ -569,13 +569,6 @@ packages:
url: "https://pub.flutter-io.cn"
source: hosted
version: "3.5.1"
keyboard_visibility:
dependency: "direct main"
description:
name: keyboard_visibility
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.5.6"
latlng:
dependency: transitive
description:
... ...
... ... @@ -91,8 +91,7 @@ dependencies:
package_info: ^0.4.0+18
# 获取设备信息
device_info: ^0.4.2+4
#监听键盘
keyboard_visibility: ^0.5.6
# 获取通讯录
contacts_service: ^0.4.6
... ...