oderf

lib/pages/home/index.dart

@@ -1,11 +1,9 @@
 import 'package:farmer_client/widgets/Modal.dart' as modal;
 import 'package:farmer_client/widgets/layout/BasicPage.dart';
 import 'package:flutter/material.dart';
-import 'package:get/get.dart';
 import '../../utils/timer.dart';
 import './widgets/home/index.dart';
 
-
 class Home extends BasicPage {
   Home({Key? key}) : super(key: key) {
     tabIndex = 0;
@@ -14,7 +12,6 @@ class Home extends BasicPage {
 
   @override
   Widget builder(BuildContext context) {
-
     setTimeout(() {
       // showDialog(context: Get.overlayContext!, builder: (BuildContext c) {
       //   return Modal(type: 'dialog', title: '测试', message: '这是一段 message ！', onConfirm: () => print('hahahaha'),);
@@ -22,7 +19,7 @@ class Home extends BasicPage {
       // Get.dialog(Modal(type: 'dialog', title: '测试', message: '这是一段 message ！', onConfirm: () => print('hahahaha'),));
       // modal.showDialog(title: '测试', content: SizedBox(width: 400, height: 300,), onConfirm: () => false);
     }, 2000);
-    
+
     return const HomePage();
   }
 }

lib/services/homeAPI.dart

@@ -1,63 +1,62 @@
-
-
 import 'package:dio/dio.dart';
 import 'package:farmer_client/utils/Request.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 
-
-
 /**
  * banner轮播图
  * @param {*} data
  * @returns
  */
-Future getHomeBanner(String position)async{
-  return request('/banner',options: Options(method: 'GET'),data: { 'position': position}).catchError((error) =>
-  { Fluttertoast.showToast(
-      msg: error.error['message']
-  ),});
-  
+Future getHomeBanner(String position) async {
+  return request('/banner',
+          options: Options(method: 'GET'), data: {'position': position})
+      .catchError((error) => {
+            Fluttertoast.showToast(msg: error.error['message']),
+          });
 }
 
-
-
 /**
  * 农机列表
  * @param {*} data
  * @returns
  */
-Future getMachinery(String location)async{
-  return request('/machinery',options: Options(method: 'GET'),queryParameters: { 'location': location}).catchError((error) =>
-  { Fluttertoast.showToast(
-      msg: error.error['message']
-  ),});
-
+Future getMachinery(String location) async {
+  return request('/machinery', options: Options(method: 'GET'), queryParameters: {
+    'location': location
+  }).catchError((error) => {
+        Fluttertoast.showToast(msg: error.error['message']),
+      });
 }
 
-
-
 /**
  * 农机详情
  * @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) =>
   { 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
  * @returns
  */
-Future getMachineryType()async{
-  return request('/machinery-type',options: Options(method: 'GET'));
+Future getMachineryType() async {
+  return request('/machinery-type', options: Options(method: 'GET'));
 }
-
-
-

lib/utils/Request.dart

@@ -37,7 +37,7 @@ Dio createRequest() {
   var dio = Dio(options);
   dio.interceptors.add(InterceptorsWrapper(onRequest: (options, handler) {
     // Do something before request is sent
-    options.headers['Authorization'] =  GetStorage().read("token");
+    options.headers['Authorization'] = GetStorage().read("token");
     return handler.next(options); //continue
     // If you want to resolve the request with some custom data，
     // you can resolve a `Response` object eg: `handler.resolve(response)`.
@@ -59,7 +59,10 @@ Dio createRequest() {
 
       return handler.next(response);
     } else {
-      DioError error = DioError(requestOptions: response.requestOptions, error: response.data, response: response);
+      DioError error = DioError(
+          requestOptions: response.requestOptions,
+          error: response.data,
+          response: response);
       return handler.reject(error);
     }
   }, onError: (DioError e, handler) {
@@ -81,7 +84,6 @@ Future request(String path,
     Options? options,
     ProgressCallback? onSendProgress,
     ProgressCallback? onReceiveProgress}) async {
-
   var resp = await instance.request(path,
       data: data,
       queryParameters: queryParameters,