add Loading EasyLoading

lib/main.dart

@@ -1,6 +1,7 @@
 import 'package:farmer_client/theme.dart';
 import 'package:farmer_client/utils/location.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:get/get.dart';
 import 'package:get_storage/get_storage.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
@@ -46,6 +47,7 @@ class MyApp extends StatelessWidget {
           routingCallback: routingCallback,
           initialBinding: AppBindings(),
           getPages: pages,
+          builder: EasyLoading.init(),
         );
       },
     );

lib/models/Store.dart

@@ -1 +1 @@
-// TODO Implement this library.
+// TODO Implement this library.

lib/models/User.dart

@@ -1,15 +1,13 @@
-
 import 'package:farmer_client/models/entities/person.dart';
 import 'package:get/get.dart';
 
 class User extends GetxController {
   Person? _person;
   Person? get person => _person;
-  set person (Person? p) {
+  set person(Person? p) {
     _person = p;
     update();
   }
 
   bool get isLogin => _person != null;
-
-}
+}

lib/models/addressController.dart

@@ -1,8 +1,7 @@
-
 import 'package:farmer_client/models/entities/Address.dart';
 import 'package:get/get.dart';
 
-class AddressController extends GetxController{
+class AddressController extends GetxController {
   static AddressController t = Get.find();
-  final address=Rx<Address>(Address.fromJson({'address':'选择位置'}));
-}
+  final address = Rx<Address>(Address.fromJson({'address': '选择位置'}));
+}

lib/models/app.dart

@@ -1,17 +1,17 @@
-
 import 'dart:io';
 
 import 'package:amap_flutter_location/amap_flutter_location.dart';
 import 'package:farmer_client/models/entities/person.dart';
 import 'package:farmer_client/widgets/Modal.dart';
 import 'package:get/get.dart';
+import 'package:get_storage/get_storage.dart';
 import '../services/user.dart';
 import '../utils/location.dart';
 
 class AppController extends GetxController {
   // 有了这句, 可以直接 AppController.t 调用
   static AppController t = Get.find();
-
+  GetStorage box = GetStorage();
   final user = Rx<Person>(Person());
   final location = Rxn<Map<String, Object>>();
   final testInt = 1.obs;
@@ -19,7 +19,7 @@ class AppController extends GetxController {
   AMapFlutterLocation? _location;
 
   get locationStr {
-    if (null ==location.value) return null;
+    if (null == location.value) return null;
 
     double longitude = location.value!['longitude'] as double;
     double latitude = location.value!['latitude'] as double;
@@ -27,7 +27,7 @@ class AppController extends GetxController {
     return longitude.toString() + "," + latitude.toString();
   }
 
-  void onLocationChange (Map<String, Object> result) {
+  void onLocationChange(Map<String, Object> result) {
     location(result);
   }
 
@@ -48,14 +48,14 @@ class AppController extends GetxController {
       );
     });
 
-
-    // 尝试获取一次人员信息
-    getCurrent().then((person) {
-      user(Person.fromJson(person));
-
-    }).catchError((e) {
-      print(e);
-    });
+    if (box.read('token') != null) {
+      // 尝试获取一次人员信息
+      getCurrent().then((person) {
+        user(Person.fromJson(person));
+      }).catchError((e) {
+        print(e);
+      });
+    }
   }
 
   @override
@@ -64,5 +64,4 @@ class AppController extends GetxController {
       _location?.destroy();
     }
   }
-
-}
+}

lib/models/entities/CardInfo.dart

