oredrInfo

lib/models/entities/CardInfo.dart

@@ -24,7 +24,7 @@ class CardInfo {
   // @ApiModelProperty(value = "类型名称")
   String? typeName;
   // @ApiModelProperty(value = "农机价格")
-  num? price;
+  int? price;
   // @ApiModelProperty(value = "主图")
   String? thumb;
 

lib/pages/OrderConfirmation/index.dart

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

lib/pages/TabBar/Information_page.dart

@@ -1,11 +0,0 @@
-import 'package:flutter/material.dart';
-
-class InformationPage extends StatelessWidget {
-  @override
-  Widget build(BuildContext context) {
-    // TODO: implement build
-    return Scaffold(
-      body: Center(child: Text('资讯')),
-    );
-  }
-}

lib/pages/TabBar/Mine_page.dart

@@ -1,11 +0,0 @@
-import 'package:flutter/material.dart';
-
-class MinePage extends StatelessWidget {
-  @override
-  Widget build(BuildContext context) {
-    // TODO: implement build
-    return Scaffold(
-      body: Center(child: Text('我的')),
-    );
-  }
-}

lib/pages/TabBar/Orders_page.dart

@@ -1,11 +0,0 @@
-import 'package:flutter/material.dart';
-
-class OrdersPage extends StatelessWidget {
-  @override
-  Widget build(BuildContext context) {
-    // TODO: implement build
-    return Scaffold(
-      body: Center(child: Text('订单')),
-    );
-  }
-}

lib/pages/TabBar/home_page.dart

@@ -1,10 +0,0 @@
-import 'package:flutter/material.dart';
-
-class HomePage extends StatelessWidget {
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      body: Center(child: Text('首页')),
-    );
-  }
-}

lib/pages/TabBar/index.dart

@@ -1,133 +0,0 @@
-
-import 'package:flutter/material.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';
-
-import '../TabBar/widgets/Information/index.dart';
-import '../TabBar/widgets/main/index.dart';
-import '../TabBar/widgets/order/index.dart';
-import '../TabBar/widgets/home/index.dart';
-
-class Home extends StatefulWidget {
-  const Home({Key? key}) : super(key: key);
-
-  @override
-  _Home createState() => _Home();
-}
-
-class _Home extends State<Home> {
-  //下标   当前tab
-  int _tabIndex = 0;
-
-  final List _titles = ['首页', '订单', '资讯','我的'];
-  final tabTextStyleSelected = TextStyle(
-      color: const Color(0xFFFF703B),
-      fontSize: 15.sp,
-      fontWeight: FontWeight.bold); //选线卡选中字体颜色
-  final tabTextStyleNormal = TextStyle(
-      color: const Color(0xFF323232),
-      fontSize: 15.sp,
-      fontWeight: FontWeight.bold); //选项卡未选中字体颜色
-
-  TextStyle getTabTextStyle(int curIndex) {
-    //设置tabbar 选中和未选中的状态文本
-    if (curIndex == _tabIndex) {
-      return tabTextStyleSelected;
-    }
-    return tabTextStyleNormal;
-  }
-
-  // 切换底部选项卡，标题的变化设置
-  Text getTabTitle(int curIndex) {
-    return Text(_titles[curIndex], style: getTabTextStyle(curIndex));
-  }
-
-  List images = [
-    ['images/index/HomesOFFImgaes.png', 'images/index/HomesNOImgaes.png'],
-    ['images/index/OrdersOFFImgaes.png', 'images/index/OrdersNOImgaes.png'],
-    ['images/index/newsONImages.png', 'images/index/newsOFFImages.png'],
-    ['images/index/MineOFFImgaes.png', 'images/index/MineNOImgaes.png'],
-  ];
-  Image getTabIcon(int curIndex) {
-    //设置tabbar选中和未选中的状态图标
-    if (curIndex == _tabIndex) {
-      return Image.asset(
-        images[curIndex][1],
-        width: 22.w,
-        height: 22.w,
-      );
-    }
-    return Image.asset(
-      images[curIndex][0],
-      width: 22.w,
-      height: 22.w,
-    );
-  }
-
-  Image getTabImage(path) {
-    return Image.asset(path, width: 22.w, height: 22.w);
-  }
-
-  //内容
-  var _body = [HomePage(), OrderPage(),Information(), MainPage()];
-
-  Widget tabBar(index) {
-    return GestureDetector(
-      behavior: HitTestBehavior.opaque,
-      onTap: () {
-        setState(() {
-          _tabIndex = index;
-        });
-      },
-      child: Container(
-        width: 93.w,
-        height: 65.h,
-        child: Column(
-          children: [
-            getTabIcon(index),
-            Padding(
-              padding: EdgeInsets.fromLTRB(0, 6.h, 0, 0),
-              child: getTabTitle(index),
-            )
-          ],
-        ),
-      ),
-    );
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      backgroundColor: Colors.white,
-      appBar: AppBar(
-        elevation: 0,
-        centerTitle: true,
-        backgroundColor: Colors.white,
-        title: Text(
-          _titles[_tabIndex],
-          style: TextStyle(
-              color: Colors.black,
-              fontSize: 17.sp,
-              letterSpacing: 2,
-              fontWeight: FontWeight.bold),
-        ),
-      ),
-      body: _body[_tabIndex],
-      bottomNavigationBar: Container(
-        padding: EdgeInsets.fromLTRB(0, 7.h, 0, 7.h),
-        decoration: BoxDecoration(
-          color: const Color(0xFFFFFFFF),
-          boxShadow: [
-            BoxShadow(
-              color: const Color(0x14000000),
-              offset: Offset(0, -2.w),
-              blurRadius: 3.w,
-            ),
-          ],
-        ),
-        child: Row(
-          children:_titles.asMap().keys.map((index) =>tabBar(index)).toList(),
-        ),
-      ),
-    );
-  }
-}

