'.'

lib/models/app.dart

@@ -1,12 +1,12 @@
 import 'dart:convert';
 import 'dart:io';
 import 'package:amap_flutter_location/amap_flutter_location.dart';
+import 'package:get/get.dart';
 import 'package:get_storage/get_storage.dart';
 import 'package:worker_client/services/amap.dart';
 import 'package:worker_client/services/user.dart';
-import '/models/entities/person.dart';
+import 'entities/person.dart';
 import '/widgets/Modal.dart';
-import 'package:get/get.dart';
 import '../utils/location.dart';
 
 class AppController extends GetxController {
@@ -29,9 +29,9 @@ class AppController extends GetxController {
   }
 
   void onLocationChange(Map<String, Object> result) {
-    if (box.read('token') == null){
+    if (box.read('token') == null) {
       location(result);
-    }else if(result['address']==null ){
+    } else if (result['address'] == '') {
       setAmap({
         //定位有问题
         // 'params': 'location=${result['longitude'].toString()},${result['latitude'].toString()}',

lib/pages/addBankCard/index.dart

@@ -89,7 +89,9 @@ class AddBankPage extends BasicPage {
         });
         bankList(list);
       },
-    );
+    ).catchError((error){
+      Fluttertoast.showToast(msg: error.error['message']);
+    });
   }
 
   @override

lib/pages/bankList/index.dart

@@ -55,7 +55,13 @@ class BankListPages extends BasicPage {
           }
           bankCardListStore.bankCardList(list1);
           EasyLoading.dismiss();
+        }).catchError((error){
+          EasyLoading.dismiss();
+          Fluttertoast.showToast(msg: error.error['message']);
         });
+      }).catchError((error2){
+        EasyLoading.dismiss();
+        Fluttertoast.showToast(msg: error2.error['message']);
       });
     }
   }

lib/pages/jobDetail/index.dart

@@ -1,5 +1,6 @@
 import 'dart:convert';
 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';
@@ -67,7 +68,7 @@ class JobDetail extends BasicPage {
 
   Widget endContent() {
     return Container(
-        margin: EdgeInsets.fromLTRB(15.w, 0, 15.w, 0),
+        margin: EdgeInsets.fromLTRB(15.w, 0, 15.w, 25.h),
         padding: EdgeInsets.symmetric(vertical: 18.h, horizontal: 15.w),
         decoration: BoxDecoration(
             border: Border.all(
@@ -102,7 +103,8 @@ class JobDetail extends BasicPage {
               ),
             )
           ],
-        ));
+        )
+    );
   }
 
   void changeJob(Job item) {
@@ -110,26 +112,38 @@ class JobDetail extends BasicPage {
       modal.showDialog(
           content: startContent(),
           onConfirm: () {
-            startJob(item.jobId.toString(), {'mode': true})
-                .then((value) => getJob());
+            EasyLoading.show(status: '请稍后');
+            startJob(item.jobId.toString(), {'mode': true}).then((value) {
+              getJob();
+              EasyLoading.dismiss();
+            }).catchError((error) {
+              Fluttertoast.showToast(msg: error.error['message']);
+              EasyLoading.dismiss();
+            });
           });
     } else {
       modal.showDialog(
-          content: endContent(),
-          onConfirm: () {
-            if (area.value == '') {
-              Fluttertoast.showToast(msg: '请输入正确的面积整数或最多两位小数');
-              return false;
-            } else {
-              overJob(item.jobId.toString(), {
-                ...item.toJson(),
-                'area': area.value.toString()
-              }).then((value) {
-                getJob();
-                Fluttertoast.showToast(msg: '恭喜完成作业');
-              });
-            }
-          },);
+        content: endContent(),
+        onConfirm: () {
+          if (area.value == '') {
+            Fluttertoast.showToast(msg: '请输入正确的面积整数或最多两位小数');
+            return false;
+          } else {
+            EasyLoading.show(status: '请稍后');
+            overJob(item.jobId.toString(), {
+              ...item.toJson(),
+              'area': area.value.toString()
+            }).then((value) {
+              getJob();
+              EasyLoading.dismiss();
+              Fluttertoast.showToast(msg: '恭喜完成作业');
+            }).catchError((error) {
+              Fluttertoast.showToast(msg: error.error['message']);
+              EasyLoading.dismiss();
+            });
+          }
+        },
+      );
     }
   }
 

lib/pages/machineryDetail/index.dart

@@ -1,10 +1,13 @@
 import 'package:carousel_slider/carousel_slider.dart';
