'.'

lib/models/entities/ExtendContent.dart

@@ -0,0 +1,44 @@
+
+class ExtendContent {
+  // 租户号
+  String? extId;
+
+  // 扩展对象类型;message消息表 bannar轮播图 info资讯
+  String? targetType;
+
+  // 拓展对象Id
+  String? targetId;
+
+  // 内容类型;text文本 image图片
+  String? contentType;
+
+  // 内容
+  String? content;
+
+  // 排序
+  int? sort;
+
+  // 创建时间
+  String? createDate;
+
+  ExtendContent();
+
+  ExtendContent.fromJson(Map<String, dynamic> json)
+      : extId = json["extId"],
+        targetType = json["targetType"],
+        targetId = json["targetId"],
+        contentType = json["contentType"],
+        content = json["content"],
+        sort = json["sort"],
+        createDate = json["createDate"];
+
+  Map<String, dynamic> toJson() => {
+    'extId' : extId,
+    'targetType' : targetType,
+    'targetId' : targetId,
+    'contentType' : contentType,
+    'content' : content,
+    'sort' : sort,
+    'createDate' : createDate,
+  };
+}

lib/models/entities/Machinery.dart

@@ -0,0 +1,116 @@
+import 'package:worker_client/models/entities/ExtendContent.dart';
+import 'package:worker_client/models/entities/MachineryImage.dart';
+
+class Machinery {
+  // APP 注册状态
+  String? appStatus;
+  //购买时间
+  String? buyDate;
+//  创建时间
+  String? createDate;
+//  创建用户
+  String? createUser;
+//  押金
+  int? deposit;
+//  工作状态
+  String? jobStatus;
+//  人工费
+  int? laborCost;
+//  当前位置
+  String? location;
+//  农机Id
+  String? machineryId;
+//  名称
+  String? name;
+//  机构ID
+  String? orgId;
+//  机构名称
+  String? orgName;
+//  农机价格
+  int? price;
+  //  归属区域id
+  String? regionId;
+  //  归属区域名
+  String? regionName;
+  //  状态
+  int? status;
+  //  主图
+  String? thumb;
+  //  农机类型
+  String? typeId;
+  //  类型名称
+  String? typeName;
+  //  更新时间
+  String? updateDate;
+  //  更新用户
+  String? updateUser;
+
+  //农机详情列表
+  List<ExtendContent>? contentList = [];
+
+  //农机banner图集
+  List<MachineryImage>? imagesList = [];
+
+  Machinery();
+
+  Machinery.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 = jsonToContentList(json["contentList"]),
+        imagesList = jsonToImagesList(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': ListTojson(contentList),
+        'imagesList': ListTojson(imagesList),
+      };
+}
+
+List<ExtendContent> jsonToContentList(list) {
+  List<ExtendContent> contList = [];
+  if (list!=null) {
+    list.forEach((item) {
+      contList.add(ExtendContent.fromJson(item));
+    });
+  }
+  return contList;
+}
+
+List<MachineryImage> jsonToImagesList(list) {
+  List<MachineryImage> contList = [];
+  if (list!=null) {
+    list.forEach((item) {
+      contList.add(MachineryImage.fromJson(item));
+    });
+  }
+  return contList;
+}
+
+List<Map<String, dynamic>> ListTojson(list) {
+  List<Map<String, dynamic>> contList = [];
+  list.forEach((item) {
+    contList.add(item.toJson());
+  });
+  return contList;
+}

lib/models/entities/MachineryImage.dart

@@ -0,0 +1,33 @@
+class MachineryImage {
+//  图片ID
+  String? imageId;
+//  状态
+  int? status;
+//  对象ID
+  String? targetId;
+//  所属对象
+  String? targetType;
+//  图片地址
+  String? url;
+//创建时间
+  String? createDate;
+
+  MachineryImage();
+
+  MachineryImage.fromJson(Map<String, dynamic> json)
+      : imageId = json["imageId"],
+        status = json["status"],
+        targetId = json["targetId"],
+        targetType = json["targetType"],
+        url = json["url"],
+        createDate = json["createDate"];
+
+  Map<String, dynamic> toJson() => {
+        'imageId': imageId,
+        'status': status,
+        'targetId': targetId,
+        'targetType': targetType,
+        'url': url,
+        'createDate': createDate,
+      };
+}

