herdsa

lib/models/entities/ExtendContent.dart

+
+class ExtendContent {
+  // 租户号
+  String? extId;
+
+  // 扩展对象类型;message消息表 bannar轮播图 info资讯
+  String? targetType;
+
+  // 拓展对象Id
+  String? targetId;
+
+  // 内容类型;text文本 image图片
+  String? contentType;
+
+  // 内容
+  String? content;
+
+  // 排序
+  int? sort;
+
+  // 创建时间
+  String? createDate;
+
+  ExtendContent();
+
+  ExtendContent.simple({ this.content, this.contentType });
+
+  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/pages/MoreCars/index.dart

-
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:get/get.dart';
 
 import '../../widgets/CarsCard.dart';
 import '../../widgets/Search.dart';
 import '../TabBar/widgets/home/widgets/headers.dart';
 
-
 class MoreCars extends StatefulWidget {
   const MoreCars({Key? key}) : super(key: key);
 
   State<MoreCars> createState() => _MoreCarsState();
 }
 
-class _MoreCarsState extends State<MoreCars> with TickerProviderStateMixin  {
-
-  late TabController _controller = TabController(length: tabText.length, vsync: this);
-   List<String> tabText= [
-     '全部',
-     '播种机',
-     '收割机',
-     '挺长名字的农机选项分类',
+class _MoreCarsState extends State<MoreCars> with TickerProviderStateMixin {
+  late TabController _controller =
+      TabController(length: tabText.length, vsync: this);
+  List<String> tabText = [
+    '全部',
+    '播种机',
+    '收割机',
+    '挺长名字的农机选项分类',
   ];
 
-
-
   @override
   void initState() {
     // TODO: implement initState
     super.initState();
   }
+
   @override
   Widget build(BuildContext context) {
     // _controller=TabController(length: tabText.length, vsync: this);
     return Scaffold(
-      resizeToAvoidBottomInset: false,
-      appBar: AppBar(
-        elevation: 0,
-        centerTitle: true,
-        backgroundColor: Colors.white,
-        title:Text(
-          '更多',
-          style: TextStyle(
-              color: Colors.black,
-              fontSize: 17.sp,
-              letterSpacing: 2,
-              fontWeight: FontWeight.bold),
+        resizeToAvoidBottomInset: false,
+        appBar: AppBar(
+          elevation: 0,
+          centerTitle: true,
+          backgroundColor: Colors.white,
+          title: Text(
+            '更多',
+            style: TextStyle(
+                color: Colors.black,
+                fontSize: 17.sp,
+                letterSpacing: 2,
+                fontWeight: FontWeight.bold),
+          ),
         ),
 
-      ),
+
       body: Container(
         decoration: BoxDecoration(
             color: Colors.white
         ),
       )
 
-
-
     );
   }
 }
-

lib/pages/OrderConfirmation/index.dart

-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
+import 'package:get_storage/get_storage.dart';
 import 'package:intl/intl.dart';
 
 class OrderConfirmation extends StatefulWidget {
 
   var selectDate; //选择的时间
   var workingArea;
-
-
+  String address = '请选择详细地址';
+  @override
+  void initState() {
+    super.initState();
+    //到底哪里错了 唉
+    // if (GetStorage().read("address") != null) {
+    //   address = GetStorage().read("address").address;
+    // }
+  }
 //  20:59:59
 
   @override
                 floatingLabelBehavior: FloatingLabelBehavior.never,
                 hintText: "请输入具体面积(公顷)",
               ),
-              onChanged: (e){
+              onChanged: (e) {
                 setState(() {
-                  workingArea=e;
+                  workingArea = e;
                 });
               },
               // 校验用户名
                   Padding(
                       padding: EdgeInsets.fromLTRB(10, 0, 0, 0),
                       child: GestureDetector(
-                        onTap: () {},
+                        onTap: () {
+                          Get.toNamed('/addressList',
+                              arguments: {'isBack': true});
+                        },
                         child: Container(
                           width: 290.w,
                           child: Text(
-                            '请选择详细地址',
+                            address,
                             softWrap: true,
                             maxLines: 1,
                             textAlign: TextAlign.left,
               ),
             ),
 
-            // 登录按钮
             Spacer(),
             Container(
               alignment: Alignment.bottomCenter,
                 child: ElevatedButton(
                   onPressed: () {
                     if ((_formKey.currentState as FormState).validate()) {
-                      var a={selectDate,workingArea};
+                      var a = {selectDate, workingArea};
                       print('我确定了$a');
                       //验证通过提交数据
+                      Get.toNamed('/orderPageInfo');
                     }
                   },
                   child: const Text(
     );
   }
 }
-
-
-
-

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

       child: ListView(
         children: [
 
-          TypeHeader(type: true,),
+          Container(
+            width:20.w ,
+            child: TypeHeader(type: true,),
+          ),
+
 
           Container(
             margin: EdgeInsets.fromLTRB(0, 15, 0, 0),

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

 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:get/get.dart';
+
 
 class TypeHeader extends StatefulWidget {
   TypeHeader({Key? key, required this.type}) : super(key: key);
 
 class _TypeHeaderState extends State<TypeHeader> {
   @override
-  Widget build(BuildContext context) {
+  Widget build (BuildContext context) {
     if (widget.type) {
       return Container(
         child: Row(
                       ),
                     ),
                   ),
-                  const Icon(Icons.arrow_drop_down),
-                  Container(
-                      padding: EdgeInsets.fromLTRB(15.w, 0, 0, 0),
-                      width: 260.w,
-                      height: 32.w,
-                      decoration: const BoxDecoration(color: Colors.white),
-                      child: GestureDetector(
-                          onTap: () {
-                            print('点击了搜索');
-                          },
-                          child: Container(
-                            decoration: const BoxDecoration(
-                              // color: Colors.red,
-                              color: Color(0x30cccccc),
-                              borderRadius:
-                                  BorderRadius.all(Radius.circular(25)),
-                            ),
-                            child: Row(
-                              children: [
-                                Padding(
-                                  padding: EdgeInsets.fromLTRB(15, 0, 5, 0),
-                                  child: Icon(
-                                    Icons.search,
-                                    size: 19,
-                                    color: Color(0xff666666),
-                                  ),
-                                ),
-                                Text(
-                                  '请输入关键字查询',
-                                  style: TextStyle(
-                                      color: Color(0xff666666), fontSize: 14),
-                                )
-                              ],
-                            ),
-                          )
-                          // Search(),
-                          )),
+        Container(
+          padding: EdgeInsets.fromLTRB(0, 0, 10, 0),
+          child: Icon(Icons.arrow_drop_down),
+        ),
+                  _initWidget(),
                 ],
               ),
             ),
         ),
       );
     } else {
-      return Container(
-          padding: EdgeInsets.fromLTRB(15.w, 0, 0, 0),
-          width: 260.w,
-          height: 32.w,
-          decoration: const BoxDecoration(color: Colors.white),
-          child: GestureDetector(
-              onTap: () {
-                print('点击了搜索');
-              },
-              child: Container(
-                decoration: const BoxDecoration(
-                  // color: Colors.red,
-                  color: Color(0x30cccccc),
-                  borderRadius: BorderRadius.all(Radius.circular(25)),
-                ),
-                child: Row(
-                  children: [
-                    Padding(
-                      padding: EdgeInsets.fromLTRB(15, 0, 5, 0),
-                      child: Icon(
-                        Icons.search,
-                        size: 19,
-                        color: Color(0xff666666),
-                      ),
-                    ),
-                    Text(
-                      '请输入关键字查询',
-                      style: TextStyle(color: Color(0xff666666), fontSize: 14),
-                    )
-                  ],
-                ),
-              )
-              // Search(),
-              ));
+      return _initWidget();
+
     }
+
+
   }
 }
-
-// Widget _initWidget (TypeHeader flag) {
 //
-//
-// }
+
+
+class _initWidget extends StatelessWidget {
+  const _initWidget({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+        width: 255.w,
+        height: 32.w,
+        decoration: const BoxDecoration(color: Colors.white),
+        child: GestureDetector(
+            onTap: () {
+              print('点击了搜索');
+              Get.toNamed('/searchPage');
+
+            },
+            child: Container(
+              decoration: const BoxDecoration(
+                // color: Colors.red,
+                color: Color(0x30cccccc),
+                borderRadius: BorderRadius.all(Radius.circular(25)),
+              ),
+              child: Row(
+                children: [
+                  Padding(
+                    padding: EdgeInsets.fromLTRB(15, 0, 5, 0),
+                    child: Icon(
+                      Icons.search,
+                      size: 19,
+                      color: Color(0xff666666),
+                    ),
+                  ),
+                  Text(
+                    '请输入关键字查询',
+                    style: TextStyle(color: Color(0xff666666), fontSize: 14),
+                  )
+                ],
+              ),
+            )
+          // Search(),
+        ));
+
+  }
+}
+
+

lib/pages/addressList/index.dart

 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:get/get.dart';
-
+import 'package:get_storage/get_storage.dart';
 
 class AddressList extends StatefulWidget {
   const AddressList({Key? key}) : super(key: key);
 }
 
 class _AddressList extends State<AddressList> {
+  bool isBack = false;
+
+  @override
+  void initState() {
+    super.initState();
+    if (Get.arguments != null) {
+      isBack = Get.arguments['isBack'];
+    }
+  }
 
   List<Address> addressList = [
     Address.fromJson({'address': '777', 'isDefault': false}),
       addressList[index].isDefault = true;
     });
   }
-  void onDelete(index){
+
+  void onDelete(index) {
     showDialog(
         context: context,
         builder: (context) {
-          return AlertDialog(
-              content: Text("您确定要删除此地址吗?"),
-              actions: <Widget>[
-                TextButton(
-                  child: Text("取消"),
-                  onPressed: () {
-                    print("取消");
-                    Navigator.pop(context, 'Cancle');
-                  },
-                ),
-                TextButton(
-                    child: Text("确定"),
-                    onPressed: () {
-                      // setState(() {
-                      //   addressList.remove(addressList[e]);
-                      // });
-                      Navigator.pop(context, "Ok");
-                      Fluttertoast.showToast(
-                          msg: '删除成功！');
-                    })
-              ]);
+          return AlertDialog(content: Text("您确定要删除此地址吗?"), actions: <Widget>[
+            TextButton(
+              child: Text("取消"),
+              onPressed: () {
+                print("取消");
+                Navigator.pop(context, 'Cancle');
+              },
+            ),
+            TextButton(
+                child: Text("确定"),
+                onPressed: () {
+                  // setState(() {
+                  //   addressList.remove(addressList[e]);
+                  // });
+                  Navigator.pop(context, "Ok");
+                  Fluttertoast.showToast(msg: '删除成功！');
+                })
+          ]);
         });
   }
 
                           (e) => AddressCard(
                             No: e + 1,
                             item: addressList[e],
+                            isBack: isBack,
                             onChange: () {
                               onChange(e);
                             },
                             onEdit: () {
-                              Get.toNamed('/addAddress',arguments: {'item':addressList[e]});
+                              Get.toNamed('/addAddress',
+                                  arguments: {'item': addressList[e]});
                             },
                             onDelete: () {
                               onDelete(e);
                             },
+                            onBack: () {
+                              if(GetStorage().read('address')==null) {
+                                GetStorage().write('address', addressList[e]);
+                              }else {
+                                GetStorage().remove('address');
+                                GetStorage().write('address', addressList[e]);
+                              }
+                              Get.back();
+                            },
                           ),
                         )
                         .toList()),

lib/pages/addressList/widget/AddressCard.dart

 class AddressCard extends StatefulWidget {
   final Address item;
   final int No;
+  final bool isBack;
   final GestureTapCallback onChange;
   final GestureTapCallback onDelete;
   final GestureTapCallback onEdit;
-  AddressCard(
+  final GestureTapCallback onBack;
+  const AddressCard(
       {Key? key,
       required this.item,
       required this.No,
+      required this.isBack,
       required this.onChange,
       required this.onDelete,
-      required this.onEdit})
+      required this.onEdit,
+      required this.onBack})
       : super(key: key);
 
   @override
   _AddressCard createState() =>
-      _AddressCard(item, No, onChange, onDelete, onEdit);
+      _AddressCard(item, No, onChange, onDelete, onEdit, isBack, onBack);
 }
 
 class _AddressCard extends State<AddressCard> {
   final Address item;
   final int No;
+  final bool isBack;
   final GestureTapCallback onChange;
   final GestureTapCallback onDelete;
   final GestureTapCallback onEdit;
-  _AddressCard(this.item, this.No, this.onChange, this.onDelete, this.onEdit);
+  final GestureTapCallback onBack;
+  _AddressCard(this.item, this.No, this.onChange, this.onDelete, this.onEdit,
+      this.isBack, this.onBack);
   @override
   Widget build(BuildContext context) {
     return Container(
               decoration: BoxDecoration(
                 border: Border(
                   bottom: BorderSide(
-                      width: 0.5.h,
+                      width: 1.h,
                       color: const Color(0xcc000000),
                       style: BorderStyle.solid),
                 ),
               ),
             ),
           ),
-          Row(
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-            children: [
-              GestureDetector(
-                onTap: onChange,
-                child: Row(
-                  children: [
-                    const Text('设为默认地址'),
-                    Radio<bool>(
-                        value: true,
-                        activeColor: const Color(0xFFFF703B),
-                        groupValue: item.isDefault,
-                        onChanged: (value){
-                          onChange();
-                        }),
-                  ],
+          if (isBack)
+            GestureDetector(
+              onTap: onBack,
+              child: Container(
+                width: 315.w,
+                margin: EdgeInsets.fromLTRB(0, 5.w, 0, 0),
+                child: Text(
+                  '选择此地址',
+                  style:
+                      TextStyle(fontSize: 17.sp, fontWeight: FontWeight.w800),
                 ),
               ),
-              GestureDetector(
-                onTap: onDelete,
-                child: Row(
-                  children: [
-                    const Text('删除'),
-                    Image.asset(
-                      'images/icons/delete.png',
-                      width: 25.w,
-                      height: 25.w,
-                    ),
-                  ],
+            ),
+          if (!isBack)
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                GestureDetector(
+                  onTap: onChange,
+                  child: Row(
+                    children: [
+                      const Text('设为默认地址'),
+                      Radio<bool>(
+                          value: true,
+                          activeColor: const Color(0xFFFF703B),
+                          groupValue: item.isDefault,
+                          onChanged: (value) {
+                            onChange();
+                          }),
+                    ],
+                  ),
                 ),
-              ),
-            ],
-          ),
+                GestureDetector(
+                  onTap: onDelete,
+                  child: Row(
+                    children: [
+                      const Text('删除'),
+                      Image.asset(
+                        'images/icons/delete.png',
+                        width: 25.w,
+                        height: 25.w,
+                      ),
+                    ],
+                  ),
+                ),
+              ],
+            ),
         ],
       ),
     );

lib/pages/machinery/detail/index.dart

 
   // 响应预约事件
   void handleClick() {
-
+    Get.toNamed('/orderConfirmation');
   }
 
   @override
 
     return Scaffold(
       appBar: appBar,
-      body: page(context: context, appbarSize: appBar.preferredSize, handleClick: handleClick),
+      body: SingleChildScrollView(
+        child: page(context: context, handleClick: handleClick),
+      ),
     );
   }
 

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

 
+import 'package:farmer_client/pages/machinery/widgets/DefLayout.dart';
+import 'package:farmer_client/pages/machinery/widgets/RoundButton.dart';
 import 'package:flutter/widgets.dart';
 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 '../../widgets/summary.dart';
 
-Widget page({ required BuildContext context, required Size appbarSize, required void Function() handleClick}) {
-  final _offset = 20.w;
-  final width = MediaQuery.of(context).size.width;
-  final height = MediaQuery.of(context).size.height
-      - appbarSize.height
-      - MediaQuery.of(context).padding.top;
-  final _bannerHeight = 250.w;
+Widget page({ required BuildContext context, VoidCallback? handleClick}) {
   final img = 'https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/index-icon19.jpg';
 
-  return Stack(
-    alignment: Alignment.topCenter,
+  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),
       children: [
-        // 第一个组件用来撑满全屏
-        SizedBox(
-          width: width,
-          height: height,
-        ),
-        Positioned(
-          left: 0,
-          top: 0,
-          child: SizedBox(
-            height: _bannerHeight,
-            child: _banner(img),
-          ),
-        ),
-        Positioned(
-          left: 0,
-          top: _bannerHeight - _offset,
-          child: _content(context),
-        ),
-      ],
+        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),
+        )
+      ]
   );
 }
 