lib/pages/TabBar/index_page.dart

@@ -1,71 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter/cupertino.dart';
-import 'home_page.dart';
-import 'Information_page.dart';
-import 'Mine_page.dart';
-import 'Orders_page.dart';
-
-class IndexPage extends StatefulWidget {
-  _IndexPageState createState() => _IndexPageState();
-}
-
-class _IndexPageState extends State<IndexPage> {
-
-
-  final List<BottomNavigationBarItem> bottomTabs = [
-     BottomNavigationBarItem(
-      icon: Icon(CupertinoIcons.home),
-      title: Text('首页'),
-    ),
-     BottomNavigationBarItem(
-      icon: Icon(CupertinoIcons.search),
-      title: Text('资讯'),
-
-    ),
-     BottomNavigationBarItem(
-      icon: Icon(CupertinoIcons.shopping_cart),
-      title: Text('订单'),
-
-    ),
-     BottomNavigationBarItem(
-      icon: Icon(CupertinoIcons.profile_circled),
-      title: Text('我的'),
-    ),
-  ];
-
-  final List tabBodies = [
-    HomePage(),
-    InformationPage(),
-    OrdersPage(),
-    MinePage(),
-  ];
-
-  int currentIndex = 0;
-  var currentPage;
-
-  @override
-  void initState() {
-    super.initState();
-    currentPage = tabBodies[currentIndex];
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    // TODO: implement build
-    return Scaffold(
-      backgroundColor: Color.fromRGBO(244, 245, 245, 1),
-      bottomNavigationBar: BottomNavigationBar(
-        type: BottomNavigationBarType.fixed,
-        currentIndex: currentIndex,
-        items: bottomTabs,
-        onTap: (index){
-          setState(() {
-            currentIndex = index;
-            currentPage = tabBodies[currentIndex];
-          });
-        },
-      ),
-      body: currentPage,
-    );
-  }
-}

lib/pages/TabBar/member_page.dart

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

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

