xt / Flutter-ReserveApp · Commits

Go to a project

Commit 7684885b2dd47b2ea4bde0f42da07430be01e5d0

Authored by wdn127929
1 parent 82794b7a
build: skipped

店内常点

Inline Side-by-side
Showing 3 changed files with 97 additions and 92 deletions
@@ -12,14 +12,14 @@ if (flutterRoot == null) { @@ -12,14 +12,14 @@ if (flutterRoot == null) {
12 } 12 }
13 13
14 14
15 -def flutterVersionCode = "431" 15 +def flutterVersionCode = "432"
16 if (flutterVersionCode == null) { 16 if (flutterVersionCode == null) {
17 - flutterVersionCode = '431' 17 + flutterVersionCode = '432'
18 } 18 }
19 19
20 -def flutterVersionName = "4.3.1" 20 +def flutterVersionName = "4.3.2"
21 if (flutterVersionName == null) { 21 if (flutterVersionName == null) {
22 - flutterVersionName = '4.3.1' 22 + flutterVersionName = '4.3.2'
23 } 23 }
24 apply plugin: 'com.android.application' 24 apply plugin: 'com.android.application'
25 apply plugin: 'kotlin-android' 25 apply plugin: 'kotlin-android'
@@ -809,7 +809,8 @@ class _OrderAdvanceHomePageState extends State<OrderAdvanceHomePage> { @@ -809,7 +809,8 @@ class _OrderAdvanceHomePageState extends State<OrderAdvanceHomePage> {
809 // if (oid != null) { 809 // if (oid != null) {
810 //获取成功 810 //获取成功
811 Utils.goShareOrderPageToWeChat(context, 811 Utils.goShareOrderPageToWeChat(context,
812 - title: '张红经理邀请您点餐了', 812 + title:
  813 + '${Provider.of<UserModel>(context, listen: false).user.nickName ?? Provider.of<UserModel>(context, listen: false).user.sellername}经理邀请您点餐了',
813 img: 814 img:
814 'http://nosqn.colorcun.com/reserve/images/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_201911151148571.jpg', 815 'http://nosqn.colorcun.com/reserve/images/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_201911151148571.jpg',
815 rid: widget.rid, 816 rid: widget.rid,
@@ -325,105 +325,109 @@ class PlanDishProvider extends ChangeNotifier { @@ -325,105 +325,109 @@ class PlanDishProvider extends ChangeNotifier {
325 List<MenuSunModel> data = []; 325 List<MenuSunModel> data = [];
326 List<MenuSunModel> datatemp = []; 326 List<MenuSunModel> datatemp = [];
327 sellerOftenSunModel.forEach((element) { 327 sellerOftenSunModel.forEach((element) {
328 - // SellerOftenSunModel  
329 - MenuSunModel menuSunModel = MenuSunModel();  
330 - menuSunModel.id = element.id;  
331 - menuSunModel.name = '${element.pnum}人';  
332 - // menuSunModel.price = element.menuPrice;  
333 - menuSunModel.price = element.price;  
334 - menuSunModel.member_price = element.memberPrice ?? element.price;  
335 - menuSunModel.unit = '份';  
336 - //  
337 -  
338 - List<MenuModel> cookF = [];  
339 - element.cooklist.forEach((value) {  
340 - MenuModel menuModel = MenuModel();  
341 - menuModel.id = value.classid;  
342 - menuModel.sellerid = element.sellerid;  
343 - menuModel.className = value.className;  
344 - menuModel.classLabel = null;  
345 - menuModel.order = null;  
346 - menuModel.status = '1';  
347 - menuModel.classType = null;  
348 - menuModel.cookbooklist = [];  
349 - value.cooklist.forEach((cook) {  
350 - MenuSunModel cookData = MenuSunModel();  
351 - cookData.id = cook.cookbookid;  
352 - cookData.sellerid = cook.sid;  
353 - cookData.cid = cook.classid;  
354 - cookData.price = cook.price;  
355 - cookData.member_price = cook.memberPrice ?? cook.price;  
356 - cookData.name = cook.name;  
357 - cookData.unit = cook.unit;  
358 - cookData.image = cook.image;  
359 - cookData.amount = cook.amount;  
360 -  
361 - // "specid": null,  
362 - // "practiceid": null,  
363 - // "class_name": "炒菜12",  
364 - // "class_order": "2"  
365 - menuModel.cookbooklist.add(cookData); 328 + if (element.cooklist != null) {
  329 + // SellerOftenSunModel
  330 + MenuSunModel menuSunModel = MenuSunModel();
  331 + menuSunModel.id = element.id;
  332 + menuSunModel.name = '${element.pnum}人';
  333 + // menuSunModel.price = element.menuPrice;
  334 + menuSunModel.price = element.price;
  335 + menuSunModel.member_price = element.memberPrice ?? element.price;
  336 + menuSunModel.unit = '份';
  337 + //
  338 +
  339 + List<MenuModel> cookF = [];
  340 + element.cooklist.forEach((value) {
  341 + MenuModel menuModel = MenuModel();
  342 + menuModel.id = value.classid;
  343 + menuModel.sellerid = element.sellerid;
  344 + menuModel.className = value.className;
  345 + menuModel.classLabel = null;
  346 + menuModel.order = null;
  347 + menuModel.status = '1';
  348 + menuModel.classType = null;
  349 + menuModel.cookbooklist = [];
  350 + value.cooklist.forEach((cook) {
  351 + MenuSunModel cookData = MenuSunModel();
  352 + cookData.id = cook.cookbookid;
  353 + cookData.sellerid = cook.sid;
  354 + cookData.cid = cook.classid;
  355 + cookData.price = cook.price;
  356 + cookData.member_price = cook.memberPrice ?? cook.price;
  357 + cookData.name = cook.name;
  358 + cookData.unit = cook.unit;
  359 + cookData.image = cook.image;
  360 + cookData.amount = cook.amount;
  361 +
  362 + // "specid": null,
  363 + // "practiceid": null,
  364 + // "class_name": "炒菜12",
  365 + // "class_order": "2"
  366 + menuModel.cookbooklist.add(cookData);
  367 + });
  368 +
  369 + cookF.add(menuModel);
366 }); 370 });
367 371
368 - cookF.add(menuModel);  
369 - }); 372 + menuSunModel.cookList = cookF;
370 373
371 - menuSunModel.cookList = cookF;  
372 -  
373 - data.add(menuSunModel);  
374 - // datatemp.add(menuSunModel); 374 + data.add(menuSunModel);
  375 + // datatemp.add(menuSunModel);
  376 + }
375 }); 377 });
376 print(data); 378 print(data);
377 379
378 sellerOftendata = data; 380 sellerOftendata = data;
379 381
380 sellerOftenSunModel.forEach((element) { 382 sellerOftenSunModel.forEach((element) {
381 - // SellerOftenSunModel  
382 - MenuSunModel menuSunModel = MenuSunModel();  
383 - menuSunModel.id = element.id;  
384 - menuSunModel.name = '${element.pnum}人';  
385 - // menuSunModel.price = element.menuPrice;  
386 - menuSunModel.price = element.price;  
387 - menuSunModel.member_price = element.memberPrice ?? element.price;  
388 - menuSunModel.unit = '份';  
389 - //  
390 -  
391 - List<MenuModel> cookF = [];  
392 - element.cooklist.forEach((value) {  
393 - MenuModel menuModel = MenuModel();  
394 - menuModel.id = value.classid;  
395 - menuModel.sellerid = element.sellerid;  
396 - menuModel.className = value.className;  
397 - menuModel.classLabel = null;  
398 - menuModel.order = null;  
399 - menuModel.status = '1';  
400 - menuModel.classType = null;  
401 - menuModel.cookbooklist = [];  
402 - value.cooklist.forEach((cook) {  
403 - MenuSunModel cookData = MenuSunModel();  
404 - cookData.id = cook.cookbookid;  
405 - cookData.sellerid = cook.sid;  
406 - cookData.cid = cook.classid;  
407 - cookData.price = cook.price;  
408 - cookData.member_price = cook.memberPrice ?? cook.price;  
409 - cookData.name = cook.name;  
410 - cookData.unit = cook.unit;  
411 - cookData.image = cook.image;  
412 - cookData.amount = cook.amount;  
413 -  
414 - // "specid": null,  
415 - // "practiceid": null,  
416 - // "class_name": "炒菜12",  
417 - // "class_order": "2"  
418 - menuModel.cookbooklist.add(cookData); 383 + if (element.cooklist != null) {
  384 + // SellerOftenSunModel
  385 + MenuSunModel menuSunModel = MenuSunModel();
  386 + menuSunModel.id = element.id;
  387 + menuSunModel.name = '${element.pnum}人';
  388 + // menuSunModel.price = element.menuPrice;
  389 + menuSunModel.price = element.price;
  390 + menuSunModel.member_price = element.memberPrice ?? element.price;
  391 + menuSunModel.unit = '份';
  392 + //
  393 +
  394 + List<MenuModel> cookF = [];
  395 + element.cooklist.forEach((value) {
  396 + MenuModel menuModel = MenuModel();
  397 + menuModel.id = value.classid;
  398 + menuModel.sellerid = element.sellerid;
  399 + menuModel.className = value.className;
  400 + menuModel.classLabel = null;
  401 + menuModel.order = null;
  402 + menuModel.status = '1';
  403 + menuModel.classType = null;
  404 + menuModel.cookbooklist = [];
  405 + value.cooklist.forEach((cook) {
  406 + MenuSunModel cookData = MenuSunModel();
  407 + cookData.id = cook.cookbookid;
  408 + cookData.sellerid = cook.sid;
  409 + cookData.cid = cook.classid;
  410 + cookData.price = cook.price;
  411 + cookData.member_price = cook.memberPrice ?? cook.price;
  412 + cookData.name = cook.name;
  413 + cookData.unit = cook.unit;
  414 + cookData.image = cook.image;
  415 + cookData.amount = cook.amount;
  416 +
  417 + // "specid": null,
  418 + // "practiceid": null,
  419 + // "class_name": "炒菜12",
  420 + // "class_order": "2"
  421 + menuModel.cookbooklist.add(cookData);
  422 + });
  423 +
  424 + cookF.add(menuModel);
419 }); 425 });
420 426
421 - cookF.add(menuModel);  
422 - }); 427 + menuSunModel.cookList = cookF;
423 428
424 - menuSunModel.cookList = cookF;  
425 -  
426 - datatemp.add(menuSunModel); 429 + datatemp.add(menuSunModel);
  430 + }
427 }); 431 });
428 432
429 sellerOftendataTemp = datatemp; 433 sellerOftendataTemp = datatemp;