-Widget _banner(String imgUrl) {
-  return Image.network(imgUrl);
+Widget _content(BuildContext context, List<ExtendContent> list, VoidCallback? handleClick) {
+  return Column(
+    children: [
+      summary(),
+      _sectionHead('农机详情'),
+      ExtendContentList(list: list),
+      SizedBox(height: 20.w,),
+      RoundButton(text: "预约", onPressed: handleClick,)
+    ],
+  );
 }
 
-Widget _content(BuildContext context) {
-  final _border = 20.w;
+Widget _sectionHead(String title) {
+  Widget img = SizedBox(
+    width: 16.w,
+    height: 16.w,
+    child: Image.asset('images/decorate.png'),
+  );
+
   return Container(
-    width: MediaQuery.of(context).size.width,
-    padding: EdgeInsets.only(top: 45.w, left: 15.w, right: 15.w, bottom: 20.w),
-    decoration: BoxDecoration(
-      color: Colors.white,
-        borderRadius: BorderRadius.vertical(top: Radius.circular(_border))
-    ),
-    child: Column(
+    padding: EdgeInsets.fromLTRB(0, 20.w, 0, 20.w),
+    child: Row(
+      mainAxisAlignment: MainAxisAlignment.center,
       children: [
-        summary(),
+        img,
+        SizedBox(width: 20.w),
+        Text(title, style: TextStyle(fontSize: 16.sp, color: const Color(0xFF222222), fontWeight: FontWeight.w500),),
+        SizedBox(width: 20.w),
+        img,
       ],
     ),
   );

lib/pages/machinery/map/index.dart

   @override
   Widget build(BuildContext context) {
     final appBar = AppBar(title: Obx(() => Text(title.value)), centerTitle: true,);
-    return Scaffold(appBar: appBar, body: page(context: context, appbarSize: appBar.preferredSize, handleClick: handleClick),);
+    return Scaffold(
+      appBar: appBar,
+      body: SafeArea(
+        child: SingleChildScrollView (
+          child: page(context: context, handleClick: handleClick),
+        ),
+      )
+    );
   }
   
 }

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

 
+import 'package:farmer_client/pages/machinery/widgets/DefLayout.dart';
+import 'package:farmer_client/pages/machinery/widgets/RoundButton.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 
 import '../../widgets/summary.dart';
 
-Widget page({ required BuildContext context, required Size appbarSize, required void Function() handleClick}) {
+Widget page({ required BuildContext context, VoidCallback? handleClick}) {
   final _offset = 20.w;
   final width = MediaQuery.of(context).size.width;
-  final height = MediaQuery.of(context).size.height
-      - appbarSize.height
-      - MediaQuery.of(context).padding.top;
-  final mapHeight = height * 0.3;
-  final cardHeight = (height - mapHeight) / 2 + _offset;
+  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 Stack(
-    alignment: Alignment.topCenter,
-    children: [
-      // 第一个组件用来撑满全屏
-      SizedBox(
-        width: width,
-        height: height,
-      ),
-      SizedBox(
-        width: width,
-        height: mapHeight,
-        child: AMap(position: position),
-      ),
-      Positioned(
-        left: 0,
-        top: mapHeight - _offset,
-        height: cardHeight,
-        child: _thumb(context, img),
-      ),
-      Positioned(
-        left: 0,
-        top: mapHeight + cardHeight - 2 * _offset,
-        height: cardHeight,
-        child: _content(context, handleClick),
-      ),
-    ],);
-}
-
-Widget _card(BuildContext context, Widget child) {
-  final _border = 20.w;
-  return Container(
-    width: MediaQuery.of(context).size.width,
-    clipBehavior: Clip.hardEdge,
-    decoration: BoxDecoration(
-        borderRadius: BorderRadius.vertical(top: Radius.circular(_border))
-    ),
-    child: child,
+  return DefLayout(
+      head: AMap(position: position),
+      children: [
+        DefLayout.card(
+            top: DefLayout.headHeight - DefLayout.offset,
+            height: DefLayout.headHeight,
+            child: Image.network(img, fit: BoxFit.cover)
+        ),
+        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)
+        ),
+      ]
   );
 }
 
-Widget _thumb(BuildContext context, String imgUrl) {
-  return _card(context, Image.network(imgUrl, fit: BoxFit.cover));
-}
-
-
-Widget _button(void Function() handleClick) {
-  return ElevatedButton(
-    child: const Text("预约"),
-    style: ElevatedButton.styleFrom(
-        primary: const Color(0xFFFF703B),
-        textStyle: TextStyle(color: Colors.white, fontSize: 20.sp, letterSpacing: 5.sp),
-        elevation: 0,
-        minimumSize: Size(double.infinity, 49.w),
-        shape: RoundedRectangleBorder(
-          borderRadius: BorderRadius.all(Radius.circular(24.5.w)),
-        )
-    ),
-    onPressed: handleClick,
+Widget _content(BuildContext context, VoidCallback? handleClick) {
+  return Column(
+    children: [
+      summary(),
+      RoundButton(text: "预约", onPressed: handleClick,),
+    ],
   );
-}
-
-Widget _content(BuildContext context, void Function() handleClick) {
-  return _card(context, Container(
-    padding: EdgeInsets.only(top: 45.w, left: 15.w, right: 15.w, bottom: 20.w),
-    decoration: const BoxDecoration(
-      color: Colors.white,
-    ),
-    child: Column(
-
-      children: [
-        summary(),
-        _button(handleClick),
-      ],
-    ),
-  ));
 }

lib/pages/machinery/widgets/DefLayout.dart

+
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+
+class DefLayout extends StatelessWidget {
+  Widget head;
+  List<Widget> children;
+
+  DefLayout({Key? key, required this.head, required this.children}): super(key: key);
+
+  static double headHeight = 250.w;
+  static double offset = 20.w;
+
+  static Widget card({required double top, required Widget child, double? height, EdgeInsetsGeometry? padding}) {
+    final _border = 20.w;
+    return Container(
+      margin: EdgeInsets.only(top: top),
+      padding: padding,
+      height: height,
+      clipBehavior: Clip.hardEdge,
+      decoration: BoxDecoration(
+          color: Colors.white,
+          borderRadius: BorderRadius.vertical(top: Radius.circular(_border))
+      ),
+      child: child,
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final width = MediaQuery.of(context).size.width;
+
+    return Stack(
+      children: [
+        SizedBox(
+          width: width,
+          height: headHeight,
+          child: head,
+        ),
+        ...children,
+      ],
+    );
+  }
+}

lib/pages/machinery/widgets/RoundButton.dart

+
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+
+class RoundButton extends StatelessWidget {
+
+  String text;
+  VoidCallback? onPressed;
+
+  RoundButton({Key? key, this.onPressed, required this.text}): super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+
+    return ElevatedButton(
+      child: Text(text),
+      style: ElevatedButton.styleFrom(
+          primary: const Color(0xFFFF703B),
+          textStyle: TextStyle(color: Colors.white, fontSize: 20.sp, letterSpacing: 5.sp),
+          elevation: 0,
+          minimumSize: Size(double.infinity, 49.w),
+          shape: RoundedRectangleBorder(
+            borderRadius: BorderRadius.all(Radius.circular(24.5.w)),
+          )
+      ),
+      onPressed: onPressed,
+    );
+  }
+
+}

lib/pages/machinery/widgets/summary.dart

       Expanded(
           child: Text("收割机001--S001",
               style: TextStyle(
-                color: Color(0xFF222222),
+                color: const Color(0xFF222222),
                 fontSize: 18.sp,
                 fontWeight: FontWeight.bold,
               )),
       Icon(Icons.location_on_outlined, size: 16.sp,),
       Expanded(
         flex: 1,
-        child: Text("距离当前位置2.3公里 >>", style: TextStyle(color: Color(0xFF222222), fontSize: 15.sp),),
+        child: Text("距离当前位置2.3公里 >>", style: TextStyle(color: const Color(0xFF222222), fontSize: 15.sp),),
       ),
     ],
   );
 Widget _detail() {
   return Container(
     alignment: Alignment.centerLeft,
-    child: Text("农机手1的收割机", style: TextStyle(color: Color(0xFF222222), fontSize: 15.sp),),
+    child: Text("农机手1的收割机", style: TextStyle(color: const Color(0xFF222222), fontSize: 15.sp),),
   );
 }

lib/pages/orderInfo/index.dart

+import 'package:farmer_client/widgets/DefaultButton.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:fluttertoast/fluttertoast.dart';
+import 'package:get/get.dart';
 
 import '../../widgets/OrderInfoCard.dart';
 
-
-
-
 class OrderPageInfo extends StatefulWidget {
   const OrderPageInfo({Key? key}) : super(key: key);
 
 }
 
 class _OrderPageInfoState extends State<OrderPageInfo> {
+  void onCancel() {
+    showDialog(
+        context: context,
+        builder: (context) {
+          return AlertDialog(content: Text("您确定要取消订单吗?"), actions: <Widget>[
+            TextButton(
+              child: Text("取消"),
+              onPressed: () {
+                print("取消");
+                Navigator.pop(context, 'Cancle');
+              },
+            ),
+            TextButton(
+                child: Text("确定"),
+                onPressed: () {
+                  // setState(() {
+                  //   addressList.remove(addressList[e]);
+                  // });
+                  Navigator.pop(context, "Ok");
+                  Fluttertoast.showToast(msg: '取消成功！');
+                  Get.offAllNamed('/');
+                })
+          ]);
+        });
+  }
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
               fontWeight: FontWeight.bold),
         ),
       ),
-      body:      Column(
+      body: Column(
         children: [
           OrderInfoCard(),
-
+          Spacer(),
           Container(
-            height: 130.h,
-            margin: EdgeInsets.only(top: 20.0, bottom: 0.0),
-            alignment: Alignment.bottomCenter,
-            child: SizedBox(
-              width: 315.w,
-              height: 49.h,
-              child: ElevatedButton(
-                onPressed: () {
-                  // _handelSubmit();
-                  print('用户点击了支付啊阿松大撒地方');
-                },
-                child: const Text(
-                  "支付",
-                  style: TextStyle(
-                      fontSize: 18,
-                      color: Colors.white,
-                      fontWeight: FontWeight.bold),
+            margin: EdgeInsets.fromLTRB(15.w, 0, 15.w, 50.h),
+            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(
+                        '取消',
+                        style: TextStyle(
+                            fontSize: 20.sp,
+                            color: const Color(0xFFFF703B),
+                            fontWeight: FontWeight.bold),
+                      ),
+                    ),
+                  ),
                 ),
-                style: ButtonStyle(
-                  elevation: MaterialStateProperty.all(0),
-                  backgroundColor:
-                  MaterialStateProperty.all(const Color(0xFFFF703B)),
-                  shape: MaterialStateProperty.all(
-                      const RoundedRectangleBorder(
-                          borderRadius:
-                          BorderRadius.all(Radius.circular(24.4)))),
+                DefaultButton(
+                  color: const Color(0xffffffff),
+                  backColor: const Color(0xFFFF703B),
+                  width: 150.w,
+                  height: 49.h,
+                  text: '支付',
+                  onPressed: () {
+                    Fluttertoast.showToast(msg: '支付成功！');
+                    Get.offAllNamed('/');
+                  },
+                  margin: const EdgeInsets.all(0),
+                  fontSize: 20.sp,
+                  radius: 24.5.w,
                 ),
-              ),
+              ],
             ),
           ),
+          // Container(
+          //   height: 130.h,
+          //   margin: EdgeInsets.only(top: 20.0, bottom: 0.0),
+          //   alignment: Alignment.bottomCenter,
+          //   child: SizedBox(
+          //     width: 315.w,
+          //     height: 49.h,
+          //     child: ElevatedButton(
+          //       onPressed: () {
+          //         // _handelSubmit();
+          //         print('用户点击了支付啊阿松大撒地方');
+          //       },
+          //       child: const Text(
+          //         "支付",
+          //         style: TextStyle(
+          //             fontSize: 18,
+          //             color: Colors.white,
+          //             fontWeight: FontWeight.bold),
+          //       ),
+          //       style: ButtonStyle(
+          //         elevation: MaterialStateProperty.all(0),
+          //         backgroundColor:
+          //             MaterialStateProperty.all(const Color(0xFFFF703B)),
+          //         shape: MaterialStateProperty.all(const RoundedRectangleBorder(
+          //             borderRadius: BorderRadius.all(Radius.circular(24.4)))),
+          //       ),
+          //     ),
+          //   ),
+          // ),
         ],
       ),
     );
