diff --git a/assets/newIcon/hyhd.png b/assets/newIcon/hyhd.png new file mode 100644 index 00000000..ac6c65cf Binary files /dev/null and b/assets/newIcon/hyhd.png differ diff --git a/assets/newIcon/jfjs.png b/assets/newIcon/jfjs.png new file mode 100644 index 00000000..ebc41dcb Binary files /dev/null and b/assets/newIcon/jfjs.png differ diff --git a/assets/newIcon/sfbs.png b/assets/newIcon/sfbs.png new file mode 100644 index 00000000..466ba7fa Binary files /dev/null and b/assets/newIcon/sfbs.png differ diff --git a/assets/newIcon/srzf.png b/assets/newIcon/srzf.png new file mode 100644 index 00000000..f08c418d Binary files /dev/null and b/assets/newIcon/srzf.png differ diff --git a/assets/newIcon/xcyhm.png b/assets/newIcon/xcyhm.png new file mode 100644 index 00000000..3f89cdb7 Binary files /dev/null and b/assets/newIcon/xcyhm.png differ diff --git a/assets/newIcon/zfyh.png b/assets/newIcon/zfyh.png new file mode 100644 index 00000000..ae59adf8 Binary files /dev/null and b/assets/newIcon/zfyh.png differ diff --git a/lib/gen/assets.gen.dart b/lib/gen/assets.gen.dart index 6aa32d97..b1b6006e 100644 --- a/lib/gen/assets.gen.dart +++ b/lib/gen/assets.gen.dart @@ -637,6 +637,7 @@ class $AssetsNewIconGen { AssetGenImage get avatarPlaceholder => const AssetGenImage('assets/newIcon/avatar_placeholder.png'); + AssetGenImage get hyhd => const AssetGenImage('assets/newIcon/hyhd.png'); AssetGenImage get icDaifuk => const AssetGenImage('assets/newIcon/ic_daifuk.png'); AssetGenImage get icDaishouh => @@ -688,6 +689,11 @@ class $AssetsNewIconGen { const AssetGenImage('assets/newIcon/img_wpcm.png'); AssetGenImage get imgZxgl => const AssetGenImage('assets/newIcon/img_zxgl.png'); + AssetGenImage get jfjs => const AssetGenImage('assets/newIcon/jfjs.png'); + AssetGenImage get sfbs => const AssetGenImage('assets/newIcon/sfbs.png'); + AssetGenImage get srzf => const AssetGenImage('assets/newIcon/srzf.png'); + AssetGenImage get xcyhm => const AssetGenImage('assets/newIcon/xcyhm.png'); + AssetGenImage get zfyh => const AssetGenImage('assets/newIcon/zfyh.png'); } class $AssetsStaticGen { diff --git a/lib/pages/personal/intergral/integral_center_page.dart b/lib/pages/personal/intergral/integral_center_page.dart index 1301f15b..06a7553e 100644 --- a/lib/pages/personal/intergral/integral_center_page.dart +++ b/lib/pages/personal/intergral/integral_center_page.dart @@ -1,15 +1,13 @@ +import 'package:aku_new_community/gen/assets.gen.dart'; +import 'package:aku_new_community/pages/personal/intergral/progress_paint.dart'; +import 'package:aku_new_community/pages/personal/intergral/rule_explain_page.dart'; +import 'package:aku_new_community/widget/bee_back_button.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; - import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:velocity_x/velocity_x.dart'; -import 'package:aku_new_community/gen/assets.gen.dart'; -import 'package:aku_new_community/pages/personal/intergral/progress_paint.dart'; -import 'package:aku_new_community/pages/personal/intergral/rule_explain_page.dart'; -import 'package:aku_new_community/widget/bee_back_button.dart'; - class integralCenterPage extends StatefulWidget { const integralCenterPage({Key? key}) : super(key: key); @@ -42,12 +40,12 @@ class _integralCenterPageState extends State { crossAxisCount: 3, physics: NeverScrollableScrollPhysics(), children: [ - gridCard(Assets.icons.identify.path, '身份标识', () {}), - gridCard(Assets.icons.identify.path, '积分加速', () {}), - gridCard(Assets.icons.identify.path, '支付优惠', () {}), - gridCard(Assets.icons.identify.path, '生日祝福', () {}), - gridCard(Assets.icons.identify.path, '会员活动', () {}), - gridCard(Assets.icons.identify.path, '炫彩用户名', () {}), + gridCard(Assets.newIcon.sfbs.path, '身份标识', () {}), + gridCard(Assets.newIcon.jfjs.path, '积分加速', () {}), + gridCard(Assets.newIcon.zfyh.path, '支付优惠', () {}), + gridCard(Assets.newIcon.srzf.path, '生日祝福', () {}), + gridCard(Assets.newIcon.hyhd.path, '会员活动', () {}), + gridCard(Assets.newIcon.xcyhm.path, '炫彩用户名', () {}), ], ), ); @@ -66,10 +64,9 @@ class _integralCenterPageState extends State { color: Color(0xFF303843), width: double.infinity, height: 850.h, - child: Column( - mainAxisSize: MainAxisSize.min, + child: ListView( children: [ - Spacer(), + 180.w.heightBox, Padding( padding: EdgeInsets.only(left: 48.w), child: Row( diff --git a/lib/ui/community/community_views/community_page.dart b/lib/ui/community/community_views/community_page.dart index 9f30c4db..3f9f4625 100644 --- a/lib/ui/community/community_views/community_page.dart +++ b/lib/ui/community/community_views/community_page.dart @@ -28,6 +28,7 @@ import 'package:aku_new_community/widget/others/user_tool.dart'; import 'package:bot_toast/bot_toast.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:get/get.dart'; import 'package:provider/provider.dart'; @@ -84,106 +85,117 @@ class _CommunityPageState extends State super.build(context); final userProvider = Provider.of(context); final appProvider = Provider.of(context); - return Scaffold( - appBar: AppBar( - titleSpacing: 0, - title: Align( - alignment: Alignment.centerLeft, - child: Theme( - data: ThemeData( - splashColor: Colors.transparent, - highlightColor: Colors.transparent, - ), - child: TabBar( - onTap: (index) { - setState(() {}); - if (_tabController?.index == 1) { - myKey.currentState?.refresh(); - } - }, - controller: _tabController, - indicatorColor: Color(0xffffc40c), - indicatorPadding: EdgeInsets.only(bottom: 15.w), - indicator: const BoxDecoration(), - tabs: _tabs.map((e) => Tab(text: e)).toList(), - labelStyle: - TextStyle(fontSize: 36.sp, fontWeight: FontWeight.bold), - labelColor: Color(0xD9000000), - unselectedLabelStyle: TextStyle(fontSize: 32.sp), - unselectedLabelColor: Color(0x73000000), - isScrollable: true, - ), - )), - backgroundColor: Colors.white, - actions: [ - Padding( - padding: EdgeInsets.only(right: 32.w), - child: GestureDetector( - onTap: () async { - if (LoginUtil.isNotLogin) return; - bool? result = await Get.to(() => AddNewEventPage()); - if (result == true) { - switch (_tabController!.index) { - case 0: - _easyRefreshController.callRefresh(); + return AnnotatedRegion( + value: SystemUiOverlayStyle.dark, + child: Scaffold( + appBar: PreferredSize( + preferredSize: Size.fromHeight(88.w), + child: Container( + decoration: BoxDecoration( + gradient: + LinearGradient(colors: [Colors.white, Color(0xFFFFF9D1)])), + child: AppBar( + titleSpacing: 0, + title: Align( + alignment: Alignment.centerLeft, + child: Theme( + data: ThemeData( + splashColor: Colors.transparent, + highlightColor: Colors.transparent, + ), + child: TabBar( + onTap: (index) { + setState(() {}); + if (_tabController?.index == 1) { + myKey.currentState?.refresh(); + } + }, + controller: _tabController, + indicatorColor: Color(0xffffc40c), + indicatorPadding: EdgeInsets.only(bottom: 15.w), + indicator: const BoxDecoration(), + tabs: _tabs.map((e) => Tab(text: e)).toList(), + labelStyle: TextStyle( + fontSize: 36.sp, fontWeight: FontWeight.bold), + labelColor: Color(0xD9000000), + unselectedLabelStyle: TextStyle(fontSize: 32.sp), + unselectedLabelColor: Color(0x73000000), + isScrollable: true, + ), + )), + backgroundColor: Colors.transparent, + actions: [ + Padding( + padding: EdgeInsets.only(right: 32.w), + child: GestureDetector( + onTap: () async { + if (LoginUtil.isNotLogin) return; + bool? result = await Get.to(() => AddNewEventPage()); + if (result == true) { + switch (_tabController!.index) { + case 0: + _easyRefreshController.callRefresh(); - break; - case 1: - myKey.currentState!.refresh(); - break; - } - } - }, - child: Image.asset(R.ASSETS_ICONS_ICON_COMMUNITY_PUSH_PNG, - height: 40.w, width: 40.w), - ), - ) - ], - ), - body: TabBarView( - children: [ - EasyRefresh( - firstRefresh: true, - header: MaterialHeader(), - footer: MaterialFooter(), - controller: _easyRefreshController, - onRefresh: () async { - _pageNum = 1; - await (getNewInfo()); - _gambitModels = await CommunityFunc.getListGambit(); - _hotNewsModels = await CommunityFunc.getHotNews(); - _onload = false; - setState(() {}); - }, - onLoad: () async { - _pageNum++; - await loadNewInfo(); - setState(() {}); - }, - child: _onload - ? SizedBox() - : ListView( - children: [ - // _geSearch(), - // 2.hb, - _hotNewsModels.isEmpty ? SizedBox() : _getInfo(), - 16.hb, - _gambitModels.isEmpty ? SizedBox() : _getNews(), - 16.hb, - ..._newItems - .map((e) => ChatCard( - model: e, - refresh: () { - _easyRefreshController.callRefresh(); - setState(() {}); - })) - .toList() - ], + break; + case 1: + myKey.currentState!.refresh(); + break; + } + } + }, + child: Image.asset(R.ASSETS_ICONS_ICON_COMMUNITY_PUSH_PNG, + height: 40.w, width: 40.w), ), + ) + ], + ), ), - if (UserTool.userProvider.isLogin) MyCommunityView(key: myKey), - ], - controller: _tabController, + ), + body: TabBarView( + children: [ + EasyRefresh( + firstRefresh: true, + header: MaterialHeader(), + footer: MaterialFooter(), + controller: _easyRefreshController, + onRefresh: () async { + _pageNum = 1; + await (getNewInfo()); + _gambitModels = await CommunityFunc.getListGambit(); + _hotNewsModels = await CommunityFunc.getHotNews(); + _onload = false; + setState(() {}); + }, + onLoad: () async { + _pageNum++; + await loadNewInfo(); + setState(() {}); + }, + child: _onload + ? SizedBox() + : ListView( + children: [ + // _geSearch(), + // 2.hb, + _hotNewsModels.isEmpty ? SizedBox() : _getInfo(), + 16.hb, + _gambitModels.isEmpty ? SizedBox() : _getNews(), + 16.hb, + ..._newItems + .map((e) => ChatCard( + model: e, + refresh: () { + _easyRefreshController.callRefresh(); + setState(() {}); + })) + .toList() + ], + ), + ), + if (UserTool.userProvider.isLogin) MyCommunityView(key: myKey), + ], + controller: _tabController, + ), ), ); }