lib/models/entities/person.dart

@@ -1,9 +1,9 @@
-
 class Person {
   String? personId;
   String? appId;
   String? openid;
   String? nickName;
+  String? userName;
   String? avatar;
   int? sex;
   String? phone;
@@ -11,13 +11,14 @@ class Person {
   int? status;
   String? createDate;
 
-  Person ();
+  Person();
 
   Person.fromJson(Map<String, dynamic> json)
       : personId = json["personId"],
         appId = json["appId"],
         openid = json["openid"],
         nickName = json["nickName"],
+        userName = json["userName"],
         avatar = json["avatar"],
         sex = json["sex"],
         phone = json["phone"],
@@ -26,15 +27,16 @@ class Person {
         createDate = json["createDate"];
 
   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,
+        'userName': userName,
+        'avatar': avatar,
+        'sex': sex,
+        'phone': phone,
+        'userId': userId,
+        'status': status,
+        'createDate': createDate,
+      };
 }

lib/pages/machineryList/index.dart

@@ -1,11 +1,40 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:get/get.dart';
+import 'package:worker_client/models/app.dart';
+import 'package:worker_client/models/entities/Machinery.dart';
+import 'package:worker_client/pages/machineryList/widgets/MachineryCard.dart';
+import 'package:worker_client/services/machinery.dart';
+import 'package:worker_client/widgets/NullCard.dart';
 import 'package:worker_client/widgets/layout/BasicPage.dart';
 
-class MachineryList extends BasicPage{
+class MachineryList extends BasicPage {
+  final machineryList = Rx<List<Machinery>>([]);
+  String? location = AppController.t.locationStr;
+  @override
+  void beforeShow() {
+    super.beforeShow();
+    getMachineryList({'pageNum': 1, 'location': location}).then((res) {
+      dynamic list = <Machinery>[];
+      res['records'].forEach((item) => {list.add(Machinery.fromJson(item))});
+      machineryList(list);
+    });
+  }
+
   @override
   Widget builder(BuildContext context) {
     naviTitle = '我的';
-    return const Text('农机列表');
+    return Container(
+      padding: EdgeInsets.only(top: 15.w),
+      child: Obx(() => machineryList.value.length > 0
+          ? ListView(
+        children: machineryList.value
+            .map((e) =>
+            MachineryCard(machinery: e, goDetail: () {}, goMap: () {}))
+            .toList(),
+      )
+          : const NullCard(text: '暂无更多农机')),
+    )
+      ;
   }
-
-}
+}

lib/pages/machineryList/widgets/MachineryCard.dart

@@ -0,0 +1,89 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:worker_client/models/entities/Machinery.dart';
+
+import '../../../widgets/Jianbian/index.dart';
+
+class MachineryCard extends StatelessWidget {
+  final Machinery machinery;
+  final GestureTapCallback goDetail;
+  final GestureTapCallback goMap;
+
+  const MachineryCard(
+      {Key? key,
+      required this.machinery,
+      required this.goDetail,
+      required this.goMap})
+      : super(key: key);
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      margin: EdgeInsets.only(left:15.w,right: 15.w,bottom: 15.w),
+      clipBehavior: Clip.hardEdge,
+      decoration: BoxDecoration(
+          color: Colors.white,
+          borderRadius: BorderRadius.all(Radius.circular(20.w)),
+          boxShadow: [
+            BoxShadow(
+                color: const Color(0x14000000),
+                offset: const Offset(0, 0),
+                blurRadius: 22.w)
+          ]),
+      child: Stack(
+        children: [
+          Column(
+            children: [
+              GestureDetector(
+                onTap: goDetail,
+                child: Image.network(
+                  machinery.thumb.toString(),
+                  width: 345.w,
+                  height: 227.7.w,
+                  fit: BoxFit.fill,
+                ),
+              ),
+              Container(
+                padding: EdgeInsets.fromLTRB(14.w, 19.5.h, 14.w, 30.h),
+                child: Row(
+                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                  children: [
+                    SizedBox(
+                      width: 250.w,
+                      child: GestureDetector(
+                        onTap: goDetail,
+                        child: Text(
+                          machinery.name.toString(),
+                          softWrap: true,
+                          textAlign: TextAlign.left,
+                          overflow: TextOverflow.ellipsis,
+                          maxLines: 1,
+                          style: TextStyle(
+                            fontWeight: FontWeight.w700,
+                            fontSize: 18.sp,
+                            color: const Color(0xFF222222),
+                          ),
+                        ),
+                      ),
+                    ),
+                    GestureDetector(
+                      onTap: goMap,
+                      child: const Text(
+                        '进入地图>>',
+                        style: TextStyle(fontWeight: FontWeight.w700),
+                      ),
+                    )
+                  ],
+                ),
+              ),
+            ],
+          ),
+          Jianbian(
+            status: machinery.status,
+            type: 'machinery',
+            value: machinery.jobStatus,
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/pages/main/index.dart

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:get_storage/get_storage.dart';
+import 'package:worker_client/models/app.dart';
 import 'package:worker_client/widgets/GradientButton.dart';
 import 'package:worker_client/widgets/MyCell/index.dart';
 import 'package:worker_client/widgets/layout/BasicPage.dart';
@@ -12,7 +13,7 @@ class Main extends BasicPage {
     tabIndex = 2;
     naviTitle = '我的';
   }
-
+  var store = AppController.t;
   GetStorage box = GetStorage();
 
   void loginOut() {
@@ -26,7 +27,8 @@ class Main extends BasicPage {
         },
         onCancel: () => true);
   }
-  void goMachinery(){
+
+  void goMachinery() {
     Get.toNamed('/machineryList');
   }
 
@@ -54,18 +56,24 @@ class Main extends BasicPage {
                     children: [
                       Container(
                         margin: EdgeInsets.fromLTRB(40.w, 0, 10.w, 0),
-                        child: Image.asset(
-                          'images/main/defaultAvatar.png',
-                          width: 63.w,
-                          height: 63.w,
-                        ),
+                        child: store.user().avatar != null
+                            ? Image.network(
+                                store.user().avatar.toString(),
+                                width: 63.w,
+                                height: 63.w,
+                              )
+                            : Image.asset(
+                                'images/main/defaultAvatar.png',
+                                width: 63.w,
+                                height: 63.w,
+                              ),
                       ),
                       Column(
                         mainAxisAlignment: MainAxisAlignment.center,
                         crossAxisAlignment: CrossAxisAlignment.start,
                         children: [
                           Text(
-                            '姓名',
+                            store.user().nickName != null?store.user().nickName.toString():'',
                             style: TextStyle(
                                 color: Colors.white,
                                 fontWeight: FontWeight.w500,
@@ -81,7 +89,8 @@ class Main extends BasicPage {
                           Container(
                             margin: EdgeInsets.fromLTRB(0, 19.h, 0, 0),
                             child: Text(
-                              '手机号',
+                                store.user().nickName != null?
+                              store.user().phone.toString():'',
                               style: TextStyle(
                                   color: Colors.white,
                                   fontWeight: FontWeight.w500,
@@ -107,7 +116,7 @@ class Main extends BasicPage {
                 child: Container(
                   decoration: const BoxDecoration(color: Color(0xb2000000)),
                   child: Text(
-                    '该账号归。。。所属',
+                    '该账号归${store.user().nickName!=null?store.user().nickName.toString():''}所属',
                     style: TextStyle(color: Colors.white, fontSize: 12.sp),
                   ),
                 ),
@@ -131,7 +140,7 @@ class Main extends BasicPage {
                       mainAxisAlignment: MainAxisAlignment.spaceAround,
                       children: [
                         GestureDetector(
-                          onTap:(){
+                          onTap: () {
                             goMachinery();
                           },
                           child: Column(

lib/services/machinery.dart

@@ -0,0 +1,23 @@
+import 'package:dio/dio.dart';
+import '../utils/Request.dart';
+import 'package:fluttertoast/fluttertoast.dart';
+
+/// 农机列表
+/// @param {*} data
+/// @returns
+Future getMachineryList(params) async {
+  return request('/machinery',
+      options: Options(method: 'GET'), queryParameters: params)
+      .catchError((error) =>
+  {Fluttertoast.showToast(msg: error.error.toString()), print(error)});
+}
+
+/// 农机详情
+/// @param {*} data
+/// @returns
+Future getMachineryDetail(String id) async {
+  return request('/machinery-summary/$id', options: Options(method: 'GET'))
+      .catchError((error) => {
+    Fluttertoast.showToast(msg: error.error['message']),
+  });
+}

lib/widgets/Jianbian/index.dart

@@ -0,0 +1,96 @@
+import 'dart:math';
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:worker_client/widgets/MyCard/entities/ItemColor.dart';
+
+class Jianbian extends StatelessWidget {
+  Jianbian({Key? key,  this.type, required this.status, this.value})
+      : super(key: key);
+
+  final String? type;
+  final dynamic status;
+  final dynamic? value;
+
+  List<ItemColor> colors = [
+    ItemColor(const Color(0xFFC7C7C7), const Color(0xFF8F8F8F),
+        const Color(0xFFC0C0C0)),
+    ItemColor(const Color(0xFFFFC937), const Color(0xFFFFAB8C),
+        const Color(0xFFFF703B)),
+    ItemColor(const Color(0xFF06B03B), const Color(0xFF00AE39),
+        const Color(0xFFA0E067)),
+  ];
+
+  String Title() {
+    return type == 'machinery'
+        ? (status == 0
+            ? '维修中'
+            : (value == null || value == 3)
+                ? '空闲中'
+                : '使用中')
+        : (status == 0
+            ? '待作业'
+            : status == 1 || status == 2
+                ? '进行中'
+                : status == 3
+                    ? '已完成'
+                    : '');
+  }
+
+  ItemColor CurrentColor() {
+    return type == 'machinery'
+        //是农机列表卡片？？要改
+        ? (status == 0
+            ? colors[0]
+            : (value == null || value == 3)
+                ? colors[1]
+                : colors[2])
+        : (status == 0
+            ? colors[1]
+            : status == 1 || status == 2
+                ? colors[2]
+                : status == 3
+                    ? colors[0]
+                    : colors[0]);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Positioned(
+      top: -61.w,
+      left: -67.w,
+      child: Transform.rotate(
+        angle: pi / 6,
+        child: Container(
+          width: 112.5.w,
+          height: 108.5.w,
+          decoration: BoxDecoration(
+            borderRadius: BorderRadius.all(Radius.circular(68.5.w)),
+            border: Border.all(
+                width: 1.w,
+                color: CurrentColor().borderColor,
+                style: BorderStyle.solid),
+            gradient: LinearGradient(
+              colors: [
+                CurrentColor().rightColor,
+                CurrentColor().leftColor,
+              ],
+            ),
+          ),
+          child: Transform.rotate(
+            angle: -pi / 2.3,
+            child: Transform.translate(
+              offset: Offset(38.w, 85.w),
+              child: Text(
+                Title(),
+                style: TextStyle(
+                    fontSize: 14.sp,
+                    fontWeight: FontWeight.bold,
+                    color: const Color(0xffffffff)),
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/widgets/MyCard/index.dart

@@ -2,6 +2,7 @@ import 'dart:math';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:worker_client/models/entities/Job.dart';
+import 'package:worker_client/widgets/Jianbian/index.dart';
 import 'package:worker_client/widgets/MyButton/index.dart';
 import 'package:worker_client/widgets/MyCard/entities/ItemColor.dart';
 import 'package:worker_client/widgets/MyCard/widgets/CardCell.dart';
@@ -15,7 +16,7 @@ class MyCard extends StatelessWidget {
   final bool detail;
   final GestureTapCallback onClick;
   final GestureTapCallback? goDetail;
-  MyCard(
+  const MyCard(
       {Key? key,
       required this.item,
       this.type,
@@ -27,66 +28,6 @@ class MyCard extends StatelessWidget {
       this.goDetail})
       : super(key: key);
 
-  List<ItemColor> colors = [
-    ItemColor(const Color(0xFFC7C7C7), const Color(0xFF8F8F8F),
-        const Color(0xFFC0C0C0)),
-    ItemColor(const Color(0xFFFFC937), const Color(0xFFFFAB8C),
-        const Color(0xFFFF703B)),
-    ItemColor(const Color(0xFF06B03B), const Color(0xFF00AE39),
-        const Color(0xFFA0E067)),
-  ];
-
-  String Title() {
-    return type == 'machinery'
-        ? (item.status == 0
-            ? '维修中'
-            : (value != null || value == 3)
-                ? '空闲中'
-                : '使用中')
-        : (item is Job
-            ? (item.status == 0
-                ? '待作业'
-                : item.status == 1 || item.status == 2
-                    ? '进行中'
-                    : item.status == 3
-                        ? '已完成'
-                        : '')
-            : (item.workStatus == 0
-                ? '待作业'
-                : item.workStatus == 1 || item.workStatus == 2
-                    ? '进行中'
-                    : item.workStatus == 3
-                        ? '已完成'
-                        : ''));
-  }
-
-  ItemColor CurrentColor() {
-    return type == 'machinery'
-        //是农机列表卡片？？要改
-        ? (item.status == 0
-            ? colors[0]
-            : (value != null || value == 3)
-                ? colors[1]
-                : colors[2])
-        : (item is Job
-            //作业列表卡片
-            ? (item.status == 0
-                ? colors[1]
-                : item.status == 1 || item.status == 2
-                    ? colors[2]
-                    : item.status == 3
-                        ? colors[0]
-                        : colors[0])
-            //订单列表卡片
-            : (item.workStatus == 0
-                ? colors[1]
-                : item.workStatus == 1 || item.workStatus == 2
-                    ? colors[2]
-                    : item.workStatus == 3
-                        ? colors[0]
-                        : colors[0]));
-  }
-
   @override
   Widget build(BuildContext context) {
     return Container(
@@ -105,43 +46,7 @@ class MyCard extends StatelessWidget {
       ),
       child: Stack(
         children: [
-          Positioned(
-            top: -61.w,
-            left: -67.w,
-            child: Transform.rotate(
-              angle: pi / 6,
-              child: Container(
-                width: 112.5.w,
-                height: 108.5.w,
-                decoration: BoxDecoration(
-                  borderRadius: BorderRadius.all(Radius.circular(68.5.w)),
-                  border: Border.all(
-                      width: 1.w,
-                      color: CurrentColor().borderColor,
-                      style: BorderStyle.solid),
-                  gradient: LinearGradient(
-                    colors: [
-                      CurrentColor().rightColor,
-                      CurrentColor().leftColor,
-                    ],
-                  ),
-                ),
-                child: Transform.rotate(
-                  angle: -pi / 2.3,
-                  child: Transform.translate(
-                    offset: Offset(38.w, 85.w),
-                    child: Text(
-                      Title(),
-                      style: TextStyle(
-                          fontSize: 14.sp,
-                          fontWeight: FontWeight.bold,
-                          color: const Color(0xffffffff)),
-                    ),
-                  ),
-                ),
-              ),
-            ),
-          ),
+          Jianbian(status: job?item.status:item.workStatus),
           Container(
             padding: EdgeInsets.all(20.w),
             child: Column(

lib/widgets/NullCard.dart

@@ -0,0 +1,33 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+
+class NullCard extends StatelessWidget {
+  final String text;
+  const NullCard({Key? key, required this.text}) : super(key: key);
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      width: 345.w,
+      padding: EdgeInsets.all(30.w),
+      alignment: Alignment.center,
+      child: Column(
+        children: [
+          Container(
+            margin: EdgeInsets.fromLTRB(0, 0, 0, 22.h),
+            child: Image.asset(
+              'images/noData.png',
+              width: 135.w,
+            ),
+          ),
+          Text(
+            text,
+            style: TextStyle(
+                fontSize: 17.sp, color: Color(0xFFb4b4b4)),
+          )
+        ],
+      ),
+    );
+  }
+
+
+}