'.'\

android/app/build.gradle

     }
 
     dependencies {
-//        implementation fileTree(dir: 'libs', include: ['*.jar'])
-//        implementation('com.amap.api:map2d:6.0.0')
-//        implementation('com.amap.api:search:9.2.0')
-//        implementation('com.amap.api:location:6.1.0')
+//        implementation 'com.google.android.material:material:1.5.0'
         implementation('com.amap.api:3dmap:9.1.0')
     }
 

android/app/src/main/AndroidManifest.xml

     <!--允许读设备等信息，用于问题排查-->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
    <application
-        android:label="farmer_client"
+        android:label="农忙助手"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
         <activity

android/app/src/main/res/drawable/launch_background.xml

 <!-- Modify this file to customize your launch splash screen -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:drawable="@android:color/white" />
-
     <!-- You can insert your own image images here -->
-    <!-- <item>
-        <bitmap
-            android:gravity="center"
-            android:src="@mipmap/launch_image" />
-    </item> -->
+<!--    <item>-->
+<!--        <bitmap-->
+<!--            android:gravity="fill"-->
+<!--            android:src="@drawable/launch_image" />-->
+<!--    </item>-->
 </layer-list>

android/app/src/main/res/values/styles.xml

     <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <!-- Show a splash screen on the activity. Automatically removed when
              Flutter draws its first frame -->
-        <item name="android:windowBackground">@drawable/launch_background</item>
+<!--        <item name="android:windowBackground">@drawable/launch_image</item>-->
+        <item name="android:windowBackground">@drawable/launch_image</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your
          This Theme is only used starting with V2 of Flutter's Android embedding. -->
     <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <item name="android:windowBackground">?android:colorBackground</item>
+<!--        <item name="android:windowBackground">@drawable/launch_background</item>-->
     </style>
 </resources>

lib/main.dart

             Locale('en', ''),
           ],
           theme: getTheme(),
-          initialRoute: '/splash',
+          initialRoute: '/',
           defaultTransition: Transition.native,
           routingCallback: routingCallback,
           initialBinding: AppBindings(),

lib/models/app.dart

   final location = Rxn<LocationData>();
   final testInt = 1.obs;
 
