xt / Flutter-ReserveApp · Commits

Go to a project

Commit 6762745081c6fe23bac1d9d2e51719cfcfa7121b

Authored by wdn127929
1 parent 3fc213f9
build: skipped

桌位页面新增区域和桌位时的bug

Inline Side-by-side
Showing 4 changed files with 53 additions and 33 deletions
... ... @@ -311,6 +311,7 @@ class SelectTableFPageState extends State<SelectTableFPage> {
_chooseTableModel.areaTableMapShow = areaTableMap;
_chooseTableModel.tablesShow = _chooseTableModel.tablesAll;
}
print(currentArea);
if (widget.tid == '') {
if (!needRetain) {
// currentArea = areaTableMap.keys.first;
... ... @@ -696,6 +697,7 @@ class SelectTableFPageState extends State<SelectTableFPage> {
isSelected = false;
_selectNumber = index - 1;
currentArea = areas[index - 1].name;
_chooseTableModel.currentTables =
_chooseTableModel
.areaTableMapShow[currentArea];
... ...
... ... @@ -55,7 +55,6 @@ class TableManagerPageState extends State<TableManagerPage> {
List<String> personNumList = [];
bool isSelected = true; //全部按钮
int _selectNumber;
ScrollController _scrollCrl = ScrollController();
final ItemPositionsListener itemPositionsListener =
ItemPositionsListener.create();
... ... @@ -76,7 +75,8 @@ class TableManagerPageState extends State<TableManagerPage> {
tableManagerModel.initTime(context);
EventBus().on("refresh_tablemanager", (arg) {
//订座-完成预订 刷新管理桌位
tableManagerModel.getReserveList(context);
tableManagerModel.getReserveList(context,
needLoading: false, needKeep: true);
print(tableManagerModel);
});
EventBus().on("refresh_tablePhoto", (arg) {
... ... @@ -145,7 +145,7 @@ class TableManagerPageState extends State<TableManagerPage> {
itemCount: tableManagerModel.currentArea == '全部'
? tableManagerModel.tablesShow.length
: tableManagerModel
.areaTableMapShow[tableManagerModel.areas[i].name].length +
.areaTableMapShow[tableManagerModel.currentArea].length +
1,
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 4,
... ... @@ -214,7 +214,7 @@ class TableManagerPageState extends State<TableManagerPage> {
// .getTableList(context);
// await tableManagerModel
// .initData();
tableManagerModel.refreshTable(context);
await tableManagerModel.refreshTable(context);
}
});
},
... ... @@ -434,8 +434,8 @@ class TableManagerPageState extends State<TableManagerPage> {
children: [
RoundButton(
onPressed: () async {
SunReserveInfoModel _model =
await tableManagerModel.setReserveInfo(context);
SunReserveInfoModel _model = await tableManagerModel
.setReserveInfo(context, needKeep: true);
if (_model != null &&
ObjectUtil.isNotEmpty(_model.row) &&
ObjectUtil.isNotEmpty(_model.row.id)) {
... ... @@ -880,11 +880,15 @@ class TableManagerPageState extends State<TableManagerPage> {
print(success);
if (success) {
Utils.showToast('添加成功！');
tableManagerModel.currentArea =
value;
await tableManagerModel
.getTableList(context,
needLoading: false);
tableManagerModel.initData();
.refreshTable(context);
// await tableManagerModel
// .getTableList(context,
// needLoading: false);
// tableManagerModel.initData();
// setState(() {
// updateMenu();
... ... @@ -945,12 +949,9 @@ class TableManagerPageState extends State<TableManagerPage> {
isSelected = true;
tableManagerModel.currentArea =
'全部';
tableManagerModel
.currentTables =
tableManagerModel
.areaTableMapShow[
tableManagerModel
.currentArea];
// tableManagerModel.tablesShow =
// tableManagerModel
// .tabl;
});
},
child: Container(
... ... @@ -1001,15 +1002,16 @@ class TableManagerPageState extends State<TableManagerPage> {
(area) {
setState(() {
isSelected = false;
_selectNumber = index - 1;
tableManagerModel.selectNumber =
index - 1;
tableManagerModel.currentArea =
tableManagerModel
.areas[index - 1].name;
tableManagerModel.currentTables =
tableManagerModel
.areaTableMapShow[
tableManagerModel
.currentArea];
// tableManagerModel.currentTables =
// tableManagerModel
// .areaTableMapShow[
// tableManagerModel
// .currentArea];
// _anmationMenu();
});
});
... ... @@ -1078,7 +1080,8 @@ class TableManagerPageState extends State<TableManagerPage> {
constraints: BoxConstraints(
minHeight: ScreenUtil().setWidth(100)),
color: Color.fromRGBO(249, 249, 249, 1),
child: item(_selectNumber))),
child:
item(tableManagerModel.selectNumber))),
tableManagerModel.selectTables.length > 0
? _selectTableWidget()
: SizedBox()
... ...
... ... @@ -60,6 +60,7 @@ class TableManagerModel with ChangeNotifier {
String selectDateStr = '';
DateTime dateTimeSelect;
int selectNumber;
//初始化时间
initTime(BuildContext context) async {
... ... @@ -244,13 +245,14 @@ class TableManagerModel with ChangeNotifier {
}
///录入更改内部预订
Future<SunReserveInfoModel> setReserveInfo(BuildContext context) async {
Future<SunReserveInfoModel> setReserveInfo(BuildContext context,
{needKeep = false}) async {
if (selectTables.length == 0) {
Utils.showToast('请选择桌位');
return null;
}
bool sucess =
await getReserveList(context, showMsg: true, needLoading: false);
bool sucess = await getReserveList(context,
showMsg: true, needLoading: false, needKeep: true, showloading: true);
if (sucess) {
UserModel userModel = Provider.of<UserModel>(context, listen: false);
//
... ... @@ -440,7 +442,8 @@ class TableManagerModel with ChangeNotifier {
getReserveList(BuildContext context,
{bool needLoading = true,
bool needKeep = false,
bool showMsg = false}) async {
bool showMsg = false,
bool showloading = false}) async {
tableMap.clear();
NoteBookModel model = new NoteBookModel();
Map<String, String> params = {
... ... @@ -457,7 +460,8 @@ class TableManagerModel with ChangeNotifier {
notifyListeners();
}
List<Notebook> noteBooks = await newGetReserveList(context, params);
List<Notebook> noteBooks =
await newGetReserveList(context, params, showLoading: showloading);
List<t.Table> tempSelectTables = [];
tempSelectTables.addAll(selectTables);
String msg = '';
... ... @@ -504,7 +508,8 @@ class TableManagerModel with ChangeNotifier {
//获取已预订订单
Future<List<Notebook>> newGetReserveList(
BuildContext context, Map<String, String> params) async {
BuildContext context, Map<String, String> params,
{showLoading = false}) async {
List<Notebook> notebooks = [];
BaseResp<List> baseResp = await DioUtil()
.request<List>(context, Method.get, HttpUrl.get_reserve_list,
... ... @@ -661,15 +666,25 @@ class TableManagerModel with ChangeNotifier {
}
}
if (areaTableMap.isNotEmpty) {
if (areaTableMapShow.isNotEmpty) {
if (!needKeep) {
// currentArea = areaTableMap.keys.first;
// currentTables = areaTableMap[currentArea];
currentArea = '全部';
currentTables = tablesAll;
// currentTables = tablesAll;
pageState = PageState.Success;
} else {
if (currentArea != null && currentArea != '') {
// tablesShow = areaTableMapShow[currentArea];
List keys = areaTableMapShow.keys.toList();
selectNumber = keys.indexOf(currentArea) + 1;
}
}
} else {
if (currentArea != null && currentArea != '') {
tablesShow = areaTableMapShow[currentArea];
selectNumber = areaTableMapShow.length;
}
// pageState = PageState.Empty;
pageState = PageState.Success;
}
... ... @@ -848,7 +863,7 @@ class TableManagerModel with ChangeNotifier {
refreshTable(context) async {
List temp = await getTableList(context, needLoading: false);
if (temp.length > 0) {
getReserveList(context, needLoading: false);
getReserveList(context, needLoading: false, needKeep: true);
} else {
// pageState = PageState.Empty;
pageState = PageState.Success;
... ...
... ... @@ -289,7 +289,7 @@ class DialogUtil {
child: Container(
padding:
EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(50)),
height: ScreenUtil().setWidth(207 * 2),
height: ScreenUtil().setWidth(207 * 2 + 10),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(ScreenUtil().setWidth(10))),
child: Card(
... ... @@ -529,7 +529,7 @@ class DialogUtil {
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(50)),
height: ScreenUtil().setWidth(326 * 2) +
ScreenUtil().setWidth(45 * 2),
ScreenUtil().setWidth(50 * 2),
decoration: BoxDecoration(
borderRadius:
BorderRadius.circular(ScreenUtil().setWidth(10))),
... ...