'.'

lib/pages/order/index.dart

@@ -1,10 +1,11 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_easyrefresh/easy_refresh.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:worker_client/models/entities/Order.dart';
 import 'package:worker_client/services/order.dart';
-import 'package:worker_client/widgets/MoreList.dart';
 import 'package:worker_client/widgets/MyCard/index.dart';
+import 'package:worker_client/widgets/NullCard.dart';
 import 'package:worker_client/widgets/layout/BasicPage.dart';
 
 class Order extends BasicPage {
@@ -12,8 +13,7 @@ class Order extends BasicPage {
     tabIndex = 1;
     naviTitle = '订单列表';
   }
-
-  List<OrderModel> orderList = [];
+  final orderList = Rx<List<OrderModel>>([]);
   final q = Rx<String>('');
 
   List<String> tabValues = [
@@ -23,9 +23,64 @@ class Order extends BasicPage {
   ];
   final currentIndex = Rx<int>(0);
 
+  //测试上拉加载更多
+  EasyRefreshController _controller = EasyRefreshController();
+  var pageIndex = 1;
+  var count = 10;
+  int maxSum = 0;
+  final params = Rx<Map<String, dynamic>>({'pageNum': 1, 'workStatus': 1});
+  final newOrderList = Rx<List<OrderModel>>([]);
+  void getNewData() {
+    Map<String, dynamic> map = {...params.value};
+    pageIndex = 1;
+    map['pageNum'] = pageIndex;
+    map['workStatus'] = currentIndex.value;
+    if (map['workStatus'] == 2) {
+      map['workStatus'] = 3;
+    }
+    map['q'] = q.value;
+    params(map);
+    getOrderList(params.value).then((value) {
+      maxSum = value['total'];
+
+      List<OrderModel> list = [];
+      value['records'].forEach((item) {
+        list.add(OrderModel.fromJson(item));
+      });
+      orderList(list);
+      newOrderList(list);
+    });
+  }
+
+  void getMoreData() {
+    Map<String, dynamic> map = {...params.value};
+    pageIndex++;
+    map['pageNum'] = pageIndex;
+    map['workStatus'] = currentIndex.value;
+    if (map['workStatus'] == 2) {
+      map['workStatus'] = 3;
+    }
+    map['q'] = q.value;
+    params(map);
+    getOrderList(params.value).then((value) {
+      maxSum = value['total'];
+      List<OrderModel> list = [];
+      List<OrderModel> Newlist = [];
+      value['records'].forEach((item) {
+        list.add(OrderModel.fromJson(item));
+      });
+      newOrderList.value.addAll(list);
+      Newlist.addAll(newOrderList.value);
+      orderList(Newlist);
+    });
+  }
+
+  int _count = 0;
+
   @override
   void beforeShow() {
     super.beforeShow();
+    getNewData();
   }
 
   List<OrderModel> GetList(value) {
@@ -34,8 +89,6 @@ class Order extends BasicPage {
     return list;
   }
 
-  Map<String, dynamic> map = {'pageNum': 1};
-
   void goDetail(OrderModel item) {
     Get.toNamed('/orderDetail', arguments: {'id': item.orderId});
   }
@@ -44,9 +97,7 @@ class Order extends BasicPage {
   Widget builder(BuildContext context) {
     return Container(
       width: 375.w,
-      decoration: const BoxDecoration(
-        color: Colors.white
-      ),
+      decoration: const BoxDecoration(color: Colors.white),
       child: Column(
         children: [
           Container(
@@ -79,6 +130,7 @@ class Order extends BasicPage {
                     ),
                     onChanged: (e) {
                       q(e);
+                      getNewData();
                     },
                   ),
                 ),
@@ -111,6 +163,7 @@ class Order extends BasicPage {
                         child: GestureDetector(
                           onTap: () {
                             currentIndex(index);
+                            getNewData();
                           },
                           child: SizedBox(
                             height: 44.h,
@@ -147,33 +200,65 @@ class Order extends BasicPage {
                     }).toList(),
                   ))),
           Expanded(
-            flex:1,
-            child: MoreList(
-              serves: getOrderList,
-              params: map,
-              getJson: (BuildContext context, List<dynamic> jsonData) {
-                orderList = GetList(jsonData);
-                return Container(
-                  decoration: const BoxDecoration(color: Colors.white),
-                  padding: EdgeInsets.all(15.w),
-                  child: Column(
-                    children: orderList
-                        .map(
-                          (item) => MyCard(
-                            item: item,
-                            job: false,
-                            detail: false,
-                            goDetail: () {
-                              goDetail(item);
-                            },
-                            buttomText: item.status == 0 ? '开始作业' : '完成作业',
-                            onClick: () {},
-                          ),
-                        )
-                        .toList(),
-                  ),
-                );
-              },
+            flex: 1,
+            child: Obx(() => orderList.value.isNotEmpty
+                ? EasyRefresh(
+                    controller: _controller,
+                    header: ClassicalHeader(
+                      infoText: '',
+                      refreshedText: '刷新完成',
+                      refreshText: '刷新中....',
+                      refreshingText: '刷新中....',
+                      refreshReadyText: '刷新完毕',
+                      noMoreText: '',
+                      textColor: const Color(0xff666666),
+                    ),
+                    footer: ClassicalFooter(
+                      infoText: '',
+                      loadText: '上拉加载更多',
+                      loadingText: '加载中....',
+                      loadReadyText: '释放加载',
+                      noMoreText: '暂无更多',
+                      enableInfiniteLoad: false,
+                      textColor: const Color(0xff666666),
+                    ),
+                    // firstRefresh: true,//是否首次刷新
+                    onRefresh: () async {
+                      await Future.delayed(const Duration(seconds: 1), () {
+                        // print("下拉刷新-----");
+                        getNewData();
+                        _count = orderList.value.length;
+                        // print("最新条数" + _count.toString());
+                        _controller.resetLoadState();
+                      });
+                    },
+                    onLoad: () async {
+                      await Future.delayed(const Duration(seconds: 1), () {
+                        // print("上拉加载-----");
+                        getMoreData();
+                        _count = orderList.value.length;
+                        // print("加载更多条数" + _count.toString());
+                        _controller.finishLoad(noMore: _count >= maxSum);
+                      });
+                    },
+                    child: Column(
+                      children: orderList.value
+                          .map(
+                            (item) => MyCard(
+                              item: item,
+                              job: false,
+                              detail: false,
+                              onClick: () {},
+                              goDetail: () {
+                                // goDetail(item);
+                              },
+                              buttomText: item.status == 0 ? '开始作业' : '完成作业',
+                            ),
+                          )
+                          .toList(),
+                    ),
+                  )
+                : const NullCard(text:'暂无订单'),
             ),
           ),
         ],

lib/widgets/RefreshMoreList.dart

@@ -0,0 +1,146 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_easyrefresh/easy_refresh.dart';
+import 'package:get/get.dart';
+import 'package:worker_client/models/entities/Order.dart';
+import 'package:worker_client/services/order.dart';
+import 'package:worker_client/widgets/NullCard.dart';
+import 'package:worker_client/widgets/MyCard/index.dart';
+
+class RefreshMoreList extends StatefulWidget {
+  const RefreshMoreList({Key? key, required this.cardText, required this.pPrams}) : super(key: key);
+  final String cardText;
+  final Map<String,dynamic> pPrams;
+  @override
+  State<RefreshMoreList> createState() => _RefreshMoreList(this.cardText,this.pPrams);
+}
+
+class _RefreshMoreList extends State<RefreshMoreList> {
+
+  EasyRefreshController _controller = EasyRefreshController();
+  final String cardText;
+  final Map<String,dynamic> pPrams;
+
+  _RefreshMoreList(this.cardText, this.pPrams);
+
+  @override
+  void initState() {
+    super.initState();
+
+    getNewData();
+  }
+
+  final orderList = Rx<List<OrderModel>>([]);
+  var pageIndex = 1;
+  var count = 10;
+  int maxSum = 0;
+  final params = Rx<Map<String, dynamic>>({'pageNum': 1});
+  final newOrderList = Rx<List<OrderModel>>([]);
+  void getNewData() {
+    Map<String, dynamic> map = {...params.value,...pPrams};
+    pageIndex = 1;
+    map['pageNum'] = pageIndex;
+    // map['workStatus'] = currentIndex.value;
+    if (map['workStatus'] == 2) {
+      map['workStatus'] = 3;
+    }
+    // map['q'] = q.value;
+    params(map);
+    getOrderList(params.value).then((value) {
+      maxSum = value['total'];
+
+      List<OrderModel> list = [];
+      value['records'].forEach((item) {
+        list.add(OrderModel.fromJson(item));
+      });
+      orderList(list);
+      newOrderList(list);
+    });
+  }
+
+  void getMoreData() {
+    Map<String, dynamic> map = {...params.value};
+    pageIndex++;
+    map['pageNum'] = pageIndex;
+    // map['workStatus'] = currentIndex.value;
+    if (map['workStatus'] == 2) {
+      map['workStatus'] = 3;
+    }
+    // map['q'] = q.value;
+    params(map);
+    getOrderList(params.value).then((value) {
+      maxSum = value['total'];
+      List<OrderModel> list = [];
+      List<OrderModel> Newlist = [];
+      value['records'].forEach((item) {
+        list.add(OrderModel.fromJson(item));
+      });
+      newOrderList.value.addAll(list);
+      Newlist.addAll(newOrderList.value);
+      orderList(Newlist);
+    });
+  }
+
+  int _count = 0;
+
+  @override
+  Widget build(BuildContext context) {
+    return Obx(() => orderList.value.isNotEmpty
+        ? EasyRefresh(
+            controller: _controller,
+            header: ClassicalHeader(
+              infoText: '',
+              refreshedText: '刷新完成',
+              refreshText: '刷新中....',
+              refreshingText: '刷新中....',
+              refreshReadyText: '刷新完毕',
+              noMoreText: '',
+              textColor: const Color(0xff666666),
+            ),
+            footer: ClassicalFooter(
+              infoText: '',
+              loadText: '上拉加载更多',
+              loadingText: '加载中....',
+              loadReadyText: '释放加载',
+              noMoreText: '暂无更多',
+              enableInfiniteLoad: false,
+              textColor: const Color(0xff666666),
+            ),
+            // firstRefresh: true,//是否首次刷新
+            onRefresh: () async {
+              await Future.delayed(const Duration(seconds: 1), () {
+                // print("下拉刷新-----");
+                getNewData();
+                _count = orderList.value.length;
+                // print("最新条数" + _count.toString());
+                _controller.resetLoadState();
+              });
+            },
+            onLoad: () async {
+              await Future.delayed(const Duration(seconds: 1), () {
+                // print("上拉加载-----");
+                getMoreData();
+                _count = orderList.value.length;
+                // print("加载更多条数" + _count.toString());
+                _controller.finishLoad(noMore: _count >= maxSum);
+              });
+            },
+            child: Column(
+              children: orderList.value
+                  .map(
+                    (item) => MyCard(
+                      item: item,
+                      job: false,
+                      detail: false,
+                      onClick: () {},
+                      goDetail: () {
+                        // goDetail(item);
+                      },
+                      buttomText: item.status == 0 ? '开始作业' : '完成作业',
+                    ),
+                  )
+                  .toList(),
+            ),
+          )
+        : NullCard(text: cardText));
+  }
+}

pubspec.lock

@@ -188,6 +188,13 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.0.3"
+  flutter_easyrefresh:
+    dependency: "direct main"
+    description:
+      name: flutter_easyrefresh
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.2.1"
   flutter_lints:
     dependency: "direct dev"
     description:

pubspec.yaml

@@ -47,6 +47,7 @@ dependencies:
   dotted_border: ^2.0.0
   flutter_picker: ^2.0.3
   flutter_easyloading: ^3.0.3
+  flutter_easyrefresh: ^2.2.1
 
 dev_dependencies:
   flutter_test: