Merge branch 'check-nested-page'

haolun1996 · Jun 1, 2023 · ae846dd · ae846dd
2 parents 67ff272 + f810501
commit ae846dd
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/lib/Core/x_base_widget.dart b/lib/Core/x_base_widget.dart
@@ -100,12 +100,19 @@ abstract class BaseXWidget<T extends BaseXController> extends GetWidget<T> {
  }
 
  Widget _contentBody(BuildContext context) {
+ bool isPage = true;
+
+ if (c.page != null) {
+ isPage = (c.page as BaseXWidget).routeName == routeName;
+ }
  return Stack(
  children: [
  Column(
  mainAxisSize: MainAxisSize.max,
  children: [
- if (baseConstant.position == Position.top && baseConstant.appEnv == Environment.Staging)
+ if (baseConstant.position == Position.top &&
+ baseConstant.appEnv == Environment.Staging &&
+ isPage)
  envBar(),
  if (stackedAppBar == null)
  Expanded(
@@ -148,7 +155,8 @@ abstract class BaseXWidget<T extends BaseXController> extends GetWidget<T> {
  ),
  ),
  if (baseConstant.position == Position.bottom &&
- baseConstant.appEnv == Environment.Staging)
+ baseConstant.appEnv == Environment.Staging &&
+ isPage)
  envBar(),
  ],
  ),