xt / Flutter-ReserveApp · Commits

Go to a project

Commit 5c7b514c10c649e5d38ad16744870fe675a9862b

Authored by weixin_45529955
1 parent 6854965f
build: skipped

预订安排页，返回的时候，检查是不是当前页面是不是栈顶

Inline Side-by-side
Showing 3 changed files with 15 additions and 15 deletions
@@ -277,14 +277,10 @@ @@ -277,14 +277,10 @@
277 inputFileListPaths = ( 277 inputFileListPaths = (
278 "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", 278 "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
279 ); 279 );
280 - inputPaths = (  
281 - );  
282 name = "[CP] Embed Pods Frameworks"; 280 name = "[CP] Embed Pods Frameworks";
283 outputFileListPaths = ( 281 outputFileListPaths = (
284 "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", 282 "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
285 ); 283 );
286 - outputPaths = (  
287 - );  
288 runOnlyForDeploymentPostprocessing = 0; 284 runOnlyForDeploymentPostprocessing = 0;
289 shellPath = /bin/sh; 285 shellPath = /bin/sh;
290 shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; 286 shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
@@ -298,14 +294,10 @@ @@ -298,14 +294,10 @@
298 inputFileListPaths = ( 294 inputFileListPaths = (
299 "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist", 295 "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
300 ); 296 );
301 - inputPaths = (  
302 - );  
303 name = "[CP] Copy Pods Resources"; 297 name = "[CP] Copy Pods Resources";
304 outputFileListPaths = ( 298 outputFileListPaths = (
305 "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist", 299 "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
306 ); 300 );
307 - outputPaths = (  
308 - );  
309 runOnlyForDeploymentPostprocessing = 0; 301 runOnlyForDeploymentPostprocessing = 0;
310 shellPath = /bin/sh; 302 shellPath = /bin/sh;
311 shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n"; 303 shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
@@ -457,7 +449,7 @@ @@ -457,7 +449,7 @@
457 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 449 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
458 CLANG_ENABLE_MODULES = YES; 450 CLANG_ENABLE_MODULES = YES;
459 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 451 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
460 - CURRENT_PROJECT_VERSION = 5601; 452 + CURRENT_PROJECT_VERSION = 560;
461 DEVELOPMENT_TEAM = 8J59HM8B82; 453 DEVELOPMENT_TEAM = 8J59HM8B82;
462 ENABLE_BITCODE = NO; 454 ENABLE_BITCODE = NO;
463 INFOPLIST_FILE = Runner/Info.plist; 455 INFOPLIST_FILE = Runner/Info.plist;
@@ -640,7 +632,7 @@ @@ -640,7 +632,7 @@
640 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 632 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
641 CLANG_ENABLE_MODULES = YES; 633 CLANG_ENABLE_MODULES = YES;
642 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 634 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
643 - CURRENT_PROJECT_VERSION = 5601; 635 + CURRENT_PROJECT_VERSION = 560;
644 DEVELOPMENT_TEAM = 8J59HM8B82; 636 DEVELOPMENT_TEAM = 8J59HM8B82;
645 ENABLE_BITCODE = NO; 637 ENABLE_BITCODE = NO;
646 INFOPLIST_FILE = Runner/Info.plist; 638 INFOPLIST_FILE = Runner/Info.plist;
@@ -666,7 +658,7 @@ @@ -666,7 +658,7 @@
666 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 658 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
667 CLANG_ENABLE_MODULES = YES; 659 CLANG_ENABLE_MODULES = YES;
668 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 660 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
669 - CURRENT_PROJECT_VERSION = 5601; 661 + CURRENT_PROJECT_VERSION = 560;
670 DEVELOPMENT_TEAM = 8J59HM8B82; 662 DEVELOPMENT_TEAM = 8J59HM8B82;
671 ENABLE_BITCODE = NO; 663 ENABLE_BITCODE = NO;
672 INFOPLIST_FILE = Runner/Info.plist; 664 INFOPLIST_FILE = Runner/Info.plist;
@@ -6102,7 +6102,9 @@ class InvicationPageState extends State<InvicationPage> @@ -6102,7 +6102,9 @@ class InvicationPageState extends State<InvicationPage>
6102 onWillPop: () async { 6102 onWillPop: () async {
6103 // needBack = true; 6103 // needBack = true;
6104 await _showConfirmWidget(); 6104 await _showConfirmWidget();
6105 - Navigator.of(context).pop(); 6105 + if (Navigator.canPop(context)) {
  6106 + Navigator.pop(context);
  6107 + }
6106 6108
6107 return true; 6109 return true;
6108 }, 6110 },
@@ -6113,7 +6115,9 @@ class InvicationPageState extends State<InvicationPage> @@ -6113,7 +6115,9 @@ class InvicationPageState extends State<InvicationPage>
6113 onTap: () async { 6115 onTap: () async {
6114 // needBack = true; 6116 // needBack = true;
6115 await _showConfirmWidget(); 6117 await _showConfirmWidget();
6116 - Navigator.of(context).pop(); 6118 + if (Navigator.canPop(context)) {
  6119 + Navigator.pop(context);
  6120 + }
6117 }, 6121 },
6118 rightImgName: 'set_g.png', 6122 rightImgName: 'set_g.png',
6119 onTapRight: () { 6123 onTapRight: () {
@@ -589,7 +589,9 @@ class InvicationPageSimState extends State<InvicationPageSim> @@ -589,7 +589,9 @@ class InvicationPageSimState extends State<InvicationPageSim>
589 } else { 589 } else {
590 if (needBack) { 590 if (needBack) {
591 needBack = false; 591 needBack = false;
592 - Navigator.of(context).pop(); 592 + if (Navigator.canPop(context)) {
  593 + Navigator.pop(context);
  594 + }
593 } 595 }
594 if (needSex) { 596 if (needSex) {
595 needSex = false; 597 needSex = false;
@@ -745,7 +747,9 @@ class InvicationPageSimState extends State<InvicationPageSim> @@ -745,7 +747,9 @@ class InvicationPageSimState extends State<InvicationPageSim>
745 } else { 747 } else {
746 if (needBack) { 748 if (needBack) {
747 needBack = false; 749 needBack = false;
748 - Navigator.of(context).pop(); 750 + if (Navigator.canPop(context)) {
  751 + Navigator.pop(context);
  752 + }
749 } 753 }
750 if (needWechat) { 754 if (needWechat) {
751 needWechat = false; 755 needWechat = false;