aasd

lib/models/app.dart

@@ -18,7 +18,7 @@ class AppController extends GetxController {
   AMapFlutterLocation? _location;
 
   get locationStr {
-    if (null == location.value) return null;
+    if (null == location) return null;
 
     double longitude = location.value!['longitude'] as double;
     double latitude = location.value!['latitude'] as double;

lib/models/entities/CardInfo.dart

@@ -1,4 +1,18 @@
+List<ContentImageList> jsonToContentList(list) {
+  List<ContentImageList> contList = [];
+  list.forEach((item) {
+    contList.add(ContentImageList.fromJson(item));
+  });
+  return contList;
+}
 
+List<BannerImageList> jsonToImagesList(list) {
+  List<BannerImageList> contList = [];
+  list.forEach((item) {
+    contList.add(BannerImageList.fromJson(item));
+  });
+  return contList;
+}
 
 class CardInfo {
   // @ApiModelProperty(value = "农机Id")
@@ -10,7 +24,7 @@ class CardInfo {
   // @ApiModelProperty(value = "类型名称")
   String? typeName;
   // @ApiModelProperty(value = "农机价格")
-  int? price;
+  num? price;
   // @ApiModelProperty(value = "主图")
   String? thumb;
 
@@ -33,10 +47,9 @@ class CardInfo {
   int? status;
 
   // @ApiModelProperty(value = "内容详情")
-  late List<dynamic>? contentList;
-
+   List<ContentImageList>? contentList=[];
   // @ApiModelProperty(value = "图片列表")
-  late List<dynamic>? imagesList;
+   List<BannerImageList>? imagesList=[];
 
   CardInfo();
 
@@ -53,8 +66,8 @@ class CardInfo {
         orgName = json["orgName"],
         jobStatus = json["jobStatus"],
         status = json["status"],
-        contentList = json["contentList"],
-        imagesList = json["imagesList"];
+        contentList = jsonToContentList(json["contentList"]),
+        imagesList = jsonToImagesList(json["imagesList"]);
   Map<String, dynamic> toJson() => {
         'machineryId': machineryId,
         'name': name,
@@ -72,3 +85,57 @@ class CardInfo {
         'imagesList': imagesList,
       };
 }
+
+class ContentImageList {
+  String? content;
+  String? contentType;
+  String? createDate;
+  String? extId;
+  String? sort;
+  String? targetId;
+  String? targetType;
+  ContentImageList();
+
+  ContentImageList.fromJson(Map<String, dynamic> json)
+      : content = json["content"],
+        contentType = json["contentType"],
+        createDate = json["createDate"],
+        extId = json["extId"],
+        sort = json["sort"],
+        targetId = json["targetId"],
+        targetType = json["targetType"];
+  Map<String, dynamic> toJson() => {
+        'content': content,
+        'contentType': contentType,
+        'createDate': createDate,
+        'extId': extId,
+        'sort': sort,
+        'targetId': targetId,
+        'targetType': targetType,
+      };
+}
+
+class BannerImageList {
+  String? createDate;
+  String? imageId;
+  num? status;
+  String? targetId;
+  String? targetType;
+  String? url;
+  BannerImageList();
+  BannerImageList.fromJson(Map<String, dynamic> json)
+      : createDate = json["createDate"],
+        imageId = json["imageId"],
+        status = json["status"],
+        targetId = json["targetId"],
+        targetType = json["targetType"],
+        url = json["url"];
+  Map<String, dynamic> toJson() => {
+        'createDate': createDate,
+        'imageId': imageId,
+        'status': status,
+        'targetId': targetId,
+        'targetType': targetType,
+        'url': url,
+      };
+}

lib/models/entities/CardListModel.dart

@@ -0,0 +1,69 @@
+class CardListModel {
+  // @ApiModelProperty(value = "农机Id")
+  String? machineryId;
+  // @ApiModelProperty(value = "名称")
+  String? name;
+  // @ApiModelProperty(value = "农机类型")
+  String? typeId;
+  // @ApiModelProperty(value = "类型名称")
+  String? typeName;
+  // @ApiModelProperty(value = "农机价格")
+  num? price;
+  // @ApiModelProperty(value = "主图")
+  String? thumb;
+
+  // @ApiModelProperty(value = "当前位置")
+  String? location;
+
+  // @ApiModelProperty(value = "距离")
+  double? distance;
+
+  // @ApiModelProperty(value = "机构ID")
+  String? orgId;
+
+  // @ApiModelProperty(value = "机构名称")
+  String? orgName;
+
+  // @ApiModelProperty(value = "工作状态")
+  String? jobStatus;
+
+  // @ApiModelProperty(value = "状态")
+  int? status;
+
+  // @ApiModelProperty(value = "内容详情")
+  List<dynamic>? contentList;
+  // @ApiModelProperty(value = "图片列表")
+  List<dynamic>? imagesList;
+  CardListModel();
+  CardListModel.fromJson(Map<String, dynamic> json)
+      : machineryId = json["machineryId"],
+        name = json["name"],
+        typeId = json["typeId"],
+        typeName = json["typeName"],
+        price = json["price"],
+        thumb = json["thumb"],
+        location = json["location"],
+        distance = json["distance"],
+        orgId = json["orgId"],
+        orgName = json["orgName"],
+        jobStatus = json["jobStatus"],
+        status = json["status"],
+        contentList = json["contentList"],
+        imagesList = json["imagesList"];
+  Map<String, dynamic> toJson() => {
+        'machineryId': machineryId,
+        'name': name,
+        'typeId': typeId,
+        'typeName': typeName,
+        'price': price,
+        'thumb': thumb,
+        'location': location,
+        'distance': distance,
+        'orgId': orgId,
+        'orgName': orgName,
+        'jobStatus': jobStatus,
+        'status': status,
+        'contentList': contentList,
+        'imagesList': imagesList,
+      };
+}

lib/models/entities/NewsInformationInfoTextModel.dart

@@ -0,0 +1,78 @@
+
+List<ExtendContent> jsonToList(list){
+  List<ExtendContent> contList=[];
+  list.forEach((item){
+    contList.add(ExtendContent.fromJson(item));
+  });
+  return contList;
+}
+
+
+class NewsInformationInfoTextModel {
+  String? createDate;
+  String? newsId;
+  num? status;
+  String? thumb;
+  String? title;
+  String? typeId;
+  String? typeName;
+  num? weight;
+   List<ExtendContent>? contentList=[];
+
+  NewsInformationInfoTextModel();
+
+  NewsInformationInfoTextModel.fromJson(Map<String, dynamic> json)
+      : newsId = json["newsId"],
+        title = json["title"],
+        typeId = json["typeId"],
+        typeName = json["typeName"],
+        thumb = json["thumb"],
+        weight = json["weight"],
+        status = json["status"],
+        createDate = json["createDate"],
+        contentList= jsonToList(json["contentList"]);
+
+
+  Map<String, dynamic> toJson() => {
+        'newsId': newsId,
+        'title': title,
+        'typeId': typeId,
+        'typeName': typeName,
+        'thumb': thumb,
+        'weight': weight,
+        'status': status,
+        'createDate': createDate,
+
+
+      };
+}
+
+class ExtendContent {
+  String? content;
+  String? contentType;
+  String? createDate;
+  String? extId;
+  num? sort;
+  String? targetId;
+  String? targetType;
+  ExtendContent();
+
+  ExtendContent.fromJson(Map<String, dynamic> json)
+      : content = json["content"],
+        contentType = json["contentType"],
+        createDate = json["createDate"],
+        extId = json["extId"],
+        sort = json["sort"],
+        targetId = json["targetId"],
+        targetType = json["targetType;"];
+
+  Map<String, dynamic> toJson() => {
+        'content': content,
+        'contentType': contentType,
+        'createDate': createDate,
+        'extId': extId,
+        'sort': sort,
+        'targetId': targetId,
+        'targetType': targetType,
+      };
+}

lib/pages/ArticleInfo/ArticleInfo.dart

@@ -1,52 +1,90 @@
+import 'package:farmer_client/services/news.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:get/get.dart';
+import 'package:get/get_core/src/get_main.dart';
 
+import '../../models/entities/NewsInformationInfoTextModel.dart';
+import '../../models/entities/NewsInformationModel.dart';
 import '../../widgets/layout/BasicPage.dart';
 
 class ArticleInfo extends BasicPage {
+  String newsId = '';
+  final newsInfoContent = Rx<NewsInformationInfoTextModel>(NewsInformationInfoTextModel());
+  final newsList = Rx<List<ExtendContent>>([]);
 
   @override
-  Widget builder(BuildContext context) {
-    naviTitle='资讯详情';
-    return  Container(
-          padding: EdgeInsets.fromLTRB(15, 30, 15, 50),
+  void beforeShow() {
+    // TODO: implement beforeShow
+    super.beforeShow();
+    if (Get.arguments['newsId'] != null) {
+      newsId = Get.arguments['newsId'];
+
+      getNewsInfo(newsId).then((value) {
+        newsInfoContent.value = NewsInformationInfoTextModel.fromJson(value);
+        newsList.value =  newsInfoContent.value.contentList!;
 
-          child: Column(
-            children: [
-              Container(
-                alignment: Alignment.center,
-                child:  Row(
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  children: [
-                    Image(image: AssetImage('images/icons/decorate.png'),width: 17,),
-                    Text('我是22222222222标题',
-                    style: TextStyle(
-                      fontSize: 17.sp,
-                      fontWeight: FontWeight.bold,
+      });
 
-                    ),
-                    ),
-                    Image(image: AssetImage('images/icons/decorate.png'),width: 17),
+    }
+  }
 
-                  ],
+  @override
+  Widget builder(BuildContext context) {
+    naviTitle = '资讯详情';
+    return Container(
+      padding: EdgeInsets.fromLTRB(15, 30, 15, 50),
+      child: Column(
+        children: [
+          Container(
+            alignment: Alignment.center,
+            child: Row(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                Image(
+                  image: AssetImage('images/icons/decorate.png'),
+                  width: 17,
                 ),
-              ),
-              Container(
-                padding: EdgeInsets.fromLTRB(0, 20, 0, 10),
-                width: 344.w,
-                child: Text('gr一年之计在于春，连日来，农业生产工作正在热火朝天的进行着：农技人员走村串户指导农户春耕生产，大型拖拉机忙着翻垦农田，植保无人机 ',
-                style: TextStyle(
-                  fontSize: 14.sp
+                Obx(()=>
+                    Text(
+                      newsInfoContent.value.title.toString(),
+                      style: TextStyle(
+                        fontSize: 17.sp,
+                        fontWeight: FontWeight.bold,
+                      ),
+                    )
                 ),
-                ) ,
-              ),
-              Container(
-                padding: EdgeInsets.fromLTRB(0, 10, 0,10),
-                child: Image(image: AssetImage('images/cars.png'),width:320.w,height:260.w,fit: BoxFit.fill,),
-              )
-            ],
+                Image(
+                    image: AssetImage('images/icons/decorate.png'), width: 17),
+              ],
+            ),
           ),
+          Obx(() => Column(
+                children:  newsList.value.map((item) {
+                  if (item.contentType != 'image') {
+                    return Container(
+                      padding: EdgeInsets.fromLTRB(0, 20, 0, 10),
+                      width: 344.w,
+                      child: Text(
+                        item.content.toString(),
+                        style: TextStyle(fontSize: 14.sp),
+                      ),
+                    );
+                  } else {
+                    return Container(
+                      padding: EdgeInsets.fromLTRB(0, 10, 0, 10),
+                      child: Image(
+                        image: NetworkImage(item.content.toString()),
+                        width: 320.w,
+                        height: 260.w,
+                        fit: BoxFit.fill,
+                      ),
+                    );
+                  }
+                }).toList(),
+              )),
+        ],
+      ),
     );
-
   }
 }

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

@@ -4,7 +4,9 @@ import 'package:farmer_client/widgets/NullCard.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
+import '../../../../models/app.dart';
 import '../../../../models/entities/CardInfo.dart';
+import '../../../../models/entities/CardListModel.dart';
 import '../../../../services/homeAPI.dart';
 import '../../../../widgets/CarsCard.dart';
 import 'package:farmer_client/models/entities/Banners.dart';
@@ -23,13 +25,14 @@ class _HomePageState extends State<HomePage> {
   final CarouselController _controller = CarouselController();
   List<Banners> bannerList = [];
 
-  List<CardInfo> machineryLists = [];
+  List<CardListModel> machineryLists = [];
 
   @override
   void initState() {
     super.initState();
-    // final location = AppController.t.location;
-    // print('location+$location');
+   //  final location = AppController.t.location;
+   // final long=   location.value!['longitude'].toString() + "," + location.value!['latitude'].toString();
+   //  print('location+$location,lolongglongng+$long');
 
     getHomeBanner('banner').then((value) {
       setState(() {
@@ -39,10 +42,10 @@ class _HomePageState extends State<HomePage> {
       });
     });
 
-    getMachinery('112.087433,32.687692').then((value) {
+    getMachinery('122.08400000000002,37.421998333333335').then((value) {
       setState(() {
         value['records'].forEach((item) {
-          machineryLists.add(CardInfo.fromJson(item));
+          machineryLists.add(CardListModel.fromJson(item));
         });
       });
     });

lib/pages/infomation/index.dart

@@ -1,37 +1,56 @@
 import 'package:farmer_client/pages/infomation/widgets/Information/index.dart';
 import 'package:farmer_client/widgets/layout/BasicPage.dart';
 import 'package:flutter/material.dart';
+import 'package:get/get_rx/src/rx_types/rx_types.dart';
+import 'package:get/get_state_manager/get_state_manager.dart';
 
 import '../../models/entities/NewsInformationModel.dart';
 import '../../services/news.dart';
 
 class Infomation extends BasicPage {
+  // List<NewsInformationModel> newsListItem=[];
+
   Infomation({Key? key}) : super(key: key) {
     tabIndex = 2;
     naviTitle = '资讯';
   }
-  List<NewsInformationModel> newsListItem = [];
 
+  final newsListItem = Rx<List<NewsInformationModel>>([]);
 
 @override
   void beforeShow() {
+
     // TODO: implement beforeShow
     super.beforeShow();
   getNewsList().then((value) {
+    final list = <NewsInformationModel>[];
+
      value['records'].forEach((item) {
-       newsListItem.add(NewsInformationModel.fromJson(item));
-      });
-  });
+       list.add(NewsInformationModel.fromJson(item));
+       print('newsListItem');
+
+       print(newsListItem.value);
 
+     });
+    newsListItem.value=list;
+
+  });
 }
 
   @override
   Widget builder(BuildContext context) {
 
+    return Container(
+        child:
+            Obx(()=>
+          Column(
+            mainAxisSize: MainAxisSize.min,
+            children:newsListItem.value.map((item) => Information(item: item,)).toList(),
+          )
 
-    return  Column(
-      mainAxisSize: MainAxisSize.min,
-      children: newsListItem.map((item) => Information(item: item)).toList(),
+            )
     );
+
+
   }
 }

lib/pages/infomation/widgets/Information/index.dart

@@ -13,71 +13,77 @@ class Information extends StatefulWidget {
   const Information({Key? key, required this.item}) : super(key: key);
 
   @override
-  State<Information> createState() => _InformationState();
-
+  State<Information> createState() => _InformationState(item);
   // getNewsList
 }
 
 class _InformationState extends State<Information> {
-  late final NewsInformationModel item;
+  final NewsInformationModel item;
+
+
+  _InformationState(this.item);
 
 
   @override
   Widget build(BuildContext context) {
-    return Column(
-      children: [
-        // ListTile用不好
-        GestureDetector(
-          child: Container(
-              padding: EdgeInsets.fromLTRB(0, 30, 0, 30),
-              decoration: const BoxDecoration(
-                  border: Border(
-                      bottom: BorderSide(width: 0.5, color: Color(0x20000000)
+    return Container(
+      child:   Column(
+        children: [
+          // ListTile用不好
+          GestureDetector(
+            child: Container(
+                padding: EdgeInsets.fromLTRB(0, 30, 0, 30),
+                decoration: const BoxDecoration(
+                    border: Border(
+                        bottom: BorderSide(width: 0.5, color: Color(0x20000000)
                           // 0x17000000
-                          ))),
-              child: Row(
-                children: [
-                  Container(
-                    margin: EdgeInsets.fromLTRB(15, 0, 11, 0),
-                    width: 100,
-                    height: 100,
-                    decoration: BoxDecoration(
-                      image: DecorationImage(
-                        image: AssetImage('images/cars.png'),
-                        fit: BoxFit.cover,
+                        ))),
+                child: Row(
+                  children: [
+                    Container(
+                      margin: EdgeInsets.fromLTRB(15, 0, 11, 0),
+                      width: 100,
+                      height: 100,
+                      decoration: BoxDecoration(
+                        image: DecorationImage(
+                          image: NetworkImage(item.thumb.toString()),
+                          fit: BoxFit.cover,
+                        ),
+                        borderRadius: BorderRadius.circular(12),
                       ),
-                      borderRadius: BorderRadius.circular(12),
                     ),
-                  ),
-                  Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      Container(
-                        width: 240.w,
-                        padding: EdgeInsets.fromLTRB(0, 0, 0, 30),
-                        child: Text('',
-                            softWrap: true,
-                            maxLines: 2,
-                            textAlign: TextAlign.left,
-                            overflow: TextOverflow.ellipsis,
-                            style: TextStyle(
-                              fontSize: 17.sp,
-                              fontWeight: FontWeight.bold,
-                            )),
-                      ),
-                      Container(
-
-                        child: Text(''),
-                      )
-                    ],
-                  )
-                ],
-              )),
-          onTap: () {
-            Get.to(ArticleInfo());
-          },
-        ),
-      ],
+                    Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Container(
+                          width: 240.w,
+                          padding: EdgeInsets.fromLTRB(0, 0, 0, 30),
+                          child: Text(item.title!.toString(),
+                              softWrap: true,
+                              maxLines: 2,
+                              textAlign: TextAlign.left,
+                              overflow: TextOverflow.ellipsis,
+                              style: TextStyle(
+                                fontSize: 17.sp,
+                                fontWeight: FontWeight.bold,
+                              )),
+                        ),
+                        Container(
+                          child: Text(
+                              item.createDate!=null? DateFormat("yyyy-MM-dd").format(DateTime.parse(item.createDate.toString())):item.createDate.toString(),),
+                        )
+                      ],
+                    )
+                  ],
+                )),
+            onTap: () {
+              Get.to(ArticleInfo(),arguments: {'newsId':item.newsId});
+            },
+          ),
+        ],
+      ),
     );
+
+
   }
 }

lib/pages/machinery/detail/index.dart

@@ -1,10 +1,15 @@
-
+import 'package:farmer_client/models/entities/CardInfo.dart';
 import 'package:farmer_client/widgets/layout/BasicPage.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
+import '../../../services/homeAPI.dart';
 import 'widgets/detail.dart';
 
 class MachineryDetailPage extends BasicPage {
+  String markId = '';
+  final machineryInfoContent = Rx<CardInfo>(CardInfo());//全部详情
+  final machineryListBanner = Rx<List<BannerImageList>>([]);//banner轮播
+  final machineryListContent= Rx<List<ContentImageList>>([]);//图文详情
   // 响应预约事件
   void handleClick() {
     Get.toNamed('/orderConfirmation');
@@ -14,6 +19,17 @@ class MachineryDetailPage extends BasicPage {
   void beforeShow() {
     // TODO: implement onMounted
     super.beforeShow();
+    if (Get.arguments['id'] != null) {
+     markId = Get.arguments['id'];
+      getMachineryInfo(markId, '122.08400000000002,37.421998333333335', true).then((value) {
+        machineryInfoContent.value=CardInfo.fromJson(value);
+        machineryListBanner.value=machineryInfoContent.value.imagesList!;
+        machineryListContent.value=machineryInfoContent.value.contentList!;
+
+        print('222222222222222222+$value');
+      });
+
+    }
     print("----show----detail page--------------");
   }
 
@@ -27,7 +43,6 @@ class MachineryDetailPage extends BasicPage {
   @override
   Widget builder(BuildContext context) {
     naviTitle = "查看详情";
-    return page(context: context, handleClick: handleClick);
+    return Obx(()=>page(context: context, handleClick: handleClick,item:machineryInfoContent.value,bnnerItem:machineryListBanner.value,contentItem:machineryListContent.value));
   }
-
 }

lib/pages/machinery/detail/widgets/detail.dart

@@ -1,4 +1,5 @@
 
+import 'package:carousel_slider/carousel_slider.dart';
 import 'package:farmer_client/pages/machinery/widgets/DefLayout.dart';
 import 'package:farmer_client/pages/machinery/widgets/RoundButton.dart';
 import 'package:flutter/widgets.dart';
@@ -6,9 +7,15 @@ import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:farmer_client/widgets/ExtendContentList.dart';
 import 'package:farmer_client/models/entities/ExtendContent.dart';
+import 'package:get/get.dart';
+import '../../../../models/entities/CardInfo.dart';
 import '../../widgets/summary.dart';
 
-Widget page({ required BuildContext context, VoidCallback? handleClick}) {
+Widget page({ required BuildContext context, VoidCallback? handleClick,required CardInfo item,required List<BannerImageList> bnnerItem,required List<ContentImageList> contentItem}) {
+  print('88888888888888+$item');
+
+
+
   final img = 'https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/index-icon19.jpg';
 
   final list = <ExtendContent>[
@@ -22,23 +29,39 @@ Widget page({ required BuildContext context, VoidCallback? handleClick}) {
   ];
 
   return DefLayout(
-      head: Image.network(img, fit: BoxFit.cover),
+      head: CarouselSlider(
+        items: bnnerItem
+            .map((item) => Container(
+          child: Center(
+              child: Image.network(item.url.toString(),
+                  fit: BoxFit.fitWidth, width: 370.w)),
+        ))
+            .toList(),
+        options: CarouselOptions(
+          autoPlay: true,
+          enlargeCenterPage: false, //图片中心放大
+          viewportFraction: 1, //每个页面应占据的视口部分。默认为 0.8，这意味着每个页面填充 80% 的轮播。
+          // aspectRatio: 1.6,//纵横比
+          height: 214.w,
+          initialPage: 1, //初始页
+        ),
+      ),
       children: [
         DefLayout.card(
           top: DefLayout.headHeight - DefLayout.offset,
           padding: EdgeInsets.only(top: 45.w, left: 15.w, right: 15.w, bottom: 20.w),
-          child: _content(context, list, handleClick),
+          child: _content(context, handleClick,item,contentItem),
         )
       ]
   );
 }
 
-Widget _content(BuildContext context, List<ExtendContent> list, VoidCallback? handleClick) {
+Widget _content(BuildContext context, VoidCallback? handleClick, CardInfo item,List<ContentImageList> contentItem) {
   return Column(
     children: [
-      summary(),
+     summary(item: item),
       _sectionHead('农机详情'),
-      ExtendContentList(list: list),
+      ExtendContentList(item: contentItem,),
       SizedBox(height: 20.w,),
       RoundButton(text: "预约", onPressed: handleClick,)
     ],

lib/pages/machinery/map/widgets/detail.dart

@@ -39,7 +39,7 @@ Widget page({ required BuildContext context, VoidCallback? handleClick}) {
 Widget _content(BuildContext context, VoidCallback? handleClick) {
   return Column(
     children: [
-      summary(),
+      // summary(),
       RoundButton(text: "预约", onPressed: handleClick,),
     ],
   );

lib/pages/machinery/widgets/DefLayout.dart

@@ -8,7 +8,7 @@ class DefLayout extends StatelessWidget {
 
   DefLayout({Key? key, required this.head, required this.children}): super(key: key);
 
-  static double headHeight = 250.w;
+  static double headHeight = 214.w;
   static double offset = 20.w;
 
   static Widget card({required double top, required Widget child, double? height, EdgeInsetsGeometry? padding}) {

lib/pages/machinery/widgets/summary.dart

@@ -4,24 +4,28 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
 
 import 'package:farmer_client/widgets/LinearGradientText.dart';
 
-Widget summary() {
+import '../../../models/entities/CardInfo.dart';
+
+Widget summary({required CardInfo item}) {
+
   return Column(
     children: [
-      _title(),
+      _title(item: item),
       SizedBox(height: 20.w,),
-      _desc(),
+      _desc(item: item),
       SizedBox(height: 20.w,),
-      _detail(),
+      _detail(item: item),
       SizedBox(height: 20.w,),
     ],
   );
 }
 
-Widget _title() {
+Widget _title({required CardInfo item}) {
+
   return Row(
     children: [
       Expanded(
-          child: Text("收割机001--S001",
+          child: Text(item.name.toString(),
               style: TextStyle(
                 color: const Color(0xFF222222),
                 fontSize: 18.sp,
@@ -40,7 +44,7 @@ Widget _title() {
             text: TextSpan(
                 children: <InlineSpan>[
                   TextSpan(
-                      text: "450",
+                      text: ((item.price??0)/100).toString(),
                       style: TextStyle(
                         fontSize: 22.sp,
                         fontWeight: FontWeight.bold,
@@ -66,7 +70,7 @@ Widget _title() {
   );
 }
 
-Widget _desc() {
+Widget _desc({required CardInfo item}) {
   return Row(
     children: [
       Icon(Icons.location_on_outlined, size: 16.sp,),
@@ -78,9 +82,9 @@ Widget _desc() {
   );
 }
 
-Widget _detail() {
+Widget _detail({required CardInfo item}) {
   return Container(
     alignment: Alignment.centerLeft,
-    child: Text("农机手1的收割机", style: TextStyle(color: const Color(0xFF222222), fontSize: 15.sp),),
+    child: Text(item.orgName.toString(), style: TextStyle(color: const Color(0xFF222222), fontSize: 15.sp),),
   );
 }

lib/pages/order/widgets/order/index.dart

@@ -1,6 +1,7 @@
 import 'package:farmer_client/widgets/NullCard.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:get/get_rx/src/rx_types/rx_types.dart';
 
 import '../../../../models/entities/OrderListAll.dart';
 import '../../../../services/orderAPI.dart';
@@ -15,7 +16,7 @@ class OrderPage extends StatefulWidget {
 }
 
 class _OrderPageState extends State<OrderPage> {
-  List<OrderListAll> orderListItem = [];
+  final orderListItem = Rx<List<OrderListAll>>([]);
 
   @override
   void initState() {
@@ -23,17 +24,22 @@ class _OrderPageState extends State<OrderPage> {
     super.initState();
 
     getOrderList(true).then((value) {
+      final list = <OrderListAll>[];
+
       setState(() {
         value['records'].forEach((item) {
-          orderListItem.add(OrderListAll.fromJson(item));
+          list.add(OrderListAll.fromJson(item));
+
         });
       });
+      orderListItem(list);
+
     });
   }
 
   @override
   Widget build(BuildContext context) {
-    return orderListItem.length >= 0?
+    return orderListItem.value.length >= 0?
       Column(
       children: [
         Container(
@@ -68,7 +74,7 @@ class _OrderPageState extends State<OrderPage> {
         Column(
           mainAxisSize: MainAxisSize.min,
           children:
-          orderListItem.map((item) => OrderListCard(item: item)).toList(),
+          orderListItem.value.map((item) => OrderListCard(item: item)).toList(),
         ),
       ],
     ):NullCard(text: '您还没有新的订单！');

lib/services/homeAPI.dart

@@ -42,7 +42,7 @@ Future getMachinery(String location)async{
  * @returns
  */
 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) =>
+  return request('/machinery-summary/$id',options: Options(method: 'GET'),queryParameters: { 'location': location,'attached': attached}).catchError((error) =>
   { Fluttertoast.showToast(
       msg: error.error['message']
   ),});

lib/widgets/CarsCard.dart

@@ -5,13 +5,14 @@ import 'package:get/get.dart';
 import 'package:get/get_core/src/get_main.dart';
 
 import '../models/entities/CardInfo.dart';
+import '../models/entities/CardListModel.dart';
 import '../pages/OrderConfirmation/index.dart';
 import '../pages/machinery/detail/index.dart';
 import '../pages/machinery/map/index.dart';
 import 'LinearGradientText.dart';
 
 class CarsCard extends StatefulWidget {
-  final CardInfo item;
+  final CardListModel item;
 
   const CarsCard({Key? key, required this.item}) : super(key: key);
 
@@ -20,7 +21,7 @@ class CarsCard extends StatefulWidget {
 }
 
 class _CarsCardPage extends State<CarsCard> {
-  final CardInfo item;
+  final CardListModel item;
   _CarsCardPage(this.item);
 
   @override
@@ -36,7 +37,7 @@ class _CarsCardPage extends State<CarsCard> {
         children: [
           GestureDetector(
             onTap: () {
-              Get.to(MachineryDetailPage());
+              Get.to(MachineryDetailPage(),arguments: {'id':item.machineryId});
             },
             child: Image.network(
               item.thumb.toString(),
@@ -53,8 +54,12 @@ class _CarsCardPage extends State<CarsCard> {
               verticalDirection: VerticalDirection.up,
               children: <Widget>[
                 Container(
+                  width: 210.w,
                   child: Text(
                     item.name.toString(),
+                    softWrap: true,
+                    textAlign: TextAlign.left,
+                    overflow: TextOverflow.ellipsis,
                     style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
                   ),
                 ),

lib/widgets/ExtendContentList.dart

@@ -1,13 +1,16 @@
 
 import 'package:flutter/widgets.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:get/get_rx/src/rx_types/rx_types.dart';
+import 'package:get/get_state_manager/src/rx_flutter/rx_obx_widget.dart';
 
+import '../models/entities/CardInfo.dart';
 import '../models/entities/ExtendContent.dart';
 
 class ExtendContentList extends StatelessWidget {
-  final List<ExtendContent> list;
+  final List<ContentImageList> item;
 
-  ExtendContentList({ Key? key, required this.list }) : super(key: key);
+  const ExtendContentList({ Key? key, required this.item }) : super(key: key);
   
   Widget? _image(String? content) {
     if (null == content || content.isEmpty) return null;
@@ -21,21 +24,50 @@ class ExtendContentList extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    //
+    // List<Widget> _widgets = [];
+    // Container(
+    //   child: item.contentType == "image" ? _image(item.content) : _text(item.content),
+    // );
+    // for (var i = 0; i < item.length; i += 1) {
+    //   if (i != 0 ) {
+    //     _widgets.add(SizedBox(height: 20.w,));
+    //   }
+    //   var item = item[i];
+    //   _widgets.add(Container(
+    //     child: item.contentType == "image" ? _image(item.content) : _text(item.content),
+    //   ));
+    // }
 
-    List<Widget> _widgets = [];
-    for (var i = 0; i < list.length; i += 1) {
-      if (i != 0 ) {
-        _widgets.add(SizedBox(height: 20.w,));
-      }
-      var item = list[i];
-      _widgets.add(Container(
-        child: item.contentType == "image" ? _image(item.content) : _text(item.content),
-      ));
-    }
-
-    return Column(
-      children: _widgets,
+    return  Container(
+      child:  Column(
+        children:  item.map((item) {
+          if (item.contentType != 'image') {
+
+            return Container(
+              padding: EdgeInsets.fromLTRB(0, 20, 0, 10),
+              width: 344.w,
+              child: Text(
+                item.content.toString(),
+                style: TextStyle(fontSize: 14.sp),
+              ),
+            );
+          } else {
+            return Container(
+              padding: EdgeInsets.fromLTRB(0, 10, 0, 10),
+              child: Image(
+                image: NetworkImage(item.content.toString()),
+                width: 320.w,
+                height: 260.w,
+                fit: BoxFit.cover,
+              ),
+
+            );
+          }
+        }).toList(),
+      ),
     );
+
   }
 
 }

lib/widgets/OrderInfoCard.dart

@@ -1,4 +1,5 @@
 import 'package:farmer_client/models/entities/OrderInfoModel.dart';
+import 'package:farmer_client/pages/index.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
@@ -120,7 +121,7 @@ class OrderInfoCard extends StatelessWidget {
                                   fontWeight: FontWeight.bold)),
                           TextSpan(
                           // '${DateFormat("yyyy-MM-dd").format(item.appointmentDate.toString())}'
-                              text: DateFormat("yyyy-MM-dd").format(DateTime.parse(item.appointmentDate.toString())),
+                              text:item.appointmentDate!=null? DateFormat("yyyy-MM-dd").format(DateTime.parse(item.appointmentDate.toString())):item.appointmentDate.toString(),
                               style: TextStyle(
                                   color: Color(0xff222222),
                                   fontSize: 16,
@@ -139,7 +140,8 @@ class OrderInfoCard extends StatelessWidget {
                                   fontSize: 16,
                                   fontWeight: FontWeight.bold)),
                           TextSpan(
-                              text: DateFormat("yyyy-MM-dd").format(DateTime.parse(item.createDate.toString())),
+                              // text: DateFormat("yyyy-MM-dd").format(DateTime.parse(item.createDate!.toString())),
+                              text:item.createDate!=null? DateFormat("yyyy-MM-dd").format(DateTime.parse(item.createDate.toString())):item.createDate.toString(),
 
                               style: TextStyle(
                                   color: Color(0xff222222),