feats

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

@@ -1,12 +1,11 @@
-
 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);
 
@@ -14,115 +13,89 @@ class MoreCars extends StatefulWidget {
   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: ListView(
-          children: [Column(
-          children: [
-            Container(
-              padding: EdgeInsets.fromLTRB(20, 15, 20, 15),
 
-              decoration: BoxDecoration(
-                color: Colors.white
-              ),
-              // child:Search(),
-              child:          Container(
-                  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(),
+      body: Container(
+        decoration: BoxDecoration(
+            color: Colors.white
+        ),
+        child:       ListView(
+            children: [Column(
+              children: [
+                Container(
+                  padding: EdgeInsets.fromLTRB(0, 15, 0, 15),
+                  width: 350.w,
+                  child: TypeHeader(type: false,),
+                ),
+
+                TabBar(
+                  labelStyle: TextStyle(fontSize: ScreenUtil().setSp(19),fontWeight: FontWeight.bold), //选中的样式
+                  unselectedLabelStyle: TextStyle(fontSize:ScreenUtil().setSp(16)), //未选中的样式
+                  controller: _controller,
+                  isScrollable: true, //可滚动
+                  indicatorColor: Colors.black, //指示器的颜色
+                  labelColor: Colors.black, //选中文字颜色
+                  unselectedLabelColor: Color(0xffadadad),
+                  // indicatorSize: TabBarIndicatorSize.label, //指示器与文字等宽
+                  tabs: tabText.map((e) => Tab(text: e)).toList(),
+                  onTap: (int i) {
+                    print('当前+${i}');
+                  },
+
+                ),
+                Container(
+                  child: Column(
+                    children: [
+                      CarsCard(),
+                      CarsCard(),
+                      CarsCard(),
+                      CarsCard(),
+                    ],
                   )
-              ),
-            ),
-            
-            TabBar(
-              labelStyle: TextStyle(fontSize: ScreenUtil().setSp(19),fontWeight: FontWeight.bold), //选中的样式
-              unselectedLabelStyle: TextStyle(fontSize:ScreenUtil().setSp(16)), //未选中的样式
-              controller: _controller,
-              isScrollable: true, //可滚动
-              indicatorColor: Colors.black, //指示器的颜色
-              labelColor: Colors.black, //选中文字颜色
-              unselectedLabelColor: Color(0xffadadad),
-              // indicatorSize: TabBarIndicatorSize.label, //指示器与文字等宽
-              tabs: tabText.map((e) => Tab(text: e)).toList(),
-              onTap: (int i) {
-                print('当前+${i}');
-              },
-
-            ),
-            Container(
-              child: Column(
-                children: [
-                  CarsCard(),
-                  CarsCard(),
-                  CarsCard(),
-                  CarsCard(),
-                ],
-              )
-              ,
-            )
+                  ,
+                )
 
 
-          ],
-        )]
+              ],
+            )]
 
+        ),
       )
 
     );
   }
 }
-

lib/pages/OrderConfirmation/index.dart