+import 'package:fluttertoast/fluttertoast.dart';
+import 'package:get/get.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:worker_client/models/entities/Machinery.dart';
 import 'package:worker_client/services/machinery.dart';
 import 'package:worker_client/widgets/Jianbian/index.dart';
+import 'package:worker_client/widgets/NullCard.dart';
 import 'package:worker_client/widgets/layout/BasicPage.dart';
 
 class MachineryDetail extends BasicPage {
@@ -14,13 +17,17 @@ class MachineryDetail extends BasicPage {
   final machinery = Rx<Machinery>(Machinery());
   @override
   void beforeShow() {
-    // TODO: implement beforeShow
     super.beforeShow();
     if (Get.arguments != null) {
-      getMachineryDetail(Get.arguments['id'], {
-        'attached': true,
-        'location': '118.84002,31.95266'
-      }).then((res) => {machinery(Machinery.fromJson(res))});
+      EasyLoading.show(status: '数据加载中...');
+      getMachineryDetail(Get.arguments['id'],
+          {'attached': true, 'location': '118.84002,31.95266'}).then((res) {
+        machinery(Machinery.fromJson(res));
+        EasyLoading.dismiss();
+      }).catchError((error){
+        EasyLoading.dismiss();
+        Fluttertoast.showToast(msg: error.error['message']);
+      });
     }
   }
 
@@ -117,11 +124,13 @@ class MachineryDetail extends BasicPage {
                               ],
                             ),
                           ),
-                          Container(
-                            margin: EdgeInsets.only(left: 15.w, right: 15.w),
-                            child: Column(
-                              children: machinery.value.contentList != null
-                                  ? machinery.value.contentList!.map((e) {
+                          machinery.value.contentList!.isNotEmpty
+                              ? Container(
+                                  margin:
+                                      EdgeInsets.only(left: 15.w, right: 15.w),
+                                  child: Column(
+                                    children:
+                                        machinery.value.contentList!.map((e) {
                                       if (e.contentType == 'image') {
                                         return Image.network(
                                             e.content.toString(),
@@ -141,10 +150,10 @@ class MachineryDetail extends BasicPage {
                                           ),
                                         );
                                       }
-                                    }).toList()
-                                  : [],
-                            ),
-                          )
+                                    }).toList(),
+                                  ),
+                                )
+                              : const NullCard(text: '该农机暂未添加详情'),
                         ],
                       )),
                 ],

lib/pages/machineryList/index.dart

@@ -1,5 +1,7 @@
 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';
 import 'package:worker_client/models/app.dart';
 import 'package:worker_client/models/entities/Machinery.dart';
