diff --git a/wgshare/lib/pages/homePage/home_view.dart b/wgshare/lib/pages/homePage/home_view.dart index f9fc475..fe0592e 100644 --- a/wgshare/lib/pages/homePage/home_view.dart +++ b/wgshare/lib/pages/homePage/home_view.dart @@ -8,6 +8,7 @@ import 'package:wgshare/common/models/user_info_detail.dart'; import 'package:wgshare/common/store/user_store.dart'; import 'package:wgshare/main.dart'; import 'package:wgshare/routes/app_routes.dart'; +import 'package:wgshare/utils/cus_behavior.dart'; import 'package:wgshare/utils/my_text.dart'; import 'package:wgshare/utils/storage.dart'; import '../../utils/color_util.dart'; @@ -69,106 +70,109 @@ class HomePageState extends State with AutomaticKeepAliveClientMixin { Expanded( child: Container( color: ColorUtil.Color_244_244_244, - child: ListView.builder( - itemBuilder: (context, index) { - return Container( - width: double.infinity, - decoration: const BoxDecoration( - borderRadius: BorderRadius.all(Radius.circular(6)), - color: Colors.white, - ), - margin: EdgeInsets.only(top: index == 0 ? 20 : 12, bottom: index == 19 ? 20 : 0, left: 16, right: 16), - padding: const EdgeInsets.all(12), - child: Column( - children: [ - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Text( - '奉节中学期末考试分析总结会议', - style: TextStyle( - fontSize: 14.sp, - color: ColorUtil.Color_89_88_88, - fontWeight: FontWeight.w500 - ), - ), - Row( - children: [ - Image.asset( - 'assets/images/index_persons.png', - width: 16.w, - height: 16.h, - ), - Text( - '2人', - style: TextStyle( - fontSize: 12.sp, - color: ColorUtil.Color_177_177_177, - ), - ), - ], - ) - ], + child: ScrollConfiguration( + behavior: CusBehavior(), + child: ListView.builder( + itemBuilder: (context, index) { + return Container( + width: double.infinity, + decoration: const BoxDecoration( + borderRadius: BorderRadius.all(Radius.circular(6)), + color: Colors.white, ), - SizedBox(height: 20.h), - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, + margin: EdgeInsets.only(top: index == 0 ? 20 : 12, bottom: index == 19 ? 20 : 0, left: 16, right: 16), + padding: const EdgeInsets.all(12), + child: Column( children: [ Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Text( - '2525353', + '奉节中学期末考试分析总结会议', style: TextStyle( - fontSize: 12.sp, - color: ColorUtil.Color_177_177_177, + fontSize: 14.sp, + color: ColorUtil.Color_89_88_88, + fontWeight: FontWeight.w500 ), ), - SizedBox(width: 6.w), - Image.asset( - 'assets/images/index_copy.png', - width: 16.w, - height: 16.h, + Row( + children: [ + Image.asset( + 'assets/images/index_persons.png', + width: 16.w, + height: 16.h, + ), + Text( + '2人', + style: TextStyle( + fontSize: 12.sp, + color: ColorUtil.Color_177_177_177, + ), + ), + ], ) ], ), - GestureDetector( - child: Container( - width: 78.w, - height: 30.h, - decoration: BoxDecoration( - borderRadius: const BorderRadius.all(Radius.circular(6)), - color: ColorUtil.Color_85_117_242, - ), - child: Row( - mainAxisAlignment: MainAxisAlignment.center, + SizedBox(height: 20.h), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Row( children: [ Text( - '进入', + '2525353', style: TextStyle( fontSize: 12.sp, - color: Colors.white, + color: ColorUtil.Color_177_177_177, ), ), + SizedBox(width: 6.w), Image.asset( - 'assets/images/index_right.png', + 'assets/images/index_copy.png', width: 16.w, height: 16.h, ) ], ), - ), - onTap: (){ - Get.toNamed(Routes.meetingMainPage); - // Navigator.of(context).push(MaterialPageRoute(builder: (context) => MeetingMainPage())); - }, + GestureDetector( + child: Container( + width: 78.w, + height: 30.h, + decoration: BoxDecoration( + borderRadius: const BorderRadius.all(Radius.circular(6)), + color: ColorUtil.Color_85_117_242, + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + '进入', + style: TextStyle( + fontSize: 12.sp, + color: Colors.white, + ), + ), + Image.asset( + 'assets/images/index_right.png', + width: 16.w, + height: 16.h, + ) + ], + ), + ), + onTap: (){ + Get.toNamed(Routes.meetingMainPage); + // Navigator.of(context).push(MaterialPageRoute(builder: (context) => MeetingMainPage())); + }, + ) + ], ) ], - ) - ], - ), - ); - }, - itemCount: 20, + ), + ); + }, + itemCount: 20, + ) ), ), ) diff --git a/wgshare/lib/pages/metting/meeting_main_view.dart b/wgshare/lib/pages/metting/meeting_main_view.dart index 0959825..df8244c 100644 --- a/wgshare/lib/pages/metting/meeting_main_view.dart +++ b/wgshare/lib/pages/metting/meeting_main_view.dart @@ -637,7 +637,7 @@ class MeetingMainPage extends StatelessWidget { ), Expanded( child: Container( - color: ColorUtil.Color_57_57_57, + color: ColorUtil.Color_57_57_57_08, )) ], ),