From 17231d7ad7d9cf182c9c1a62fedef1312547c763 Mon Sep 17 00:00:00 2001
From: anfe <448468458@qq.com>
Date: Tue, 18 Jun 2024 14:12:08 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E4=BF=AE=E5=A4=8D=E9=94=81=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=20ui=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lockDetail/lockDetail_page.dart           | 22 +++++++++----------
 .../lockMian/lockMain/lockMain_logic.dart     |  7 +++---
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/lib/main/lockDetail/lockDetail/lockDetail_page.dart b/lib/main/lockDetail/lockDetail/lockDetail_page.dart
index 199ff1f2..15021fd6 100755
--- a/lib/main/lockDetail/lockDetail/lockDetail_page.dart
+++ b/lib/main/lockDetail/lockDetail/lockDetail_page.dart
@@ -102,7 +102,7 @@ class _LockDetailPageState extends State<LockDetailPage>
               child: Column(
                 children: <Widget>[
                   SizedBox(
-                    height: 15.h,
+                    height: 10.h,
                   ),
                   Padding(
                     padding: EdgeInsets.symmetric(horizontal: 24.w),
@@ -113,20 +113,16 @@ class _LockDetailPageState extends State<LockDetailPage>
                     ),
                   ),
                   SizedBox(
-                    height: 35.h,
+                    height: 20.h,
                   ),
                   xhjInfoView(),
                   SizedBox(
-                    height: 35.h,
+                    height: 20.h,
                   ),
                   labelText(
                       img: 'images/icon_slider_horizontal.png',
                       text: '功能'.tr,
                       child: bottomWidget()),
-                  labelText(
-                      img: 'images/icon_puzzlepiece_extension.png',
-                      text: '配件'.tr,
-                      child: attachmentWidget()),
                   btnText(
                       img: 'images/main/icon_main_set.png',
                       text: TranslationLoader.lanKeys!.set!.tr,
@@ -140,6 +136,10 @@ class _LockDetailPageState extends State<LockDetailPage>
                               'isOnlyOneData': state.isOnlyOneData
                             });
                       }),
+                  labelText(
+                      img: 'images/icon_puzzlepiece_extension.png',
+                      text: '配件'.tr,
+                      child: attachmentWidget()),
                 ],
               ),
             ),
@@ -207,7 +207,7 @@ class _LockDetailPageState extends State<LockDetailPage>
       {required String img, required String text, required Widget child}) {
     return Container(
       margin: EdgeInsets.symmetric(horizontal: 0.05.sw, vertical: 15.h),
-      padding: EdgeInsets.symmetric(horizontal: 0.05.sw, vertical: 20.h),
+      padding: EdgeInsets.symmetric(horizontal: 0.05.sw, vertical: 15.h),
       decoration: BoxDecoration(
           color: Colors.white,
           borderRadius: BorderRadius.circular(16.r),
@@ -899,7 +899,7 @@ class _LockDetailPageState extends State<LockDetailPage>
       child: GridView.count(
           crossAxisCount: 4,
           // childAspectRatio: 3,
-          crossAxisSpacing: 20.w,
+          crossAxisSpacing: 0.w,
           mainAxisSpacing: 0.h,
           shrinkWrap: true,
           physics: const NeverScrollableScrollPhysics(),
@@ -945,8 +945,8 @@ class _LockDetailPageState extends State<LockDetailPage>
       child: GridView.count(
           crossAxisCount: 4,
           // childAspectRatio: 3,
-          crossAxisSpacing: 25.h,
-          mainAxisSpacing: 5.h,
+          crossAxisSpacing: 0.h,
+          mainAxisSpacing: 0.h,
           shrinkWrap: true,
           physics: const NeverScrollableScrollPhysics(),
           children: getBottomWidget()),
diff --git a/lib/main/lockMian/lockMain/lockMain_logic.dart b/lib/main/lockMian/lockMain/lockMain_logic.dart
index 94838b61..1ea35672 100755
--- a/lib/main/lockMian/lockMain/lockMain_logic.dart
+++ b/lib/main/lockMian/lockMain/lockMain_logic.dart
@@ -42,9 +42,10 @@ class LockMainLogic extends BaseGetXController {
   }
 
   void loadMainDataLogic(LockListInfoGroupEntity entity) {
-    final bool every = entity.groupList!.every((GroupList list) =>
-        (list.lockList ?? <LockListInfoItemEntity>[]).isEmpty);
-    if (entity.groupList!.isEmpty || every) {
+    final bool every = entity.groupList?.every((GroupList list) =>
+            (list.lockList ?? <LockListInfoItemEntity>[]).isEmpty) ??
+        false;
+    if ((entity.groupList??<GroupList>[]).isEmpty || every) {
       state.dataLength.value = 0;
     } else if (entity.groupList!.length == 1) {
       final GroupList groupList = entity.groupList![0];