diff --git a/lib/common/widgets/loading_widget.dart b/lib/common/widgets/loading_widget.dart index 7abeebc1..8a203cd8 100644 --- a/lib/common/widgets/loading_widget.dart +++ b/lib/common/widgets/loading_widget.dart @@ -9,7 +9,8 @@ Widget errorWidget({errMsg, onReload}) => HttpError( onReload: onReload, ); -Widget scrollErrorWidget({errMsg, onReload}) => CustomScrollView( +Widget scrollErrorWidget({errMsg, onReload, controller}) => CustomScrollView( + controller: controller, slivers: [ HttpError( errMsg: errMsg, diff --git a/lib/pages/dynamics/controller.dart b/lib/pages/dynamics/controller.dart index 5d89c16b..8bf6945f 100644 --- a/lib/pages/dynamics/controller.dart +++ b/lib/pages/dynamics/controller.dart @@ -110,10 +110,6 @@ class DynamicsController extends GetxController upData.refresh(); } upData.value.errMsg = null; - if (type == 'init') { - upData.value.upList = []; - upData.value.liveUsers = LiveUsers(); - } if (GStorage.setting .get(SettingBoxKey.dynamicsShowAllFollowedUp, defaultValue: false)) { allFollowedUpsPage = 1; diff --git a/lib/pages/dynamics/widgets/up_panel.dart b/lib/pages/dynamics/widgets/up_panel.dart index e7c04784..f4a40c07 100644 --- a/lib/pages/dynamics/widgets/up_panel.dart +++ b/lib/pages/dynamics/widgets/up_panel.dart @@ -89,12 +89,13 @@ class _UpPanelState extends State { ), ), ), - SliverList.builder( - itemCount: upList.length, - itemBuilder: (context, index) { - return upItemBuild(upList[index]); - }, - ), + if (upList.isNotEmpty) + SliverList.builder( + itemCount: upList.length, + itemBuilder: (context, index) { + return upItemBuild(upList[index]); + }, + ), const SliverToBoxAdapter(child: SizedBox(height: 200)), ], ); diff --git a/lib/pages/video/detail/member/horizontal_member_page.dart b/lib/pages/video/detail/member/horizontal_member_page.dart index e6c9293c..dc3a0c43 100644 --- a/lib/pages/video/detail/member/horizontal_member_page.dart +++ b/lib/pages/video/detail/member/horizontal_member_page.dart @@ -110,6 +110,7 @@ class _HorizontalMemberPageState extends State { ], ), Error() => scrollErrorWidget( + controller: _controller.scrollController, errMsg: userState.errMsg, onReload: () { _controller.userState.value = LoadingState.loading(); @@ -227,6 +228,7 @@ class _HorizontalMemberPageState extends State { ), ), Error() => scrollErrorWidget( + controller: _controller.scrollController, errMsg: loadingState.errMsg, onReload: _controller.onReload, ),