Merge branch 'master' of http://git.ycjcjy.com/nanyang/farmer_client

.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Wed Apr 20 15:13:32 CST 2022
-gradle.version=6.8

android/app/src/main/java/com/example/farmer_client/MainActivity.java

@@ -0,0 +1,6 @@
+package com.example.farmer_client;
+
+import io.flutter.embedding.android.FlutterActivity;
+
+public class MainActivity extends FlutterActivity {
+}

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

@@ -5,7 +5,7 @@
     <!-- You can insert your own image images here -->
 <!--    <item>-->
 <!--        <bitmap-->
-<!--            android:gravity="fill"-->
+<!--            android:gravity="center"-->
 <!--            android:src="@drawable/launch_image" />-->
 <!--    </item>-->
 </layer-list>

lib/models/Store.dart

@@ -0,0 +1 @@
+// TODO Implement this library.

lib/models/User.dart

@@ -0,0 +1,15 @@
+
+import 'package:farmer_client/models/entities/person.dart';
+import 'package:get/get.dart';
+
+class User extends GetxController {
+  Person? _person;
+  Person? get person => _person;
+  set person (Person? p) {
+    _person = p;
+    update();
+  }
+
+  bool get isLogin => _person != null;
+
+}

lib/models/app.dart

@@ -5,6 +5,7 @@ import 'package:amap_flutter_location/amap_flutter_location.dart';
 import 'package:farmer_client/models/entities/person.dart';
 import 'package:farmer_client/widgets/Modal.dart';
 import 'package:get/get.dart';
+import '../services/user.dart';
 import '../utils/location.dart';
 
 class AppController extends GetxController {
@@ -18,7 +19,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;
@@ -47,12 +48,15 @@ class AppController extends GetxController {
       );
     });
 
-    // // 尝试获取一次人员信息
-    // getCurrent().then((person) {
-    //   user(person);
-    // }).catchError((e) {
-    //   print(e);
-    // });
+
+    // 尝试获取一次人员信息
+    getCurrent().then((person) {
+      print('9personpersonpersonperson+$person');
+      user(Person.fromJson(person));
+
+    }).catchError((e) {
+      print(e);
+    });
   }
 
   @override

lib/models/entities/Address.dart

@@ -1,14 +1,33 @@
 class Address {
   String? address;
   bool? isDefault;
+  String? addressId;
+  String? ownerType;
+  String? ownerId;
+  num? sortNo;
+  String? orgId;
+  num? status;
+
   Address();
 
   Address.fromJson(Map<String, dynamic> json)
       : address = json["address"],
-        isDefault = json["isDefault"];
+        isDefault = json["isDefault"],
+        addressId = json["addressId"],
+        ownerType = json["ownerType"],
+        ownerId = json["ownerId"],
+        sortNo = json["sortNo"],
+        orgId = json["orgId"],
+        status = json["status"];
 
   Map<String, dynamic> toJson() => {
         'address': address,
         'isDefault': isDefault,
+        'addressId': addressId,
+        'ownerType': ownerType,
+        'ownerId': ownerId,
+        'sortNo': sortNo,
+        'orgId': orgId,
+        'status': status,
       };
 }

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")
@@ -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;
+  num? 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/models/entities/banner.dart

@@ -0,0 +1,28 @@
+class banner {
+  String? bannerId;
+  String? title;
+  String? thumb;
+  String? position;
+  num? sortNo;
+  num? status;
+  String? createDat;
+  banner();
+
+  banner.fromJson(Map<String, dynamic> json)
+      : bannerId = json["bannerId"],
+        title = json["title"],
+        thumb = json["thumb"],
+        position = json["position"],
+        sortNo = json["sortNo"],
+        status = json["status"],
+        createDat = json["createDat"];
+  Map<String, dynamic> toJson() => {
+        "bannerId": bannerId,
+        "title": title,
+        "thumb": thumb,
+        "position": position,
+        "sortNo": sortNo,
+        "status": status,
+        "createDat": createDat,
+      };
+}

lib/models/entities/person.dart

@@ -1,17 +1,18 @@
-
 class Person {
   String? personId;
   String? appId;
   String? openid;
   String? nickName;
   String? avatar;
-  int? sex;
+  num? sex;
   String? phone;
   String? userId;
-  int? status;
+  num? status;
   String? createDate;
+  String? identity;
+  String? isOrgManager;
 
-  Person ();
+  Person();
 
   Person.fromJson(Map<String, dynamic> json)
       : personId = json["personId"],
@@ -23,20 +24,23 @@ class Person {
         phone = json["phone"],
         userId = json["userId"],
         status = json["status"],
-        createDate = json["createDate"];
+        createDate = json["createDate"],
+        isOrgManager = json["isOrgManager"],
+        identity = json["identity"];
 
   Map<String, dynamic> toJson() => {
-    'personId' : personId,
-    'appId' : appId,
-    'openid' : openid,
-    'nickName' : nickName,
-    'avatar' : avatar,
-    'sex' : sex,
-    'phone' : phone,
-    'userId' : userId,
-    'status' : status,
-    'createDate' : createDate,
+        'personId': personId,
+        'appId': appId,
+        'openid': openid,
+        'nickName': nickName,
+        'avatar': avatar,
+        'sex': sex,
+        'phone': phone,
+        'userId': userId,
+        'status': status,
+        'createDate': createDate,
+        'isOrgManager': isOrgManager,
+         'identity': identity,
+
   };
 }
-
-

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/Information/ArticleInfo.dart

@@ -0,0 +1,62 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+
+class ArticleInfo extends StatelessWidget {
+  const ArticleInfo({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+        resizeToAvoidBottomInset: false,
+        appBar: AppBar(
+          title: Text('资讯'),
+          leading: Icon(Icons.arrow_back_ios),
+          // backgroundColor: Colors.transparent,
+          centerTitle: true,
+        ),
+        body: 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,),
+                    Text('我是22222222222标题',
+                    style: TextStyle(
+                      fontSize: 17.sp,
+                      fontWeight: FontWeight.bold,
+
+                    ),
+                    ),
+                    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
+                ),
+                ) ,
+              ),
+              Container(
+                padding: EdgeInsets.fromLTRB(0, 10, 0,10),
+                child: Image(image: AssetImage('images/cars.png'),width:320.w,height:260.w,fit: BoxFit.fill,),
+
+              )
+
+
+            ],
+          ),
+        ),
+    );
+
+  }
+}

lib/pages/Information/index.dart

@@ -0,0 +1,141 @@
+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';
+
+class Information extends StatefulWidget {
+  const Information({Key? key}) : super(key: key);
+
+  @override
+  State<Information> createState() => _InformationState();
+}
+
+class _InformationState extends State<Information> {
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      resizeToAvoidBottomInset: false,
+      appBar: AppBar(
+        title: Text('资讯'),
+        leading: Icon(Icons.arrow_back_ios),
+        // backgroundColor: Colors.transparent,
+        centerTitle: true,
+      ),
+      body: ListView(
+        children: [
+          // ListTile用不好
+
+          GestureDetector(
+            child:
+            Container(
+                padding: EdgeInsets.fromLTRB(0, 30, 0, 30),
+                width: 310.w,
+                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,
+                        ),
+
+                        borderRadius: BorderRadius.circular(12),
+                      ),
+                    )
+                    ,
+                    Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Container(
+                          width: 240.w,
+                          padding: EdgeInsets.fromLTRB(0, 0, 0, 30),
+                          child: Text("我我就是一个标题，什阿三大苏打333萨达萨达萨达v么特不是",
+                              softWrap: true,
+                              maxLines: 2,
+                              textAlign: TextAlign.left,
+                              overflow: TextOverflow.ellipsis,
+                              style: TextStyle(
+                                fontSize: 17.sp, fontWeight: FontWeight.bold,)),
+                        ),
+                        Container(
+                          child: Text('2022-02-09'),
+                        )
+                      ],
+                    )
+                  ],
+                )
+            ),
+            onTap: () {
+              Get.toNamed('/ArticleInfo');
+            },
+          ),
+          GestureDetector(
+            child:
+            Container(
+                padding: EdgeInsets.fromLTRB(0, 30, 0, 30),
+                width: 310.w,
+                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,
+                        ),
+
+                        borderRadius: BorderRadius.circular(12),
+                      ),
+                    )
+                    ,
+                    Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Container(
+                          width: 240.w,
+                          padding: EdgeInsets.fromLTRB(0, 0, 0, 30),
+                          child: Text("我我就是一个标题，什阿三大苏打333萨达萨达萨达v么特不是",
+                              softWrap: true,
+                              maxLines: 2,
+                              textAlign: TextAlign.left,
+                              overflow: TextOverflow.ellipsis,
+                              style: TextStyle(
+                                fontSize: 17.sp, fontWeight: FontWeight.bold,)),
+                        ),
+                        Container(
+                          child: Text('2022-02-09'),
+                        )
+                      ],
+                    )
+                  ],
+                )
+            ),
+            onTap: () {
+              print('进入资讯详情');
+            },
+          )
+
+        ],
+      ),
+    );
+  }
+}