-
   }
 }

lib/pages/search/index.jsx.dart

+import 'package:farmer_client/widgets/NullCard.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import '../../widgets/CarsCard.dart';
+
+class SearchPage extends StatefulWidget {
+  const SearchPage({Key? key}) : super(key: key);
+
+  @override
+  State<SearchPage> createState() => _SearchPage();
+}
+
+class _SearchPage extends State<SearchPage> {
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      resizeToAvoidBottomInset: false,
+      appBar: AppBar(
+        elevation: 0,
+        centerTitle: true,
+        backgroundColor: Colors.white,
+        title: Text(
+          '搜索',
+          style: TextStyle(
+              color: Colors.black,
+              fontSize: 17.sp,
+              letterSpacing: 2,
+              fontWeight: FontWeight.bold),
+        ),
+      ),
+      body: Container(
+          decoration: const BoxDecoration(
+            color: Colors.white,
+          ),
+          child: ListView(children: [
+            Container(
+              width: 345.w,
+              height: 34.h,
+              margin: EdgeInsets.symmetric(vertical: 15.h, horizontal: 15.w),
+              padding: EdgeInsets.symmetric(vertical: 0, horizontal: 10.w),
+              decoration: BoxDecoration(
+                  color: Color(0xFFf8f8f8),
+                  borderRadius: BorderRadius.all(Radius.circular(17.w))),
+              child: Row(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  Image.asset(
+                    'images/icons/search.png',
+                    width: 15.w,
+                    height: 15.w,
+                  ),
+                  Container(
+                    width: 300.w,
+                    margin: EdgeInsets.fromLTRB(5.w, 0, 0, 0),
+                    child: TextField(
+                      style: TextStyle(fontSize: 14.sp),
+                      decoration: const InputDecoration(
+                        isCollapsed: true,
+                        hintText: '搜索关键字查询',
+                        border: InputBorder.none,
+                        counterText: '', //去掉计数
+                        floatingLabelBehavior: FloatingLabelBehavior.never,
+                      ),
+                      onChanged: (e) {
+                        print(999);
+                        setState(() {});
+                      },
+                    ),
+                  ),
+                ],
+              ),
+            ),
+            Container(
+              child: Column(
+                children: [
+                  // NullCard(text: '暂无农机信息'),
+                  CarsCard(),
+                  CarsCard(),
+                  CarsCard(),
+                  CarsCard(),
+                ],
+              ),
+            )
+          ])),
+    );
+  }
+}

