From f5fc01c1b290b53d444e8df919ca8a8aacfec38c Mon Sep 17 00:00:00 2001
From: lcy <2503978335@qq.com>
Date: Tue, 4 Jul 2023 09:02:23 +0800
Subject: [PATCH] feat:修复首页进入个人信息页闪退问题

---
 ios/Runner.xcodeproj/project.pbxproj | 6 +++---
 lib/pages/home/home_page.dart        | 8 +++++++-
 lib/pages/user/user_page.dart        | 4 +---
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 8ba9947..84fba7b 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -511,7 +511,7 @@
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = 1;
+				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Profile;
@@ -697,7 +697,7 @@
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = 1;
+				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Debug;
@@ -725,7 +725,7 @@
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = 1;
+				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Release;
diff --git a/lib/pages/home/home_page.dart b/lib/pages/home/home_page.dart
index bb68dbe..6604eba 100644
--- a/lib/pages/home/home_page.dart
+++ b/lib/pages/home/home_page.dart
@@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:wow_english/app/app.dart';
+import 'package:wow_english/common/core/user_util.dart';
 import 'package:wow_english/common/extension/string_extension.dart';
 import 'package:wow_english/models/course_entity.dart';
 import 'package:wow_english/pages/home/widgets/home_bouns_item.dart';
@@ -37,7 +39,11 @@ class _HomePageView extends StatelessWidget {
     } else if (type == HeaderActionType.shop) {
       pushNamed(AppRouteName.shop);
     } else if (type == HeaderActionType.user) {
-      pushNamed(AppRouteName.user);
+      if(UserUtil.token.isEmpty) {
+        pushNamed(AppRouteName.login);
+      } else {
+        pushNamed(AppRouteName.user);
+      }
     } else {
 
     }
diff --git a/lib/pages/user/user_page.dart b/lib/pages/user/user_page.dart
index 5acea7c..90ec0e0 100644
--- a/lib/pages/user/user_page.dart
+++ b/lib/pages/user/user_page.dart
@@ -18,14 +18,12 @@ class UserPage extends StatelessWidget {
   Widget build(BuildContext context) {
     return BlocProvider(
       create: (context) => UserBloc(),
-      child: const _UserView(),
+      child: _UserView(),
     );
   }
 }
 
 class _UserView extends StatelessWidget {
-  const _UserView({super.key});
-
   final String bannerUrl = '';
 
   @override
--
libgit2 0.22.2