xt / Flutter-ReserveApp · Commits

Go to a project

Commit 0d09860302583bbf9d282d88f45a6dacb1699752

Authored by wdn127929
1 parent 90a3db26
build: skipped

全年&月度&日订单 OK

Inline Side-by-side
Showing 7 changed files with 424 additions and 295 deletions
import 'dart:convert' as convert;
import 'package:common_utils/common_utils.dart';
import 'package:one_key/models/table_list.dart' as t;
class DayStaticsModel {
int ret;
DayStaticsSunModel data;
... ... @@ -25,22 +29,22 @@ class DayStaticsModel {
}
class DayStaticsSunModel {
String ddateSolt;
String totalRserve;
String totalPnum;
String totalDao;
String totalCel;
String totalPrice;
dynamic ddateSolt;
dynamic totalRserve;
dynamic totalPnum;
dynamic totalDao;
dynamic totalCel;
dynamic totalPrice;
dynamic totalConsume;
dynamic avgPrice;
String totalDaoKe;
int totalTable;
int daoTable;
int storeWine;
int order;
int plancook;
int agvTable;
Map<String, ItemData> data;
dynamic totalDaoKe;
dynamic totalTable;
dynamic daoTable;
dynamic storeWine;
dynamic order;
dynamic plancook;
dynamic agvTable;
Map<String, ItemData> daydata;
DayStaticsSunModel(
{this.ddateSolt,
... ... @@ -58,7 +62,7 @@ class DayStaticsSunModel {
this.order,
this.plancook,
this.agvTable,
this.data});
this.daydata});
DayStaticsSunModel.fromJson(Map<String, dynamic> json) {
ddateSolt = json['ddate_solt'];
... ... @@ -77,23 +81,22 @@ class DayStaticsSunModel {
plancook = json['Plancook'];
agvTable = json['agvTable'];
if (json['list'] != null) {
data = {};
daydata = {};
json['list'].map((key, value) {
Map map = json['list'].map((key, value) {
List<DsoltListModel> temp = [];
value.forEach((element) {
temp.add(DsoltListModel.fromJson(value));
temp.add(DsoltListModel.fromJson(element));
});
ItemData itemData = ItemData();
itemData.dsoltListModelItem = temp;
itemData.expansion = true;
print(key);
data.addAll({key: itemData});
// data.putIfAbsent(key.toString(), () => itemData);
print(data);
return MapEntry(key, itemData);
});
daydata = Map<String, ItemData>.from(map);
}
}
... ... @@ -114,8 +117,8 @@ class DayStaticsSunModel {
data['Order'] = this.order;
data['Plancook'] = this.plancook;
data['agvTable'] = this.agvTable;
if (this.data != null) {
// data['list'] = this.data;
if (this.daydata != null) {
data['list'] = this.daydata;
}
return data;
}
... ... @@ -127,22 +130,65 @@ class ItemData {
}
class DsoltListModel {
String id;
String rname;
String phone;
Null pnum;
String ddate;
String ddateSolt;
String tableinfo;
String sex;
String uid;
String actualPum;
Null conAmount;
Null cusdem;
String nickName;
int isOrder;
int avgPrice;
int isStoreWine;
dynamic id;
dynamic rname;
dynamic phone;
dynamic pnum;
dynamic ddate;
dynamic ddateSolt;
dynamic tableinfo;
dynamic sex;
dynamic uid;
dynamic actualPum;
dynamic conAmount;
dynamic cusdem;
dynamic nickName;
dynamic isOrder;
dynamic avgPrice;
dynamic isStoreWine;
String get tableinfoName {
if (tableinfo == null) {
return '';
}
List<dynamic> tableinfoList = convert.jsonDecode(tableinfo);
print(tableinfo);
String _nameStr = '';
for (int i = 0; i < tableinfoList.length; i++) {
_nameStr += '${t.TableList.fromJson(tableinfoList[i]).name},';
}
if (_nameStr.endsWith(',')) {
_nameStr = _nameStr.substring(0, _nameStr.length - 1);
}
return _nameStr;
}
String get rnameStr {
if (rname == null || rname == '' || rname == ' ') return "";
switch (sex.toString()) {
case "1": //先生
case "男":
case "先生":
return rname + "先生";
case "2": //女士
case "女":
case "女士":
return rname + "女士";
case "3": //公司
case "公司":
return rname + "公司";
}
}
String get ddateStr {
if (ddate.toString() == '0') {
return '';
}
DateTime dateTime =
DateTime.fromMillisecondsSinceEpoch(int.parse(ddate.toString()) * 1000);
return DateUtil.formatDate(dateTime, format: DateFormats.full);
}
DsoltListModel(
{this.id,
... ...
import 'package:common_utils/common_utils.dart';
import 'package:flutter/material.dart';
import 'package:one_key/res/colors.dart';
import 'package:one_key/utils/utils.dart';
... ... @@ -7,8 +8,10 @@ import 'package:one_key/widgets/v_empty_view.dart';
import 'package:provider/provider.dart';
import '../../../../constant/state.dart';
import '../../../../models/day_statics_model.dart';
import '../../../../provider/customer_provider.dart';
import '../../../../provider/user_model.dart';
import '../../../../route/navigator_util.dart';
import '../../../../utils/screen_util.dart';
import '../../../../widgets/page_exception.dart';
... ... @@ -27,20 +30,20 @@ class DayOrderLeftPage extends StatefulWidget {
_DayOrderLeftPageState createState() => _DayOrderLeftPageState();
}
var data = {
"早餐": {
'data': ["东城区", "西城区", "朝阳区", "丰台区", "石景山区", "顺义区", "海淀区"],
'expansion': true
},
"午餐": {
'data': ["东城区", "西城区", "朝阳区", "丰台区", "石景山区", "顺义区", "海淀区"],
'expansion': true
},
"晚餐": {
'data': ["东城区", "西城区", "朝阳区", "丰台区", "石景山区", "顺义区", "海淀区"],
'expansion': true
},
};
// var data = {
// "早餐": {
// 'data': ["东城区", "西城区", "朝阳区", "丰台区", "石景山区", "顺义区", "海淀区"],
// 'expansion': true
// },
// "午餐": {
// 'data': ["东城区", "西城区", "朝阳区", "丰台区", "石景山区", "顺义区", "海淀区"],
// 'expansion': true
// },
// "晚餐": {
// 'data': ["东城区", "西城区", "朝阳区", "丰台区", "石景山区", "顺义区", "海淀区"],
// 'expansion': true
// },
// };
class _DayOrderLeftPageState extends State<DayOrderLeftPage> {
CustomerProvider customerProvider;
... ... @@ -68,6 +71,8 @@ class _DayOrderLeftPageState extends State<DayOrderLeftPage> {
isShowLoading: isShowLoading);
}
@override
Widget build(BuildContext context) {
customerProvider = Provider.of<CustomerProvider>(context, listen: true);
... ... @@ -95,25 +100,25 @@ class _DayOrderLeftPageState extends State<DayOrderLeftPage> {
List<Widget> _buildList() {
List<Widget> widgets = [];
data.keys.forEach((key) {
customerProvider.dayStaticsData.daydata.keys.forEach((key) {
widgets.add(_item(key));
});
return widgets;
}
Widget _item(String city) {
Widget _item(String key) {
return ExpansionTile(
tilePadding: EdgeInsets.symmetric(horizontal: w(10)),
// childrenPadding: EdgeInsets.only(bottom: w(10)),
title: Text(
city,
key,
style: TextStyle(color: MyColours.color_515151, fontSize: font(16)),
),
trailing: Image.asset(
data[city]['expansion']
customerProvider.dayStaticsData.daydata[key].expansion
? Utils.getImgPath('up')
: Utils.getImgPath('down'),
width: w(12),
... ... @@ -128,219 +133,258 @@ class _DayOrderLeftPageState extends State<DayOrderLeftPage> {
onExpansionChanged: (value) {
print(value);
data[city]['expansion'] = value;
customerProvider.dayStaticsData.daydata[key].expansion = value;
setState(() {});
},
initiallyExpanded: true,
// title:,
children: List.from(data[city]['data'])
.map((area) => _buildArea(area))
children: customerProvider.dayStaticsData.daydata[key].dsoltListModelItem
.map((dsoltListModel) => _buildArea(dsoltListModel))
.toList(),
);
}
Widget _buildArea(String area) {
return Container(
// constraints: BoxConstraints(minHeight: w(10)),
// padding: EdgeInsets.only(top: w(10), left: w(10), right: w(10)),
decoration: BoxDecoration(
color: MyColours.color_f3f3f3,
),
padding:
EdgeInsets.only(top: w(5), bottom: w(5), left: w(10), right: w(10)),
Widget _buildArea(DsoltListModel dsoltListModel) {
return InkWell(
onTap: () {
NavigatorUtil.goNotebookDetailPage(
context, dsoltListModel.id, dsoltListModel.uid);
},
child: Container(
// constraints: BoxConstraints(minHeight: w(10)),
// padding: EdgeInsets.only(top: w(10), left: w(10), right: w(10)),
decoration: BoxDecoration(
color: MyColours.color_ffffff,
borderRadius: BorderRadius.circular(r(8))),
child: Row(
children: [
Expanded(
child: Container(
decoration: BoxDecoration(
// color: Colors.red,
border: Border(
right: BorderSide(
color: MyColours.color_f3f3f3, width: w(1)))),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
// height: w(34),
padding: EdgeInsets.symmetric(
horizontal: w(10), vertical: w(10)),
child: Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
Text(
'包间1',
style: TextStyle(
color: MyColours.color_999999,
fontSize: font(14),
fontWeight: FontWeight.bold),
),
Text(
'张先生',
style: TextStyle(
color: MyColours.color_999999,
fontSize: font(14),
fontWeight: FontWeight.bold),
),
Text(
'186****6909',
style: TextStyle(
color: MyColours.color_999999,
fontSize: font(14),
),
)
],
)),
MyDivider(
double.infinity,
w(1),
color: MyColours.color_f3f3f3,
),
VEmptyView(10),
Container(
padding: EdgeInsets.symmetric(horizontal: w(10)),
child: Wrap(
runSpacing: w(6),
children: [
Text(
'李霞订',
style: TextStyle(
color: MyColours.color_515151,
fontSize: font(10),
),
),
HEmptyView(10),
MyDivider(
w(1),
w(15),
color: MyColours.color_DBDBDB,
),
HEmptyView(10),
Text(
'2023-11-05 12:23:34',
style: TextStyle(
color: MyColours.color_515151,
fontSize: font(10),
),
),
],
)),
VEmptyView(10),
widget.index == 1
? Padding(
padding:
EdgeInsets.symmetric(horizontal: w(10)),
child: Text(
'6人',
style: TextStyle(
color: MyColours.color_999999,
fontSize: font(10),
),
))
: Padding(
padding:
EdgeInsets.symmetric(horizontal: w(10)),
child: Wrap(
runSpacing: w(6),
// constraints: BoxConstraints(minHeight: w(10)),
// padding: EdgeInsets.only(top: w(10), left: w(10), right: w(10)),
decoration: BoxDecoration(
color: MyColours.color_f3f3f3,
),
padding: EdgeInsets.only(
top: w(5), bottom: w(5), left: w(10), right: w(10)),
child: Container(
// constraints: BoxConstraints(minHeight: w(10)),
// padding: EdgeInsets.only(top: w(10), left: w(10), right: w(10)),
decoration: BoxDecoration(
color: MyColours.color_ffffff,
borderRadius: BorderRadius.circular(r(8))),
child: Row(
children: [
Expanded(
child: Container(
decoration: BoxDecoration(
// color: Colors.red,
border: Border(
right: BorderSide(
color: MyColours.color_f3f3f3,
width: w(1)))),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
// height: w(34),
padding: EdgeInsets.symmetric(
horizontal: w(10), vertical: w(10)),
child: Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
Text(
'6人',
Expanded(
child: Text(
'${dsoltListModel.tableinfoName}',
style: TextStyle(
color: MyColours.color_999999,
fontSize: font(10),
),
),
HEmptyView(10),
MyDivider(
w(1),
w(15),
color: MyColours.color_DBDBDB,
),
HEmptyView(10),
color: MyColours.color_999999,
fontSize: font(14),
fontWeight: FontWeight.bold),
)),
HEmptyView(44),
Text(
'消费 25800.99元',
'${dsoltListModel.rnameStr}',
style: TextStyle(
color: MyColours.color_999999,
fontSize: font(10),
),
color: MyColours.color_999999,
fontSize: font(14),
fontWeight: FontWeight.bold),
),
HEmptyView(10),
MyDivider(
w(1),
w(15),
color: MyColours.color_DBDBDB,
),
HEmptyView(10),
HEmptyView(44),
Text(
'人均 103.2元',
Utils.starPhone(dsoltListModel.phone),
style: TextStyle(
color: MyColours.color_999999,
fontSize: font(10),
fontSize: font(14),
),
),
HEmptyView(10),
MyDivider(
w(1),
w(15),
color: MyColours.color_DBDBDB,
),
HEmptyView(10),
)
],
)),
MyDivider(
double.infinity,
w(1),
color: MyColours.color_f3f3f3,
),
VEmptyView(10),
Container(
padding:
EdgeInsets.symmetric(horizontal: w(10)),
child: Wrap(
runSpacing: w(6),
children: [
if (dsoltListModel.nickName != null &&
dsoltListModel.nickName != '')
Row(
mainAxisSize: MainAxisSize.min,
children: [
Text(
dsoltListModel.nickName ==
null ||
dsoltListModel
.nickName ==
''
? ''
: '${dsoltListModel.nickName}订',
style: TextStyle(
color: MyColours.color_515151,
fontSize: font(10),
),
),
HEmptyView(10),
MyDivider(
w(1),
w(15),
color: MyColours.color_DBDBDB,
),
HEmptyView(10),
]),
Text(
'存酒',
dsoltListModel.ddateStr,
style: TextStyle(
color: MyColours.color_999999,
color: MyColours.color_515151,
fontSize: font(10),
),
),
HEmptyView(10),
MyDivider(
w(1),
w(15),
color: MyColours.color_DBDBDB,
),
HEmptyView(10),
Text(
'提前点餐',
],
)),
VEmptyView(10),
widget.index == 1
? Padding(
padding: EdgeInsets.symmetric(
horizontal: w(10)),
child: Text(
'${dsoltListModel.pnum ?? '0'}人',
style: TextStyle(
color: MyColours.color_999999,
fontSize: font(10),
),
))
: Padding(
padding: EdgeInsets.symmetric(
horizontal: w(10)),
child: Wrap(
runSpacing: w(6),
children: [
Text(
'${dsoltListModel.pnum ?? '0'}人',
style: TextStyle(
color: MyColours.color_999999,
fontSize: font(10),
),
),
HEmptyView(10),
MyDivider(
w(1),
w(15),
color: MyColours.color_DBDBDB,
),
HEmptyView(10),
Text(
'消费 ${dsoltListModel.conAmount ?? 0}元',
style: TextStyle(
color: MyColours.color_999999,
fontSize: font(10),
),
),
HEmptyView(10),
MyDivider(
w(1),
w(15),
color: MyColours.color_DBDBDB,
),
HEmptyView(10),
Text(
'人均 ${dsoltListModel.avgPrice ?? 0}元',
style: TextStyle(
color: MyColours.color_999999,
fontSize: font(10),
),
),
HEmptyView(10),
if (dsoltListModel.isStoreWine
.toString() ==
'1')
Row(children: [
MyDivider(
w(1),
w(15),
color: MyColours.color_DBDBDB,
),
HEmptyView(10),
Text(
'存酒',
style: TextStyle(
color: MyColours.color_999999,
fontSize: font(10),
),
),
HEmptyView(10),
]),
if (dsoltListModel.isOrder
.toString() ==
'1')
Row(
children: [
MyDivider(
w(1),
w(15),
color: MyColours.color_DBDBDB,
),
HEmptyView(10),
Text(
'提前点餐',
style: TextStyle(
color:
MyColours.color_999999,
fontSize: font(10),
),
),
],
)
],
)),
VEmptyView(10),
if (dsoltListModel.cusdem != 'null' &&
dsoltListModel.cusdem != null &&
dsoltListModel.cusdem != '')
Padding(
padding:
EdgeInsets.symmetric(horizontal: w(10)),
child: Text(
'备注：${dsoltListModel.cusdem}',
overflow: TextOverflow.ellipsis,
maxLines: 10,
style: TextStyle(
height: 1.2,
color: MyColours.color_999999,
fontSize: font(10),
),
],
)),
VEmptyView(10),
Padding(
padding: EdgeInsets.symmetric(horizontal: w(10)),
child: Text(
'备注：生日女35岁 蛋糕布置备注：生日女35岁 蛋糕布置备注：生日女35岁 蛋糕布置备注：生日女35岁 蛋糕布置',
overflow: TextOverflow.ellipsis,
maxLines: 10,
style: TextStyle(
height: 1.2,
color: MyColours.color_999999,
fontSize: font(10),
),
)),
VEmptyView(10),
],
))),
Container(
width: w(70),
padding: EdgeInsets.zero,
child: Image.asset(
Utils.getImgPath('arrow_right_new'),
width: w(12),
height: w(12),
),
)
],
),
));
)),
VEmptyView(10),
],
))),
Container(
width: w(70),
padding: EdgeInsets.zero,
child: Image.asset(
Utils.getImgPath('arrow_right_new'),
width: w(12),
height: w(12),
),
)
],
),
)));
}
}
... ...
import 'package:common_utils/common_utils.dart';
import 'package:flutter/material.dart';
import 'package:one_key/pages/my/customer_type/store_customer/day_order_left_page.dart';
... ... @@ -7,8 +8,10 @@ import 'package:one_key/widgets/v_empty_view.dart';
import 'package:provider/provider.dart';
import '../../../../constant/state.dart';
import '../../../../models/month_statics_model.dart';
import '../../../../provider/customer_provider.dart';
import '../../../../utils/screen_util.dart';
import '../../../../utils/utils.dart';
import '../../../../widgets/MyDivider.dart';
import '../../../../widgets/h_empty_view.dart';
import '../../../../widgets/page_exception.dart';
... ... @@ -23,7 +26,9 @@ class DayOrderPage extends StatefulWidget {
final String month;
final String day;
final String uid;
DayOrderPage({Key key, this.year, this.month, this.day, this.uid})
final DayList daylist;
DayOrderPage(
{Key key, this.year, this.month, this.day, this.uid, this.daylist})
: super(key: key);
@override
... ... @@ -36,19 +41,16 @@ class _DayOrderPageState extends State<DayOrderPage>
TabController tabController;
Color selectedColor = MyColours.color_ffffff;
Color unSelectedColor = MyColours.color_BFC4D4;
List _elements = [
{'name': 'John', 'group': 'Team A'},
{'name': 'Will', 'group': 'Team B'},
{'name': 'Beth', 'group': 'Team A'},
{'name': 'Miranda', 'group': 'Team B'},
{'name': 'Mike', 'group': 'Team C'},
{'name': 'Danny', 'group': 'Team C'},
];
String nongli;
String weekday;
@override
void initState() {
// TODO: implement initState
super.initState();
nongli = nongliShow(widget.year, widget.month, widget.day);
weekday = weekdayShow(widget.year, widget.month, widget.day);
tabController = TabController(length: 2, vsync: this);
tabController.addListener(() {
... ... @@ -61,6 +63,26 @@ class _DayOrderPageState extends State<DayOrderPage>
});
}
String nongliShow(String year, String month, String day) {
String dateStr = year +
'-' +
Utils.addZeroNumber(int.parse(month)) +
'-' +
Utils.addZeroNumber(int.parse(day));
DateTime date = DateUtil.getDateTime(dateStr);
return Utils.lunarCalendarHolidays(date);
}
String weekdayShow(String year, String month, String day) {
String dateStr = year +
'-' +
Utils.addZeroNumber(int.parse(month)) +
'-' +
Utils.addZeroNumber(int.parse(day));
DateTime date = DateUtil.getDateTime(dateStr);
return "星期${Utils.formatWeekDayNum(date.weekday)} ";
}
Widget _headWidget() {
return Column(
children: [
... ... @@ -74,21 +96,21 @@ class _DayOrderPageState extends State<DayOrderPage>
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
'2023年12月30日',
widget.year + '-' + widget.month + '-' + widget.day,
style: TextStyle(
color: MyColours.color_515151,
fontSize: font(16),
fontWeight: FontWeight.bold),
),
Text(
'十二月廿四',
nongli,
style: TextStyle(
color: MyColours.color_515151,
fontSize: font(14),
),
),
Text(
'星期日',
weekday,
style: TextStyle(
color: MyColours.color_515151,
fontSize: font(14),
... ... @@ -111,7 +133,7 @@ class _DayOrderPageState extends State<DayOrderPage>
),
HEmptyView(10),
Text(
'1089单',
'${widget.daylist.totalRserve}单',
style: TextStyle(
color: MyColours.color_515151,
fontSize: font(
... ... @@ -126,7 +148,7 @@ class _DayOrderPageState extends State<DayOrderPage>
),
HEmptyView(10),
Text(
'1190桌',
'${widget.daylist.totalTable}桌',
style: TextStyle(
color: MyColours.color_515151,
fontSize: font(
... ... @@ -137,6 +159,7 @@ class _DayOrderPageState extends State<DayOrderPage>
),
VEmptyView(20),
Wrap(
crossAxisAlignment: WrapCrossAlignment.start,
runSpacing: w(5),
children: [
Text(
... ... @@ -150,7 +173,7 @@ class _DayOrderPageState extends State<DayOrderPage>
),
HEmptyView(10),
Text(
'1089单',
'${widget.daylist.totalDao}单',
style: TextStyle(
color: MyColours.color_515151,
fontSize: font(
... ... @@ -165,7 +188,7 @@ class _DayOrderPageState extends State<DayOrderPage>
),
HEmptyView(10),
Text(
'1190桌',
'${widget.daylist.daoTable}桌',
style: TextStyle(
color: MyColours.color_515151,
fontSize: font(
... ... @@ -174,7 +197,7 @@ class _DayOrderPageState extends State<DayOrderPage>
),
HEmptyView(10),
Text(
'1089人',
'${widget.daylist.totalPnum ?? 0}人',
style: TextStyle(
color: MyColours.color_515151,
fontSize: font(
... ... @@ -189,7 +212,7 @@ class _DayOrderPageState extends State<DayOrderPage>
),
HEmptyView(10),
Text(
'1190取消',
'${widget.daylist.totalCel}取消',
style: TextStyle(
color: MyColours.color_515151,
fontSize: font(
... ... @@ -204,7 +227,7 @@ class _DayOrderPageState extends State<DayOrderPage>
),
HEmptyView(10),
Text(
'到客90.1%',
'到客${widget.daylist.totalDaoKe}',
style: TextStyle(
color: MyColours.color_515151,
fontSize: font(
... ... @@ -216,9 +239,10 @@ class _DayOrderPageState extends State<DayOrderPage>
VEmptyView(20),
Wrap(
runSpacing: w(6),
crossAxisAlignment: WrapCrossAlignment.start,
children: [
Text(
'有金额订单数 25',
'有金额订单数 ${widget.daylist.totalPrice}',
style: TextStyle(
color: MyColours.color_999999,
fontSize: font(
... ... @@ -233,7 +257,7 @@ class _DayOrderPageState extends State<DayOrderPage>
),
HEmptyView(10),
Text(
'总消费 25800元',
'总消费 ${widget.daylist.totalConsume ?? 0}元',
style: TextStyle(
color: MyColours.color_999999,
fontSize: font(
... ... @@ -242,7 +266,7 @@ class _DayOrderPageState extends State<DayOrderPage>
),
HEmptyView(10),
Text(
'人均 103.2元',
'人均 ${widget.daylist.avgPrice ?? 0}元',
style: TextStyle(
color: MyColours.color_999999,
fontSize: font(
... ... @@ -257,7 +281,7 @@ class _DayOrderPageState extends State<DayOrderPage>
),
HEmptyView(10),
Text(
'桌均 860元',
'桌均 ${widget.daylist.agvTable ?? 0}元',
style: TextStyle(
color: MyColours.color_999999,
fontSize: font(
... ... @@ -266,7 +290,7 @@ class _DayOrderPageState extends State<DayOrderPage>
),
HEmptyView(10),
Text(
'存酒 1位',
'存酒 ${widget.daylist.storeWine}位',
style: TextStyle(
color: MyColours.color_999999,
fontSize: font(
... ... @@ -281,7 +305,7 @@ class _DayOrderPageState extends State<DayOrderPage>
),
HEmptyView(10),
Text(
'提前点餐 9位',
'提前点餐 ${widget.daylist.order}位',
style: TextStyle(
color: MyColours.color_999999,
fontSize: font(
... ... @@ -296,7 +320,7 @@ class _DayOrderPageState extends State<DayOrderPage>
),
HEmptyView(10),
Text(
'安排菜 9位',
'安排菜 ${widget.daylist.plancook}位',
style: TextStyle(
color: MyColours.color_999999,
fontSize: font(
... ... @@ -383,6 +407,10 @@ class _DayOrderPageState extends State<DayOrderPage>
),
DayOrderLeftPage(
index: 1,
year: widget.year,
month: widget.month,
day: widget.day,
uid: widget.uid,
),
]),
),
... ...
... ... @@ -537,9 +537,14 @@ class _MonthOrderPageState extends State<MonthOrderPage> {
customerProvider.monthStaticsData.dayList[index];
return InkWell(
onTap: () {
NavigatorUtil.goDayOrderPage(context,
widget.year, widget.month, daylist.days,
uid: widget.uid);
NavigatorUtil.goDayOrderPage(
context,
widget.year.toString(),
widget.month.toString(),
daylist.days.toString(),
daylist,
uid: widget.uid.toString(),
);
},
child: Container(
margin: EdgeInsets.only(bottom: w(10)),
... ...
... ... @@ -1167,7 +1167,9 @@ class TableManagerPageState extends State<TableManagerPage> {
)))
],
),
)
),
VEmptyView(44),
_remarkWidget()
],
),
Positioned(
... ... @@ -1187,10 +1189,13 @@ class TableManagerPageState extends State<TableManagerPage> {
color: MyColours.color_e5e5e5,
blurRadius: ScreenUtil().setWidth(20))
]),
width: ScreenUtil().setWidth(440),
height: _baseIndoProvider.userHistorys.length > 1
? ScreenUtil().setWidth(140)
: ScreenUtil().setWidth(104),
// width: double.infinity,
width: ScreenUtil().screenWidth-w(60),
// width: ScreenUtil().setWidth(350),
constraints: BoxConstraints(maxHeight: w(170)),
// height: _baseIndoProvider.userHistorys.length > 1
// ? ScreenUtil().setWidth(140)
// : ScreenUtil().setWidth(104),
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(30)),
child: Align(
... ... @@ -1409,9 +1414,10 @@ class TableManagerPageState extends State<TableManagerPage> {
Widget _remarkWidget() {
return Padding(
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(48),
),
padding: EdgeInsets.zero,
// (
// horizontal: ScreenUtil().setWidth(48),
// ),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
... ... @@ -2178,12 +2184,11 @@ class TableManagerPageState extends State<TableManagerPage> {
);
}),
),
Column(children: [
_customerInfoWidget(),
VEmptyView(44),
_remarkWidget()
// _couponWidget(),
]),
// Column(children: [
_customerInfoWidget(),
// _couponWidget(),
// ]),
VEmptyView(20),
Padding(
... ...
... ... @@ -30,6 +30,7 @@ import '../models/IsExamineModel.dart';
import '../models/get_banquet_by_id_new_model.dart';
import '../models/get_banquet_deposit_model.dart';
import '../models/menu_unit_model.dart';
import '../models/month_statics_model.dart';
import '../models/otherset_model.dart';
import '../models/out_wine_record_model.dart';
import '../models/plan_cook_by_rid_model.dart';
... ... @@ -1745,11 +1746,11 @@ class NavigatorUtil {
}
/// 日订单
static Future<dynamic> goDayOrderPage(
BuildContext context, String year, String month, String day,
static Future<dynamic> goDayOrderPage(BuildContext context, String year,
String month, String day, DayList daylist,
{replace = false, String uid = ''}) {
return _navigateTo(context,
"${Routes.day_order_page}?year=${year}&month=${month}&day=${day}&uid=${uid}",
"${Routes.day_order_page}?year=${year}&month=${month}&day=${day}&uid=${uid}&daylist=${FluroConvertUtils.object2string(daylist)}",
replace: replace);
}
}
... ...
... ... @@ -156,6 +156,7 @@ import 'package:provider/provider.dart';
import '../models/IsExamineModel.dart';
import '../models/get_banquet_by_id_new_model.dart';
import '../models/menu_unit_model.dart';
import '../models/month_statics_model.dart';
import '../models/out_wine_record_model.dart';
import '../models/plan_cook_by_rid_model.dart';
import '../models/plan_cook_list_model.dart';
... ... @@ -2847,12 +2848,11 @@ var dayOrderPageHandle = new Handler(
String day = params["day"].first;
String uid = params["uid"].first;
// IsExamineSunModel isExamineSunModel = IsExamineSunModel.fromJson(json.decode(
// FluroConvertUtils.fluroCnParamsDecode(
// params["isExamineSunModel"].first)));
// }
DayList daylist = DayList.fromJson(json
.decode(FluroConvertUtils.fluroCnParamsDecode(params["daylist"].first)));
return ChangeNotifierProvider<CustomerProvider>(
create: (_) => CustomerProvider(),
child: DayOrderPage(year: year, month: month, day: day, uid: uid));
child: DayOrderPage(
year: year, month: month, day: day, uid: uid, daylist: daylist));
});
... ...