订单/分类/农机/我的完善

lib/models/app.dart

@@ -19,7 +19,7 @@ class AppController extends GetxController {
   AMapFlutterLocation? _location;
 
   get locationStr {
-    if (null == location) return null;
+    if (null == location.value) return null;
 
     double longitude = location.value!['longitude'] as double;
     double latitude = location.value!['latitude'] as double;
@@ -51,7 +51,6 @@ class AppController extends GetxController {
 
     // 尝试获取一次人员信息
     getCurrent().then((person) {
-      print('9personpersonpersonperson+$person');
       user(Person.fromJson(person));
 
     }).catchError((e) {

lib/models/entities/CardTypeModel.dart

@@ -0,0 +1,19 @@
+class CardTypeModel {
+  String? createDate;
+  String? name;
+  num? status;
+  String? typeId;
+  CardTypeModel();
+
+  CardTypeModel.fromJson(Map<String, dynamic> json)
+      : createDate = json["createDate"],
+        name = json["name"],
+        status = json["status"],
+        typeId = json["typeId"];
+  Map<String, dynamic> toJson() => {
+        "createDate": createDate,
+        "name": name,
+        "status": status,
+        "typeId": typeId,
+      };
+}

lib/pages/MoreCars/index.dart

@@ -3,6 +3,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 
+import '../../models/entities/CardTypeModel.dart';
+import '../../services/homeAPI.dart';
 import '../../widgets/CarsCard.dart';
 import '../../widgets/Search.dart';
 
@@ -14,19 +16,27 @@ class MoreCars extends StatefulWidget {
 }
 
 class _MoreCarsState extends State<MoreCars> with TickerProviderStateMixin {
-  late TabController _controller =
-      TabController(length: tabText.length, vsync: this);
-  List<String> tabText = [
-    '全部',
-    '播种机',
-    '收割机',
-    '挺长名字的农机选项分类',
-  ];
+   late TabController _controller = TabController(length: tabText.value.length, vsync: this);
+  final tabText = Rx<List<CardTypeModel>>([]);
+
+
 
   @override
   void initState() {
     // TODO: implement initState
     super.initState();
+
+  }
+  void _geList (){
+    getMachineryType().then((value) {
+      final list = <CardTypeModel>[];
+      List<String> newTabs =['全部'];
+      value['records'].forEach((item) {
+        list.add(CardTypeModel.fromJson(item));
+
+      });
+      tabText(list);
+    });
   }
 
   @override
@@ -74,7 +84,7 @@ class _MoreCarsState extends State<MoreCars> with TickerProviderStateMixin {
                   labelColor: Colors.black, //选中文字颜色
                   unselectedLabelColor: Color(0xffadadad),
                   // indicatorSize: TabBarIndicatorSize.label, //指示器与文字等宽
-                  tabs: tabText.map((e) => Tab(text: e)).toList(),
+                  tabs: tabText.value.map((e) => Tab(text: e.name.toString())).toList(),
                   onTap: (int i) {
                     print('当前+${i}');
                   },

lib/pages/addressList/index.dart

@@ -7,15 +7,15 @@ import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:get/get.dart';
+import 'package:farmer_client/widgets/Modal.dart' as modal;
 
 import '../../services/address.dart';
 
 class AddressList extends BasicPage {
   bool isBack = false;
-  AddressController addressController=AddressController.t;
+  AddressController addressController = AddressController.t;
   final addressList = Rx<List<Address>>([]);
 
-
   @override
   void beforeShow() {
     super.beforeShow();
@@ -31,10 +31,9 @@ class AddressList extends BasicPage {
     }
   }
 
-
   void onChange(id) {
     print(id);
-    addressDefault(id.toString()).then((value){
+    addressDefault(id.toString()).then((value) {
       final defaultlist = [...addressList()];
       for (var element in addressList()) {
         if (element.isDefault == true) {
@@ -43,21 +42,29 @@ class AddressList extends BasicPage {
       }
       addressList(defaultlist);
     });
-
   }
+
   void onDelete(id) {
     print(id);
-
-    addressDelete(id).then((value) {
-      final newslist = [...addressList()];
-      for (var item in addressList()) {
-        if (item.addressId == id) {
-          newslist.remove(item);
-        }
-      }
-      addressList(newslist);
-      Fluttertoast.showToast(msg: '删除成功！');
-    });
+    modal.showDialog(
+        title: '提示',
+        content: Container(
+          alignment: Alignment.center,
+          child: Text('确定要删除此地址吗？'),
+        ),
+        onCancel: () => true,
+        onConfirm: () => {
+              addressDelete(id).then((value) {
+                final newslist = [...addressList()];
+                for (var item in addressList()) {
+                  if (item.addressId == id) {
+                    newslist.remove(item);
+                  }
+                }
+                addressList(newslist);
+                Fluttertoast.showToast(msg: '删除成功！');
+              }),
+            });
   }
 
   @override
@@ -71,33 +78,38 @@ class AddressList extends BasicPage {
             //左对齐
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
-              Obx(()=>Column(
-                  children: addressList()
-                      .asMap()
-                      .keys
-                      .map(
-                        (e) => AddressCard(
-                          No: e + 1,
-                          item: addressList.value[e],
-                          isBack: isBack,
-                          onChange: () {
-                            onChange(addressList()[e].addressId);
-                          },
-                          onEdit: () {
-                            Get.toNamed('/addAddress',
-                                arguments: {'id':addressList.value[e].addressId,'item': addressList.value[e].address.toString()});
-                          },
-                          onDelete: () {
-                            onDelete(addressList.value[e].addressId);
-                          },
-                          onBack: () {
-                            //选择地址
-                            addressController.address.value=addressList.value[e];
-                            Get.back();
-                          },
-                        ),
-                      )
-                      .toList()),),
+              Obx(
+                () => Column(
+                    children: addressList()
+                        .asMap()
+                        .keys
+                        .map(
+                          (e) => AddressCard(
+                            No: e + 1,
+                            item: addressList.value[e],
+                            isBack: isBack,
+                            onChange: () {
+                              onChange(addressList()[e].addressId);
+                            },
+                            onEdit: () {
+                              Get.toNamed('/addAddress', arguments: {
+                                'id': addressList.value[e].addressId,
+                                'item': addressList.value[e].address.toString()
+                              });
+                            },
+                            onDelete: () {
+                              onDelete(addressList.value[e].addressId);
+                            },
+                            onBack: () {
+                              //选择地址
+                              addressController.address.value =
+                                  addressList.value[e];
+                              Get.back();
+                            },
+                          ),
+                        )
+                        .toList()),
+              ),
               DefaultButton(
                 color: const Color(0xffffffff),
                 backColor: const Color(0xFFFF703B),
@@ -118,4 +130,3 @@ class AddressList extends BasicPage {
     );
   }
 }
-

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

@@ -24,13 +24,13 @@ class HomePage extends StatefulWidget {
 class _HomePageState extends State<HomePage> {
   final CarouselController _controller = CarouselController();
   List<Banners> bannerList = [];
+  String? location = AppController.t.locationStr;
 
   List<CardListModel> machineryLists = [];
 
   @override
   void initState() {
     super.initState();
-   //  final location = AppController.t.location;
    // final long=   location.value!['longitude'].toString() + "," + location.value!['latitude'].toString();
    //  print('location+$location,lolongglongng+$long');
 
@@ -42,7 +42,7 @@ class _HomePageState extends State<HomePage> {
       });
     });
 
-    getMachinery('122.08400000000002,37.421998333333335').then((value) {
+    getMachinery(location??'112.087465,32.687507').then((value) {
       setState(() {
         value['records'].forEach((item) {
           machineryLists.add(CardListModel.fromJson(item));
@@ -124,7 +124,7 @@ class _HomePageState extends State<HomePage> {
                       )
                     ],
                   ),
-                  machineryLists.length>=0?
+                  machineryLists.length>= 1?
                   Column(
                     children: machineryLists
                         .map((item) => CarsCard(item: item))

lib/pages/main/widgets/UserInfo.dart

@@ -38,7 +38,7 @@ class UserInfo extends StatelessWidget {
                 child: GestureDetector(
                   child: const Text(
                     '修改个人信息',
-                    style: TextStyle(color: Colors.white),
+                    style: TextStyle(color: Colors.white,fontSize: 14),
                   ),
                   onTap: () {
                     print('修改个人信息');

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

@@ -6,6 +6,7 @@ import './widgets/UserAddress.dart';
 import './widgets/UserInfo.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:farmer_client/widgets/Modal.dart' as modal;
 
 class MainPage extends StatelessWidget {
   final Address item;
@@ -16,11 +17,22 @@ class MainPage extends StatelessWidget {
 
   GetStorage box = GetStorage();
 
+  void _userOut(){
+    modal.showDialog(title: '提示', content:
+    Container(
+      alignment: Alignment.center,
+      child:  Text('确定要退出登陆吗？'),
+    ),onCancel: ()=>true,
+        onConfirm: () => {
+        box.remove('token'),
+    Get.offNamed('/login'),
+
+  });
+  }
+
 
   @override
   Widget build(BuildContext context) {
-    print('644444444444444+$item');
-
     return Container(
       alignment: Alignment.center,
       child: Column(
@@ -48,27 +60,8 @@ class MainPage extends StatelessWidget {
                   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');
-                                      })
-                                ]);
-                          });
+                      _userOut();
+
                     },
                     child: const Text(
                       "退出登陆",

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

@@ -44,7 +44,7 @@ class UserInfo extends StatelessWidget {
                 child: GestureDetector(
                   child: const Text(
                     '修改个人信息',
-                    style: TextStyle(color: Colors.white),
+                    style: TextStyle(color: Colors.white,fontSize: 14),
                   ),
                   onTap: () {
                     Get.toNamed('/userInfo');

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

@@ -22,10 +22,8 @@ class _OrderPageState extends State<OrderPage> {
   void initState() {
     // TODO: implement initState
     super.initState();
-
     getOrderList(true).then((value) {
       final list = <OrderListAll>[];
-
       setState(() {
         value['records'].forEach((item) {
           list.add(OrderListAll.fromJson(item));
@@ -39,7 +37,7 @@ class _OrderPageState extends State<OrderPage> {
 
   @override
   Widget build(BuildContext context) {
-    return orderListItem.value.length >= 0?
+    return orderListItem().length>0?
       Column(
       children: [
         Container(
@@ -74,7 +72,7 @@ class _OrderPageState extends State<OrderPage> {
         Column(
           mainAxisSize: MainAxisSize.min,
           children:
-          orderListItem.value.map((item) => OrderListCard(item: item)).toList(),
+          orderListItem().map((item) => OrderListCard(item: item)).toList(),
         ),
       ],
     ):NullCard(text: '您还没有新的订单！');

lib/pages/orderInfo/index.dart

@@ -16,14 +16,11 @@ import '../../widgets/layout/BasicPage.dart';
 //   StyleObj ({ required this.title, required this.styleColor});
 // }
 
-
-
 class OrderPageInfo extends BasicPage {
-  final id=Rx<String>('');
-  final orderStateText=Rx<String>('待支付');
-  final orderStateColor=Rx<Color>(Colors.black);
+  final id = Rx<String>('');
+  final orderStateText = Rx<String>('待支付');
+  final orderStateColor = Rx<Color>(Colors.black);
   final orderInfoContent = Rx<OrderInfoModel>(OrderInfoModel());
-
   // orderStates
 
   @override
@@ -42,157 +39,265 @@ class OrderPageInfo extends BasicPage {
     }
   }
 
-
   @override
   Widget builder(BuildContext context) {
     naviTitle = '订单详情';
 
     return Column(
       children: [
-        Obx(() =>
-            OrderInfoCard(
-                item: orderInfoContent(),
-                orderStateText: orderStateText(),
-                orderStateColor: orderStateColor()
-            ),
+        Obx(
+          () => OrderInfoCard(
+              item: orderInfoContent(),
+              orderStateText: orderStateText(),
+              orderStateColor: orderStateColor()),
+        ),
+        // Obx(() => _BottomWidget(id: id())),
+
+        Obx(
+          () => Container(
+              padding: EdgeInsets.fromLTRB(15, 50.w, 15, 0),
+              child: _bottomJudgment(id.value)),
         ),
-        Obx(()=>_BottomWidget(id: id()))
-        // orderStateText=='已完成'?  Text('')
-        //     :orderStateText== '进行中' ?Text('')
-        //     :orderStateText=='待评价'? DefaultButton(
-        //   color: const Color(0xffffffff),
-        //   backColor: const Color(0xFFFF703B),
-        //   width: 300.w,
-        //   height: 49.h,
-        //   text: '评价',
-        //   onPressed: () {
-        //     Fluttertoast.showToast(msg: '评价成功！');
-        //     Get.offAllNamed('/');
-        //   },
-        //   margin: const EdgeInsets.all(0),
-        //   fontSize: 20.sp,
-        //   radius: 24.5.w,
-        // )
-        //     :orderStateText=='待作业'?DefaultButton(
-        //   color: const Color(0xffffffff),
-        //   backColor: const Color(0xFFFF703B),
-        //   width: 300.w,
-        //   height: 49.h,
-        //   text: '退单',
-        //   onPressed: () {
-        //     Fluttertoast.showToast(msg: '评价成功！');
-        //     Get.offAllNamed('/');
-        //   },
-        //   margin: const EdgeInsets.all(0),
-        //   fontSize: 20.sp,
-        //   radius: 24.5.w,
-        // )
-        //     :orderStateText=='待付款'?_BottomWidget
-        //     :orderStateText=='已退单'?Text('')
-        //     :orderStateText=='退单申请中'?DefaultButton(
-        //   color: const Color(0xffffffff),
-        //   backColor: const Color(0xFFFF703B),
-        //   width: 300.w,
-        //   height: 49.h,
-        //   text: orderStateText,
-        //   onPressed: () {
-        //     Fluttertoast.showToast(msg: '评价成功！');
-        //     Get.offAllNamed('/');
-        //   },
-        //   margin: const EdgeInsets.all(0),
-        //   fontSize: 20.sp,
-        //   radius: 24.5.w,
-        // ):Text(''),
-
-        // Spacer(),
       ],
     );
   }
+
+  Widget _bottomJudgment(String id) {
+    return orderStateText.value == '已完成'
+        ? Text('')
+        : orderStateText.value == '进行中'
+            ? Text('')
+            : orderStateText.value == '待评价'
+                ? DefaultButton(
+                    color: const Color(0xffffffff),
+                    backColor: const Color(0xFFFF703B),
+                    width: 300.w,
+                    height: 49.h,
+                    text: '评价',
+                    onPressed: () {
+                      Fluttertoast.showToast(msg: '评价成功！');
+                      Get.offNamed('/order');
+                    },
+                    margin: const EdgeInsets.all(0),
+                    fontSize: 20.sp,
+                    radius: 24.5.w,
+                  )
+                : orderStateText.value == '待作业'
+                    ? DefaultButton(
+                        color: const Color(0xffffffff),
+                        backColor: const Color(0xFFFF703B),
+                        width: 300.w,
+                        height: 49.h,
+                        text: '退单',
+                        onPressed: () {
+                          modal.showDialog(
+                              title: '提示',
+                              content: Container(
+                                alignment: Alignment.center,
+                                child: Text('确定要申请退单吗？'),
+                              ),
+                              onCancel: () => true,
+                              onConfirm: () => {
+                                    orderRefund(id).then((value) {
+                                      Fluttertoast.showToast(msg: '退单成功！');
+                                      Get.offNamed('/order');
+                                    }),
+                                  });
+                        },
+                        margin: const EdgeInsets.all(0),
+                        fontSize: 20.sp,
+                        radius: 24.5.w,
+                      )
+                    : orderStateText.value == '已付款'
+                        ? DefaultButton(
+                            color: const Color(0xffffffff),
+                            backColor: const Color(0xFFFF703B),
+                            width: 300.w,
+                            height: 49.h,
+                            text: '退单',
+                            onPressed: () {
+                              modal.showDialog(
+                                  title: '提示',
+                                  content: Container(
+                                    alignment: Alignment.center,
+                                    child: Text('确定要申请退单吗？'),
+                                  ),
+                                  onCancel: () => true,
+                                  onConfirm: () => {
+                                        orderRefund(id).then((value) {
+                                          Fluttertoast.showToast(msg: '退单成功！');
+                                          Get.offNamed('/order');
+                                        }),
+                                      });
+                            },
+                            margin: const EdgeInsets.all(0),
+                            fontSize: 20.sp,
+                            radius: 24.5.w,
+                          )
+                        : orderStateText.value == '待付款'
+                            ? _BottomWidget(
+                                id: id,
+                              )
+                            : orderStateText.value == '已退单'
+                                ? Text('')
+                                : orderStateText.value == '退单申请中'
+                                    ? Text(orderStateText.value)
+                                    : Text('');
+  }
 }
 
 class _BottomWidget extends StatelessWidget {
   final id;
-  const _BottomWidget({Key? key, required this.id}) : super(key: key);
+  final resultMessage = Rx<String>('---');
 
+  _BottomWidget({Key? key, required this.id}) : super(key: key);
 
-  void _orderDeletels (){
-    modal.showDialog(title: '测试', content: SizedBox(width: 400, height: 300,), onConfirm: () => true);
-    // orderDelete(id).then((value) {
-    //   Fluttertoast.showToast(
-    //       msg: '订单取消成功！'
-    //   );
-    //   Get.offNamed('/order');
-    // });
+  void _orderDeletels() {
+    modal.showDialog(
+        title: '提示',
+        content: Container(
+          alignment: Alignment.center,
+          child: Text('确定要取消此订单吗？'),
+        ),
+        onCancel: () => true,
+        onConfirm: () => {
+              orderDelete(id).then((value) {
+                Fluttertoast.showToast(msg: '订单取消成功！');
+                Get.offNamed('/order');
+              })
+            });
   }
 
+  //显示底部弹框的功能
+  void showBottomSheet(context) {
+    //用于在底部打开弹框的效果
+    showModalBottomSheet(
+        context: context,
+        isScrollControlled: false,
+        backgroundColor: Colors.white,
+        shape: RoundedRectangleBorder(
+            borderRadius: BorderRadius.all(Radius.circular(10))),
+        builder: (BuildContext context) {
+          return Container(
+            height: 200.w, //对话框高度就是此高度
+            child: Center(
+                child: Column(
+              children: [
+                Padding(
+                  padding: EdgeInsets.fromLTRB(0, 25.w, 0, 34.w),
+                  child: Text(
+                    "支付方式",
+                    style:
+                        TextStyle(fontSize: 17.sp, fontWeight: FontWeight.bold),
+                  ),
+                ),
+                Padding(
+                  padding: EdgeInsets.fromLTRB(15.w, 0, 15.w, 0),
+                  child: ListTile(
+                    contentPadding: EdgeInsets.symmetric(horizontal: 0.0),
+                    // 这边使用了contentPadding
+                    leading: Image(
+                      image: AssetImage('images/alipay.png'),
+                      width: 30.w,
+                      height: 30.w,
+                    ),
+                    title: Transform(
+                      transform: Matrix4.translationValues(-15, 0.0, 0.0),
+                      child: Text("支付宝",
+                          style: TextStyle(
+                              fontSize: 18.sp, color: Color(0xff333333))),
+                    ),
+                    trailing: Image(
+                      image: AssetImage('images/userRight.png'),
+                      width: 10.w,
+                      height: 18.w,
+                    ),
+                  ),
+                ),
+                Padding(
+                  padding: EdgeInsets.fromLTRB(15.w, 0, 15.w, 0),
+                  child: ListTile(
+                    onTap: (){
 
+                    },
+                    contentPadding: EdgeInsets.symmetric(horizontal: 0.0),
+                    // 这边使用了contentPadding
+                    leading: Image(
+                      image: AssetImage('images/weChatPay.png'),
+                      width: 30.w,
+                      height: 30.w,
+                    ),
+                    title: Transform(
+                      transform: Matrix4.translationValues(-15, 0.0, 0.0),
+                      child: Text("微信",
+                          style: TextStyle(
+                              fontSize: 18.sp, color: Color(0xff333333))),
+                    ),
+                    trailing: Image(
+                      image: AssetImage('images/userRight.png'),
+                      width: 10.w,
+                      height: 18.w,
+                    ),
+                  ),
+                ),
+              ],
+            )),
+          );
+        });
+  }
 
   @override
   Widget build(BuildContext context) {
-
     return Container(
-      height: 100.w,
       alignment: Alignment.bottomCenter,
-      margin: EdgeInsets.fromLTRB(15.w, 0, 15.w, 50.h),
       child: Row(
         mainAxisAlignment: MainAxisAlignment.spaceBetween,
         children: [
-          Container(
+          SizedBox(
             width: 150.w,
             height: 49.h,
-            margin: EdgeInsets.fromLTRB(0, 30.w, 0, 30.w),
-            alignment: Alignment.bottomCenter,
-            child: SizedBox(
-                  width: 150.w,
-                  height: 49.h,
-              child: ElevatedButton(
-                onPressed: () {
-                  _orderDeletels();
-                },
-                child: const Text(
-                  "取消",
-                  style: TextStyle(
-                      fontSize: 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))),
-                  ),
+            child: ElevatedButton(
+              onPressed: () {
+                _orderDeletels();
+              },
+              child: const Text(
+                "取消",
+                style: TextStyle(
+                    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))),
                 ),
               ),
             ),
           ),
-      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,
-            height: 49.h,
-            text: '支付',
-            onPressed: () {
-              Fluttertoast.showToast(msg: '支付成功！');
-              Get.offAllNamed('/');
-            },
-            margin: const EdgeInsets.all(0),
-            fontSize: 20.sp,
-            radius: 24.5.w,
+          SizedBox(
+            child: DefaultButton(
+              color: const Color(0xffffffff),
+              backColor: const Color(0xFFFF703B),
+              width: 150.w,
+              height: 49.h,
+              text: '支付',
+              onPressed: () {
+                showBottomSheet(context);
+                // Fluttertoast.showToast(msg: '支付成功！');
+                // Get.offAllNamed('/');
+              },
+              margin: const EdgeInsets.all(0),
+              fontSize: 20.sp,
+              radius: 24.5.w,
+            ),
           ),
-      ),
         ],
       ),
     );
   }
 }
-
-
-

lib/pages/search/index.dart

@@ -1,58 +1,82 @@
+import 'dart:async';
+
 import 'package:farmer_client/widgets/layout/BasicPage.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:get/get.dart';
+import 'package:get/get_rx/src/rx_types/rx_types.dart';
 
+import '../../models/app.dart';
+import '../../models/entities/CardListModel.dart';
+import '../../services/homeAPI.dart';
+import '../../widgets/CarsCard.dart';
 import '../../widgets/NullCard.dart';
+import 'dart:async';
 
 class SearchPage extends BasicPage {
+  final cardSearchList = Rx<List<CardListModel>>([]);
+  var location = AppController.t.locationStr;
+
+
+  void _onChange(String value){
+      print(location);
+      searchMachinery(location.toString(),value).then((value) {
+        final list = <CardListModel>[];
+        value['records'].forEach((item) {
+          list.add(CardListModel.fromJson(item));
+        });
+        cardSearchList(list);
+      });
+
+  }
 
   @override
   Widget builder(BuildContext context) {
     naviTitle = '搜索';
     return Container(
-
         child: Column(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);
-                    },
-                  ),
+      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) {
+                  _onChange(e);
+                },
+              ),
             ),
-          ),
-          Column(
-            children: [
-              NullCard(text: '暂无农机信息'),
-            ],
-          )
-        ]));
+          ],
+        ),
+      ),
+          Obx(()=>Column(
+              children:
+              cardSearchList.value.length>0?
+                  cardSearchList().map((item) => CarsCard(item: item)).toList()
+                  :  [NullCard(text: '暂无农机信息！')],
+            ))
+    ]));
   }
 }

lib/services/homeAPI.dart

@@ -29,6 +29,21 @@ Future getMachinery(String location) async {
       });
 }
 
+/**
+ * 农机列表搜索
+ * @param {*} data
+ * @returns
+ */
+Future searchMachinery(String location,String? q,) async {
+  return request('/machinery', options: Options(method: 'GET'), queryParameters: {
+    'location': location,'q':q,
+  },data: {'q':q,'location':location}).catchError((error) => {
+    Fluttertoast.showToast(msg: error.error['message']),
+  });
+}
+
+
+
 /**
  * 农机详情
  * @param {*} data

lib/services/orderAPI.dart

@@ -59,5 +59,19 @@ Future orderDelete(String id)async{
   { Fluttertoast.showToast(
       msg: error.error['message']
   ),});
+}
+
 
+/**
+ * --------------订单退款-----------------
+ * @param {*} data
+ * @returns
+ */
+Future orderRefund (String id)async{
+  return request('/order/$id/refund',options: Options(method: 'PUT')).catchError((error) =>
+  { Fluttertoast.showToast(
+      msg: error.error['message']
+  ),});
 }
+
+

lib/widgets/OrderInfoCard.dart

@@ -161,7 +161,7 @@ class OrderInfoCard extends StatelessWidget {
                                   fontSize: 16,
                                   fontWeight: FontWeight.bold)),
                           TextSpan(
-                              text: orderStateText??'未支付',
+                              text: orderStateText==null?'未支付':orderStateText=='已付款'? '已付款,待调度':orderStateText,
                               style: TextStyle(
                                   color:orderStateColor??Colors.black,
                                   fontSize: 16,