xt / Flutter-ReserveApp · Commits

Go to a project

Commit f39cb4d3e82cc5b10bee390c6425f117fa66b22c

Authored by wdn127929
1 parent e44da6f9
build: skipped

选择桌位更多页面，没有选了几个桌子的提示，有时误触多选了一个桌子都不知道

Inline Side-by-side
Showing 3 changed files with 25 additions and 3 deletions
... ... @@ -66,7 +66,7 @@ Future<void> main() async {
LogUtil.init(isDebug: true, tag: 'ONE_KEY');
Provider.debugCheckInvalidValueType = null;
await initializeDateFormatting();
_requestPermissions();
// _requestPermissions();
Utils.changeStatusColor();
SystemChrome.setPreferredOrientations(
[DeviceOrientation.portraitUp, DeviceOrientation.portraitDown])
... ...
... ... @@ -389,7 +389,7 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
// if (temp['tid'] != null) {
// setReserveStatus("5", tid: temp['tid']);
// }
if (temp == null || temp['object'].length == 0) {
if (temp == null) {
if (_notebookDetailChangeModel.tableList.length == 0) {
_notebookDetailChangeModel.isRecommend = true;
_notebookDetailChangeModel.tableList = [];
... ... @@ -399,6 +399,14 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
}
setState(() {});
}
} else if (temp['object'].length == 0) {
_notebookDetailChangeModel.isRecommend = true;
_notebookDetailChangeModel.tableList = [];
for (t.TableList item
in _notebookDetailChangeModel.recommendList) {
item.selected = false;
}
setState(() {});
} else {
_notebookDetailChangeModel.isRecommend = false;
_notebookDetailChangeModel.tableList = temp['object'];
... ...
... ... @@ -59,6 +59,8 @@ class SelectTablePageState extends State<SelectTablePage> {
String currentArea; //当前选中区域
List<String> personNumList = [];
int selectNum = 0;
@override
void initState() {
// TODO: implement initState
... ... @@ -85,6 +87,7 @@ class SelectTablePageState extends State<SelectTablePage> {
for (var table in widget.tableList) {
if (item.id == table.id) {
item.selected = true;
selectNum++;
// if (!tableList.contains(item)) {
// tableList.add(item);
// }
... ... @@ -413,9 +416,11 @@ class SelectTablePageState extends State<SelectTablePage> {
for (t.Table item
in areaTableMap[item]) {
item.selected = false;
selectNum = 0;
if (table.id == item.id) {
item.selected = true;
selectTables = [];
selectNum++;
selectTables.add(table);
}
}
... ... @@ -424,14 +429,21 @@ class SelectTablePageState extends State<SelectTablePage> {
} else {
if ((table as t.Table).selected) {
selectTables.add(table);
selectNum++;
widget.tableList
.add(tableToTableList(table));
} else {
widget.tableList.removeWhere(
(t) => t.id == table.id);
selectNum--;
selectTables.removeWhere(
(t) => t.id == table.id);
}
setState(() {});
}
},
canSelected: true,
... ... @@ -454,7 +466,9 @@ class SelectTablePageState extends State<SelectTablePage> {
alignment: Alignment.center,
color: MyColours.color_ffffff,
child: CommonButton(
content: "确定",
content: widget.fromPage == 'tablePhoto'
? '确定'
: "已选${selectNum}个 确定",
width: 500,
height: 84,
fontSize: 34,
... ...