@@ -1,125 +0,0 @@
-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 '../../../ArticleInfo/ArticleInfo.dart';
-
-class Information extends StatefulWidget {
-  const Information({Key? key}) : super(key: key);
-
-  @override
-  State<Information> createState() => _InformationState();
-}
-
-class _InformationState extends State<Information> {
-  @override
-  Widget build(BuildContext context) {
-    return ListView(
-      children: [
-        // ListTile用不好
-
-        GestureDetector(
-          child: Container(
-              padding: EdgeInsets.fromLTRB(0, 30, 0, 30),
-              width: 310.w,
-              decoration: const BoxDecoration(
-                  border: Border(
-                      bottom: BorderSide(width: 0.5, color: Color(0x20000000)
-                          // 0x17000000
-                          ))),
-              child: Row(
-                children: [
-                  Container(
-                    margin: EdgeInsets.fromLTRB(15, 0, 11, 0),
-                    width: 100,
-                    height: 100,
-                    decoration: BoxDecoration(
-                      image: DecorationImage(
-                        image: AssetImage('images/cars.png'),
-                        fit: BoxFit.cover,
-                      ),
-                      borderRadius: BorderRadius.circular(12),
-                    ),
-                  ),
-                  Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      Container(
-                        width: 240.w,
-                        padding: EdgeInsets.fromLTRB(0, 0, 0, 30),
-                        child: Text("我我就是一个标题，什阿三大苏打333萨达萨达萨达v么特不是",
-                            softWrap: true,
-                            maxLines: 2,
-                            textAlign: TextAlign.left,
-                            overflow: TextOverflow.ellipsis,
-                            style: TextStyle(
-                              fontSize: 17.sp,
-                              fontWeight: FontWeight.bold,
-                            )),
-                      ),
-                      Container(
-                        child: Text('2022-02-09'),
-                      )
-                    ],
-                  )
-                ],
-              )),
-          onTap: () {
-            Get.to(ArticleInfo());
-          },
-        ),
-        GestureDetector(
-          child: Container(
-              padding: EdgeInsets.fromLTRB(0, 30, 0, 30),
-              width: 310.w,
-              decoration: const BoxDecoration(
-                  border: Border(
-                      bottom: BorderSide(width: 0.5, color: Color(0x20000000)
-                          // 0x17000000
-                          ))),
-              child: Row(
-                children: [
-                  Container(
-                    margin: EdgeInsets.fromLTRB(15, 0, 11, 0),
-                    width: 100,
-                    height: 100,
-                    decoration: BoxDecoration(
-                      image: DecorationImage(
-                        image: AssetImage('images/cars.png'),
-                        fit: BoxFit.cover,
-                      ),
-                      borderRadius: BorderRadius.circular(12),
-                    ),
-                  ),
-                  Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      Container(
-                        width: 240.w,
-                        padding: EdgeInsets.fromLTRB(0, 0, 0, 30),
-                        child: Text("我我就是一个标题，什阿三大苏打333萨达萨达萨达v么特不是",
-                            softWrap: true,
-                            maxLines: 2,
-                            textAlign: TextAlign.left,
-                            overflow: TextOverflow.ellipsis,
-                            style: TextStyle(
-                              fontSize: 17.sp,
-                              fontWeight: FontWeight.bold,
-                            )),
-                      ),
-                      Container(
-                        child: Text('2022-02-09'),
-                      )
-                    ],
-                  )
-                ],
-              )),
-          onTap: () {
-            print('进入资讯详情');
-          },
-        )
-      ],
-    );
-  }
-}

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

