feats

lib/pages/userInfo/index.dart

@@ -51,12 +51,13 @@ class UserInfo extends BasicPage {
         EasyLoading.show(status: '数据加载中...');
 
         getCurrent().then((person) {
+          EasyLoading.dismiss();
           userInfo.user(Person.fromJson(person));
           Fluttertoast.showToast(msg: '保存成功');
-          EasyLoading.dismiss();
 
           Get.offAllNamed('/main');
         }).catchError((e) {
+          EasyLoading.dismiss();
           EasyLoading.showError('出错啦！');
           print(e);
         });

lib/services/address.dart

@@ -1,7 +1,7 @@
 import 'package:dio/dio.dart';
 import 'package:farmer_client/utils/Request.dart';
-import 'package:fluttertoast/fluttertoast.dart';
 
+import 'showError.dart';
 /**
  * 地址列表
  * @param {*} data
@@ -19,9 +19,7 @@ Future getAddress() async {
 Future addressSave(String address) async {
   return request('/address',
           options: Options(method: 'POST'), data: {'address': address})
-      .catchError((error) => {
-            Fluttertoast.showToast(msg: error.error['message']),
-          });
+      .catchError(showError);
 }
 
 /**
@@ -31,9 +29,7 @@ Future addressSave(String address) async {
  */
 Future addressDelete(String id) async {
   return request('/address/$id', options: Options(method: 'DELETE'))
-      .catchError((error) => {
-            Fluttertoast.showToast(msg: error.error['message']),
-          });
+      .catchError(showError);
 }
 
 /**
@@ -44,9 +40,7 @@ Future addressDelete(String id) async {
 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']),
-          });
+      .catchError(showError);
 }
 
 /**
@@ -56,7 +50,5 @@ Future addressUpdate(String id, String address) async {
  */
 Future addressDefault(String id) async {
   return request('/address/$id/default', options: Options(method: 'PUT'))
-      .catchError((error) => {
-            Fluttertoast.showToast(msg: error.error['message']),
-          });
+      .catchError(showError);
 }

lib/services/homeAPI.dart

@@ -1,7 +1,7 @@
 import 'package:dio/dio.dart';
 import 'package:farmer_client/utils/Request.dart';
-import 'package:fluttertoast/fluttertoast.dart';
 
+import 'showError.dart';
 /**
  * banner轮播图
  * @param {*} data
@@ -11,9 +11,7 @@ import 'package:fluttertoast/fluttertoast.dart';
 Future getHomeBanner(String position) async {
   return request('/banner',
           options: Options(method: 'GET'), data: {'position': position})
-      .catchError((error) => {
-            Fluttertoast.showToast(msg: error.error['message']),
-          });
+      .catchError(showError);
 }
 
 /**
@@ -24,9 +22,7 @@ Future getHomeBanner(String position) async {
 Future getMachinery(params) async {
   return request('/machinery',
           options: Options(method: 'GET'), queryParameters: params)
-      .catchError((error) => {
-            Fluttertoast.showToast(msg: error.error['message']),
-          });
+      .catchError(showError);
 }
 
 /**
@@ -39,9 +35,7 @@ Future searchMachinery(params) async {
           options: Options(method: 'GET'),
           queryParameters: params,
           data: params)
-      .catchError((error) => {
-            Fluttertoast.showToast(msg: error.error['message']),
-          });
+      .catchError(showError);
 }
 
 /**
@@ -62,9 +56,7 @@ Future typeMachinery(
       data: {
         'typeId': typeId,
         'location': location
-      }).catchError((error) => {
-        Fluttertoast.showToast(msg: error.error['message']),
-      });
+      }).catchError(showError);
 }
 
 /**

lib/services/main.dart

@@ -1,7 +1,7 @@
 import 'package:dio/dio.dart';
 import 'package:farmer_client/utils/Request.dart';
-import 'package:fluttertoast/fluttertoast.dart';
 
+import 'showError.dart';
 /**
  * 意见反馈
  * @param {*} data
@@ -11,7 +11,5 @@ import 'package:fluttertoast/fluttertoast.dart';
 Future feedback(String content) async {
   return request('/feedback',
           options: Options(method: 'POST'), data: {'content': content})
-      .catchError((error) => {
-            Fluttertoast.showToast(msg: error.error['message']),
-          });
+      .catchError(showError);
 }

lib/services/news.dart

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

lib/services/orderAPI.dart

@@ -1,7 +1,7 @@
 import 'package:dio/dio.dart';
 import 'package:farmer_client/utils/Request.dart';
-import 'package:fluttertoast/fluttertoast.dart';
 
+import 'showError.dart';
 /**
  * 订单列表
  * @param {*} data
@@ -10,9 +10,7 @@ import 'package:fluttertoast/fluttertoast.dart';
 Future getOrderList(params) async {
   return request('/order',
           options: Options(method: 'GET'), queryParameters: params)
-      .catchError((error) => {
-            Fluttertoast.showToast(msg: error.error['message']),
-          });
+      .catchError(showError);
 }
 
 /**
@@ -24,9 +22,7 @@ Future orderInfo(String id) async {
   return request(
     '/order/$id',
     options: Options(method: 'GET'),
-  ).catchError((error) => {
-        Fluttertoast.showToast(msg: error.error['message']),
-      });
+  ).catchError(showError);
 }
 
 /**
@@ -37,9 +33,7 @@ Future orderInfo(String id) async {
 
 Future generateOrder(item) async {
   return request('/order', options: Options(method: 'POST'), data: item)
-      .catchError((error) => {
-            Fluttertoast.showToast(msg: error.error['message']),
-          });
+      .catchError(showError);
 }
 
 /**
@@ -49,9 +43,7 @@ Future generateOrder(item) async {
  */
 Future orderDelete(String id) async {
   return request('/order/$id', options: Options(method: 'DELETE'))
-      .catchError((error) => {
-            Fluttertoast.showToast(msg: error.error['message']),
-          });
+      .catchError(showError);
 }
 
 /**
@@ -61,9 +53,7 @@ Future orderDelete(String id) async {
  */
 Future orderRefund(String id) async {
   return request('/order/$id/refund', options: Options(method: 'PUT'))
-      .catchError((error) => {
-            Fluttertoast.showToast(msg: error.error['message']),
-          });
+      .catchError(showError);
 }
 
 /**
@@ -76,7 +66,5 @@ 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']),
-          });
+      .catchError(showError);
 }

lib/services/pay.dart

@@ -1,6 +1,5 @@
 import 'package:dio/dio.dart';
 import 'package:farmer_client/utils/Request.dart';
-import 'package:fluttertoast/fluttertoast.dart';
 
 /**
  * 支付

lib/services/showError.dart

@@ -0,0 +1,10 @@
+
+import 'package:flutter_easyloading/flutter_easyloading.dart';
+import 'package:fluttertoast/fluttertoast.dart';
+
+void showError(error) {
+  var err = error.error;
+  var msg = err is Map ? err['message'] : err;
+  EasyLoading.dismiss();
+  Fluttertoast.showToast(msg: msg);
+}

lib/services/user.dart

@@ -2,14 +2,14 @@ import 'package:dio/dio.dart';
 import 'package:farmer_client/utils/Request.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 
+import 'showError.dart';
+
 Future getSMSCaptch(String phone) async {
   return request('/sms-captcha',
       options: Options(method: 'POST'),
       queryParameters: {'phone': phone}).then((value) {
     Fluttertoast.showToast(msg: '验证码发送成功！');
-  }).catchError((error) {
-    Fluttertoast.showToast(msg: error.error['message']);
-  });
+  }).catchError(showError);
 }
 
 //登录
@@ -18,9 +18,7 @@ Future userLogin(String userName, String password) async {
     '/login',
     options: Options(method: 'POST'),
     data: {'userName': userName, 'password': password},
-  ).catchError((error) => {
-        Fluttertoast.showToast(msg: error['message']),
-      });
+  ).catchError(showError);
 }
 
 Future getCurrent() async {
@@ -34,7 +32,5 @@ Future getCurrent() async {
  */
 Future updateInfo(String id, userdata) async {
   return request('/person/$id', options: Options(method: 'PUT'), data: userdata)
-      .catchError((error) => {
-            Fluttertoast.showToast(msg: error.error['message']),
-          });
+      .catchError(showError);
 }