lib/routes/pages.dart

 
 import 'package:farmer_client/pages/ArticleInfo/ArticleInfo.dart';
+import 'package:farmer_client/pages/OrderConfirmation/index.dart';
 import 'package:farmer_client/pages/aboutUs/index.dart';
 import 'package:farmer_client/pages/addAddress/index.dart';
 import 'package:farmer_client/pages/addressList/index.dart';
 import 'package:farmer_client/pages/agreement/index.dart';
 import 'package:farmer_client/pages/feedback/index.dart';
+import 'package:farmer_client/pages/orderInfo/index.dart';
+import 'package:farmer_client/pages/search/index.jsx.dart';
 import 'package:farmer_client/pages/userInfo/index.dart';
 import 'package:get/get.dart';
 import '../pages/MoreCars/index.dart';
   GetPage(name: '/addAddress', page: () =>  AddAddress()),
   GetPage(name: '/userInfo', page: () =>  UserInfo()),
   GetPage(name: '/machineryMap', page: () =>  MachineryMapPage()),
+  GetPage(name: '/machineryDetail', page: () =>  MachineryDetailPage()),
   GetPage(name: '/aboutUs', page: () =>  AboutUs()),
   GetPage(name: '/agreement', page: () =>  Agreement()),
   GetPage(name: '/feedback', page: () =>  Feedback()),