@@ -1,116 +0,0 @@
-import 'package:carousel_slider/carousel_slider.dart';
-import 'package:farmer_client/pages/TabBar/widgets/home/widgets/headers.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:get/get.dart';
-import 'package:get/get_core/src/get_main.dart';
-import '../../../../models/app.dart';
-import '../../../../models/entities/banner.dart';
-import '../../../../services/homeAPI.dart';
-import '../../../../widgets/CarsCard.dart';
-import 'package:farmer_client/models/app.dart';
-import '../../../../widgets/layout/BasicPage.dart';
-import '../../../MoreCars/index.dart';
-
-
-
-class HomePage extends BasicPage {
-
-  final bannerList = Rx<List<banner>>([]);
-
-  @override
-  void beforeShow() {
-    final location = AppController.t.locationStr;
-
-    getHomeBanner('banner').then((value) {
-      value.forEach((item) {
-        bannerList.value.add(banner.fromJson(item));
-      });
-    });
-  }
-
-  List<Widget>? _renderList() {
-    return bannerList.value.map((item) => Container(
-      child: Center(
-          child: Image.network(item.thumb.toString(),
-              fit: BoxFit.cover, width: 350.w)),
-    )).toList();
-  }
-
-  @override
-  Widget builder (BuildContext context) {
-    return Container(
-      alignment: Alignment.center,
-      padding: EdgeInsets.fromLTRB(15.w, 0, 15.w, 0),
-      child: Column(
-        children: [
-          Container(
-            child: TypeHeader(
-              type: true,
-            ),
-          ),
-          Container(
-            margin: EdgeInsets.fromLTRB(0, 15, 0, 0),
-            child:
-                Obx(() => CarouselSlider(
-              items: _renderList(),
-              options: CarouselOptions(
-                autoPlay: true,
-                enlargeCenterPage: false, //图片中心放大
-                viewportFraction: 1, //每个页面应占据的视口部分。默认为 0.8，这意味着每个页面填充 80% 的轮播。
-                // aspectRatio: 1.6,//纵横比
-                height: 214.w,
-                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),
-                            )
-                          ],
-                        ),
-                      ),
-                      Container(
-                        child: GestureDetector(
-                          child: Text('更多 >>'),
-                          onTap: () {
-                            print('点我进入农机搜索/更多页');
-                            Get.to(MoreCars());
-                          },
-                        ),
-                      )
-                    ],
-                  ),
-                  CarsCard(),
-                  CarsCard(),
-                  CarsCard(),
-                ],
-              )),
-        ],
-      ),
-    );
-  }
-}

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

@@ -1,103 +0,0 @@
-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);
-
-  final bool type;
-
-  @override
-  State<TypeHeader> createState() => _TypeHeaderState();
-}
-
-
-class _TypeHeaderState extends State<TypeHeader> {
-  @override
-  Widget build(BuildContext context) {
-    if (widget.type) {
-      return Container(
-        child: Row(
-          // mainAxisAlignment: MainAxisAlignment.start,
-          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,
-                      ),
-                    ),
-                  ),
-                  Container(
-                    padding: EdgeInsets.fromLTRB(0, 0, 10, 0),
-                    child: Icon(Icons.arrow_drop_down),
-                  ),
-                  _initWidget(),
-                ],
-              ),
-            ),
-          ],
-        ),
-      );
-    } 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.red,
-                color: Color(0x30cccccc),
-                borderRadius: BorderRadius.all(Radius.circular(25)),
-              ),
-              child: Row(
-                children: const [
-                  Padding(
-                    padding: EdgeInsets.fromLTRB(5, 0, 5, 0),
-                    child: Icon(
-                      Icons.search,
-                      size: 19,
-                      color: Color(0xff666666),
-                    ),
-                  ),
-                  Text(
-                    '请输入关键字查询',
-                    style: TextStyle(color: Color(0xff666666), fontSize: 14),
-                  )
-                ],
-              ),
-            )
-            // Search(),
-            ));
-  }
-}

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