-  // get locationStr {
-  //   if(location.value!.longitude==null){
-  //     return null;
-  //
-  //   }else{
-  //   return location.value!.longitude.toString() + "," + location.value!.latitude.toString();
-  //
-  //   }
-  // }
+  get locationStr {
+    if (null == location.value) return null;
+    return location.value!.longitude.toString() + "," + location.value!.latitude.toString();
+  }
 
   @override
   void onInit() {

lib/models/entities/banner.dart → lib/models/entities/Banners.dart

-class banner {
+class Banners {
   String? bannerId;
   String? title;
   String? thumb;
   num? sortNo;
   num? status;
   String? createDat;
-  banner();
+  Banners();
 
-  banner.fromJson(Map<String, dynamic> json)
+  Banners.fromJson(Map<String, dynamic> json)
       : bannerId = json["bannerId"],
         title = json["title"],
         thumb = json["thumb"],

lib/models/entities/CardInfo.dart

   int? status;
 
   // @ApiModelProperty(value = "内容详情")
-  late List<dynamic> contentList;
+  late List<dynamic>? contentList;
 
   // @ApiModelProperty(value = "图片列表")
-  late List<dynamic> imagesList;
+  late List<dynamic>? imagesList;
 
   CardInfo();
 

lib/pages/MoreCars/index.dart

                 Container(
                   child: Column(
                     children: [
-                      CarsCard(),
-                      CarsCard(),
-                      CarsCard(),
-                      CarsCard(),
+
                     ],
                   )
                   ,

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

 import 'package:get/get.dart';
 import 'package:get/get_core/src/get_main.dart';
 import '../../../../models/app.dart';
-import '../../../../models/entities/banner.dart';
+import '../../../../models/entities/CardInfo.dart';
 import '../../../../services/homeAPI.dart';
 import '../../../../widgets/CarsCard.dart';
-import 'package:farmer_client/models/app.dart';
+import 'package:farmer_client/models/entities/Banners.dart';
 import '../../../MoreCars/index.dart';
 
 class HomePage extends StatefulWidget {
-  const HomePage({Key? key}) : super(key: key);
+  const HomePage({Key? key, }) : super(key: key);
+
 
   @override
-  State<HomePage> createState() => _HomePageState();
+  _HomePageState createState() => _HomePageState();
 }
 
 
 class _HomePageState extends State<HomePage> {
   final CarouselController _controller = CarouselController();
-  List<banner> BannerList = [];
+  List<Banners> bannerList = [];
+
+  List<CardInfo> machineryLists = [];
+
+
+
 
   @override
   void initState() {
     super.initState();
-    final location = AppController.t.location;
-    print('location+$location');
+    // final location = AppController.t.location;
+    // print('location+$location');
 
     getHomeBanner('banner').then((value) {
       setState(() {
         value.forEach((item) {
-          BannerList.add(banner.fromJson(item));
+          bannerList.add(Banners.fromJson(item));
         });
       });
     });
 
-    // getMachinery(location.value!.longitude.toString()).then((value) {
-    //   print('$value');
-    // });
+    getMachinery('112.087433,32.687692').then((value) {
+      setState(() {
+        value['records'].forEach((item) {
+          machineryLists.add(CardInfo.fromJson(item));
+        });
+      });
+    });
   }
 
   @override
   Widget build(BuildContext context) {
+
     return Container(
       alignment: Alignment.center,
       padding: EdgeInsets.fromLTRB(15.w, 0, 15.w, 0),
           Container(
             margin: EdgeInsets.fromLTRB(0, 15, 0, 0),
             child:
-                // Text('asdasdas')
                 CarouselSlider(
-              items: BannerList.map((item) => Container(
+              items: bannerList.map((item) => Container(
                     child: Center(
                         child: Image.network(item.thumb.toString(),
                             fit: BoxFit.cover, width: 350.w)),
                       )
                     ],
                   ),
-                  CarsCard(),
-                  CarsCard(),
-                  CarsCard(),
+            Column(
+              children: machineryLists.map((item) =>CarsCard(item:item)).toList(),
+            )
+
+
+
                 ],
               )),
         ],

lib/pages/search/index.jsx.dart

               child: Column(
                 children: [
                   // NullCard(text: '暂无农机信息'),
-                  CarsCard(),
-                  CarsCard(),
-                  CarsCard(),
-                  CarsCard(),
                 ],
               ),
             )

lib/routes/middleWares.dart

 import 'package:get_storage/get_storage.dart';
 
 void routingCallback (routing) {
-  GetStorage box = GetStorage();
-  bool isLogin = box.hasData('token');
-  bool isSplashScreen = routing?.current == '/splash';
-  bool isLoginPage = routing?.current == '/login';
-  bool isAgreementPage = routing?.current == '/agreement';
-  if (!isLogin && !isSplashScreen && !isLoginPage&&!isAgreementPage) {
-    // addPostFrameCallback 作用是等当前帧绘制完成之后再加载
-    // https://github.com/jonataslaw/getx/issues/262
-    SchedulerBinding.instance?.addPostFrameCallback((_) => Get.offNamed('/login'));
-  }
+  // GetStorage box = GetStorage();
+  // bool isLogin = box.hasData('token');
+  // bool isSplashScreen = routing?.current == '/splash';
+  // bool isLoginPage = routing?.current == '/login';
+  // bool isAgreementPage = routing?.current == '/agreement';
+  // if (!isLogin && !isSplashScreen && !isLoginPage&&!isAgreementPage) {
+  //   // addPostFrameCallback 作用是等当前帧绘制完成之后再加载
+  //   // https://github.com/jonataslaw/getx/issues/262
+  //   SchedulerBinding.instance?.addPostFrameCallback((_) => Get.offNamed('/login'));
+  // }
 }

lib/routes/pages.dart

 import 'package:farmer_client/pages/search/index.jsx.dart';
 import 'package:farmer_client/pages/userInfo/index.dart';
 import 'package:get/get.dart';
-
 import '../pages/home/index.dart';
+import 'package:get_storage/get_storage.dart';
 import '../pages/index.dart';
 
-
 List<GetPage> pages = [
-  GetPage(name: '/', page: () =>  Home()),
+  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: '/splash', page: () => SplashScreen()), // SplashScreen
   GetPage(name: '/login', page: () =>  MyRouteLogin()),
   GetPage(name: '/addressList', page: () =>  AddressList()),
   GetPage(name: '/addAddress', page: () =>  AddAddress()),

lib/services/orderAPI.dart

+
+
+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'),data: { 'mine': mine}).catchError((error) =>
+  { Fluttertoast.showToast(
+      msg: error.error['message']
+  ),});
+
+}
+
+

lib/widgets/CarsCard.dart

 import 'package:get/get.dart';
 import 'package:get/get_core/src/get_main.dart';
 
+import '../models/entities/CardInfo.dart';
 import '../pages/OrderConfirmation/index.dart';
 import '../pages/machinery/detail/index.dart';
 import '../pages/machinery/map/index.dart';
 import 'LinearGradientText.dart';
 
-// class CarItem {
-//   late String name;
-//   late num? price;
-//   late num? distance;
-//   CarItem({required this.name, this.price, this.distance});
-// }
+class CarsCard extends StatefulWidget {
+  final CardInfo item;
 
-class CarsCard extends StatelessWidget {
-  // final CarItem item;
+  const CarsCard({Key? key, required this.item}) : super(key: key);
+
+  @override
+  _CarsCardPage createState() => _CarsCardPage(item);
+}
+
+class _CarsCardPage extends State<CarsCard> {
+  final CardInfo item;
+  _CarsCardPage(this.item);
 
-  // const CarsCard({
-  //   Key? key,
-  //   required this.item,
-  // }) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
       child: Column(
         children: [
           GestureDetector(
-            onTap: (){
+            onTap: () {
               Get.to(MachineryDetailPage());
             },
-            child:Image.network(
-              "http://yz-shigongli.oss-accelerate.aliyuncs.com/2022-03/1648094119154-7b280bbf63105a8e90299e2d79c8c6ee.jpeg",
+            child: Image.network(
+              item.thumb.toString(),
               width: 345.w,
               height: 230.h,
               fit: BoxFit.cover,
               children: <Widget>[
                 Container(
                   child: Text(
-                    '联合收割机GB01235-0B',
+                    item.name.toString(),
                     style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
                   ),
                 ),
                       Color(0xFFB61515),
                     ],
                     child: RichText(
-                      text: TextSpan(
-                          children: <InlineSpan>[
-                            TextSpan(
-                                text: "4508",
-                                style: TextStyle(
-                                  fontSize: 22,
-                                  fontWeight: FontWeight.bold,
-                                )),
-                            TextSpan(
-                                text: "元/",
-                                style: TextStyle(
-                                  fontSize: 22,
-                                  fontWeight: FontWeight.bold,
-                                )),
-                            TextSpan(
-                                text: "公顷",
-                                style: TextStyle(
-                                  fontSize: 12,
-                                  fontWeight: FontWeight.bold,
-                                )),
-                          ]
-                      ),
+                      text: TextSpan(children: <InlineSpan>[
+                        TextSpan(
+                            text: (item.price! / 100).toString(),
+                            style: TextStyle(
+                              fontSize: 22,
+                              fontWeight: FontWeight.bold,
+                            )),
+                        TextSpan(
+                            text: "元/",
+                            style: TextStyle(
+                              fontSize: 22,
+                              fontWeight: FontWeight.bold,
+                            )),
+                        TextSpan(
+                            text: "公顷",
+                            style: TextStyle(
+                              fontSize: 12,
+                              fontWeight: FontWeight.bold,
+                            )),
+                      ]),
                     ),
                   ),
                 ),
                     height: 44.h, //+10
                     child: ElevatedButton(
                       onPressed: () {
-                        Get.to(OrderConfirmation());
+                        Get.toNamed('/orderConfirmation',
+                            arguments: {'machineryId': item.machineryId});
                       },
                       child: const Text(
                         "预约",
                             ),
                             onTap: () {
                               print('进入地图');
-                              Get.to(MachineryMapPage());
+                              Get.toNamed('/machineryMap',
+                                  arguments: {'machineryId': item.machineryId});
                             },
                           )
                         ],