@@ -14,10 +16,15 @@ class MachineryList extends BasicPage {
   @override
   void beforeShow() {
     super.beforeShow();
+    EasyLoading.show(status: '数据加载中...');
     getMachineryList({'pageNum': 1, 'location': location}).then((res) {
       dynamic list = <Machinery>[];
       res['records'].forEach((item) => {list.add(Machinery.fromJson(item))});
       machineryList(list);
+      EasyLoading.dismiss();
+    }).catchError((error) {
+      EasyLoading.dismiss();
+      Fluttertoast.showToast(msg: error.error['message']);
     });
   }
 

lib/pages/machineryMap/index.dart

@@ -1,6 +1,8 @@
 import 'dart:convert';
 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';
 import 'package:worker_client/models/app.dart';
 import 'package:worker_client/models/entities/Machinery.dart';
@@ -35,39 +37,49 @@ class MachineryMap extends BasicPage {
   void beforeShow() {
     super.beforeShow();
     if (Get.arguments != null) {
+      EasyLoading.show(status: '数据加载中...');
       getMachineryDetail(Get.arguments['id'], {
         'attached': true,
         //查询农机详情时需要把当前定位传到服务端
         'location': '118.84002,31.95266'
-      }).then((res) => {
-            getMachineryList({'pageSize': 500, 'location': location})
-                .then((value) {
-              dynamic list = <Machinery>[];
-              int index;
-              Machinery data = Machinery.fromJson(res);
-              List area = [];
-              value['records'].forEach((item) {
-                index = value['records'].indexOf(item);
-                item['location'] = locList[index % 10];
-                list.add(Machinery.fromJson(item));
-                if (data.machineryId == item['machineryId']) {
-                  data.location = item['location'];
-                  area = item['location'].toString().split(',');
-                  setAmap({
-                    'params': 'location=${area[1]},${area[0]}',
-                    'path': '/v3/geocode/regeo'
-                  }).then((value) {
-                    //json字符串转Map对象
-                    data.address =
-                        jsonDecode(value)['regeocode']['formatted_address'];
-                    machinery(data);
-                    current(data);
+      })
+          .then((res) => {
+                getMachineryList({'pageSize': 500, 'location': location})
+                    .then((value) {
+                  dynamic list = <Machinery>[];
+                  int index;
+                  Machinery data = Machinery.fromJson(res);
+                  List area = [];
+                  value['records'].forEach((item) {
+                    index = value['records'].indexOf(item);
+                    item['location'] = locList[index % 10];
+                    list.add(Machinery.fromJson(item));
+                    if (data.machineryId == item['machineryId']) {
+                      data.location = item['location'];
+                      area = item['location'].toString().split(',');
+                      setAmap({
+                        'params': 'location=${area[1]},${area[0]}',
+                        'path': '/v3/geocode/regeo'
+                      }).then((value) {
+                        //json字符串转Map对象
+                        data.address =
+                            jsonDecode(value)['regeocode']['formatted_address'];
+                        machinery(data);
+                        current(data);
+                      });
+                    }
                   });
-                }
-              });
-              machineryList(list);
-            }),
-          });
+                  machineryList(list);
+                  EasyLoading.dismiss();
+                }).catchError((error) {
+                  EasyLoading.dismiss();
+                  Fluttertoast.showToast(msg: error.error['message']);
+                }),
+              })
+          .catchError((error2) {
+        EasyLoading.dismiss();
+        Fluttertoast.showToast(msg: error2.error['message']);
+      });
     }
   }
 
@@ -100,7 +112,7 @@ class MachineryMap extends BasicPage {
   }
 
   void onCancel() {
-    if (!visible.value) {
+    if (visible.value) {
       visible(false);
     }
   }

lib/pages/userInfo/index.dart

@@ -1,4 +1,5 @@
 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';
@@ -9,7 +10,10 @@ import 'package:worker_client/widgets/MyButton/index.dart';
 import 'package:worker_client/widgets/layout/BasicPage.dart';
 
 class UserInfo extends BasicPage {
-  UserInfo({Key? key}) : super(key: key);
+  UserInfo({Key? key}) : super(key: key){
+    naviTitle = '个人信息';
+    isPop = true;
+  }
 
   AppController store = AppController.t;
   late String name;
@@ -19,7 +23,6 @@ class UserInfo extends BasicPage {
 
   @override
   void beforeShow() {
-    // TODO: implement beforeShow
     super.beforeShow();
     _cName = TextEditingController(text: store.user().nickName.toString());
     _cPhone = TextEditingController(text: store.user().phone.toString());
@@ -37,6 +40,7 @@ class UserInfo extends BasicPage {
       Fluttertoast.showToast(msg: '请输入正确的手机号');
       return;
     } else {
+      EasyLoading.show(status: '保存中', maskType: EasyLoadingMaskType.black);
       updateInfo(store.user().personId.toString(), {
         ...store.user().toJson(),
         'nickName': name,
@@ -44,15 +48,17 @@ class UserInfo extends BasicPage {
       }).then((value) {
         Fluttertoast.showToast(msg: '修改成功');
         store.user(Person.fromJson(value));
+        EasyLoading.dismiss();
         Get.offAllNamed('/main');
+      }).catchError((error) {
+        EasyLoading.dismiss();
+        Fluttertoast.showToast(msg: error.error['message']);
       });
     }
   }
 
   @override
   Widget builder(BuildContext context) {
-    naviTitle = '个人信息';
-    isPop = true;
     return Container(
       padding: EdgeInsets.all(15.w),
       decoration: const BoxDecoration(color: Colors.white),

lib/pages/withdrawal/index.dart

@@ -82,6 +82,8 @@ class MyWithdrawal extends BasicPage {
         });
         bankPickerListStore.bankPickerList(pickerList);
         bankCardListStore.bankCardList(list);
+      }).catchError((error){
+        Fluttertoast.showToast(msg: error.error['message']);
       });
     }
   }

lib/services/account.dart

@@ -6,10 +6,7 @@ import 'package:fluttertoast/fluttertoast.dart';
 /// @param {*} data
 /// @returns
 Future getAccount() async {
-  return request('/account/mine',
-      options: Options(method: 'GET'))
-      .catchError((error) =>
-  {Fluttertoast.showToast(msg: error.error.toString()), print(error)});
+  return request('/account/mine', options: Options(method: 'GET'));
 }
 
 /// 我的流水
@@ -17,7 +14,5 @@ Future getAccount() async {
 /// @returns
 Future getLogList(params) async {
   return request('/account-log',
-      options: Options(method: 'GET'), queryParameters: params)
-      .catchError((error) =>
-  {Fluttertoast.showToast(msg: error.error.toString()), print(error)});
-}
+      options: Options(method: 'GET'), queryParameters: params);
+}

lib/services/bank.dart

@@ -7,27 +7,25 @@ import 'package:fluttertoast/fluttertoast.dart';
 /// @returns
 Future getBankList(params) async {
   return request('/bank',
-      options: Options(method: 'GET'), queryParameters: params)
-      .catchError((error) =>
-  {Fluttertoast.showToast(msg: error.error.toString()), print(error)});
+      options: Options(method: 'GET'), queryParameters: params);
 }
+
 /// 银行卡列表
 /// @param {*} data
 /// @returns
 Future getBankCardList(params) async {
   return request('/bankcard',
-      options: Options(method: 'GET'), queryParameters: params)
-      .catchError((error) =>
-  {Fluttertoast.showToast(msg: error.error.toString()), print(error)});
+      options: Options(method: 'GET'), queryParameters: params);
 }
