Compare commits

..

No commits in common. '9af01afc506fe81029d49f6aa951b84408a8affc' and '488d8886cc69d57dc0f9c84442124c32ff084617' have entirely different histories.

File diff suppressed because it is too large Load Diff

@ -239,7 +239,8 @@ 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( Assets.home.imgFkyq.path), image: AssetImage(
Assets.home.imgFkyq.path),
)), )),
child: Column( child: Column(
crossAxisAlignment: crossAxisAlignment:
@ -263,11 +264,8 @@ class _HomePageState extends State<HomePage>
], ],
), ),
), ),
onTap: () async { onTap: () {
BotToast.showText( Get.to(() => VisitorAccessPage());
text: '本小区尚未配置门禁设备',
align: Alignment(0, 0.5));
//Get.to(() => VisitorAccessPage());
}, },
), ),
), ),
@ -357,9 +355,7 @@ class _HomePageState extends State<HomePage>
), ),
), ),
onTap: () async { onTap: () async {
BotToast.showText( await TipsDialog.tipsDialog();
text: '本小区尚未配置门禁设备',
align: Alignment(0, 0.5));
// Get.to(AdvicePage( // Get.to(AdvicePage(
// type: AdviceType.SUGGESTION)); // type: AdviceType.SUGGESTION));
}, },

@ -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,54 +78,44 @@ class ActivityCard extends StatelessWidget {
], ],
), ),
24.hb, 24.hb,
Padding( Row(
padding: EdgeInsets.symmetric(horizontal: 32.w), crossAxisAlignment: CrossAxisAlignment.start,
child: Row( children: [
crossAxisAlignment: CrossAxisAlignment.start, Container(
children: [ constraints: BoxConstraints(maxWidth: 340.w),
Container( child: Text(
constraints: BoxConstraints(maxWidth: 340.w), model == null ? '' : model!.title,
child: Text( maxLines: 2,
model == null ? '' : model!.title, overflow: TextOverflow.ellipsis,
maxLines: 2, style: TextStyle(
overflow: TextOverflow.ellipsis, color: Color(0xD9000000),
style: TextStyle( fontSize: 28.sp,
color: Color(0xD9000000), fontWeight: FontWeight.bold),
fontSize: 28.sp,
fontWeight: FontWeight.bold),
),
), ),
Spacer(), ),
], Spacer(),
), ],
), ),
Spacer(), Spacer(),
[
Padding( Flexible(
padding:EdgeInsets.only(left: 32.w,right: 32.w,bottom: 32.w), child: AvatarsParticipate(
child: Row( avatars:
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(),
], ],
), ),
), ),

Loading…
Cancel
Save