Prechádzať zdrojové kódy

fix #19886 修正ios系统手势返回检测问题

chengc 1 deň pred
rodič
commit
b09d4d0567
1 zmenil súbory, kde vykonal 2 pridanie a 2 odobranie
  1. 2 2
      lib/core/router/app_router.dart

+ 2 - 2
lib/core/router/app_router.dart

@@ -62,7 +62,7 @@ GoRouter createAppRouter() => GoRouter(
     // ── 费用报销 ──
     GoRoute(path: '/expense/list', pageBuilder: (context, state) => MaterialPage(key: ValueKey(state.uri.toString()), child: AppScaffold(navConfig: NavBarConfig(showBack: true, showRight: true, rightWidget: _addButton(context, '/expense/create'), onBack: _popToNative), body: const ExpenseListPage()))),
     GoRoute(path: '/expense/import-apply', pageBuilder: (context, _) => MaterialPage(child: AppScaffold(navConfig: NavBarConfig(showBack: true, onBack: () => _smartBack(context)), body: const ExpenseApplyImportPage(), resizeToAvoidBottomInset: false))),
-    GoRoute(path: '/expense/create', pageBuilder: (context, state) => MaterialPage(key: ValueKey(state.uri.toString()), child: AppScaffold(navConfig: NavBarConfig(showBack: true), body: ExpenseCreatePage(editId: state.uri.queryParameters['id']), resizeToAvoidBottomInset: false))),
+    GoRoute(path: '/expense/create', pageBuilder: (context, state) => MaterialPage(key: ValueKey(state.uri.toString()), canPop: false, child: AppScaffold(navConfig: NavBarConfig(showBack: true), body: ExpenseCreatePage(editId: state.uri.queryParameters['id']), resizeToAvoidBottomInset: false))),
     GoRoute(path: '/expense/detail/:billNo', pageBuilder: (context, state) => MaterialPage(key: ValueKey(state.uri.toString()), child: AppScaffold(navConfig: NavBarConfig(showBack: true, onBack: () => _smartBack(context)), body: ExpenseDetailPage(billNo: state.pathParameters['billNo']!, queryId: int.tryParse(state.uri.queryParameters['queryId'] ?? '0') ?? 0)))),
     GoRoute(path: '/expense/edit/:billNo', pageBuilder: (context, state) => MaterialPage(key: ValueKey(state.uri.toString()), child: AppScaffold(navConfig: NavBarConfig(showBack: true, onBack: () => _smartBack(context)), body: ExpenseEditPage(billNo: state.pathParameters['billNo']!), resizeToAvoidBottomInset: false))),
 
@@ -89,7 +89,7 @@ GoRouter createAppRouter() => GoRouter(
     // ── 费用申请 ──
     GoRoute(path: '/expense-apply/list', pageBuilder: (context, state) => MaterialPage(key: ValueKey(state.uri.toString()), child: AppScaffold(navConfig: NavBarConfig(showBack: true, showRight: true, rightWidget: _addButton(context, '/expense-apply/create'), onBack: _popToNative), body: const ExpenseApplyListPage()))),
     GoRoute(path: '/expense-apply/detail/:billNo', pageBuilder: (context, state) => MaterialPage(key: ValueKey(state.uri.toString()), child: AppScaffold(navConfig: NavBarConfig(showBack: true, onBack: () => _smartBack(context)), body: ExpenseApplyDetailPage(billNo: state.pathParameters['billNo']!, queryId: int.tryParse(state.uri.queryParameters['queryId'] ?? '0') ?? 0)))),
-    GoRoute(path: '/expense-apply/create', pageBuilder: (context, state) => MaterialPage(key: ValueKey(state.uri.toString()), child: AppScaffold(navConfig: NavBarConfig(showBack: true), body: ExpenseApplyCreatePage(id: state.uri.queryParameters['id']), resizeToAvoidBottomInset: false))),
+    GoRoute(path: '/expense-apply/create', pageBuilder: (context, state) => MaterialPage(key: ValueKey(state.uri.toString()), canPop: false, child: AppScaffold(navConfig: NavBarConfig(showBack: true), body: ExpenseApplyCreatePage(id: state.uri.queryParameters['id']), resizeToAvoidBottomInset: false))),
     GoRoute(path: '/expense-apply/edit/:billNo', pageBuilder: (context, state) => MaterialPage(key: ValueKey(state.uri.toString()), child: AppScaffold(navConfig: NavBarConfig(showBack: true, onBack: () => _smartBack(context)), body: ExpenseApplyEditPage(billNo: state.pathParameters['billNo']!), resizeToAvoidBottomInset: false))),
 
     // ── 报表 ──