+
 /// 银行卡详情
 /// @param {*} data
 /// @returns
 Future getBankCardDetail(String id) async {
   return request('/bankcard/$id', options: Options(method: 'GET'))
       .catchError((error) => {
-    Fluttertoast.showToast(msg: error.error['message']),
-  });
+            Fluttertoast.showToast(msg: error.error['message']),
+          });
 }
 
 /// 添加银行卡
@@ -39,19 +37,18 @@ Future addBankCard(data) async {
     options: Options(method: 'POST'),
     data: data,
   ).catchError((error) => {
-    Fluttertoast.showToast(msg: error.error['message']),
-  });
+        Fluttertoast.showToast(msg: error.error['message']),
+      });
 }
 
 /// 解绑银行卡
 /// @param {*}
 /// @returns
 Future unbindBankCard(String id) async {
-  return request('/bankcard/$id/pause',
-      options: Options(method: 'DELETE'))
+  return request('/bankcard/$id/pause', options: Options(method: 'DELETE'))
       .catchError((error) => {
-    Fluttertoast.showToast(msg: error.error['message']),
-  });
+            Fluttertoast.showToast(msg: error.error['message']),
+          });
 }
 
 /// 添加银行卡

lib/services/job.dart

@@ -29,18 +29,12 @@ Future getJobDetail(String id) async {
  */
 Future startJob(String id, params) async {
   return request('/work-job/$id/pause',
-          options: Options(method: 'PUT'), queryParameters: params)
-      .catchError((error) => {
-            Fluttertoast.showToast(msg: error.error['message']),
-          });
+          options: Options(method: 'PUT'), queryParameters: params);
 }
 /// 开始作业
 /// @param {*}
 /// @returns
 Future overJob(String id, data) async {
   return request('/work-job/$id/stop',
-      options: Options(method: 'PUT'), data: data)
-      .catchError((error) => {
-    Fluttertoast.showToast(msg: error.error['message']),
-  });
+      options: Options(method: 'PUT'), data: data);
 }

lib/services/machinery.dart

@@ -7,9 +7,7 @@ import 'package:fluttertoast/fluttertoast.dart';
 /// @returns
 Future getMachineryList(params) async {
   return request('/machinery',
-          options: Options(method: 'GET'), queryParameters: params)
-      .catchError((error) =>
-          {Fluttertoast.showToast(msg: error.error.toString()), print(error)});
+      options: Options(method: 'GET'), queryParameters: params);
 }
 
 /// 农机详情
@@ -17,8 +15,5 @@ Future getMachineryList(params) async {
 /// @returns
 Future getMachineryDetail(String id, params) async {
   return request('/machinery-summary/$id',
-          options: Options(method: 'GET'), queryParameters: params)
-      .catchError((error) => {
-            Fluttertoast.showToast(msg: error.error['message']),
-          });
+      options: Options(method: 'GET'), queryParameters: params);
 }

lib/services/user.dart

@@ -31,8 +31,5 @@ Future getCurrent() async {
  */
 
 Future updateInfo(String id, Map data) async {
-  return request('/person/${id}', options: Options(method: 'PUT'), data: data)
-      .catchError((error) => {
-            Fluttertoast.showToast(msg: error.error['message']),
-          });
+  return request('/person/${id}', options: Options(method: 'PUT'), data: data);
 }