feats

lib/pages/MoreCars/index.dart

@@ -1,20 +1,14 @@
-import 'dart:convert';
-
-import 'package:farmer_client/pages/home/widgets/home/widgets/headers.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_easyloading/flutter_easyloading.dart';
-import 'package:flutter_easyrefresh/easy_refresh.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:fluttertoast/fluttertoast.dart';
+import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:get/get.dart';
-
-import '../../models/app.dart';
-import '../../models/entities/CardListModel.dart';
-import '../../models/entities/CardTypeModel.dart';
-import '../../services/homeAPI.dart';
-import '../../widgets/CarsCard.dart';
-import '../../widgets/NullCard.dart';
-import '../../widgets/Search.dart';
+import 'package:farmer_client/pages/home/widgets/headers.dart';
+import 'package:farmer_client/widgets/CarsCard.dart';
+import 'package:farmer_client/widgets/RefreshMoreList.dart';
+import 'package:farmer_client/models/app.dart';
+import 'package:farmer_client/models/entities/CardListModel.dart';
+import 'package:farmer_client/models/entities/CardTypeModel.dart';
+import 'package:farmer_client/services/homeAPI.dart';
 
 class MoreCars extends StatefulWidget {
   const MoreCars({Key? key}) : super(key: key);
@@ -24,170 +18,124 @@ class MoreCars extends StatefulWidget {
 
 class _MoreCarsState extends State<MoreCars> with TickerProviderStateMixin {
   late TabController _controller;
-  late EasyRefreshController _controllerList;
-
-  final tabText = Rx<List<CardTypeModel>>([]);
-  final classId = Rx<List<dynamic>>([]);
-  final cardTypeList = Rx<List<CardListModel>>([]);
-  final newCardTypeList = Rx<List<CardListModel>>([]);
-  var pageIndex = 1; //页数
-  var count = 10; //每页10条
-  late int maxSum; //最多条数
-  String value=''; //最多条数
-  int _count = 0;
   String? location = AppController.t.locationStr;
+
+  //农机分类列表
+  final typeList = Rx<List<CardTypeModel>>([]);
+  //顶部的tab栏是否加载完成标识位
   bool hasTopLoad = false;
+  //当前选中项的下标
   int index = 0;
-  String typeId='';
-  Map<String, dynamic> params = {'pageNum': 1,'location':AppController.t.locationStr,'typeId':''};
+  //当前选中项的类型Id
+  String typeId = '';
+
+  //农机列表
+  final machineryList = Rx<List<CardListModel>>([]);
+  late int maxSum; //最多条数
+  Function? Refresh;
+
+  final params = Rx<Map<String, dynamic>>({
+    'pageNum': 1,
+    'location': AppController.t.locationStr ?? '112.087465,32.687507',
+    'typeId': ''
+  });
 
   @override
   void initState() {
-    // TODO: implement initState
     super.initState();
-    _controller = TabController(length: tabText.value.length, vsync: this);
-    _controllerList = EasyRefreshController();
-
-    // _controller.addListener(() {
-    //   setState(() => _selectedIndex = _controller.index);
-    //   print("liucheng-> ${_controller.indexIsChanging}");
-    // });
+    _controller = TabController(length: typeList.value.length, vsync: this);
     _geList();
-    getNewData(params);
-    // _getAllCarsList();
   }
 
-  @override
-  void dispose() {
-    super.dispose();
-    _controller.dispose();
-    _controllerList.dispose();
-  }
-
-
-
-  void getNewData(Map? params) {
-    pageIndex = 1;
-    params!['pageNum'] = pageIndex;
-    print(params['pageNum']);
-    getMachinery(params).then((value) {
-      maxSum = value['total'];
-
-      List<CardListModel> list = [];
-      value['records'].forEach((item) {
-        list.add(CardListModel.fromJson(item));
-      });
-      cardTypeList(list);
-      newCardTypeList(list);
-      _count = cardTypeList.value.length;
-    });
-  }
+  //获取数据
   void _geList() {
-    getMachineryType().then((value) {
+    getMachineryType({'pageSize': 500}).then((value) {
       EasyLoading.show(status: '数据加载中...');
-
       final list = <CardTypeModel>[];
-      List classtypeId = [];
       List<CardTypeModel> newTabs = [
         CardTypeModel.fromJson({'name': '全部'})
       ];
       value['records'].forEach((item) {
         list.add(CardTypeModel.fromJson(item));
       });
+      //将全部的选项的农机放到tab栏的第一位
       list.insertAll(0, newTabs);
-      tabText(list);
-      tabText().forEach((item) {
-        classtypeId.add(item.typeId);
-      });
-      classId(classtypeId);
-
-      hasTopLoad = true;
-      _controller = TabController(length: tabText.value.length, vsync: this);
-      print(hasTopLoad);
+      typeList(list);
+      _controller = TabController(length: typeList.value.length, vsync: this);
       EasyLoading.dismiss();
-
-    });
-  }
-  void getMoreData(Map? params) {
-    pageIndex++;
-    params!['pageNum'] = pageIndex;
-    print(params['pageNum']);
-    searchMachinery(params).then((value) {
-      maxSum = value['total'];
-      List<CardListModel> list = [];
-      List<CardListModel> Newlist = [];
-      value['records'].forEach((item) {
-        list.add(CardListModel.fromJson(item));
-      });
-      newCardTypeList.value.addAll(list);
-      Newlist.addAll(newCardTypeList.value);
-      cardTypeList(Newlist);
-      _count = cardTypeList.value.length;
     });
   }
+
+  //切换农机类型
   void _handleTabChange(i) {
     index = i;
+    Map<String, dynamic> map = {...params.value};
+    map['pageNum'] = 1;
     if (index == 0) {
-      Map<String, dynamic> paramss = {'pageNum': 1,'location':location};
-      getNewData(paramss);
+      typeId = '';
     } else {
-      // final typeId = classId.value[index];
-      print('typeId+$typeId');
-      typeId=classId.value[index];
-      print('typeId+$typeId');
-
+      typeId = typeList.value[index].typeId.toString();
+    }
+    map['typeId'] = typeId;
+    params(map);
+    Refresh!();
+  }
 
-      // Map<String, dynamic> params = {'pageNum': 1,'location':location,'typeId':typeId.toString()};
-      params['typeId']=classId.value[index];
-      getNewData(params);
+  List<CardListModel> GetList(value) {
+    List<CardListModel> list = [];
+    if (value != null)
+      value.forEach((item) => {list.add(CardListModel.fromJson(item))});
+    return list;
+  }
 
-    }
+  @override
+  void dispose() {
+    super.dispose();
+    _controller.dispose();
   }
 
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-        resizeToAvoidBottomInset: true,
-        appBar: AppBar(
-          centerTitle: true,
-          backgroundColor: Colors.transparent,
-          foregroundColor: const Color(0xFF333333),
-          elevation: 0,
-          toolbarHeight: 44.w,
-          title: Text(
-            '更多',
-            style: TextStyle(
-                color: const Color(0xFF333333),
-                fontWeight: FontWeight.bold,
-                fontSize: 17.sp,
-                letterSpacing: 2),
-          ),
+      resizeToAvoidBottomInset: true,
+      appBar: AppBar(
+        centerTitle: true,
+        backgroundColor: Colors.transparent,
+        foregroundColor: const Color(0xFF333333),
+        elevation: 0,
+        toolbarHeight: 44.w,
+        title: Text(
+          '更多',
+          style: TextStyle(
+              color: const Color(0xFF333333),
+              fontWeight: FontWeight.bold,
+              fontSize: 17.sp,
+              letterSpacing: 2),
         ),
-        body: SafeArea(
-            child: Container(
-              alignment: Alignment.center,
-              decoration: BoxDecoration(color: Colors.white),
-              child: !hasTopLoad
-                  ?  Column(
+      ),
+      body: SafeArea(
+        child: Container(
+          alignment: Alignment.center,
+          decoration: const BoxDecoration(color: Colors.white),
+          child: Column(
+            children: [
+              ListView(
+                shrinkWrap: true,
+                physics: const NeverScrollableScrollPhysics(),
                 children: [
-                  ListView(
-                    shrinkWrap: true,
-                    physics: NeverScrollableScrollPhysics(),
-                    children: [
-                      Container(
-                        padding: EdgeInsets.fromLTRB(0, 15, 0, 15),
-                        width: 350.w,
-                        child: TypeHeader(
-                          type: false,
-                        ),
-                      ),
-                      Obx(() => TabBar(
+                  Container(
+                    margin: EdgeInsets.all(15.w),
+                    child: TypeHeader(
+                      type: false,
+                    ),
+                  ),
+                  Obx(() => TabBar(
                         labelStyle: TextStyle(
                             fontSize: ScreenUtil().setSp(19),
                             fontWeight: FontWeight.bold),
                         //选中的样式
                         unselectedLabelStyle:
-                        TextStyle(fontSize: ScreenUtil().setSp(16)),
+                            TextStyle(fontSize: ScreenUtil().setSp(16)),
                         //未选中的样式
                         controller: _controller,
                         isScrollable: true,
@@ -198,60 +146,45 @@ class _MoreCarsState extends State<MoreCars> with TickerProviderStateMixin {
                         //选中文字颜色
                         unselectedLabelColor: Color(0xffadadad),
                         // indicatorSize: TabBarIndicatorSize.label, //指示器与文字等宽
-                        tabs: tabText.value
+                        tabs: typeList.value
                             .map((e) => Tab(text: e.name.toString()))
                             .toList(),
                         onTap: (int i) {
                           _handleTabChange(i);
                         },
                       )),
-                    ],
-                  ),
-                  Expanded(
-                    child: _buildListView(context),
-                  )
                 ],
+              ),
+              Expanded(
+                child: _buildListView(context),
               )
-                  : Text('加载中...'),
-            )));
+            ],
+          ),
+        ),
+      ),
+    );
   }
-  Widget _buildListView(BuildContext context) {
-    return EasyRefresh(
-      controller: _controllerList,
-      firstRefresh: true,
-      onRefresh: () async {
-        await Future.delayed(Duration(seconds: 1), () {
-          print("下拉刷新-----");
-          // Map<String, dynamic> params = {'pageNum': pageIndex,'location':AppController.t.locationStr,'q':value};
 
-          getNewData(params);
-          _controllerList.resetLoadState();
-        });
+  Widget _buildListView(BuildContext context) {
+    return RefreshMoreList(
+      pPrams: params,
+      cardText: '暂无农机',
+      fetch: getMachinery,
+      useState: (state) {
+        machineryList(GetList(state));
       },
-      onLoad: () async {
-        await Future.delayed(Duration(seconds: 1), () {
-          if (_count == maxSum) {
-            Fluttertoast.showToast(msg: '暂无更多数据哦');
-          } else {
-            // Map<String, dynamic> params = {'pageNum': pageIndex,'location':AppController.t.locationStr,'q':value};
-
-            getMoreData(params);
-          }
-          _controllerList.finishLoad(noMore: _count >= maxSum);
-
-        });
+      builder: ({required BuildContext context, required Function toggle}) {
+        Refresh = toggle;
+        return Obx(
+          () => Column(
+            children: machineryList.value
+                .map(
+                  (item) => CarsCard(item: item),
+                )
+                .toList(),
+          ),
+        );
       },
-      child: Obx(
-            () => cardTypeList.value.length > 0
-            ?
-        Column(
-          mainAxisSize: MainAxisSize.min,
-          children: cardTypeList.value
-              .map((item) => CarsCard(item: item))
-              .toList(),
-        ): NullCard(text: '暂无农机信息！'),
-      ),
     );
   }
-
 }

lib/pages/OrderConfirmation/index.dart

@@ -38,7 +38,6 @@ class OrderConfirmation extends BasicPage {
           .then((value) {
         item(CardInfo.fromJson(value));
         EasyLoading.dismiss();
-
       });
 
       // item(CardInfo.fromJson(Get.arguments['item']));
@@ -67,7 +66,11 @@ class OrderConfirmation extends BasicPage {
       generateOrder(data).then((value) {
         orderInfo(OrderInfoModel.fromJson(value));
         Fluttertoast.showToast(msg: '预约成功');
-        Get.offNamed('/orderPageInfo', arguments: {'id': orderInfo().orderId,'title':'待付款','styleColor':Color(0xFF51D4FF)});
+        Get.offNamed('/orderPageInfo', arguments: {
+          'id': orderInfo().orderId,
+          'title': '待付款',
+          'styleColor': Color(0xFF51D4FF)
+        });
       });
       //验证通过提交数据
     }
@@ -81,141 +84,138 @@ class OrderConfirmation extends BasicPage {
       child: Form(
         key: _formKey, //设置globalKey，用于后面获取FormState
         autovalidateMode: AutovalidateMode.onUserInteraction,
-        child:
-            Column(
-              children: [
-                Container(
-                  margin: EdgeInsets.fromLTRB(15, 20, 0, 0),
-                  alignment: Alignment.topLeft,
-                  child: Text(
-                    '作业面积/亩',
-                    style: TextStyle(
-                        color: Color(0xff222222),
-                        fontSize: 17.sp,
-                        fontWeight: FontWeight.bold),
-                  ),
-                ),
-                TextFormField(
-                  autofocus: false,
-                  keyboardType: TextInputType.number,
-                  controller: _unameController,
-                  decoration: const InputDecoration(
-                    isCollapsed: true,
-                    contentPadding:
+        child: Column(
+          children: [
+            Container(
+              margin: EdgeInsets.fromLTRB(15, 20, 0, 0),
+              alignment: Alignment.topLeft,
+              child: Text(
+                '作业面积/亩',
+                style: TextStyle(
+                    color: Color(0xff222222),
+                    fontSize: 17.sp,
+                    fontWeight: FontWeight.bold),
+              ),
+            ),
+            TextFormField(
+              autofocus: false,
+              keyboardType: TextInputType.number,
+              controller: _unameController,
+              decoration: const InputDecoration(
+                isCollapsed: true,
+                contentPadding:
                     EdgeInsets.symmetric(vertical: 8, horizontal: 16),
-                    counterText: '', //去掉计数
-                    ///   UnderlineInputBorder 只有下边框  默认使用的就是下边框
-                    border: UnderlineInputBorder(
-                      borderRadius: BorderRadius.all(Radius.circular(10)),
-                      borderSide: BorderSide(
-                        color: Color(0x30000000),
-                        width: 2.0,
-                      ),
-                    ),
-                    floatingLabelBehavior: FloatingLabelBehavior.never,
-                    hintText: "请输入具体面积(亩)",
+                counterText: '', //去掉计数
+                ///   UnderlineInputBorder 只有下边框  默认使用的就是下边框
+                border: UnderlineInputBorder(
+                  borderRadius: BorderRadius.all(Radius.circular(10)),
+                  borderSide: BorderSide(
+                    color: Color(0x30000000),
+                    width: 2.0,
                   ),
-                  onChanged: (e) {
-                    workingArea(int.parse(e));
-                  },
-                  // 校验用户名
-                  validator: (v) {
-                    return v!.trim().isNotEmpty ? null : "作业面积/亩不能为空";
-                  },
                 ),
-                Container(
-                  margin: EdgeInsets.fromLTRB(15, 20, 0, 0),
-                  alignment: Alignment.topLeft,
-                  child: Text(
-                    '作业时间：',
-                    style: TextStyle(
-                        color: Color(0xff222222),
-                        fontSize: 17.sp,
-                        fontWeight: FontWeight.bold),
-                  ),
-                ),
-                Container(
-                    width: 345.w,
-                    padding: EdgeInsets.fromLTRB(0, 15, 0, 15),
-                    decoration: const BoxDecoration(
-                      border: Border(
-                          bottom: BorderSide(width: 1, color: Color(0x20000000)
-                            // 0x17000000
+                floatingLabelBehavior: FloatingLabelBehavior.never,
+                hintText: "请输入具体面积(亩)",
+              ),
+              onChanged: (e) {
+                workingArea(int.parse(e));
+              },
+              // 校验用户名
+              validator: (v) {
+                return v!.trim().isNotEmpty ? null : "作业面积/亩不能为空";
+              },
+            ),
+            Container(
+              margin: const EdgeInsets.fromLTRB(15, 20, 0, 0),
+              alignment: Alignment.topLeft,
+              child: Text(
+                '作业时间：',
+                style: TextStyle(
+                    color: Color(0xff222222),
+                    fontSize: 17.sp,
+                    fontWeight: FontWeight.bold),
+              ),
+            ),
+            Container(
+                width: 345.w,
+                padding: const EdgeInsets.fromLTRB(0, 15, 0, 15),
+                decoration: const BoxDecoration(
+                  border: Border(
+                      bottom: BorderSide(width: 1, color: Color(0x20000000)
+                          // 0x17000000
                           )),
-                    ),
-                    child: Row(
-                      children: [
-                        Image(
-                          image: AssetImage('images/icons/timeImage.png'),
-                          fit: BoxFit.cover,
-                          width: 18.w,
-                          height: 18.w,
-                        ),
-                        Padding(
-                          padding: EdgeInsets.fromLTRB(10, 0, 0, 0),
-                          child: GestureDetector(
-                              onTap: () async {
-                                var handleChnage = await showDatePicker(
-                                  context: context,
-                                  helpText: '请选择作业开始时间',
-                                  cancelText: '取消',
-                                  confirmText: '确定',
-                                  initialDate: selectDate() == null
-                                      ? DateTime.now()
-                                      : selectDate(),
-                                  firstDate: DateTime.now(),
-                                  lastDate: DateTime(2030),
-                                );
-                                selectDate(handleChnage!);
-                                print('${selectDate}+');
-                              },
-                              child: Obx(
-                                    () => Text(selectDate == null
-                                    ? '请选择日期'
-                                    : '${DateFormat("yyyy-MM-dd").format(selectDate())}'),
-                              )),
-                        )
-                      ],
-                    )),
-                Container(
-                  margin: EdgeInsets.fromLTRB(15, 20, 0, 0),
-                  alignment: Alignment.topLeft,
-                  child: Text(
-                    '作业位置：',
-                    style: TextStyle(
-                        color: Color(0xff222222),
-                        fontSize: 17.sp,
-                        fontWeight: FontWeight.bold),
-                  ),
                 ),
-                Container(
-                  width: 345.w,
-                  padding: EdgeInsets.fromLTRB(0, 15, 0, 15),
-                  decoration: BoxDecoration(
-                    border: Border(
-                        bottom: BorderSide(width: 1, color: Color(0x20000000)
-                          // 0x17000000
+                child: Row(
+                  children: [
+                    Image(
+                      image: const AssetImage('images/icons/timeImage.png'),
+                      fit: BoxFit.cover,
+                      width: 18.w,
+                      height: 18.w,
+                    ),
+                    Padding(
+                      padding: const EdgeInsets.fromLTRB(10, 0, 0, 0),
+                      child: GestureDetector(
+                          onTap: () async {
+                            var handleChnage = await showDatePicker(
+                              context: context,
+                              helpText: '请选择作业开始时间',
+                              cancelText: '取消',
+                              confirmText: '确定',
+                              initialDate: selectDate() ?? DateTime.now(),
+                              firstDate: DateTime.now(),
+                              lastDate: DateTime(2030),
+                            );
+                            selectDate(handleChnage!);
+                            print('${selectDate}+');
+                          },
+                          child: Obx(
+                            () => Text(selectDate == null
+                                ? '请选择日期'
+                                : DateFormat("yyyy-MM-dd").format(selectDate())),
+                          )),
+                    )
+                  ],
+                )),
+            Container(
+              margin: const EdgeInsets.fromLTRB(15, 20, 0, 0),
+              alignment: Alignment.topLeft,
+              child: Text(
+                '作业位置：',
+                style: TextStyle(
+                    color: Color(0xff222222),
+                    fontSize: 17.sp,
+                    fontWeight: FontWeight.bold),
+              ),
+            ),
+            Container(
+              width: 345.w,
+              padding: const EdgeInsets.fromLTRB(0, 15, 0, 15),
+              decoration: const BoxDecoration(
+                border: Border(
+                    bottom: BorderSide(width: 1, color: Color(0x20000000)
+                        // 0x17000000
                         )),
+              ),
+              child: Row(
+                mainAxisAlignment: MainAxisAlignment.start,
+                children: [
+                  Image(
+                    image: const AssetImage('images/gpsImgae.png'),
+                    fit: BoxFit.cover,
+                    width: 14.w,
+                    height: 17.h,
                   ),
-                  child: Row(
-                    mainAxisAlignment: MainAxisAlignment.start,
-                    children: [
-                      Image(
-                        image: AssetImage('images/gpsImgae.png'),
-                        fit: BoxFit.cover,
-                        width: 14.w,
-                        height: 17.h,
-                      ),
-                      Padding(
-                          padding: EdgeInsets.fromLTRB(10, 0, 0, 0),
-                          child: GestureDetector(
-                            onTap: () {
-                              Get.toNamed('/addressList',
-                                  arguments: {'isBack': true});
-                            },
-                            child: Container(
-                              width: 290.w,
-                              child: Obx(() => Text(
+                  Padding(
+                      padding: const EdgeInsets.fromLTRB(10, 0, 0, 0),
+                      child: GestureDetector(
+                        onTap: () {
+                          Get.toNamed('/addressList',
+                              arguments: {'isBack': true});
+                        },
+                        child: SizedBox(
+                          width: 290.w,
+                          child: Obx(() => Text(
                                 addressController.address.value.address
                                     .toString(),
                                 softWrap: true,
@@ -223,76 +223,73 @@ class OrderConfirmation extends BasicPage {
                                 textAlign: TextAlign.left,
                                 overflow: TextOverflow.ellipsis,
                               )),
-                            ),
-                          ))
-                    ],
+                        ),
+                      ))
+                ],
+              ),
+            ),
+            const Spacer(),
+            Container(
+              alignment: Alignment.bottomCenter,
+              child: SizedBox(
+                width: 315.w,
+                height: 49.h,
+                child: ElevatedButton(
+                  onPressed: () {
+                    _orderSubmit();
+                  },
+                  child: const Text(
+                    "确定",
+                    style: TextStyle(
+                        fontSize: 18,
+                        color: Colors.white,
+                        fontWeight: FontWeight.bold),
                   ),
-                ),
-                Spacer(),
-                Container(
-                  alignment: Alignment.bottomCenter,
-                  child: SizedBox(
-                    width: 315.w,
-                    height: 49.h,
-                    child: ElevatedButton(
-                      onPressed: () {
-                        _orderSubmit();
-                      },
-                      child: const Text(
-                        "确定",
-                        style: TextStyle(
-                            fontSize: 18,
-                            color: Colors.white,
-                            fontWeight: FontWeight.bold),
-                      ),
-                      style: ButtonStyle(
-                        elevation: MaterialStateProperty.all(0),
-                        backgroundColor:
+                  style: ButtonStyle(
+                    elevation: MaterialStateProperty.all(0),
+                    backgroundColor:
                         MaterialStateProperty.all(const Color(0xFFFF703B)),
-                        shape: MaterialStateProperty.all(
-                            const RoundedRectangleBorder(
-                                borderRadius:
+                    shape: MaterialStateProperty.all(
+                        const RoundedRectangleBorder(
+                            borderRadius:
                                 BorderRadius.all(Radius.circular(24.4)))),
-                      ),
-                    ),
                   ),
                 ),
-                Container(
-                  margin: EdgeInsets.fromLTRB(0, 30.w, 0, 30.w),
-                  alignment: Alignment.bottomCenter,
-                  child: SizedBox(
-                    width: 315.w,
-                    height: 49.h,
-                    child: ElevatedButton(
-                      onPressed: () {
-                        Get.back();
-                      },
-                      child: const Text(
-                        "取消",
-                        style: TextStyle(
-                            fontSize: 18,
-                            color: Color(0xFFFF703B),
-                            fontWeight: FontWeight.bold),
-                      ),
-                      style: ButtonStyle(
-                        side: MaterialStateProperty.all(
-                            BorderSide(width: 1, color: Color(0xFFFF703B))), //边框
-                        elevation: MaterialStateProperty.all(0),
-                        backgroundColor: MaterialStateProperty.all(Colors.white),
-                        shape: MaterialStateProperty.all(
-                          RoundedRectangleBorder(
-                              borderRadius:
+              ),
+            ),
+            Container(
+              margin: EdgeInsets.fromLTRB(0, 30.w, 0, 30.w),
+              alignment: Alignment.bottomCenter,
+              child: SizedBox(
+                width: 315.w,
+                height: 49.h,
+                child: ElevatedButton(
+                  onPressed: () {
+                    Get.back();
+                  },
+                  child: const Text(
+                    "取消",
+                    style: TextStyle(
+                        fontSize: 18,
+                        color: Color(0xFFFF703B),
+                        fontWeight: FontWeight.bold),
+                  ),
+                  style: ButtonStyle(
+                    side: MaterialStateProperty.all(
+                        const BorderSide(width: 1, color: Color(0xFFFF703B))), //边框
+                    elevation: MaterialStateProperty.all(0),
+                    backgroundColor: MaterialStateProperty.all(Colors.white),
+                    shape: MaterialStateProperty.all(
+                      const RoundedRectangleBorder(
+                          borderRadius:
                               BorderRadius.all(Radius.circular(24.4))),
-                        ),
-                      ),
                     ),
                   ),
                 ),
-              ],
+              ),
             ),
-
-
-
+          ],
+        ),
       ),
     );
   }

lib/pages/home/index.dart

@@ -1,14 +1,14 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:farmer_client/models/app.dart';
 import 'package:farmer_client/models/entities/CardListModel.dart';
 import 'package:farmer_client/services/homeAPI.dart';
 import 'package:farmer_client/widgets/CarsCard.dart';
 import 'package:farmer_client/widgets/RefreshMoreList.dart';
 import 'package:farmer_client/widgets/layout/BasicPage.dart';
-import 'package:flutter/material.dart';
-import '../MoreCars/index.dart';
-import 'package:farmer_client/pages/home/widgets/home/widgets/searchBannerHeader.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:get/get.dart';
+import 'package:farmer_client/pages/home/widgets/searchBannerHeader.dart';
+import 'package:farmer_client/pages/MoreCars/index.dart';
 
 class Home extends BasicPage {
   Home({Key? key}) : super(key: key) {
@@ -16,13 +16,7 @@ class Home extends BasicPage {
     naviTitle = '首页';
   }
 
-  String? location = AppController.t.locationStr;
-  final machineryLists = Rx<List<CardListModel>>([]);
-
-  final newMachineryLists = Rx<List<CardListModel>>([]);
-  var pageIndex = 1; //页数
-  var count = 10; //每页10条
-  late int maxSum; //最多条数
+  final machineryList = Rx<List<CardListModel>>([]);
   final params = Rx<Map<String, dynamic>>({
     'pageSize': 10,
     'location': AppController.t.locationStr ?? '112.087465,32.687507'
@@ -40,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) {
-                machineryLists(GetList(state));
-              },
-              builder: (
-                  {required BuildContext context, required Function toggle}) {
-                Refresh = toggle;
-                return Obx(
-                  () => Column(
-                    children: machineryLists.value
-                        .map(
-                          (item) => CarsCard(item: item),
-                        )
-                        .toList(),
-                  ),
-                );
-              },
-            ),
-          ),
-        ],
+          );
+        },
       ),
     );
   }

lib/pages/infomation/index.dart

@@ -1,132 +1,48 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
 import 'package:farmer_client/pages/infomation/widgets/Information/index.dart';
+import 'package:farmer_client/widgets/RefreshMoreList.dart';
 import 'package:farmer_client/widgets/layout/BasicPage.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_easyloading/flutter_easyloading.dart';
-import 'package:flutter_easyrefresh/easy_refresh.dart';
-import 'package:fluttertoast/fluttertoast.dart';
-import 'package:get/get_rx/src/rx_types/rx_types.dart';
-import 'package:get/get_state_manager/get_state_manager.dart';
-
-import '../../models/entities/NewsInformationModel.dart';
-import '../../services/news.dart';
-import '../../widgets/NullCard.dart';
+import 'package:farmer_client/models/entities/NewsInformationModel.dart';
+import 'package:farmer_client/services/news.dart';
 
 class Infomation extends BasicPage {
-  // List<NewsInformationModel> newsListItem=[];
-
   Infomation({Key? key}) : super(key: key) {
     tabIndex = 2;
     naviTitle = '资讯';
   }
-  EasyRefreshController _controller = EasyRefreshController();
 
-  final newsListItem = Rx<List<NewsInformationModel>>([]);
-  final addNewOrderList = Rx<List<NewsInformationModel>>([]);
-  var pageIndex = 1; //页数
-  var count = 10; //每页10条
-  late int maxSum; //最多条数
-  int _count = 0;
-  Map<String, dynamic> params = {'pageNum': 1};
-  @override
-  void beforeShow() {
-    // TODO: implement beforeShow
-    super.beforeShow();
-    // EasyLoading.show(status: '数据加载中...');
-    //
-    // getNewsList(params).then((value) {
-    //   final list = <NewsInformationModel>[];
-    //
-    //   value['records'].forEach((item) {
-    //     list.add(NewsInformationModel.fromJson(item));
-    //     print('newsListItem');
-    //
-    //     print(newsListItem.value);
-    //   });
-    //   newsListItem.value = list;
-    //   EasyLoading.dismiss();
-    //
-    // });
+  final newsList = Rx<List<NewsInformationModel>>([]);
+  final params = Rx<Map<String, dynamic>>({'pageSize': 10});
+  Function? Refresh;
+  List<NewsInformationModel> GetList(value) {
+    List<NewsInformationModel> list = [];
+    if (value != null)
+      value.forEach((item) => {list.add(NewsInformationModel.fromJson(item))});
+    return list;
   }
 
-  void getNewData() {
-    pageIndex = 1;
-    params['pageNum'] = pageIndex;
-    print(params['pageNum']);
-    getNewsList(params).then((value) {
-      maxSum = value['total'];
-
-      List<NewsInformationModel> list = [];
-      value['records'].forEach((item) {
-        list.add(NewsInformationModel.fromJson(item));
-      });
-      newsListItem(list);
-      addNewOrderList(list);
-      _count = newsListItem.value.length;
-    });
-  }
-
-  void getMoreData() {
-    pageIndex++;
-    params['pageNum'] = pageIndex;
-    print(params['pageNum']);
-    getNewsList(params).then((value) {
-      maxSum = value['total'];
-      List<NewsInformationModel> list = [];
-      List<NewsInformationModel> Newlist = [];
-      value['records'].forEach((item) {
-        list.add(NewsInformationModel.fromJson(item));
-      });
-      addNewOrderList.value.addAll(list);
-      Newlist.addAll(addNewOrderList.value);
-      newsListItem(Newlist);
-      _count = newsListItem.value.length;
-    });
-  }
-
-
-
   @override
   Widget builder(BuildContext context) {
-    return EasyRefresh(
-      controller: _controller,
-      firstRefresh: true,
-      onRefresh: () async {
-        await Future.delayed(Duration(seconds: 1), () {
-          print("下拉刷新-----");
-          getNewData();
-          _controller.resetLoadState();
-        });
+    return RefreshMoreList(
+      pPrams: params,
+      cardText: '暂无资讯',
+      fetch: getNewsList,
+      useState: (state) {
+        newsList(GetList(state));
       },
-      onLoad: () async {
-        await Future.delayed(Duration(seconds: 1), () {
-          if (_count == maxSum) {
-            Fluttertoast.showToast(msg: '暂无更多资讯哦');
-          } else {
-            getMoreData();
-          }
-          _controller.finishLoad(noMore: _count >= maxSum);
-
-        });
+      builder: ({required BuildContext context, required Function toggle}) {
+        Refresh = toggle;
+        return Obx(
+          () => Column(
+            children: newsList.value
+                .map(
+                  (item) => Information(item: item),
+                )
+                .toList(),
+          ),
+        );
       },
-      child: Obx(
-            () => newsListItem.value.length > 0
-            ?
-        Column(
-          mainAxisSize: MainAxisSize.min,
-          children: newsListItem.value
-              .map((item) => Information(item: item))
-              .toList(),
-        ): NullCard(text: '暂无资讯！'),
-      ),
     );
-      // Container(
-      //   child: Obx(() => Column(
-      //         mainAxisSize: MainAxisSize.min,
-      //         children: newsListItem.value
-      //             .map((item) => Information(
-      //                   item: item,
-      //                 ))
-      //             .toList(),
-      //       )));
   }
 }

lib/pages/order/index.dart

@@ -1,113 +1,57 @@
 import 'package:farmer_client/pages/order/widgets/index.dart';
-import 'package:farmer_client/widgets/layout/BasicPage.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_easyrefresh/easy_refresh.dart';
-import 'package:farmer_client/widgets/NullCard.dart';
-import 'package:fluttertoast/fluttertoast.dart';
 import 'package:get/get.dart';
 import 'package:get/get_rx/src/rx_types/rx_types.dart';
-import '../../models/entities/OrderInfoModel.dart';
-import '../../services/orderAPI.dart';
-import '../../widgets/OrderListCard.dart';
+import 'package:farmer_client/models/entities/OrderInfoModel.dart';
+import 'package:farmer_client/services/orderAPI.dart';
+import 'package:farmer_client/widgets/OrderListCard.dart';
+import 'package:farmer_client/widgets/layout/BasicPage.dart';
+import 'package:farmer_client/widgets/RefreshMoreList.dart';
 
 class OrderPage extends BasicPage {
   OrderPage({Key? key}) : super(key: key) {
     tabIndex = 1;
     naviTitle = '订单';
   }
-  EasyRefreshController _controller = EasyRefreshController();
 
-  final orderListItem = Rx<List<OrderInfoModel>>([]);
-  final newOrderList = Rx<List<OrderInfoModel>>([]);
-  var pageIndex = 1; //页数
-  var count = 10; //每页10条
-  late int maxSum; //最多条数
-  int _count = 0;
-  Map<String, dynamic> params = {'pageNum': 1,'mine':true};
-
-  void getNewData() {
-    pageIndex = 1;
-    params['pageNum'] = pageIndex;
-    print(params['pageNum']);
-    getOrderList(params).then((value) {
-      maxSum = value['total'];
-      List<OrderInfoModel> list = [];
-      value['records'].forEach((item) {
-        list.add(OrderInfoModel.fromJson(item));
-      });
-      orderListItem(list);
-      newOrderList(list);
-      _count = orderListItem.value.length;
-    });
+  final orderList = Rx<List<OrderInfoModel>>([]);
+  final params = Rx<Map<String, dynamic>>({'pageSize': 10, 'mine': true});
+  Function? Refresh;
+  List<OrderInfoModel> GetList(value) {
+    List<OrderInfoModel> list = [];
+    if (value != null)
+      value.forEach((item) => {list.add(OrderInfoModel.fromJson(item))});
+    return list;
   }
 
-  void getMoreData() {
-    pageIndex++;
-    params['pageNum'] = pageIndex;
-    print(params['pageNum']);
-    getOrderList(params).then((value) {
-      maxSum = value['total'];
-      List<OrderInfoModel> list = [];
-      List<OrderInfoModel> Newlist = [];
-      value['records'].forEach((item) {
-        list.add(OrderInfoModel.fromJson(item));
-      });
-      newOrderList.value.addAll(list);
-      Newlist.addAll(newOrderList.value);
-      orderListItem(Newlist);
-      _count = orderListItem.value.length;
-    });
-  }
-
-@override
-  void beforeShow() {
-    // TODO: implement beforeShow
-    super.beforeShow();
-    // getNewData();
-  }
   @override
   Widget builder(BuildContext context) {
     return Column(
-      children:  [
+      children: [
         const OrderHead(),
         Expanded(
-          child:
-          (
-    EasyRefresh(
-      controller: _controller,
-      firstRefresh: true,
-      header: ClassicalHeader(refreshingText:'刷新中...',refreshedText: '刷新成功',refreshFailedText:'异常'),
-      onRefresh: () async {
-        await Future.delayed(const Duration(seconds: 1), () {
-          print("下拉刷新-----");
-          getNewData();
-          _controller.resetLoadState();
-        });
-      },
-      onLoad: () async {
-        await Future.delayed(const Duration(seconds: 1), () {
-          if (_count == maxSum) {
-            Fluttertoast.showToast(msg: '暂无更多数据哦');
-          } else {
-            getMoreData();
-          }
-          _controller.finishLoad(noMore: _count >= maxSum);
-
-        });
-      },
-      child: Obx(
-            () => orderListItem.value.isNotEmpty
-            ?
-        Column(
-          mainAxisSize: MainAxisSize.min,
-          children: orderListItem.value
-              .map((item) => OrderListCard(item: item))
-              .toList(),
-        ): const NullCard(text: '您还没有新的订单！'),
-      ),
-    )
+          child: RefreshMoreList(
+            pPrams: params,
+            cardText: '您还没有新的订单',
+            fetch: getOrderList,
+            useState: (state) {
+              orderList(GetList(state));
+            },
+            builder: (
+                {required BuildContext context, required Function toggle}) {
+              Refresh = toggle;
+              return Obx(
+                () => Column(
+                  children: orderList.value
+                      .map(
+                        (item) => OrderListCard(item: item),
+                      )
+                      .toList(),
+                ),
+              );
+            },
           ),
-  )
+        ),
       ],
     );
   }

lib/pages/search/index.dart

@@ -1,170 +1,102 @@
-import 'dart:async';
-
-import 'package:farmer_client/widgets/layout/BasicPage.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_easyloading/flutter_easyloading.dart';
-import 'package:flutter_easyrefresh/easy_refresh.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:fluttertoast/fluttertoast.dart';
 import 'package:get/get.dart';
-import 'package:get/get_rx/src/rx_types/rx_types.dart';
-
-import '../../models/app.dart';
-import '../../models/entities/CardListModel.dart';
-import '../../services/homeAPI.dart';
-import '../../widgets/CarsCard.dart';
-import '../../widgets/NullCard.dart';
-import 'dart:async';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:farmer_client/widgets/CarsCard.dart';
+import 'package:farmer_client/widgets/RefreshMoreList.dart';
+import 'package:farmer_client/widgets/layout/BasicPage.dart';
+import 'package:farmer_client/models/app.dart';
+import 'package:farmer_client/models/entities/CardListModel.dart';
+import 'package:farmer_client/services/homeAPI.dart';
 
 class SearchPage extends BasicPage {
-  EasyRefreshController _controller = EasyRefreshController();
-
-  final cardSearchList = Rx<List<CardListModel>>([]);
-  final newCardSearchList = Rx<List<CardListModel>>([]);
-  var pageIndex = 1; //页数
-  var count = 10; //每页10条
-  late int maxSum; //最多条数
-   String value=''; //最多条数
-  int _count = 0;
+  final machineryList = Rx<List<CardListModel>>([]);
+  final params = Rx<Map<String, dynamic>>(
+      {'location': AppController.t.locationStr ?? '112.087465,32.687507'});
+  Function? Refresh;
+  List<CardListModel> GetList(value) {
+    List<CardListModel> list = [];
+    if (value != null)
+      value.forEach((item) => {list.add(CardListModel.fromJson(item))});
+    return list;
+  }
 
   var location = AppController.t.locationStr;
-
   void _onChange(String value) {
-    Map<String, dynamic> params = {'pageNum': 1,'location':AppController.t.locationStr,'q':value};
-
-    getNewData(params);
-    // searchMachinery(params).then((value) {
-    //   EasyLoading.show(status: '数据加载中...');
-    //   final list = <CardListModel>[];
-    //   value['records'].forEach((item) {
-    //     list.add(CardListModel.fromJson(item));
-    //   });
-    //   cardSearchList(list);
-    //   newCardSearchList(list);
-    //   EasyLoading.dismiss();
-    //
-    // });
-  }
-
-
-  void getNewData(Map? params) {
-    pageIndex = 1;
-    params!['pageNum'] = pageIndex;
-    print(params['pageNum']);
-    searchMachinery(params).then((value) {
-      maxSum = value['total'];
-
-      List<CardListModel> list = [];
-      value['records'].forEach((item) {
-        list.add(CardListModel.fromJson(item));
-      });
-      cardSearchList(list);
-      newCardSearchList(list);
-      _count = cardSearchList.value.length;
-    });
-  }
-
-  void getMoreData(Map? params) {
-    pageIndex++;
-    params!['pageNum'] = pageIndex;
-    print(params['pageNum']);
-    searchMachinery(params).then((value) {
-      maxSum = value['total'];
-      List<CardListModel> list = [];
-      List<CardListModel> Newlist = [];
-      value['records'].forEach((item) {
-        list.add(CardListModel.fromJson(item));
-      });
-      newCardSearchList.value.addAll(list);
-      Newlist.addAll(newCardSearchList.value);
-      cardSearchList(Newlist);
-      _count = cardSearchList.value.length;
-    });
+    Map<String, dynamic> map = {...params.value};
+    map['q'] = value;
+    map['pageNum'] = 1;
+    params(map);
+    Refresh!();
   }
 
   @override
   Widget builder(BuildContext context) {
     naviTitle = '搜索';
-    return Container(
-        child: Column(children: [
-      Container(
-        width: 345.w,
-        height: 34.h,
-        margin: EdgeInsets.symmetric(vertical: 15.h, horizontal: 15.w),
-        padding: EdgeInsets.symmetric(vertical: 0, horizontal: 10.w),
-        decoration: BoxDecoration(
-            color: Color(0xFFf8f8f8),
-            borderRadius: BorderRadius.all(Radius.circular(17.w))),
-        child: Row(
-          mainAxisAlignment: MainAxisAlignment.center,
-          children: [
-            Image.asset(
-              'images/icons/search.png',
-              width: 15.w,
-              height: 15.w,
+    return Column(
+      children: [
+        Container(
+          width: 345.w,
+          height: 34.h,
+          margin: EdgeInsets.symmetric(vertical: 15.h, horizontal: 15.w),
+          padding: EdgeInsets.symmetric(vertical: 0, horizontal: 10.w),
+          decoration: BoxDecoration(
+            color: const Color(0xFFf8f8f8),
+            borderRadius: BorderRadius.all(
+              Radius.circular(17.w),
             ),
-            Container(
-              width: 300.w,
-              margin: EdgeInsets.fromLTRB(5.w, 0, 0, 0),
-              child: TextField(
-                style: TextStyle(fontSize: 14.sp),
-                decoration: const InputDecoration(
-                  isCollapsed: true,
-                  hintText: '搜索关键字查询',
-                  border: InputBorder.none,
-                  counterText: '', //去掉计数
-                  floatingLabelBehavior: FloatingLabelBehavior.never,
+          ),
+          child: Row(
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              Image.asset(
+                'images/icons/search.png',
+                width: 15.w,
+                height: 15.w,
+              ),
+              Container(
+                width: 300.w,
+                margin: EdgeInsets.fromLTRB(5.w, 0, 0, 0),
+                child: TextField(
+                  style: TextStyle(fontSize: 14.sp),
+                  decoration: const InputDecoration(
+                    isCollapsed: true,
+                    hintText: '搜索关键字查询',
+                    border: InputBorder.none,
+                    counterText: '', //去掉计数
+                    floatingLabelBehavior: FloatingLabelBehavior.never,
+                  ),
+                  onChanged: (e) {
+                    _onChange(e);
+                  },
                 ),
-                onChanged: (e) {
-                  _onChange(e);
-                },
               ),
-            ),
-          ],
+            ],
+          ),
         ),
-      ),
-          Expanded(
-            child:
-            (
-                EasyRefresh(
-                  controller: _controller,
-                  firstRefresh: true,
-                  onRefresh: () async {
-                    await Future.delayed(Duration(seconds: 1), () {
-                      print("下拉刷新-----");
-                      Map<String, dynamic> params = {'pageNum': pageIndex,'location':AppController.t.locationStr,'q':value};
-
-                      getNewData(params);
-                      _controller.resetLoadState();
-                    });
-                  },
-                  onLoad: () async {
-                    await Future.delayed(Duration(seconds: 1), () {
-                      if (_count == maxSum) {
-                        Fluttertoast.showToast(msg: '暂无更多数据哦');
-                      } else {
-                        Map<String, dynamic> params = {'pageNum': pageIndex,'location':AppController.t.locationStr,'q':value};
-
-                        getMoreData(params);
-                      }
-                      _controller.finishLoad(noMore: _count >= maxSum);
-
-                    });
-                  },
-                  child: Obx(
-                        () => cardSearchList.value.length > 0
-                        ?
-                    Column(
-                      mainAxisSize: MainAxisSize.min,
-                      children: cardSearchList.value
-                          .map((item) => CarsCard(item: item))
-                          .toList(),
-                    ): NullCard(text: '暂无农机信息！'),
-                  ),
-                )
-
-            ),
-          )
-    ]));
+        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/services/homeAPI.dart

@@ -88,8 +88,8 @@ Future getMachineryInfo(String id, String location, bool attached) async {
  * @param {*} data
  * @returns
  */
-Future getMachineryType() async {
-  return request('/machinery-type', options: Options(method: 'GET'));
+Future getMachineryType(params) async {
+  return request('/machinery-type', options: Options(method: 'GET'),queryParameters: params);
 }
 
 

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("上拉加载-----");