@@ -1,95 +0,0 @@
-import 'package:get/get.dart';
-import 'package:get_storage/get_storage.dart';
-
-import './widgets/OtherColumn.dart';
-import './widgets/UserAddress.dart';
-import './widgets/UserInfo.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';
-
-class MainPage extends StatefulWidget {
-  const MainPage({Key? key}) : super(key: key);
-
-  @override
-  State<MainPage> createState() => _MainPageState();
-}
-
-class _MainPageState extends State<MainPage> {
-  GetStorage box = GetStorage();
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      alignment: Alignment.center,
-      child: ListView(
-        children: [
-          Column(
-            children: [
-              UserInfo(), //头部，头像手机号姓名
-              UserAddress(), //用户地址
-              OtherColumn(), //功能菜单栏
-              Container(
-                height: 70.h,
-                margin: EdgeInsets.only(top: 0, bottom: 40.0),
-                alignment: Alignment.bottomCenter,
-                decoration: BoxDecoration(
-                  boxShadow: [
-                    BoxShadow(
-                      blurRadius: 10, //阴影范围
-                      spreadRadius: 0.1, //阴影浓度
-                      color: Colors.grey.withOpacity(0.2), //阴影颜色
-                    ),
-                  ],
-                ),
-                child: SizedBox(
-                  width: 315.w,
-                  height: 49.h,
-                  child: ElevatedButton(
-                    onPressed: () {
-                      showDialog(
-                          context: context,
-                          builder: (context) {
-                            return AlertDialog(
-                                content: Text("您确定退出登录吗?"),
-                                actions: <Widget>[
-                                  TextButton(
-                                    child: Text("取消"),
-                                    onPressed: () {
-                                      Navigator.pop(context, 'Cancle');
-                                    },
-                                  ),
-                                  TextButton(
-                                      child: Text("确定"),
-                                      onPressed: () {
-                                        Navigator.pop(context, "Ok");
-                                        box.remove('token');
-                                        Get.offNamed('/login');
-                                      })
-                                ]);
-                          });
-                    },
-                    child: const Text(
-                      "退出登陆",
-                      style: TextStyle(
-                          fontSize: 18,
-                          color: Colors.black,
-                          fontWeight: FontWeight.bold),
-                    ),
-                    style: ButtonStyle(
-                      elevation: MaterialStateProperty.all(0),
-                      backgroundColor:
-                          MaterialStateProperty.all(const Color(0xFFFFFFFF)),
-                      shape: MaterialStateProperty.all(
-                          const RoundedRectangleBorder(
-                              borderRadius:
-                                  BorderRadius.all(Radius.circular(24.4)))),
-                    ),
-                  ),
-                ),
-              ),
-            ],
-          ),
-        ],
-      ),
-    );
-  }
-}

lib/pages/TabBar/widgets/main/widgets/OtherColumn.dart

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

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

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

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

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

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

@@ -1,61 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';
-
-import '../../../../widgets/OrderListCard.dart';
-import '../../../orderInfo/index.dart';
-
-class OrderPage extends StatefulWidget {
-  const OrderPage({Key? key}) : super(key: key);
-
-  @override
-  State<OrderPage> createState() => _OrderPageState();
-}
-
-class _OrderPageState extends State<OrderPage> {
-  @override
-  Widget build(BuildContext context) {
-    return ListView(
-      children: [
-        Container(
-          padding: EdgeInsets.fromLTRB(15, 0, 15, 0),
-          height: 55.w,
-          decoration: BoxDecoration(
-            color: Colors.white
-          ),
-          child: Row(
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-
-            children: [
-              Row(
-                children: [
-                  Padding(padding: EdgeInsets.fromLTRB(0, 0, 8, 0),
-                  child:Image(image: AssetImage('images/ordersListImga.png'),fit: BoxFit.cover,width: 18.w,),
-                  ),
-                  Text('订单列表',
-                    style: TextStyle(
-                      color: Color(0xff222222),
-                      fontSize: 20.sp,
-                      fontWeight: FontWeight.bold
-                    ),
-                  )
-                ],
-              ),
-            ],
-          ),
-        ),
- Column(
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          OrderListCard(),
-          OrderListCard(),
-          OrderListCard(),
-          OrderListCard(),
-
-
-        ],
-      ),
-
-    ],
-    );
-  }
-}

lib/pages/machinery/detail/index.dart

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

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

@@ -11,23 +11,9 @@ import 'package:get/get.dart';
 import '../../../../models/entities/CardInfo.dart';
 import '../../widgets/summary.dart';
 
-Widget page({ required BuildContext context, VoidCallback? handleClick,required CardInfo item,required List<BannerImageList> bnnerItem,required List<ContentImageList> contentItem}) {
-  print('88888888888888+$item');
+Widget page({ required BuildContext context, VoidCallback? handleClick,required String km,required CardInfo item,required List<BannerImageList> bnnerItem,required List<ContentImageList> contentItem}) {
 
 
-
-  final img = 'https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/index-icon19.jpg';
-
-  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: CarouselSlider(
         items: bnnerItem
@@ -50,16 +36,16 @@ Widget page({ required BuildContext context, VoidCallback? handleClick,required
         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, handleClick,item,contentItem),
+          child: _content(context, handleClick,item,contentItem,km),
         )
       ]
   );
 }
 
