aasd

lib/services/homeAPI.dart

@@ -7,6 +7,7 @@ import 'package:fluttertoast/fluttertoast.dart';
  * @param {*} data
  * @returns
  */
+
 Future getHomeBanner(String position) async {
   return request('/banner',
           options: Options(method: 'GET'), data: {'position': position})
@@ -33,25 +34,17 @@ Future getMachinery(String location) async {
  * @param {*} data
  * @returns
  */
-<<<<<<< HEAD
-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) =>
+
+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',
-          options: Options(method: 'GET'),
-          queryParameters: {'id': id},
-          data: {'location': location, 'attached': attached})
-      .catchError((error) => {
-            Fluttertoast.showToast(msg: error.error['message']),
-          });
->>>>>>> 40e1cb063352fdbd66774cfedb970a9d87bd4315
 }
 
+
 /**
  * 农机分类Tab列查询
  * @param {*} data