xt / Flutter-ReserveApp · Commits

Go to a project

Commit c0969fa5df1af32ff8d48a14bb9532979ff3a6d3

Authored by “gaiyaguang”
1 parent 31467915

1和5预订状态都可选择

Inline Side-by-side
Showing 2 changed files with 78 additions and 78 deletions
... ... @@ -443,87 +443,86 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
color: MyColours.color_f5f5f5,
child: Column(
children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.end,
children: [
Text(
'可订桌位',
style: TextStyle(
color: MyColours.color_353535,
fontSize: ScreenUtil().setSp(30)),
),
InkWell(
onTap: () async {
//当前选中 月 日string
String mdStr = '';
//今天 明天 其他天
for (var item in _notebookDetailChangeModel.dateList) {
if (item['select'] == true) {
mdStr = item['title'];
}
InkWell(
onTap: () async {
//当前选中 月 日string
String mdStr = '';
//今天 明天 其他天
for (var item in _notebookDetailChangeModel.dateList) {
if (item['select'] == true) {
mdStr = item['title'];
}
String timeNowYear =
DateUtil.formatDate(DateTime.now(), format: 'yyyy');
String ymyStr = timeNowYear + '-' + mdStr; //年月日
String timeStr = ymyStr + ' ' + "00:00:00";
int ddate = DateUtil.getDateMsByTimeStr(timeStr); //筛选日期时间戳
String ddateSolt = '';
for (var item in _notebookDetailChangeModel.sunDateList) {
if (item['isSelect']) {
ddateSolt = '${item['ddateSolt']}';
}
}
String timeNowYear =
DateUtil.formatDate(DateTime.now(), format: 'yyyy');
String ymyStr = timeNowYear + '-' + mdStr; //年月日
String timeStr = ymyStr + ' ' + "00:00:00";
int ddate = DateUtil.getDateMsByTimeStr(timeStr); //筛选日期时间戳
String ddateSolt = '';
for (var item in _notebookDetailChangeModel.sunDateList) {
if (item['isSelect']) {
ddateSolt = '${item['ddateSolt']}';
}
}
// String tempDdate = ymyStr + ' ' + ddateStr + ':00';
// int ddate = DateUtil.getDateMsByTimeStr(timeStr);
Map temp = await NavigatorUtil.goSelectTablePage(
context, widget.rid, ddate, ddateSolt,
canChoose: true,
object: {'object': _notebookDetailChangeModel.tableList});
// if (temp['tid'] != null) {
// setReserveStatus("5", tid: temp['tid']);
// String tempDdate = ymyStr + ' ' + ddateStr + ':00';
// int ddate = DateUtil.getDateMsByTimeStr(timeStr);
Map temp = await NavigatorUtil.goSelectTablePage(
context, widget.rid, ddate, ddateSolt,
canChoose: true,
object: {'object': _notebookDetailChangeModel.tableList});
// if (temp['tid'] != null) {
// setReserveStatus("5", tid: temp['tid']);
// }
if (temp == null || temp['object'].length == 0) {
isRecommend = true;
_notebookDetailChangeModel.tableList = [];
for (t.TableList item
in _notebookDetailChangeModel.recommendList) {
item.selected = false;
}
setState(() {});
} else {
isRecommend = false;
_notebookDetailChangeModel.tableList = temp['object'];
// if (_notebookDetailChangeModel.tableList.length == 0) {
// isRecommend = true;
// }
if (temp == null || temp['object'].length == 0) {
isRecommend = true;
_notebookDetailChangeModel.tableList = [];
for (t.TableList item
in _notebookDetailChangeModel.recommendList) {
item.selected = false;
}
setState(() {});
} else {
isRecommend = false;
_notebookDetailChangeModel.tableList = temp['object'];
// if (_notebookDetailChangeModel.tableList.length == 0) {
// isRecommend = true;
// }
for (t.TableList item
in _notebookDetailChangeModel.tableList) {
item.selected = true;
}
setState(() {});
for (t.TableList item
in _notebookDetailChangeModel.tableList) {
item.selected = true;
}
setState(() {});
}
// _notebookDetailChangeModel.notifyListeners();
},
child: Row(
children: [
Text('更多',
style: TextStyle(
color: MyColours.color_353535,
fontSize: ScreenUtil().setSp(26))),
HEmptyView(20),
Image.asset(
'assets/arr_right_gray.png',
width: ScreenUtil().setWidth(12),
height: ScreenUtil().setWidth(22),
)
],
),
)
],
),
// _notebookDetailChangeModel.notifyListeners();
},
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.end,
children: [
Text(
'可订桌位',
style: TextStyle(
color: MyColours.color_353535,
fontSize: ScreenUtil().setSp(30)),
),
Row(
children: [
Text('更多',
style: TextStyle(
color: MyColours.color_353535,
fontSize: ScreenUtil().setSp(26))),
HEmptyView(20),
Image.asset(
'assets/arr_right_gray.png',
width: ScreenUtil().setWidth(12),
height: ScreenUtil().setWidth(22),
)
],
),
],
)),
VEmptyView(32),
Align(
alignment: Alignment.centerRight,
... ... @@ -940,7 +939,6 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
ddate_solt = '晚餐';
}
}
List<dynamic> tableinfo =
convert.jsonDecode(_model.row.tableinfo);
print(tableinfo);
... ... @@ -1026,7 +1024,7 @@ class _ButtonState extends State<CustomButton> {
? Container(
alignment: Alignment.center,
// color: Colors.red,
width: ScreenUtil().setWidth(110),
width: ScreenUtil().setWidth(114),
height: ScreenUtil().setWidth(50),
// padding: EdgeInsets.zero,
child: TextField(
... ...
... ... @@ -46,7 +46,9 @@ class TableItemState extends State<TableItem> {
});
widget.onSelected(table);
} else {
if (table.sign == '5') {
if (table.sign == '5' || table.sign == '1') {
// 1一般是商户端
// 5是用户端
//已预订状态 不是自己的不可以选择，是自己的可以选择
//当前桌子的预订id
String idNow = '';
... ...