1281228557
/
aku_new_community
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'newHost' of https://git.oa00.com/1281228557/aku_new_community into newHost

Browse Source
pull/1/head
张萌 3 years ago
parent b5dc06731c fc01e09091
commit 5cdd77e04a
7 changed files with 63 additions and 831 deletions
Show Stats Download Patch File Download Diff File

786
lib/gen/assets.gen.dart
View File

File diff suppressed because it is too large Load Diff

17
lib/pages/home/home_page.dart
Unescape View File

@ -239,8 +239,7 @@ class _HomePageState extends State<HomePage>
borderRadius: BorderRadius.circular(16.w), borderRadius: BorderRadius.circular(16.w),
image: DecorationImage( image: DecorationImage(
fit: BoxFit.fill, fit: BoxFit.fill,
image: AssetImage( image: AssetImage( Assets.home.imgFkyq.path),
Assets.home.imgFkyq.path),
)), )),
child: Column( child: Column(
crossAxisAlignment: crossAxisAlignment:
@ -264,8 +263,11 @@ class _HomePageState extends State<HomePage>
], ],
), ),
), ),
onTap: () { onTap: () async {
Get.to(() => VisitorAccessPage()); BotToast.showText(
text: '本小区尚未配置门禁设备',
align: Alignment(0, 0.5));
//Get.to(() => VisitorAccessPage());
}, },
), ),
), ),
@ -355,7 +357,9 @@ class _HomePageState extends State<HomePage>
), ),
), ),
onTap: () async { onTap: () async {
await TipsDialog.tipsDialog(); BotToast.showText(
text: '本小区尚未配置门禁设备',
align: Alignment(0, 0.5));
// Get.to(AdvicePage( // Get.to(AdvicePage(
// type: AdviceType.SUGGESTION)); // type: AdviceType.SUGGESTION));
}, },
@ -386,7 +390,7 @@ class _HomePageState extends State<HomePage>
_activityItemModels == [] _activityItemModels == []
? SizedBox() ? SizedBox()
: Container( : Container(
height: 460.w, height: 450.w,
child: ListView.separated( child: ListView.separated(
padding: EdgeInsets.zero, padding: EdgeInsets.zero,
separatorBuilder: (context, index) { separatorBuilder: (context, index) {
@ -401,6 +405,7 @@ class _HomePageState extends State<HomePage>
child: Builder( child: Builder(
builder: (context) { builder: (context) {
return ActivityCard( return ActivityCard(
home: true,
model: model:
_activityItemModels[index]); _activityItemModels[index]);
}, },

1
lib/pages/message_center_page/thumbs_up/thumbs_up_card.dart
Unescape View File

@ -21,6 +21,7 @@ class ThumbsUpCard extends StatelessWidget {
}, },
child: Container( child: Container(
padding: EdgeInsets.symmetric(horizontal: 32.w, vertical: 48.w), padding: EdgeInsets.symmetric(horizontal: 32.w, vertical: 48.w),
color: Colors.white,
child: Row( child: Row(
children: [ children: [
ClipOval( ClipOval(

4
lib/pages/message_center_page/thumbs_up/thumbs_up_view.dart
Unescape View File

@ -33,7 +33,9 @@ class _ThumbsUpViewState extends State<ThumbsUpView> {
itemBuilder: (context, index) { itemBuilder: (context, index) {
return ThumbsUpCard(model: items[index]); return ThumbsUpCard(model: items[index]);
}, },
separatorBuilder: (_, __) => 20.w.heightBox, separatorBuilder: (_, __) =>Container(
color: Color(0xFFF0F0F0),height: 2.w,
),
itemCount: items.length); itemCount: items.length);
}); });
} }

2
lib/pages/personal/personal_page.dart
Unescape View File

@ -428,7 +428,7 @@ class _PersonalIndexState extends State<PersonalIndex>
// 36.hb, // 36.hb,
_function('我的访客', Assets.newIcon.icWdfk.path, () { _function('我的访客', Assets.newIcon.icWdfk.path, () {
BotToast.showText( BotToast.showText(
text: '当前小区尚未连接设备', text: '本小区尚未配置门禁设备',
align: Alignment(0, 0.5)); align: Alignment(0, 0.5));
}, ''), }, ''),
_function( _function(

78
lib/ui/community/activity/activity_card.dart
Unescape View File

@ -22,7 +22,7 @@ class ActivityCard extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return ConstrainedBox( return ConstrainedBox(
constraints: BoxConstraints(maxHeight: home! ? 480.w : 540.w), constraints: BoxConstraints(maxHeight: home! ? 450.w : 540.w),
child: MaterialButton( child: MaterialButton(
clipBehavior: Clip.antiAlias, clipBehavior: Clip.antiAlias,
color: Colors.white, color: Colors.white,
@ -46,7 +46,7 @@ class ActivityCard extends StatelessWidget {
child: BeeImageNetwork( child: BeeImageNetwork(
imgs: model!.imgList ?? [], imgs: model!.imgList ?? [],
width: double.infinity, width: double.infinity,
height: home! ? 240.w : 340.w, height: home! ? 250.w : 340.w,
), ),
), ),
), ),
@ -78,44 +78,54 @@ class ActivityCard extends StatelessWidget {
], ],
), ),
24.hb, 24.hb,
Row( Padding(
crossAxisAlignment: CrossAxisAlignment.start, padding: EdgeInsets.symmetric(horizontal: 32.w),
children: [ child: Row(
Container( crossAxisAlignment: CrossAxisAlignment.start,
constraints: BoxConstraints(maxWidth: 340.w), children: [
child: Text( Container(
model == null ? '' : model!.title, constraints: BoxConstraints(maxWidth: 340.w),
maxLines: 2, child: Text(
overflow: TextOverflow.ellipsis, model == null ? '' : model!.title,
style: TextStyle( maxLines: 2,
color: Color(0xD9000000), overflow: TextOverflow.ellipsis,
fontSize: 28.sp, style: TextStyle(
fontWeight: FontWeight.bold), color: Color(0xD9000000),
fontSize: 28.sp,
fontWeight: FontWeight.bold),
),
), ),
), Spacer(),
Spacer(), ],
], ),
), ),
Spacer(), Spacer(),
[
Flexible( Padding(
child: AvatarsParticipate( padding: home!?EdgeInsets.only(left: 32.w,right: 32.w,): EdgeInsets.only(left: 32.w,right: 32.w,bottom: 32.w),
avatars: child: Row(
children: [
Flexible(
child: AvatarsParticipate(
avatars:
(model?.avatarImgList?.map((e) => e.url).toList() ?? []), (model?.avatarImgList?.map((e) => e.url).toList() ?? []),
pNum: model?.registrationNum ?? 0, pNum: model?.registrationNum ?? 0,
hasIcon: false, hasIcon: false,
), ),
),
// Spacer(),
Offstage(
offstage: ActivityFunc.dateCheck(model!.end) == '已结束',
child: ActivityFunc.dateCheck(model!.end)
.text
.size(24.sp)
.black
.make()),
],
), ),
// Spacer(), )
Offstage(
offstage: ActivityFunc.dateCheck(model!.end) == '已结束',
child: ActivityFunc.dateCheck(model!.end)
.text
.size(24.sp)
.black
.make()),
].row(),
], ],
), ),
), ),

6
lib/ui/function_and_service/task/dialogs/task_cancel_dialog.dart
Unescape View File

@ -30,9 +30,9 @@ class _TaskCancelDialogState extends State<TaskCancelDialog> {
children: [ children: [
Assets.icons.cancelTask.image( Assets.icons.cancelTask.image(
width: double.infinity, width: double.infinity,
height: 420.w, height: 390.w,
), ),
64.hb, 24.hb,
'确定要取消任务吗?'.text.size(36.sp).black.bold.make(), '确定要取消任务吗?'.text.size(36.sp).black.bold.make(),
24.hb, 24.hb,
'不再等等吗？马上就会有人来接单了！' '不再等等吗？马上就会有人来接单了！'
@ -40,7 +40,7 @@ class _TaskCancelDialogState extends State<TaskCancelDialog> {
.size(28.sp) .size(28.sp)
.color(Colors.black.withOpacity(0.45)) .color(Colors.black.withOpacity(0.45))
.make(), .make(),
80.hb, 24.hb,
Row( Row(
children: [ children: [
MaterialButton( MaterialButton(

Write Preview
Loading…
Cancel
Save