xt / Flutter-ReserveApp · Commits

Go to a project

Commit a7543fd7fdbd6453f25dd00a46aee3678eabc284

Authored by wdn127929
1 parent f28cfebd
build: skipped

桌位页面桌子选中状态bug修复

Inline Side-by-side
Showing 2 changed files with 60 additions and 31 deletions
... ... @@ -81,8 +81,8 @@ android {
ndk {
//选择要添加的对应 cpu 类型的 .so 库。
// abiFilters 'arm64-v8a', 'x86_64', 'mips64' //魅族64位，不支持32位
abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a', 'x86_64','x86', 'mips', 'mips64'
abiFilters 'arm64-v8a', 'x86_64', 'mips64' //魅族64位，不支持32位
// abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a', 'x86_64','x86', 'mips', 'mips64'
}
lintOptions {
... ...
... ... @@ -878,22 +878,35 @@ class TableManagerPageState extends State<TableManagerPage> {
context, table.notebookId, data.reserveList.uid);
}
} else {
setState(() {
if (table.selected) {
tableManagerModel.selectTablesOrReserve.add(table);
} else {
tableManagerModel.selectTablesOrReserve
.removeWhere((t) => t.id == table.id);
}
if (tableManagerModel.selectTablesOrReserve.length == 0) {
// wechatNotification = true;
_clearData();
}
// if (tableManagerModel.selectTables.length > 1) {
// _scrollCrl.position
// .didUpdateScrollPositionBy(0); //这里触发更新滚动条
// }
});
if (table.selected) {
tableManagerModel.selectTablesOrReserve.add(table);
tableManagerModel.tablesOrReserveDataShow.forEach((element) {
element.tableList.forEach((element1) {
if (element1.id == table.id) {
element1.selected = true;
}
});
});
} else {
tableManagerModel.selectTablesOrReserve
.removeWhere((t) => t.id == table.id);
tableManagerModel.tablesOrReserveDataShow.forEach((element) {
element.tableList.forEach((element1) {
if (element1.id == table.id) {
element1.selected = false;
}
});
});
}
if (tableManagerModel.selectTablesOrReserve.length == 0) {
// wechatNotification = true;
_clearData();
}
// if (tableManagerModel.selectTables.length > 1) {
// _scrollCrl.position
// .didUpdateScrollPositionBy(0); //这里触发更新滚动条
// }
setState(() {});
}
// DialogUtil.showTableManagerDialog(context, table).then((value) {
// if (value != null) {
... ... @@ -2616,10 +2629,10 @@ class TableManagerPageState extends State<TableManagerPage> {
element.tableList.forEach((elementn) {
if (elementn.id == table.id) {
elementn.selected = false;
setState(() {});
}
});
});
setState(() {});
// for (t.Table item
// in tableManagerModel.tablesShow) {
... ... @@ -2674,7 +2687,7 @@ class TableManagerPageState extends State<TableManagerPage> {
radius: ScreenUtil().setWidth(8),
isBold: false,
onPressed: () async {
if(currTimeIndex == null){
if (currTimeIndex == null) {
Utils.showToast('请选择餐段或检查您的网络！');
return;
}
... ... @@ -2728,10 +2741,10 @@ class TableManagerPageState extends State<TableManagerPage> {
radius: ScreenUtil().setWidth(8),
isBold: false,
onPressed: () async {
if(currTimeIndex == null){
Utils.showToast('请选择餐段或检查您的网络！');
return;
}
if (currTimeIndex == null) {
Utils.showToast('请选择餐段或检查您的网络！');
return;
}
Loading.showLoading(
context,
);
... ... @@ -3526,7 +3539,7 @@ class TableManagerPageState extends State<TableManagerPage> {
}
*/
Guest guest = Guest(null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null,null);
null, null, null, null, null, null, null, null, null, null);
// if (widget.guest == null) {
guest.phone =
... ... @@ -4251,7 +4264,7 @@ class TableManagerPageState extends State<TableManagerPage> {
},
)),
InkWell(
onTap: () {
onTap: () async {
setState(() {
swichState = !swichState;
});
... ... @@ -4289,11 +4302,27 @@ class TableManagerPageState extends State<TableManagerPage> {
});
setState(() {});
} else {
tableManagerModel.getTableListOrReserve(
context,
currTimeIndex,
dateTime,
selectNumber);
await tableManagerModel
.getTableListOrReserve(
context,
currTimeIndex,
dateTime,
selectNumber);
tableManagerModel.selectTablesOrReserve
.forEach((element1) {
tableManagerModel
.tablesOrReserveDataShow
.forEach((element) {
element.tableList
.forEach((elementn) {
if (elementn.id == element1.id) {
elementn.selected = true;
}
});
});
});
setState(() {});
// model.tablesOrReserveDataShow = [];
// model.tablesOrReserveData
// .forEach((element) {
... ...