xt / Flutter-ReserveApp · Commits

Go to a project

Commit 2dc321182ffd416b35bab32fa9183e9e9fc79958

Authored by wdn127929
1 parent 3b9cdf6b
build: skipped

提前点餐后页面null 数据展示bug

Inline Side-by-side
Showing 9 changed files with 106 additions and 80 deletions
@@ -71,6 +71,7 @@ Future<void> main() async { @@ -71,6 +71,7 @@ Future<void> main() async {
71 await initializeDateFormatting(); 71 await initializeDateFormatting();
72 // _requestPermissions(); 72 // _requestPermissions();
73 Utils.changeStatusColor(); 73 Utils.changeStatusColor();
  74 + await App.initSp();
74 SystemChrome.setPreferredOrientations( 75 SystemChrome.setPreferredOrientations(
75 [DeviceOrientation.portraitUp, DeviceOrientation.portraitDown]) 76 [DeviceOrientation.portraitUp, DeviceOrientation.portraitDown])
76 .then((_) { 77 .then((_) {
@@ -110,7 +111,7 @@ Future<void> main() async { @@ -110,7 +111,7 @@ Future<void> main() async {
110 child: MyApp(), 111 child: MyApp(),
111 )); 112 ));
112 }); 113 });
113 - await App.initSp(); 114 + // await App.initSp();
114 await AmapService.instance.init( 115 await AmapService.instance.init(
115 iosKey: 'e373581528f8fd901c01dfbda236159e', 116 iosKey: 'e373581528f8fd901c01dfbda236159e',
116 androidKey: 'dbced781d0acd36184d5b4b54da7188d'); 117 androidKey: 'dbced781d0acd36184d5b4b54da7188d');
@@ -26,6 +26,7 @@ class Message { @@ -26,6 +26,7 @@ class Message {
26 String room_info; 26 String room_info;
27 27
28 String get rnameStr { 28 String get rnameStr {
  29 + if (rname == null || rname == '') return "";
29 switch (sex.toString()) { 30 switch (sex.toString()) {
30 case "1": //先生 31 case "1": //先生
31 case "男": 32 case "男":
@@ -220,6 +220,7 @@ class ReserveDetailSunModel extends Object { @@ -220,6 +220,7 @@ class ReserveDetailSunModel extends Object {
220 220
221 ///顾客姓名 221 ///顾客姓名
222 String get rnameStr { 222 String get rnameStr {
  223 + if (rname == null || rname == '') return "";
223 // 预订人姓名：1：男 2：女 224 // 预订人姓名：1：男 2：女
224 switch (sex) { 225 switch (sex) {
225 case "1": 226 case "1":
@@ -66,12 +66,12 @@ class MessageDialogItem extends StatelessWidget { @@ -66,12 +66,12 @@ class MessageDialogItem extends StatelessWidget {
66 if (isTreated) { 66 if (isTreated) {
67 if (message.message_type == "10") { 67 if (message.message_type == "10") {
68 NavigatorUtil.goNotebookDetailPage( 68 NavigatorUtil.goNotebookDetailPage(
69 - context, message.rid.toString(),message.uid); 69 + context, message.rid.toString(), message.uid);
70 } else if (message.message_type == "1") { 70 } else if (message.message_type == "1") {
71 NavigatorUtil.goHasOrderFoodPage(context, rid: message.rid); 71 NavigatorUtil.goHasOrderFoodPage(context, rid: message.rid);
72 } else if (message.message_type == "11") { 72 } else if (message.message_type == "11") {
73 NavigatorUtil.goNotebookDetailPage( 73 NavigatorUtil.goNotebookDetailPage(
74 - context, message.rid.toString(),message.uid); 74 + context, message.rid.toString(), message.uid);
75 } else if (message.message_type == "12") { 75 } else if (message.message_type == "12") {
76 //在线买单消息查看 76 //在线买单消息查看
77 NavigatorUtil.goOnlineCheckDetailPage(context, 77 NavigatorUtil.goOnlineCheckDetailPage(context,
@@ -126,7 +126,9 @@ class MessageDialogItem extends StatelessWidget { @@ -126,7 +126,9 @@ class MessageDialogItem extends StatelessWidget {
126 VEmptyView(20), 126 VEmptyView(20),
127 message.message_type == "11" 127 message.message_type == "11"
128 ? Text( 128 ? Text(
129 - "${message.ddateStr}的${message.rnameStr}取消了预订", 129 + message.rname != null && message.rname != ''
  130 + ? "${message.ddateStr}的${message.rnameStr}取消了预订"
  131 + : "${message.ddateStr} 取消了预订",
130 style: TextStyle( 132 style: TextStyle(
131 color: textColor, 133 color: textColor,
132 fontSize: ScreenUtil().setSp(28)), 134 fontSize: ScreenUtil().setSp(28)),
@@ -149,12 +151,14 @@ class MessageDialogItem extends StatelessWidget { @@ -149,12 +151,14 @@ class MessageDialogItem extends StatelessWidget {
149 fontSize: ScreenUtil().setSp(28)), 151 fontSize: ScreenUtil().setSp(28)),
150 ), 152 ),
151 VEmptyView(10), 153 VEmptyView(10),
152 - Text(  
153 - "${subTitleThr}：${message.rnameStr}",  
154 - style: TextStyle(  
155 - color: textColor,  
156 - fontSize: ScreenUtil().setSp(28)),  
157 - ), 154 + message.rname != null && message.rname != ''
  155 + ? Text(
  156 + "${subTitleThr}：${message.rnameStr}",
  157 + style: TextStyle(
  158 + color: textColor,
  159 + fontSize: ScreenUtil().setSp(28)),
  160 + )
  161 + : SizedBox(),
158 ], 162 ],
159 ) 163 )
160 ], 164 ],
@@ -185,7 +189,7 @@ class MessageDialogItem extends StatelessWidget { @@ -185,7 +189,7 @@ class MessageDialogItem extends StatelessWidget {
185 : false); 189 : false);
186 } else if (message.message_type == "11") { 190 } else if (message.message_type == "11") {
187 NavigatorUtil.goNotebookDetailPage( 191 NavigatorUtil.goNotebookDetailPage(
188 - context, message.rid.toString(),message.uid, 192 + context, message.rid.toString(), message.uid,
189 replace: messageDialogModel.messages.isEmpty 193 replace: messageDialogModel.messages.isEmpty
190 ? true 194 ? true
191 : false); 195 : false);
@@ -164,8 +164,10 @@ class _MessageHasOrderFoodPageState extends State<MessageHasOrderFoodPage> { @@ -164,8 +164,10 @@ class _MessageHasOrderFoodPageState extends State<MessageHasOrderFoodPage> {
164 _orderFoodProvider 164 _orderFoodProvider
165 .createdOrderSunModel.remark), 165 .createdOrderSunModel.remark),
166 ), 166 ),
167 - _getRow(  
168 - '人数', _orderFoodProvider.createdOrderSunModel.pnum), 167 + _orderFoodProvider.createdOrderSunModel.pnum != null
  168 + ? _getRow('人数',
  169 + _orderFoodProvider.createdOrderSunModel.pnum)
  170 + : SizedBox(),
169 VEmptyView(30), 171 VEmptyView(30),
170 _orderFoodProvider.reserveDetailSunModel != null 172 _orderFoodProvider.reserveDetailSunModel != null
171 ? _getRow( 173 ? _getRow(
@@ -184,7 +184,9 @@ class MessageItem extends StatelessWidget { @@ -184,7 +184,9 @@ class MessageItem extends StatelessWidget {
184 VEmptyView(20), 184 VEmptyView(20),
185 message.message_type == "11" 185 message.message_type == "11"
186 ? Text( 186 ? Text(
187 - "${message.ddateStr}的${message.rnameStr}取消了预订", 187 + message.rname != null
  188 + ? "${message.ddateStr}的${message.rnameStr}取消了预订"
  189 + : "${message.ddateStr} 取消了预订",
188 style: TextStyle( 190 style: TextStyle(
189 color: textColor, 191 color: textColor,
190 fontSize: ScreenUtil().setSp(28)), 192 fontSize: ScreenUtil().setSp(28)),
@@ -207,12 +209,14 @@ class MessageItem extends StatelessWidget { @@ -207,12 +209,14 @@ class MessageItem extends StatelessWidget {
207 fontSize: ScreenUtil().setSp(28)), 209 fontSize: ScreenUtil().setSp(28)),
208 ), 210 ),
209 VEmptyView(10), 211 VEmptyView(10),
210 - Text(  
211 - "预订人：${message.rnameStr}",  
212 - style: TextStyle(  
213 - color: textColor,  
214 - fontSize: ScreenUtil().setSp(28)),  
215 - ), 212 + message.rnameStr == ''
  213 + ? SizedBox()
  214 + : Text(
  215 + "预订人：${message.rnameStr}",
  216 + style: TextStyle(
  217 + color: textColor,
  218 + fontSize: ScreenUtil().setSp(28)),
  219 + ),
216 ], 220 ],
217 ), 221 ),
218 message.message_type == "11" ? VEmptyView(80) : VEmptyView(0) 222 message.message_type == "11" ? VEmptyView(80) : VEmptyView(0)
@@ -510,9 +510,6 @@ class PhotoManagerPageState extends State<PhotoManagerPage> { @@ -510,9 +510,6 @@ class PhotoManagerPageState extends State<PhotoManagerPage> {
510 selectNum = 0; 510 selectNum = 0;
511 if (table.id == tableItem.id) { 511 if (table.id == tableItem.id) {
512 selectTableId = table.id; 512 selectTableId = table.id;
513 - setState(() {  
514 - tableItem.selected = true;  
515 - });  
516 513
517 // selectTables = []; 514 // selectTables = [];
518 // selectNum++; 515 // selectNum++;
@@ -525,6 +522,9 @@ class PhotoManagerPageState extends State<PhotoManagerPage> { @@ -525,6 +522,9 @@ class PhotoManagerPageState extends State<PhotoManagerPage> {
525 522
526 NavigatorUtil.goTablePhotoManagerPage(context, 523 NavigatorUtil.goTablePhotoManagerPage(context,
527 tid: table.id, tname: table.name); 524 tid: table.id, tname: table.name);
  525 + setState(() {
  526 + tableItem.selected = true;
  527 + });
528 } 528 }
529 } 529 }
530 } 530 }
@@ -466,7 +466,9 @@ class _OnlineCheckDetailPageState extends State<OnlineCheckDetailPage> { @@ -466,7 +466,9 @@ class _OnlineCheckDetailPageState extends State<OnlineCheckDetailPage> {
466 VEmptyView(24), 466 VEmptyView(24),
467 _customInfoItemWidget( 467 _customInfoItemWidget(
468 '买单顾客', 468 '买单顾客',
469 - _orderFoodProvider.reserveDetailSunModel != null 469 + _orderFoodProvider.reserveDetailSunModel != null &&
  470 + _orderFoodProvider.reserveDetailSunModel.rname !=
  471 + null
470 ? _orderFoodProvider.reserveDetailSunModel.rnameStr 472 ? _orderFoodProvider.reserveDetailSunModel.rnameStr
471 : ''), 473 : ''),
472 VEmptyView(24), 474 VEmptyView(24),
@@ -46,13 +46,13 @@ class EnterModel with ChangeNotifier { @@ -46,13 +46,13 @@ class EnterModel with ChangeNotifier {
46 isSetDate = '0'; 46 isSetDate = '0';
47 } 47 }
48 48
49 - initData(NotebookDetail notebookDetail){  
50 - this.detailEntity=notebookDetail; 49 + initData(NotebookDetail notebookDetail) {
  50 + this.detailEntity = notebookDetail;
51 print(detailEntity); 51 print(detailEntity);
52 if (detailEntity.phone != '0') { 52 if (detailEntity.phone != '0') {
53 phoneController.text = detailEntity.phone; 53 phoneController.text = detailEntity.phone;
54 } 54 }
55 - if (detailEntity.rnameStr != '') { 55 + if (detailEntity.rname != null && detailEntity.rnameStr != '') {
56 nameController.text = detailEntity.rname; 56 nameController.text = detailEntity.rname;
57 } 57 }
58 if (detailEntity.cusdem != '') { 58 if (detailEntity.cusdem != '') {
@@ -68,7 +68,7 @@ class EnterModel with ChangeNotifier { @@ -68,7 +68,7 @@ class EnterModel with ChangeNotifier {
68 _initDateList() { 68 _initDateList() {
69 String createtime = detailEntity.ddate.toString() + '000'; 69 String createtime = detailEntity.ddate.toString() + '000';
70 DateTime createTime = 70 DateTime createTime =
71 - DateTime.fromMillisecondsSinceEpoch(int.parse(createtime)); 71 + DateTime.fromMillisecondsSinceEpoch(int.parse(createtime));
72 ddateStr = DateUtil.formatDate(createTime, format: DateFormats.h_m); 72 ddateStr = DateUtil.formatDate(createTime, format: DateFormats.h_m);
73 String dateTimeSelect = DateUtil.formatDateMs( 73 String dateTimeSelect = DateUtil.formatDateMs(
74 createTime.millisecondsSinceEpoch, 74 createTime.millisecondsSinceEpoch,
@@ -87,7 +87,7 @@ class EnterModel with ChangeNotifier { @@ -87,7 +87,7 @@ class EnterModel with ChangeNotifier {
87 //明天 87 //明天
88 int tomorrowMill = dateTimeMill + 24 * 60 * 60 * 1000; 88 int tomorrowMill = dateTimeMill + 24 * 60 * 60 * 1000;
89 String dateTextTomorrow = 89 String dateTextTomorrow =
90 - DateUtil.formatDateMs(tomorrowMill, format: 'MM-dd'); 90 + DateUtil.formatDateMs(tomorrowMill, format: 'MM-dd');
91 dateList.add({ 91 dateList.add({
92 'title': dateTextTomorrow, 92 'title': dateTextTomorrow,
93 'select': dateTimeSelect == dateTextTomorrow ? true : false, 93 'select': dateTimeSelect == dateTextTomorrow ? true : false,
@@ -110,7 +110,7 @@ class EnterModel with ChangeNotifier { @@ -110,7 +110,7 @@ class EnterModel with ChangeNotifier {
110 } 110 }
111 111
112 /// 初始化 早市、午市、晚市 112 /// 初始化 早市、午市、晚市
113 - _initSunDateList(BuildContext context,morning, noon, night) { 113 + _initSunDateList(BuildContext context, morning, noon, night) {
114 String ddateSolt = detailEntity.ddate_solt; 114 String ddateSolt = detailEntity.ddate_solt;
115 if (morning != '') { 115 if (morning != '') {
116 sunDateList.add({ 116 sunDateList.add({
@@ -119,7 +119,10 @@ class EnterModel with ChangeNotifier { @@ -119,7 +119,10 @@ class EnterModel with ChangeNotifier {
119 'ddateSolt': 1, 119 'ddateSolt': 1,
120 'key': 'morning', 120 'key': 'morning',
121 'isSelect': ddateSolt == '1' ? true : false, 121 'isSelect': ddateSolt == '1' ? true : false,
122 - "isEnable":!isOverMorning(DateTime.fromMillisecondsSinceEpoch(int.parse(detailEntity.ddate)*1000), context) 122 + "isEnable": !isOverMorning(
  123 + DateTime.fromMillisecondsSinceEpoch(
  124 + int.parse(detailEntity.ddate) * 1000),
  125 + context)
123 }); 126 });
124 } 127 }
125 if (noon != '') { 128 if (noon != '') {
@@ -129,7 +132,10 @@ class EnterModel with ChangeNotifier { @@ -129,7 +132,10 @@ class EnterModel with ChangeNotifier {
129 'ddateSolt': 2, 132 'ddateSolt': 2,
130 'key': 'noon', 133 'key': 'noon',
131 'isSelect': ddateSolt == '2' ? true : false, 134 'isSelect': ddateSolt == '2' ? true : false,
132 - "isEnable":!isOverNoon(DateTime.fromMillisecondsSinceEpoch(int.parse(detailEntity.ddate)*1000), context) 135 + "isEnable": !isOverNoon(
  136 + DateTime.fromMillisecondsSinceEpoch(
  137 + int.parse(detailEntity.ddate) * 1000),
  138 + context)
133 }); 139 });
134 } 140 }
135 if (night != '') { 141 if (night != '') {
@@ -139,64 +145,68 @@ class EnterModel with ChangeNotifier { @@ -139,64 +145,68 @@ class EnterModel with ChangeNotifier {
139 'ddateSolt': 3, 145 'ddateSolt': 3,
140 'key': 'night', 146 'key': 'night',
141 'isSelect': ddateSolt == '3' ? true : false, 147 'isSelect': ddateSolt == '3' ? true : false,
142 - "isEnable":!isOverNight(DateTime.fromMillisecondsSinceEpoch(int.parse(detailEntity.ddate)*1000), context) 148 + "isEnable": !isOverNight(
  149 + DateTime.fromMillisecondsSinceEpoch(
  150 + int.parse(detailEntity.ddate) * 1000),
  151 + context)
143 }); 152 });
144 } 153 }
145 notifyListeners(); 154 notifyListeners();
146 } 155 }
147 156
148 - updateSunDateList(DateTime dateTime,BuildContext context){  
149 - UserModel userModel=Provider.of<UserModel>(context,listen: false);  
150 - for(Map item in sunDateList){  
151 - item["isEnable"]=true;  
152 - if(item['dateText']=="早市"){  
153 - item["isEnable"]=!isOverMorning(dateTime, context);  
154 - }else if(item['dateText']=="午市"){  
155 - item["isEnable"]=!isOverNoon(dateTime, context);  
156 - }else if(item['dateText']=="晚市"){  
157 - item["isEnable"]=!isOverNight(dateTime, context); 157 + updateSunDateList(DateTime dateTime, BuildContext context) {
  158 + UserModel userModel = Provider.of<UserModel>(context, listen: false);
  159 + for (Map item in sunDateList) {
  160 + item["isEnable"] = true;
  161 + if (item['dateText'] == "早市") {
  162 + item["isEnable"] = !isOverMorning(dateTime, context);
  163 + } else if (item['dateText'] == "午市") {
  164 + item["isEnable"] = !isOverNoon(dateTime, context);
  165 + } else if (item['dateText'] == "晚市") {
  166 + item["isEnable"] = !isOverNight(dateTime, context);
158 } 167 }
159 } 168 }
160 } 169 }
161 170
162 -  
163 -  
164 //当前时间是否查过所选日期早市 171 //当前时间是否查过所选日期早市
165 - bool isOverMorning(DateTime dateTime,BuildContext context){  
166 - int millsNow=DateTime.now().millisecondsSinceEpoch;  
167 - UserModel userModel=Provider.of<UserModel>(context,listen: false);  
168 - String morning=userModel.user.morning==""?"00:00-00:00":userModel.user.morning;  
169 - String endMorning=morning.split("-")[1];  
170 - int endMorningMills=DateUtil.getDateMsByTimeStr(DateUtil.formatDate(dateTime).replaceRange(11,19, "$endMorning:00"));  
171 - if(millsNow>endMorningMills)return true; 172 + bool isOverMorning(DateTime dateTime, BuildContext context) {
  173 + int millsNow = DateTime.now().millisecondsSinceEpoch;
  174 + UserModel userModel = Provider.of<UserModel>(context, listen: false);
  175 + String morning =
  176 + userModel.user.morning == "" ? "00:00-00:00" : userModel.user.morning;
  177 + String endMorning = morning.split("-")[1];
  178 + int endMorningMills = DateUtil.getDateMsByTimeStr(
  179 + DateUtil.formatDate(dateTime).replaceRange(11, 19, "$endMorning:00"));
  180 + if (millsNow > endMorningMills) return true;
172 return false; 181 return false;
173 } 182 }
174 183
175 //当前时间是否查过所选日期午市 184 //当前时间是否查过所选日期午市
176 - bool isOverNoon(DateTime dateTime,BuildContext context){  
177 - int millsNow=DateTime.now().millisecondsSinceEpoch;  
178 - UserModel userModel=Provider.of<UserModel>(context,listen: false);  
179 - String noon=userModel.user.noon==""?"00:00-00:00":userModel.user.noon;  
180 - String endNoon=noon.split("-")[1];  
181 - int endNoonMills=DateUtil.getDateMsByTimeStr(DateUtil.formatDate(dateTime).replaceRange(11,19, "$endNoon:00"));  
182 - if(millsNow>endNoonMills)return true; 185 + bool isOverNoon(DateTime dateTime, BuildContext context) {
  186 + int millsNow = DateTime.now().millisecondsSinceEpoch;
  187 + UserModel userModel = Provider.of<UserModel>(context, listen: false);
  188 + String noon =
  189 + userModel.user.noon == "" ? "00:00-00:00" : userModel.user.noon;
  190 + String endNoon = noon.split("-")[1];
  191 + int endNoonMills = DateUtil.getDateMsByTimeStr(
  192 + DateUtil.formatDate(dateTime).replaceRange(11, 19, "$endNoon:00"));
  193 + if (millsNow > endNoonMills) return true;
183 return false; 194 return false;
184 } 195 }
185 196
186 //当前时间是否查过所选日期晚市 197 //当前时间是否查过所选日期晚市
187 - bool isOverNight(DateTime dateTime,BuildContext context){  
188 - int millsNow=DateTime.now().millisecondsSinceEpoch;  
189 - UserModel userModel=Provider.of<UserModel>(context,listen: false);  
190 - String night=userModel.user.night==""?"00:00-00:00":userModel.user.night;  
191 - String endNight=night.split("-")[1];  
192 - int endNightMills=DateUtil.getDateMsByTimeStr(DateUtil.formatDate(dateTime).replaceRange(11,19, "$endNight:00"));  
193 - if(millsNow>endNightMills)return true; 198 + bool isOverNight(DateTime dateTime, BuildContext context) {
  199 + int millsNow = DateTime.now().millisecondsSinceEpoch;
  200 + UserModel userModel = Provider.of<UserModel>(context, listen: false);
  201 + String night =
  202 + userModel.user.night == "" ? "00:00-00:00" : userModel.user.night;
  203 + String endNight = night.split("-")[1];
  204 + int endNightMills = DateUtil.getDateMsByTimeStr(
  205 + DateUtil.formatDate(dateTime).replaceRange(11, 19, "$endNight:00"));
  206 + if (millsNow > endNightMills) return true;
194 return false; 207 return false;
195 } 208 }
196 209
197 -  
198 -  
199 -  
200 //人数 210 //人数
201 _initPersonNumList() { 211 _initPersonNumList() {
202 String pnum = detailEntity.pnum; 212 String pnum = detailEntity.pnum;
@@ -286,16 +296,17 @@ class EnterModel with ChangeNotifier { @@ -286,16 +296,17 @@ class EnterModel with ChangeNotifier {
286 model.daily.morning == '' 296 model.daily.morning == ''
287 ? dailyMap.putIfAbsent('morning', () => '') 297 ? dailyMap.putIfAbsent('morning', () => '')
288 : dailyMap.putIfAbsent( 298 : dailyMap.putIfAbsent(
289 - 'morning', () => _getHourAndMinute(model.daily.morning, 1, model)); 299 + 'morning', () => _getHourAndMinute(model.daily.morning, 1, model));
290 model.daily.noon == '' 300 model.daily.noon == ''
291 ? dailyMap.putIfAbsent('noon', () => '') 301 ? dailyMap.putIfAbsent('noon', () => '')
292 : dailyMap.putIfAbsent( 302 : dailyMap.putIfAbsent(
293 - 'noon', () => _getHourAndMinute(model.daily.noon, 2, model)); 303 + 'noon', () => _getHourAndMinute(model.daily.noon, 2, model));
294 model.daily.night == '' 304 model.daily.night == ''
295 ? dailyMap.putIfAbsent('night', () => '') 305 ? dailyMap.putIfAbsent('night', () => '')
296 : dailyMap.putIfAbsent( 306 : dailyMap.putIfAbsent(
297 - 'night', () => _getHourAndMinute(model.daily.night, 3, model));  
298 - _initSunDateList(context,model.daily.morning, model.daily.noon, model.daily.night); 307 + 'night', () => _getHourAndMinute(model.daily.night, 3, model));
  308 + _initSunDateList(
  309 + context, model.daily.morning, model.daily.noon, model.daily.night);
299 } 310 }
300 311
301 //根据获取时间 11:00-12:30 获取30分钟间隔组装的数组 312 //根据获取时间 11:00-12:30 获取30分钟间隔组装的数组
@@ -317,7 +328,7 @@ class EnterModel with ChangeNotifier { @@ -317,7 +328,7 @@ class EnterModel with ChangeNotifier {
317 String temp = _dealTime(beginHour, beginMinute); 328 String temp = _dealTime(beginHour, beginMinute);
318 bool tempSelect = false; 329 bool tempSelect = false;
319 if (int.parse(isSetDate) == 1) //设置预订时间 330 if (int.parse(isSetDate) == 1) //设置预订时间
320 - { 331 + {
321 if (temp == ddateStr) { 332 if (temp == ddateStr) {
322 tempSelect = true; 333 tempSelect = true;
323 } 334 }
@@ -380,7 +391,7 @@ class EnterModel with ChangeNotifier { @@ -380,7 +391,7 @@ class EnterModel with ChangeNotifier {
380 }; 391 };
381 BaseResp<Map<String, dynamic>> baseResp = await DioUtil() 392 BaseResp<Map<String, dynamic>> baseResp = await DioUtil()
382 .request<Map<String, dynamic>>(context, Method.get, HttpUrl.sellerinfo, 393 .request<Map<String, dynamic>>(context, Method.get, HttpUrl.sellerinfo,
383 - data: params) 394 + data: params)
384 .catchError((error) { 395 .catchError((error) {
385 print(error.toString()); 396 print(error.toString());
386 }); 397 });
@@ -418,7 +429,7 @@ class EnterModel with ChangeNotifier { @@ -418,7 +429,7 @@ class EnterModel with ChangeNotifier {
418 }; 429 };
419 BaseResp<dynamic> baseResp = await DioUtil() 430 BaseResp<dynamic> baseResp = await DioUtil()
420 .request<dynamic>(context, Method.get, HttpUrl.get_table_list, 431 .request<dynamic>(context, Method.get, HttpUrl.get_table_list,
421 - data: params) 432 + data: params)
422 .catchError((error) { 433 .catchError((error) {
423 print(error.toString()); 434 print(error.toString());
424 }); 435 });
@@ -608,14 +619,14 @@ class EnterModel with ChangeNotifier { @@ -608,14 +619,14 @@ class EnterModel with ChangeNotifier {
608 "rdate": rdate, //预定用餐时间范围：时间戳 开始时间戳(time)-结束时间戳(time) 619 "rdate": rdate, //预定用餐时间范围：时间戳 开始时间戳(time)-结束时间戳(time)
609 "ddate": '$ddate'.substring(0, 10), //到店时间 620 "ddate": '$ddate'.substring(0, 10), //到店时间
610 "ddate_solt": ddateSolt, 621 "ddate_solt": ddateSolt,
611 - "channel":'5',  
612 - "uid":userModel.user.openid 622 + "channel": '5',
  623 + "uid": userModel.user.openid
613 }; 624 };
614 print(params.toString()); 625 print(params.toString());
615 BaseResp<Map<String, dynamic>> baseResp = await DioUtil() 626 BaseResp<Map<String, dynamic>> baseResp = await DioUtil()
616 .request<Map<String, dynamic>>( 627 .request<Map<String, dynamic>>(
617 - context, Method.get, HttpUrl.set_reserve_info,  
618 - data: params) 628 + context, Method.get, HttpUrl.set_reserve_info,
  629 + data: params)
619 .catchError((error) { 630 .catchError((error) {
620 print(error); 631 print(error);
621 }); 632 });