@@ -1,8 +1,8 @@
-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 {
@@ -19,8 +19,15 @@ class _OrderConfirmationState extends State<OrderConfirmation> {
 
   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
@@ -76,9 +83,9 @@ class _OrderConfirmationState extends State<OrderConfirmation> {
                 floatingLabelBehavior: FloatingLabelBehavior.never,
                 hintText: "请输入具体面积(公顷)",
               ),
-              onChanged: (e){
+              onChanged: (e) {
                 setState(() {
-                  workingArea=e;
+                  workingArea = e;
                 });
               },
               // 校验用户名
@@ -173,11 +180,14 @@ class _OrderConfirmationState extends State<OrderConfirmation> {
                   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,
@@ -189,7 +199,6 @@ class _OrderConfirmationState extends State<OrderConfirmation> {
               ),
             ),
 
-            // 登录按钮
             Spacer(),
             Container(
               alignment: Alignment.bottomCenter,
@@ -199,9 +208,10 @@ class _OrderConfirmationState extends State<OrderConfirmation> {
                 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(
@@ -260,7 +270,3 @@ class _OrderConfirmationState extends State<OrderConfirmation> {
     );
   }
 }
-
-
-
-

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

@@ -4,11 +4,12 @@ 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/banner.dart';
+import '../../../../services/homeAPI.dart';
 import '../../../../widgets/CarsCard.dart';
 import '../../../../widgets/Search.dart';
 import '../../../MoreCars/index.dart';
 
-
 class HomePage extends StatefulWidget {
   const HomePage({Key? key}) : super(key: key);
 
@@ -18,14 +19,19 @@ class HomePage extends StatefulWidget {
 
 class _HomePageState extends State<HomePage> {
   final CarouselController _controller = CarouselController();
-  final List<String> imgList = [
-    'https://images.unsplash.com/photo-1520342868574-5fa3804e551c?ixlib=rb-0.3.5&ixid=eyJhcHBfaWQiOjEyMDd9&s=6ff92caffcdd63681a35134a6770ed3b&auto=format&fit=crop&w=1951&q=80',
-    'https://images.unsplash.com/photo-1522205408450-add114ad53fe?ixlib=rb-0.3.5&ixid=eyJhcHBfaWQiOjEyMDd9&s=368f45b0888aeb0b7b08e3a1084d3ede&auto=format&fit=crop&w=1950&q=80',
-    'https://images.unsplash.com/photo-1519125323398-675f0ddb6308?ixlib=rb-0.3.5&ixid=eyJhcHBfaWQiOjEyMDd9&s=94a1e718d89ca60a6337a6008341ca50&auto=format&fit=crop&w=1950&q=80',
-    'https://images.unsplash.com/photo-1523205771623-e0faa4d2813d?ixlib=rb-0.3.5&ixid=eyJhcHBfaWQiOjEyMDd9&s=89719a0d55dd05e2deae4120227e6efc&auto=format&fit=crop&w=1953&q=80',
-    'https://images.unsplash.com/photo-1508704019882-f9cf40e475b4?ixlib=rb-0.3.5&ixid=eyJhcHBfaWQiOjEyMDd9&s=8c6e5e3aba713b17aa1fe71ab4f0ae5b&auto=format&fit=crop&w=1352&q=80',
-    'https://images.unsplash.com/photo-1519985176271-adb1088fa94c?ixlib=rb-0.3.5&ixid=eyJhcHBfaWQiOjEyMDd9&s=a0c8d632e977f94e5d312d9893258f59&auto=format&fit=crop&w=1355&q=80'
-  ];
+  List<banner> BannerList = [];
+
+  @override
+  void initState() {
+    super.initState();
+    getHomeBanner('banner').then((value) {
+      setState(() {
+        value.forEach((item) {
+          BannerList.add(banner.fromJson(item));
+        });
+      });
+    });
+  }
 
   @override
   Widget build(BuildContext context) {
@@ -34,77 +40,79 @@ class _HomePageState extends State<HomePage> {
       padding: EdgeInsets.fromLTRB(15.w, 0, 15.w, 0),
       child: ListView(
         children: [
-          headers(),
+          Container(
+            width: 20.w,
+            child: TypeHeader(
+              type: true,
+            ),
+          ),
           Container(
             margin: EdgeInsets.fromLTRB(0, 15, 0, 0),
-            child: CarouselSlider(
-              //API  https://pub.dev/documentation/carousel_slider/latest/carousel_options/CarouselOptions-class.html
-              items:imgList
-                  .map((item) => Container(
-                child: Center(
-                    child:
-                    Image.network(item, fit: BoxFit.cover, width: 350.w)),
-              ))
-                  .toList(),
+            child:
+                // Text('asdasdas')
+                CarouselSlider(
+              items: BannerList.map((item) => Container(
+                    child: Center(
+                        child: Image.network(item.thumb.toString(),
+                            fit: BoxFit.cover, width: 350.w)),
+                  )).toList(),
               options: CarouselOptions(
                 autoPlay: true,
-                enlargeCenterPage: false,//图片中心放大
-                viewportFraction: 1,//每个页面应占据的视口部分。默认为 0.8，这意味着每个页面填充 80% 的轮播。
+                enlargeCenterPage: false, //图片中心放大
+                viewportFraction: 1, //每个页面应占据的视口部分。默认为 0.8，这意味着每个页面填充 80% 的轮播。
                 // aspectRatio: 1.6,//纵横比
                 height: 214.w,
-                initialPage: 1,//初始页
+                initialPage: 1, //初始页
               ),
             ),
           ),
-          
-
           Container(
-            margin: EdgeInsets.fromLTRB(0, 20, 0, 20),
-            child: Column(
-              children: [
-                Row(
-                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                  children: [
-                    Container(
-                      child: Row(
-                        children: [
-                          Padding(padding: EdgeInsets.fromLTRB(0, 0, 8, 0),
-                            child:Image(image: AssetImage('images/icons/carsListImga.png'),fit: BoxFit.cover,width: 20.w,),
-                          ),
-                          Text('农机列表',
-                            style: TextStyle(
-                                color: Color(0xff222222),
-                                fontSize: 20.sp,
-                                fontWeight: FontWeight.bold
+              margin: EdgeInsets.fromLTRB(0, 20, 0, 20),
+              child: Column(
+                children: [
+                  Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    children: [
+                      Container(
+                        child: Row(
+                          children: [
+                            Padding(
+                              padding: EdgeInsets.fromLTRB(0, 0, 8, 0),
+                              child: Image(
+                                image:
+                                    AssetImage('images/icons/carsListImga.png'),
+                                fit: BoxFit.cover,
+                                width: 20.w,
+                              ),
                             ),
-                          )
-                        ],
+                            Text(
+                              '农机列表',
+                              style: TextStyle(
+                                  color: Color(0xff222222),
+                                  fontSize: 20.sp,
+                                  fontWeight: FontWeight.bold),
+                            )
+                          ],
+                        ),
                       ),
-                    ),
-                    Container(
-                      child:GestureDetector(
-                        child:  Text('更多 >>'),
-                        onTap: (){
-                          print('点我进入农机搜索/更多页');
-                          Get.to(MoreCars());
-                        },
-                      ),
-                    )
-
-                  ],
-                ),
-                CarsCard(),
-                CarsCard(),
-                CarsCard(),
-              ],
-            )
-
-          ),
-
+                      Container(
+                        child: GestureDetector(
+                          child: Text('更多 >>'),
+                          onTap: () {
+                            print('点我进入农机搜索/更多页');
+                            Get.to(MoreCars());
+                          },
+                        ),
+                      )
+                    ],
+                  ),
+                  CarsCard(),
+                  CarsCard(),
+                  CarsCard(),
+                ],
+              )),
         ],
       ),
-
-
     );
   }
 }

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

@@ -1,73 +1,110 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:get/get.dart';
 
 
-class headers extends StatelessWidget {
-  const headers({Key? key}) : super(key: key);
+class TypeHeader extends StatefulWidget {
+  TypeHeader({Key? key, required this.type}) : super(key: key);
+
+  final bool type;
 
   @override
-  Widget build(BuildContext context) {
-    return Container(
-      child:           Row(
-        children: [
-          Container(
-            height: 32.w,
-            decoration: BoxDecoration(
-                color: Colors.white
-            ),
-            child: Row(
-              children: [
-                Image(
-                  image: AssetImage('images/gpsImgae.png'),
-                  fit: BoxFit.cover,
-                  width: 14.w,
-                  height: 17.h,
-                ),
-                Padding(padding: EdgeInsets.fromLTRB(5, 0, 0, 0),
-                  child: Text('邓州市',
-                    style: TextStyle(
-                      color: Color(0xff202020),
-                      fontSize: 16.sp,
-                      fontWeight: FontWeight.bold,
+  State<TypeHeader> createState() => _TypeHeaderState();
+}
+
+class _TypeHeaderState extends State<TypeHeader> {
+  @override
+  Widget build (BuildContext context) {
+    if (widget.type) {
+      return Container(
+        child: Row(
+          children: [
+            Container(
+              height: 32.w,
+              decoration: BoxDecoration(color: Colors.white),
+              child: Row(
+                children: [
+                  Image(
+                    image: AssetImage('images/gpsImgae.png'),
+                    fit: BoxFit.cover,
+                    width: 14.w,
+                    height: 17.h,
+                  ),
+                  Padding(
+                    padding: EdgeInsets.fromLTRB(5, 0, 0, 0),
+                    child: Text(
+                      '邓州市',
+                      style: TextStyle(
+                        color: Color(0xff202020),
+                        fontSize: 16.sp,
+                        fontWeight: FontWeight.bold,
+                      ),
                     ),
                   ),
-                ),
-                const Icon(Icons.arrow_drop_down)
-              ],
-
+        Container(
+          padding: EdgeInsets.fromLTRB(0, 0, 10, 0),
+          child: Icon(Icons.arrow_drop_down),
+        ),
+                  _initWidget(),
+                ],
+              ),
             ),
-          ),
-          Container(
-              padding: EdgeInsets.fromLTRB(15.w, 0, 0, 0),
-              width: 260.w,
-              height: 32.w,
+          ],
+        ),
+      );
+    } else {
+      return _initWidget();
+
+    }
+
+
+  }
+}
+//
+
+
+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.white
+                // color: Colors.red,
+                color: Color(0x30cccccc),
+                borderRadius: BorderRadius.all(Radius.circular(25)),
               ),
-              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),)
-                      ],
+              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(),
-              )
-          )
-        ],
-      ),
-    );
+                ],
+              ),
+            )
+          // Search(),
+        ));
+
   }
 }