+  GetPage(name: '/orderConfirmation', page: () =>  OrderConfirmation()),
+  GetPage(name: '/orderPageInfo', page: () =>  OrderPageInfo()),
+  GetPage(name: '/searchPage', page: () =>  SearchPage()),
 ];

lib/widgets/CarsCard.dart

           GestureDetector(
             onTap: (){
               Get.to(MachineryDetailPage());
-
             },
             child:Image.network(
               "http://yz-shigongli.oss-accelerate.aliyuncs.com/2022-03/1648094119154-7b280bbf63105a8e90299e2d79c8c6ee.jpeg",
                     child: ElevatedButton(
                       onPressed: () {
                         Get.to(OrderConfirmation());
-                        print('点我去预约');
-
                       },
                       child: const Text(
                         "预约",

lib/widgets/ExtendContentList.dart

+
+import 'package:flutter/widgets.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+
+import '../models/entities/ExtendContent.dart';
+
+class ExtendContentList extends StatelessWidget {
+  final List<ExtendContent> list;
+
+  ExtendContentList({ Key? key, required this.list }) : super(key: key);
+  
+  Widget? _image(String? content) {
+    if (null == content || content.isEmpty) return null;
+    return Image.network(content, fit: BoxFit.cover);
+  }
+
+  Widget? _text(String? content) {
+    if (null == content || content.isEmpty) return null;
+    return Text(content);
+  }
+
+  @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,
+    );
+  }
+
+}

lib/widgets/NullCard.dart

+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/icons/nullDataImg.png',
+              width: 135.w,
+            ),
+          ),
+          Text(
+            text,
+            style: TextStyle(
+                fontSize: 17.sp, color: Color(0xFFb4b4b4)),
+          )
+        ],
+      ),
+    );
+  }
+
+
+}