@@ -47,9 +47,9 @@ class CardInfo {
   int? status;
 
   // @ApiModelProperty(value = "内容详情")
-   List<ContentImageList>? contentList=[];
+  List<ContentImageList>? contentList = [];
   // @ApiModelProperty(value = "图片列表")
-   List<BannerImageList>? imagesList=[];
+  List<BannerImageList>? imagesList = [];
 
   CardInfo();
 

lib/models/entities/ExtendContent.dart

@@ -1,4 +1,3 @@
-
 class ExtendContent {
   // 租户号
   String? extId;
@@ -23,7 +22,7 @@ class ExtendContent {
 
   ExtendContent();
 
-  ExtendContent.simple({ this.content, this.contentType });
+  ExtendContent.simple({this.content, this.contentType});
 
   ExtendContent.fromJson(Map<String, dynamic> json)
       : extId = json["extId"],
@@ -35,12 +34,12 @@ class ExtendContent {
         createDate = json["createDate"];
 
   Map<String, dynamic> toJson() => {
-    'extId' : extId,
-    'targetType' : targetType,
-    'targetId' : targetId,
-    'contentType' : contentType,
-    'content' : content,
-    'sort' : sort,
-    'createDate' : createDate,
-  };
-}
+        'extId': extId,
+        'targetType': targetType,
+        'targetId': targetId,
+        'contentType': contentType,
+        'content': content,
+        'sort': sort,
+        'createDate': createDate,
+      };
+}

lib/models/entities/NewsInformationInfoTextModel.dart

@@ -1,13 +1,11 @@
-
-List<ExtendContent> jsonToList(list){
-  List<ExtendContent> contList=[];
-  list.forEach((item){
+List<ExtendContent> jsonToList(list) {
+  List<ExtendContent> contList = [];
+  list.forEach((item) {
     contList.add(ExtendContent.fromJson(item));
   });
   return contList;
 }
 
-
 class NewsInformationInfoTextModel {
   String? createDate;
   String? newsId;
@@ -17,7 +15,7 @@ class NewsInformationInfoTextModel {
   String? typeId;
   String? typeName;
   num? weight;
-   List<ExtendContent>? contentList=[];
+  List<ExtendContent>? contentList = [];
 
   NewsInformationInfoTextModel();
 
@@ -30,8 +28,7 @@ class NewsInformationInfoTextModel {
         weight = json["weight"],
         status = json["status"],
         createDate = json["createDate"],
-        contentList= jsonToList(json["contentList"]);
-
+        contentList = jsonToList(json["contentList"]);
 
   Map<String, dynamic> toJson() => {
         'newsId': newsId,
@@ -42,8 +39,6 @@ class NewsInformationInfoTextModel {
         'weight': weight,
         'status': status,
         'createDate': createDate,
-
-
       };
 }
 

lib/models/entities/NewsInformationModel.dart

@@ -11,25 +11,25 @@ class NewsInformationModel {
   NewsInformationModel();
 
   NewsInformationModel.fromJson(Map<String, dynamic> json)
-      : newsId=json["newsId"],
-        title=json["title"],
-        typeId=json["typeId"],
-        typeNam=json["typeNam"],
-        thumb=json["thumb"],
-        weight=json["weight"],
-        status=json["status"],
-        createDate=json["createDate"],
-        contentList=json["contentList"];
+      : newsId = json["newsId"],
+        title = json["title"],
+        typeId = json["typeId"],
+        typeNam = json["typeNam"],
+        thumb = json["thumb"],
+        weight = json["weight"],
+        status = json["status"],
+        createDate = json["createDate"],
+        contentList = json["contentList"];
 
   Map<String, dynamic> toJson() => {
-    'newsId':newsId,
-    'title':title,
-    'typeId':typeId,
-    'typeNam':typeNam,
-    'thumb':thumb,
-    'weight':weight,
-    'status':status,
-    'createDate':createDate,
-    'contentList':contentList,
-  };
+        'newsId': newsId,
+        'title': title,
+        'typeId': typeId,
+        'typeNam': typeNam,
+        'thumb': thumb,
+        'weight': weight,
+        'status': status,
+        'createDate': createDate,
+        'contentList': contentList,
+      };
 }

lib/models/entities/OrderInfoModel.dart

@@ -29,62 +29,61 @@ class OrderInfoModel {
   OrderInfoModel();
 
   OrderInfoModel.fromJson(Map<String, dynamic> json)
-      : orderId=json["orderId"],
-        orderNo=json["orderNo"],
-        personId=json["personId"],
-        personName=json["personName"],
-        phone=json["phone"],
-        charges=json["charges"],
-        price=json["price"],
-        amount=json["amount"],
-        machineryId=json["machineryId"],
-        machineryName=json["machineryName"],
-        machineryType=json["machineryType"],
-        typeName=json["typeName"],
-        address=json["address"],
-        appointmentDate=json["appointmentDate"],
-        payStatus=json["payStatus"],
-        dispatchStatus=json["dispatchStatus"],
-        workStatus=json["workStatus"],
-        isEvaluated=json["isEvaluated"],
-        payType=json["payType"],
-        isRefund=json["isRefund"],
-        orgId=json["orgId"],
-        orgName=json["orgName"],
-        status=json["status"],
-        createDate=json["createDate"],
-        dispatchId=json["dispatchId"],
-        workId=json["workId"],
-        workName=json["workName"];
+      : orderId = json["orderId"],
+        orderNo = json["orderNo"],
+        personId = json["personId"],
+        personName = json["personName"],
+        phone = json["phone"],
+        charges = json["charges"],
+        price = json["price"],
+        amount = json["amount"],
+        machineryId = json["machineryId"],
+        machineryName = json["machineryName"],
+        machineryType = json["machineryType"],
+        typeName = json["typeName"],
+        address = json["address"],
+        appointmentDate = json["appointmentDate"],
+        payStatus = json["payStatus"],
+        dispatchStatus = json["dispatchStatus"],
+        workStatus = json["workStatus"],
+        isEvaluated = json["isEvaluated"],
+        payType = json["payType"],
+        isRefund = json["isRefund"],
+        orgId = json["orgId"],
+        orgName = json["orgName"],
+        status = json["status"],
+        createDate = json["createDate"],
+        dispatchId = json["dispatchId"],
+        workId = json["workId"],
+        workName = json["workName"];
 
   Map<String, dynamic> toJson() => {
-    'orderId':orderId,
-    'orderNo':orderNo,
-    'personId':personId,
-    'personName':personName,
-    'phone':phone,
-    'charges':charges,
-    'price':price,
-    'amount':amount,
-    'machineryId':machineryId,
-    'machineryName':machineryName,
-    'machineryType':machineryType,
-    'typeName':typeName,
-    'address':address,
-    'appointmentDate':appointmentDate,
-    'payStatus':payStatus,
-    'dispatchStatus':dispatchStatus,
-    'workStatus':workStatus,
-    'isEvaluated':isEvaluated,
-    'payType':payType,
-    'isRefund':isRefund,
-    'orgId':orgId,
-    'orgName':orgName,
-    'status':status,
-    'createDate':createDate,
-    'dispatchId':dispatchId,
-    'workId':workId,
-    'workName':workName,
-  };
+        'orderId': orderId,
+        'orderNo': orderNo,
+        'personId': personId,
+        'personName': personName,
+        'phone': phone,
+        'charges': charges,
+        'price': price,
+        'amount': amount,
+        'machineryId': machineryId,
+        'machineryName': machineryName,
+        'machineryType': machineryType,
+        'typeName': typeName,
+        'address': address,
+        'appointmentDate': appointmentDate,
+        'payStatus': payStatus,
+        'dispatchStatus': dispatchStatus,
+        'workStatus': workStatus,
+        'isEvaluated': isEvaluated,
+        'payType': payType,
+        'isRefund': isRefund,
+        'orgId': orgId,
+        'orgName': orgName,
+        'status': status,
+        'createDate': createDate,
+        'dispatchId': dispatchId,
+        'workId': workId,
+        'workName': workName,
+      };
 }
-

lib/models/entities/OrderListAll.dart

@@ -1,5 +1,4 @@
 class OrderListAll {
-
   String? orderId;
   String? orderNo;
   String? personId;
@@ -28,68 +27,64 @@ class OrderListAll {
   String? workId;
   String? workName;
 
-
   OrderListAll();
 
   OrderListAll.fromJson(Map<String, dynamic> json)
-      :orderId=json["orderId"],
-        orderNo=json["orderNo"],
-        personId=json["personId"],
-        personName=json["personName"],
-        phone=json["phone"],
-        charges=json["charges"],
-        price=json["price"],
-        amount=json["amount"],
-        machineryId=json["machineryId"],
-        machineryName=json["machineryName"],
-        machineryType=json["machineryType"],
-        typeName=json["typeName"],
-        address=json["address"],
-        appointmentDate=json["appointmentDate"],
-        payStatus=json["payStatus"],
-        dispatchStatus=json["dispatchStatus"],
-        workStatus=json["workStatus"],
-        isEvaluated=json["isEvaluated"],
-        payType=json["payType"],
-        isRefund=json["isRefund"],
-        orgId=json["orgId"],
-        orgName=json["orgName"],
-        status=json["status"],
-        createDate=json["createDate"],
-        dispatchId=json["dispatchId"],
-        workId=json["workId"],
-        workName=json["workName"];
+      : orderId = json["orderId"],
+        orderNo = json["orderNo"],
+        personId = json["personId"],
+        personName = json["personName"],
+        phone = json["phone"],
+        charges = json["charges"],
+        price = json["price"],
+        amount = json["amount"],
+        machineryId = json["machineryId"],
+        machineryName = json["machineryName"],
+        machineryType = json["machineryType"],
+        typeName = json["typeName"],
+        address = json["address"],
+        appointmentDate = json["appointmentDate"],
+        payStatus = json["payStatus"],
+        dispatchStatus = json["dispatchStatus"],
+        workStatus = json["workStatus"],
+        isEvaluated = json["isEvaluated"],
+        payType = json["payType"],
+        isRefund = json["isRefund"],
+        orgId = json["orgId"],
+        orgName = json["orgName"],
+        status = json["status"],
+        createDate = json["createDate"],
+        dispatchId = json["dispatchId"],
+        workId = json["workId"],
+        workName = json["workName"];
 
   Map<String, dynamic> toJson() => {
-    'orderId':orderId,
-    'orderNo':orderNo,
-    'personId':personId,
-    'personName':personName,
-    'phone':phone,
-    'charges':charges,
-    'price':price,
-    'amount':amount,
-    'machineryId':machineryId,
-    'machineryName':machineryName,
-    'machineryType':machineryType,
-    'typeName':typeName,
-    'address':address,
-    'appointmentDate':appointmentDate,
-    'payStatus':payStatus,
-    'dispatchStatus':dispatchStatus,
-    'workStatus':workStatus,
-    'isEvaluated':isEvaluated,
-    'payType':payType,
-    'isRefund':isRefund,
-    'orgId':orgId,
-    'orgName':orgName,
-    'status':status,
-    'createDate':createDate,
-    'dispatchId':dispatchId,
-    'workId':workId,
-    'workName':workName,
-
-
-
-  };
+        'orderId': orderId,
+        'orderNo': orderNo,
+        'personId': personId,
+        'personName': personName,
+        'phone': phone,
+        'charges': charges,
+        'price': price,
+        'amount': amount,
+        'machineryId': machineryId,
+        'machineryName': machineryName,
+        'machineryType': machineryType,
+        'typeName': typeName,
+        'address': address,
+        'appointmentDate': appointmentDate,
+        'payStatus': payStatus,
+        'dispatchStatus': dispatchStatus,
+        'workStatus': workStatus,
+        'isEvaluated': isEvaluated,
+        'payType': payType,
+        'isRefund': isRefund,
+        'orgId': orgId,
+        'orgName': orgName,
+        'status': status,
+        'createDate': createDate,
+        'dispatchId': dispatchId,
+        'workId': workId,
+        'workName': workName,
+      };
 }

lib/models/entities/PagedResult.dart

@@ -1,4 +1,3 @@
-
 class PagedResult {
   num total;
   num size;
@@ -15,7 +14,7 @@ class PagedResult {
   });
 
   PagedResult.fromJson(Map<String, dynamic> json)
-    : total = json['total'],
+      : total = json['total'],
         size = json['size'],
         pages = json['pages'],
         current = json['current'],

lib/models/entities/person.dart

@@ -40,7 +40,6 @@ class Person {
         'status': status,
         'createDate': createDate,
         'isOrgManager': isOrgManager,
-         'identity': identity,
-
-  };
+        'identity': identity,
+      };
 }

lib/models/index.dart

@@ -1,4 +1,3 @@
-
 export 'app.dart';
 
 import 'package:farmer_client/models/addressController.dart';
@@ -12,4 +11,3 @@ class AppBindings implements Bindings {
     Get.put(AddressController());
   }
 }
-

lib/pages/ArticleInfo/ArticleInfo.dart

@@ -1,5 +1,6 @@
 import 'package:farmer_client/services/news.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:get/get_core/src/get_main.dart';
@@ -10,7 +11,8 @@ import '../../widgets/layout/BasicPage.dart';
 
 class ArticleInfo extends BasicPage {
   String newsId = '';
-  final newsInfoContent = Rx<NewsInformationInfoTextModel>(NewsInformationInfoTextModel());
+  final newsInfoContent =
+      Rx<NewsInformationInfoTextModel>(NewsInformationInfoTextModel());
   final newsList = Rx<List<ExtendContent>>([]);
 
   @override
@@ -18,14 +20,16 @@ class ArticleInfo extends BasicPage {
     // TODO: implement beforeShow
     super.beforeShow();
     if (Get.arguments['newsId'] != null) {
+      EasyLoading.show(status: '数据加载中...');
+
       newsId = Get.arguments['newsId'];
 
       getNewsInfo(newsId).then((value) {
         newsInfoContent.value = NewsInformationInfoTextModel.fromJson(value);
-        newsList.value =  newsInfoContent.value.contentList!;
+        newsList.value = newsInfoContent.value.contentList!;
+        EasyLoading.dismiss();
 
       });
-
     }
   }
 
@@ -45,22 +49,20 @@ class ArticleInfo extends BasicPage {
                   image: AssetImage('images/icons/decorate.png'),
                   width: 17,
                 ),
-                Obx(()=>
-                    Text(
+                Obx(() => Text(
                       newsInfoContent.value.title.toString(),
                       style: TextStyle(
                         fontSize: 17.sp,
                         fontWeight: FontWeight.bold,
                       ),
-                    )
-                ),
+                    )),
                 Image(
                     image: AssetImage('images/icons/decorate.png'), width: 17),
               ],
             ),
           ),
           Obx(() => Column(
-                children:  newsList.value.map((item) {
+                children: newsList.value.map((item) {
                   if (item.contentType != 'image') {
                     return Container(
                       padding: EdgeInsets.fromLTRB(0, 20, 0, 10),

lib/pages/Information/ArticleInfo.dart

@@ -7,56 +7,59 @@ class ArticleInfo extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-        resizeToAvoidBottomInset: false,
-        appBar: AppBar(
-          title: Text('资讯'),
-          leading: Icon(Icons.arrow_back_ios),
-          // backgroundColor: Colors.transparent,
-          centerTitle: true,
-        ),
-        body: Container(
-          padding: EdgeInsets.fromLTRB(15, 30, 15, 50),
-
-          child: Column(
-            children: [
-              Container(
-                alignment: Alignment.center,
-                child:  Row(
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  children: [
-                    Image(image: AssetImage('images/icons/decorate.png'),width: 17,),
-                    Text('我是22222222222标题',
+      resizeToAvoidBottomInset: false,
+      appBar: AppBar(
+        title: Text('资讯'),
+        leading: Icon(Icons.arrow_back_ios),
+        // backgroundColor: Colors.transparent,
+        centerTitle: true,
+      ),
+      body: Container(
+        padding: EdgeInsets.fromLTRB(15, 30, 15, 50),
+        child: Column(
+          children: [
+            Container(
+              alignment: Alignment.center,
+              child: Row(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  Image(
+                    image: AssetImage('images/icons/decorate.png'),
+                    width: 17,
+                  ),
+                  Text(
+                    '我是22222222222标题',
                     style: TextStyle(
                       fontSize: 17.sp,
                       fontWeight: FontWeight.bold,
-
                     ),
-                    ),
-                    Image(image: AssetImage('images/icons/decorate.png'),width: 17),
-
-                  ],
-                ),
+                  ),
+                  Image(
+                      image: AssetImage('images/icons/decorate.png'),
+                      width: 17),
+                ],
               ),
-              Container(
-                padding: EdgeInsets.fromLTRB(0, 20, 0, 10),
-                width: 344.w,
-                child: Text('gr一年之计在于春，连日来，农业生产工作正在热火朝天的进行着：农技人员走村串户指导农户春耕生产，大型拖拉机忙着翻垦农田，植保无人机 ',
-                style: TextStyle(
-                  fontSize: 14.sp
-                ),
-                ) ,
+            ),
+            Container(
+              padding: EdgeInsets.fromLTRB(0, 20, 0, 10),
+              width: 344.w,
+              child: Text(
+                'gr一年之计在于春，连日来，农业生产工作正在热火朝天的进行着：农技人员走村串户指导农户春耕生产，大型拖拉机忙着翻垦农田，植保无人机 ',
+                style: TextStyle(fontSize: 14.sp),
               ),
-              Container(
-                padding: EdgeInsets.fromLTRB(0, 10, 0,10),
-                child: Image(image: AssetImage('images/cars.png'),width:320.w,height:260.w,fit: BoxFit.fill,),
-
-              )
-
-
-            ],
-          ),
+            ),
+            Container(
+              padding: EdgeInsets.fromLTRB(0, 10, 0, 10),
+              child: Image(
+                image: AssetImage('images/cars.png'),
+                width: 320.w,
+                height: 260.w,
+                fit: BoxFit.fill,
+              ),
+            )
+          ],
         ),
+      ),
     );
-
   }
 }

lib/pages/Information/index.dart

@@ -26,17 +26,14 @@ class _InformationState extends State<Information> {
           // ListTile用不好
 
           GestureDetector(
-            child:
-            Container(
+            child: Container(
                 padding: EdgeInsets.fromLTRB(0, 30, 0, 30),
                 width: 310.w,
                 decoration: const BoxDecoration(
-                    border:Border(
-                        bottom:
-                        BorderSide(width: 0.5, color: Color(0x20000000)
-                          // 0x17000000
-                        ))
-                ),
+                    border: Border(
+                        bottom: BorderSide(width: 0.5, color: Color(0x20000000)
+                            // 0x17000000
+                            ))),
                 child: Row(
                   children: [
                     Container(
@@ -44,15 +41,13 @@ class _InformationState extends State<Information> {
                       width: 100,
                       height: 100,
                       decoration: BoxDecoration(
-                        image:  DecorationImage(
+                        image: DecorationImage(
                           image: AssetImage('images/cars.png'),
                           fit: BoxFit.cover,
                         ),
-
                         borderRadius: BorderRadius.circular(12),
                       ),
-                    )
-                    ,
+                    ),
                     Column(
                       crossAxisAlignment: CrossAxisAlignment.start,
                       children: [
@@ -65,7 +60,9 @@ class _InformationState extends State<Information> {
                               textAlign: TextAlign.left,
                               overflow: TextOverflow.ellipsis,
                               style: TextStyle(
-                                fontSize: 17.sp, fontWeight: FontWeight.bold,)),
+                                fontSize: 17.sp,
+                                fontWeight: FontWeight.bold,
+                              )),
                         ),
                         Container(
                           child: Text('2022-02-09'),
@@ -73,24 +70,20 @@ class _InformationState extends State<Information> {
                       ],
                     )
                   ],
-                )
-            ),
+                )),
             onTap: () {
               Get.toNamed('/ArticleInfo');
             },
           ),
           GestureDetector(
-            child:
-            Container(
+            child: Container(
                 padding: EdgeInsets.fromLTRB(0, 30, 0, 30),
                 width: 310.w,
                 decoration: const BoxDecoration(
-                    border:Border(
-                        bottom:
-                        BorderSide(width: 0.5, color: Color(0x20000000)
-                          // 0x17000000
-                        ))
-                ),
+                    border: Border(
+                        bottom: BorderSide(width: 0.5, color: Color(0x20000000)
+                            // 0x17000000
+                            ))),
                 child: Row(
                   children: [
                     Container(
@@ -98,15 +91,13 @@ class _InformationState extends State<Information> {
                       width: 100,
                       height: 100,
                       decoration: BoxDecoration(
-                        image:  DecorationImage(
+                        image: DecorationImage(
                           image: AssetImage('images/cars.png'),
                           fit: BoxFit.cover,
                         ),
-
                         borderRadius: BorderRadius.circular(12),
                       ),
-                    )
-                    ,
+                    ),
                     Column(
                       crossAxisAlignment: CrossAxisAlignment.start,
                       children: [
@@ -119,7 +110,9 @@ class _InformationState extends State<Information> {
                               textAlign: TextAlign.left,
                               overflow: TextOverflow.ellipsis,
                               style: TextStyle(
-                                fontSize: 17.sp, fontWeight: FontWeight.bold,)),
+                                fontSize: 17.sp,
+                                fontWeight: FontWeight.bold,
+                              )),
                         ),
                         Container(
                           child: Text('2022-02-09'),
@@ -127,13 +120,11 @@ class _InformationState extends State<Information> {
                       ],
                     )
                   ],
-                )
-            ),
+                )),
             onTap: () {
               print('进入资讯详情');
             },
           )
-
         ],
       ),
     );

lib/pages/MoreCars/index.dart

@@ -2,6 +2,7 @@ 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_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 
@@ -52,18 +53,24 @@ class _MoreCarsState extends State<MoreCars> with TickerProviderStateMixin {
 
 //进来拿到全部农机
   void _getAllCarsList() {
+    EasyLoading.show(status: '数据加载中...');
+
     getMachinery(location ?? '112.087465,32.687507').then((value) {
       final list = <CardListModel>[];
       value['records'].forEach((item) {
         list.add(CardListModel.fromJson(item));
       });
       cardTypeList(list);
+      EasyLoading.dismiss();
+
     });
   }
 
   //全部农机分类
   void _geList() {
     getMachineryType().then((value) {
+      EasyLoading.show(status: '数据加载中...');
+
       final list = <CardTypeModel>[];
       List classtypeId = [];
       List<CardTypeModel> newTabs = [
@@ -82,6 +89,8 @@ class _MoreCarsState extends State<MoreCars> with TickerProviderStateMixin {
       hasTopLoad = true;
       _controller = TabController(length: tabText.value.length, vsync: this);
       print(hasTopLoad);
+      EasyLoading.dismiss();
+
     });
   }
 
@@ -92,6 +101,8 @@ class _MoreCarsState extends State<MoreCars> with TickerProviderStateMixin {
     } else {
       final typeId = classId.value[index];
       print('typeId+$typeId');
+      EasyLoading.show(status: '数据加载中...');
+
       typeMachinery(location ?? '112.087465,32.687507', typeId.toString())
           .then((value) {
         final list = <CardListModel>[];
@@ -99,6 +110,7 @@ class _MoreCarsState extends State<MoreCars> with TickerProviderStateMixin {
           list.add(CardListModel.fromJson(item));
         });
         cardTypeList(list);
+        EasyLoading.dismiss();
 
       });
     }

lib/pages/OrderConfirmation/index.dart

@@ -3,6 +3,7 @@ import 'package:farmer_client/models/entities/CardInfo.dart';
 import 'package:farmer_client/widgets/layout/BasicPage.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:get/get.dart';
@@ -20,19 +21,23 @@ class OrderConfirmation extends BasicPage {
   final selectDate = Rx<DateTime>(DateTime.now()); //选择的时间
   final workingArea = Rx<int>(0);
   AddressController addressController = AddressController.t;
-  final item = Rx<CardInfo>(CardInfo());//全部详情
-  final orderInfo = Rx<OrderInfoModel>(OrderInfoModel());//全部详情
+  final item = Rx<CardInfo>(CardInfo()); //全部详情
+  final orderInfo = Rx<OrderInfoModel>(OrderInfoModel()); //全部详情
 
   @override
   void beforeShow() {
     // TODO: implement beforeShow
     super.beforeShow();
-    if(Get.arguments['item']!=null){
+    if (Get.arguments['item'] != null) {
       item(Get.arguments['item']);
-    }else{
-      markId=Get.arguments['id'];
-      getMachineryInfo(markId, '122.08400000000002,37.421998333333335', true).then((value) {
+    } else {
+      markId = Get.arguments['id'];
+      EasyLoading.show(status: '数据加载中...');
+
+      getMachineryInfo(markId, '122.08400000000002,37.421998333333335', true)
+          .then((value) {
         item(CardInfo.fromJson(value));
+        EasyLoading.dismiss();
 
       });
 
@@ -42,37 +47,30 @@ class OrderConfirmation extends BasicPage {
     }
   }
 
+  Map<String, dynamic> data = {};
 
-  Map<String, dynamic> data = {
-
-  };
-
-  void _orderSubmit (){
-
+  void _orderSubmit() {
     if ((_formKey.currentState as FormState).validate()) {
-          data = {
+      data = {
         'charges': item.value.price! * workingArea.value,
-        'price':  item.value.price,
+        'price': item.value.price,
         'amount': workingArea.value,
-        'machineryId':  item.value.machineryId,
-        'machineryName':  item.value.name,
-        'machineryType':  item.value.typeId,
-        'typeName':  item.value.typeName,
+        'machineryId': item.value.machineryId,
+        'machineryName': item.value.name,
+        'machineryType': item.value.typeId,
+        'typeName': item.value.typeName,
         'address': addressController.address.value.address,
-        'orgId':  item.value.orgId,
-        'appointmentDate': '${DateFormat("yyyy-MM-dd").format(selectDate.value)} 08:00:00',
+        'orgId': item.value.orgId,
+        'appointmentDate':
+            '${DateFormat("yyyy-MM-dd").format(selectDate.value)} 08:00:00',
       };
       generateOrder(data).then((value) {
         orderInfo(OrderInfoModel.fromJson(value));
-        Fluttertoast.showToast(
-            msg: '预约成功'
-        );
-        Get.offNamed('/orderPageInfo',arguments: {'id':orderInfo().orderId});
-
+        Fluttertoast.showToast(msg: '预约成功');
+        Get.offNamed('/orderPageInfo', arguments: {'id': orderInfo().orderId});
       });
       //验证通过提交数据
     }
-
   }
 
   @override
@@ -155,28 +153,26 @@ class OrderConfirmation extends BasicPage {
                     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
+                          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())}'),
-                        )
-
-                      ),
+                          )),
                     )
                   ],
                 )),
@@ -240,8 +236,6 @@ class OrderConfirmation extends BasicPage {
                 child: ElevatedButton(
                   onPressed: () {
                     _orderSubmit();
-
-
                   },
                   child: const Text(
                     "确定",

lib/pages/addAddress/index.dart

@@ -8,8 +8,7 @@ import 'package:fluttertoast/fluttertoast.dart';
 import 'package:get/get.dart';
 
 class AddAddress extends BasicPage {
-
-  final address =Rx<Address>(Address());
+  final address = Rx<Address>(Address());
   late String text = '';
   late String id = '';
 
@@ -17,7 +16,7 @@ class AddAddress extends BasicPage {
   void beforeShow() {
     super.beforeShow();
     if (Get.arguments != null) {
-      print( Get.arguments['item']);
+      print(Get.arguments['item']);
       // address(Get.arguments['item']);
       text = Get.arguments['item'];
       id = Get.arguments['id'];
@@ -26,7 +25,7 @@ class AddAddress extends BasicPage {
 
   @override
   Widget builder(BuildContext context) {
-    naviTitle='添加地址';
+    naviTitle = '添加地址';
     return Container(
       padding: EdgeInsets.all(15.w),
       child: Column(
@@ -62,7 +61,7 @@ class AddAddress extends BasicPage {
                 floatingLabelBehavior: FloatingLabelBehavior.never,
               ),
               onChanged: (e) {
-                  address().address=e;
+                address().address = e;
               },
             ),
           ),
@@ -73,21 +72,17 @@ class AddAddress extends BasicPage {
             height: 49.h,
             text: '保存',
             onPressed: () {
-              if(address.value.address==null){
-                Fluttertoast.showToast(
-                    msg: '请输入地址！');
-              } else{
-                if(text==''){
-                  addressSave(address().address.toString()).then((value){
-                    Fluttertoast.showToast(
-                        msg: '添加地址成功！');
+              if (address.value.address == null) {
+                Fluttertoast.showToast(msg: '请输入地址！');
+              } else {
+                if (text == '') {
+                  addressSave(address().address.toString()).then((value) {
+                    Fluttertoast.showToast(msg: '添加地址成功！');
                     Get.back();
                   });
-
-                }else{
-                  addressUpdate(id,address().address.toString()).then((value) {
-                    Fluttertoast.showToast(
-                        msg: '修改地址成功！');
+                } else {
+                  addressUpdate(id, address().address.toString()).then((value) {
+                    Fluttertoast.showToast(msg: '修改地址成功！');
                     Get.back();
                   });
                 }

lib/pages/addressList/index.dart

@@ -4,6 +4,7 @@ import 'package:farmer_client/pages/addressList/widget/AddressCard.dart';
 import 'package:farmer_client/widgets/DefaultButton.dart';
 import 'package:farmer_client/widgets/layout/BasicPage.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:get/get.dart';
@@ -19,12 +20,16 @@ class AddressList extends BasicPage {
   @override
   void beforeShow() {
     super.beforeShow();
+    EasyLoading.show(status: '数据加载中...');
+
     getAddress().then((value) {
       final list = <Address>[];
       value['records'].forEach((item) {
         list.add(Address.fromJson(item));
       });
       addressList(list);
+      EasyLoading.dismiss();
+
     });
     if (Get.arguments != null) {
       isBack = Get.arguments['isBack'];

lib/pages/agreement/index.dart

@@ -3,7 +3,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 
 class Agreement extends BasicPage {
-
   @override
   Widget builder(BuildContext context) {
     naviTitle = '用户协议及隐私政策';
@@ -16,20 +15,21 @@ class Agreement extends BasicPage {
           Row(
             mainAxisAlignment: MainAxisAlignment.center,
             children: [
-              Image(image: const AssetImage(
-                  'images/icons/decorate.png'
-              ),width: 16.5.w),
-              Text('用户协议',
+              Image(
+                  image: const AssetImage('images/icons/decorate.png'),
+                  width: 16.5.w),
+              Text(
+                '用户协议',
                 style: TextStyle(
                     fontSize: 20.sp,
                     fontWeight: FontWeight.bold,
-                    color: const Color(0xFF222222)
-                ),
+                    color: const Color(0xFF222222)),
               ),
-              Image(image: const AssetImage('images/icons/decorate.png'),width: 16.5.w),
+              Image(
+                  image: const AssetImage('images/icons/decorate.png'),
+                  width: 16.5.w),
             ],
           ),
-
         ],
       ),
     );

lib/pages/feedback/index.dart

@@ -8,8 +8,8 @@ import 'package:get/get.dart';
 import '../../services/main.dart';
 
 class Feedback extends BasicPage {
-  final text=Rx<String>('');
-  final isEdit=Rx<bool>(false);
+  final text = Rx<String>('');
+  final isEdit = Rx<bool>(false);
 
   @override
   Widget builder(BuildContext context) {
@@ -40,38 +40,37 @@ class Feedback extends BasicPage {
                 floatingLabelBehavior: FloatingLabelBehavior.never,
               ),
               onTap: () {
-                  isEdit.value=true;
+                isEdit.value = true;
               },
               onChanged: (e) {
-                  text.value = e;
+                text.value = e;
               },
             ),
           ),
-          Obx(()=>
-          Visibility(
-          visible:!isEdit(),
-            child:
-          Positioned(
-            left: 20.w,
-            top: 5.w,
-            child: Row(
-              children: [
-                Image.asset(
-                  'images/icons/feedbackIcon.png',
-                  width: 15.w,
-                ),
-                Text(
-                  '请留下您宝贵的意见和建议！',
-                  style: TextStyle(
-                      fontSize: 17.sp,
-                      letterSpacing: 2,
-                      color: Color(0xFFBEBDBD)),
+          Obx(
+            () => Visibility(
+              visible: !isEdit(),
+              child: Positioned(
+                left: 20.w,
+                top: 5.w,
+                child: Row(
+                  children: [
+                    Image.asset(
+                      'images/icons/feedbackIcon.png',
+                      width: 15.w,
+                    ),
+                    Text(
+                      '请留下您宝贵的意见和建议！',
+                      style: TextStyle(
+                          fontSize: 17.sp,
+                          letterSpacing: 2,
+                          color: Color(0xFFBEBDBD)),
+                    ),
+                  ],
                 ),
-              ],
+              ),
             ),
           ),
-          ),
-          ),
           Positioned(
             bottom: 25.h,
             child: DefaultButton(
@@ -88,7 +87,6 @@ class Feedback extends BasicPage {
                     Fluttertoast.showToast(msg: '提交成功！');
                     Get.back();
                   });
-
                 }
               },
               margin: const EdgeInsets.all(0),

lib/pages/home.dart

@@ -1 +1 @@
-// TODO Implement this library.
+// TODO Implement this library.

lib/pages/home/widgets/home/index.dart

@@ -2,6 +2,7 @@ import 'package:carousel_slider/carousel_slider.dart';
 import 'package:farmer_client/pages/home/widgets/home/widgets/headers.dart';
 import 'package:farmer_client/widgets/NullCard.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import '../../../../models/app.dart';
@@ -31,35 +32,40 @@ class _HomePageState extends State<HomePage> {
   @override
   void initState() {
     super.initState();
-   // final long=   location.value!['longitude'].toString() + "," + location.value!['latitude'].toString();
-   //  print('location+$location,lolongglongng+$long');
-
+    // final long=   location.value!['longitude'].toString() + "," + location.value!['latitude'].toString();
+    //  print('location+$location,lolongglongng+$long');
     getHomeBanner('banner').then((value) {
+      EasyLoading.show(status: '数据加载中...');
+
       setState(() {
         value.forEach((item) {
           bannerList.add(Banners.fromJson(item));
         });
       });
+      EasyLoading.dismiss();
+
     });
 
-    getMachinery(location??'112.087465,32.687507').then((value) {
+    getMachinery(location ?? '112.087465,32.687507').then((value) {
+      EasyLoading.show(status: '数据加载中...');
+
       setState(() {
         value['records'].forEach((item) {
           machineryLists.add(CardListModel.fromJson(item));
         });
       });
+      EasyLoading.dismiss();
+
     });
   }
 
   @override
   Widget build(BuildContext context) {
     return Container(
-      decoration: BoxDecoration(
-        color: Colors.white
-      ),
+      decoration: BoxDecoration(color: Colors.white),
       alignment: Alignment.center,
       padding: EdgeInsets.fromLTRB(15.w, 0, 15.w, 0),
-      child:  Column(
+      child: Column(
         children: [
           TypeHeader(
             type: true,
@@ -124,12 +130,13 @@ class _HomePageState extends State<HomePage> {
                       )
                     ],
                   ),
-                  machineryLists.length>= 1?
-                  Column(
-                    children: machineryLists
-                        .map((item) => CarsCard(item: item))
-                        .toList(),
-                  ):NullCard(text: '暂无农机信息！')
+                  machineryLists.length >= 1
+                      ? Column(
+                          children: machineryLists
+                              .map((item) => CarsCard(item: item))
+                              .toList(),
+                        )
+                      : NullCard(text: '暂无农机信息！')
                 ],
               )),
         ],

lib/pages/index.dart

@@ -1,4 +1,3 @@
-
 export 'ArticleInfo/ArticleInfo.dart';
 export 'OrderConfirmation/index.dart';
 export 'aboutUs/index.dart';
@@ -17,4 +16,4 @@ export 'splash/splash.dart';
 export 'login/login.dart';
 export 'machinery/map/index.dart';
 export 'machinery/detail/index.dart';
-// export 'main/index.dart';
+// export 'main/index.dart';

lib/pages/infomation/index.dart

@@ -1,6 +1,7 @@
 import 'package:farmer_client/pages/infomation/widgets/Information/index.dart';
 import 'package:farmer_client/widgets/layout/BasicPage.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:get/get_rx/src/rx_types/rx_types.dart';
 import 'package:get/get_state_manager/get_state_manager.dart';
 
@@ -17,40 +18,37 @@ class Infomation extends BasicPage {
 
   final newsListItem = Rx<List<NewsInformationModel>>([]);
 
-@override
+  @override
   void beforeShow() {
-
     // TODO: implement beforeShow
     super.beforeShow();
-  getNewsList().then((value) {
-    final list = <NewsInformationModel>[];
+    EasyLoading.show(status: '数据加载中...');
 
-     value['records'].forEach((item) {
-       list.add(NewsInformationModel.fromJson(item));
-       print('newsListItem');
+    getNewsList().then((value) {
+      final list = <NewsInformationModel>[];
 
-       print(newsListItem.value);
+      value['records'].forEach((item) {
+        list.add(NewsInformationModel.fromJson(item));
+        print('newsListItem');
 
-     });
-    newsListItem.value=list;
+        print(newsListItem.value);
+      });
+      newsListItem.value = list;
+      EasyLoading.dismiss();
 
-  });
-}
+    });
+  }
 
   @override
   Widget builder(BuildContext context) {
-
     return Container(
-        child:
-            Obx(()=>
-          Column(
-            mainAxisSize: MainAxisSize.min,
-            children:newsListItem.value.map((item) => Information(item: item,)).toList(),
-          )
-
-            )
-    );
-
-
+        child: Obx(() => Column(
+              mainAxisSize: MainAxisSize.min,
+              children: newsListItem.value
+                  .map((item) => Information(
+                        item: item,
+                      ))
+                  .toList(),
+            )));
   }
-}
+}

lib/pages/infomation/widgets/Information/index.dart

@@ -20,14 +20,12 @@ class Information extends StatefulWidget {
 class _InformationState extends State<Information> {
   final NewsInformationModel item;
 
-
   _InformationState(this.item);
 
-
   @override
   Widget build(BuildContext context) {
     return Container(
-      child:   Column(
+      child: Column(
         children: [
           // ListTile用不好
           GestureDetector(
@@ -36,8 +34,8 @@ class _InformationState extends State<Information> {
                 decoration: const BoxDecoration(
                     border: Border(
                         bottom: BorderSide(width: 0.5, color: Color(0x20000000)
-                          // 0x17000000
-                        ))),
+                            // 0x17000000
+                            ))),
                 child: Row(
                   children: [
                     Container(
@@ -70,20 +68,22 @@ class _InformationState extends State<Information> {
                         ),
                         Container(
                           child: Text(
-                              item.createDate!=null? DateFormat("yyyy-MM-dd").format(DateTime.parse(item.createDate.toString())):item.createDate.toString(),),
+                            item.createDate != null
+                                ? DateFormat("yyyy-MM-dd").format(
+                                    DateTime.parse(item.createDate.toString()))
+                                : item.createDate.toString(),
+                          ),
                         )
                       ],
                     )
                   ],
                 )),
             onTap: () {
-              Get.to(ArticleInfo(),arguments: {'newsId':item.newsId});
+              Get.to(ArticleInfo(), arguments: {'newsId': item.newsId});
             },
           ),
         ],
       ),
     );
-
-
   }
 }

lib/pages/login/login.dart

@@ -101,7 +101,6 @@ class _RouteLogin extends State<MyRouteLogin> {
         userLogin(handlePhones, handleCodes).then((value) {
           userInfo(Person.fromJson(value['person']));
 
-
           Get.off(Home());
         });
       } else {

lib/pages/machinery/detail/index.dart

@@ -1,6 +1,7 @@
 import 'package:farmer_client/models/entities/CardInfo.dart';
 import 'package:farmer_client/widgets/layout/BasicPage.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:get/get.dart';
 import '../../../services/homeAPI.dart';
 import 'widgets/detail.dart';
@@ -8,30 +9,33 @@ import 'widgets/detail.dart';
 class MachineryDetailPage extends BasicPage {
   String markId = '';
   String marKm = '';
-  final machineryInfoContent = Rx<CardInfo>(CardInfo());//全部详情
-  final machineryListBanner = Rx<List<BannerImageList>>([]);//banner轮播
-  final machineryListContent= Rx<List<ContentImageList>>([]);//图文详情
+  final machineryInfoContent = Rx<CardInfo>(CardInfo()); //全部详情
+  final machineryListBanner = Rx<List<BannerImageList>>([]); //banner轮播
+  final machineryListContent = Rx<List<ContentImageList>>([]); //图文详情
   // 响应预约事件
   void handleClick() {
-    Get.toNamed('/orderConfirmation',arguments: {'item':machineryInfoContent()});
+    Get.toNamed('/orderConfirmation',
+        arguments: {'item': machineryInfoContent()});
   }
 
-
   @override
   void beforeShow() {
     // TODO: implement onMounted
     super.beforeShow();
     if (Get.arguments['id'] != null) {
-     markId = Get.arguments['id'];
-     marKm = Get.arguments['km'];
-     print(marKm);
-      getMachineryInfo(markId, '122.08400000000002,37.421998333333335', true).then((value) {
+      EasyLoading.show(status: '数据加载中...');
+
+      markId = Get.arguments['id'];
+      marKm = Get.arguments['km'];
+      print(marKm);
+      getMachineryInfo(markId, '122.08400000000002,37.421998333333335', true)
+          .then((value) {
         machineryInfoContent(CardInfo.fromJson(value));
         machineryListBanner(machineryInfoContent().imagesList!);
         machineryListContent(machineryInfoContent().contentList!);
+        EasyLoading.dismiss();
 
       });
-
     }
     print("----show----detail page--------------");
   }
@@ -46,6 +50,12 @@ class MachineryDetailPage extends BasicPage {
   @override
   Widget builder(BuildContext context) {
     naviTitle = "查看详情";
-    return Obx(()=>page(context: context, handleClick: handleClick,km:marKm,item:machineryInfoContent.value,bnnerItem:machineryListBanner.value,contentItem:machineryListContent.value));
+    return Obx(() => page(
+        context: context,
+        handleClick: handleClick,
+        km: marKm,
+        item: machineryInfoContent.value,
+        bnnerItem: machineryListBanner.value,
+        contentItem: machineryListContent.value));
   }
 }

lib/pages/machinery/detail/widgets/detail.dart

@@ -1,4 +1,3 @@
-
 import 'package:carousel_slider/carousel_slider.dart';
 import 'package:farmer_client/pages/machinery/widgets/DefLayout.dart';
 import 'package:farmer_client/pages/machinery/widgets/RoundButton.dart';
@@ -11,17 +10,21 @@ import 'package:get/get.dart';
 import '../../../../models/entities/CardInfo.dart';
 import '../../widgets/summary.dart';
 
-Widget page({ required BuildContext context, VoidCallback? handleClick,required String km,required CardInfo item,required List<BannerImageList> bnnerItem,required List<ContentImageList> contentItem}) {
-
-
+Widget page(
+    {required BuildContext context,
+    VoidCallback? handleClick,
+    required String km,
+    required CardInfo item,
+    required List<BannerImageList> bnnerItem,
+    required List<ContentImageList> contentItem}) {
   return DefLayout(
       head: CarouselSlider(
         items: bnnerItem
             .map((item) => Container(
-          child: Center(
-              child: Image.network(item.url.toString(),
-                  fit: BoxFit.fitWidth, width: 370.w)),
-        ))
+                  child: Center(
+                      child: Image.network(item.url.toString(),
+                          fit: BoxFit.fitWidth, width: 370.w)),
+                ))
             .toList(),
         options: CarouselOptions(
           autoPlay: true,
@@ -35,21 +38,29 @@ Widget page({ required BuildContext context, VoidCallback? handleClick,required
       children: [
         DefLayout.card(
           top: DefLayout.headHeight - DefLayout.offset,
-          padding: EdgeInsets.only(top: 45.w, left: 15.w, right: 15.w, bottom: 20.w),
-          child: _content(context, handleClick,item,contentItem,km),
+          padding:
+              EdgeInsets.only(top: 45.w, left: 15.w, right: 15.w, bottom: 20.w),
+          child: _content(context, handleClick, item, contentItem, km),
         )
-      ]
-  );
+      ]);
 }
 
-Widget _content(BuildContext context, VoidCallback? handleClick, CardInfo item,List<ContentImageList> contentItem, String km) {
+Widget _content(BuildContext context, VoidCallback? handleClick, CardInfo item,
+    List<ContentImageList> contentItem, String km) {
   return Column(
     children: [
-     summary(item: item,km:km),
+      summary(item: item, km: km),
       _sectionHead('农机详情'),
-      ExtendContentList(item: contentItem,),
-      SizedBox(height: 20.w,),
-      RoundButton(text: "预约", onPressed: handleClick,)
+      ExtendContentList(
+        item: contentItem,
+      ),
+      SizedBox(
+        height: 20.w,
+      ),
+      RoundButton(
+        text: "预约",
+        onPressed: handleClick,
+      )
     ],
   );
 }
@@ -68,7 +79,13 @@ Widget _sectionHead(String title) {
       children: [
         img,
         SizedBox(width: 20.w),
-        Text(title, style: TextStyle(fontSize: 16.sp, color: const Color(0xFF222222), fontWeight: FontWeight.w500),),
+        Text(
+          title,
+          style: TextStyle(
+              fontSize: 16.sp,
+              color: const Color(0xFF222222),
+              fontWeight: FontWeight.w500),
+        ),
         SizedBox(width: 20.w),
         img,
       ],

lib/pages/machinery/map/index.dart

@@ -1,7 +1,7 @@
-
 import 'package:farmer_client/pages/machinery/map/widgets/detail.dart';
 import 'package:farmer_client/widgets/layout/BasicPage.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:get/get.dart';
 
 import '../../../models/entities/CardInfo.dart';
@@ -10,12 +10,12 @@ import '../../../services/homeAPI.dart';
 class MachineryMapPage extends BasicPage {
   String markId = '';
   String marKm = '';
-  final machineryInfoContent = Rx<CardInfo>(CardInfo());//全部详情
+  final machineryInfoContent = Rx<CardInfo>(CardInfo()); //全部详情
   // 响应预约事件
   void handleClick() {
     // Get.toNamed("/machineryDetail");
-    Get.toNamed('/orderConfirmation',arguments: {'item':machineryInfoContent()});
-
+    Get.toNamed('/orderConfirmation',
+        arguments: {'item': machineryInfoContent()});
   }
 
   @override
@@ -23,14 +23,17 @@ class MachineryMapPage extends BasicPage {
     // TODO: implement onMounted
     super.beforeShow();
     if (Get.arguments['id'] != null) {
+      EasyLoading.show(status: '数据加载中...');
+
       markId = Get.arguments['id'];
       marKm = Get.arguments['km'];
       print(marKm);
-      getMachineryInfo(markId, '122.08400000000002,37.421998333333335', true).then((value) {
+      getMachineryInfo(markId, '122.08400000000002,37.421998333333335', true)
+          .then((value) {
         machineryInfoContent(CardInfo.fromJson(value));
+        EasyLoading.dismiss();
 
       });
-
     }
     print("----show----map page--------------");
   }
@@ -45,8 +48,10 @@ class MachineryMapPage extends BasicPage {
   @override
   Widget builder(BuildContext context) {
     naviTitle = "查看地图";
-    return Obx(()=>page(context: context, handleClick: handleClick,item: machineryInfoContent(),km: marKm));
+    return Obx(() => page(
+        context: context,
+        handleClick: handleClick,
+        item: machineryInfoContent(),
+        km: marKm));
   }
-  
 }
-

lib/pages/machinery/map/widgets/detail.dart

@@ -1,4 +1,3 @@
-
 import 'package:farmer_client/pages/machinery/widgets/DefLayout.dart';
 import 'package:farmer_client/pages/machinery/widgets/RoundButton.dart';
 import 'package:flutter/material.dart';
@@ -10,42 +9,47 @@ import 'package:farmer_client/widgets/amap/amap.dart';
 import '../../../../models/entities/CardInfo.dart';
 import '../../widgets/summary.dart';
 
-Widget page({required CardInfo item,required String km, required BuildContext context, VoidCallback? handleClick}) {
+Widget page(
+    {required CardInfo item,
+    required String km,
+    required BuildContext context,
+    VoidCallback? handleClick}) {
   final _offset = 20.w;
   final width = MediaQuery.of(context).size.width;
   final mapHeight = 226.5.w;
   final cardHeight = 250.w;
 
-
   final LatLng position = LatLng(32.690712, 112.091892);
 
-  return DefLayout(
-      head: AMap(position: position),
-      children: [
-        DefLayout.card(
-            top: DefLayout.headHeight - DefLayout.offset,
-            height: DefLayout.headHeight,
-            child: Image.network(item.thumb.toString(), fit: BoxFit.cover,
-            errorBuilder:  (ctx, exception, stackTrace) {
-              return Container(); //THE WIDGET YOU WANT TO SHOW IF URL NOT RETURN IMAGE
-            },
-            ),
-        ),
-        DefLayout.card(
-            top: (DefLayout.headHeight - DefLayout.offset) * 2,
-            padding: EdgeInsets.only(top: 45.w, left: 15.w, right: 15.w, bottom: 20.w),
-            child: _content(context, handleClick,item,km)
-        ),
-      ]
-  );
+  return DefLayout(head: AMap(position: position), children: [
+    DefLayout.card(
+      top: DefLayout.headHeight - DefLayout.offset,
+      height: DefLayout.headHeight,
+      child: Image.network(
+        item.thumb.toString(),
+        fit: BoxFit.cover,
+        errorBuilder: (ctx, exception, stackTrace) {
+          return Container(); //THE WIDGET YOU WANT TO SHOW IF URL NOT RETURN IMAGE
+        },
+      ),
+    ),
+    DefLayout.card(
+        top: (DefLayout.headHeight - DefLayout.offset) * 2,
+        padding:
+            EdgeInsets.only(top: 45.w, left: 15.w, right: 15.w, bottom: 20.w),
+        child: _content(context, handleClick, item, km)),
+  ]);
 }
 
-Widget _content(BuildContext context, VoidCallback? handleClick,CardInfo item,String km) {
-  return
-    Column(
+Widget _content(
+    BuildContext context, VoidCallback? handleClick, CardInfo item, String km) {
+  return Column(
     children: [
-      summary(item: item,km:km),
-      RoundButton(text: "预约", onPressed: handleClick,),
+      summary(item: item, km: km),
+      RoundButton(
+        text: "预约",
+        onPressed: handleClick,
+      ),
     ],
   );
-}
+}

lib/pages/machinery/widgets/DefLayout.dart

@@ -1,4 +1,3 @@
-
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 
@@ -6,12 +5,17 @@ class DefLayout extends StatelessWidget {
   Widget head;
   List<Widget> children;
 
-  DefLayout({Key? key, required this.head, required this.children}): super(key: key);
+  DefLayout({Key? key, required this.head, required this.children})
+      : super(key: key);
 
   static double headHeight = 214.w;
   static double offset = 20.w;
 
-  static Widget card({required double top, required Widget child, double? height, EdgeInsetsGeometry? padding}) {
+  static Widget card(
+      {required double top,
+      required Widget child,
+      double? height,
+      EdgeInsetsGeometry? padding}) {
     final _border = 20.w;
     return Container(
       margin: EdgeInsets.only(top: top),
@@ -20,8 +24,7 @@ class DefLayout extends StatelessWidget {
       clipBehavior: Clip.hardEdge,
       decoration: BoxDecoration(
           color: Colors.white,
-          borderRadius: BorderRadius.vertical(top: Radius.circular(_border))
-      ),
+          borderRadius: BorderRadius.vertical(top: Radius.circular(_border))),
       child: child,
     );
   }

lib/pages/machinery/widgets/RoundButton.dart

@@ -1,30 +1,26 @@
-
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 
 class RoundButton extends StatelessWidget {
-
   String text;
   VoidCallback? onPressed;
 
-  RoundButton({Key? key, this.onPressed, required this.text}): super(key: key);
+  RoundButton({Key? key, this.onPressed, required this.text}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
-
     return ElevatedButton(
       child: Text(text),
       style: ElevatedButton.styleFrom(
           primary: const Color(0xFFFF703B),
-          textStyle: TextStyle(color: Colors.white, fontSize: 20.sp, letterSpacing: 5.sp),
+          textStyle: TextStyle(
+              color: Colors.white, fontSize: 20.sp, letterSpacing: 5.sp),
           elevation: 0,
           minimumSize: Size(double.infinity, 49.w),
           shape: RoundedRectangleBorder(
             borderRadius: BorderRadius.all(Radius.circular(24.5.w)),
-          )
-      ),
+          )),
       onPressed: onPressed,
     );
   }
-
 }

lib/pages/machinery/widgets/summary.dart

@@ -6,22 +6,26 @@ import 'package:farmer_client/widgets/LinearGradientText.dart';
 
 import '../../../models/entities/CardInfo.dart';
 
-Widget summary({required CardInfo item,required String km}) {
-
+Widget summary({required CardInfo item, required String km}) {
   return Column(
     children: [
       _title(item: item),
-      SizedBox(height: 20.w,),
-      _desc(item: item,km: km),
-      SizedBox(height: 20.w,),
+      SizedBox(
+        height: 20.w,
+      ),
+      _desc(item: item, km: km),
+      SizedBox(
+        height: 20.w,
+      ),
       _detail(item: item),
-      SizedBox(height: 20.w,),
+      SizedBox(
+        height: 20.w,
+      ),
     ],
   );
 }
 
 Widget _title({required CardInfo item}) {
-
   return Row(
     children: [
       Expanded(
@@ -41,28 +45,26 @@ Widget _title({required CardInfo item}) {
             Color(0xFFB61515),
           ],
           child: RichText(
-            text: TextSpan(
-                children: <InlineSpan>[
-                  TextSpan(
-                      text: ((item.price??0)/100).toString(),
-                      style: TextStyle(
-                        fontSize: 22.sp,
-                        fontWeight: FontWeight.bold,
-                      )),
-                  TextSpan(
-                      text: "元/",
-                      style: TextStyle(
-                        fontSize: 22.sp,
-                        fontWeight: FontWeight.bold,
-                      )),
-                  TextSpan(
-                      text: "公顷",
-                      style: TextStyle(
-                        fontSize: 12.sp,
-                        fontWeight: FontWeight.bold,
-                      )),
-                ]
-            ),
+            text: TextSpan(children: <InlineSpan>[
+              TextSpan(
+                  text: ((item.price ?? 0) / 100).toString(),
+                  style: TextStyle(
+                    fontSize: 22.sp,
+                    fontWeight: FontWeight.bold,
+                  )),
+              TextSpan(
+                  text: "元/",
+                  style: TextStyle(
+                    fontSize: 22.sp,
+                    fontWeight: FontWeight.bold,
+                  )),
+              TextSpan(
+                  text: "公顷",
+                  style: TextStyle(
+                    fontSize: 12.sp,
+                    fontWeight: FontWeight.bold,
+                  )),
+            ]),
           ),
         ),
       )
@@ -70,13 +72,19 @@ Widget _title({required CardInfo item}) {
   );
 }
 
-Widget _desc({required CardInfo item,required String km}) {
+Widget _desc({required CardInfo item, required String km}) {
   return Row(
     children: [
-      Icon(Icons.location_on_outlined, size: 16.sp,),
+      Icon(
+        Icons.location_on_outlined,
+        size: 16.sp,
+      ),
       Expanded(
         flex: 1,
-        child: Text("距离当前位置$km >>", style: TextStyle(color: const Color(0xFF222222), fontSize: 15.sp),),
+        child: Text(
+          "距离当前位置$km >>",
+          style: TextStyle(color: const Color(0xFF222222), fontSize: 15.sp),
+        ),
       ),
     ],
   );
@@ -85,6 +93,9 @@ Widget _desc({required CardInfo item,required String km}) {
 Widget _detail({required CardInfo item}) {
   return Container(
     alignment: Alignment.centerLeft,
-    child: Text(item.orgName.toString(), style: TextStyle(color: const Color(0xFF222222), fontSize: 15.sp),),
+    child: Text(
+      item.orgName.toString(),
+      style: TextStyle(color: const Color(0xFF222222), fontSize: 15.sp),
+    ),
   );
 }

lib/pages/main/index.dart

@@ -1,6 +1,7 @@
 import 'package:farmer_client/pages/main/widgets/main/index.dart';
 import 'package:farmer_client/widgets/layout/BasicPage.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:get/get.dart';
 import 'package:get/get_rx/src/rx_types/rx_types.dart';
 
@@ -15,13 +16,12 @@ class Main extends BasicPage {
   final addressListInfo = Rx<List<Address>>([]);
   final addressInfoContent = Rx<Address>(Address());
 
-
-
-
   @override
   void beforeShow() {
     // TODO: implement beforeShow
     super.beforeShow();
+    EasyLoading.show(status: '数据加载中...');
+
     getAddress().then((value) {
       List<Address> list = [];
       value['records'].forEach((item) {
@@ -29,11 +29,15 @@ class Main extends BasicPage {
       });
       addressListInfo(list);
       addressInfoContent(addressListInfo()[0]);
+      EasyLoading.dismiss();
+
     });
   }
 
   @override
   Widget builder(BuildContext context) {
-    return Obx(()=>MainPage( item: addressInfoContent(),));
+    return Obx(() => MainPage(
+          item: addressInfoContent(),
+        ));
   }
-}
+}

lib/pages/main/widgets/main/index.dart

@@ -11,26 +11,24 @@ import 'package:farmer_client/widgets/Modal.dart' as modal;
 class MainPage extends StatelessWidget {
   final Address item;
 
-
-
   MainPage({Key? key, required this.item}) : super(key: key);
 
   GetStorage box = GetStorage();
 
-  void _userOut(){
-    modal.showDialog(title: '提示', content:
-    Container(
-      alignment: Alignment.center,
-      child:  Text('确定要退出登陆吗？'),
-    ),onCancel: ()=>true,
+  void _userOut() {
+    modal.showDialog(
+        title: '提示',
+        content: Container(
+          alignment: Alignment.center,
+          child: Text('确定要退出登陆吗？'),
+        ),
+        onCancel: () => true,
         onConfirm: () => {
-        box.remove('token'),
-    Get.offNamed('/login'),
-
-  });
+              box.remove('token'),
+              Get.offNamed('/login'),
+            });
   }
 
-
   @override
   Widget build(BuildContext context) {
     return Container(
@@ -40,7 +38,7 @@ class MainPage extends StatelessWidget {
           Column(
             children: [
               UserInfo(), //头部，头像手机号姓名
-              UserAddress(item:item),//用户地址
+              UserAddress(item: item), //用户地址
               OtherColumn(), //功能菜单栏
               Container(
                 height: 70.h,
@@ -61,7 +59,6 @@ class MainPage extends StatelessWidget {
                   child: ElevatedButton(
                     onPressed: () {
                       _userOut();
-
                     },
                     child: const Text(
                       "退出登陆",

lib/pages/main/widgets/main/widgets/UserAddress.dart

@@ -65,7 +65,8 @@ class UserAddress extends StatelessWidget {
                         ),
                         Container(
                           width: 260,
-                          child:  Text(item!=null?item.address.toString():'请设置详细地址！',
+                          child: Text(
+                            item != null ? item.address.toString() : '请设置详细地址！',
                             softWrap: true,
                             maxLines: 1,
                             textAlign: TextAlign.left,

lib/pages/main/widgets/main/widgets/UserInfo.dart

@@ -7,7 +7,7 @@ import '../../../../../models/app.dart';
 class UserInfo extends StatelessWidget {
   AppController userInfo = AppController.t;
 
-   UserInfo({Key? key}) : super(key: key);
+  UserInfo({Key? key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -44,7 +44,7 @@ class UserInfo extends StatelessWidget {
                 child: GestureDetector(
                   child: const Text(
                     '修改个人信息',
-                    style: TextStyle(color: Colors.white,fontSize: 14),
+                    style: TextStyle(color: Colors.white, fontSize: 14),
                   ),
                   onTap: () {
                     Get.toNamed('/userInfo');
@@ -61,13 +61,14 @@ class UserInfo extends StatelessWidget {
                     height: 63.w,
                     decoration: BoxDecoration(
                       shape: BoxShape.circle,
-                      image: userInfo.user().avatar!=null?
-                      DecorationImage(
-                        image: NetworkImage(userInfo.user().avatar.toString()),
-                        fit: BoxFit.cover,
-                      ): DecorationImage(
-                        image: AssetImage('images/userMoren.png')
-                      ),
+                      image: userInfo.user().avatar != null
+                          ? DecorationImage(
+                              image: NetworkImage(
+                                  userInfo.user().avatar.toString()),
+                              fit: BoxFit.cover,
+                            )
+                          : DecorationImage(
+                              image: AssetImage('images/userMoren.png')),
                       border: Border.all(
                         color: Colors.white,
                         width: 2,
@@ -84,9 +85,10 @@ class UserInfo extends StatelessWidget {
                   children: [
                     Container(
                       margin: EdgeInsets.fromLTRB(0, 0, 0, 10),
-                      child:
-                      Text(
-                        userInfo.user().nickName!=null?userInfo.user().nickName.toString():'请修改个人信息！',
+                      child: Text(
+                        userInfo.user().nickName != null
+                            ? userInfo.user().nickName.toString()
+                            : '请修改个人信息！',
                         style: TextStyle(
                           color: Colors.white,
                           fontSize: 17,
@@ -95,14 +97,14 @@ class UserInfo extends StatelessWidget {
                     ),
                     Container(
                       margin: EdgeInsets.fromLTRB(0, 10, 0, 0),
-                      child:
-                          Text(
-                            userInfo.user().phone!=null?userInfo.user().phone.toString():'请修改手机号！',
-                            style: TextStyle(
-                              color: Colors.white,
-                              fontSize: 17,
-                            ),
-
+                      child: Text(
+                        userInfo.user().phone != null
+                            ? userInfo.user().phone.toString()
+                            : '请修改手机号！',
+                        style: TextStyle(
+                          color: Colors.white,
+                          fontSize: 17,
+                        ),
                       ),
                     ),
                     // const Text(

lib/pages/order/index.dart

@@ -2,7 +2,6 @@ import 'package:farmer_client/widgets/layout/BasicPage.dart';
 import 'package:flutter/material.dart';
 import './widgets/order/index.dart';
 
-
 class Order extends BasicPage {
   Order({Key? key}) : super(key: key) {
     tabIndex = 1;
@@ -13,4 +12,4 @@ class Order extends BasicPage {
   Widget builder(BuildContext context) {
     return const OrderPage();
   }
-}
+}

lib/pages/order/widgets/order/index.dart

@@ -1,5 +1,6 @@
 import 'package:farmer_client/widgets/NullCard.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get_rx/src/rx_types/rx_types.dart';
 
@@ -22,59 +23,64 @@ class _OrderPageState extends State<OrderPage> {
   void initState() {
     // TODO: implement initState
     super.initState();
+
     getOrderList(true).then((value) {
+      EasyLoading.show(status: '数据加载中...');
+
       final list = <OrderListAll>[];
       setState(() {
         value['records'].forEach((item) {
           list.add(OrderListAll.fromJson(item));
-
         });
       });
       orderListItem(list);
+      EasyLoading.dismiss();
 
     });
   }
 
   @override
   Widget build(BuildContext context) {
-    return orderListItem().length>0?
-      Column(
-      children: [
-        Container(
-          padding: EdgeInsets.fromLTRB(15, 0, 15, 0),
-          height: 55.w,
-          decoration: BoxDecoration(color: Colors.white),
-          child: Row(
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+    return orderListItem().length > 0
+        ? Column(
             children: [
-              Row(
-                children: [
-                  Padding(
-                    padding: EdgeInsets.fromLTRB(0, 0, 8, 0),
-                    child: Image(
-                      image: AssetImage('images/ordersListImga.png'),
-                      fit: BoxFit.cover,
-                      width: 18.w,
+              Container(
+                padding: EdgeInsets.fromLTRB(15, 0, 15, 0),
+                height: 55.w,
+                decoration: BoxDecoration(color: Colors.white),
+                child: Row(
+                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                  children: [
+                    Row(
+                      children: [
+                        Padding(
+                          padding: EdgeInsets.fromLTRB(0, 0, 8, 0),
+                          child: Image(
+                            image: AssetImage('images/ordersListImga.png'),
+                            fit: BoxFit.cover,
+                            width: 18.w,
+                          ),
+                        ),
+                        Text(
+                          '订单列表',
+                          style: TextStyle(
+                              color: Color(0xff222222),
+                              fontSize: 20.sp,
+                              fontWeight: FontWeight.bold),
+                        )
+                      ],
                     ),
-                  ),
-                  Text(
-                    '订单列表',
-                    style: TextStyle(
-                        color: Color(0xff222222),
-                        fontSize: 20.sp,
-                        fontWeight: FontWeight.bold),
-                  )
-                ],
+                  ],
+                ),
+              ),
+              Column(
+                mainAxisSize: MainAxisSize.min,
+                children: orderListItem()
+                    .map((item) => OrderListCard(item: item))
+                    .toList(),
               ),
             ],
-          ),
-        ),
-        Column(
-          mainAxisSize: MainAxisSize.min,
-          children:
-          orderListItem().map((item) => OrderListCard(item: item)).toList(),
-        ),
-      ],
-    ):NullCard(text: '您还没有新的订单！');
+          )
+        : NullCard(text: '您还没有新的订单！');
   }
 }

lib/pages/orderInfo/index.dart

@@ -2,6 +2,7 @@ import 'package:farmer_client/pages/orderInfo/widgets/star.dart';
 import 'package:farmer_client/widgets/DefaultButton.dart';
 import 'package:ff_stars/ff_stars.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:get/get.dart';
@@ -23,9 +24,8 @@ class OrderPageInfo extends BasicPage {
   final orderStateText = Rx<String>('待支付');
   final orderStateColor = Rx<Color>(Colors.black);
   final orderInfoContent = Rx<OrderInfoModel>(OrderInfoModel());
-  final evalText=Rx<String>('');
-  final evalStars=Rx<num>(-1);
-
+  final evalText = Rx<String>('');
+  final evalStars = Rx<num>(-1);
 
   // orderStates
 
@@ -40,7 +40,11 @@ class OrderPageInfo extends BasicPage {
       orderStateColor(Get.arguments['styleColor']);
 
       orderInfo(id()).then((value) {
+        EasyLoading.show(status: '数据加载中...');
+
         orderInfoContent(OrderInfoModel.fromJson(value));
+        EasyLoading.dismiss();
+
       });
     }
   }
@@ -81,85 +85,97 @@ class OrderPageInfo extends BasicPage {
                     height: 49.h,
                     text: '评价',
                     onPressed: () {
-
                       modal.showDialog(
                           title: '评价此订单',
                           content: Container(
-                            alignment: Alignment.center,
-                            child:Container(
-                              margin: const EdgeInsets.fromLTRB(15, 20, 15, 20),
-                              child: Column(
-                                children: [
-                                  Container(
-                                    padding: const EdgeInsets.fromLTRB(0, 0, 0, 10),
-                                    decoration: const BoxDecoration(
-                                        border: Border(
-                                            bottom: BorderSide(
-                                                width: 0.8, color: Color(0x20000000)
-                                              // 0x17000000
-                                            ))),
-                                    child: Row(
-                                      children: [
-                                        Text('满意度：',style: TextStyle(fontSize: 17.sp,fontWeight: FontWeight.bold),),
-                                        FFStars(
-                                          //https://pub.dev/packages/ff_stars
-                                          normalStar:Image.asset('images/icons/starOff.png'),
-                                          selectedStar:Image.asset('images/icons/starOn.png'),
-                                          starsChanged: (realStars, selectedStars) {
-                                            evalStars(realStars);
-                                            print("real: $selectedStars, final: $realStars");
-                                          },
-                                          step: 1,
-                                          defaultStars: 0,
-                                        ),
-                                      ],
-                                    ),
-                                  ),
-                                  Container(
-                                    margin: const EdgeInsets.fromLTRB(0, 20, 0, 0),
-                                    width: 300.w,
-                                    height: 100.w,
-                                    decoration: BoxDecoration(
-                                      border: Border.all(
-                                        color: Color(0x20000000),
-                                        width: 0.8,
+                              alignment: Alignment.center,
+                              child: Container(
+                                margin:
+                                    const EdgeInsets.fromLTRB(15, 20, 15, 20),
+                                child: Column(
+                                  children: [
+                                    Container(
+                                      padding: const EdgeInsets.fromLTRB(
+                                          0, 0, 0, 10),
+                                      decoration: const BoxDecoration(
+                                          border: Border(
+                                              bottom: BorderSide(
+                                                  width: 0.8,
+                                                  color: Color(0x20000000)
+                                                  // 0x17000000
+                                                  ))),
+                                      child: Row(
+                                        children: [
+                                          Text(
+                                            '满意度：',
+                                            style: TextStyle(
+                                                fontSize: 17.sp,
+                                                fontWeight: FontWeight.bold),
+                                          ),
+                                          FFStars(
+                                            //https://pub.dev/packages/ff_stars
+                                            normalStar: Image.asset(
+                                                'images/icons/starOff.png'),
+                                            selectedStar: Image.asset(
+                                                'images/icons/starOn.png'),
+                                            starsChanged:
+                                                (realStars, selectedStars) {
+                                              evalStars(realStars);
+                                              print(
+                                                  "real: $selectedStars, final: $realStars");
+                                            },
+                                            step: 1,
+                                            defaultStars: 0,
+                                          ),
+                                        ],
                                       ),
                                     ),
-                                    child:  TextField(
-                                      minLines: 6,
-                                      maxLines: 6,
-                                      style: TextStyle(fontSize: 17.sp, height: 1.5),
-                                      decoration: const InputDecoration(
-                                        isCollapsed: true,
-                                        border: InputBorder.none,
-                                        counterText: '',
-                                        hintText: '请输入评价内容',
-                                        floatingLabelBehavior: FloatingLabelBehavior.never,
+                                    Container(
+                                      margin: const EdgeInsets.fromLTRB(
+                                          0, 20, 0, 0),
+                                      width: 300.w,
+                                      height: 100.w,
+                                      decoration: BoxDecoration(
+                                        border: Border.all(
+                                          color: Color(0x20000000),
+                                          width: 0.8,
+                                        ),
                                       ),
-                                      onChanged: (e) {
-                                        evalText(e);
-                                      },
-                                    ),
-                                  )
-
-                                ],
-                              )
-                              ,
-                            )
-                          ),
+                                      child: TextField(
+                                        minLines: 6,
+                                        maxLines: 6,
+                                        style: TextStyle(
+                                            fontSize: 17.sp, height: 1.5),
+                                        decoration: const InputDecoration(
+                                          isCollapsed: true,
+                                          border: InputBorder.none,
+                                          counterText: '',
+                                          hintText: '请输入评价内容',
+                                          floatingLabelBehavior:
+                                              FloatingLabelBehavior.never,
+                                        ),
+                                        onChanged: (e) {
+                                          evalText(e);
+                                        },
+                                      ),
+                                    )
+                                  ],
+                                ),
+                              )),
                           onCancel: () => true,
-                          onConfirm:() {
-                                if(evalStars.value!=-1&&evalText.value!=''){
-                                    orderEvaluation(id,evalStars.value,evalText.value).then((value) {
-                                      Fluttertoast.showToast(msg: '评价成功！');
-                                       Get.offNamed('/order');
-                                    });
-                                }else{
-                                  Fluttertoast.showToast(msg: '请完整选择评分或输入评价内容');
-                                  return false;
-                                }
-                          }
-                          );
+                          onConfirm: () {
+                            if (evalStars.value != -1 && evalText.value != '') {
+                              orderEvaluation(
+                                      id, evalStars.value, evalText.value)
+                                  .then((value) {
+                                Fluttertoast.showToast(msg: '评价成功！');
+                                Get.offNamed('/order');
+                              });
+                            } else {
+                              Fluttertoast.showToast(msg: '请完整选择评分或输入评价内容');
+                              return false;
+                            }
+                          });
                     },
                     margin: const EdgeInsets.all(0),
                     fontSize: 20.sp,
@@ -300,9 +316,7 @@ class _BottomWidget extends StatelessWidget {
                 Padding(
                   padding: EdgeInsets.fromLTRB(15.w, 0, 15.w, 0),
                   child: ListTile(
-                    onTap: (){
-
-                    },
+                    onTap: () {},
                     contentPadding: EdgeInsets.symmetric(horizontal: 0.0),
                     // 这边使用了contentPadding
                     leading: Image(

lib/pages/orderInfo/widgets/star.dart

@@ -1,34 +1,29 @@
-
 import 'package:flutter/material.dart';
 
-
-
-
 class HTStarRating extends StatefulWidget {
-  final double rating;       // 当前分数
-  final double maxRating;    // 满分
-  final int count;           // 总共几颗心
-  final double size;          // 星星大小
+  final double rating; // 当前分数
+  final double maxRating; // 满分
+  final int count; // 总共几颗心
+  final double size; // 星星大小
   final Color defaultColor;
   final Color selectedColor;
   final Widget unselectedImage;
   final Widget selectedImage;
 
   HTStarRating({
-    required this.rating,   // 必填
+    required this.rating, // 必填
     //选填， 初始默认值
     this.maxRating = 10,
     this.count = 5,
     this.size = 30,
     this.defaultColor = Colors.grey,
     this.selectedColor = Colors.red,
-     Widget? unselectedImage,
-     Widget? selectedImage,
-
-
-  }):unselectedImage = unselectedImage?? Icon(
-      Icons.star_border, color: defaultColor, size: size),
-        selectedImage = selectedImage?? Icon(Icons.star, color: selectedColor,size: size);
+    Widget? unselectedImage,
+    Widget? selectedImage,
+  })  : unselectedImage = unselectedImage ??
+            Icon(Icons.star_border, color: defaultColor, size: size),
+        selectedImage =
+            selectedImage ?? Icon(Icons.star, color: selectedColor, size: size);
 
   @override
   _HTStarRatingState createState() => _HTStarRatingState();
@@ -39,23 +34,16 @@ class _HTStarRatingState extends State<HTStarRating> {
   Widget build(BuildContext context) {
     return Stack(
       children: <Widget>[
-        Row(
-            mainAxisSize: MainAxisSize.min,
-            children: buildDefaultStar()
-        ),
-        Row(
-            mainAxisSize: MainAxisSize.min,
-            children: buildSelectedStar()
-        )
+        Row(mainAxisSize: MainAxisSize.min, children: buildDefaultStar()),
+        Row(mainAxisSize: MainAxisSize.min, children: buildSelectedStar())
       ],
     );
   }
 
-
   /*
   *  创建默认的星星
   * */
-  List<Widget> buildDefaultStar(){
+  List<Widget> buildDefaultStar() {
     return List.generate(widget.count, (index) {
       return widget.unselectedImage;
     });
@@ -72,20 +60,17 @@ class _HTStarRatingState extends State<HTStarRating> {
     double oneValue = widget.maxRating / widget.count;
     int entireCount = (widget.rating / oneValue).floor(); //.floor() 向下取整
 
-    for (var i = 0; i< entireCount ; i++){
+    for (var i = 0; i < entireCount; i++) {
       starts.add(star);
     }
     //构建部分start
-    double leftWidth = ((widget.rating /oneValue)-entireCount)* widget.size;
-    final halfStar = ClipRect(
-        clipper: HTStartClipper(leftWidth),
-        child: star
-    );
+    double leftWidth = ((widget.rating / oneValue) - entireCount) * widget.size;
+    final halfStar = ClipRect(clipper: HTStartClipper(leftWidth), child: star);
     starts.add(halfStar);
 
     // 防止传入参数大于总分
-    if (starts.length > widget.count){
-      return starts.sublist(0,widget.count);
+    if (starts.length > widget.count) {
+      return starts.sublist(0, widget.count);
     }
 
     return starts;
@@ -96,7 +81,6 @@ class _HTStarRatingState extends State<HTStarRating> {
 * 切割
 * */
 class HTStartClipper extends CustomClipper<Rect> {
-
   double width;
 
   HTStartClipper(this.width);
@@ -110,5 +94,4 @@ class HTStartClipper extends CustomClipper<Rect> {
   bool shouldReclip(HTStartClipper oldClipper) {
     return oldClipper.width != this.width;
   }
-
-}
+}

lib/pages/search/index.dart

@@ -2,6 +2,7 @@ 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_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:get/get_rx/src/rx_types/rx_types.dart';
@@ -17,17 +18,19 @@ class SearchPage extends BasicPage {
   final cardSearchList = Rx<List<CardListModel>>([]);
   var location = AppController.t.locationStr;
 
+  void _onChange(String value) {
+    print(location);
+    searchMachinery(location.toString(), value).then((value) {
+      EasyLoading.show(status: '数据加载中...');
 
-  void _onChange(String value){
-      print(location);
-      searchMachinery(location.toString(),value).then((value) {
-        final list = <CardListModel>[];
-        value['records'].forEach((item) {
-          list.add(CardListModel.fromJson(item));
-        });
-        cardSearchList(list);
+      final list = <CardListModel>[];
+      value['records'].forEach((item) {
+        list.add(CardListModel.fromJson(item));
       });
+      cardSearchList(list);
+      EasyLoading.dismiss();
 
+    });
   }
 
   @override
@@ -71,12 +74,11 @@ class SearchPage extends BasicPage {
           ],
         ),
       ),
-          Obx(()=>Column(
-              children:
-              cardSearchList.value.length>0?
-                  cardSearchList().map((item) => CarsCard(item: item)).toList()
-                  :  [NullCard(text: '暂无农机信息！')],
-            ))
+      Obx(() => Column(
+            children: cardSearchList.value.length > 0
+                ? cardSearchList().map((item) => CarsCard(item: item)).toList()
+                : [NullCard(text: '暂无农机信息！')],
+          ))
     ]));
   }
 }

lib/pages/splash/splash.dart

@@ -4,7 +4,6 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:flutter/material.dart';
 import 'package:get_storage/get_storage.dart';
 
-
 class SplashScreen extends StatefulWidget {
   const SplashScreen({Key? key}) : super(key: key);
 

lib/pages/userInfo/index.dart

@@ -1,6 +1,7 @@
 import 'package:farmer_client/widgets/DefaultButton.dart';
 import 'package:farmer_client/widgets/layout/BasicPage.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:get/get.dart';
@@ -10,62 +11,58 @@ import '../../models/entities/person.dart';
 import '../../services/user.dart';
 
 class UserInfo extends BasicPage {
-  late String name ;
+  late String name;
   late String phone;
   late TextEditingController _cName;
   late TextEditingController _cPhone;
   AppController userInfo = AppController.t;
 
-
   @override
   void beforeShow() {
     super.beforeShow();
     _cName = TextEditingController(text: userInfo.user().nickName.toString());
-    _cPhone = TextEditingController(text:userInfo.user().phone.toString());
-    name=userInfo.user().nickName.toString();
-    phone=userInfo.user().phone.toString();
+    _cPhone = TextEditingController(text: userInfo.user().phone.toString());
+    name = userInfo.user().nickName.toString();
+    phone = userInfo.user().phone.toString();
   }
 
   bool disableLogin = false;
   RegExp exp = RegExp(r'^1[3456789]\d{9}$');
 
-  Map<String, dynamic> data = {
-
-  };
-
+  Map<String, dynamic> data = {};
 
   void handleOk() {
     if (name == '' && phone == '') {
       Fluttertoast.showToast(msg: '请输入正确的信息');
       return;
-
-    } else if (phone==''&&!exp.hasMatch(phone)) {
+    } else if (phone == '' && !exp.hasMatch(phone)) {
       Fluttertoast.showToast(msg: '请输入正确的手机号');
       return;
     } else {
-      data={
+      data = {
         ...userInfo.user().toJson(),
-        'avatar':userInfo.user().avatar ?? '',
+        'avatar': userInfo.user().avatar ?? '',
         'nickName': name,
         'phone': phone
       };
-      updateInfo(userInfo.user().personId.toString(),data).then((value) {
+      updateInfo(userInfo.user().personId.toString(), data).then((value) {
         // 尝试获取一次人员信息
+        EasyLoading.show(status: '数据加载中...');
+
         getCurrent().then((person) {
           userInfo.user(Person.fromJson(person));
           Fluttertoast.showToast(msg: '保存成功');
+          EasyLoading.dismiss();
 
-          Get.back();
-
+          Get.offAllNamed('/main');
         }).catchError((e) {
+          EasyLoading.showError('出错啦！');
           print(e);
         });
-
       });
     }
   }
 
-
   @override
   Widget builder(BuildContext context) {
     naviTitle = '个人信息';
@@ -98,16 +95,16 @@ class UserInfo extends BasicPage {
                     height: 63.w,
                     decoration: BoxDecoration(
                       shape: BoxShape.circle,
-                      image: userInfo.user().avatar!=null?
-                      DecorationImage(
-                        image: NetworkImage(userInfo.user().avatar.toString()),
-                        fit: BoxFit.cover,
-                      ): DecorationImage(
-                          image: AssetImage('images/userMoren.png')
-                      ),
+                      image: userInfo.user().avatar != null
+                          ? DecorationImage(
+                              image: NetworkImage(
+                                  userInfo.user().avatar.toString()),
+                              fit: BoxFit.cover,
+                            )
+                          : DecorationImage(
+                              image: AssetImage('images/userMoren.png')),
                     ),
                   ),
-
                 ]),
           ),
           Text(
@@ -119,7 +116,7 @@ class UserInfo extends BasicPage {
                 fontWeight: FontWeight.bold),
           ),
           Container(
-            width: 345.w,
+              width: 345.w,
               margin: EdgeInsets.fromLTRB(0, 10.h, 0, 40.h),
               padding: EdgeInsets.symmetric(vertical: 19.h, horizontal: 0),
               decoration: BoxDecoration(
@@ -152,18 +149,17 @@ class UserInfo extends BasicPage {
                               border: InputBorder.none,
                               counterText: '', //去掉计数
                               floatingLabelBehavior:
-                              FloatingLabelBehavior.never,
+                                  FloatingLabelBehavior.never,
                             ),
                             onChanged: (e) {
-
-                                name = e;
-                                print(name);
+                              name = e;
+                              print(name);
                             },
                           ),
                         ),
                         GestureDetector(
                           onTap: () {
-                              name = '';
+                            name = '';
                             _cName.clear();
                           },
                           child: Image.asset(
@@ -184,7 +180,7 @@ class UserInfo extends BasicPage {
                 fontWeight: FontWeight.bold),
           ),
           Container(
-            width: 345.w,
+              width: 345.w,
               margin: EdgeInsets.fromLTRB(0, 10.h, 0, 40.h),
               padding: EdgeInsets.symmetric(vertical: 19.h, horizontal: 0),
               decoration: BoxDecoration(
@@ -219,16 +215,16 @@ class UserInfo extends BasicPage {
                               border: InputBorder.none,
                               counterText: '', //去掉计数
                               floatingLabelBehavior:
-                              FloatingLabelBehavior.never,
+                                  FloatingLabelBehavior.never,
                             ),
                             onChanged: (e) {
-                                phone = e;
+                              phone = e;
                             },
                           ),
                         ),
                         GestureDetector(
                           onTap: () {
-                              phone = '';
+                            phone = '';
                             _cPhone.clear();
                           },
                           child: Image.asset(

lib/routes/index.dart

@@ -1,3 +1,2 @@
-
 export 'pages.dart';
 export 'middleWares.dart';

lib/routes/middleWares.dart

@@ -1,9 +1,8 @@
-
 import 'package:flutter/scheduler.dart';
 import 'package:get/get.dart';
 import 'package:get_storage/get_storage.dart';
 
-void routingCallback (routing) {
+void routingCallback(routing) {
   // GetStorage box = GetStorage();
   // bool isLogin = box.hasData('token');
   // bool isSplashScreen = routing?.current == '/splash';

lib/routes/pages.dart

@@ -3,25 +3,27 @@ import 'package:get_storage/get_storage.dart';
 import '../pages/index.dart';
 
 List<GetPage> pages = [
-  GetPage(name: '/', page: () {
-    GetStorage box = GetStorage();
-    return box.hasData('token') ? Home() : MyRouteLogin();
-  }),
-  GetPage(name: '/main', page: () =>  Main()),
-  GetPage(name: '/order', page: () =>  Order()),
-  GetPage(name: '/infomation', page: () =>  Infomation()),
-  GetPage(name: '/ArticleInfo', page: () =>  ArticleInfo()),//资讯详情
+  GetPage(
+      name: '/',
+      page: () {
+        GetStorage box = GetStorage();
+        return box.hasData('token') ? Home() : MyRouteLogin();
+      }),
+  GetPage(name: '/main', page: () => Main()),
+  GetPage(name: '/order', page: () => Order()),
+  GetPage(name: '/infomation', page: () => Infomation()),
+  GetPage(name: '/ArticleInfo', page: () => ArticleInfo()), //资讯详情
   // GetPage(name: '/splash', page: () => SplashScreen()), // SplashScreen
-  GetPage(name: '/login', page: () =>  MyRouteLogin()),
-  GetPage(name: '/addressList', page: () =>  AddressList()),
-  GetPage(name: '/addAddress', page: () =>  AddAddress()),
-  GetPage(name: '/userInfo', page: () =>  UserInfo()),
-  GetPage(name: '/machineryMap', page: () =>  MachineryMapPage()),
-  GetPage(name: '/machineryDetail', page: () =>  MachineryDetailPage()),
-  GetPage(name: '/aboutUs', page: () =>  AboutUs()),
-  GetPage(name: '/agreement', page: () =>  Agreement()),
-  GetPage(name: '/feedback', page: () =>  Feedback()),
-  GetPage(name: '/orderConfirmation', page: () =>  OrderConfirmation()),
-  GetPage(name: '/orderPageInfo', page: () =>  OrderPageInfo()),
-  GetPage(name: '/searchPage', page: () =>  SearchPage()),
+  GetPage(name: '/login', page: () => MyRouteLogin()),
+  GetPage(name: '/addressList', page: () => AddressList()),
+  GetPage(name: '/addAddress', page: () => AddAddress()),
+  GetPage(name: '/userInfo', page: () => UserInfo()),
+  GetPage(name: '/machineryMap', page: () => MachineryMapPage()),
+  GetPage(name: '/machineryDetail', page: () => MachineryDetailPage()),
+  GetPage(name: '/aboutUs', page: () => AboutUs()),
+  GetPage(name: '/agreement', page: () => Agreement()),
+  GetPage(name: '/feedback', page: () => Feedback()),
+  GetPage(name: '/orderConfirmation', page: () => OrderConfirmation()),
+  GetPage(name: '/orderPageInfo', page: () => OrderPageInfo()),
+  GetPage(name: '/searchPage', page: () => SearchPage()),
 ];

lib/services/address.dart

@@ -1,4 +1,3 @@
-
 import 'package:dio/dio.dart';
 import 'package:farmer_client/utils/Request.dart';
 import 'package:fluttertoast/fluttertoast.dart';
@@ -9,13 +8,12 @@ import 'package:fluttertoast/fluttertoast.dart';
  * @returns
  */
 Future getAddress() async {
-  return request('/address',
-      options: Options(method: 'GET')).catchError((error) => {
-    Fluttertoast.showToast(msg: error.error['message']),
-  });
+  return request('/address', options: Options(method: 'GET'))
+      .catchError((error) => {
+            Fluttertoast.showToast(msg: error.error['message']),
+          });
 }
 
-
 /**
  * 地址保存
  * @param {*} data
@@ -23,51 +21,45 @@ Future getAddress() async {
  */
 Future addressSave(String address) async {
   return request('/address',
-      options: Options(method: 'POST'), data: {'address': address})
+          options: Options(method: 'POST'), data: {'address': address})
       .catchError((error) => {
-    Fluttertoast.showToast(msg: error.error['message']),
-  });
+            Fluttertoast.showToast(msg: error.error['message']),
+          });
 }
 
-
-
 /**
  * 地址删除
  * @param {*} data
  * @returns
  */
-Future addressDelete(String id)async{
-  return request('/address/$id',options: Options(method: 'DELETE')).catchError((error) =>
-  { Fluttertoast.showToast(
-      msg: error.error['message']
-  ),});
-
+Future addressDelete(String id) async {
+  return request('/address/$id', options: Options(method: 'DELETE'))
+      .catchError((error) => {
+            Fluttertoast.showToast(msg: error.error['message']),
+          });
 }
 
-
 /**
  * 地址修改更新
  * @param {*} data
  * @returns
  */
-Future addressUpdate(String id,String address)async{
-  return request('/address/$id',options: Options(method: 'PUT'),data: {'address':address}).catchError((error) =>
-  { Fluttertoast.showToast(
-      msg: error.error['message']
-  ),});
-
+Future addressUpdate(String id, String address) async {
+  return request('/address/$id',
+          options: Options(method: 'PUT'), data: {'address': address})
+      .catchError((error) => {
+            Fluttertoast.showToast(msg: error.error['message']),
+          });
 }
 
-
 /**
  * 地址是否默认
  * @param {*} data
  * @returns
  */
-Future addressDefault(String id)async{
-  return request('/address/$id/default',options: Options(method: 'PUT')).catchError((error) =>
-  { Fluttertoast.showToast(
-      msg: error.error['message']
-  ),});
-
+Future addressDefault(String id) async {
+  return request('/address/$id/default', options: Options(method: 'PUT'))
+      .catchError((error) => {
+            Fluttertoast.showToast(msg: error.error['message']),
+          });
 }

lib/services/homeAPI.dart

@@ -34,48 +34,62 @@ Future getMachinery(String location) async {
  * @param {*} data
  * @returns
  */
-Future searchMachinery(String location,String? q,) async {
-  return request('/machinery', options: Options(method: 'GET'), queryParameters: {
-    'location': location,'q':q,
-  },data: {'q':q,'location':location}).catchError((error) => {
-    Fluttertoast.showToast(msg: error.error['message']),
-  });
+Future searchMachinery(
+  String location,
+  String? q,
+) async {
+  return request('/machinery',
+      options: Options(method: 'GET'),
+      queryParameters: {
+        'location': location,
+        'q': q,
+      },
+      data: {
+        'q': q,
+        'location': location
+      }).catchError((error) => {
+        Fluttertoast.showToast(msg: error.error['message']),
+      });
 }
 
-
-
-
 /**
  * 农机分类
  * @param {*} data
  * @returns
  */
-Future typeMachinery(String location,String typeId,) async {
-  return request('/machinery', options: Options(method: 'GET'), queryParameters: {
-    'location': location,'typeId':typeId,
-  },data: {'typeId':typeId,'location':location}).catchError((error) => {
-    Fluttertoast.showToast(msg: error.error['message']),
-  });
+Future typeMachinery(
+  String location,
+  String typeId,
+) async {
+  return request('/machinery',
+      options: Options(method: 'GET'),
+      queryParameters: {
+        'location': location,
+        'typeId': typeId,
+      },
+      data: {
+        'typeId': typeId,
+        'location': location
+      }).catchError((error) => {
+        Fluttertoast.showToast(msg: error.error['message']),
+      });
 }
 
-
-
 /**
  * 农机详情
  * @param {*} data
  * @returns
  */
 
-Future getMachineryInfo(String id,String location ,bool attached)async {
-  return request('/machinery-summary/$id', options: Options(method: 'GET'),
-      queryParameters: { 'location': location, 'attached': attached})
-      .catchError((error) =>
-  { Fluttertoast.showToast(
-      msg: error.error['message']
-  ),});
+Future getMachineryInfo(String id, String location, bool attached) async {
+  return request('/machinery-summary/$id',
+          options: Options(method: 'GET'),
+          queryParameters: {'location': location, 'attached': attached})
+      .catchError((error) => {
+            Fluttertoast.showToast(msg: error.error['message']),
+          });
 }
 
-
 /**
  * 农机分类Tab列查询
  * @param {*} data

lib/services/main.dart

@@ -10,12 +10,8 @@ import 'package:fluttertoast/fluttertoast.dart';
 
 Future feedback(String content) async {
   return request('/feedback',
-      options: Options(method: 'POST'), data: {'content': content})
+          options: Options(method: 'POST'), data: {'content': content})
       .catchError((error) => {
-    Fluttertoast.showToast(msg: error.error['message']),
-  });
+            Fluttertoast.showToast(msg: error.error['message']),
+          });
 }
-
-
-
-

lib/services/news.dart

@@ -1,21 +1,17 @@
-
-
 import 'package:dio/dio.dart';
 import 'package:farmer_client/utils/Request.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 
-
 /**
  * 农机资讯
  * @param {*} data
  * @returns
  */
-Future getNewsList()async{
-  return request('/news',options: Options(method: 'GET')).catchError((error) =>
-  { Fluttertoast.showToast(
-      msg: error.error['message']
-  ),});
-
+Future getNewsList() async {
+  return request('/news', options: Options(method: 'GET'))
+      .catchError((error) => {
+            Fluttertoast.showToast(msg: error.error['message']),
+          });
 }
 
 /**
@@ -23,14 +19,11 @@ Future getNewsList()async{
  * @param {*} data
  * @returns
  */
-Future getNewsInfo(String id)async{
-  return request('/news/$id',options: Options(method: 'GET'),).catchError((error) =>
-  { Fluttertoast.showToast(
-      msg: error.error['message']
-  ),});
-
+Future getNewsInfo(String id) async {
+  return request(
+    '/news/$id',
+    options: Options(method: 'GET'),
+  ).catchError((error) => {
+        Fluttertoast.showToast(msg: error.error['message']),
+      });
 }
-
-
-
-

lib/services/orderAPI.dart

@@ -1,92 +1,82 @@
-
-
 import 'package:dio/dio.dart';
 import 'package:farmer_client/utils/Request.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 
-
 /**
  * 订单列表
  * @param {*} data
  * @returns
  */
-Future getOrderList(bool mine)async{
-  return request('/order',options: Options(method: 'GET'),queryParameters: { 'mine': mine}).catchError((error) =>
-  { Fluttertoast.showToast(
-      msg: error.error['message']
-  ),});
-
+Future getOrderList(bool mine) async {
+  return request('/order',
+          options: Options(method: 'GET'), queryParameters: {'mine': mine})
+      .catchError((error) => {
+            Fluttertoast.showToast(msg: error.error['message']),
+          });
 }
 
-
 /**
  * 订单详情
  * @param {*} data
  * @returns
  */
-Future orderInfo(String id)async{
-  return request('/order/$id',options: Options(method: 'GET'),).catchError((error) =>
-  { Fluttertoast.showToast(
-      msg: error.error['message']
-  ),});
-
+Future orderInfo(String id) async {
+  return request(
+    '/order/$id',
+    options: Options(method: 'GET'),
+  ).catchError((error) => {
+        Fluttertoast.showToast(msg: error.error['message']),
+      });
 }
 
-
 /**
  * 生成订单
  * @param {*} data
  * @returns
  */
 
-Future generateOrder(item)async{
-  return request('/order',options: Options(method: 'POST'),data: item).catchError((error) =>
-  { Fluttertoast.showToast(
-      msg: error.error['message']
-  ),});
-
+Future generateOrder(item) async {
+  return request('/order', options: Options(method: 'POST'), data: item)
+      .catchError((error) => {
+            Fluttertoast.showToast(msg: error.error['message']),
+          });
 }
 
-
-
 /**
  * 删除订单
  * @param {*} data
  * @returns
  */
-Future orderDelete(String id)async{
-  return request('/order/$id',options: Options(method: 'DELETE')).catchError((error) =>
-  { Fluttertoast.showToast(
-      msg: error.error['message']
-  ),});
+Future orderDelete(String id) async {
+  return request('/order/$id', options: Options(method: 'DELETE'))
+      .catchError((error) => {
+            Fluttertoast.showToast(msg: error.error['message']),
+          });
 }
 
-
 /**
  * --------------订单退款-----------------
  * @param {*} data
  * @returns
  */
-Future orderRefund (String id)async{
-  return request('/order/$id/refund',options: Options(method: 'PUT')).catchError((error) =>
-  { Fluttertoast.showToast(
-      msg: error.error['message']
-  ),});
+Future orderRefund(String id) async {
+  return request('/order/$id/refund', options: Options(method: 'PUT'))
+      .catchError((error) => {
+            Fluttertoast.showToast(msg: error.error['message']),
+          });
 }
 
-
-
-
 /**
  * 评价订单
  * @param {*} data
  * @returns
  */
 
-Future orderEvaluation (String orderId,num score,String content)async{
-  return request('/evaluation',options: Options(method: 'POST'),data: {'orderId':orderId,'score':score,'content':content}).catchError((error) =>
-  { Fluttertoast.showToast(
-      msg: error.error['message']
-  ),});
+Future orderEvaluation(String orderId, num score, String content) async {
+  return request('/evaluation',
+          options: Options(method: 'POST'),
+          data: {'orderId': orderId, 'score': score, 'content': content})
+      .catchError((error) => {
+            Fluttertoast.showToast(msg: error.error['message']),
+          });
 }
-

lib/services/user.dart

@@ -1,46 +1,40 @@
-
-
 import 'package:dio/dio.dart';
 import 'package:farmer_client/utils/Request.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 
-
 Future getSMSCaptch(String phone) async {
-  return request('/sms-captcha', options: Options(method: 'POST'), queryParameters: { 'phone': phone }).then((value) {
-    Fluttertoast.showToast(
-        msg: '验证码发送成功！'
-    );
+  return request('/sms-captcha',
+      options: Options(method: 'POST'),
+      queryParameters: {'phone': phone}).then((value) {
+    Fluttertoast.showToast(msg: '验证码发送成功！');
   }).catchError((error) {
-
-    Fluttertoast.showToast(
-      msg: error.error['message']
-    );
+    Fluttertoast.showToast(msg: error.error['message']);
   });
 }
 
 //登陆
-Future userLogin(String userName,String password) async {
-  return request('/login', options: Options(method: 'POST'),
-    data: { 'userName': userName, 'password': password},).catchError((error) =>
-  { Fluttertoast.showToast(
-      msg: error.error['message']
-  ),});
+Future userLogin(String userName, String password) async {
+  return request(
+    '/login',
+    options: Options(method: 'POST'),
+    data: {'userName': userName, 'password': password},
+  ).catchError((error) => {
+        Fluttertoast.showToast(msg: error.error['message']),
+      });
 }
 
 Future getCurrent() async {
   return request('/person/current');
 }
 
-
-
 /**
  * 修改个人信息
  * @param {*}
  * @returns
  */
 Future updateInfo(String id, userdata) async {
-  return request('/person/$id', options: Options(method: 'PUT'),data: userdata).catchError((error) =>
-  { Fluttertoast.showToast(
-      msg: error.error['message']
-  ),});
+  return request('/person/$id', options: Options(method: 'PUT'), data: userdata)
+      .catchError((error) => {
+            Fluttertoast.showToast(msg: error.error['message']),
+          });
 }

lib/theme.dart

@@ -1,4 +1,3 @@
-
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 
@@ -11,11 +10,10 @@ ThemeData getTheme() {
       elevation: 0,
       toolbarHeight: 44.w,
       titleTextStyle: TextStyle(
-        color: const Color(0xFF333333),
-        fontWeight: FontWeight.bold,
-        fontSize: 17.sp,
-        letterSpacing: 2
-      ),
+          color: const Color(0xFF333333),
+          fontWeight: FontWeight.bold,
+          fontSize: 17.sp,
+          letterSpacing: 2),
     ),
     backgroundColor: Colors.white,
   );

lib/utils/amap/const_config.dart

@@ -7,8 +7,7 @@ class ConstConfig {
   ///注意：使用[AMapWidget]的`apiKey`属性设置的key的优先级高于通过Native配置key的优先级，
   ///使用[AMapWidget]的`apiKey`属性配置后Native配置的key将失效，请根据实际情况选择使用
   static const AMapApiKey amapApiKeys = AMapApiKey(
-      androidKey: 'b481b4187e24e625fa0056fd0530e663',
-      iosKey: '您申请的iOS平台的key');
+      androidKey: 'b481b4187e24e625fa0056fd0530e663', iosKey: '您申请的iOS平台的key');
 
   ///高德隐私合规声明，这里只是示例，实际使用中请按照实际参数设置[AMapPrivacyStatement]的'hasContains''hasShow''hasAgree'这三个参数
   ///
@@ -18,5 +17,5 @@ class ConstConfig {
   ///
   /// 高德SDK合规使用方案请参考：https://lbs.amap.com/news/sdkhgsy
   static const AMapPrivacyStatement amapPrivacyStatement =
-  AMapPrivacyStatement(hasContains: true, hasShow: true, hasAgree: true);
+      AMapPrivacyStatement(hasContains: true, hasShow: true, hasAgree: true);
 }

lib/utils/dialog.dart

@@ -1,5 +1,3 @@
-
-
 import 'package:flutter/widgets.dart';
 
 class CommonPopup extends StatelessWidget {
@@ -12,6 +10,4 @@ class CommonPopup extends StatelessWidget {
     // TODO: implement build
     throw UnimplementedError();
   }
-
 }
-

lib/utils/location.dart

@@ -6,7 +6,7 @@ import 'package:permission_handler/permission_handler.dart';
 
 import 'amap/const_config.dart';
 
-typedef AMAPListener = void Function (Map<String, Object>);
+typedef AMAPListener = void Function(Map<String, Object>);
 
 void showPrivacy() {
   /// 设置是否已经包含高德隐私政策并弹窗展示显示用户查看，如果未包含或者没有弹窗展示，高德定位SDK将不会工作
@@ -44,7 +44,8 @@ Future _requirePermission() async {
 }
 
 Future requireLocation(AMAPListener listener) async {
-  AMapFlutterLocation.setApiKey(ConstConfig.amapApiKeys.androidKey!, ConstConfig.amapApiKeys.iosKey!);
+  AMapFlutterLocation.setApiKey(
+      ConstConfig.amapApiKeys.androidKey!, ConstConfig.amapApiKeys.iosKey!);
   showPrivacy();
   await _requirePermission();
   final AMapFlutterLocation location = AMapFlutterLocation();
@@ -100,7 +101,6 @@ _getAMapLocationOption() {
   return locationOption;
 }
 
-
 // import 'dart:io';
 //
 // import 'package:flutter_baidu_mapapi_base/flutter_baidu_mapapi_base.dart'
@@ -131,4 +131,4 @@ _getAMapLocationOption() {
 //   }
 //
 //   return location;
-// }
+// }

lib/utils/timer.dart

@@ -1,12 +1,11 @@
-
 import 'dart:async';
 
-Timer setInterval(void Function (Timer) f, int milliseconds) {
+Timer setInterval(void Function(Timer) f, int milliseconds) {
   var duration = Duration(milliseconds: milliseconds);
   return Timer.periodic(duration, f);
 }
 
-void setTimeout(void Function () f, int milliseconds) {
+void setTimeout(void Function() f, int milliseconds) {
   var duration = Duration(milliseconds: milliseconds);
   Timer? t = null;
   t = Timer(duration, () {

lib/widgets/CarsCard.dart

@@ -20,15 +20,15 @@ class CarsCard extends StatefulWidget {
   _CarsCardPage createState() => _CarsCardPage();
 }
 
-
 class _CarsCardPage extends State<CarsCard> {
   // final CardListModel item;
   // _CarsCardPage(this.item);
-  setMorKm () {
+  setMorKm() {
     String n = '';
-    if (widget.item.distance !=null) {
-      if ((widget.item.distance??0) >= 1000) {
-        n = ((widget.item.distance??0) / 1000).toStringAsFixed(2).toString() + '公里';
+    if (widget.item.distance != null) {
+      if ((widget.item.distance ?? 0) >= 1000) {
+        n = ((widget.item.distance ?? 0) / 1000).toStringAsFixed(2).toString() +
+            '公里';
       } else {
         n = widget.item.distance.toString() + '米';
       }
@@ -36,7 +36,7 @@ class _CarsCardPage extends State<CarsCard> {
       n = '0m';
     }
     return n;
-}
+  }
 
   @override
   Widget build(BuildContext context) {
@@ -53,7 +53,10 @@ class _CarsCardPage extends State<CarsCard> {
         children: [
           GestureDetector(
             onTap: () {
-              Get.to(MachineryDetailPage(),arguments: {'id':widget.item.machineryId,'km':setMorKm().toString()});
+              Get.to(MachineryDetailPage(), arguments: {
+                'id': widget.item.machineryId,
+                'km': setMorKm().toString()
+              });
             },
             child: Image.network(
               widget.item.thumb.toString(),
@@ -130,7 +133,7 @@ class _CarsCardPage extends State<CarsCard> {
                     child: ElevatedButton(
                       onPressed: () {
                         Get.toNamed('/orderConfirmation',
-                            arguments: {'id':widget.item.machineryId});
+                            arguments: {'id': widget.item.machineryId});
                       },
                       child: const Text(
                         "预约",
@@ -177,18 +180,18 @@ class _CarsCardPage extends State<CarsCard> {
                                 Text(
                                   '距离当前位置',
                                   style: TextStyle(
-                                      fontSize: 15, fontWeight: FontWeight.bold),
+                                      fontSize: 15,
+                                      fontWeight: FontWeight.bold),
                                 ),
                                 Text(
                                   setMorKm().toString(),
                                   style: TextStyle(
-                                      fontSize: 15, fontWeight: FontWeight.bold),
+                                      fontSize: 15,
+                                      fontWeight: FontWeight.bold),
                                 ),
-
                               ],
                             ),
                           ),
-
                           GestureDetector(
                             child: Text(
                               '进入地图 >>',
@@ -197,8 +200,10 @@ class _CarsCardPage extends State<CarsCard> {
                             ),
                             onTap: () {
                               print('进入地图');
-                              Get.toNamed('/machineryMap',
-                                  arguments: {'id':widget.item.machineryId,'km':setMorKm().toString()});
+                              Get.toNamed('/machineryMap', arguments: {
+                                'id': widget.item.machineryId,
+                                'km': setMorKm().toString()
+                              });
                             },
                           )
                         ],
@@ -210,5 +215,3 @@ class _CarsCardPage extends State<CarsCard> {
     );
   }
 }
-
-

lib/widgets/Cell.dart

@@ -1,10 +1,9 @@
-
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 
 class Cell extends StatelessWidget {
-  const Cell ({
+  const Cell({
     Key? key,
     this.header,
     required this.child,
@@ -19,36 +18,35 @@ class Cell extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-
     return Container(
       margin: margin,
       padding: EdgeInsets.symmetric(vertical: 10.h, horizontal: 0.0),
       decoration: const BoxDecoration(
-        border: Border(
-          bottom: BorderSide(width: 1.0, color: Color(0x1F000000)),
-        )
-      ),
+          border: Border(
+        bottom: BorderSide(width: 1.0, color: Color(0x1F000000)),
+      )),
       child: Row(
         children: [
-          if (null != header) SizedBox(
-            width: 53.w,
-            child: Container(
-              decoration: const BoxDecoration(
-                border: Border(
-                  right: BorderSide(width: 1, color: Color(0xFF333333))
-                )
+          if (null != header)
+            SizedBox(
+              width: 53.w,
+              child: Container(
+                decoration: const BoxDecoration(
+                    border: Border(
+                        right: BorderSide(width: 1, color: Color(0xFF333333)))),
+                child: header,
               ),
-              child: header,
             ),
+          Expanded(
+            child: child,
           ),
-          Expanded(child: child,),
-          if (null != footer) ConstrainedBox (
-            constraints: BoxConstraints(maxWidth: 100.w),
-            child: footer,
-          )
+          if (null != footer)
+            ConstrainedBox(
+              constraints: BoxConstraints(maxWidth: 100.w),
+              child: footer,
+            )
         ],
       ),
     );
   }
-  
-}
+}

lib/widgets/DefaultButton.dart

@@ -1,7 +1,5 @@
 import 'package:flutter/material.dart';
 
-
-
 class DefaultButton extends StatefulWidget {
   //点击回调
   final GestureTapCallback onPressed;
@@ -15,7 +13,7 @@ class DefaultButton extends StatefulWidget {
   final double? radius;
 
   EdgeInsetsGeometry marginDefault =
-  const EdgeInsets.fromLTRB(0, 90.0, 0, 30); //按钮默认的margin值
+      const EdgeInsets.fromLTRB(0, 90.0, 0, 30); //按钮默认的margin值
 
   DefaultButton({
     Key? key,
@@ -33,9 +31,11 @@ class DefaultButton extends StatefulWidget {
   @override
   State createState() {
     if (margin == null) {
-      return _DefaultButtonState(onPressed, text, marginDefault,width,height,fontSize,backColor,color,radius);
+      return _DefaultButtonState(onPressed, text, marginDefault, width, height,
+          fontSize, backColor, color, radius);
     }
-    return _DefaultButtonState(onPressed, text, margin,width,height,fontSize,backColor,color,radius);
+    return _DefaultButtonState(onPressed, text, margin, width, height, fontSize,
+        backColor, color, radius);
   }
 }
 
@@ -50,17 +50,8 @@ class _DefaultButtonState extends State<DefaultButton> {
   final Color backColor;
   final Color color;
   final double? radius;
-  _DefaultButtonState(
-      this.onPressed,
-      this.text,
-      this.margin,
-      this.width,
-      this.height,
-      this.fontSize,
-      this.backColor,
-      this.color,
-      this.radius
-      );
+  _DefaultButtonState(this.onPressed, this.text, this.margin, this.width,
+      this.height, this.fontSize, this.backColor, this.color, this.radius);
 
   @override
   Widget build(BuildContext context) {
@@ -74,13 +65,16 @@ class _DefaultButtonState extends State<DefaultButton> {
           disabledColor: const Color(0xF5F6F7ff),
           disabledTextColor: const Color(0xF5F6F7ff),
           colorBrightness: Brightness.dark,
-          shape:
-          RoundedRectangleBorder(borderRadius: BorderRadius.circular(radius??5)),
-          child: Text(text,style:  TextStyle(
+          shape: RoundedRectangleBorder(
+              borderRadius: BorderRadius.circular(radius ?? 5)),
+          child: Text(
+            text,
+            style: TextStyle(
               fontSize: fontSize,
               fontWeight: FontWeight.bold,
               color: color,
-          ),),
+            ),
+          ),
           textColor: Colors.white,
           onPressed: onPressed,
         ),
@@ -89,6 +83,4 @@ class _DefaultButtonState extends State<DefaultButton> {
 
     return _SectionBtn;
   }
-
 }
-

lib/widgets/ExtendContentList.dart

@@ -1,4 +1,3 @@
-
 import 'package:flutter/widgets.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get_rx/src/rx_types/rx_types.dart';
@@ -10,8 +9,8 @@ import '../models/entities/ExtendContent.dart';
 class ExtendContentList extends StatelessWidget {
   final List<ContentImageList> item;
 
-  const ExtendContentList({ Key? key, required this.item }) : super(key: key);
-  
+  const ExtendContentList({Key? key, required this.item}) : super(key: key);
+
   Widget? _image(String? content) {
     if (null == content || content.isEmpty) return null;
     return Image.network(content, fit: BoxFit.cover);
@@ -39,15 +38,14 @@ class ExtendContentList extends StatelessWidget {
     //   ));
     // }
 
-    return  Container(
-      child:  Column(
-        children:  item.map((item) {
+    return Container(
+      child: Column(
+        children: item.map((item) {
           if (item.contentType != 'image') {
             return Container(
-              padding: EdgeInsets.fromLTRB(0, 20, 0, 10),
-              width: 344.w,
-              child: _text(item.content)
-            );
+                padding: EdgeInsets.fromLTRB(0, 20, 0, 10),
+                width: 344.w,
+                child: _text(item.content));
           } else {
             return Container(
               padding: EdgeInsets.fromLTRB(0, 10, 0, 10),
@@ -57,7 +55,5 @@ class ExtendContentList extends StatelessWidget {
         }).toList(),
       ),
     );
-
   }
-
 }

lib/widgets/GradientButton.dart

@@ -1,5 +1,3 @@
-
-
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 
@@ -47,7 +45,12 @@ class GradientButton extends StatelessWidget {
 
     return DecoratedBox(
       decoration: BoxDecoration(
-        gradient: disabled ? null : LinearGradient(begin: linearStart??Alignment.topCenter, end: linearEnd??Alignment.bottomCenter, colors: _colors),
+        gradient: disabled
+            ? null
+            : LinearGradient(
+                begin: linearStart ?? Alignment.topCenter,
+                end: linearEnd ?? Alignment.bottomCenter,
+                colors: _colors),
         color: disabled ? disabledColor ?? theme.disabledColor : null,
         borderRadius: radius,
       ),
@@ -85,4 +88,4 @@ class GradientButton extends StatelessWidget {
       ),
     );
   }
-}
+}

lib/widgets/LinearGradientText.dart

@@ -1,4 +1,3 @@
-
 import 'package:flutter/widgets.dart';
 
 class LinearGradientText extends StatelessWidget {

lib/widgets/LoadMore.dart

@@ -1,4 +1,3 @@
-
 import 'package:flutter/widgets.dart';
 
 import 'package:farmer_client/models/entities/PagedResult.dart';
@@ -9,7 +8,7 @@ class LoadMore extends StatefulWidget {
     required this.builder,
     required this.fetch,
     this.onError,
-  }): super(key: key);
+  }) : super(key: key);
 
   Future Function(Map param) fetch;
   Function? onError;
@@ -22,7 +21,7 @@ class LoadMore extends StatefulWidget {
   }) builder;
 
   @override
-  State<StatefulWidget> createState () => _LoadMoreState();
+  State<StatefulWidget> createState() => _LoadMoreState();
 }
 
 class _LoadMoreState extends State<LoadMore> {
@@ -54,7 +53,7 @@ class _LoadMoreState extends State<LoadMore> {
   Future fetchData() {
     final pageNum = result.current + 1;
     final pageSize = result.size == 0 ? 10 : result.size;
-    Map params = { "pageNum": pageNum, "pageSize": pageSize };
+    Map params = {"pageNum": pageNum, "pageSize": pageSize};
     return Future.value(widget.fetch(params).then((res) {
       setState(() {
         result = PagedResult.fromJson(res);

lib/widgets/Modal.dart

@@ -1,4 +1,3 @@
-
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
@@ -28,30 +27,35 @@ void _handleFunc(ModalFunc? func) {
 }
 
 /// 打开一个 dialog
-void showDialog({ required String title, String? message, Widget? content, ModalFunc? onConfirm, ModalFunc? onCancel }) {
-  Get.dialog(
-    Modal(
-      type: 'dialog',
-      title: title,
-      message: message,
-      content: content,
-      onConfirm: () => _handleFunc(onConfirm),
-      onCancel: () => _handleFunc(onCancel),
-    )
-  );
+void showDialog(
+    {required String title,
+    String? message,
+    Widget? content,
+    ModalFunc? onConfirm,
+    ModalFunc? onCancel}) {
+  Get.dialog(Modal(
+    type: 'dialog',
+    title: title,
+    message: message,
+    content: content,
+    onConfirm: () => _handleFunc(onConfirm),
+    onCancel: () => _handleFunc(onCancel),
+  ));
 }
 
 /// 打开一个 alert
-void showAlert({ required String title, String? message, Widget? content, ModalFunc? onConfirm }) {
-  Get.dialog(
-      Modal(
-        type: 'alert',
-        title: title,
-        message: message,
-        content: content,
-        onConfirm: () => _handleFunc(onConfirm),
-      )
-  );
+void showAlert(
+    {required String title,
+    String? message,
+    Widget? content,
+    ModalFunc? onConfirm}) {
+  Get.dialog(Modal(
+    type: 'alert',
+    title: title,
+    message: message,
+    content: content,
+    onConfirm: () => _handleFunc(onConfirm),
+  ));
 }
 
 void _closeModal() {
@@ -60,7 +64,6 @@ void _closeModal() {
 }
 
 class Modal extends StatelessWidget {
-
   String title;
   String type;
   String? message;
@@ -68,8 +71,12 @@ class Modal extends StatelessWidget {
   VoidCallback? onConfirm;
   VoidCallback? onCancel;
 
-  final _titleStyle = TextStyle(color: const Color(0xFF222222), fontSize: 20.sp, fontWeight: FontWeight.bold);
-  final _messageStyle = TextStyle(color: const Color(0xFF666666), fontSize: 18.sp);
+  final _titleStyle = TextStyle(
+      color: const Color(0xFF222222),
+      fontSize: 20.sp,
+      fontWeight: FontWeight.bold);
+  final _messageStyle =
+      TextStyle(color: const Color(0xFF666666), fontSize: 18.sp);
   final _primaryColor = const Color(0xFFFF703B);
   final _btnSize = Size(90.w, 36.w);
   final _btnShape = RoundedRectangleBorder(
@@ -82,29 +89,33 @@ class Modal extends StatelessWidget {
       onConfirm!();
     }
   }
+
   void _handleCancel() {
     if (null != onCancel) {
       onCancel!();
     }
   }
 
-  Modal({Key? key,
+  Modal({
+    Key? key,
     this.type = 'alert',
     required this.title,
     this.message,
     this.content,
     this.onConfirm,
     this.onCancel,
-  }): super(key: key);
+  }) : super(key: key);
 
   Widget _confirmBtn() {
     return ElevatedButton(
-      child: Text("确定", style: TextStyle(color: Colors.white, fontSize: 18.sp, letterSpacing: 5.sp)),
+      child: Text("确定",
+          style: TextStyle(
+              color: Colors.white, fontSize: 18.sp, letterSpacing: 5.sp)),
       style: ElevatedButton.styleFrom(
-          primary: _primaryColor,
-          elevation: 0,
-          minimumSize: _btnSize,
-          shape: _btnShape,
+        primary: _primaryColor,
+        elevation: 0,
+        minimumSize: _btnSize,
+        shape: _btnShape,
       ),
       onPressed: _handleConfirm,
     );
@@ -112,7 +123,9 @@ class Modal extends StatelessWidget {
 
   Widget _cancelBtn() {
     return ElevatedButton(
-      child: Text("取消", style: TextStyle(color: _primaryColor, fontSize: 18.sp, letterSpacing: 5.sp)),
+      child: Text("取消",
+          style: TextStyle(
+              color: _primaryColor, fontSize: 18.sp, letterSpacing: 5.sp)),
       style: ElevatedButton.styleFrom(
         primary: Colors.white,
         elevation: 0,
@@ -125,31 +138,34 @@ class Modal extends StatelessWidget {
 
   Widget _alert() {
     return SimpleDialog(
-      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(24.w)),
-      titleTextStyle: _titleStyle,
-      title: Text(title, textAlign: TextAlign.center),
+        shape:
+            RoundedRectangleBorder(borderRadius: BorderRadius.circular(24.w)),
+        titleTextStyle: _titleStyle,
+        title: Text(title, textAlign: TextAlign.center),
         children: [
-          if (null != message) Text(message!, textAlign: TextAlign.center, style: _messageStyle),
+          if (null != message)
+            Text(message!, textAlign: TextAlign.center, style: _messageStyle),
           if (null != content) content!,
           SizedBox(height: 16.w),
           Center(
             child: _confirmBtn(),
           ),
           SizedBox(height: 10.w),
-        ]
-    );
+        ]);
   }
 
   Widget _dialog() {
     Widget hSpacer = SizedBox(width: 16.w);
 
     return SimpleDialog(
-        shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(24.w)),
+        shape:
+            RoundedRectangleBorder(borderRadius: BorderRadius.circular(24.w)),
         titleTextStyle: _titleStyle,
         title: Text(title, textAlign: TextAlign.center),
         alignment: Alignment.center,
         children: [
-          if (null != message) Text(message!, textAlign: TextAlign.center, style: _messageStyle),
+          if (null != message)
+            Text(message!, textAlign: TextAlign.center, style: _messageStyle),
           if (null != content) content!,
           SizedBox(height: 16.w),
           Row(
@@ -167,13 +183,11 @@ class Modal extends StatelessWidget {
             ],
           ),
           SizedBox(height: 10.w),
-        ]
-    );
+        ]);
   }
 
   @override
   Widget build(BuildContext context) {
     return type == 'alert' ? _alert() : _dialog();
   }
-
 }

lib/widgets/NullCard.dart

@@ -21,13 +21,10 @@ class NullCard extends StatelessWidget {
           ),
           Text(
             text,
-            style: TextStyle(
-                fontSize: 17.sp, color: Color(0xFFb4b4b4)),
+            style: TextStyle(fontSize: 17.sp, color: Color(0xFFb4b4b4)),
           )
         ],
       ),
     );
   }
-
-
-}
+}

lib/widgets/OrderInfoCard.dart

@@ -12,222 +12,233 @@ class OrderInfoCard extends StatelessWidget {
   final String? orderStateText;
   final Color? orderStateColor;
 
- // final  DateTime timeNew=item.appointmentDate;
-
-  const OrderInfoCard({Key? key, required this.item, required this.orderStateColor, required this.orderStateText}) : super(key: key);
-
+  // final  DateTime timeNew=item.appointmentDate;
 
+  const OrderInfoCard(
+      {Key? key,
+      required this.item,
+      required this.orderStateColor,
+      required this.orderStateText})
+      : super(key: key);
 
   @override
   Widget build(BuildContext context) {
     return Container(
-        width: 345.w,
-        height: 484.5.h,
-        margin: EdgeInsets.fromLTRB(15.w, 17.w, 15.w, 0),
-        decoration: BoxDecoration(
-          color: Colors.white,
-          //设置四周圆角 角度
-          borderRadius: BorderRadius.all(Radius.circular(2.0)),
-          //设置四周边框
-          boxShadow: [
-            BoxShadow(
-              blurRadius: 10, //阴影范围
-              spreadRadius: 0.1, //阴影浓度
-              color: Colors.grey.withOpacity(0.2), //阴影颜色
-            ),
-          ],
-        ),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Container(
-                margin: EdgeInsets.fromLTRB(15.w, 0, 0, 0),
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    Container(
-                      padding: EdgeInsets.fromLTRB(0, 15, 0, 20),
-                      width: 314.w,
-                      decoration: const BoxDecoration(
-                          border: Border(
-                              bottom: BorderSide(
-                                  width: 0.5, color: Color(0x20000000)
-                                  // 0x17000000
-                                  ))),
-                      child: RichText(
-                        text:  TextSpan(children: <InlineSpan>[
-                          TextSpan(
-                              text: '订单编号：',
-                              style: TextStyle(
-                                  color: Color(0xff666666),
-                                  fontSize: 16,
-                                  fontWeight: FontWeight.bold)),
-                          TextSpan(
-                              text: item.orderNo.toString(),
-                              style: TextStyle(
-                                  color: Color(0xff222222),
-                                  fontSize: 16,
-                                  fontWeight: FontWeight.bold)),
-                        ]),
-                      ),
+      width: 345.w,
+      height: 484.5.h,
+      margin: EdgeInsets.fromLTRB(15.w, 17.w, 15.w, 0),
+      decoration: BoxDecoration(
+        color: Colors.white,
+        //设置四周圆角 角度
+        borderRadius: BorderRadius.all(Radius.circular(2.0)),
+        //设置四周边框
+        boxShadow: [
+          BoxShadow(
+            blurRadius: 10, //阴影范围
+            spreadRadius: 0.1, //阴影浓度
+            color: Colors.grey.withOpacity(0.2), //阴影颜色
+          ),
+        ],
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Container(
+              margin: EdgeInsets.fromLTRB(15.w, 0, 0, 0),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Container(
+                    padding: EdgeInsets.fromLTRB(0, 15, 0, 20),
+                    width: 314.w,
+                    decoration: const BoxDecoration(
+                        border: Border(
+                            bottom:
+                                BorderSide(width: 0.5, color: Color(0x20000000)
+                                    // 0x17000000
+                                    ))),
+                    child: RichText(
+                      text: TextSpan(children: <InlineSpan>[
+                        TextSpan(
+                            text: '订单编号：',
+                            style: TextStyle(
+                                color: Color(0xff666666),
+                                fontSize: 16,
+                                fontWeight: FontWeight.bold)),
+                        TextSpan(
+                            text: item.orderNo.toString(),
+                            style: TextStyle(
+                                color: Color(0xff222222),
+                                fontSize: 16,
+                                fontWeight: FontWeight.bold)),
+                      ]),
                     ),
-                    Padding(
-                      padding: EdgeInsets.fromLTRB(0, 20, 0, 15),
-                      child: RichText(
-                        text:  TextSpan(children: <InlineSpan>[
-                          TextSpan(
-                              text: '农机名称：',
-                              style: TextStyle(
-                                  color: Color(0xff666666),
-                                  fontSize: 16,
-                                  fontWeight: FontWeight.bold)),
-                          TextSpan(
-                              text: item.machineryName.toString(),
-                              style: TextStyle(
-                                  color: Color(0xff222222),
-                                  fontSize: 16,
-                                  fontWeight: FontWeight.bold)),
-                        ]),
-                      ),
+                  ),
+                  Padding(
+                    padding: EdgeInsets.fromLTRB(0, 20, 0, 15),
+                    child: RichText(
+                      text: TextSpan(children: <InlineSpan>[
+                        TextSpan(
+                            text: '农机名称：',
+                            style: TextStyle(
+                                color: Color(0xff666666),
+                                fontSize: 16,
+                                fontWeight: FontWeight.bold)),
+                        TextSpan(
+                            text: item.machineryName.toString(),
+                            style: TextStyle(
+                                color: Color(0xff222222),
+                                fontSize: 16,
+                                fontWeight: FontWeight.bold)),
+                      ]),
                     ),
-                    Padding(
-                      padding: EdgeInsets.fromLTRB(0, 0, 0, 15),
-                      child: RichText(
-                        text:  TextSpan(children: <InlineSpan>[
-                          TextSpan(
-                              text: '作业面积：',
-                              style: TextStyle(
-                                  color: Color(0xff666666),
-                                  fontSize: 16,
-                                  fontWeight: FontWeight.bold)),
-                          TextSpan(
-                              text: item.amount.toString(),
-                              style: TextStyle(
-                                  color: Color(0xff222222),
-                                  fontSize: 16,
-                                  fontWeight: FontWeight.bold)),
-                        ]),
-                      ),
+                  ),
+                  Padding(
+                    padding: EdgeInsets.fromLTRB(0, 0, 0, 15),
+                    child: RichText(
+                      text: TextSpan(children: <InlineSpan>[
+                        TextSpan(
+                            text: '作业面积：',
+                            style: TextStyle(
+                                color: Color(0xff666666),
+                                fontSize: 16,
+                                fontWeight: FontWeight.bold)),
+                        TextSpan(
+                            text: item.amount.toString(),
+                            style: TextStyle(
+                                color: Color(0xff222222),
+                                fontSize: 16,
+                                fontWeight: FontWeight.bold)),
+                      ]),
                     ),
-                    Padding(
-                      padding: EdgeInsets.fromLTRB(0, 0, 0, 15),
-                      child: RichText(
-                        text:  TextSpan(children: <InlineSpan>[
-                          TextSpan(
-                              text: '需求时间：',
-                              style: TextStyle(
-                                  color: Color(0xff666666),
-                                  fontSize: 16,
-                                  fontWeight: FontWeight.bold)),
-                          TextSpan(
-                          // '${DateFormat("yyyy-MM-dd").format(item.appointmentDate.toString())}'
-                              text:item.appointmentDate!=null? DateFormat("yyyy-MM-dd").format(DateTime.parse(item.appointmentDate.toString())):item.appointmentDate.toString(),
-                              style: TextStyle(
-                                  color: Color(0xff222222),
-                                  fontSize: 16,
-                                  fontWeight: FontWeight.bold)),
-                        ]),
-                      ),
+                  ),
+                  Padding(
+                    padding: EdgeInsets.fromLTRB(0, 0, 0, 15),
+                    child: RichText(
+                      text: TextSpan(children: <InlineSpan>[
+                        TextSpan(
+                            text: '需求时间：',
+                            style: TextStyle(
+                                color: Color(0xff666666),
+                                fontSize: 16,
+                                fontWeight: FontWeight.bold)),
+                        TextSpan(
+                            // '${DateFormat("yyyy-MM-dd").format(item.appointmentDate.toString())}'
+                            text: item.appointmentDate != null
+                                ? DateFormat("yyyy-MM-dd").format(
+                                    DateTime.parse(
+                                        item.appointmentDate.toString()))
+                                : item.appointmentDate.toString(),
+                            style: TextStyle(
+                                color: Color(0xff222222),
+                                fontSize: 16,
+                                fontWeight: FontWeight.bold)),
+                      ]),
                     ),
-                    Padding(
-                      padding: EdgeInsets.fromLTRB(0, 0, 0, 20),
-                      child: RichText(
-                        text:  TextSpan(children: <InlineSpan>[
-                          const TextSpan(
-                              text: '下单时间：',
-                              style: TextStyle(
-                                  color: Color(0xff666666),
-                                  fontSize: 16,
-                                  fontWeight: FontWeight.bold)),
-                          TextSpan(
-                              // text: DateFormat("yyyy-MM-dd").format(DateTime.parse(item.createDate!.toString())),
-                              text:item.createDate!=null? DateFormat("yyyy-MM-dd").format(DateTime.parse(item.createDate.toString())):item.createDate.toString(),
-
-                              style: const TextStyle(
-                                  color: Color(0xff222222),
-                                  fontSize: 16,
-                                  fontWeight: FontWeight.bold)),
-                        ]),
-                      ),
+                  ),
+                  Padding(
+                    padding: EdgeInsets.fromLTRB(0, 0, 0, 20),
+                    child: RichText(
+                      text: TextSpan(children: <InlineSpan>[
+                        const TextSpan(
+                            text: '下单时间：',
+                            style: TextStyle(
+                                color: Color(0xff666666),
+                                fontSize: 16,
+                                fontWeight: FontWeight.bold)),
+                        TextSpan(
+                            // text: DateFormat("yyyy-MM-dd").format(DateTime.parse(item.createDate!.toString())),
+                            text: item.createDate != null
+                                ? DateFormat("yyyy-MM-dd").format(
+                                    DateTime.parse(item.createDate.toString()))
+                                : item.createDate.toString(),
+                            style: const TextStyle(
+                                color: Color(0xff222222),
+                                fontSize: 16,
+                                fontWeight: FontWeight.bold)),
+                      ]),
                     ),
-                    Padding(
-                      padding: EdgeInsets.fromLTRB(0, 0, 0, 20),
-                      child: RichText(
-                        text:  TextSpan(children: <InlineSpan>[
-                          TextSpan(
-                              text: '订单状态：',
-                              style: TextStyle(
-                                  color: Color(0xff666666),
-                                  fontSize: 16,
-                                  fontWeight: FontWeight.bold)),
-                          TextSpan(
-                              text: orderStateText==null?'未支付':orderStateText=='已付款'? '已付款,待调度':orderStateText,
-                              style: TextStyle(
-                                  color:orderStateColor??Colors.black,
-                                  fontSize: 16,
-                                  fontWeight: FontWeight.bold)),
-                        ]),
-                      ),
+                  ),
+                  Padding(
+                    padding: EdgeInsets.fromLTRB(0, 0, 0, 20),
+                    child: RichText(
+                      text: TextSpan(children: <InlineSpan>[
+                        TextSpan(
+                            text: '订单状态：',
+                            style: TextStyle(
+                                color: Color(0xff666666),
+                                fontSize: 16,
+                                fontWeight: FontWeight.bold)),
+                        TextSpan(
+                            text: orderStateText == null
+                                ? '未支付'
+                                : orderStateText == '已付款'
+                                    ? '已付款,待调度'
+                                    : orderStateText,
+                            style: TextStyle(
+                                color: orderStateColor ?? Colors.black,
+                                fontSize: 16,
+                                fontWeight: FontWeight.bold)),
+                      ]),
                     ),
-                    Container(
-                        padding: EdgeInsets.fromLTRB(0, 20, 0, 0),
-                        width: 314.w,
-                        decoration: const BoxDecoration(
-                            border: Border(
-                                top: BorderSide(
-                                    width: 0.8, color: Color(0x20000000)
-                                    // 0x17000000
-                                    ))),
-                        child: Column(
-                          children: [
-                            Row(
+                  ),
+                  Container(
+                      padding: EdgeInsets.fromLTRB(0, 20, 0, 0),
+                      width: 314.w,
+                      decoration: const BoxDecoration(
+                          border: Border(
+                              top: BorderSide(
+                                  width: 0.8, color: Color(0x20000000)
+                                  // 0x17000000
+                                  ))),
+                      child: Column(
+                        children: [
+                          Row(
+                            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                            children: [
+                              const Text('费用：',
+                                  style: TextStyle(
+                                      color: Color(0xff666666),
+                                      fontSize: 16,
+                                      fontWeight: FontWeight.bold)),
+                              LinearGradientText(
+                                colors: const <Color>[
+                                  Color(0xFFFA7878),
+                                  Color(0xFFB61515),
+                                ],
+                                child: Text(
+                                    ((item.charges ?? 0) / 100).toString(),
+                                    style: TextStyle(
+                                        color: Color(0xffB61515),
+                                        fontSize: 16,
+                                        fontWeight: FontWeight.bold)),
+                              ),
+                            ],
+                          ),
+                          Padding(
+                            padding: EdgeInsets.fromLTRB(0, 30, 0, 0),
+                            child: Row(
                               mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                              children:  [
-                                const Text('费用：',
+                              children: [
+                                Text('状态：',
                                     style: TextStyle(
                                         color: Color(0xff666666),
                                         fontSize: 16,
                                         fontWeight: FontWeight.bold)),
-                                LinearGradientText(
-                                  colors: const <Color>[
-                                    Color(0xFFFA7878),
-                                    Color(0xFFB61515),
-                                  ],
-                                  child:  Text(( (item.charges??0)/100).toString(),
-                                      style: TextStyle(
-                                          color: Color(0xffB61515),
-                                          fontSize: 16,
-                                          fontWeight: FontWeight.bold)),
-                                ),
-
+                                Text(orderStateText ?? '未支付',
+                                    style: TextStyle(
+                                        color: orderStateColor ?? Colors.black,
+                                        fontSize: 16,
+                                        fontWeight: FontWeight.bold)),
                               ],
                             ),
-                            Padding(
-                              padding: EdgeInsets.fromLTRB(0, 30, 0, 0),
-                              child: Row(
-                                mainAxisAlignment:
-                                MainAxisAlignment.spaceBetween,
-                                children:  [
-                                  Text('状态：',
-                                      style: TextStyle(
-                                          color: Color(0xff666666),
-                                          fontSize: 16,
-                                          fontWeight: FontWeight.bold)),
-                                  Text(orderStateText??'未支付',
-                                      style: TextStyle(
-                                          color: orderStateColor??Colors.black,
-                                          fontSize: 16,
-                                          fontWeight: FontWeight.bold)),
-                                ],
-                              ),
-                            ),
-                          ],
-                        )),
-                  ],
-                )),
-          ],
-        ),
-
+                          ),
+                        ],
+                      )),
+                ],
+              )),
+        ],
+      ),
     );
   }
 }

lib/widgets/OrderListCard.dart

@@ -8,9 +8,7 @@ import '../pages/orderInfo/index.dart';
 import 'package:intl/intl.dart';
 import 'LinearGradientText.dart';
 
-
 class OrderListCard extends StatefulWidget {
-
   final OrderListAll item;
   const OrderListCard({Key? key, required this.item}) : super(key: key);
 
@@ -18,77 +16,53 @@ class OrderListCard extends StatefulWidget {
   _OrderListCardPages createState() => _OrderListCardPages(item);
 }
 
-
 class StyleObj {
   String title;
   Color styleColor;
-  StyleObj ({ required this.title, required this.styleColor});
+  StyleObj({required this.title, required this.styleColor});
 }
 
-
-
 class _OrderListCardPages extends State<OrderListCard> {
-
   final OrderListAll item;
 
-
   _OrderListCardPages(this.item);
 
-
-  StyleObj  orderStates(){
+  StyleObj orderStates() {
     if (item.payStatus == 0) {
-      return StyleObj(
-          title: '待付款',
-          styleColor: Color(0xFF51D4FF)
-      );
-    } else if (item.payStatus == 1 && item.workStatus == 0 && item.dispatchStatus == 0) {
-      return StyleObj(
-          title: '已付款',
-          styleColor: Color(0xFFFF703B)
-      );
-    } else if (item.payStatus == 1 && item.dispatchStatus == 1 && item.workStatus == 0) {
-      return StyleObj(
-          title: '待作业',
-          styleColor: Color(0xFFFF703B)
-      );
-    } else if (item.payStatus == 1 && (item.workStatus == 1 || item.workStatus == 2)) {
-      return StyleObj(
-          title: '进行中',
-          styleColor: Color(0xFF44F68B)
-      );
+      return StyleObj(title: '待付款', styleColor: Color(0xFF51D4FF));
+    } else if (item.payStatus == 1 &&
+        item.workStatus == 0 &&
+        item.dispatchStatus == 0) {
+      return StyleObj(title: '已付款', styleColor: Color(0xFFFF703B));
+    } else if (item.payStatus == 1 &&
+        item.dispatchStatus == 1 &&
+        item.workStatus == 0) {
+      return StyleObj(title: '待作业', styleColor: Color(0xFFFF703B));
+    } else if (item.payStatus == 1 &&
+        (item.workStatus == 1 || item.workStatus == 2)) {
+      return StyleObj(title: '进行中', styleColor: Color(0xFF44F68B));
     } else if (item.workStatus == 3 && item.isEvaluated == 0) {
-      return StyleObj(
-          title: '待评价',
-          styleColor: Color(0xFF51D4FF)
-      );
-    } if (item.workStatus == 3 && item.isEvaluated == 1 && item.dispatchStatus == 1) {
-      return StyleObj(
-          title: '已完成',
-          styleColor: Color(0xFFFF703B)
-      );
-    } else if (item.payStatus == -1 && item.workStatus == 0 && item.isRefund == 1) {
-      return StyleObj(
-          title: '已退单',
-          styleColor: Color(0xFFFF703B)
-      );
-    } else if (item.payStatus == 3 && (item.dispatchStatus == 1 || item.dispatchStatus == 0)) {
-      return StyleObj(
-          title: '退单申请中',
-          styleColor: Color(0xFFFF703B)
-      );
+      return StyleObj(title: '待评价', styleColor: Color(0xFF51D4FF));
+    }
+    if (item.workStatus == 3 &&
+        item.isEvaluated == 1 &&
+        item.dispatchStatus == 1) {
+      return StyleObj(title: '已完成', styleColor: Color(0xFFFF703B));
+    } else if (item.payStatus == -1 &&
+        item.workStatus == 0 &&
+        item.isRefund == 1) {
+      return StyleObj(title: '已退单', styleColor: Color(0xFFFF703B));
+    } else if (item.payStatus == 3 &&
+        (item.dispatchStatus == 1 || item.dispatchStatus == 0)) {
+      return StyleObj(title: '退单申请中', styleColor: Color(0xFFFF703B));
     } else {
-      return StyleObj(
-          title: '异常',
-          styleColor: Color(0xFFFF0000)
-      );
+      return StyleObj(title: '异常', styleColor: Color(0xFFFF0000));
     }
   }
 
-
   @override
   Widget build(BuildContext context) {
-    return
-      Container(
+    return Container(
       width: 375.w,
       height: 345.h,
       margin: EdgeInsets.fromLTRB(0, 0, 0, 20),
@@ -131,7 +105,7 @@ class _OrderListCardPages extends State<OrderListCard> {
                     children: [
                       Container(
                         child: RichText(
-                          text:  TextSpan(children: <InlineSpan>[
+                          text: TextSpan(children: <InlineSpan>[
                             TextSpan(
                                 text: '订单编号：',
                                 style: TextStyle(
@@ -156,7 +130,11 @@ class _OrderListCardPages extends State<OrderListCard> {
                             )),
                         onTap: () {
                           print('进入详情');
-                          Get.toNamed('/orderPageInfo',arguments:{'id':item.orderId,'title':orderStates().title,'styleColor':orderStates().styleColor});
+                          Get.toNamed('/orderPageInfo', arguments: {
+                            'id': item.orderId,
+                            'title': orderStates().title,
+                            'styleColor': orderStates().styleColor
+                          });
                         },
                       )
                     ],
@@ -169,7 +147,7 @@ class _OrderListCardPages extends State<OrderListCard> {
                     Padding(
                       padding: EdgeInsets.fromLTRB(0, 0, 0, 15),
                       child: RichText(
-                        text:  TextSpan(children: <InlineSpan>[
+                        text: TextSpan(children: <InlineSpan>[
                           TextSpan(
                               text: '农机名称：',
                               style: TextStyle(
@@ -188,7 +166,7 @@ class _OrderListCardPages extends State<OrderListCard> {
                     Padding(
                       padding: EdgeInsets.fromLTRB(0, 0, 0, 15),
                       child: RichText(
-                        text:  TextSpan(children: <InlineSpan>[
+                        text: TextSpan(children: <InlineSpan>[
                           TextSpan(
                               text: '作业面积：',
                               style: TextStyle(
@@ -207,7 +185,7 @@ class _OrderListCardPages extends State<OrderListCard> {
                     Padding(
                       padding: EdgeInsets.fromLTRB(0, 0, 0, 15),
                       child: RichText(
-                        text:  TextSpan(children: <InlineSpan>[
+                        text: TextSpan(children: <InlineSpan>[
                           TextSpan(
                               text: '需求时间：',
                               style: TextStyle(
@@ -215,8 +193,9 @@ class _OrderListCardPages extends State<OrderListCard> {
                                   fontSize: 16,
                                   fontWeight: FontWeight.bold)),
                           TextSpan(
-                              text: DateFormat("yyyy-MM-dd").format(DateTime.parse(item.appointmentDate.toString())),
-
+                              text: DateFormat("yyyy-MM-dd").format(
+                                  DateTime.parse(
+                                      item.appointmentDate.toString())),
                               style: TextStyle(
                                   color: Color(0xff222222),
                                   fontSize: 16,
@@ -227,7 +206,7 @@ class _OrderListCardPages extends State<OrderListCard> {
                     Padding(
                       padding: EdgeInsets.fromLTRB(0, 0, 0, 4),
                       child: RichText(
-                        text:  TextSpan(children: <InlineSpan>[
+                        text: TextSpan(children: <InlineSpan>[
                           TextSpan(
                               text: '下单时间：',
                               style: TextStyle(
@@ -235,7 +214,8 @@ class _OrderListCardPages extends State<OrderListCard> {
                                   fontSize: 16,
                                   fontWeight: FontWeight.bold)),
                           TextSpan(
-                              text: DateFormat("yyyy-MM-dd").format(DateTime.parse(item.createDate.toString())),
+                              text: DateFormat("yyyy-MM-dd").format(
+                                  DateTime.parse(item.createDate.toString())),
                               style: TextStyle(
                                   color: Color(0xff222222),
                                   fontSize: 16,
@@ -257,17 +237,17 @@ class _OrderListCardPages extends State<OrderListCard> {
                     mainAxisAlignment: MainAxisAlignment.spaceBetween,
                     children: [
                       RichText(
-                        text:  TextSpan(children: <InlineSpan>[
+                        text: TextSpan(children: <InlineSpan>[
                           TextSpan(
                               text: '订单状态：',
                               style: TextStyle(
-                                  color:Color(0xff666666),
+                                  color: Color(0xff666666),
                                   fontSize: 16,
                                   fontWeight: FontWeight.bold)),
                           TextSpan(
                               text: orderStates().title,
                               style: TextStyle(
-                                  color:orderStates().styleColor,
+                                  color: orderStates().styleColor,
                                   fontSize: 16,
                                   fontWeight: FontWeight.bold)),
                         ]),
@@ -275,40 +255,37 @@ class _OrderListCardPages extends State<OrderListCard> {
                       Container(
                         child: Row(
                           children: [
-                            const Text('费用：',style: TextStyle(
-                                color: Color(0xff666666),
-                                fontSize: 16,
-                                fontWeight: FontWeight.bold)),
+                            const Text('费用：',
+                                style: TextStyle(
+                                    color: Color(0xff666666),
+                                    fontSize: 16,
+                                    fontWeight: FontWeight.bold)),
                             LinearGradientText(
                               colors: const <Color>[
                                 Color(0xFFFA7878),
                                 Color(0xFFB61515),
                               ],
                               child: RichText(
-                                text:  TextSpan(
-                                    children: <InlineSpan>[
-                                      TextSpan(
-                                          text:( (item.charges??0)/100).toString(),
-                                          style: TextStyle(
-                                            fontSize: 16,
-                                            fontWeight: FontWeight.bold,
-                                          )),
-                                      TextSpan(
-                                          text: "元",
-                                          style: TextStyle(
-                                            fontSize: 16,
-                                            fontWeight: FontWeight.bold,
-                                          )),
-
-                                    ]
-                                ),
+                                text: TextSpan(children: <InlineSpan>[
+                                  TextSpan(
+                                      text: ((item.charges ?? 0) / 100)
+                                          .toString(),
+                                      style: TextStyle(
+                                        fontSize: 16,
+                                        fontWeight: FontWeight.bold,
+                                      )),
+                                  TextSpan(
+                                      text: "元",
+                                      style: TextStyle(
+                                        fontSize: 16,
+                                        fontWeight: FontWeight.bold,
+                                      )),
+                                ]),
                               ),
                             ),
-
                           ],
                         ),
                       ),
-
                     ],
                   ),
                 ),
@@ -320,4 +297,3 @@ class _OrderListCardPages extends State<OrderListCard> {
     );
   }
 }
-

lib/widgets/Refresher.dart

@@ -1,4 +1,3 @@
-
 import 'package:farmer_client/models/entities/PagedResult.dart';
 import 'package:flutter/material.dart';
 
@@ -10,7 +9,7 @@ class RefreshBuilder extends StatefulWidget {
     required this.fetch,
     required this.useState,
     this.onError,
-  }): super(key: key);
+  }) : super(key: key);
 
   bool autoRerender;
   Future Function(Map param) fetch;
@@ -27,7 +26,6 @@ class RefreshBuilder extends StatefulWidget {
 }
 
 class _RefresherState extends State<RefreshBuilder> {
-
   PagedResult result = PagedResult(total: 0, size: 0, pages: 0, current: 0);
   List<dynamic> listData = [];
 
@@ -38,7 +36,7 @@ class _RefresherState extends State<RefreshBuilder> {
   }
 
   Future fetchData() {
-    return Future.value(widget.fetch({ "pageNum": 1 }).then((res) {
+    return Future.value(widget.fetch({"pageNum": 1}).then((res) {
       final pagedResult = PagedResult.fromJson(res);
       widget.useState(state: pagedResult);
 
@@ -62,10 +60,7 @@ class _RefresherState extends State<RefreshBuilder> {
     return RefreshIndicator(
       triggerMode: RefreshIndicatorTriggerMode.onEdge,
       onRefresh: fetchData,
-      child: widget.builder(
-          context: context,
-          toggle: toggle
-      ),
+      child: widget.builder(context: context, toggle: toggle),
     );
   }
-}
+}

lib/widgets/amap/amap.dart

@@ -10,7 +10,7 @@ class AMap extends StatelessWidget {
   final LatLng? position;
   final Map<String, Marker> _markers = Map<String, Marker>();
 
-  AMap({Key? key,  this.position }): super(key: key);
+  AMap({Key? key, this.position}) : super(key: key);
 
   void onMapCreated(AMapController controller) {
     _mapController = controller;
@@ -19,9 +19,8 @@ class AMap extends StatelessWidget {
   void _initMarkers() {
     if (null != position) {
       Marker marker = Marker(
-        position: position!,
-        icon: BitmapDescriptor.fromIconPath("images/locationImage.png")
-      );
+          position: position!,
+          icon: BitmapDescriptor.fromIconPath("images/locationImage.png"));
       _markers[marker.id] = marker;
     }
   }
@@ -35,8 +34,8 @@ class AMap extends StatelessWidget {
       apiKey: ConstConfig.amapApiKeys,
       markers: Set<Marker>.of(_markers.values),
       // 默认是邓州市中心
-      initialCameraPosition: const CameraPosition(target: LatLng(32.687732, 112.08745)),
+      initialCameraPosition:
+          const CameraPosition(target: LatLng(32.687732, 112.08745)),
     );
   }
-
-}
+}

lib/widgets/amap/const_config.dart

@@ -7,8 +7,7 @@ class ConstConfig {
   ///注意：使用[AMapWidget]的`apiKey`属性设置的key的优先级高于通过Native配置key的优先级，
   ///使用[AMapWidget]的`apiKey`属性配置后Native配置的key将失效，请根据实际情况选择使用
   static const AMapApiKey amapApiKeys = AMapApiKey(
-      androidKey: 'b481b4187e24e625fa0056fd0530e663',
-      iosKey: '您申请的iOS平台的key');
+      androidKey: 'b481b4187e24e625fa0056fd0530e663', iosKey: '您申请的iOS平台的key');
 
   ///高德隐私合规声明，这里只是示例，实际使用中请按照实际参数设置[AMapPrivacyStatement]的'hasContains''hasShow''hasAgree'这三个参数
   ///
@@ -18,5 +17,5 @@ class ConstConfig {
   ///
   /// 高德SDK合规使用方案请参考：https://lbs.amap.com/news/sdkhgsy
   static const AMapPrivacyStatement amapPrivacyStatement =
-  AMapPrivacyStatement(hasContains: true, hasShow: true, hasAgree: true);
+      AMapPrivacyStatement(hasContains: true, hasShow: true, hasAgree: true);
 }

lib/widgets/layout/BasicPage.dart

@@ -1,4 +1,3 @@
-
 import 'package:farmer_client/widgets/layout/bottomBar/BottomBar.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
@@ -22,7 +21,7 @@ abstract class BasicPage extends StatefulWidget {
   bool canScroll;
 
   //
-  BasicPage({Key? key, this.canScroll = true, this.tabIndex }) : super(key: key);
+  BasicPage({Key? key, this.canScroll = true, this.tabIndex}) : super(key: key);
 
   @protected
   Widget builder(BuildContext context);
@@ -60,7 +59,6 @@ abstract class BasicPage extends StatefulWidget {
 }
 
 class _BasicPageState extends State<BasicPage> {
-
   @override
   void initState() {
     super.initState();
@@ -106,8 +104,9 @@ class _BasicPageState extends State<BasicPage> {
       body: SafeArea(
         child: _buildChild(context),
       ),
-      bottomNavigationBar: widget.tabIndex == null ? null : BottomBar(list: BarList, current: widget.tabIndex!),
+      bottomNavigationBar: widget.tabIndex == null
+          ? null
+          : BottomBar(list: BarList, current: widget.tabIndex!),
     );
   }
 }
-

lib/widgets/layout/barList.dart

@@ -1,4 +1,3 @@
-
 import 'package:flutter/cupertino.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 
@@ -8,25 +7,49 @@ final BarList = <BarItem>[
   BarItem(
     label: '首页',
     page: '/',
-    normal: Item (color: const Color(0xFF323232), fontSize: 15.sp, image: 'images/index/HomesOFFImgaes.png'),
-    selected: Item (color: const Color(0xFFFF703B), fontSize: 15.sp, image: 'images/index/HomesNOImgaes.png'),
+    normal: Item(
+        color: const Color(0xFF323232),
+        fontSize: 15.sp,
+        image: 'images/index/HomesOFFImgaes.png'),
+    selected: Item(
+        color: const Color(0xFFFF703B),
+        fontSize: 15.sp,
+        image: 'images/index/HomesNOImgaes.png'),
   ),
   BarItem(
     label: '订单',
     page: '/order',
-    normal: Item (color: const Color(0xFF323232), fontSize: 15.sp, image: 'images/index/OrdersOFFImgaes.png'),
-    selected: Item (color: const Color(0xFFFF703B), fontSize: 15.sp, image: 'images/index/OrdersNOImgaes.png'),
+    normal: Item(
+        color: const Color(0xFF323232),
+        fontSize: 15.sp,
+        image: 'images/index/OrdersOFFImgaes.png'),
+    selected: Item(
+        color: const Color(0xFFFF703B),
+        fontSize: 15.sp,
+        image: 'images/index/OrdersNOImgaes.png'),
   ),
   BarItem(
     label: '资讯',
     page: '/infomation',
-    normal: Item (color: const Color(0xFF323232), fontSize: 15.sp, image: 'images/index/newsOFFImages.png'),
-    selected: Item (color: const Color(0xFFFF703B), fontSize: 15.sp, image: 'images/index/newsONImages.png'),
+    normal: Item(
+        color: const Color(0xFF323232),
+        fontSize: 15.sp,
+        image: 'images/index/newsOFFImages.png'),
+    selected: Item(
+        color: const Color(0xFFFF703B),
+        fontSize: 15.sp,
+        image: 'images/index/newsONImages.png'),
   ),
   BarItem(
     label: '我的',
     page: '/main',
-    normal: Item (color: const Color(0xFF323232), fontSize: 15.sp, image: 'images/index/MineOFFImgaes.png'),
-    selected: Item (color: const Color(0xFFFF703B), fontSize: 15.sp, image: 'images/index/MineNOImgaes.png'),
+    normal: Item(
+        color: const Color(0xFF323232),
+        fontSize: 15.sp,
+        image: 'images/index/MineOFFImgaes.png'),
+    selected: Item(
+        color: const Color(0xFFFF703B),
+        fontSize: 15.sp,
+        image: 'images/index/MineNOImgaes.png'),
   ),
 ];

lib/widgets/layout/bottomBar/BottomBar.dart

@@ -1,16 +1,14 @@
-
 import 'package:farmer_client/widgets/layout/bottomBar/item.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 
-
 class BottomBarItem extends StatelessWidget {
-
   final bool selected;
   final BarItem data;
 
-  BottomBarItem({Key? key, required this.selected, required this.data }) : super(key: key);
+  BottomBarItem({Key? key, required this.selected, required this.data})
+      : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -18,7 +16,8 @@ class BottomBarItem extends StatelessWidget {
     final color = selected ? data.selected.color : data.normal.color;
     final fontSize = selected ? data.selected.fontSize : data.normal.fontSize;
 
-    final textStyle = TextStyle(color: color, fontSize: fontSize, fontWeight: FontWeight.bold);
+    final textStyle = TextStyle(
+        color: color, fontSize: fontSize, fontWeight: FontWeight.bold);
 
     return GestureDetector(
       onTap: () {
@@ -45,11 +44,11 @@ class BottomBarItem extends StatelessWidget {
 }
 
 class BottomBar extends StatelessWidget {
-
   final int current;
   List<BarItem> list;
 
-  BottomBar({ Key? key , required this.list, required this.current }) : super(key: key);
+  BottomBar({Key? key, required this.list, required this.current})
+      : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -74,8 +73,8 @@ class BottomBar extends StatelessWidget {
               int index = list.indexOf(item);
 
               return Expanded(
-                  flex: 1,
-                  child: BottomBarItem(data: item, selected: current == index ),
+                flex: 1,
+                child: BottomBarItem(data: item, selected: current == index),
               );
             })
           ],
@@ -83,5 +82,4 @@ class BottomBar extends StatelessWidget {
       ),
     );
   }
-
 }

lib/widgets/layout/bottomBar/item.dart

@@ -1,4 +1,3 @@
-
 import 'dart:ui';
 
 class Item {
@@ -6,7 +5,7 @@ class Item {
   Color color;
   String image;
 
-  Item({ required this.fontSize, required this.color, required this.image });
+  Item({required this.fontSize, required this.color, required this.image});
 }
 
 class BarItem {
@@ -15,5 +14,9 @@ class BarItem {
   Item normal;
   Item selected;
 
-  BarItem ({ required this.label, required this.page, required this.normal, required this.selected });
+  BarItem(
+      {required this.label,
+      required this.page,
+      required this.normal,
+      required this.selected});
 }

lib/widgets/layout/widgets/index.dart

@@ -0,0 +1 @@
+

pubspec.lock

@@ -181,6 +181,13 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_easyloading:
+    dependency: "direct main"
+    description:
+      name: flutter_easyloading
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.0.3"
   flutter_lints:
     dependency: "direct dev"
     description:
@@ -207,6 +214,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "5.4.0+1"
+  flutter_spinkit:
+    dependency: transitive
+    description:
+      name: flutter_spinkit
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "5.1.0"
   flutter_test:
     dependency: "direct dev"
     description: flutter

pubspec.yaml

@@ -50,6 +50,7 @@ dependencies:
   carousel_slider: ^4.0.0
   permission_handler: ^9.2.0
   ff_stars: ^1.0.0
+  flutter_easyloading: ^3.0.3
 
 #  flutter_bmflocation: ^3.1.0+1