+
+

lib/pages/addressList/index.dart

@@ -5,7 +5,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:get_storage/get_storage.dart';
 
 class AddressList extends StatefulWidget {
   const AddressList({Key? key}) : super(key: key);
@@ -15,6 +15,15 @@ class AddressList extends StatefulWidget {
 }
 
 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}),
@@ -31,31 +40,29 @@ class _AddressList extends State<AddressList> {
       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: '删除成功！');
+                })
+          ]);
         });
   }
 
@@ -91,15 +98,26 @@ class _AddressList extends State<AddressList> {
                           (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

@@ -6,30 +6,37 @@ import 'package:get/get_rx/src/rx_typedefs/rx_typedefs.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(
@@ -81,7 +88,7 @@ class _AddressCard extends State<AddressCard> {
               decoration: BoxDecoration(
                 border: Border(
                   bottom: BorderSide(
-                      width: 0.5.h,
+                      width: 1.h,
                       color: const Color(0xcc000000),
                       style: BorderStyle.solid),
                 ),
@@ -113,39 +120,53 @@ class _AddressCard extends State<AddressCard> {
               ),
             ),
           ),
-          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

@@ -7,7 +7,7 @@ import 'widgets/detail.dart';
 class MachineryDetailPage extends BasicPage {
   // 响应预约事件
   void handleClick() {
-    Get.back();
+    Get.toNamed('/orderConfirmation');
   }
 
   @override

lib/pages/orderInfo/index.dart

@@ -1,11 +1,11 @@
+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);
 
@@ -14,6 +14,32 @@ class OrderPageInfo extends StatefulWidget {
 }
 
 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(
@@ -31,44 +57,89 @@ class _OrderPageInfoState extends State<OrderPageInfo> {
               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

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

@@ -1,10 +1,13 @@
 
 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';
@@ -24,4 +27,7 @@ List<GetPage> pages = [
   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/services/homeAPI.dart

@@ -0,0 +1,63 @@
+
+
+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']
+  ),});
+  
+}
+
+
+
+/**
+ * 农机列表
+ * @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']
+  ),});
+
+}
+
+
+
+/**
+ * 农机详情
+ * @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) =>
+  { Fluttertoast.showToast(
+      msg: error.error['message']
+  ),});
+
+}
+
+
+/**
+ * 农机分类Tab列查询
+ * @param {*} data
+ * @returns
+ */
+Future getMachineryType()async{
+  return request('/machinery-type',options: Options(method: 'GET'));
+}
+
+
+

lib/widgets/CarsCard.dart

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

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

lib/widgets/Search.dart

@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 
-
 class Search extends StatefulWidget {
   const Search({Key? key}) : super(key: key);
 
@@ -10,20 +9,18 @@ class Search extends StatefulWidget {
 }
 
 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');
               },
@@ -31,17 +28,22 @@ class _SearchState extends State<Search> {
                 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))),
@@ -49,14 +51,11 @@ class _SearchState extends State<Search> {
                 hintStyle: TextStyle(
                   textBaseline: TextBaseline.alphabetic, //用于提示文字对齐
                 ),
-
               ),
-
             ),
           ),
         ],
       );
     });
-
   }
 }