lib/widgets/Search.dart

 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 
-
 class Search extends StatefulWidget {
   const Search({Key? key}) : super(key: key);
 
 }
 
 class _SearchState extends State<Search> {
-
   @override
   Widget build(BuildContext context) {
-    return LayoutBuilder(builder: (BuildContext context, BoxConstraints constraints){
-      return  Column(
+    return LayoutBuilder(
+        builder: (BuildContext context, BoxConstraints constraints) {
+      return Column(
         children: [
           Container(
-            decoration: BoxDecoration(
-              color: Colors.white
-            ),
-      width: constraints.maxWidth,
-      height: 34,
-      alignment: Alignment.center,
-      child:  TextField(
+            decoration: BoxDecoration(color: Colors.white),
+            width: 345.w,
+            height: 34,
+            alignment: Alignment.center,
+            child: TextField(
               onChanged: (value) {
                 print('打一个字我搜索一下$value');
               },
                 FocusScope.of(context).requestFocus(FocusNode());
                 print('点击键盘搜索');
               },
-              style: const TextStyle(fontSize: 15, color: Colors.black, textBaseline: TextBaseline.alphabetic),
+              style: const TextStyle(
+                  fontSize: 15,
+                  color: Colors.black,
+                  textBaseline: TextBaseline.alphabetic),
               decoration: const InputDecoration(
                 isDense: true,
                 prefixIcon: Padding(
                   padding: EdgeInsets.only(left: 0),
-                  child:  Icon(Icons.search,),
+                  child: Icon(
+                    Icons.search,
+                  ),
                 ),
                 fillColor: Color(0x30cccccc),
                 filled: true,
                 border: OutlineInputBorder(borderSide: BorderSide.none),
-      contentPadding: EdgeInsets.all(0),
+                contentPadding: EdgeInsets.all(0),
                 enabledBorder: OutlineInputBorder(
                     borderSide: BorderSide(color: Color(0x00FF0000)),
                     borderRadius: BorderRadius.all(Radius.circular(100))),
                 hintStyle: TextStyle(
                   textBaseline: TextBaseline.alphabetic, //用于提示文字对齐
                 ),
-
               ),
-
             ),
           ),
         ],
       );
     });
-
   }
 }

pubspec.lock

     dependency: "direct main"
     description:
       name: carousel_slider
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "4.0.0"
   characters: