我靠有地雷女

lib/pages/home_page.dart

@@ -199,26 +199,26 @@ class _HomePageState extends State<HomePage> {
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
 
-    return Scaffold(
+    return PopScope(
+      canPop: !_loggingOut,
+      onPopInvokedWithResult: (didPop, _) {
+        if (!didPop && !_loggingOut) {
+          _performLogoutAndExit();
+        }
+      },
+      child: Scaffold(
       appBar: AppBar(
-        title: Text(_tabTitles[_currentTab]),
+        leading: IconButton(
-        actions: [
+          icon: _loggingOut
-          if (_loggingOut)
+              ? const SizedBox(
-            const Padding(
-              padding: EdgeInsets.only(right: 12),
-              child: SizedBox(
                   width: 20,
                   height: 20,
                   child: CircularProgressIndicator(strokeWidth: 2),
-              ),
                 )
-          else
+              : const Icon(Icons.arrow_back),
-            IconButton(
+          onPressed: _loggingOut ? null : _performLogoutAndExit,
-              icon: const Icon(Icons.logout),
-              tooltip: AppStrings.logoutTooltip,
-              onPressed: _performLogoutAndExit,
         ),
-        ],
+        title: Text(_tabTitles[_currentTab]),
       ),
       body: IndexedStack(
         index: _currentTab,
@@ -253,6 +253,7 @@ class _HomePageState extends State<HomePage> {
           NavigationDestination(icon: Icon(Icons.info_outlined), selectedIcon: Icon(Icons.info), label: AppStrings.tabAbout),
         ],
       ),
+    ),
     );
   }
 

lib/pages/ticket_page.dart

@@ -42,12 +42,10 @@ class TicketPage extends StatefulWidget {
 
 class _TicketPageState extends State<TicketPage> {
   static const _ticketNameMap = {
-    1: '功能票',
     2: '2倍功能票',
     3: '3倍功能票',
     4: '4倍功能票',
-    5: '5倍功能票',
+    5: '5倍功能票'
-    6: '6倍功能票',
   };
 
   TicketStep _step = TicketStep.idle;