@@ -6,16 +6,13 @@ import 'package:flutter_bloc/flutter_bloc.dart'; | |||||
import 'package:zhiying_base_widget/pages/main_page/notifier/main_page_notifier.dart'; | import 'package:zhiying_base_widget/pages/main_page/notifier/main_page_notifier.dart'; | ||||
import 'package:zhiying_base_widget/widgets/empty/empty_widget.dart'; | import 'package:zhiying_base_widget/widgets/empty/empty_widget.dart'; | ||||
import 'package:zhiying_base_widget/widgets/home/home_auth/home_auth.dart'; | import 'package:zhiying_base_widget/widgets/home/home_auth/home_auth.dart'; | ||||
import 'package:zhiying_base_widget/widgets/refresh/refresh_footer/refresh_footer.dart'; | |||||
import 'package:zhiying_base_widget/widgets/refresh/refresh_header/refresh_gif_header.dart'; | import 'package:zhiying_base_widget/widgets/refresh/refresh_header/refresh_gif_header.dart'; | ||||
import 'package:zhiying_base_widget/widgets/refresh/refresh_header/refresh_header.dart'; | |||||
import 'package:zhiying_comm/zhiying_comm.dart'; | import 'package:zhiying_comm/zhiying_comm.dart'; | ||||
import 'bloc/custom_item_page_bloc.dart'; | import 'bloc/custom_item_page_bloc.dart'; | ||||
import 'bloc/custom_item_page_state.dart'; | import 'bloc/custom_item_page_state.dart'; | ||||
import 'bloc/custom_item_page_event.dart'; | import 'bloc/custom_item_page_event.dart'; | ||||
import 'bloc/custom_item_page_repository.dart'; | import 'bloc/custom_item_page_repository.dart'; | ||||
import 'dart:ui'; | |||||
import 'package:zhiying_comm/util/custom_sliver_persistent_header_delegate.dart'; | |||||
/// | /// | ||||
/// 通用模块的分类导航下的子模块 | /// 通用模块的分类导航下的子模块 | ||||
@@ -19,8 +19,8 @@ class MessageNoticeRepository { | |||||
MessageNoticeRepository(final Map<String, dynamic> data) { | MessageNoticeRepository(final Map<String, dynamic> data) { | ||||
try { | try { | ||||
_type = !EmptyUtil.isEmpty(data) ? data.containsKey('type') ? data['type'] : 'main' : 'main'; | _type = !EmptyUtil.isEmpty(data) ? data.containsKey('NoticePageType') ? data['NoticePageType'] : 'main' : 'main'; | ||||
_title = !EmptyUtil.isEmpty(data) ? data.containsKey('title') ? data['title'] : '消息中心' : '消息中心'; | _title = !EmptyUtil.isEmpty(data) ? data.containsKey('NoticePageTitle') ? data['NoticePageTitle'] : '消息中心' : '消息中心'; | ||||
} catch (e, s) { | } catch (e, s) { | ||||
_type = 'main'; | _type = 'main'; | ||||
} | } | ||||
@@ -57,7 +57,7 @@ class __MessageNoticePageContainerState extends State<_MessageNoticePageContaine | |||||
BlocProvider.of<MessageNoticeBloc>(context).add(MessageNoticeClearPointEvent(selectId: dataModel?.id)); | BlocProvider.of<MessageNoticeBloc>(context).add(MessageNoticeClearPointEvent(selectId: dataModel?.id)); | ||||
/// 如果是消息中心,则重新打开页面加载 | /// 如果是消息中心,则重新打开页面加载 | ||||
Navigator.push(context, CupertinoPageRoute(builder: (_) => MessageNoticePage({'type': styleModel?.type, 'title': styleModel?.name}))); | Navigator.push(context, CupertinoPageRoute(builder: (_) => MessageNoticePage({'NoticePageType': styleModel?.type, 'NoticePageTitle': styleModel?.name}))); | ||||
} | } | ||||
/// 子item点击的公共跳转 | /// 子item点击的公共跳转 | ||||
@@ -25,7 +25,7 @@ class MineDetailBloc extends BlocBase { | |||||
void loadData() { | void loadData() { | ||||
NetUtil.request('/api/v1/user/info', method: NetMethod.GET, | NetUtil.request('/api/v1/user/info', method: NetMethod.GET, | ||||
onCache: (data) { | onCache: (data) { | ||||
if (_user == null) _loadData(data); | // if (_user == null) _loadData(data); | ||||
}, onSuccess: (data) { | }, onSuccess: (data) { | ||||
_loadData(data); | _loadData(data); | ||||
}); | }); | ||||
@@ -17,13 +17,16 @@ class MineHeader extends StatefulWidget { | |||||
} | } | ||||
class _MineHeaderState extends State<MineHeader> { | class _MineHeaderState extends State<MineHeader> { | ||||
UserInfoModel user; | |||||
@override | @override | ||||
Widget build(BuildContext context) { | void didChangeDependencies() { | ||||
// if (_isSketelon) { | user = Provider.of<UserInfoNotifier>(context).userInfo; | ||||
// return MineHeaderSkeleton(); | super.didChangeDependencies(); | ||||
// } | } | ||||
UserInfoModel user = Provider.of<UserInfoNotifier>(context).userInfo; | @override | ||||
Widget build(BuildContext context) { | |||||
if (user == null || user.token == null || user.token == '') { | if (user == null || user.token == null || user.token == '') { | ||||
// 未登录 | // 未登录 | ||||
return MineStaticContainer(widget.data); | return MineStaticContainer(widget.data); | ||||