lib/pages/OrderConfirmation/index.dart

@@ -1,18 +1,79 @@
 import 'package:farmer_client/models/addressController.dart';
+import 'package:farmer_client/models/entities/CardInfo.dart';
 import 'package:farmer_client/widgets/layout/BasicPage.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:fluttertoast/fluttertoast.dart';
 import 'package:get/get.dart';
 import 'package:intl/intl.dart';
 
+import '../../models/entities/CardListModel.dart';
+import '../../models/entities/OrderInfoModel.dart';
+import '../../services/homeAPI.dart';
+import '../../services/orderAPI.dart';
+
 class OrderConfirmation extends BasicPage {
   TextEditingController _unameController = TextEditingController();
   GlobalKey _formKey = GlobalKey<FormState>();
-
+  String markId = '';
   final selectDate = Rx<DateTime>(DateTime.now()); //选择的时间
-  final workingArea = Rxn(0);
+  final workingArea = Rx<int>(0);
   AddressController addressController = AddressController.t;
+  final item = Rx<CardInfo>(CardInfo());//全部详情
+  final orderInfo = Rx<OrderInfoModel>(OrderInfoModel());//全部详情
+
+  @override
+  void beforeShow() {
+    // TODO: implement beforeShow
+    super.beforeShow();
+    if(Get.arguments['item']!=null){
+      item(Get.arguments['item']);
+    }else{
+      markId=Get.arguments['id'];
+      getMachineryInfo(markId, '122.08400000000002,37.421998333333335', true).then((value) {
+        item(CardInfo.fromJson(value));
+
+      });
+
+      // item(CardInfo.fromJson(Get.arguments['item']));
+
+      return;
+    }
+  }
+
+
+  Map<String, dynamic> data = {
+
+  };
+
+  void _orderSubmit (){
+
+    if ((_formKey.currentState as FormState).validate()) {
+          data = {
+        'charges': item.value.price! * workingArea.value,
+        'price':  item.value.price,
+        'amount': workingArea.value,
+        'machineryId':  item.value.machineryId,
+        'machineryName':  item.value.name,
+        'machineryType':  item.value.typeId,
+        'typeName':  item.value.typeName,
+        'address': addressController.address.value.address,
+        'orgId':  item.value.orgId,
+        'appointmentDate': '${DateFormat("yyyy-MM-dd").format(selectDate.value)} 08:00:00',
+      };
+      generateOrder(data).then((value) {
+        orderInfo(OrderInfoModel.fromJson(value));
+        Fluttertoast.showToast(
+            msg: '预约成功'
+        );
+        Get.offNamed('/orderPageInfo',arguments: {'id':orderInfo().orderId});
+
+      });
+      //验证通过提交数据
+    }
+
+  }
 
   @override
   Widget builder(BuildContext context) {
@@ -36,7 +97,7 @@ class OrderConfirmation extends BasicPage {
               ),
             ),
             TextFormField(
-              // autofocus: true,
+              autofocus: false,
               keyboardType: TextInputType.number,
               controller: _unameController,
               decoration: const InputDecoration(
@@ -56,7 +117,7 @@ class OrderConfirmation extends BasicPage {
                 hintText: "请输入具体面积(公顷)",
               ),
               onChanged: (e) {
-                workingArea.value = e as int?;
+                workingArea(int.parse(e));
               },
               // 校验用户名
               validator: (v) {
@@ -100,18 +161,21 @@ class OrderConfirmation extends BasicPage {
                             helpText: '请选择作业开始时间',
                             cancelText: '取消',
                             confirmText: '确定',
-                            initialDate: selectDate.value == null
+                            initialDate: selectDate() == null
                                 ? DateTime.now()
-                                : selectDate.value,
+                                : selectDate(),
                             firstDate: DateTime.now(),
                             lastDate: DateTime(2030),
                           );
-                          selectDate.value = handleChnage!;
+                          selectDate(handleChnage!);
                           print('${selectDate}+');
                         },
-                        child: Text(selectDate == null
-                            ? '请选择日期'
-                            : '${DateFormat("yyyy-MM-dd").format(selectDate.value)}'),
+                        child: Obx(()=>
+                            Text(selectDate == null
+                                ? '请选择日期'
+                                : '${DateFormat("yyyy-MM-dd").format(selectDate())}'),
+                        )
+
                       ),
                     )
                   ],