-Widget _content(BuildContext context, VoidCallback? handleClick, CardInfo item,List<ContentImageList> contentItem) {
+Widget _content(BuildContext context, VoidCallback? handleClick, CardInfo item,List<ContentImageList> contentItem, String km) {
   return Column(
     children: [
-     summary(item: item),
+     summary(item: item,km:km),
       _sectionHead('农机详情'),
       ExtendContentList(item: contentItem,),
       SizedBox(height: 20.w,),

lib/pages/machinery/map/index.dart

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

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

@@ -7,16 +7,16 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:amap_flutter_base/amap_flutter_base.dart';
 import 'package:farmer_client/widgets/amap/amap.dart';
 
+import '../../../../models/entities/CardInfo.dart';
 import '../../widgets/summary.dart';
 
-Widget page({ required BuildContext context, VoidCallback? handleClick}) {
+Widget page({required CardInfo item,required String km, required BuildContext context, VoidCallback? handleClick}) {
   final _offset = 20.w;
   final width = MediaQuery.of(context).size.width;
   final mapHeight = 226.5.w;
   final cardHeight = 250.w;
 
 
-  final img = 'https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/index-icon19.jpg';
   final LatLng position = LatLng(32.690712, 112.091892);
 
   return DefLayout(
@@ -25,21 +25,22 @@ Widget page({ required BuildContext context, VoidCallback? handleClick}) {
         DefLayout.card(
             top: DefLayout.headHeight - DefLayout.offset,
             height: DefLayout.headHeight,
-            child: Image.network(img, fit: BoxFit.cover)
+            child: Image.network(item.thumb.toString(), fit: BoxFit.cover)
         ),
         DefLayout.card(
             top: (DefLayout.headHeight - DefLayout.offset) * 2,
             padding: EdgeInsets.only(top: 45.w, left: 15.w, right: 15.w, bottom: 20.w),
-            child: _content(context, handleClick)
+            child: _content(context, handleClick,item,km)
         ),
       ]
   );
 }
 
-Widget _content(BuildContext context, VoidCallback? handleClick) {
-  return Column(
+Widget _content(BuildContext context, VoidCallback? handleClick,CardInfo item,String km) {
+  return
+    Column(
     children: [
-      // summary(),
+      summary(item: item,km:km),
       RoundButton(text: "预约", onPressed: handleClick,),
     ],
   );

lib/pages/machinery/widgets/summary.dart

@@ -6,13 +6,13 @@ import 'package:farmer_client/widgets/LinearGradientText.dart';
 
 import '../../../models/entities/CardInfo.dart';
 
-Widget summary({required CardInfo item}) {
+Widget summary({required CardInfo item,required String km}) {
 
   return Column(
     children: [
       _title(item: item),
       SizedBox(height: 20.w,),
-      _desc(item: item),
+      _desc(item: item,km: km),
       SizedBox(height: 20.w,),
       _detail(item: item),
       SizedBox(height: 20.w,),
@@ -70,13 +70,13 @@ Widget _title({required CardInfo item}) {
   );
 }
 
-Widget _desc({required CardInfo item}) {
+Widget _desc({required CardInfo item,required String km}) {
   return Row(
     children: [
       Icon(Icons.location_on_outlined, size: 16.sp,),
       Expanded(
         flex: 1,
-        child: Text("距离当前位置2.3公里 >>", style: TextStyle(color: const Color(0xFF222222), fontSize: 15.sp),),
+        child: Text("距离当前位置$km >>", style: TextStyle(color: const Color(0xFF222222), fontSize: 15.sp),),
       ),
     ],
   );

lib/pages/orderInfo/index.dart

@@ -122,33 +122,43 @@ class _BottomWidget extends StatelessWidget {
       child: Row(
         mainAxisAlignment: MainAxisAlignment.spaceBetween,
         children: [
-          GestureDetector(
-            onTap: () {
-              // onCancel();
-            },
-            child: Container(
-              width: 150.w,
-              height: 49.h,
-              decoration: BoxDecoration(
-                  color: const Color(0xffffffff),
-                  border: Border.all(
-                      color: const Color(0xFFFF703B),
-                      width: 1.w,
-                      style: BorderStyle.solid),
-                  borderRadius:
-                  BorderRadius.all(Radius.circular(24.5.w))),
-              child: Center(
-                child: Text(
-                  '取消',
+          Container(
+            width: 150.w,
+            height: 49.h,
+            margin: EdgeInsets.fromLTRB(0, 30.w, 0, 30.w),
+            alignment: Alignment.bottomCenter,
+            child: SizedBox(
+                  width: 150.w,
+                  height: 49.h,
+              child: ElevatedButton(
+                onPressed: () {
+                  Get.back();
+                },
+                child: const Text(
+                  "取消",
                   style: TextStyle(
-                      fontSize: 20.sp,
-                      color: const Color(0xFFFF703B),
+                      fontSize: 18,
+                      color: Color(0xFFFF703B),
                       fontWeight: FontWeight.bold),
                 ),
+                style: ButtonStyle(
+                  side: MaterialStateProperty.all(
+                      BorderSide(width: 1, color: Color(0xFFFF703B))), //边框
+                  elevation: MaterialStateProperty.all(0),
+                  backgroundColor: MaterialStateProperty.all(Colors.white),
+                  shape: MaterialStateProperty.all(
+                    RoundedRectangleBorder(
+                        borderRadius:
+                        BorderRadius.all(Radius.circular(24.4))),
+                  ),
+                ),
               ),
             ),
           ),
-          DefaultButton(
+      Container(
+        margin: EdgeInsets.fromLTRB(0, 30.w, 0, 30.w),
+        alignment: Alignment.bottomCenter,
+        child: DefaultButton(
             color: const Color(0xffffffff),
             backColor: const Color(0xFFFF703B),
             width: 150.w,
@@ -162,6 +172,7 @@ class _BottomWidget extends StatelessWidget {
             fontSize: 20.sp,
             radius: 24.5.w,
           ),
+      ),
         ],
       ),
     );

lib/pages/search/index.jsx.dart

@@ -1,87 +0,0 @@
-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/services/orderAPI.dart

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

lib/widgets/CarsCard.dart

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

lib/widgets/ExtendContentList.dart

@@ -43,25 +43,15 @@ class ExtendContentList extends StatelessWidget {
       child:  Column(
         children:  item.map((item) {
           if (item.contentType != 'image') {
-
             return Container(
               padding: EdgeInsets.fromLTRB(0, 20, 0, 10),
               width: 344.w,
-              child: Text(
-                item.content.toString(),
-                style: TextStyle(fontSize: 14.sp),
-              ),
+              child: _text(item.content)
             );
           } else {
             return Container(
               padding: EdgeInsets.fromLTRB(0, 10, 0, 10),
-              child: Image(
-                image: NetworkImage(item.content.toString()),
-                width: 320.w,
-                height: 260.w,
-                fit: BoxFit.cover,
-              ),
-
+              child: _image(item.content),
             );
           }
         }).toList(),

lib/widgets/OrderInfoCard.dart

@@ -9,8 +9,8 @@ import 'LinearGradientText.dart';
 
 class OrderInfoCard extends StatelessWidget {
   final OrderInfoModel item;
-  final String orderStateText;
-  final Color orderStateColor;
+  final String? orderStateText;
+  final Color? orderStateColor;
 
  // final  DateTime timeNew=item.appointmentDate;
 
@@ -161,9 +161,9 @@ class OrderInfoCard extends StatelessWidget {
                                   fontSize: 16,
                                   fontWeight: FontWeight.bold)),
                           TextSpan(
-                              text: orderStateText,
+                              text: orderStateText??'未支付',
                               style: TextStyle(
-                                  color:orderStateColor,
+                                  color:orderStateColor??Colors.black,
                                   fontSize: 16,
                                   fontWeight: FontWeight.bold)),
                         ]),
@@ -213,9 +213,9 @@ class OrderInfoCard extends StatelessWidget {
                                           color: Color(0xff666666),
                                           fontSize: 16,
                                           fontWeight: FontWeight.bold)),
-                                  Text(orderStateText,
+                                  Text(orderStateText??'未支付',
                                       style: TextStyle(
-                                          color: orderStateColor,
+                                          color: orderStateColor??Colors.black,
                                           fontSize: 16,
                                           fontWeight: FontWeight.bold)),
                                 ],