xt / Flutter-ReserveApp · Commits

Go to a project

Commit 8bedf33eb7a56cd27b79f67e1950a3a4faddeaa5

Authored by weixin_45529955
1 parent 058f5ede
build: skipped

桌位页面显示预订数量为限制

Inline Side-by-side
Showing 2 changed files with 40 additions and 16 deletions
@@ -535,7 +535,7 @@ @@ -535,7 +535,7 @@
535 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 535 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
536 CLANG_ENABLE_MODULES = YES; 536 CLANG_ENABLE_MODULES = YES;
537 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 537 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
538 - CURRENT_PROJECT_VERSION = 5634; 538 + CURRENT_PROJECT_VERSION = 5641;
539 DEVELOPMENT_TEAM = 8J59HM8B82; 539 DEVELOPMENT_TEAM = 8J59HM8B82;
540 ENABLE_BITCODE = NO; 540 ENABLE_BITCODE = NO;
541 INFOPLIST_FILE = Runner/Info.plist; 541 INFOPLIST_FILE = Runner/Info.plist;
@@ -544,7 +544,7 @@ @@ -544,7 +544,7 @@
544 "$(inherited)", 544 "$(inherited)",
545 "@executable_path/Frameworks", 545 "@executable_path/Frameworks",
546 ); 546 );
547 - MARKETING_VERSION = 5.6.3; 547 + MARKETING_VERSION = 5.6.4;
548 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 548 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
549 PRODUCT_NAME = "$(TARGET_NAME)"; 549 PRODUCT_NAME = "$(TARGET_NAME)";
550 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; 550 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -718,7 +718,7 @@ @@ -718,7 +718,7 @@
718 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 718 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
719 CLANG_ENABLE_MODULES = YES; 719 CLANG_ENABLE_MODULES = YES;
720 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 720 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
721 - CURRENT_PROJECT_VERSION = 5634; 721 + CURRENT_PROJECT_VERSION = 5641;
722 DEVELOPMENT_TEAM = 8J59HM8B82; 722 DEVELOPMENT_TEAM = 8J59HM8B82;
723 ENABLE_BITCODE = NO; 723 ENABLE_BITCODE = NO;
724 INFOPLIST_FILE = Runner/Info.plist; 724 INFOPLIST_FILE = Runner/Info.plist;
@@ -727,7 +727,7 @@ @@ -727,7 +727,7 @@
727 "$(inherited)", 727 "$(inherited)",
728 "@executable_path/Frameworks", 728 "@executable_path/Frameworks",
729 ); 729 );
730 - MARKETING_VERSION = 5.6.3; 730 + MARKETING_VERSION = 5.6.4;
731 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 731 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
732 PRODUCT_NAME = "$(TARGET_NAME)"; 732 PRODUCT_NAME = "$(TARGET_NAME)";
733 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; 733 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -744,7 +744,7 @@ @@ -744,7 +744,7 @@
744 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 744 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
745 CLANG_ENABLE_MODULES = YES; 745 CLANG_ENABLE_MODULES = YES;
746 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 746 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
747 - CURRENT_PROJECT_VERSION = 5634; 747 + CURRENT_PROJECT_VERSION = 5641;
748 DEVELOPMENT_TEAM = 8J59HM8B82; 748 DEVELOPMENT_TEAM = 8J59HM8B82;
749 ENABLE_BITCODE = NO; 749 ENABLE_BITCODE = NO;
750 INFOPLIST_FILE = Runner/Info.plist; 750 INFOPLIST_FILE = Runner/Info.plist;
@@ -753,7 +753,7 @@ @@ -753,7 +753,7 @@
753 "$(inherited)", 753 "$(inherited)",
754 "@executable_path/Frameworks", 754 "@executable_path/Frameworks",
755 ); 755 );
756 - MARKETING_VERSION = 5.6.3; 756 + MARKETING_VERSION = 5.6.4;
757 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 757 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
758 PRODUCT_NAME = "$(TARGET_NAME)"; 758 PRODUCT_NAME = "$(TARGET_NAME)";
759 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; 759 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -248,29 +248,53 @@ class TableManagerModelOrReserve with ChangeNotifier { @@ -248,29 +248,53 @@ class TableManagerModelOrReserve with ChangeNotifier {
248 if (limitNum != -1) { 248 if (limitNum != -1) {
249 //存在配置 249 //存在配置
250 250
251 - int sum = 0; 251 + // int sum = 0;
  252 +
  253 + List<String> rids = [];
252 tablesOrReserveData?.forEach((element) { 254 tablesOrReserveData?.forEach((element) {
253 element.tableList?.forEach((subelement) { 255 element.tableList?.forEach((subelement) {
254 if (subelement.reserveList != null) { 256 if (subelement.reserveList != null) {
255 - sum++;  
256 - }  
257 - if (sum > limitNum) {  
258 - subelement.reserveList = null; 257 + // sum++;
  258 + if (!rids.contains(subelement.reserveList!.id!) &&
  259 + rids.length < limitNum) {
  260 + rids.add(subelement.reserveList!.id!);
  261 + }
  262 + if (rids.length == limitNum &&
  263 + !rids.contains(subelement.reserveList!.id!)) {
  264 + subelement.reserveList = null;
  265 + }
259 } 266 }
260 }); 267 });
261 }); 268 });
262 269
263 - int sumShow = 0; 270 + List<String> ridsShow = [];
264 tablesOrReserveDataShow?.forEach((element) { 271 tablesOrReserveDataShow?.forEach((element) {
265 element.tableList?.forEach((subelement) { 272 element.tableList?.forEach((subelement) {
266 if (subelement.reserveList != null) { 273 if (subelement.reserveList != null) {
267 - sumShow++;  
268 - }  
269 - if (sumShow > limitNum) {  
270 - subelement.reserveList = null; 274 + // sum++;
  275 + if (!ridsShow.contains(subelement.reserveList!.id!) &&
  276 + ridsShow.length < limitNum) {
  277 + ridsShow.add(subelement.reserveList!.id!);
  278 + }
  279 + if (ridsShow.length == limitNum &&
  280 + !ridsShow.contains(subelement.reserveList!.id!)) {
  281 + subelement.reserveList = null;
  282 + }
271 } 283 }
272 }); 284 });
273 }); 285 });
  286 +
  287 + // int sumShow = 0;
  288 + // tablesOrReserveDataShow?.forEach((element) {
  289 + // element.tableList?.forEach((subelement) {
  290 + // if (subelement.reserveList != null) {
  291 + // sumShow++;
  292 + // }
  293 + // if (sumShow > limitNum) {
  294 + // subelement.reserveList = null;
  295 + // }
  296 + // });
  297 + // });
274 } 298 }
275 299
276 // 300 //