@@ -175,12 +239,9 @@ class OrderConfirmation extends BasicPage {
                 height: 49.h,
                 child: ElevatedButton(
                   onPressed: () {
-                    if ((_formKey.currentState as FormState).validate()) {
-                      var a = {selectDate, workingArea};
-                      print('我确定了$a');
-                      //验证通过提交数据
-                      Get.toNamed('/orderPageInfo');
-                    }
+                    _orderSubmit();
+
+
                   },
                   child: const Text(
                     "确定",

lib/pages/addAddress/index.dart

@@ -1,4 +1,5 @@
 import 'package:farmer_client/models/entities/Address.dart';
+import 'package:farmer_client/services/address.dart';
 import 'package:farmer_client/widgets/DefaultButton.dart';
 import 'package:farmer_client/widgets/layout/BasicPage.dart';
 import 'package:flutter/material.dart';
@@ -10,13 +11,16 @@ class AddAddress extends BasicPage {
 
   final address =Rx<Address>(Address());
   late String text = '';
+  late String id = '';
 
   @override
   void beforeShow() {
     super.beforeShow();
     if (Get.arguments != null) {
-      address.value = Get.arguments['item'];
-      text = address.value.address.toString();
+      print( Get.arguments['item']);
+      // address(Get.arguments['item']);
+      text = Get.arguments['item'];
+      id = Get.arguments['id'];
     }
   }
 
@@ -58,7 +62,7 @@ class AddAddress extends BasicPage {
                 floatingLabelBehavior: FloatingLabelBehavior.never,
               ),
               onChanged: (e) {
-                  address.value.address = e;
+                  address().address=e;
               },
             ),
           ),
@@ -73,9 +77,20 @@ class AddAddress extends BasicPage {
                 Fluttertoast.showToast(
                     msg: '请输入地址！');
               } else{
-                Fluttertoast.showToast(
-                    msg: '保存成功！');
-                Get.back();
+                if(text==''){
+                  addressSave(address().address.toString()).then((value){
+                    Fluttertoast.showToast(
+                        msg: '添加地址成功！');
+                    Get.back();
+                  });
+
+                }else{
+                  addressUpdate(id,address().address.toString()).then((value) {
+                    Fluttertoast.showToast(
+                        msg: '修改地址成功！');
+                    Get.back();
+                  });
+                }
               }
             },
             margin: const EdgeInsets.all(0),

lib/pages/addressList/index.dart

@@ -8,35 +8,56 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:get/get.dart';
 
+import '../../services/address.dart';
+
 class AddressList extends BasicPage {
   bool isBack = false;
   AddressController addressController=AddressController.t;
+  final addressList = Rx<List<Address>>([]);
+
 
   @override
   void beforeShow() {
     super.beforeShow();
+    getAddress().then((value) {
+      final list = <Address>[];
+      value['records'].forEach((item) {
+        list.add(Address.fromJson(item));
+      });
+      addressList(list);
+    });
     if (Get.arguments != null) {
       isBack = Get.arguments['isBack'];
     }
   }
 
-  final addressList = Rx<List<Address>>([
-    Address.fromJson({'address': '777', 'isDefault': false}),
-    Address.fromJson({'address': '999', 'isDefault': false}),
-    Address.fromJson({'address': '这是一个正经的地址', 'isDefault': false}),
-  ]);
 
-  void onChange(index) {
-    for (var element in addressList.value) {
-      if (element.isDefault == true) {
-        element.isDefault = false;
+  void onChange(id) {
+    print(id);
+    addressDefault(id.toString()).then((value){
+      final defaultlist = [...addressList()];
+      for (var element in addressList()) {
+        if (element.isDefault == true) {
+          element.isDefault = false;
+        }
       }
-    }
-    addressList.value[index].isDefault = true;
+      addressList(defaultlist);
+    });
+
   }
+  void onDelete(id) {
+    print(id);
 
-  void onDelete(index) {
-    Fluttertoast.showToast(msg: '删除成功！');
+    addressDelete(id).then((value) {
+      final newslist = [...addressList()];
+      for (var item in addressList()) {
+        if (item.addressId == id) {
+          newslist.remove(item);
+        }
+      }
+      addressList(newslist);
+      Fluttertoast.showToast(msg: '删除成功！');
+    });
   }
 
   @override
@@ -50,8 +71,8 @@ class AddressList extends BasicPage {
             //左对齐
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
-              Column(
-                  children: addressList.value
+              Obx(()=>Column(
+                  children: addressList()
                       .asMap()
                       .keys
                       .map(
@@ -60,22 +81,23 @@ class AddressList extends BasicPage {
                           item: addressList.value[e],
                           isBack: isBack,
                           onChange: () {
-                            onChange(e);
+                            onChange(addressList()[e].addressId);
                           },
                           onEdit: () {
                             Get.toNamed('/addAddress',
-                                arguments: {'item': addressList.value[e]});
+                                arguments: {'id':addressList.value[e].addressId,'item': addressList.value[e].address.toString()});
                           },
                           onDelete: () {
-                            onDelete(e);
+                            onDelete(addressList.value[e].addressId);
                           },
                           onBack: () {
+                            //选择地址
                             addressController.address.value=addressList.value[e];
                             Get.back();
                           },
                         ),
                       )
-                      .toList()),
+                      .toList()),),
               DefaultButton(
                 color: const Color(0xffffffff),
                 backColor: const Color(0xFFFF703B),
@@ -96,3 +118,4 @@ class AddressList extends BasicPage {
     );
   }
 }
+

lib/pages/feedback/index.dart

@@ -5,6 +5,8 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:get/get.dart';
 
+import '../../services/main.dart';
+
 class Feedback extends BasicPage {
   final text=Rx<String>('');
   final isEdit=Rx<bool>(false);
@@ -45,7 +47,11 @@ class Feedback extends BasicPage {
               },
             ),
           ),
-          if(!isEdit.value) Positioned(
+          Obx(()=>
+          Visibility(
+          visible:!isEdit(),
+            child:
+          Positioned(
             left: 20.w,
             top: 5.w,
             child: Row(
@@ -64,6 +70,8 @@ class Feedback extends BasicPage {
               ],
             ),
           ),
+          ),
+          ),
           Positioned(
             bottom: 25.h,
             child: DefaultButton(
@@ -73,11 +81,14 @@ class Feedback extends BasicPage {
               height: 49.h,
               text: '提交',
               onPressed: () {
-                if (text.value == '') {
+                if (text() == '') {
                   Fluttertoast.showToast(msg: '请输入内容哦');
                 } else {
-                  Fluttertoast.showToast(msg: '提交成功！');
-                  Get.back();
+                  feedback(text()).then((value) {
+                    Fluttertoast.showToast(msg: '提交成功！');
+                    Get.back();
+                  });
+
                 }
               },
               margin: const EdgeInsets.all(0),

lib/pages/home.dart

@@ -0,0 +1 @@
+// TODO Implement this library.

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/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/login/login.dart

@@ -100,7 +100,7 @@ class _RouteLogin extends State<MyRouteLogin> {
       if (_newValue) {
         userLogin(handlePhones, handleCodes).then((value) {
           userInfo(Person.fromJson(value['person']));
-          print('已同意协议');
+
 
           Get.off(Home());
         });

lib/pages/machinery/detail/index.dart

@@ -1,19 +1,38 @@
-
+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 = '';
+  String marKm = '';
+  final machineryInfoContent = Rx<CardInfo>(CardInfo());//全部详情
+  final machineryListBanner = Rx<List<BannerImageList>>([]);//banner轮播
+  final machineryListContent= Rx<List<ContentImageList>>([]);//图文详情
   // 响应预约事件
   void handleClick() {
-    Get.toNamed('/orderConfirmation');
+    Get.toNamed('/orderConfirmation',arguments: {'item':machineryInfoContent()});
   }
 
+
   @override
   void beforeShow() {
     // TODO: implement onMounted
     super.beforeShow();
+    if (Get.arguments['id'] != null) {
+     markId = Get.arguments['id'];
+     marKm = Get.arguments['km'];
+     print(marKm);
+      getMachineryInfo(markId, '122.08400000000002,37.421998333333335', true).then((value) {
+        machineryInfoContent(CardInfo.fromJson(value));
+        machineryListBanner(machineryInfoContent().imagesList!);
+        machineryListContent(machineryInfoContent().contentList!);
+
+      });
+
+    }
     print("----show----detail page--------------");
   }
 
@@ -27,7 +46,6 @@ class MachineryDetailPage extends BasicPage {
   @override
   Widget builder(BuildContext context) {
     naviTitle = "查看详情";
-    return page(context: context, handleClick: handleClick);
+    return Obx(()=>page(context: context, handleClick: handleClick,km:marKm,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,39 +7,47 @@ 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}) {
-  final img = 'https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/index-icon19.jpg';
+Widget page({ required BuildContext context, VoidCallback? handleClick,required String km,required CardInfo item,required List<BannerImageList> bnnerItem,required List<ContentImageList> contentItem}) {
 
-  final list = <ExtendContent>[
-    ExtendContent.simple(content: img, contentType: "image" ),
-    ExtendContent.simple(content: "有时，你可能想要创建一个水平滑动（而不是竖直滑动）的列表。 ListView widget 本身就支持水平列表的创建。我们将会使用标准的 ListView 构造方法，通过指定 scrollDirection 的值为水平方向，来覆盖默认的竖直方向。", contentType: "text" ),
-    ExtendContent.simple(content: img, contentType: "image" ),
-    ExtendContent.simple(content: "有时，你可能想要创建一个水平滑动（而不是竖直滑动）的列表。 ListView widget 本身就支持水平列表的创建。我们将会使用标准的 ListView 构造方法，通过指定 scrollDirection 的值为水平方向，来覆盖默认的竖直方向。", contentType: "text" ),
-    ExtendContent.simple(content: img, contentType: "image" ),
-    ExtendContent.simple(content: "有时，你可能想要创建一个水平滑动（而不是竖直滑动）的列表。 ListView widget 本身就支持水平列表的创建。我们将会使用标准的 ListView 构造方法，通过指定 scrollDirection 的值为水平方向，来覆盖默认的竖直方向。", contentType: "text" ),
-    ExtendContent.simple(content: img, contentType: "image" ),
-  ];
 
   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,km),
         )
       ]
   );
 }
 
-Widget _content(BuildContext context, List<ExtendContent> list, VoidCallback? handleClick) {
+Widget _content(BuildContext context, VoidCallback? handleClick, CardInfo item,List<ContentImageList> contentItem, String km) {
   return Column(
     children: [
-      summary(),
+     summary(item: item,km:km),
       _sectionHead('农机详情'),
-      ExtendContentList(list: list),
+      ExtendContentList(item: contentItem,),
       SizedBox(height: 20.w,),
       RoundButton(text: "预约", onPressed: handleClick,)
     ],

lib/pages/machinery/map/index.dart

@@ -4,17 +4,34 @@ import 'package:farmer_client/widgets/layout/BasicPage.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 
-class MachineryMapPage extends BasicPage {
+import '../../../models/entities/CardInfo.dart';
+import '../../../services/homeAPI.dart';
 
+class MachineryMapPage extends BasicPage {
+  String markId = '';
+  String marKm = '';
+  final machineryInfoContent = Rx<CardInfo>(CardInfo());//全部详情
   // 响应预约事件
   void handleClick() {
-    Get.toNamed("/machineryDetail");
+    // Get.toNamed("/machineryDetail");
+    Get.toNamed('/orderConfirmation',arguments: {'item':machineryInfoContent()});
+
   }
 
   @override
   void beforeShow() {
     // TODO: implement onMounted
     super.beforeShow();
+    if (Get.arguments['id'] != null) {
+      markId = Get.arguments['id'];
+      marKm = Get.arguments['km'];
+      print(marKm);
+      getMachineryInfo(markId, '122.08400000000002,37.421998333333335', true).then((value) {
+        machineryInfoContent(CardInfo.fromJson(value));
+
+      });
+
+    }
     print("----show----map page--------------");
   }
 
@@ -28,7 +45,7 @@ class MachineryMapPage extends BasicPage {
   @override
   Widget builder(BuildContext context) {
     naviTitle = "查看地图";
-    return page(context: context, handleClick: handleClick);
+    return Obx(()=>page(context: context, handleClick: handleClick,item: machineryInfoContent(),km: marKm));
   }
   
 }

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

@@ -7,16 +7,16 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:amap_flutter_base/amap_flutter_base.dart';
 import 'package:farmer_client/widgets/amap/amap.dart';
 
+import '../../../../models/entities/CardInfo.dart';
 import '../../widgets/summary.dart';
 
-Widget page({ required BuildContext context, VoidCallback? handleClick}) {
+Widget page({required CardInfo item,required String km, required BuildContext context, VoidCallback? handleClick}) {
   final _offset = 20.w;
   final width = MediaQuery.of(context).size.width;
   final mapHeight = 226.5.w;
   final cardHeight = 250.w;
 
 
-  final img = 'https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/index-icon19.jpg';
   final LatLng position = LatLng(32.690712, 112.091892);
 
   return DefLayout(
@@ -25,21 +25,26 @@ Widget page({ required BuildContext context, VoidCallback? handleClick}) {
         DefLayout.card(
             top: DefLayout.headHeight - DefLayout.offset,
             height: DefLayout.headHeight,
-            child: Image.network(img, fit: BoxFit.cover)
+            child: Image.network(item.thumb.toString(), fit: BoxFit.cover,
+            errorBuilder:  (ctx, exception, stackTrace) {
+              return Container(); //THE WIDGET YOU WANT TO SHOW IF URL NOT RETURN IMAGE
+            },
+            ),
         ),
         DefLayout.card(
             top: (DefLayout.headHeight - DefLayout.offset) * 2,
             padding: EdgeInsets.only(top: 45.w, left: 15.w, right: 15.w, bottom: 20.w),
-            child: _content(context, handleClick)
+            child: _content(context, handleClick,item,km)
         ),
       ]
   );
 }
 
-Widget _content(BuildContext context, VoidCallback? handleClick) {
-  return Column(
+Widget _content(BuildContext context, VoidCallback? handleClick,CardInfo item,String km) {
+  return
+    Column(
     children: [
-      summary(),
+      summary(item: item,km:km),
       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,required String km}) {
+
   return Column(
     children: [
-      _title(),
+      _title(item: item),
       SizedBox(height: 20.w,),
-      _desc(),
+      _desc(item: item,km: km),
       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,21 +70,21 @@ Widget _title() {
   );
 }
 
-Widget _desc() {
+Widget _desc({required CardInfo item,required String km}) {
   return Row(
     children: [
       Icon(Icons.location_on_outlined, size: 16.sp,),
       Expanded(
         flex: 1,
-        child: Text("距离当前位置2.3公里 >>", style: TextStyle(color: const Color(0xFF222222), fontSize: 15.sp),),
+        child: Text("距离当前位置$km >>", style: TextStyle(color: const Color(0xFF222222), fontSize: 15.sp),),
       ),
     ],
   );
 }
 
-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/main/index.dart

@@ -1,15 +1,39 @@
 import 'package:farmer_client/pages/main/widgets/main/index.dart';
 import 'package:farmer_client/widgets/layout/BasicPage.dart';
 import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:get/get_rx/src/rx_types/rx_types.dart';
+
+import '../../models/entities/Address.dart';
+import '../../services/address.dart';
 
 class Main extends BasicPage {
   Main({Key? key}) : super(key: key) {
     tabIndex = 3;
     naviTitle = '我的';
   }
+  final addressListInfo = Rx<List<Address>>([]);
+  final addressInfoContent = Rx<Address>(Address());
+
+
+
+
+  @override
+  void beforeShow() {
+    // TODO: implement beforeShow
+    super.beforeShow();
+    getAddress().then((value) {
+      List<Address> list = [];
+      value['records'].forEach((item) {
+        list.add(Address.fromJson(item));
+      });
+      addressListInfo(list);
+      addressInfoContent(addressListInfo()[0]);
+    });
+  }
 
   @override
   Widget builder(BuildContext context) {
-    return const MainPage();
+    return Obx(()=>MainPage( item: addressInfoContent(),));
   }
 }

lib/pages/main/widgets/OtherColumn.dart

@@ -0,0 +1,155 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+
+class OtherColumn extends StatelessWidget {
+  const OtherColumn({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return  Container(
+        alignment: Alignment.center,
+        width: 345.w,
+        margin: EdgeInsets.fromLTRB(0, 15.w, 0, 15.w),
+        decoration: BoxDecoration(
+          borderRadius: BorderRadius.circular(30),
+          color: Colors.white,
+          boxShadow: [
+            BoxShadow(
+              blurRadius: 10, //阴影范围
+              spreadRadius: 0.1, //阴影浓度
+              color: Colors.grey.withOpacity(0.2), //阴影颜色
+            ),
+          ],
+        ),
+        child: Column(
+          children: [
+            Container(
+                margin: EdgeInsets.fromLTRB(0, 30.w, 0, 20.w),
+                alignment: Alignment.topLeft,
+                decoration: const BoxDecoration(
+                    border: Border(
+                        left: BorderSide(width: 5, color: Color(0xff000000)
+                            // 0x17000000
+                            ))),
+                child: Padding(
+                  padding: EdgeInsets.fromLTRB(12.w, 0, 0, 0),
+                  child: Text(
+                    '地址信息',
+                    style: TextStyle(
+                      color: Color(0xff333333),
+                      fontWeight: FontWeight.bold,
+                      fontSize: 17.sp,
+                    ),
+                  ),
+                )),
+            Container(
+              child: Column(
+                children: [
+                  Container(
+                    height: 45.w,
+                    width: 310.w,
+                    margin: EdgeInsets.fromLTRB(0, 10.w, 0, 0),
+
+                    decoration: const BoxDecoration(
+                        border:Border(
+                            bottom:
+                            BorderSide(width: 0.5, color: Color(0x20000000)
+                              // 0x17000000
+                            ))
+                    ),
+
+                    child: ListTile(
+                      contentPadding: EdgeInsets.symmetric(horizontal: 0.0),
+                      // 这边使用了contentPadding
+                      leading: Image(
+                        image: AssetImage('images/aboutUs.png'),
+                        width: 18.w,
+                        height: 21.w,
+                      ),
+                      title: Transform(
+                        transform: Matrix4.translationValues(-20, 0.0, 0.0),
+                        child: Text("版本更新",
+                            style: TextStyle(
+                                fontSize: 17.sp, color: Color(0xff333333))),
+                      ),
+                      trailing: Image(
+                        image: AssetImage('images/userRight.png'),
+                        width: 10.w,
+                        height: 18.w,
+                      ),
+                    ),
+                  ),
+                  Container(
+                    margin: EdgeInsets.fromLTRB(0, 10.w, 0, 0),
+                    width: 310.w,
+                    height: 45.w,
+                    decoration: const BoxDecoration(
+                        border:Border(
+                            bottom:
+                            BorderSide(width: 0.5, color: Color(0x20000000)
+                              // 0x17000000
+                            ))
+                    ),
+
+                    child: ListTile(
+                      contentPadding: EdgeInsets.symmetric(horizontal: 0.0),
+
+                      leading: Image(
+                        image: AssetImage('images/versionUpdate.png'),
+                        width: 18.w,
+                        height: 21.w,
+                      ),
+                      title: Transform(
+                        transform: Matrix4.translationValues(-20, 0.0, 0.0),
+                        child: Text("用户协议及隐私政策",
+                            style: TextStyle(
+                                fontSize: 17.sp, color: Color(0xff333333))),
+                      ),
+                      trailing: Image(
+                        image: AssetImage('images/userRight.png'),
+                        width: 10.w,
+                        height: 18.w,
+                      ),
+                    ),
+                  ),
+                  Container(
+                    margin: EdgeInsets.fromLTRB(0, 10.w, 0, 20.w),
+                    width: 310.w,
+                    height: 45.w,
+                    decoration: const BoxDecoration(
+                        border:Border(
+                            bottom:
+                            BorderSide(width: 0.5, color: Color(0x20000000)
+                              // 0x17000000
+                            ))
+                    ),
+
+                    child: ListTile(
+                      contentPadding: EdgeInsets.symmetric(horizontal: 0.0),
+
+                      leading: Image(
+                        image: AssetImage('images/feedbacks.png'),
+                        width: 18.w,
+                        height: 21.w,
+                      ),
+                      title: Transform(
+                        transform: Matrix4.translationValues(-20, 0.0, 0.0),
+                        child: Text("意见反馈",
+                            style: TextStyle(
+                                fontSize: 17.sp, color: Color(0xff333333))),
+                      ),
+                      trailing: Image(
+                        image: AssetImage('images/userRight.png'),
+                        width: 10.w,
+                        height: 18.w,
+                      ),
+                    ),
+                  ),
+
+                ],
+              ),
+            )
+          ],
+        ));
+  }
+}

lib/pages/main/widgets/UserAddress.dart

@@ -0,0 +1,98 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+
+class UserAddress extends StatelessWidget {
+  const UserAddress({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+        alignment: Alignment.center,
+        height: 123.w,
+        width: 345.w,
+        margin: EdgeInsets.fromLTRB(0, 15.w, 0, 15.w),
+        decoration: BoxDecoration(
+          borderRadius: BorderRadius.circular(30),
+          color: Colors.white,
+          boxShadow: [
+            BoxShadow(
+              blurRadius: 10, //阴影范围
+              spreadRadius: 0.1, //阴影浓度
+              color: Colors.grey.withOpacity(0.2), //阴影颜色
+            ),
+          ],
+        ),
+        child: Column(
+          children: [
+            Container(
+                margin: EdgeInsets.fromLTRB(0, 30.w, 0, 20.w),
+                alignment: Alignment.topLeft,
+                decoration: const BoxDecoration(
+                    border: Border(
+                        left: BorderSide(width: 5, color: Color(0xff000000)
+                            // 0x17000000
+                            ))),
+                child: Padding(
+                  padding: EdgeInsets.fromLTRB(12.w, 0, 0, 0),
+                  child: Text(
+                    '地址信息',
+                    style: TextStyle(
+                      color: Color(0xff333333),
+                      fontWeight: FontWeight.bold,
+                      fontSize: 17.sp,
+                    ),
+                  ),
+                )),
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                Container(
+                  child: Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    children: [
+                      Padding(
+                        padding: EdgeInsets.fromLTRB(17.w, 0, 10.w, 0),
+                        child: Image(
+                          image: AssetImage('images/gpsImgae.png'),
+                          width: 12.w,
+                        ),
+                      ),
+                      Container(
+                        width: 260,
+                        child: GestureDetector(
+                          child: Text(
+                            '请填写详细地址请填写详细地址请填写详细地址',
+                            softWrap: true,
+                            maxLines: 1,
+                            textAlign: TextAlign.left,
+                            overflow: TextOverflow.ellipsis,
+                            style: TextStyle(
+                              fontWeight: FontWeight.bold,
+                              fontSize: 17,
+                            ),
+                          ),
+                          onTap: () {
+                            print('修改地址');
+                          },
+                        ),
+                      )
+                    ],
+                  ),
+                ),
+                Container(
+                  alignment: Alignment.center,
+                  padding: EdgeInsets.fromLTRB(0, 0, 30.w, 0),
+                  child: Text(
+                    '>>',
+                    style: TextStyle(
+                      fontWeight: FontWeight.bold,
+                      fontSize: 17,
+                    ),
+                  ),
+                ),
+              ],
+            ),
+          ],
+        ));
+  }
+}

lib/pages/main/widgets/UserInfo.dart

@@ -0,0 +1,111 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+
+class UserInfo extends StatelessWidget {
+  const UserInfo({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      margin: EdgeInsets.only(top: 20.0, bottom: 0.0),
+
+      alignment: Alignment.center,
+      height: 173.w,
+      width: 345.w,
+      decoration: BoxDecoration(
+        image: const DecorationImage(
+          image: AssetImage("images/mineBack.png"),
+          fit: BoxFit.cover,
+        ),
+        borderRadius: BorderRadius.circular(10),
+      ),
+      child: Stack(
+        fit: StackFit.expand,
+        children: [
+          Positioned(
+            top: 0,
+            right: 0,
+            child: Container(
+                alignment: Alignment.center,
+                height: 24.w,
+                width: 93.w,
+                decoration: const BoxDecoration(
+                  borderRadius: BorderRadius.only(
+                      bottomLeft: Radius.circular(20),
+                      topRight: Radius.circular(20)),
+                  color: Color(0x30000000),
+                ),
+                child: GestureDetector(
+                  child: const Text(
+                    '修改个人信息',
+                    style: TextStyle(color: Colors.white),
+                  ),
+                  onTap: () {
+                    print('修改个人信息');
+                  },
+                )),
+          ),
+          Row(
+            children: [
+              Column(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  Container(
+                    decoration: BoxDecoration(
+                      shape: BoxShape.circle,
+                      border: Border.all(
+                        color: Colors.white,
+                        width: 2,
+                      ),
+                    ),
+                    margin: EdgeInsets.fromLTRB(30, 0, 15, 0),
+                    alignment: Alignment.center,
+                    child: Image.asset(
+                      "images/userMoren.png",
+                      width: 63.w,
+                    ),
+                  ),
+                ],
+              ),
+              Container(
+                child: Column(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Container(
+                      margin: EdgeInsets.fromLTRB(0, 0, 0, 10),
+                      child: Text(
+                        '符西西',
+                        style: TextStyle(
+                          color: Colors.white,
+                          fontSize: 17,
+                        ),
+                      ),
+                    ),
+                    Container(
+                      margin: EdgeInsets.fromLTRB(0, 10, 0, 0),
+                      child: Text(
+                        '17775000245',
+                        style: TextStyle(
+                          color: Colors.white,
+                          fontSize: 17,
+                        ),
+                      ),
+                    ),
+                    // const Text(
+                    //      '点击登陆',
+                    //      style: TextStyle(
+                    //        color: Colors.white,
+                    //        fontSize: 17,
+                    //      ),
+                    //    ),
+                  ],
+                ),
+              ),
+            ],
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/pages/main/widgets/main/index.dart

@@ -1,23 +1,26 @@
+import 'package:farmer_client/models/entities/Address.dart';
 import 'package:get/get.dart';
 import 'package:get_storage/get_storage.dart';
-
 import './widgets/OtherColumn.dart';
 import './widgets/UserAddress.dart';
 import './widgets/UserInfo.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 
-class MainPage extends StatefulWidget {
-  const MainPage({Key? key}) : super(key: key);
+class MainPage extends StatelessWidget {
+  final Address item;
+
 
-  @override
-  State<MainPage> createState() => _MainPageState();
-}
 
-class _MainPageState extends State<MainPage> {
+  MainPage({Key? key, required this.item}) : super(key: key);
+
   GetStorage box = GetStorage();
+
+
   @override
   Widget build(BuildContext context) {
+    print('644444444444444+$item');
+
     return Container(
       alignment: Alignment.center,
       child: Column(
@@ -25,7 +28,7 @@ class _MainPageState extends State<MainPage> {
           Column(
             children: [
               UserInfo(), //头部，头像手机号姓名
-              UserAddress(), //用户地址
+              UserAddress(item:item),//用户地址
               OtherColumn(), //功能菜单栏
               Container(
                 height: 70.h,

lib/pages/main/widgets/main/widgets/UserAddress.dart

@@ -2,8 +2,12 @@ import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 
+import '../../../../../models/entities/Address.dart';
+
 class UserAddress extends StatelessWidget {
-  const UserAddress({Key? key}) : super(key: key);
+  final Address item;
+
+  const UserAddress({Key? key, required this.item}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -61,8 +65,7 @@ class UserAddress extends StatelessWidget {
                         ),
                         Container(
                           width: 260,
-                          child: Text(
-                            '请填写详细地址请填写详细地址请填写详细地址',
+                          child:  Text(item!=null?item.address.toString():'请设置详细地址！',
                             softWrap: true,
                             maxLines: 1,
                             textAlign: TextAlign.left,

lib/pages/main/widgets/main/widgets/UserInfo.dart

@@ -2,14 +2,19 @@ import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 
+import '../../../../../models/app.dart';
+
 class UserInfo extends StatelessWidget {
-  const UserInfo({Key? key}) : super(key: key);
+  AppController userInfo = AppController.t;
+
+   UserInfo({Key? key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
+    print(userInfo.user().phone);
+
     return Container(
       margin: EdgeInsets.only(top: 20.0, bottom: 0.0),
-
       alignment: Alignment.center,
       height: 173.w,
       width: 345.w,
@@ -52,19 +57,23 @@ class UserInfo extends StatelessWidget {
                 mainAxisAlignment: MainAxisAlignment.center,
                 children: [
                   Container(
+                    width: 63.w,
+                    height: 63.w,
                     decoration: BoxDecoration(
                       shape: BoxShape.circle,
+                      image: userInfo.user().avatar!=null?
+                      DecorationImage(
+                        image: NetworkImage(userInfo.user().avatar.toString()),
+                        fit: BoxFit.cover,
+                      ): DecorationImage(
+                        image: AssetImage('images/userMoren.png')
+                      ),
                       border: Border.all(
                         color: Colors.white,
                         width: 2,
                       ),
                     ),
                     margin: EdgeInsets.fromLTRB(30, 0, 15, 0),
-                    alignment: Alignment.center,
-                    child: Image.asset(
-                      "images/userMoren.png",
-                      width: 63.w,
-                    ),
                   ),
                 ],
               ),
@@ -75,8 +84,9 @@ class UserInfo extends StatelessWidget {
                   children: [
                     Container(
                       margin: EdgeInsets.fromLTRB(0, 0, 0, 10),
-                      child: Text(
-                        '符西西',
+                      child:
+                      Text(
+                        userInfo.user().nickName!=null?userInfo.user().nickName.toString():'请修改个人信息！',
                         style: TextStyle(
                           color: Colors.white,
                           fontSize: 17,
@@ -85,12 +95,14 @@ class UserInfo extends StatelessWidget {
                     ),
                     Container(
                       margin: EdgeInsets.fromLTRB(0, 10, 0, 0),
-                      child: Text(
-                        '17775000245',
-                        style: TextStyle(
-                          color: Colors.white,
-                          fontSize: 17,
-                        ),
+                      child:
+                          Text(
+                            userInfo.user().phone!=null?userInfo.user().phone.toString():'请修改手机号！',
+                            style: TextStyle(
+                              color: Colors.white,
+                              fontSize: 17,
+                            ),
+
                       ),
                     ),
                     // const Text(

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/pages/orderInfo/index.dart

@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:get/get.dart';
+import 'package:farmer_client/widgets/Modal.dart' as modal;
 
 import '../../models/entities/OrderInfoModel.dart';
 import '../../services/orderAPI.dart';
@@ -18,10 +19,9 @@ import '../../widgets/layout/BasicPage.dart';
 
 
 class OrderPageInfo extends BasicPage {
-  String id = '';
-  String orderStateText = '';
-  late Color orderStateColor;
-
+  final id=Rx<String>('');
+  final orderStateText=Rx<String>('待支付');
+  final orderStateColor=Rx<Color>(Colors.black);
   final orderInfoContent = Rx<OrderInfoModel>(OrderInfoModel());
 
   // orderStates
@@ -31,17 +31,18 @@ class OrderPageInfo extends BasicPage {
     // TODO: implement beforeShow
     super.beforeShow();
     if (Get.arguments['id'] != null) {
-      id = Get.arguments['id'];
+      id(Get.arguments['id']);
 
-      orderStateText = Get.arguments['title'];
-      orderStateColor = Get.arguments['styleColor'];
+      orderStateText(Get.arguments['title']);
+      orderStateColor(Get.arguments['styleColor']);
 
-      orderInfo(id).then((value) {
-        orderInfoContent.value = OrderInfoModel.fromJson(value);
+      orderInfo(id()).then((value) {
+        orderInfoContent(OrderInfoModel.fromJson(value));
       });
     }
   }
 
+
   @override
   Widget builder(BuildContext context) {
     naviTitle = '订单详情';
@@ -50,12 +51,12 @@ class OrderPageInfo extends BasicPage {
       children: [
         Obx(() =>
             OrderInfoCard(
-                item: orderInfoContent.value,
-                orderStateText: orderStateText,
-                orderStateColor: orderStateColor
+                item: orderInfoContent(),
+                orderStateText: orderStateText(),
+                orderStateColor: orderStateColor()
             ),
         ),
-        _BottomWidget()
+        Obx(()=>_BottomWidget(id: id()))
         // orderStateText=='已完成'?  Text('')
         //     :orderStateText== '进行中' ?Text('')
         //     :orderStateText=='待评价'? DefaultButton(
@@ -110,7 +111,21 @@ class OrderPageInfo extends BasicPage {
 }
 
 class _BottomWidget extends StatelessWidget {
-  const _BottomWidget({Key? key}) : super(key: key);
+  final id;
+  const _BottomWidget({Key? key, required this.id}) : super(key: key);
+
+
+  void _orderDeletels (){
+    modal.showDialog(title: '测试', content: SizedBox(width: 400, height: 300,), onConfirm: () => true);
+    // orderDelete(id).then((value) {
+    //   Fluttertoast.showToast(
+    //       msg: '订单取消成功！'
+    //   );
+    //   Get.offNamed('/order');
+    // });
+  }
+
+
 
   @override
   Widget build(BuildContext context) {
@@ -122,33 +137,43 @@ class _BottomWidget extends StatelessWidget {
       child: Row(
         mainAxisAlignment: MainAxisAlignment.spaceBetween,
         children: [
-          GestureDetector(
-            onTap: () {
-              // onCancel();
-            },
-            child: Container(
-              width: 150.w,
-              height: 49.h,
-              decoration: BoxDecoration(
-                  color: const Color(0xffffffff),
-                  border: Border.all(
-                      color: const Color(0xFFFF703B),
-                      width: 1.w,
-                      style: BorderStyle.solid),
-                  borderRadius:
-                  BorderRadius.all(Radius.circular(24.5.w))),
-              child: Center(
-                child: Text(
-                  '取消',
+          Container(
+            width: 150.w,
+            height: 49.h,
+            margin: EdgeInsets.fromLTRB(0, 30.w, 0, 30.w),
+            alignment: Alignment.bottomCenter,
+            child: SizedBox(
+                  width: 150.w,
+                  height: 49.h,
+              child: ElevatedButton(
+                onPressed: () {
+                  _orderDeletels();
+                },
+                child: const Text(
+                  "取消",
                   style: TextStyle(
-                      fontSize: 20.sp,
-                      color: const Color(0xFFFF703B),
+                      fontSize: 18,
+                      color: Color(0xFFFF703B),
                       fontWeight: FontWeight.bold),
                 ),
+                style: ButtonStyle(
+                  side: MaterialStateProperty.all(
+                      BorderSide(width: 1, color: Color(0xFFFF703B))), //边框
+                  elevation: MaterialStateProperty.all(0),
+                  backgroundColor: MaterialStateProperty.all(Colors.white),
+                  shape: MaterialStateProperty.all(
+                    RoundedRectangleBorder(
+                        borderRadius:
+                        BorderRadius.all(Radius.circular(24.4))),
+                  ),
+                ),
               ),
             ),
           ),
-          DefaultButton(
+      Container(
+        margin: EdgeInsets.fromLTRB(0, 30.w, 0, 30.w),
+        alignment: Alignment.bottomCenter,
+        child: DefaultButton(
             color: const Color(0xffffffff),
             backColor: const Color(0xFFFF703B),
             width: 150.w,
@@ -162,6 +187,7 @@ class _BottomWidget extends StatelessWidget {
             fontSize: 20.sp,
             radius: 24.5.w,
           ),
+      ),
         ],
       ),
     );

lib/pages/userInfo/index.dart

@@ -5,29 +5,63 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:get/get.dart';
 
+import '../../models/app.dart';
+import '../../models/entities/person.dart';
+import '../../services/user.dart';
+
 class UserInfo extends BasicPage {
-  final name =Rx<String>('');
-  final phone =Rx<String>('');
+  late String name ;
+  late String phone;
   late TextEditingController _cName;
   late TextEditingController _cPhone;
+  AppController userInfo = AppController.t;
+
+
   @override
   void beforeShow() {
     super.beforeShow();
-    _cName = TextEditingController(text: name.value);
-    _cPhone = TextEditingController(text: phone.value);
+    _cName = TextEditingController(text: userInfo.user().nickName.toString());
+    _cPhone = TextEditingController(text:userInfo.user().phone.toString());
+    name=userInfo.user().nickName.toString();
+    phone=userInfo.user().phone.toString();
   }
 
   bool disableLogin = false;
   RegExp exp = RegExp(r'^1[3456789]\d{9}$');
 
+  Map<String, dynamic> data = {
+
+  };
+
+
   void handleOk() {
-    if (name.value == '' && phone.value == '') {
-      Fluttertoast.showToast(msg: '请输入您的信息');
-    } else if (phone.value!=''&&!exp.hasMatch(phone.value)) {
+    if (name == '' && phone == '') {
+      Fluttertoast.showToast(msg: '请输入正确的信息');
+      return;
+
+    } else if (phone==''&&!exp.hasMatch(phone)) {
       Fluttertoast.showToast(msg: '请输入正确的手机号');
+      return;
     } else {
-      Fluttertoast.showToast(msg: '保存成功');
-      Get.back();
+      data={
+        ...userInfo.user().toJson(),
+        'avatar':userInfo.user().avatar ?? '',
+        'nickName': name,
+        'phone': phone
+      };
+      updateInfo(userInfo.user().personId.toString(),data).then((value) {
+        // 尝试获取一次人员信息
+        getCurrent().then((person) {
+          userInfo.user(Person.fromJson(person));
+          Fluttertoast.showToast(msg: '保存成功');
+
+          Get.back();
+
+        }).catchError((e) {
+          print(e);
+        });
+
+      });
     }
   }
 
@@ -59,19 +93,21 @@ class UserInfo extends BasicPage {
             child: Row(
                 mainAxisAlignment: MainAxisAlignment.spaceBetween,
                 children: [
-                  Image.asset(
-                    'images/userMoren.png',
-                    width: 62.w,
-                    height: 62.w,
-                  ),
-                  Text(
-                    '更换头像',
-                    style: TextStyle(
-                        fontSize: 17.sp,
-                        color: Color(0xFF333333),
-                        letterSpacing: 2,
-                        fontWeight: FontWeight.w500),
+                  Container(
+                    width: 63.w,
+                    height: 63.w,
+                    decoration: BoxDecoration(
+                      shape: BoxShape.circle,
+                      image: userInfo.user().avatar!=null?
+                      DecorationImage(
+                        image: NetworkImage(userInfo.user().avatar.toString()),
+                        fit: BoxFit.cover,
+                      ): DecorationImage(
+                          image: AssetImage('images/userMoren.png')
+                      ),
+                    ),
                   ),
+
                 ]),
           ),
           Text(
@@ -119,13 +155,15 @@ class UserInfo extends BasicPage {
                               FloatingLabelBehavior.never,
                             ),
                             onChanged: (e) {
-                                name.value = e;
+
+                                name = e;
+                                print(name);
                             },
                           ),
                         ),
                         GestureDetector(
                           onTap: () {
-                              name.value = '';
+                              name = '';
                             _cName.clear();
                           },
                           child: Image.asset(
@@ -184,13 +222,13 @@ class UserInfo extends BasicPage {
                               FloatingLabelBehavior.never,
                             ),
                             onChanged: (e) {
-                                phone.value = e;
+                                phone = e;
                             },
                           ),
                         ),
                         GestureDetector(
                           onTap: () {
-                              phone.value = '';
+                              phone = '';
                             _cPhone.clear();
                           },
                           child: Image.asset(

lib/services/address.dart

@@ -0,0 +1,73 @@
+
+import 'package:dio/dio.dart';
+import 'package:farmer_client/utils/Request.dart';
+import 'package:fluttertoast/fluttertoast.dart';
+
+/**
+ * 地址列表
+ * @param {*} data
+ * @returns
+ */
+Future getAddress() async {
+  return request('/address',
+      options: Options(method: 'GET')).catchError((error) => {
+    Fluttertoast.showToast(msg: error.error['message']),
+  });
+}
+
+
+/**
+ * 地址保存
+ * @param {*} data
+ * @returns
+ */
+Future addressSave(String address) async {
+  return request('/address',
+      options: Options(method: 'POST'), data: {'address': address})
+      .catchError((error) => {
+    Fluttertoast.showToast(msg: error.error['message']),
+  });
+}
+
+
+
+/**
+ * 地址删除
+ * @param {*} data
+ * @returns
+ */
+Future addressDelete(String id)async{
+  return request('/address/$id',options: Options(method: 'DELETE')).catchError((error) =>
+  { Fluttertoast.showToast(
+      msg: error.error['message']
+  ),});
+
+}
+
+
+/**
+ * 地址修改更新
+ * @param {*} data
+ * @returns
+ */
+Future addressUpdate(String id,String address)async{
+  return request('/address/$id',options: Options(method: 'PUT'),data: {'address':address}).catchError((error) =>
+  { Fluttertoast.showToast(
+      msg: error.error['message']
+  ),});
+
+}
+
+
+/**
+ * 地址是否默认
+ * @param {*} data
+ * @returns
+ */
+Future addressDefault(String id)async{
+  return request('/address/$id/default',options: Options(method: 'PUT')).catchError((error) =>
+  { Fluttertoast.showToast(
+      msg: error.error['message']
+  ),});
+
+}

lib/services/homeAPI.dart

@@ -1,52 +1,47 @@
-
-
 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
  */
-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) =>
+
+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']
   ),});
-
 }
 
 
@@ -55,9 +50,6 @@ Future getMachineryInfo(String id,String location ,bool attached)async{
  * @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/services/main.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 feedback(String content) async {
+  return request('/feedback',
+      options: Options(method: 'POST'), data: {'content': content})
+      .catchError((error) => {
+    Fluttertoast.showToast(msg: error.error['message']),
+  });
+}
+
+
+
+

lib/services/orderAPI.dart

@@ -33,3 +33,31 @@ Future orderInfo(String id)async{
 }
 
 
+/**
+ * 生成订单
+ * @param {*} data
+ * @returns
+ */
+
+Future generateOrder(item)async{
+  return request('/order',options: Options(method: 'POST'),data: item).catchError((error) =>
+  { Fluttertoast.showToast(
+      msg: error.error['message']
+  ),});
+
+}
+
+
+
+/**
+ * 删除订单
+ * @param {*} data
+ * @returns
+ */
+Future orderDelete(String id)async{
+  return request('/order/$id',options: Options(method: 'DELETE')).catchError((error) =>
+  { Fluttertoast.showToast(
+      msg: error.error['message']
+  ),});
+
+}

lib/services/user.dart

@@ -30,3 +30,17 @@ Future userLogin(String userName,String password) async {
 Future getCurrent() async {
   return request('/person/current');
 }
+
+
+
+/**
+ * 修改个人信息
+ * @param {*}
+ * @returns
+ */
+Future updateInfo(String id, userdata) async {
+  return request('/person/$id', options: Options(method: 'PUT'),data: userdata).catchError((error) =>
+  { Fluttertoast.showToast(
+      msg: error.error['message']
+  ),});
+}

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,

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);
 
@@ -19,9 +20,24 @@ class CarsCard extends StatefulWidget {
   _CarsCardPage createState() => _CarsCardPage(item);
 }
 
+
 class _CarsCardPage extends State<CarsCard> {
-  final CardInfo item;
+  final CardListModel item;
   _CarsCardPage(this.item);
+  setMorKm () {
+    String n = '';
+
+    if (item.distance !=null) {
+      if ((item.distance??0) >= 1000) {
+        n = ((item.distance??0) / 1000).toStringAsFixed(2).toString() + '公里';
+      } else {
+        n = item.distance.toString() + '米';
+      }
+    } else {
+      n = '0m';
+    }
+    return n;
+}
 
   @override
   Widget build(BuildContext context) {
@@ -36,7 +52,7 @@ class _CarsCardPage extends State<CarsCard> {
         children: [
           GestureDetector(
             onTap: () {
-              Get.to(MachineryDetailPage());
+              Get.to(MachineryDetailPage(),arguments: {'id':item.machineryId,'km':setMorKm().toString()});
             },
             child: Image.network(
               item.thumb.toString(),
@@ -53,8 +69,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),
                   ),
                 ),
@@ -109,7 +129,7 @@ class _CarsCardPage extends State<CarsCard> {
                     child: ElevatedButton(
                       onPressed: () {
                         Get.toNamed('/orderConfirmation',
-                            arguments: {'machineryId': item.machineryId});
+                            arguments: {'id':item.machineryId});
                       },
                       child: const Text(
                         "预约",
@@ -150,11 +170,24 @@ class _CarsCardPage extends State<CarsCard> {
                       child: Row(
                         mainAxisAlignment: MainAxisAlignment.spaceBetween,
                         children: [
-                          Text(
-                            '距离当前位置2.6公里',
-                            style: TextStyle(
-                                fontSize: 15, fontWeight: FontWeight.bold),
+                          Container(
+                            child: Row(
+                              children: [
+                                Text(
+                                  '距离当前位置',
+                                  style: TextStyle(
+                                      fontSize: 15, fontWeight: FontWeight.bold),
+                                ),
+                                Text(
+                                  setMorKm().toString(),
+                                  style: TextStyle(
+                                      fontSize: 15, fontWeight: FontWeight.bold),
+                                ),
+
+                              ],
+                            ),
                           ),
+
                           GestureDetector(
                             child: Text(
                               '进入地图 >>',
@@ -164,7 +197,7 @@ class _CarsCardPage extends State<CarsCard> {
                             onTap: () {
                               print('进入地图');
                               Get.toNamed('/machineryMap',
-                                  arguments: {'machineryId': item.machineryId});
+                                  arguments: {'id':item.machineryId,'km':setMorKm().toString()});
                             },
                           )
                         ],
@@ -176,3 +209,5 @@ class _CarsCardPage extends State<CarsCard> {
     );
   }
 }
+
+

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,40 @@ class ExtendContentList extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-
-    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,
+    //
+    // 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),
+    //   ));
+    // }
+
+    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)
+            );
+          } else {
+            return Container(
+              padding: EdgeInsets.fromLTRB(0, 10, 0, 10),
+              child: _image(item.content),
+            );
+          }
+        }).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';
@@ -8,8 +9,8 @@ import 'LinearGradientText.dart';
 
 class OrderInfoCard extends StatelessWidget {
   final OrderInfoModel item;
-  final String orderStateText;
-  final Color orderStateColor;
+  final String? orderStateText;
+  final Color? orderStateColor;
 
  // final  DateTime timeNew=item.appointmentDate;
 
@@ -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),
@@ -159,9 +161,9 @@ class OrderInfoCard extends StatelessWidget {
                                   fontSize: 16,
                                   fontWeight: FontWeight.bold)),
                           TextSpan(
-                              text: orderStateText,
+                              text: orderStateText??'未支付',
                               style: TextStyle(
-                                  color:orderStateColor,
+                                  color:orderStateColor??Colors.black,
                                   fontSize: 16,
                                   fontWeight: FontWeight.bold)),
                         ]),
@@ -191,7 +193,7 @@ class OrderInfoCard extends StatelessWidget {
                                     Color(0xFFFA7878),
                                     Color(0xFFB61515),
                                   ],
-                                  child: const Text('8880',
+                                  child:  Text(( (item.charges??0)/100).toString(),
                                       style: TextStyle(
                                           color: Color(0xffB61515),
                                           fontSize: 16,
@@ -211,9 +213,9 @@ class OrderInfoCard extends StatelessWidget {
                                           color: Color(0xff666666),
                                           fontSize: 16,
                                           fontWeight: FontWeight.bold)),
-                                  Text(orderStateText,
+                                  Text(orderStateText??'未支付',
                                       style: TextStyle(
-                                          color: orderStateColor,
+                                          color: orderStateColor??Colors.black,
                                           fontSize: 16,
                                           fontWeight: FontWeight.bold)),
                                 ],

lib/widgets/OrderListCard.dart

@@ -288,7 +288,7 @@ class _OrderListCardPages extends State<OrderListCard> {
                                 text:  TextSpan(
                                     children: <InlineSpan>[
                                       TextSpan(
-                                          text:( item.charges!/100).toString(),
+                                          text:( (item.charges??0)/100).toString(),
                                           style: TextStyle(
                                             fontSize: 16,
                                             fontWeight: FontWeight.bold,

lib/widgets/amap/const_config.dart

@@ -0,0 +1,22 @@
+import 'package:amap_flutter_base/amap_flutter_base.dart';
+import 'package:amap_flutter_map/amap_flutter_map.dart';
+
+class ConstConfig {
+  ///配置您申请的apikey，在此处配置之后，可以在初始化[AMapWidget]时，通过`apiKey`属性设置
+  ///
+  ///注意：使用[AMapWidget]的`apiKey`属性设置的key的优先级高于通过Native配置key的优先级，
+  ///使用[AMapWidget]的`apiKey`属性配置后Native配置的key将失效，请根据实际情况选择使用
+  static const AMapApiKey amapApiKeys = AMapApiKey(
+      androidKey: 'b481b4187e24e625fa0056fd0530e663',
+      iosKey: '您申请的iOS平台的key');
+
+  ///高德隐私合规声明，这里只是示例，实际使用中请按照实际参数设置[AMapPrivacyStatement]的'hasContains''hasShow''hasAgree'这三个参数
+  ///
+  /// 注意：[AMapPrivacyStatement]的'hasContains''hasShow''hasAgree'这三个参数中有一个为false，高德SDK均不会工作，会造成地图白屏等现象
+  ///
+  /// 高德开发者合规指南请参考：https://lbs.amap.com/agreement/compliance
+  ///
+  /// 高德SDK合规使用方案请参考：https://lbs.amap.com/news/sdkhgsy
+  static const AMapPrivacyStatement amapPrivacyStatement =
+  AMapPrivacyStatement(hasContains: true, hasShow: true, hasAgree: true);
+}

pubspec.lock

@@ -335,7 +335,7 @@ packages:
       name: path_provider_android
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.12"
+    version: "2.0.13"
   path_provider_ios:
     dependency: transitive
     description:
@@ -536,7 +536,7 @@ packages:
       name: win32
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.5.1"
+    version: "2.5.2"
   xdg_directories:
     dependency: transitive
     description:
@@ -553,4 +553,4 @@ packages:
     version: "3.1.0"
 sdks:
   dart: ">=2.16.1 <3.0.0"
-  flutter: ">=2.8.0"
+  flutter: ">=2.8.1"