diff --git a/lib/ui/home/announcement/All_anouncement.dart b/lib/ui/home/announcement/All_anouncement.dart index 86bf170..a5c85e0 100644 --- a/lib/ui/home/announcement/All_anouncement.dart +++ b/lib/ui/home/announcement/All_anouncement.dart @@ -1,11 +1,13 @@ import 'dart:ui'; import 'package:aku_community_manager/style/app_style.dart'; +import 'package:aku_community_manager/ui/home/announcement/anouncement_details.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; import 'package:aku_ui/aku_ui.dart'; import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:aku_community_manager/const/resource.dart'; +import 'package:get/get.dart'; class AnouncementCard { String title; @@ -24,12 +26,24 @@ class AllAnouncement extends StatefulWidget { } class _AllAnouncementState extends State { - Widget _anounceCard(String title, String date,) { + Widget _anounceCard( + String title, + String date, + ) { return Column( children: [ AkuButton( - onPressed: (){}, - // color: Color(0xFFFFFFFF), + onPressed: () { + Get.to(AnouncementDetails( + title: title, + date: date, + body: ''' +各位同事: +深圳永成物业员工2016年国庆节放假通知如下10月1日至7日放假调休,共7天。10月8日(星期六)上班。调休期间,值班室至少三人,请各级主管自行安排。请将此消息转达给我们所有的同事、客户、供应商和任何有品要迅知的伙伴 + +祝全体员工度过一个欢乐样和的国庆节假日''', + )); + }, child: Container( color: Color(0xFFFFFFFF), width: double.infinity, @@ -59,7 +73,10 @@ class _AllAnouncementState extends State { mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.start, children: [ - Text(title,style: AppStyle().primaryStyle,), + Text( + title, + style: AppStyle().primaryStyle, + ), SizedBox(height: 12.w), Row( children: [ @@ -81,18 +98,23 @@ class _AllAnouncementState extends State { ), ), ), - SizedBox(height: 16.w,), + SizedBox( + height: 16.w, + ), ], ); } - Widget _anouncementList(String date, List cards,) { + Widget _anouncementList( + String date, + List cards, + ) { return Column( children: [ Container( alignment: Alignment.center, width: double.infinity, - height: 24.w + 33.w, + height: 48.w + 33.w, child: Text( date, style: AppStyle().minorStyle, @@ -111,13 +133,22 @@ class _AllAnouncementState extends State { return AkuScaffold( title: '全部公告', body: ListView( - padding: EdgeInsets.only(top: 24.w, left: 32.w, right: 32.w), + padding: EdgeInsets.only(left: 32.w, right: 32.w), children: [ _anouncementList('2020-10-22', [ - AnouncementCard('关于国庆放假的通知和安排', '2020-10-22 10:00',), - AnouncementCard('关于绿化组人员调动通知', '2020-10-22 11:00',), + AnouncementCard( + '关于国庆放假的通知和安排', + '2020-10-22 10:00', + ), + AnouncementCard( + '关于绿化组人员调动通知', + '2020-10-22 11:00', + ), + ]), + _anouncementList('2020-10-20', [ + AnouncementCard('关于中秋放假通知与工作安排', '2020-10-22 10:00'), + AnouncementCard('疫情期间对大家的表扬和鼓励', '2020-10-22 11:00'), ]), - _anouncementList('2020-10-20', []) ], ), ); diff --git a/lib/ui/home/announcement/anouncement_details.dart b/lib/ui/home/announcement/anouncement_details.dart new file mode 100644 index 0000000..d1ce60e --- /dev/null +++ b/lib/ui/home/announcement/anouncement_details.dart @@ -0,0 +1,65 @@ + +import 'package:aku_community_manager/style/app_style.dart'; +import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; + +class AnouncementDetails extends StatelessWidget { + final String title; + final String date; + final String body; + const AnouncementDetails({ + Key key, + @required this.title, + @required this.date, + @required this.body, + }) : super(key: key); + + @override + Widget build(BuildContext context) { + return AkuScaffold( + title: '活动详情', + body: Container( + color: Color(0xFFFFFFFF), + padding: EdgeInsets.only(top: 24.w, left: 33.w, right: 33.w), + width: double.infinity, + height: double.infinity, + child: Column(mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Text( + title, + style: AppStyle().barTitleStyle, + ), + SizedBox( + height: 16.w, + ), + Text(body, + style: + TextStyle(color: AppStyle.primaryTextColor, fontSize: 28.sp)), + SizedBox( + height: 120.w, + ), + Row( + children: [ + Spacer(), + Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text('深圳永成物业有限公司', style: AppStyle().primaryStyle), + SizedBox( + height: 4.w, + ), + Text(date, style: AppStyle().primaryStyle), + ], + ), + SizedBox( + width: 56.w - 31.w, + ), + ], + ), + ]), + ), + ); + } +}