xt / Flutter-ReserveApp · Commits

Go to a project

Commit e8d37e71a024023e0fad62e69f33b1f0a9b4c160

Authored by gaiyaguang
2 parents e8cc4a9b 34c8d1e0
build: skipped

处理在线预订页面按钮居低

Inline Side-by-side
Showing 5 changed files with 276 additions and 114 deletions
132d87951dd4c814f02e49539118d6af
\ No newline at end of file
7babc7873f8d177769b987ba4c6c2911
\ No newline at end of file
... ...
... ... @@ -405,7 +405,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 112;
DEVELOPMENT_TEAM = "";
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
... ...
... ... @@ -51,7 +51,6 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
FocusNode _nameNode = FocusNode();
FocusNode _needNode = FocusNode();
NotebookDetailModel detailModel = NotebookDetailModel();
bool isRecommend = false; //可订桌位是否展示推荐桌位，无已选中包间情况下展示推荐的包间
// //生成日期文本
// _createDateText(DateTime day) {
... ... @@ -174,7 +173,9 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
_notebookDetailChangeModel =
Provider.of<NotebookDetailChangeModel>(context, listen: false);
_notebookDetailChangeModel.initDateHourMinuteList(context);
_notebookDetailChangeModel.getNewTableList(context);
String ddate = widget.detailEntity.ddate.toString() + '000';
_notebookDetailChangeModel.getNewTableList(context, ddate,
widget.detailEntity.ddate_solt, '6', widget.detailEntity.tables);
_initData();
// _initTime();
... ... @@ -188,28 +189,28 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
}
//处理在线预订
setReserveStatus(String status, {String tid = ""}) async {
// bus.emit("remove_untreated_message", widget.mid);
UserModel userModel = Provider.of<UserModel>(context, listen: false);
Map<String, String> causeMap = {
"uid": userModel.user.openid,
"uname": userModel.user.account,
"desc": "",
};
Map<String, String> params = {
"rid": widget.rid,
"status": status, //5安排包间 6 拒绝订单
"tid": tid,
// "mid": widget.mid,
"cause": json.encode(causeMap)
};
// detailModel.setReserveStatus(context, params);
bool success =
await detailModel.setReserveStatus(context, params, ifPush: false);
if (success) {
_notebookDetailChangeModel.getNewTableList(context);
}
}
// setReserveStatus(String status, {String tid = ""}) async {
// // bus.emit("remove_untreated_message", widget.mid);
// UserModel userModel = Provider.of<UserModel>(context, listen: false);
// Map<String, String> causeMap = {
// "uid": userModel.user.openid,
// "uname": userModel.user.account,
// "desc": "",
// };
// Map<String, String> params = {
// "rid": widget.rid,
// "status": status, //5安排包间 6 拒绝订单
// "tid": tid,
// // "mid": widget.mid,
// "cause": json.encode(causeMap)
// };
// // detailModel.setReserveStatus(context, params);
// bool success =
// await detailModel.setReserveStatus(context, params, ifPush: false);
// if (success) {
// _notebookDetailChangeModel.getNewTableList(context);
// }
// }
_topWidget() {
return Container(
... ... @@ -226,10 +227,9 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
dayText: value['dayText'],
isImage: value['isImage'],
isSelect: value['select'],
onTap: () {
if (_notebookDetailChangeModel.dateList.length > 2 &&
_notebookDetailChangeModel.dateList[2]['title'] ==
'其他') {
onTap: () async {
print(value['title']);
if (value['title'] == '其他') {
_calendWidget(DateTime.now());
} else {
for (int j = 0;
... ... @@ -242,6 +242,33 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
value['title']) {
_notebookDetailChangeModel.dateList[j]['select'] =
true;
//选完今天明天刷新页面
// String dateText = //09-09
String timeNowYear = DateUtil.formatDate(
DateTime.now(),
format: 'yyyy');
String ymyStr =
timeNowYear + '-' + value['title']; //年月日
String timeStr = ymyStr + ' ' + "00:00:00";
int ddate =
DateUtil.getDateMsByTimeStr(timeStr); //筛选日期时间戳
String ddateSolt = '';
for (var item
in _notebookDetailChangeModel.sunDateList) {
if (item['isSelect'] == true) {
ddateSolt = '${item['ddateSolt']}';
}
}
List<t.TableList> list =
await _notebookDetailChangeModel.getNewTableList(
context,
'${ddate}',
ddateSolt,
'6',
_notebookDetailChangeModel.tableList);
if (list.length == 0) {
_notebookDetailChangeModel.isRecommend = true;
}
if (j == 0 || j == 1) {
_notebookDetailChangeModel.dateList[2]['title'] =
'其他';
... ... @@ -348,9 +375,34 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
}
}
}
_notebookDetailChangeModel.notifyListeners();
//刷新页面
//当前选中 月 日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 start = DateUtil.getDateMsByTimeStr(timeStr);
// String tempDdate = ymyStr + ' ' + ddateStr + ':00';
int ddate = DateUtil.getDateMsByTimeStr(timeStr);
_notebookDetailChangeModel.getNewTableList(
context,
'${ddate}',
'${item['ddateSolt']}',
'6',
_notebookDetailChangeModel.tableList);
}
}
_notebookDetailChangeModel.notifyListeners();
},
dateText: value['dateText'],
dayText: '',
... ... @@ -379,6 +431,39 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
true;
_notebookDetailChangeModel.numController.text =
value['dateText'];
//人数选择页面刷新
String pnum = value['dateText'];
//当前选中 月 日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 start = DateUtil.getDateMsByTimeStr(timeStr);
// String tempDdate = ymyStr + ' ' + ddateStr + ':00';
int ddate = DateUtil.getDateMsByTimeStr(timeStr);
String ddateSolt = '';
for (var item in _notebookDetailChangeModel.sunDateList) {
if (item['isSelect'] == true) {
ddateSolt = '${item['ddateSolt']}';
}
}
_notebookDetailChangeModel.getNewTableList(
context,
'${ddate}',
ddateSolt,
pnum,
_notebookDetailChangeModel.tableList);
// if (j < 5) {
// _notebookDetailChangeModel.personNumList[5]
// ['dateText'] = '更多';
... ... @@ -425,6 +510,17 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
} else {
_notebookDetailChangeModel.dateList[2]['title'] = '其他';
}
// 选完日历刷新页面
// String dateText = //09-09
//筛选日期时间戳
String ddateSolt = '';
for (var item in _notebookDetailChangeModel.sunDateList) {
if (item['isSelect'] == true) {
ddateSolt = '${item['ddateSolt']}';
}
}
_notebookDetailChangeModel.getNewTableList(context, '${dateTimeMill}',
ddateSolt, '6', _notebookDetailChangeModel.tableList);
}
_notebookDetailChangeModel.notifyListeners();
});
... ... @@ -433,7 +529,7 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
/// 可订桌位
_middleWidget() {
List canBookTable = [];
if (isRecommend) {
if (_notebookDetailChangeModel.isRecommend) {
canBookTable = _notebookDetailChangeModel.recommendList;
} else {
canBookTable = _notebookDetailChangeModel.tableList;
... ... @@ -443,87 +539,88 @@ 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']);
// }
if (temp == null || temp['object'].length == 0) {
isRecommend = true;
// 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) {
if (_notebookDetailChangeModel.tableList.length == 0) {
_notebookDetailChangeModel.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(() {});
}
} else {
_notebookDetailChangeModel.isRecommend = false;
_notebookDetailChangeModel.tableList = temp['object'];
// if (_notebookDetailChangeModel.tableList.length == 0) {
// isRecommend = true;
// }
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 +1037,6 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
ddate_solt = '晚餐';
}
}
List<dynamic> tableinfo =
convert.jsonDecode(_model.row.tableinfo);
print(tableinfo);
... ... @@ -1026,7 +1122,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(
... ...
... ... @@ -28,6 +28,8 @@ class NotebookDetailChangeModel with ChangeNotifier {
List<TableList> tableList = [];
String isSetDate = '0';
List<TableList> recommendList = []; //推荐列表
bool isRecommend = false; //是否展示推荐
List oldTableList = [];
clearData() {
dateList = []; //日期选择 月-日 某天
... ... @@ -345,17 +347,17 @@ class NotebookDetailChangeModel with ChangeNotifier {
}
///根据商家ID 获取桌位信息列表： 1：散座 2：包间 默认：获取所有数据
Future<List<TableListSunModel>> getNewTableList(BuildContext context) async {
String createtime = detailEntity.ddate.toString() + '000';
DateTime createTime =
DateTime.fromMillisecondsSinceEpoch(int.parse(createtime));
Future<List<TableList>> getNewTableList(BuildContext context, String ddate,
String ddate_solt, String pnum, List oldTableList) async {
DateTime createTime = DateTime.fromMillisecondsSinceEpoch(int.parse(ddate));
String rdate = DateUtil.formatDate(createTime, format: "yyyyMMdd");
UserModel userModel = Provider.of<UserModel>(context, listen: false);
Map<String, String> params = {
"sid": userModel.user.sellerid,
"rid": detailEntity.id,
"rdate": rdate,
'ddate_solt': detailEntity.ddate_solt
'ddate_solt': ddate_solt,
'pnum': pnum
};
BaseResp<dynamic> baseResp = await DioUtil()
.request<dynamic>(context, Method.get, HttpUrl.get_table_list,
... ... @@ -364,11 +366,11 @@ class NotebookDetailChangeModel with ChangeNotifier {
print(error.toString());
});
List<TableListSunModel> itemModelList;
if (baseResp == null) return itemModelList;
if (baseResp == null) return tableList;
if (baseResp.code == Constant.status_success) {
if (int.parse(baseResp.status) != Constant.status_success) {
Utils.showToast(baseResp.msg ?? "");
return itemModelList;
return tableList;
}
if (baseResp.responseData['data'] != null) {
itemModelList = TableListModel.fromJson(baseResp.responseData).data;
... ... @@ -376,6 +378,7 @@ class NotebookDetailChangeModel with ChangeNotifier {
Utils.showToast(baseResp.msg ?? "");
}
tableList = [];
for (int i = 0; i < itemModelList.length; i++) {
if (itemModelList[i].name == "推荐") {
recommendList = itemModelList[i].list;
... ... @@ -387,7 +390,7 @@ class NotebookDetailChangeModel with ChangeNotifier {
itemModelList.remove(item);
}
for (var item in item.list) {
for (var table in detailEntity.tables) {
for (var table in oldTableList) {
if (item.id == table.id) {
item.selected = true;
if (!tableList.contains(item)) {
... ... @@ -397,9 +400,70 @@ class NotebookDetailChangeModel with ChangeNotifier {
}
}
}
// List usedTableList = []; //被占用的包间
// for (var itemOld in oldTableList) {
// if (tableList.length == 0) {
// usedTableList = oldTableList;
// } else {
// for (var item in tableList) {
// if (item.id != itemOld.id) {
// usedTableList.add(item);
// }
// }
// }
// }
List idold = [];
for (var itemOld in oldTableList) {
idold.add(itemOld.id);
}
List idnew = [];
for (var item in tableList) {
idnew.add(item.id);
}
for (var item in idnew) {
idold.remove(item);
}
print(idold); //被占用的桌子的id
if (idold.length > 0) {
String msg = '';
for (var item in oldTableList) {
if (idold.contains(item.id)) {
msg += '${item.name},';
}
}
if (msg.endsWith(',')) {
msg = msg.substring(0, msg.length - 1);
}
Utils.showToast('${msg}已被占用啦');
}
// if (usedTableList.length > 0) {
// print(usedTableList);
// String msg = '';
// for (var item in usedTableList) {
// msg += '${item.name},';
// }
// if (msg.endsWith(',')) {
// msg = msg.substring(0, msg.length - 1);
// }
// Utils.showToast('${msg}已被占用啦');
// }
// if(usedTableList.length > 0){
// for (TableList item in usedTableList) {
// item
// }
// }
if (tableList.length == 0) {
// Utils.showToast('包间已经被预订');
isRecommend = true;
} else {
isRecommend = false;
}
print(tableList);
notifyListeners();
return itemModelList;
return tableList;
}
}
... ...
... ... @@ -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 = '';
... ...