diff --git a/lib/pages/home/view.dart b/lib/pages/home/view.dart index 11d36c9b..2c32aa0d 100644 --- a/lib/pages/home/view.dart +++ b/lib/pages/home/view.dart @@ -36,10 +36,10 @@ class _HomePageState extends State showUserBottomSheet() { feedBack(); final MainController mainController = Get.put(MainController()); - if (mainController.navigationBars - .where((item) => item['label'] == "我的") - .isNotEmpty) { - mainController.pageController.jumpToPage(2); + int mineItemIndex = mainController.navigationBars + .indexWhere((item) => item['label'] == "我的"); + if (mineItemIndex != -1) { + mainController.pageController.jumpToPage(mineItemIndex); } else { Get.toNamed('/mine'); } diff --git a/lib/pages/mine/view.dart b/lib/pages/mine/view.dart index 90fa4958..4fcfdcf4 100644 --- a/lib/pages/mine/view.dart +++ b/lib/pages/mine/view.dart @@ -98,9 +98,14 @@ class _MinePageState extends State }, ), _buildMenuSection(context), - Divider( - height: 25, - color: Theme.of(context).dividerColor.withOpacity(0.1), + Obx( + () => Visibility( + visible: ctr.userLogin.value, + child: Divider( + height: 25, + color: Theme.of(context).dividerColor.withOpacity(0.1), + ), + ), ), Obx( () => ctr.userLogin.value @@ -320,8 +325,8 @@ class _MinePageState extends State future: ctr.queryFavFolder(), builder: (context, snapshot) { if (snapshot.connectionState == ConnectionState.done) { - Map data = snapshot.data as Map; - if (data['status']) { + Map? data = snapshot.data; + if (data != null && data['status']) { List favFolderList = ctr.favFolderData.value.list!; int favFolderCount = ctr.favFolderData.value.count!; bool flag = favFolderCount > favFolderList.length; @@ -369,7 +374,7 @@ class _MinePageState extends State } else { return SizedBox( height: 110, - child: Center(child: Text(data['msg'])), + child: Center(child: Text(data?['msg'] ?? '')), ); } } else {