xt / Flutter-ReserveApp · Commits

Go to a project

Commit 82794b7a225f417d573f463377add2666e257e15

Authored by wdn127929
1 parent bf016e00
build: skipped

店内常点

Inline Side-by-side
Showing 6 changed files with 79 additions and 35 deletions
@@ -12,14 +12,14 @@ if (flutterRoot == null) { @@ -12,14 +12,14 @@ if (flutterRoot == null) {
12 } 12 }
13 13
14 14
15 -def flutterVersionCode = "430" 15 +def flutterVersionCode = "431"
16 if (flutterVersionCode == null) { 16 if (flutterVersionCode == null) {
17 - flutterVersionCode = '430' 17 + flutterVersionCode = '431'
18 } 18 }
19 19
20 -def flutterVersionName = "4.3.0" 20 +def flutterVersionName = "4.3.1"
21 if (flutterVersionName == null) { 21 if (flutterVersionName == null) {
22 - flutterVersionName = '4.3.0' 22 + flutterVersionName = '4.3.1'
23 } 23 }
24 apply plugin: 'com.android.application' 24 apply plugin: 'com.android.application'
25 apply plugin: 'kotlin-android' 25 apply plugin: 'kotlin-android'

40.6 KB | W: | H:

44.7 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
@@ -46,8 +46,9 @@ class SellerOftenSunModel { @@ -46,8 +46,9 @@ class SellerOftenSunModel {
46 SellerOftenSunModel.fromJson(Map<String, dynamic> json) { 46 SellerOftenSunModel.fromJson(Map<String, dynamic> json) {
47 pnum = json['pnum']; 47 pnum = json['pnum'];
48 sellerid = json['sellerid']; 48 sellerid = json['sellerid'];
49 - price = json['price'];  
50 - memberPrice = json['member_price']; 49 + price = json['price'] == null ? null : '${json['price']}';
  50 + memberPrice =
  51 + json['member_price'] == null ? null : '${json['member_price']}';
51 id = json['id']; 52 id = json['id'];
52 if (json['cooklist'] != null) { 53 if (json['cooklist'] != null) {
53 cooklist = <SellerOftenCooklist>[]; 54 cooklist = <SellerOftenCooklist>[];
@@ -209,6 +209,13 @@ class _OrderAdvanceEidtPageState extends State<OrderAdvanceEidtPage> { @@ -209,6 +209,13 @@ class _OrderAdvanceEidtPageState extends State<OrderAdvanceEidtPage> {
209 List<MenuSunModel> sellerOftendata = 209 List<MenuSunModel> sellerOftendata =
210 _planDishProvider.sellerOftendataTemp; 210 _planDishProvider.sellerOftendataTemp;
211 211
  212 + // if(sellerOftendata == null || sellerOftendata.length == 0){
  213 + // //接口请求没有值
  214 + // if(widget.planCookByRidSunModel.oftenList.length >0){
  215 +
  216 + // }
  217 + // }
  218 +
212 sellerOftendata.forEach((element) { 219 sellerOftendata.forEach((element) {
213 // if (element.status == '1') { 220 // if (element.status == '1') {
214 // MenuSunModel menuSunModel = MenuSunModel(); 221 // MenuSunModel menuSunModel = MenuSunModel();
@@ -1160,18 +1167,10 @@ class _OrderAdvanceEidtPageState extends State<OrderAdvanceEidtPage> { @@ -1160,18 +1167,10 @@ class _OrderAdvanceEidtPageState extends State<OrderAdvanceEidtPage> {
1160 setState(() { 1167 setState(() {
1161 menuSunModel.amount--; 1168 menuSunModel.amount--;
1162 _calculatePrice(); 1169 _calculatePrice();
1163 - if (_planDishProvider  
1164 - .menuModelForManager[  
1165 - _selectIndex]  
1166 - .className ==  
1167 - '套餐' ||  
1168 - _planDishProvider  
1169 - .menuModelForManager[  
1170 - _selectIndex] == 1170 + if (className == '套餐' ||
  1171 + className ==
1171 '我的排菜' || 1172 '我的排菜' ||
1172 - _planDishProvider  
1173 - .menuModelForManager[  
1174 - _selectIndex] == 1173 + className ==
1175 '店内常点') { 1174 '店内常点') {
1176 // _calculatePrice(); 1175 // _calculatePrice();
1177 //套餐菜品总个数 1176 //套餐菜品总个数
@@ -1315,19 +1314,9 @@ class _OrderAdvanceEidtPageState extends State<OrderAdvanceEidtPage> { @@ -1315,19 +1314,9 @@ class _OrderAdvanceEidtPageState extends State<OrderAdvanceEidtPage> {
1315 // menuSunModel.member_price); 1314 // menuSunModel.member_price);
1316 // planDishC.text = '${priceSum}'; 1315 // planDishC.text = '${priceSum}';
1317 _calculatePrice(); 1316 _calculatePrice();
1318 - if (_planDishProvider  
1319 - .menuModelForManager[  
1320 - _selectIndex]  
1321 - .className ==  
1322 - '套餐' ||  
1323 - _planDishProvider  
1324 - .menuModelForManager[  
1325 - _selectIndex] ==  
1326 - '我的排菜' ||  
1327 - _planDishProvider  
1328 - .menuModelForManager[  
1329 - _selectIndex] ==  
1330 - '店内常点') { 1317 + if (className == '套餐' ||
  1318 + className == '我的排菜' ||
  1319 + className == '店内常点') {
1331 //套餐菜品总个数 1320 //套餐菜品总个数
1332 //遍历套餐下的菜品分类 1321 //遍历套餐下的菜品分类
1333 menuSunModel.cookList 1322 menuSunModel.cookList
@@ -793,7 +793,11 @@ class _OrderAdvanceHomePageState extends State<OrderAdvanceHomePage> { @@ -793,7 +793,11 @@ class _OrderAdvanceHomePageState extends State<OrderAdvanceHomePage> {
793 // .goOrderAdvanceHomePage( 793 // .goOrderAdvanceHomePage(
794 // context, 794 // context,
795 // ); 795 // );
796 - await _setGuestInfo(); 796 +
  797 + if (widget.detailEntity.gid != null) {
  798 + await _setGuestInfo();
  799 + }
  800 +
797 // Map<String, String> params = { 801 // Map<String, String> params = {
798 // "rid": widget.rid 802 // "rid": widget.rid
799 // // 'is_time': '0' 803 // // 'is_time': '0'
@@ -805,8 +809,7 @@ class _OrderAdvanceHomePageState extends State<OrderAdvanceHomePage> { @@ -805,8 +809,7 @@ class _OrderAdvanceHomePageState extends State<OrderAdvanceHomePage> {
805 // if (oid != null) { 809 // if (oid != null) {
806 //获取成功 810 //获取成功
807 Utils.goShareOrderPageToWeChat(context, 811 Utils.goShareOrderPageToWeChat(context,
808 - title:  
809 - '张红经理邀请您点餐了', 812 + title: '张红经理邀请您点餐了',
810 img: 813 img:
811 'http://nosqn.colorcun.com/reserve/images/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_201911151148571.jpg', 814 'http://nosqn.colorcun.com/reserve/images/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_201911151148571.jpg',
812 rid: widget.rid, 815 rid: widget.rid,
@@ -840,7 +843,9 @@ class _OrderAdvanceHomePageState extends State<OrderAdvanceHomePage> { @@ -840,7 +843,9 @@ class _OrderAdvanceHomePageState extends State<OrderAdvanceHomePage> {
840 flex: 2, 843 flex: 2,
841 child: InkWell( 844 child: InkWell(
842 onTap: () async { 845 onTap: () async {
843 - await _setGuestInfo(); 846 + if (widget.detailEntity.gid != null) {
  847 + await _setGuestInfo();
  848 + }
844 //调用排菜信息提交接口 849 //调用排菜信息提交接口
845 Map<String, String> params = { 850 Map<String, String> params = {
846 'sellerid': 851 'sellerid':
@@ -371,12 +371,61 @@ class PlanDishProvider extends ChangeNotifier { @@ -371,12 +371,61 @@ class PlanDishProvider extends ChangeNotifier {
371 menuSunModel.cookList = cookF; 371 menuSunModel.cookList = cookF;
372 372
373 data.add(menuSunModel); 373 data.add(menuSunModel);
374 - datatemp.add(menuSunModel); 374 + // datatemp.add(menuSunModel);
375 }); 375 });
376 print(data); 376 print(data);
377 377
378 sellerOftendata = data; 378 sellerOftendata = data;
379 379
  380 + 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);
  419 + });
  420 +
  421 + cookF.add(menuModel);
  422 + });
  423 +
  424 + menuSunModel.cookList = cookF;
  425 +
  426 + datatemp.add(menuSunModel);
  427 + });
  428 +
380 sellerOftendataTemp = datatemp; 429 sellerOftendataTemp = datatemp;
381 430
382 // sellerOftendata 431 // sellerOftendata