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
  1 +import 'dart:convert' as convert;
  2 +import 'package:common_utils/common_utils.dart';
  3 +import 'package:one_key/models/table_list.dart' as t;
  4 +
1 class DayStaticsModel { 5 class DayStaticsModel {
2 int ret; 6 int ret;
3 DayStaticsSunModel data; 7 DayStaticsSunModel data;
@@ -25,22 +29,22 @@ class DayStaticsModel { @@ -25,22 +29,22 @@ class DayStaticsModel {
25 } 29 }
26 30
27 class DayStaticsSunModel { 31 class DayStaticsSunModel {
28 - String ddateSolt;  
29 - String totalRserve;  
30 - String totalPnum;  
31 - String totalDao;  
32 - String totalCel;  
33 - String totalPrice; 32 + dynamic ddateSolt;
  33 + dynamic totalRserve;
  34 + dynamic totalPnum;
  35 + dynamic totalDao;
  36 + dynamic totalCel;
  37 + dynamic totalPrice;
34 dynamic totalConsume; 38 dynamic totalConsume;
35 dynamic avgPrice; 39 dynamic avgPrice;
36 - String totalDaoKe;  
37 - int totalTable;  
38 - int daoTable;  
39 - int storeWine;  
40 - int order;  
41 - int plancook;  
42 - int agvTable;  
43 - Map<String, ItemData> data; 40 + dynamic totalDaoKe;
  41 + dynamic totalTable;
  42 + dynamic daoTable;
  43 + dynamic storeWine;
  44 + dynamic order;
  45 + dynamic plancook;
  46 + dynamic agvTable;
  47 + Map<String, ItemData> daydata;
44 48
45 DayStaticsSunModel( 49 DayStaticsSunModel(
46 {this.ddateSolt, 50 {this.ddateSolt,
@@ -58,7 +62,7 @@ class DayStaticsSunModel { @@ -58,7 +62,7 @@ class DayStaticsSunModel {
58 this.order, 62 this.order,
59 this.plancook, 63 this.plancook,
60 this.agvTable, 64 this.agvTable,
61 - this.data}); 65 + this.daydata});
62 66
63 DayStaticsSunModel.fromJson(Map<String, dynamic> json) { 67 DayStaticsSunModel.fromJson(Map<String, dynamic> json) {
64 ddateSolt = json['ddate_solt']; 68 ddateSolt = json['ddate_solt'];
@@ -77,23 +81,22 @@ class DayStaticsSunModel { @@ -77,23 +81,22 @@ class DayStaticsSunModel {
77 plancook = json['Plancook']; 81 plancook = json['Plancook'];
78 agvTable = json['agvTable']; 82 agvTable = json['agvTable'];
79 if (json['list'] != null) { 83 if (json['list'] != null) {
80 - data = {}; 84 + daydata = {};
81 85
82 - json['list'].map((key, value) { 86 + Map map = json['list'].map((key, value) {
83 List<DsoltListModel> temp = []; 87 List<DsoltListModel> temp = [];
84 value.forEach((element) { 88 value.forEach((element) {
85 - temp.add(DsoltListModel.fromJson(value)); 89 + temp.add(DsoltListModel.fromJson(element));
86 }); 90 });
87 91
88 ItemData itemData = ItemData(); 92 ItemData itemData = ItemData();
89 itemData.dsoltListModelItem = temp; 93 itemData.dsoltListModelItem = temp;
90 itemData.expansion = true; 94 itemData.expansion = true;
91 95
92 - print(key);  
93 - data.addAll({key: itemData});  
94 - // data.putIfAbsent(key.toString(), () => itemData);  
95 - print(data); 96 + return MapEntry(key, itemData);
96 }); 97 });
  98 +
  99 + daydata = Map<String, ItemData>.from(map);
97 } 100 }
98 } 101 }
99 102
@@ -114,8 +117,8 @@ class DayStaticsSunModel { @@ -114,8 +117,8 @@ class DayStaticsSunModel {
114 data['Order'] = this.order; 117 data['Order'] = this.order;
115 data['Plancook'] = this.plancook; 118 data['Plancook'] = this.plancook;
116 data['agvTable'] = this.agvTable; 119 data['agvTable'] = this.agvTable;
117 - if (this.data != null) {  
118 - // data['list'] = this.data; 120 + if (this.daydata != null) {
  121 + data['list'] = this.daydata;
119 } 122 }
120 return data; 123 return data;
121 } 124 }
@@ -127,22 +130,65 @@ class ItemData { @@ -127,22 +130,65 @@ class ItemData {
127 } 130 }
128 131
129 class DsoltListModel { 132 class DsoltListModel {
130 - String id;  
131 - String rname;  
132 - String phone;  
133 - Null pnum;  
134 - String ddate;  
135 - String ddateSolt;  
136 - String tableinfo;  
137 - String sex;  
138 - String uid;  
139 - String actualPum;  
140 - Null conAmount;  
141 - Null cusdem;  
142 - String nickName;  
143 - int isOrder;  
144 - int avgPrice;  
145 - int isStoreWine; 133 + dynamic id;
  134 + dynamic rname;
  135 + dynamic phone;
  136 + dynamic pnum;
  137 + dynamic ddate;
  138 + dynamic ddateSolt;
  139 + dynamic tableinfo;
  140 + dynamic sex;
  141 + dynamic uid;
  142 + dynamic actualPum;
  143 + dynamic conAmount;
  144 + dynamic cusdem;
  145 + dynamic nickName;
  146 + dynamic isOrder;
  147 + dynamic avgPrice;
  148 + dynamic isStoreWine;
  149 +
  150 + String get tableinfoName {
  151 + if (tableinfo == null) {
  152 + return '';
  153 + }
  154 + List<dynamic> tableinfoList = convert.jsonDecode(tableinfo);
  155 + print(tableinfo);
  156 + String _nameStr = '';
  157 +
  158 + for (int i = 0; i < tableinfoList.length; i++) {
  159 + _nameStr += '${t.TableList.fromJson(tableinfoList[i]).name},';
  160 + }
  161 + if (_nameStr.endsWith(',')) {
  162 + _nameStr = _nameStr.substring(0, _nameStr.length - 1);
  163 + }
  164 + return _nameStr;
  165 + }
  166 +
  167 + String get rnameStr {
  168 + if (rname == null || rname == '' || rname == ' ') return "";
  169 + switch (sex.toString()) {
  170 + case "1": //先生
  171 + case "男":
  172 + case "先生":
  173 + return rname + "先生";
  174 + case "2": //女士
  175 + case "女":
  176 + case "女士":
  177 + return rname + "女士";
  178 + case "3": //公司
  179 + case "公司":
  180 + return rname + "公司";
  181 + }
  182 + }
  183 +
  184 + String get ddateStr {
  185 + if (ddate.toString() == '0') {
  186 + return '';
  187 + }
  188 + DateTime dateTime =
  189 + DateTime.fromMillisecondsSinceEpoch(int.parse(ddate.toString()) * 1000);
  190 + return DateUtil.formatDate(dateTime, format: DateFormats.full);
  191 + }
146 192
147 DsoltListModel( 193 DsoltListModel(
148 {this.id, 194 {this.id,
  1 +import 'package:common_utils/common_utils.dart';
1 import 'package:flutter/material.dart'; 2 import 'package:flutter/material.dart';
2 import 'package:one_key/res/colors.dart'; 3 import 'package:one_key/res/colors.dart';
3 import 'package:one_key/utils/utils.dart'; 4 import 'package:one_key/utils/utils.dart';
@@ -7,8 +8,10 @@ import 'package:one_key/widgets/v_empty_view.dart'; @@ -7,8 +8,10 @@ import 'package:one_key/widgets/v_empty_view.dart';
7 import 'package:provider/provider.dart'; 8 import 'package:provider/provider.dart';
8 9
9 import '../../../../constant/state.dart'; 10 import '../../../../constant/state.dart';
  11 +import '../../../../models/day_statics_model.dart';
10 import '../../../../provider/customer_provider.dart'; 12 import '../../../../provider/customer_provider.dart';
11 import '../../../../provider/user_model.dart'; 13 import '../../../../provider/user_model.dart';
  14 +import '../../../../route/navigator_util.dart';
12 import '../../../../utils/screen_util.dart'; 15 import '../../../../utils/screen_util.dart';
13 import '../../../../widgets/page_exception.dart'; 16 import '../../../../widgets/page_exception.dart';
14 17
@@ -27,20 +30,20 @@ class DayOrderLeftPage extends StatefulWidget { @@ -27,20 +30,20 @@ class DayOrderLeftPage extends StatefulWidget {
27 _DayOrderLeftPageState createState() => _DayOrderLeftPageState(); 30 _DayOrderLeftPageState createState() => _DayOrderLeftPageState();
28 } 31 }
29 32
30 -var data = {  
31 - "早餐": {  
32 - 'data': ["东城区", "西城区", "朝阳区", "丰台区", "石景山区", "顺义区", "海淀区"],  
33 - 'expansion': true  
34 - },  
35 - "午餐": {  
36 - 'data': ["东城区", "西城区", "朝阳区", "丰台区", "石景山区", "顺义区", "海淀区"],  
37 - 'expansion': true  
38 - },  
39 - "晚餐": {  
40 - 'data': ["东城区", "西城区", "朝阳区", "丰台区", "石景山区", "顺义区", "海淀区"],  
41 - 'expansion': true  
42 - },  
43 -}; 33 +// var data = {
  34 +// "早餐": {
  35 +// 'data': ["东城区", "西城区", "朝阳区", "丰台区", "石景山区", "顺义区", "海淀区"],
  36 +// 'expansion': true
  37 +// },
  38 +// "午餐": {
  39 +// 'data': ["东城区", "西城区", "朝阳区", "丰台区", "石景山区", "顺义区", "海淀区"],
  40 +// 'expansion': true
  41 +// },
  42 +// "晚餐": {
  43 +// 'data': ["东城区", "西城区", "朝阳区", "丰台区", "石景山区", "顺义区", "海淀区"],
  44 +// 'expansion': true
  45 +// },
  46 +// };
44 47
45 class _DayOrderLeftPageState extends State<DayOrderLeftPage> { 48 class _DayOrderLeftPageState extends State<DayOrderLeftPage> {
46 CustomerProvider customerProvider; 49 CustomerProvider customerProvider;
@@ -68,6 +71,8 @@ class _DayOrderLeftPageState extends State<DayOrderLeftPage> { @@ -68,6 +71,8 @@ class _DayOrderLeftPageState extends State<DayOrderLeftPage> {
68 isShowLoading: isShowLoading); 71 isShowLoading: isShowLoading);
69 } 72 }
70 73
  74 +
  75 +
71 @override 76 @override
72 Widget build(BuildContext context) { 77 Widget build(BuildContext context) {
73 customerProvider = Provider.of<CustomerProvider>(context, listen: true); 78 customerProvider = Provider.of<CustomerProvider>(context, listen: true);
@@ -95,25 +100,25 @@ class _DayOrderLeftPageState extends State<DayOrderLeftPage> { @@ -95,25 +100,25 @@ class _DayOrderLeftPageState extends State<DayOrderLeftPage> {
95 100
96 List<Widget> _buildList() { 101 List<Widget> _buildList() {
97 List<Widget> widgets = []; 102 List<Widget> widgets = [];
98 - data.keys.forEach((key) { 103 + customerProvider.dayStaticsData.daydata.keys.forEach((key) {
99 widgets.add(_item(key)); 104 widgets.add(_item(key));
100 }); 105 });
101 106
102 return widgets; 107 return widgets;
103 } 108 }
104 109
105 - Widget _item(String city) { 110 + Widget _item(String key) {
106 return ExpansionTile( 111 return ExpansionTile(
107 tilePadding: EdgeInsets.symmetric(horizontal: w(10)), 112 tilePadding: EdgeInsets.symmetric(horizontal: w(10)),
108 113
109 // childrenPadding: EdgeInsets.only(bottom: w(10)), 114 // childrenPadding: EdgeInsets.only(bottom: w(10)),
110 115
111 title: Text( 116 title: Text(
112 - city, 117 + key,
113 style: TextStyle(color: MyColours.color_515151, fontSize: font(16)), 118 style: TextStyle(color: MyColours.color_515151, fontSize: font(16)),
114 ), 119 ),
115 trailing: Image.asset( 120 trailing: Image.asset(
116 - data[city]['expansion'] 121 + customerProvider.dayStaticsData.daydata[key].expansion
117 ? Utils.getImgPath('up') 122 ? Utils.getImgPath('up')
118 : Utils.getImgPath('down'), 123 : Utils.getImgPath('down'),
119 width: w(12), 124 width: w(12),
@@ -128,219 +133,258 @@ class _DayOrderLeftPageState extends State<DayOrderLeftPage> { @@ -128,219 +133,258 @@ class _DayOrderLeftPageState extends State<DayOrderLeftPage> {
128 133
129 onExpansionChanged: (value) { 134 onExpansionChanged: (value) {
130 print(value); 135 print(value);
131 - data[city]['expansion'] = value; 136 + customerProvider.dayStaticsData.daydata[key].expansion = value;
132 setState(() {}); 137 setState(() {});
133 }, 138 },
134 initiallyExpanded: true, 139 initiallyExpanded: true,
135 // title:, 140 // title:,
136 - children: List.from(data[city]['data'])  
137 - .map((area) => _buildArea(area)) 141 + children: customerProvider.dayStaticsData.daydata[key].dsoltListModelItem
  142 + .map((dsoltListModel) => _buildArea(dsoltListModel))
138 .toList(), 143 .toList(),
139 ); 144 );
140 } 145 }
141 146
142 - Widget _buildArea(String area) {  
143 - return Container(  
144 - // constraints: BoxConstraints(minHeight: w(10)),  
145 - // padding: EdgeInsets.only(top: w(10), left: w(10), right: w(10)),  
146 - decoration: BoxDecoration(  
147 - color: MyColours.color_f3f3f3,  
148 - ),  
149 - padding:  
150 - EdgeInsets.only(top: w(5), bottom: w(5), left: w(10), right: w(10)), 147 + Widget _buildArea(DsoltListModel dsoltListModel) {
  148 + return InkWell(
  149 + onTap: () {
  150 + NavigatorUtil.goNotebookDetailPage(
  151 + context, dsoltListModel.id, dsoltListModel.uid);
  152 + },
151 child: Container( 153 child: Container(
152 - // constraints: BoxConstraints(minHeight: w(10)),  
153 - // padding: EdgeInsets.only(top: w(10), left: w(10), right: w(10)),  
154 - decoration: BoxDecoration(  
155 - color: MyColours.color_ffffff,  
156 - borderRadius: BorderRadius.circular(r(8))),  
157 - child: Row(  
158 - children: [  
159 - Expanded(  
160 - child: Container(  
161 - decoration: BoxDecoration(  
162 - // color: Colors.red,  
163 - border: Border(  
164 - right: BorderSide(  
165 - color: MyColours.color_f3f3f3, width: w(1)))),  
166 - child: Column(  
167 - crossAxisAlignment: CrossAxisAlignment.start,  
168 - children: [  
169 - Container(  
170 - // height: w(34),  
171 - padding: EdgeInsets.symmetric(  
172 - horizontal: w(10), vertical: w(10)),  
173 - child: Row(  
174 - mainAxisAlignment:  
175 - MainAxisAlignment.spaceBetween,  
176 - children: [  
177 - Text(  
178 - '包间1',  
179 - style: TextStyle(  
180 - color: MyColours.color_999999,  
181 - fontSize: font(14),  
182 - fontWeight: FontWeight.bold),  
183 - ),  
184 - Text(  
185 - '张先生',  
186 - style: TextStyle(  
187 - color: MyColours.color_999999,  
188 - fontSize: font(14),  
189 - fontWeight: FontWeight.bold),  
190 - ),  
191 - Text(  
192 - '186****6909',  
193 - style: TextStyle(  
194 - color: MyColours.color_999999,  
195 - fontSize: font(14),  
196 - ),  
197 - )  
198 - ],  
199 - )),  
200 - MyDivider(  
201 - double.infinity,  
202 - w(1),  
203 - color: MyColours.color_f3f3f3,  
204 - ),  
205 - VEmptyView(10),  
206 - Container(  
207 - padding: EdgeInsets.symmetric(horizontal: w(10)),  
208 - child: Wrap(  
209 - runSpacing: w(6),  
210 - children: [  
211 - Text(  
212 - '李霞订',  
213 - style: TextStyle(  
214 - color: MyColours.color_515151,  
215 - fontSize: font(10),  
216 - ),  
217 - ),  
218 - HEmptyView(10),  
219 - MyDivider(  
220 - w(1),  
221 - w(15),  
222 - color: MyColours.color_DBDBDB,  
223 - ),  
224 - HEmptyView(10),  
225 - Text(  
226 - '2023-11-05 12:23:34',  
227 - style: TextStyle(  
228 - color: MyColours.color_515151,  
229 - fontSize: font(10),  
230 - ),  
231 - ),  
232 - ],  
233 - )),  
234 - VEmptyView(10),  
235 - widget.index == 1  
236 - ? Padding(  
237 - padding:  
238 - EdgeInsets.symmetric(horizontal: w(10)),  
239 - child: Text(  
240 - '6人',  
241 - style: TextStyle(  
242 - color: MyColours.color_999999,  
243 - fontSize: font(10),  
244 - ),  
245 - ))  
246 - : Padding(  
247 - padding:  
248 - EdgeInsets.symmetric(horizontal: w(10)),  
249 - child: Wrap(  
250 - runSpacing: w(6), 154 + // constraints: BoxConstraints(minHeight: w(10)),
  155 + // padding: EdgeInsets.only(top: w(10), left: w(10), right: w(10)),
  156 + decoration: BoxDecoration(
  157 + color: MyColours.color_f3f3f3,
  158 + ),
  159 + padding: EdgeInsets.only(
  160 + top: w(5), bottom: w(5), left: w(10), right: w(10)),
  161 + child: Container(
  162 + // constraints: BoxConstraints(minHeight: w(10)),
  163 + // padding: EdgeInsets.only(top: w(10), left: w(10), right: w(10)),
  164 + decoration: BoxDecoration(
  165 + color: MyColours.color_ffffff,
  166 + borderRadius: BorderRadius.circular(r(8))),
  167 + child: Row(
  168 + children: [
  169 + Expanded(
  170 + child: Container(
  171 + decoration: BoxDecoration(
  172 + // color: Colors.red,
  173 + border: Border(
  174 + right: BorderSide(
  175 + color: MyColours.color_f3f3f3,
  176 + width: w(1)))),
  177 + child: Column(
  178 + crossAxisAlignment: CrossAxisAlignment.start,
  179 + children: [
  180 + Container(
  181 + // height: w(34),
  182 + padding: EdgeInsets.symmetric(
  183 + horizontal: w(10), vertical: w(10)),
  184 + child: Row(
  185 + mainAxisAlignment:
  186 + MainAxisAlignment.spaceBetween,
251 children: [ 187 children: [
252 - Text(  
253 - '6人', 188 + Expanded(
  189 + child: Text(
  190 + '${dsoltListModel.tableinfoName}',
254 style: TextStyle( 191 style: TextStyle(
255 - color: MyColours.color_999999,  
256 - fontSize: font(10),  
257 - ),  
258 - ),  
259 - HEmptyView(10),  
260 - MyDivider(  
261 - w(1),  
262 - w(15),  
263 - color: MyColours.color_DBDBDB,  
264 - ),  
265 - HEmptyView(10), 192 + color: MyColours.color_999999,
  193 + fontSize: font(14),
  194 + fontWeight: FontWeight.bold),
  195 + )),
  196 + HEmptyView(44),
266 Text( 197 Text(
267 - '消费 25800.99元', 198 + '${dsoltListModel.rnameStr}',
268 style: TextStyle( 199 style: TextStyle(
269 - color: MyColours.color_999999,  
270 - fontSize: font(10),  
271 - ), 200 + color: MyColours.color_999999,
  201 + fontSize: font(14),
  202 + fontWeight: FontWeight.bold),
272 ), 203 ),
273 - HEmptyView(10),  
274 - MyDivider(  
275 - w(1),  
276 - w(15),  
277 - color: MyColours.color_DBDBDB,  
278 - ),  
279 - HEmptyView(10), 204 + HEmptyView(44),
280 Text( 205 Text(
281 - '人均 103.2元', 206 + Utils.starPhone(dsoltListModel.phone),
282 style: TextStyle( 207 style: TextStyle(
283 color: MyColours.color_999999, 208 color: MyColours.color_999999,
284 - fontSize: font(10), 209 + fontSize: font(14),
285 ), 210 ),
286 - ),  
287 - HEmptyView(10),  
288 - MyDivider(  
289 - w(1),  
290 - w(15),  
291 - color: MyColours.color_DBDBDB,  
292 - ),  
293 - HEmptyView(10), 211 + )
  212 + ],
  213 + )),
  214 + MyDivider(
  215 + double.infinity,
  216 + w(1),
  217 + color: MyColours.color_f3f3f3,
  218 + ),
  219 + VEmptyView(10),
  220 + Container(
  221 + padding:
  222 + EdgeInsets.symmetric(horizontal: w(10)),
  223 + child: Wrap(
  224 + runSpacing: w(6),
  225 + children: [
  226 + if (dsoltListModel.nickName != null &&
  227 + dsoltListModel.nickName != '')
  228 + Row(
  229 + mainAxisSize: MainAxisSize.min,
  230 + children: [
  231 + Text(
  232 + dsoltListModel.nickName ==
  233 + null ||
  234 + dsoltListModel
  235 + .nickName ==
  236 + ''
  237 + ? ''
  238 + : '${dsoltListModel.nickName}订',
  239 + style: TextStyle(
  240 + color: MyColours.color_515151,
  241 + fontSize: font(10),
  242 + ),
  243 + ),
  244 + HEmptyView(10),
  245 + MyDivider(
  246 + w(1),
  247 + w(15),
  248 + color: MyColours.color_DBDBDB,
  249 + ),
  250 + HEmptyView(10),
  251 + ]),
294 Text( 252 Text(
295 - '存酒', 253 + dsoltListModel.ddateStr,
296 style: TextStyle( 254 style: TextStyle(
297 - color: MyColours.color_999999, 255 + color: MyColours.color_515151,
298 fontSize: font(10), 256 fontSize: font(10),
299 ), 257 ),
300 ), 258 ),
301 - HEmptyView(10),  
302 - MyDivider(  
303 - w(1),  
304 - w(15),  
305 - color: MyColours.color_DBDBDB,  
306 - ),  
307 - HEmptyView(10),  
308 - Text(  
309 - '提前点餐', 259 + ],
  260 + )),
  261 + VEmptyView(10),
  262 + widget.index == 1
  263 + ? Padding(
  264 + padding: EdgeInsets.symmetric(
  265 + horizontal: w(10)),
  266 + child: Text(
  267 + '${dsoltListModel.pnum ?? '0'}人',
310 style: TextStyle( 268 style: TextStyle(
311 color: MyColours.color_999999, 269 color: MyColours.color_999999,
312 fontSize: font(10), 270 fontSize: font(10),
313 ), 271 ),
  272 + ))
  273 + : Padding(
  274 + padding: EdgeInsets.symmetric(
  275 + horizontal: w(10)),
  276 + child: Wrap(
  277 + runSpacing: w(6),
  278 + children: [
  279 + Text(
  280 + '${dsoltListModel.pnum ?? '0'}人',
  281 + style: TextStyle(
  282 + color: MyColours.color_999999,
  283 + fontSize: font(10),
  284 + ),
  285 + ),
  286 + HEmptyView(10),
  287 + MyDivider(
  288 + w(1),
  289 + w(15),
  290 + color: MyColours.color_DBDBDB,
  291 + ),
  292 + HEmptyView(10),
  293 + Text(
  294 + '消费 ${dsoltListModel.conAmount ?? 0}元',
  295 + style: TextStyle(
  296 + color: MyColours.color_999999,
  297 + fontSize: font(10),
  298 + ),
  299 + ),
  300 + HEmptyView(10),
  301 + MyDivider(
  302 + w(1),
  303 + w(15),
  304 + color: MyColours.color_DBDBDB,
  305 + ),
  306 + HEmptyView(10),
  307 + Text(
  308 + '人均 ${dsoltListModel.avgPrice ?? 0}元',
  309 + style: TextStyle(
  310 + color: MyColours.color_999999,
  311 + fontSize: font(10),
  312 + ),
  313 + ),
  314 + HEmptyView(10),
  315 + if (dsoltListModel.isStoreWine
  316 + .toString() ==
  317 + '1')
  318 + Row(children: [
  319 + MyDivider(
  320 + w(1),
  321 + w(15),
  322 + color: MyColours.color_DBDBDB,
  323 + ),
  324 + HEmptyView(10),
  325 + Text(
  326 + '存酒',
  327 + style: TextStyle(
  328 + color: MyColours.color_999999,
  329 + fontSize: font(10),
  330 + ),
  331 + ),
  332 + HEmptyView(10),
  333 + ]),
  334 + if (dsoltListModel.isOrder
  335 + .toString() ==
  336 + '1')
  337 + Row(
  338 + children: [
  339 + MyDivider(
  340 + w(1),
  341 + w(15),
  342 + color: MyColours.color_DBDBDB,
  343 + ),
  344 + HEmptyView(10),
  345 + Text(
  346 + '提前点餐',
  347 + style: TextStyle(
  348 + color:
  349 + MyColours.color_999999,
  350 + fontSize: font(10),
  351 + ),
  352 + ),
  353 + ],
  354 + )
  355 + ],
  356 + )),
  357 + VEmptyView(10),
  358 + if (dsoltListModel.cusdem != 'null' &&
  359 + dsoltListModel.cusdem != null &&
  360 + dsoltListModel.cusdem != '')
  361 + Padding(
  362 + padding:
  363 + EdgeInsets.symmetric(horizontal: w(10)),
  364 + child: Text(
  365 + '备注：${dsoltListModel.cusdem}',
  366 + overflow: TextOverflow.ellipsis,
  367 + maxLines: 10,
  368 + style: TextStyle(
  369 + height: 1.2,
  370 + color: MyColours.color_999999,
  371 + fontSize: font(10),
314 ), 372 ),
315 - ],  
316 - )),  
317 - VEmptyView(10),  
318 - Padding(  
319 - padding: EdgeInsets.symmetric(horizontal: w(10)),  
320 - child: Text(  
321 - '备注：生日女35岁 蛋糕布置备注：生日女35岁 蛋糕布置备注：生日女35岁 蛋糕布置备注：生日女35岁 蛋糕布置',  
322 - overflow: TextOverflow.ellipsis,  
323 - maxLines: 10,  
324 - style: TextStyle(  
325 - height: 1.2,  
326 - color: MyColours.color_999999,  
327 - fontSize: font(10),  
328 - ),  
329 - )),  
330 - VEmptyView(10),  
331 - ],  
332 - ))),  
333 - Container(  
334 - width: w(70),  
335 - padding: EdgeInsets.zero,  
336 - child: Image.asset(  
337 - Utils.getImgPath('arrow_right_new'),  
338 - width: w(12),  
339 - height: w(12),  
340 - ),  
341 - )  
342 - ],  
343 - ),  
344 - )); 373 + )),
  374 + VEmptyView(10),
  375 + ],
  376 + ))),
  377 + Container(
  378 + width: w(70),
  379 + padding: EdgeInsets.zero,
  380 + child: Image.asset(
  381 + Utils.getImgPath('arrow_right_new'),
  382 + width: w(12),
  383 + height: w(12),
  384 + ),
  385 + )
  386 + ],
  387 + ),
  388 + )));
345 } 389 }
346 } 390 }
  1 +import 'package:common_utils/common_utils.dart';
1 import 'package:flutter/material.dart'; 2 import 'package:flutter/material.dart';
2 import 'package:one_key/pages/my/customer_type/store_customer/day_order_left_page.dart'; 3 import 'package:one_key/pages/my/customer_type/store_customer/day_order_left_page.dart';
3 4
@@ -7,8 +8,10 @@ import 'package:one_key/widgets/v_empty_view.dart'; @@ -7,8 +8,10 @@ import 'package:one_key/widgets/v_empty_view.dart';
7 import 'package:provider/provider.dart'; 8 import 'package:provider/provider.dart';
8 9
9 import '../../../../constant/state.dart'; 10 import '../../../../constant/state.dart';
  11 +import '../../../../models/month_statics_model.dart';
10 import '../../../../provider/customer_provider.dart'; 12 import '../../../../provider/customer_provider.dart';
11 import '../../../../utils/screen_util.dart'; 13 import '../../../../utils/screen_util.dart';
  14 +import '../../../../utils/utils.dart';
12 import '../../../../widgets/MyDivider.dart'; 15 import '../../../../widgets/MyDivider.dart';
13 import '../../../../widgets/h_empty_view.dart'; 16 import '../../../../widgets/h_empty_view.dart';
14 import '../../../../widgets/page_exception.dart'; 17 import '../../../../widgets/page_exception.dart';
@@ -23,7 +26,9 @@ class DayOrderPage extends StatefulWidget { @@ -23,7 +26,9 @@ class DayOrderPage extends StatefulWidget {
23 final String month; 26 final String month;
24 final String day; 27 final String day;
25 final String uid; 28 final String uid;
26 - DayOrderPage({Key key, this.year, this.month, this.day, this.uid}) 29 + final DayList daylist;
  30 + DayOrderPage(
  31 + {Key key, this.year, this.month, this.day, this.uid, this.daylist})
27 : super(key: key); 32 : super(key: key);
28 33
29 @override 34 @override
@@ -36,19 +41,16 @@ class _DayOrderPageState extends State<DayOrderPage> @@ -36,19 +41,16 @@ class _DayOrderPageState extends State<DayOrderPage>
36 TabController tabController; 41 TabController tabController;
37 Color selectedColor = MyColours.color_ffffff; 42 Color selectedColor = MyColours.color_ffffff;
38 Color unSelectedColor = MyColours.color_BFC4D4; 43 Color unSelectedColor = MyColours.color_BFC4D4;
39 - List _elements = [  
40 - {'name': 'John', 'group': 'Team A'},  
41 - {'name': 'Will', 'group': 'Team B'},  
42 - {'name': 'Beth', 'group': 'Team A'},  
43 - {'name': 'Miranda', 'group': 'Team B'},  
44 - {'name': 'Mike', 'group': 'Team C'},  
45 - {'name': 'Danny', 'group': 'Team C'},  
46 - ]; 44 +
  45 + String nongli;
  46 + String weekday;
47 47
48 @override 48 @override
49 void initState() { 49 void initState() {
50 // TODO: implement initState 50 // TODO: implement initState
51 super.initState(); 51 super.initState();
  52 + nongli = nongliShow(widget.year, widget.month, widget.day);
  53 + weekday = weekdayShow(widget.year, widget.month, widget.day);
52 tabController = TabController(length: 2, vsync: this); 54 tabController = TabController(length: 2, vsync: this);
53 55
54 tabController.addListener(() { 56 tabController.addListener(() {
@@ -61,6 +63,26 @@ class _DayOrderPageState extends State<DayOrderPage> @@ -61,6 +63,26 @@ class _DayOrderPageState extends State<DayOrderPage>
61 }); 63 });
62 } 64 }
63 65
  66 + String nongliShow(String year, String month, String day) {
  67 + String dateStr = year +
  68 + '-' +
  69 + Utils.addZeroNumber(int.parse(month)) +
  70 + '-' +
  71 + Utils.addZeroNumber(int.parse(day));
  72 + DateTime date = DateUtil.getDateTime(dateStr);
  73 + return Utils.lunarCalendarHolidays(date);
  74 + }
  75 +
  76 + String weekdayShow(String year, String month, String day) {
  77 + String dateStr = year +
  78 + '-' +
  79 + Utils.addZeroNumber(int.parse(month)) +
  80 + '-' +
  81 + Utils.addZeroNumber(int.parse(day));
  82 + DateTime date = DateUtil.getDateTime(dateStr);
  83 + return "星期${Utils.formatWeekDayNum(date.weekday)} ";
  84 + }
  85 +
64 Widget _headWidget() { 86 Widget _headWidget() {
65 return Column( 87 return Column(
66 children: [ 88 children: [
@@ -74,21 +96,21 @@ class _DayOrderPageState extends State<DayOrderPage> @@ -74,21 +96,21 @@ class _DayOrderPageState extends State<DayOrderPage>
74 mainAxisAlignment: MainAxisAlignment.spaceBetween, 96 mainAxisAlignment: MainAxisAlignment.spaceBetween,
75 children: [ 97 children: [
76 Text( 98 Text(
77 - '2023年12月30日', 99 + widget.year + '-' + widget.month + '-' + widget.day,
78 style: TextStyle( 100 style: TextStyle(
79 color: MyColours.color_515151, 101 color: MyColours.color_515151,
80 fontSize: font(16), 102 fontSize: font(16),
81 fontWeight: FontWeight.bold), 103 fontWeight: FontWeight.bold),
82 ), 104 ),
83 Text( 105 Text(
84 - '十二月廿四', 106 + nongli,
85 style: TextStyle( 107 style: TextStyle(
86 color: MyColours.color_515151, 108 color: MyColours.color_515151,
87 fontSize: font(14), 109 fontSize: font(14),
88 ), 110 ),
89 ), 111 ),
90 Text( 112 Text(
91 - '星期日', 113 + weekday,
92 style: TextStyle( 114 style: TextStyle(
93 color: MyColours.color_515151, 115 color: MyColours.color_515151,
94 fontSize: font(14), 116 fontSize: font(14),
@@ -111,7 +133,7 @@ class _DayOrderPageState extends State<DayOrderPage> @@ -111,7 +133,7 @@ class _DayOrderPageState extends State<DayOrderPage>
111 ), 133 ),
112 HEmptyView(10), 134 HEmptyView(10),
113 Text( 135 Text(
114 - '1089单', 136 + '${widget.daylist.totalRserve}单',
115 style: TextStyle( 137 style: TextStyle(
116 color: MyColours.color_515151, 138 color: MyColours.color_515151,
117 fontSize: font( 139 fontSize: font(
@@ -126,7 +148,7 @@ class _DayOrderPageState extends State<DayOrderPage> @@ -126,7 +148,7 @@ class _DayOrderPageState extends State<DayOrderPage>
126 ), 148 ),
127 HEmptyView(10), 149 HEmptyView(10),
128 Text( 150 Text(
129 - '1190桌', 151 + '${widget.daylist.totalTable}桌',
130 style: TextStyle( 152 style: TextStyle(
131 color: MyColours.color_515151, 153 color: MyColours.color_515151,
132 fontSize: font( 154 fontSize: font(
@@ -137,6 +159,7 @@ class _DayOrderPageState extends State<DayOrderPage> @@ -137,6 +159,7 @@ class _DayOrderPageState extends State<DayOrderPage>
137 ), 159 ),
138 VEmptyView(20), 160 VEmptyView(20),
139 Wrap( 161 Wrap(
  162 + crossAxisAlignment: WrapCrossAlignment.start,
140 runSpacing: w(5), 163 runSpacing: w(5),
141 children: [ 164 children: [
142 Text( 165 Text(
@@ -150,7 +173,7 @@ class _DayOrderPageState extends State<DayOrderPage> @@ -150,7 +173,7 @@ class _DayOrderPageState extends State<DayOrderPage>
150 ), 173 ),
151 HEmptyView(10), 174 HEmptyView(10),
152 Text( 175 Text(
153 - '1089单', 176 + '${widget.daylist.totalDao}单',
154 style: TextStyle( 177 style: TextStyle(
155 color: MyColours.color_515151, 178 color: MyColours.color_515151,
156 fontSize: font( 179 fontSize: font(
@@ -165,7 +188,7 @@ class _DayOrderPageState extends State<DayOrderPage> @@ -165,7 +188,7 @@ class _DayOrderPageState extends State<DayOrderPage>
165 ), 188 ),
166 HEmptyView(10), 189 HEmptyView(10),
167 Text( 190 Text(
168 - '1190桌', 191 + '${widget.daylist.daoTable}桌',
169 style: TextStyle( 192 style: TextStyle(
170 color: MyColours.color_515151, 193 color: MyColours.color_515151,
171 fontSize: font( 194 fontSize: font(
@@ -174,7 +197,7 @@ class _DayOrderPageState extends State<DayOrderPage> @@ -174,7 +197,7 @@ class _DayOrderPageState extends State<DayOrderPage>
174 ), 197 ),
175 HEmptyView(10), 198 HEmptyView(10),
176 Text( 199 Text(
177 - '1089人', 200 + '${widget.daylist.totalPnum ?? 0}人',
178 style: TextStyle( 201 style: TextStyle(
179 color: MyColours.color_515151, 202 color: MyColours.color_515151,
180 fontSize: font( 203 fontSize: font(
@@ -189,7 +212,7 @@ class _DayOrderPageState extends State<DayOrderPage> @@ -189,7 +212,7 @@ class _DayOrderPageState extends State<DayOrderPage>
189 ), 212 ),
190 HEmptyView(10), 213 HEmptyView(10),
191 Text( 214 Text(
192 - '1190取消', 215 + '${widget.daylist.totalCel}取消',
193 style: TextStyle( 216 style: TextStyle(
194 color: MyColours.color_515151, 217 color: MyColours.color_515151,
195 fontSize: font( 218 fontSize: font(
@@ -204,7 +227,7 @@ class _DayOrderPageState extends State<DayOrderPage> @@ -204,7 +227,7 @@ class _DayOrderPageState extends State<DayOrderPage>
204 ), 227 ),
205 HEmptyView(10), 228 HEmptyView(10),
206 Text( 229 Text(
207 - '到客90.1%', 230 + '到客${widget.daylist.totalDaoKe}',
208 style: TextStyle( 231 style: TextStyle(
209 color: MyColours.color_515151, 232 color: MyColours.color_515151,
210 fontSize: font( 233 fontSize: font(
@@ -216,9 +239,10 @@ class _DayOrderPageState extends State<DayOrderPage> @@ -216,9 +239,10 @@ class _DayOrderPageState extends State<DayOrderPage>
216 VEmptyView(20), 239 VEmptyView(20),
217 Wrap( 240 Wrap(
218 runSpacing: w(6), 241 runSpacing: w(6),
  242 + crossAxisAlignment: WrapCrossAlignment.start,
219 children: [ 243 children: [
220 Text( 244 Text(
221 - '有金额订单数 25', 245 + '有金额订单数 ${widget.daylist.totalPrice}',
222 style: TextStyle( 246 style: TextStyle(
223 color: MyColours.color_999999, 247 color: MyColours.color_999999,
224 fontSize: font( 248 fontSize: font(
@@ -233,7 +257,7 @@ class _DayOrderPageState extends State<DayOrderPage> @@ -233,7 +257,7 @@ class _DayOrderPageState extends State<DayOrderPage>
233 ), 257 ),
234 HEmptyView(10), 258 HEmptyView(10),
235 Text( 259 Text(
236 - '总消费 25800元', 260 + '总消费 ${widget.daylist.totalConsume ?? 0}元',
237 style: TextStyle( 261 style: TextStyle(
238 color: MyColours.color_999999, 262 color: MyColours.color_999999,
239 fontSize: font( 263 fontSize: font(
@@ -242,7 +266,7 @@ class _DayOrderPageState extends State<DayOrderPage> @@ -242,7 +266,7 @@ class _DayOrderPageState extends State<DayOrderPage>
242 ), 266 ),
243 HEmptyView(10), 267 HEmptyView(10),
244 Text( 268 Text(
245 - '人均 103.2元', 269 + '人均 ${widget.daylist.avgPrice ?? 0}元',
246 style: TextStyle( 270 style: TextStyle(
247 color: MyColours.color_999999, 271 color: MyColours.color_999999,
248 fontSize: font( 272 fontSize: font(
@@ -257,7 +281,7 @@ class _DayOrderPageState extends State<DayOrderPage> @@ -257,7 +281,7 @@ class _DayOrderPageState extends State<DayOrderPage>
257 ), 281 ),
258 HEmptyView(10), 282 HEmptyView(10),
259 Text( 283 Text(
260 - '桌均 860元', 284 + '桌均 ${widget.daylist.agvTable ?? 0}元',
261 style: TextStyle( 285 style: TextStyle(
262 color: MyColours.color_999999, 286 color: MyColours.color_999999,
263 fontSize: font( 287 fontSize: font(
@@ -266,7 +290,7 @@ class _DayOrderPageState extends State<DayOrderPage> @@ -266,7 +290,7 @@ class _DayOrderPageState extends State<DayOrderPage>
266 ), 290 ),
267 HEmptyView(10), 291 HEmptyView(10),
268 Text( 292 Text(
269 - '存酒 1位', 293 + '存酒 ${widget.daylist.storeWine}位',
270 style: TextStyle( 294 style: TextStyle(
271 color: MyColours.color_999999, 295 color: MyColours.color_999999,
272 fontSize: font( 296 fontSize: font(
@@ -281,7 +305,7 @@ class _DayOrderPageState extends State<DayOrderPage> @@ -281,7 +305,7 @@ class _DayOrderPageState extends State<DayOrderPage>
281 ), 305 ),
282 HEmptyView(10), 306 HEmptyView(10),
283 Text( 307 Text(
284 - '提前点餐 9位', 308 + '提前点餐 ${widget.daylist.order}位',
285 style: TextStyle( 309 style: TextStyle(
286 color: MyColours.color_999999, 310 color: MyColours.color_999999,
287 fontSize: font( 311 fontSize: font(
@@ -296,7 +320,7 @@ class _DayOrderPageState extends State<DayOrderPage> @@ -296,7 +320,7 @@ class _DayOrderPageState extends State<DayOrderPage>
296 ), 320 ),
297 HEmptyView(10), 321 HEmptyView(10),
298 Text( 322 Text(
299 - '安排菜 9位', 323 + '安排菜 ${widget.daylist.plancook}位',
300 style: TextStyle( 324 style: TextStyle(
301 color: MyColours.color_999999, 325 color: MyColours.color_999999,
302 fontSize: font( 326 fontSize: font(
@@ -383,6 +407,10 @@ class _DayOrderPageState extends State<DayOrderPage> @@ -383,6 +407,10 @@ class _DayOrderPageState extends State<DayOrderPage>
383 ), 407 ),
384 DayOrderLeftPage( 408 DayOrderLeftPage(
385 index: 1, 409 index: 1,
  410 + year: widget.year,
  411 + month: widget.month,
  412 + day: widget.day,
  413 + uid: widget.uid,
386 ), 414 ),
387 ]), 415 ]),
388 ), 416 ),
@@ -537,9 +537,14 @@ class _MonthOrderPageState extends State<MonthOrderPage> { @@ -537,9 +537,14 @@ class _MonthOrderPageState extends State<MonthOrderPage> {
537 customerProvider.monthStaticsData.dayList[index]; 537 customerProvider.monthStaticsData.dayList[index];
538 return InkWell( 538 return InkWell(
539 onTap: () { 539 onTap: () {
540 - NavigatorUtil.goDayOrderPage(context,  
541 - widget.year, widget.month, daylist.days,  
542 - uid: widget.uid); 540 + NavigatorUtil.goDayOrderPage(
  541 + context,
  542 + widget.year.toString(),
  543 + widget.month.toString(),
  544 + daylist.days.toString(),
  545 + daylist,
  546 + uid: widget.uid.toString(),
  547 + );
543 }, 548 },
544 child: Container( 549 child: Container(
545 margin: EdgeInsets.only(bottom: w(10)), 550 margin: EdgeInsets.only(bottom: w(10)),
@@ -1167,7 +1167,9 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -1167,7 +1167,9 @@ class TableManagerPageState extends State<TableManagerPage> {
1167 ))) 1167 )))
1168 ], 1168 ],
1169 ), 1169 ),
1170 - ) 1170 + ),
  1171 + VEmptyView(44),
  1172 + _remarkWidget()
1171 ], 1173 ],
1172 ), 1174 ),
1173 Positioned( 1175 Positioned(
@@ -1187,10 +1189,13 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -1187,10 +1189,13 @@ class TableManagerPageState extends State<TableManagerPage> {
1187 color: MyColours.color_e5e5e5, 1189 color: MyColours.color_e5e5e5,
1188 blurRadius: ScreenUtil().setWidth(20)) 1190 blurRadius: ScreenUtil().setWidth(20))
1189 ]), 1191 ]),
1190 - width: ScreenUtil().setWidth(440),  
1191 - height: _baseIndoProvider.userHistorys.length > 1  
1192 - ? ScreenUtil().setWidth(140)  
1193 - : ScreenUtil().setWidth(104), 1192 + // width: double.infinity,
  1193 + width: ScreenUtil().screenWidth-w(60),
  1194 + // width: ScreenUtil().setWidth(350),
  1195 + constraints: BoxConstraints(maxHeight: w(170)),
  1196 + // height: _baseIndoProvider.userHistorys.length > 1
  1197 + // ? ScreenUtil().setWidth(140)
  1198 + // : ScreenUtil().setWidth(104),
1194 padding: EdgeInsets.symmetric( 1199 padding: EdgeInsets.symmetric(
1195 horizontal: ScreenUtil().setWidth(30)), 1200 horizontal: ScreenUtil().setWidth(30)),
1196 child: Align( 1201 child: Align(
@@ -1409,9 +1414,10 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -1409,9 +1414,10 @@ class TableManagerPageState extends State<TableManagerPage> {
1409 1414
1410 Widget _remarkWidget() { 1415 Widget _remarkWidget() {
1411 return Padding( 1416 return Padding(
1412 - padding: EdgeInsets.symmetric(  
1413 - horizontal: ScreenUtil().setWidth(48),  
1414 - ), 1417 + padding: EdgeInsets.zero,
  1418 + // (
  1419 + // horizontal: ScreenUtil().setWidth(48),
  1420 + // ),
1415 child: Column( 1421 child: Column(
1416 crossAxisAlignment: CrossAxisAlignment.start, 1422 crossAxisAlignment: CrossAxisAlignment.start,
1417 children: [ 1423 children: [
@@ -2178,12 +2184,11 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -2178,12 +2184,11 @@ class TableManagerPageState extends State<TableManagerPage> {
2178 ); 2184 );
2179 }), 2185 }),
2180 ), 2186 ),
2181 - Column(children: [  
2182 - _customerInfoWidget(),  
2183 - VEmptyView(44),  
2184 - _remarkWidget()  
2185 - // _couponWidget(),  
2186 - ]), 2187 + // Column(children: [
  2188 + _customerInfoWidget(),
  2189 +
  2190 + // _couponWidget(),
  2191 + // ]),
2187 2192
2188 VEmptyView(20), 2193 VEmptyView(20),
2189 Padding( 2194 Padding(
@@ -30,6 +30,7 @@ import '../models/IsExamineModel.dart'; @@ -30,6 +30,7 @@ import '../models/IsExamineModel.dart';
30 import '../models/get_banquet_by_id_new_model.dart'; 30 import '../models/get_banquet_by_id_new_model.dart';
31 import '../models/get_banquet_deposit_model.dart'; 31 import '../models/get_banquet_deposit_model.dart';
32 import '../models/menu_unit_model.dart'; 32 import '../models/menu_unit_model.dart';
  33 +import '../models/month_statics_model.dart';
33 import '../models/otherset_model.dart'; 34 import '../models/otherset_model.dart';
34 import '../models/out_wine_record_model.dart'; 35 import '../models/out_wine_record_model.dart';
35 import '../models/plan_cook_by_rid_model.dart'; 36 import '../models/plan_cook_by_rid_model.dart';
@@ -1745,11 +1746,11 @@ class NavigatorUtil { @@ -1745,11 +1746,11 @@ class NavigatorUtil {
1745 } 1746 }
1746 1747
1747 /// 日订单 1748 /// 日订单
1748 - static Future<dynamic> goDayOrderPage(  
1749 - BuildContext context, String year, String month, String day, 1749 + static Future<dynamic> goDayOrderPage(BuildContext context, String year,
  1750 + String month, String day, DayList daylist,
1750 {replace = false, String uid = ''}) { 1751 {replace = false, String uid = ''}) {
1751 return _navigateTo(context, 1752 return _navigateTo(context,
1752 - "${Routes.day_order_page}?year=${year}&month=${month}&day=${day}&uid=${uid}", 1753 + "${Routes.day_order_page}?year=${year}&month=${month}&day=${day}&uid=${uid}&daylist=${FluroConvertUtils.object2string(daylist)}",
1753 replace: replace); 1754 replace: replace);
1754 } 1755 }
1755 } 1756 }
@@ -156,6 +156,7 @@ import 'package:provider/provider.dart'; @@ -156,6 +156,7 @@ import 'package:provider/provider.dart';
156 import '../models/IsExamineModel.dart'; 156 import '../models/IsExamineModel.dart';
157 import '../models/get_banquet_by_id_new_model.dart'; 157 import '../models/get_banquet_by_id_new_model.dart';
158 import '../models/menu_unit_model.dart'; 158 import '../models/menu_unit_model.dart';
  159 +import '../models/month_statics_model.dart';
159 import '../models/out_wine_record_model.dart'; 160 import '../models/out_wine_record_model.dart';
160 import '../models/plan_cook_by_rid_model.dart'; 161 import '../models/plan_cook_by_rid_model.dart';
161 import '../models/plan_cook_list_model.dart'; 162 import '../models/plan_cook_list_model.dart';
@@ -2847,12 +2848,11 @@ var dayOrderPageHandle = new Handler( @@ -2847,12 +2848,11 @@ var dayOrderPageHandle = new Handler(
2847 String day = params["day"].first; 2848 String day = params["day"].first;
2848 String uid = params["uid"].first; 2849 String uid = params["uid"].first;
2849 2850
2850 - // IsExamineSunModel isExamineSunModel = IsExamineSunModel.fromJson(json.decode(  
2851 - // FluroConvertUtils.fluroCnParamsDecode(  
2852 - // params["isExamineSunModel"].first)));  
2853 - // } 2851 + DayList daylist = DayList.fromJson(json
  2852 + .decode(FluroConvertUtils.fluroCnParamsDecode(params["daylist"].first)));
2854 2853
2855 return ChangeNotifierProvider<CustomerProvider>( 2854 return ChangeNotifierProvider<CustomerProvider>(
2856 create: (_) => CustomerProvider(), 2855 create: (_) => CustomerProvider(),
2857 - child: DayOrderPage(year: year, month: month, day: day, uid: uid)); 2856 + child: DayOrderPage(
  2857 + year: year, month: month, day: day, uid: uid, daylist: daylist));
2858 }); 2858 });