'首页删除刷新功能改成全屏滚动'

lib/pages/home/index.dart

@@ -34,67 +34,65 @@ class Home extends BasicPage {
     return Container(
       decoration: const BoxDecoration(color: Colors.white),
       padding: EdgeInsets.fromLTRB(15.w, 5.w, 15.w, 0),
-      child: Column(
-        children: [
-          const searchBannerHeader(),
-          Row(
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+      child: RefreshMoreList(
+        pPrams: params,
+        cardText: '暂无农机',
+        fetch: getMachinery,
+        isHome: true,
+        useState: (state) {
+          machineryList(GetList(state));
+        },
+        builder: ({required BuildContext context, required Function toggle}) {
+          Refresh = toggle;
+          return Column(
             children: [
-              Container(
-                padding: EdgeInsets.symmetric(vertical: 15.h),
-                child: Row(
-                  children: [
-                    Padding(
-                      padding: const EdgeInsets.only(right: 8),
-                      child: Image(
-                        image:
-                            const AssetImage('images/icons/carsListImga.png'),
-                        fit: BoxFit.cover,
-                        width: 20.w,
-                      ),
+              const searchBannerHeader(),
+              Row(
+                mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                children: [
+                  Container(
+                    padding: EdgeInsets.symmetric(vertical: 15.h),
+                    child: Row(
+                      children: [
+                        Padding(
+                          padding: const EdgeInsets.only(right: 8),
+                          child: Image(
+                            image: const AssetImage(
+                                'images/icons/carsListImga.png'),
+                            fit: BoxFit.cover,
+                            width: 20.w,
+                          ),
+                        ),
+                        Text(
+                          '农机列表',
+                          style: TextStyle(
+                              color: const Color(0xff222222),
+                              fontSize: 20.sp,
+                              fontWeight: FontWeight.bold),
+                        )
+                      ],
                     ),
-                    Text(
-                      '农机列表',
-                      style: TextStyle(
-                          color: const Color(0xff222222),
-                          fontSize: 20.sp,
-                          fontWeight: FontWeight.bold),
-                    )
-                  ],
+                  ),
+                  GestureDetector(
+                    child: const Text('更多 >>'),
+                    onTap: () {
+                      Get.to(const MoreCars());
+                    },
+                  )
+                ],
+              ),
+              Obx(
+                () => Column(
+                  children: machineryList.value
+                      .map(
+                        (item) => CarsCard(item: item),
+                      )
+                      .toList(),
                 ),
               ),
-              GestureDetector(
-                child: const Text('更多 >>'),
-                onTap: () {
-                  Get.to(const MoreCars());
-                },
-              )
             ],
-          ),
-          Expanded(
-            child: RefreshMoreList(
-              pPrams: params,
-              cardText: '暂无农机',
-              fetch: getMachinery,
-              useState: (state) {
-                machineryList(GetList(state));
-              },
-              builder: (
-                  {required BuildContext context, required Function toggle}) {
-                Refresh = toggle;
-                return Obx(
-                  () => Column(
-                    children: machineryList.value
-                        .map(
-                          (item) => CarsCard(item: item),
-                        )
-                        .toList(),
-                  ),
-                );
-              },
-            ),
-          ),
-        ],
+          );
+        },
       ),
     );
   }

lib/widgets/RefreshMoreList.dart

@@ -12,10 +12,12 @@ class RefreshMoreList extends StatefulWidget {
     required this.fetch,
     required this.builder,
     required this.useState,
+    this.isHome,
   }) : super(key: key);
   final String cardText;
   final Rx<Map<String, dynamic>> pPrams;
   final Function fetch;
+  bool? isHome;
   Function(List<dynamic> state) useState;
   Widget Function({
     required BuildContext context,
@@ -105,15 +107,17 @@ class _RefreshMoreList extends State<RefreshMoreList> {
           infoColor: const Color(0xff666666),
         ),
         // firstRefresh: true,//是否首次刷新
-        onRefresh: () async {
-          await Future.delayed(const Duration(seconds: 1), () {
-            // print("下拉刷新-----");
-            getNewData();
-            _count = dataList.value.length;
-            // print("最新条数" + _count.toString());
-            _controller.resetLoadState();
-          });
-        },
+        onRefresh: widget.isHome != null
+            ? null
+            : () async {
+                await Future.delayed(const Duration(seconds: 1), () {
+                  // print("下拉刷新-----");
+                  getNewData();
+                  _count = dataList.value.length;
+                  // print("最新条数" + _count.toString());
+                  _controller.resetLoadState();
+                });
+              },
         onLoad: () async {
           await Future.delayed(const Duration(seconds: 1), () {
             // print("上拉加载-----");