xt / Flutter-ReserveApp · Commits

Go to a project

Commit 38faa60f0679cd9d707924774d7f947d1d5035f5

Authored by gaiyaguang
2 parents 23a1a409 01e2dff4
build: skipped

桌位管理

Inline Side-by-side
Showing 5 changed files with 202 additions and 144 deletions
... ... @@ -62,6 +62,30 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
widget.detailEntity.pnum,
widget.detailEntity.tables);
_initData();
// //输入框焦点
// _nameNode.addListener(() {
// if (!_nameNode.hasFocus) {
// print('失去焦点');
// } else {
// print('得到焦点');
// _phoneNode.unfocus();
// }
// });
// //输入框焦点
// _phoneNode.addListener(() {
// if (!_phoneNode.hasFocus) {
// print('失去焦点');
// } else {
// print('得到焦点');
// }
// });
}
@override
void dispose() {
_nameNode.unfocus();
_phoneNode.unfocus();
super.dispose();
}
_initData() {
... ... @@ -122,10 +146,12 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
}
_notebookDetailChangeModel.initHourAndMinuteSelect();
//选完今天明天刷新页面
int ddate = Utils.getDdate(_notebookDetailChangeModel.dateList);
String ddateSolt =
Utils.getDdateSolt(_notebookDetailChangeModel.sunDateList);
String pnum = Utils.getPnum(_notebookDetailChangeModel.personNumList);
int ddate =
Utils.getDdate(_notebookDetailChangeModel.dateList);
String ddateSolt = Utils.getDdateSolt(
_notebookDetailChangeModel.sunDateList);
String pnum = Utils.getPnum(
_notebookDetailChangeModel.personNumList);
List<t.TableList> list =
await _notebookDetailChangeModel.getNewTableList(
context,
... ... @@ -236,9 +262,12 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
}
_notebookDetailChangeModel.notifyListeners();
//人数选择页面刷新
String pnum = Utils.getPnum(_notebookDetailChangeModel.personNumList);
int ddate = Utils.getDdate(_notebookDetailChangeModel.dateList);
String ddateSolt = Utils.getDdateSolt(_notebookDetailChangeModel.sunDateList);
String pnum =
Utils.getPnum(_notebookDetailChangeModel.personNumList);
int ddate =
Utils.getDdate(_notebookDetailChangeModel.dateList);
String ddateSolt = Utils.getDdateSolt(
_notebookDetailChangeModel.sunDateList);
_notebookDetailChangeModel.getNewTableList(
context,
... ... @@ -287,14 +316,11 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
}
_notebookDetailChangeModel.initHourAndMinuteSelect();
// 选完日历刷新页面
String ddateSolt = Utils.getDdateSolt(_notebookDetailChangeModel.sunDateList);
String ddateSolt =
Utils.getDdateSolt(_notebookDetailChangeModel.sunDateList);
String pnum = Utils.getPnum(_notebookDetailChangeModel.personNumList);
_notebookDetailChangeModel.getNewTableList(
context,
'${dateTimeMill}',
ddateSolt,
pnum,
_notebookDetailChangeModel.tableList);
_notebookDetailChangeModel.getNewTableList(context, '${dateTimeMill}',
ddateSolt, pnum, _notebookDetailChangeModel.tableList);
}
_notebookDetailChangeModel.notifyListeners();
});
... ... @@ -519,12 +545,14 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
// EdgeInsets.only(bottom: ScreenUtil().setWidth(17)),
border: InputBorder.none,
),
onChanged: (value) {},
onChanged: (value) {
print('ggg');
},
onEditingComplete: () {
print('fff');
_nameNode.unfocus();
},
// keyboardType: TextInputType.number,
keyboardType: TextInputType.text,
),
),
HEmptyView(40),
... ... @@ -757,7 +785,7 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
body: Column(children: <Widget>[
SizedBox(height: ScreenUtil.statusBarHeight),
MyAppBar(
widget.detailEntity.id=="-1"?"录入订座信息":"变更预订",
widget.detailEntity.id == "-1" ? "录入订座信息" : "变更预订",
showBack: true,
),
Expanded(
... ... @@ -774,7 +802,7 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
width: double.infinity,
height: 84,
fontSize: 34,
content: widget.detailEntity.id=="-1"?"完成预订":"确定修改",
content: widget.detailEntity.id == "-1" ? "完成预订" : "确定修改",
state: 2,
onPress: () async {
String name =
... ... @@ -787,9 +815,13 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
Utils.showToast("请选择桌位");
return;
}
SunReserveInfoModel _model =_notebookDetailChangeModel.detailEntity.type=="1"?//判断是否在线预订
await _notebookDetailChangeModel
.updateOnlineReserveInfo(context):await _notebookDetailChangeModel.setReserveInfo(context);
SunReserveInfoModel _model =
_notebookDetailChangeModel.detailEntity.type == "1"
? //判断是否在线预订
await _notebookDetailChangeModel
.updateOnlineReserveInfo(context)
: await _notebookDetailChangeModel
.setReserveInfo(context);
if (ObjectUtil.isNotEmpty(_model.row) ||
ObjectUtil.isNotEmpty(_model.row.id)) {
print('成功');
... ... @@ -816,17 +848,20 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
List<dynamic> tableinfo =
convert.jsonDecode(_model.row.tableinfo);
print(tableinfo);
String _nameStr=t.TableList.fromJson(tableinfo[0]).name;
String _nameStr = t.TableList.fromJson(tableinfo[0]).name;
if (tableinfo.length > 1) {
_nameStr = t.TableList.fromJson(tableinfo[0]).name + '等${tableinfo.length}桌';
_nameStr = t.TableList.fromJson(tableinfo[0]).name +
'等${tableinfo.length}桌';
}
LogUtil.v(_nameStr);
NavigatorUtil.goInvicationPage(context, _model.row.id,
_nameStr, _model.row.ddate, ddate_solt,_model.row.phone,
replace: true);
EventBus().emit("refresh_tablemanager");//刷新桌位
EventBus().emit("refresh_tablemanager"); //刷新桌位
} else {
Utils.showToast(widget.detailEntity.id=="-1"?"录入预订订单失败，请重试！":"变更预订订单失败，请重试！");
Utils.showToast(widget.detailEntity.id == "-1"
? "录入预订订单失败，请重试！"
: "变更预订订单失败，请重试！");
}
},
))
... ... @@ -955,7 +990,8 @@ class _ButtonState extends State<CustomButton> {
onEditingComplete: () {
_cancelNode.unfocus();
int ddate = Utils.getDdate(widget.model.dateList);
String ddateSolt = Utils.getDdateSolt(widget.model.sunDateList);
String ddateSolt =
Utils.getDdateSolt(widget.model.sunDateList);
String pnum = Utils.getPnum(widget.model.personNumList);
widget.model.getNewTableList(context, '${ddate}',
... ...
... ... @@ -19,47 +19,49 @@ class MessageLeftPage extends StatefulWidget {
}
class MessageLeftPageState extends State<MessageLeftPage> {
EasyRefreshController _controller;
@override
void initState() {
// TODO: implement initState
super.initState();
bus.on("remove_untreated_message",(args){
MessageModel messageModel=Provider.of<MessageModel>(context,listen: false);
bus.on("remove_untreated_message", (args) {
MessageModel messageModel =
Provider.of<MessageModel>(context, listen: false);
messageModel.removeUntreatedMessageByMid(args.toString());
MessageDialogModel messageDialogModel=Provider.of<MessageDialogModel>(context,listen: false);
MessageDialogModel messageDialogModel =
Provider.of<MessageDialogModel>(context, listen: false);
messageDialogModel.removeMessage(args.toString());
});
_controller=EasyRefreshController();
WidgetsBinding.instance.addPostFrameCallback((_){
_controller = EasyRefreshController();
WidgetsBinding.instance.addPostFrameCallback((_) {
getUntreatedMessage();
});
}
//获取未处理在线预订消息
getUntreatedMessage(){
UserModel userModel=Provider.of<UserModel>(context,listen: false);
Map<String,String> params={
"sid":userModel.user.sellerid,
"type_id":"10",
"status":"0",
"offset":"0",
"limit":"100",
getUntreatedMessage({bool showLoading = true}) {
UserModel userModel = Provider.of<UserModel>(context, listen: false);
Map<String, String> params = {
"sid": userModel.user.sellerid,
"type_id": "10",
"status": "0",
"offset": "0",
"limit": "100",
};
MessageModel messageModel=Provider.of<MessageModel>(context,listen: false);
messageModel.getUntreatedMsg(context, params);
MessageModel messageModel =
Provider.of<MessageModel>(context, listen: false);
messageModel.getUntreatedMsg(context, params, showLoading: showLoading);
}
@override
Widget build(BuildContext context) {
// TODO: implement build
return Consumer<MessageModel>(
builder: (context,model,_){
if (model.pageState != PageState.Success) {
builder: (context, model, _) {
if (model.unPageState != PageState.Success) {
return ExceptionPage(
pageState: model.pageState,
pageState: model.unPageState,
callback: () {
getUntreatedMessage();
},
... ... @@ -67,19 +69,21 @@ class MessageLeftPageState extends State<MessageLeftPage> {
emptyImg: "empty_search",
showMsg: "加载中，请稍后...",
);
}else{
} else {
return EasyRefresh.custom(
controller: _controller,
slivers: [
SliverList(
delegate:
SliverChildBuilderDelegate((BuildContext context, int index) {
delegate: SliverChildBuilderDelegate(
(BuildContext context, int index) {
return MessageItem(model.untreatedMsgs[index]);
},childCount: model.untreatedMsgs.length),
}, childCount: model.untreatedMsgs.length),
)
],onRefresh: () async {
getUntreatedMessage();
},);
],
onRefresh: () async {
getUntreatedMessage(showLoading: false);
},
);
}
},
);
... ...
... ... @@ -6,7 +6,7 @@ import 'package:one_key/widgets/v_empty_view.dart';
import 'message_left_page.dart';
import 'message_right_page.dart';
class MessagePage extends StatefulWidget{
class MessagePage extends StatefulWidget {
@override
State<StatefulWidget> createState() {
// TODO: implement createState
... ... @@ -14,7 +14,7 @@ class MessagePage extends StatefulWidget{
}
}
class MessagePageState extends State<MessagePage>{
class MessagePageState extends State<MessagePage> {
@override
Widget build(BuildContext context) {
// TODO: implement build
... ... @@ -24,38 +24,48 @@ class MessagePageState extends State<MessagePage>{
color: MyColours.color_f5f5f5,
child: Column(
children: <Widget>[
MyAppBar("消息中心",showBack: false,),
MyAppBar(
"消息中心",
showBack: false,
),
Expanded(
child: DefaultTabController(length: 2, child: Column(
children: <Widget>[
Material(
color: MyColours.color_ffffff,
child: SizedBox(
width: double.infinity,
height: ScreenUtil().setHeight(76),
child: TabBar(tabs:[
Tab(text: "未处理",),
Tab(text: "已处理",)
],
indicatorColor: MyColours.color_199095,
indicatorSize: TabBarIndicatorSize.label,
indicatorWeight: ScreenUtil().setHeight(4.0),
labelColor: MyColours.color_199095,
unselectedLabelColor: MyColours.color_999999,
labelStyle: TextStyle(fontSize: ScreenUtil().setSp(32),fontWeight: FontWeight.bold),
child: DefaultTabController(
length: 2,
child: Column(
children: <Widget>[
Material(
color: MyColours.color_ffffff,
child: SizedBox(
width: double.infinity,
height: ScreenUtil().setHeight(76),
child: TabBar(
tabs: [
Tab(
text: "未处理",
),
Tab(
text: "已处理",
)
],
indicatorColor: MyColours.color_199095,
indicatorSize: TabBarIndicatorSize.label,
indicatorWeight: ScreenUtil().setHeight(4.0),
labelColor: MyColours.color_199095,
unselectedLabelColor: MyColours.color_999999,
labelStyle: TextStyle(
fontSize: ScreenUtil().setSp(32),
fontWeight: FontWeight.bold),
),
),
),
),
),
VEmptyView(11),
Expanded(
flex: 1,
child: TabBarView(children: [
MessageLeftPage(),
MessageRightPage()
]),
)
],
)),
VEmptyView(11),
Expanded(
flex: 1,
child: TabBarView(
children: [MessageLeftPage(), MessageRightPage()]),
)
],
)),
)
],
),
... ...
... ... @@ -8,50 +8,49 @@ import 'package:one_key/widgets/page_error.dart';
import 'package:one_key/widgets/page_exception.dart';
import 'package:provider/provider.dart';
class MessageRightPage extends StatefulWidget{
class MessageRightPage extends StatefulWidget {
@override
State<StatefulWidget> createState() {
// TODO: implement createState
return new MessageRightPageState();
}
}
class MessageRightPageState extends State<MessageRightPage>{
class MessageRightPageState extends State<MessageRightPage> {
EasyRefreshController _controller;
int offset=0;//当前页数
int offset = 0; //当前页数
@override
void initState() {
// TODO: implement initState
super.initState();
_controller=EasyRefreshController();
WidgetsBinding.instance.addPostFrameCallback((_){
_controller = EasyRefreshController();
WidgetsBinding.instance.addPostFrameCallback((_) {
getTreatedMessage();
});
}
//获取未处理在线预订消息
getTreatedMessage(){
UserModel userModel=Provider.of<UserModel>(context,listen: false);
Map<String,String> params={
"sid":userModel.user.sellerid,
"type_id":"10",
"status":"1",
"offset":offset.toString(),
"limit":"10",
getTreatedMessage({bool showLoading = true}) {
UserModel userModel = Provider.of<UserModel>(context, listen: false);
Map<String, String> params = {
"sid": userModel.user.sellerid,
"type_id": "10",
"status": "1",
"offset": offset.toString(),
"limit": "10",
};
MessageModel messageModel=Provider.of<MessageModel>(context,listen: false);
messageModel.getTreatedMsg(context, params);
MessageModel messageModel =
Provider.of<MessageModel>(context, listen: false);
messageModel.getTreatedMsg(context, params, showLoading: showLoading);
}
@override
Widget build(BuildContext context) {
// TODO: implement build
return Consumer<MessageModel>(
builder: (context,model,_){
builder: (context, model, _) {
if (model.pageState != PageState.Success) {
return ExceptionPage(
pageState: model.pageState,
... ... @@ -62,21 +61,26 @@ class MessageRightPageState extends State<MessageRightPage>{
emptyImg: "empty_search",
showMsg: "加载中，请稍后...",
);
}else{
} else {
return EasyRefresh.custom(
controller: _controller,
slivers: [
SliverList(
delegate:
SliverChildBuilderDelegate((BuildContext context, int index) {
return MessageItem(model.treatedMsgs[index],isTreated: true,);
},childCount: model.treatedMsgs.length),
delegate: SliverChildBuilderDelegate(
(BuildContext context, int index) {
return MessageItem(
model.treatedMsgs[index],
isTreated: true,
);
}, childCount: model.treatedMsgs.length),
)
],onRefresh: () async {
getTreatedMessage();
},);
],
onRefresh: () async {
getTreatedMessage(showLoading: false);
},
);
}
},
);
}
}
\ No newline at end of file
}
... ...
... ... @@ -8,71 +8,73 @@ import 'package:one_key/net/dio_util.dart';
import 'package:one_key/net/http_url.dart';
import 'package:one_key/utils/utils.dart';
class MessageModel extends ChangeNotifier {
List<Message> untreatedMsgs = []; //未处理在线预订消息
List<Message> treatedMsgs = []; //已处理在线预订消息
class MessageModel extends ChangeNotifier{
List<Message> untreatedMsgs=[];//未处理在线预订消息
List<Message> treatedMsgs=[];//已处理在线预订消息
PageState unPageState = PageState.Loading;
PageState pageState = PageState.Loading;
//获取未处理在线预订消息
getUntreatedMsg(BuildContext context,Map<String,String> params) async {
pageState = PageState.Loading;
getUntreatedMsg(BuildContext context, Map<String, String> params,
{showLoading = true}) async {
if (showLoading) {
unPageState = PageState.Loading;
}
notifyListeners();
BaseResp<List> baseResp = await DioUtil()
.request<List>(context, Method.get, HttpUrl.get_message_list,
data: params,showLoading: false)
data: params, showLoading: false)
.catchError((error) {
print(error.toString());
if (error is MyError) {
switch (error.type) {
case 1:
pageState = PageState.ConnectivityError;
unPageState = PageState.ConnectivityError;
break;
case 2:
pageState = PageState.ConnectivityTimeOut;
unPageState = PageState.ConnectivityTimeOut;
break;
default:
pageState = PageState.ConnectivityError;
unPageState = PageState.ConnectivityError;
break;
}
}
notifyListeners();
});
if (baseResp!=null&&baseResp.code == Constant.status_success) {
untreatedMsgs=baseResp.data.map<Message>((value){
if (baseResp != null && baseResp.code == Constant.status_success) {
untreatedMsgs = baseResp.data.map<Message>((value) {
return Message.fromJson(value);
}).toList();
untreatedMsgs.removeWhere((message){
if(message.message_type.toString()=="10"){
if(message.status=="4"){
untreatedMsgs.removeWhere((message) {
if (message.message_type.toString() == "10") {
if (message.status == "4") {
return true;
}
return false;
}else if(message.message_type.toString()=="11"){
} else if (message.message_type.toString() == "11") {
return false;
}
return true;
});
if (untreatedMsgs.isEmpty) {
pageState = PageState.Empty;
unPageState = PageState.Empty;
} else {
pageState = PageState.Success;
unPageState = PageState.Success;
}
notifyListeners();
}
}
//获取未处理在线预订消息
getTreatedMsg(BuildContext context,Map<String,String> params) async {
if (params["offset"] == "0") {
//获取已处理在线预订消息
getTreatedMsg(BuildContext context, Map<String, String> params,{showLoading = true}) async {
if (params["offset"] == "0" && showLoading) {
pageState = PageState.Loading;
notifyListeners();
}
BaseResp<List> baseResp = await DioUtil()
.request<List>(context, Method.get, HttpUrl.get_message_list,
data: params,showLoading: false)
data: params, showLoading: false)
.catchError((error) {
print(error.toString());
if (error is MyError) {
... ... @@ -90,18 +92,20 @@ class MessageModel extends ChangeNotifier{
}
notifyListeners();
});
if (baseResp!=null&&baseResp.code == Constant.status_success) {
if(params["offset"]=="0"){//第一页
treatedMsgs=baseResp.data.map<Message>((value){
if (baseResp != null && baseResp.code == Constant.status_success) {
if (params["offset"] == "0") {
//第一页
treatedMsgs = baseResp.data.map<Message>((value) {
return Message.fromJson(value);
}).toList();
}else{
treatedMsgs.addAll(baseResp.data.map<Message>((value){
} else {
treatedMsgs.addAll(baseResp.data.map<Message>((value) {
return Message.fromJson(value);
}).toList());
}
treatedMsgs.removeWhere((message){
if(message.message_type.toString()=="10"||message.message_type.toString()=="11"){
treatedMsgs.removeWhere((message) {
if (message.message_type.toString() == "10" ||
message.message_type.toString() == "11") {
return false;
}
return true;
... ... @@ -116,8 +120,8 @@ class MessageModel extends ChangeNotifier{
}
//移除未处理在线预订消息
removeUntreatedMessageByMid(String mid){
untreatedMsgs.removeWhere((message)=>message.id==mid);
removeUntreatedMessageByMid(String mid) {
untreatedMsgs.removeWhere((message) => message.id == mid);
notifyListeners();
}
}
... ...