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

lib/pages/home/home_page.dart

@@ -239,8 +239,7 @@ class _HomePageState extends State<HomePage>
                                       borderRadius: BorderRadius.circular(16.w),
                                       image: DecorationImage(
                                         fit: BoxFit.fill,
-                                        image: AssetImage(
+                                        image: AssetImage(                                            Assets.home.imgFkyq.path),
-                                            Assets.home.imgFkyq.path),
                                       )),
                                   child: Column(
                                     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 {
-                                        await TipsDialog.tipsDialog();
+                                        BotToast.showText(
+                                            text: '本小区尚未配置门禁设备',
+                                            align: Alignment(0, 0.5));
                                         // Get.to(AdvicePage(
                                         //     type: AdviceType.SUGGESTION));
                                       },

lib/pages/personal/personal_page.dart

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

lib/ui/community/activity/activity_card.dart

@@ -78,44 +78,54 @@ class ActivityCard extends StatelessWidget {
               ],
             ),
             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(),
-            [
+
-              Flexible(
+            Padding(
-                child: AvatarsParticipate(
+              padding: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() ?? []),
-                  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(),
           ],
         ),
       ),