diff --git a/lib/pages/member/widgets/seasons.dart b/lib/pages/member/widgets/seasons.dart index 615fc44c..497e68e1 100644 --- a/lib/pages/member/widgets/seasons.dart +++ b/lib/pages/member/widgets/seasons.dart @@ -41,6 +41,7 @@ class MemberSeasonsPanel extends StatelessWidget { 'category': '1', 'mid': item.meta!.mid.toString(), 'seriesId': item.meta!.seriesId.toString(), + 'seasonId': item.meta!.seasonId.toString(), 'seasonName': item.meta!.name!, }; } diff --git a/lib/pages/member_seasons/controller.dart b/lib/pages/member_seasons/controller.dart index 4e7c9762..ef85398b 100644 --- a/lib/pages/member_seasons/controller.dart +++ b/lib/pages/member_seasons/controller.dart @@ -24,7 +24,8 @@ class MemberSeasonsController extends GetxController { seasonId = int.parse(Get.parameters['seasonId']!); } if (category == '1') { - seriesId = int.parse(Get.parameters['seriesId']!); + seriesId = int.tryParse(Get.parameters['seriesId']!); + seasonId = int.tryParse(Get.parameters['seasonId']!); } } @@ -73,7 +74,27 @@ class MemberSeasonsController extends GetxController { getSeasonDetail('onLoad'); } if (category == '1') { - getSeriesDetail('onLoad'); + if (seasonId != null) { + getSeasonDetail('onLoad'); + } + if (seriesId != null) { + getSeriesDetail('onLoad'); + } + } + } + + // 下拉刷新 + Future onRefresh() async { + if (category == '0') { + return getSeasonDetail('onRefresh'); + } + if (category == '1') { + if (seasonId != null) { + return getSeasonDetail('onRefresh'); + } + if (seriesId != null) { + return getSeriesDetail('onRefresh'); + } } } } diff --git a/lib/pages/member_seasons/view.dart b/lib/pages/member_seasons/view.dart index b8c0407d..244b0a67 100644 --- a/lib/pages/member_seasons/view.dart +++ b/lib/pages/member_seasons/view.dart @@ -23,9 +23,7 @@ class _MemberSeasonsPageState extends State { void initState() { super.initState(); category = Get.parameters['category']!; - _futureBuilderFuture = category == '0' - ? _memberSeasonsController.getSeasonDetail('onRefresh') - : _memberSeasonsController.getSeriesDetail('onRefresh'); + _futureBuilderFuture = _memberSeasonsController.onRefresh(); scrollController = _memberSeasonsController.scrollController; scrollController.addListener( () {