xt / Flutter-ReserveApp · Commits

Go to a project

Commit 2037d6c972081c53aca8d994e0d91460804fb2b4

Authored by gaiyaguang
1 parent 2635ce9c

bug修复

Inline Side-by-side
Showing 6 changed files with 16 additions and 13 deletions
@@ -11,14 +11,14 @@ if (flutterRoot == null) { @@ -11,14 +11,14 @@ if (flutterRoot == null) {
11 throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") 11 throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
12 } 12 }
13 13
14 -def flutterVersionCode = "133" 14 +def flutterVersionCode = "134"
15 if (flutterVersionCode == null) { 15 if (flutterVersionCode == null) {
16 - flutterVersionCode = '133' 16 + flutterVersionCode = '134'
17 } 17 }
18 18
19 -def flutterVersionName = "1.3.3" 19 +def flutterVersionName = "1.3.4"
20 if (flutterVersionName == null) { 20 if (flutterVersionName == null) {
21 - flutterVersionName = '1.3.3' 21 + flutterVersionName = '1.3.4'
22 } 22 }
23 23
24 apply plugin: 'com.android.application' 24 apply plugin: 'com.android.application'
@@ -146,4 +146,4 @@ SPEC CHECKSUMS: @@ -146,4 +146,4 @@ SPEC CHECKSUMS:
146 146
147 PODFILE CHECKSUM: a75497545d4391e2d394c3668e20cfb1c2bbd4aa 147 PODFILE CHECKSUM: a75497545d4391e2d394c3668e20cfb1c2bbd4aa
148 148
149 -COCOAPODS: 1.9.3 149 +COCOAPODS: 1.9.1
@@ -406,7 +406,7 @@ @@ -406,7 +406,7 @@
406 CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements; 406 CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
407 CODE_SIGN_IDENTITY = "Apple Development"; 407 CODE_SIGN_IDENTITY = "Apple Development";
408 CODE_SIGN_STYLE = Automatic; 408 CODE_SIGN_STYLE = Automatic;
409 - CURRENT_PROJECT_VERSION = 133; 409 + CURRENT_PROJECT_VERSION = 134;
410 DEVELOPMENT_TEAM = 8J59HM8B82; 410 DEVELOPMENT_TEAM = 8J59HM8B82;
411 ENABLE_BITCODE = NO; 411 ENABLE_BITCODE = NO;
412 FRAMEWORK_SEARCH_PATHS = ( 412 FRAMEWORK_SEARCH_PATHS = (
@@ -419,7 +419,7 @@ @@ -419,7 +419,7 @@
419 "$(inherited)", 419 "$(inherited)",
420 "$(PROJECT_DIR)/Flutter", 420 "$(PROJECT_DIR)/Flutter",
421 ); 421 );
422 - MARKETING_VERSION = 1.3.3; 422 + MARKETING_VERSION = 1.3.4;
423 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 423 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
424 PRODUCT_NAME = "一键订"; 424 PRODUCT_NAME = "一键订";
425 PROVISIONING_PROFILE_SPECIFIER = ""; 425 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -548,7 +548,7 @@ @@ -548,7 +548,7 @@
548 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 548 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
549 CODE_SIGN_IDENTITY = "Apple Development"; 549 CODE_SIGN_IDENTITY = "Apple Development";
550 CODE_SIGN_STYLE = Automatic; 550 CODE_SIGN_STYLE = Automatic;
551 - CURRENT_PROJECT_VERSION = 133; 551 + CURRENT_PROJECT_VERSION = 134;
552 DEVELOPMENT_TEAM = 8J59HM8B82; 552 DEVELOPMENT_TEAM = 8J59HM8B82;
553 ENABLE_BITCODE = NO; 553 ENABLE_BITCODE = NO;
554 FRAMEWORK_SEARCH_PATHS = ( 554 FRAMEWORK_SEARCH_PATHS = (
@@ -561,7 +561,7 @@ @@ -561,7 +561,7 @@
561 "$(inherited)", 561 "$(inherited)",
562 "$(PROJECT_DIR)/Flutter", 562 "$(PROJECT_DIR)/Flutter",
563 ); 563 );
564 - MARKETING_VERSION = 1.3.3; 564 + MARKETING_VERSION = 1.3.4;
565 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 565 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
566 PRODUCT_NAME = "一键订"; 566 PRODUCT_NAME = "一键订";
567 PROVISIONING_PROFILE_SPECIFIER = ""; 567 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -581,7 +581,7 @@ @@ -581,7 +581,7 @@
581 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 581 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
582 CODE_SIGN_IDENTITY = "Apple Development"; 582 CODE_SIGN_IDENTITY = "Apple Development";
583 CODE_SIGN_STYLE = Automatic; 583 CODE_SIGN_STYLE = Automatic;
584 - CURRENT_PROJECT_VERSION = 133; 584 + CURRENT_PROJECT_VERSION = 134;
585 DEVELOPMENT_TEAM = 8J59HM8B82; 585 DEVELOPMENT_TEAM = 8J59HM8B82;
586 ENABLE_BITCODE = NO; 586 ENABLE_BITCODE = NO;
587 FRAMEWORK_SEARCH_PATHS = ( 587 FRAMEWORK_SEARCH_PATHS = (
@@ -594,7 +594,7 @@ @@ -594,7 +594,7 @@
594 "$(inherited)", 594 "$(inherited)",
595 "$(PROJECT_DIR)/Flutter", 595 "$(PROJECT_DIR)/Flutter",
596 ); 596 );
597 - MARKETING_VERSION = 1.3.3; 597 + MARKETING_VERSION = 1.3.4;
598 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 598 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
599 PRODUCT_NAME = "一键订"; 599 PRODUCT_NAME = "一键订";
600 PROVISIONING_PROFILE_SPECIFIER = ""; 600 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -69,7 +69,6 @@ class Table { @@ -69,7 +69,6 @@ class Table {
69 } 69 }
70 70
71 String get signStr { 71 String get signStr {
72 - if (enable == "0") return "已停用";  
73 if (sign != null) { 72 if (sign != null) {
74 switch (sign) { 73 switch (sign) {
75 case "1": //已预订 74 case "1": //已预订
@@ -81,6 +80,7 @@ class Table { @@ -81,6 +80,7 @@ class Table {
81 return ""; 80 return "";
82 } 81 }
83 } 82 }
  83 + if (enable == "0") return "已停用";
84 return ""; 84 return "";
85 } 85 }
86 86
@@ -184,6 +184,9 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -184,6 +184,9 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
184 await detailModel.setReserveStatus(context, params, ifPush: false); 184 await detailModel.setReserveStatus(context, params, ifPush: false);
185 if (success) { 185 if (success) {
186 bus.emit("refresh_book_list"); 186 bus.emit("refresh_book_list");
  187 + if(status=="4"){//取消预订
  188 + bus.emit("refresh_tablemanager"); //刷新桌位
  189 + }
187 _getReserveDetail(); 190 _getReserveDetail();
188 } 191 }
189 } 192 }
@@ -553,7 +553,7 @@ class DialogUtil { @@ -553,7 +553,7 @@ class DialogUtil {
553 ), 553 ),
554 ), 554 ),
555 Offstage( 555 Offstage(
556 - offstage: table.enable == "0", 556 + offstage: table.signStr == "已停用",
557 child: Column( 557 child: Column(
558 mainAxisSize: MainAxisSize.min, 558 mainAxisSize: MainAxisSize.min,
559 children: [ 559 children: [