orderHomePages

lib/models/app.dart

@@ -15,15 +15,10 @@ class AppController extends GetxController {
   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

@@ -1,4 +1,4 @@
-class banner {
+class Banners {
   String? bannerId;
   String? title;
   String? thumb;
@@ -6,9 +6,9 @@ class banner {
   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

@@ -33,10 +33,10 @@ class CardInfo {
   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

@@ -80,10 +80,7 @@ class _MoreCarsState extends State<MoreCars> with TickerProviderStateMixin {
                 Container(
                   child: Column(
                     children: [
-                      CarsCard(),
-                      CarsCard(),
-                      CarsCard(),
-                      CarsCard(),
+
                     ],
                   )
                   ,

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

@@ -5,45 +5,56 @@ import 'package:flutter_screenutil/flutter_screenutil.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),
@@ -58,9 +69,8 @@ class _HomePageState extends State<HomePage> {
           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)),
@@ -115,9 +125,12 @@ class _HomePageState extends State<HomePage> {
                       )
                     ],
                   ),
-                  CarsCard(),
-                  CarsCard(),
-                  CarsCard(),
+            Column(
+              children: machineryLists.map((item) =>CarsCard(item:item)).toList(),
+            )
+
+
+
                 ],
               )),
         ],

lib/pages/search/index.jsx.dart

@@ -74,10 +74,6 @@ class _SearchPage extends State<SearchPage> {
               child: Column(
                 children: [
                   // NullCard(text: '暂无农机信息'),
-                  CarsCard(),
-                  CarsCard(),
-                  CarsCard(),
-                  CarsCard(),
                 ],
               ),
             )

lib/services/orderAPI.dart

@@ -0,0 +1,21 @@
+
+
+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

@@ -4,25 +4,25 @@ import 'package:flutter_screenutil/flutter_screenutil.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) {
@@ -36,11 +36,11 @@ class CarsCard extends StatelessWidget {
       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,
@@ -55,7 +55,7 @@ class CarsCard extends StatelessWidget {
               children: <Widget>[
                 Container(
                   child: Text(
-                    '联合收割机GB01235-0B',
+                    item.name.toString(),
                     style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
                   ),
                 ),
@@ -76,28 +76,26 @@ class CarsCard extends StatelessWidget {
                       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,
+                            )),
+                      ]),
                     ),
                   ),
                 ),
@@ -111,7 +109,8 @@ class CarsCard extends StatelessWidget {
                     height: 44.h, //+10
                     child: ElevatedButton(
                       onPressed: () {
-                        Get.to(OrderConfirmation());
+                        Get.toNamed('/orderConfirmation',
+                            arguments: {'machineryId': item.machineryId});
                       },
                       child: const Text(
                         "预约",
@@ -165,7 +164,8 @@ class CarsCard extends StatelessWidget {
                             ),
                             onTap: () {
                               print('进入地图');
-                              Get.to(MachineryMapPage());
+                              Get.toNamed('/machineryMap',
+                                  arguments: {'machineryId': item.machineryId});
                             },
                           )
                         ],