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 @@
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
);
inputPaths = (
);
name = "[CP] Embed Pods Frameworks";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
... ... @@ -298,14 +294,10 @@
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
... ... @@ -457,7 +449,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 5601;
CURRENT_PROJECT_VERSION = 560;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
... ... @@ -640,7 +632,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 5601;
CURRENT_PROJECT_VERSION = 560;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
... ... @@ -666,7 +658,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 5601;
CURRENT_PROJECT_VERSION = 560;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
... ...
... ... @@ -6102,7 +6102,9 @@ class InvicationPageState extends State<InvicationPage>
onWillPop: () async {
// needBack = true;
await _showConfirmWidget();
Navigator.of(context).pop();
if (Navigator.canPop(context)) {
Navigator.pop(context);
}
return true;
},
... ... @@ -6113,7 +6115,9 @@ class InvicationPageState extends State<InvicationPage>
onTap: () async {
// needBack = true;
await _showConfirmWidget();
Navigator.of(context).pop();
if (Navigator.canPop(context)) {
Navigator.pop(context);
}
},
rightImgName: 'set_g.png',
onTapRight: () {
... ...
... ... @@ -589,7 +589,9 @@ class InvicationPageSimState extends State<InvicationPageSim>
} else {
if (needBack) {
needBack = false;
Navigator.of(context).pop();
if (Navigator.canPop(context)) {
Navigator.pop(context);
}
}
if (needSex) {
needSex = false;
... ... @@ -745,7 +747,9 @@ class InvicationPageSimState extends State<InvicationPageSim>
} else {
if (needBack) {
needBack = false;
Navigator.of(context).pop();
if (Navigator.canPop(context)) {
Navigator.pop(context);
}
}
if (needWechat) {
needWechat = false;
... ...