homnds

lib/models/entities/CardInfo.dart

@@ -91,7 +91,7 @@ class ContentImageList {
   String? contentType;
   String? createDate;
   String? extId;
-  String? sort;
+  num? sort;
   String? targetId;
   String? targetType;
   ContentImageList();

lib/pages/OrderConfirmation/index.dart

@@ -8,13 +8,15 @@ import 'package:fluttertoast/fluttertoast.dart';
 import 'package:get/get.dart';
 import 'package:intl/intl.dart';
 
+import '../../models/entities/CardListModel.dart';
 import '../../models/entities/OrderInfoModel.dart';
+import '../../services/homeAPI.dart';
 import '../../services/orderAPI.dart';
 
 class OrderConfirmation extends BasicPage {
   TextEditingController _unameController = TextEditingController();
   GlobalKey _formKey = GlobalKey<FormState>();
-
+  String markId = '';
   final selectDate = Rx<DateTime>(DateTime.now()); //选择的时间
   final workingArea = Rx<int>(0);
   AddressController addressController = AddressController.t;
@@ -26,8 +28,16 @@ class OrderConfirmation extends BasicPage {
     // TODO: implement beforeShow
     super.beforeShow();
     if(Get.arguments['item']!=null){
-      item.value=Get.arguments['item'];
+      item(Get.arguments['item']);
     }else{
+      markId=Get.arguments['id'];
+      getMachineryInfo(markId, '122.08400000000002,37.421998333333335', true).then((value) {
+        item(CardInfo.fromJson(value));
+
+      });
+
+      // item(CardInfo.fromJson(Get.arguments['item']));
+
       return;
     }
   }
@@ -53,12 +63,11 @@ class OrderConfirmation extends BasicPage {
         'appointmentDate': '${DateFormat("yyyy-MM-dd").format(selectDate.value)} 08:00:00',
       };
       generateOrder(data).then((value) {
-        orderInfo.value=OrderInfoModel.fromJson(value);
+        orderInfo(OrderInfoModel.fromJson(value));
         Fluttertoast.showToast(
             msg: '预约成功'
         );
-        Get.to('/OrderInfoCard',arguments: {'id':orderInfo.value.orderId});
-
+        Get.offNamed('/orderPageInfo',arguments: {'id':orderInfo().orderId});
 
       });
       //验证通过提交数据
@@ -88,7 +97,7 @@ class OrderConfirmation extends BasicPage {
               ),
             ),
             TextFormField(
-              // autofocus: true,
+              autofocus: false,
               keyboardType: TextInputType.number,
               controller: _unameController,
               decoration: const InputDecoration(
@@ -108,7 +117,7 @@ class OrderConfirmation extends BasicPage {
                 hintText: "请输入具体面积(公顷)",
               ),
               onChanged: (e) {
-                workingArea.value = int.parse(e);
+                workingArea(int.parse(e));
               },
               // 校验用户名
               validator: (v) {
@@ -152,19 +161,19 @@ class OrderConfirmation extends BasicPage {
                             helpText: '请选择作业开始时间',
                             cancelText: '取消',
                             confirmText: '确定',
-                            initialDate: selectDate.value == null
+                            initialDate: selectDate() == null
                                 ? DateTime.now()
-                                : selectDate.value,
+                                : selectDate(),
                             firstDate: DateTime.now(),
                             lastDate: DateTime(2030),
                           );
-                          selectDate.value = handleChnage!;
+                          selectDate(handleChnage!);
                           print('${selectDate}+');
                         },
                         child: Obx(()=>
                             Text(selectDate == null
                                 ? '请选择日期'
-                                : '${DateFormat("yyyy-MM-dd").format(selectDate.value)}'),
+                                : '${DateFormat("yyyy-MM-dd").format(selectDate())}'),
                         )
 
                       ),

lib/pages/machinery/detail/index.dart

@@ -13,7 +13,7 @@ class MachineryDetailPage extends BasicPage {
   final machineryListContent= Rx<List<ContentImageList>>([]);//图文详情
   // 响应预约事件
   void handleClick() {
-    Get.toNamed('/orderConfirmation',arguments: {'item':machineryInfoContent.value});
+    Get.toNamed('/orderConfirmation',arguments: {'item':machineryInfoContent()});
   }
 
 
@@ -26,9 +26,9 @@ class MachineryDetailPage extends BasicPage {
      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!;
+        machineryInfoContent(CardInfo.fromJson(value));
+        machineryListBanner(machineryInfoContent().imagesList!);
+        machineryListContent(machineryInfoContent().contentList!);
 
       });
 

lib/pages/machinery/map/index.dart

@@ -13,7 +13,9 @@ class MachineryMapPage extends BasicPage {
   final machineryInfoContent = Rx<CardInfo>(CardInfo());//全部详情
   // 响应预约事件
   void handleClick() {
-    Get.toNamed("/machineryDetail");
+    // Get.toNamed("/machineryDetail");
+    Get.toNamed('/orderConfirmation',arguments: {'item':machineryInfoContent()});
+
   }
 
   @override
@@ -25,7 +27,7 @@ class MachineryMapPage extends BasicPage {
       marKm = Get.arguments['km'];
       print(marKm);
       getMachineryInfo(markId, '122.08400000000002,37.421998333333335', true).then((value) {
-        machineryInfoContent.value=CardInfo.fromJson(value);
+        machineryInfoContent(CardInfo.fromJson(value));
 
       });
 
@@ -43,7 +45,7 @@ class MachineryMapPage extends BasicPage {
   @override
   Widget builder(BuildContext context) {
     naviTitle = "查看地图";
-    return Obx(()=>page(context: context, handleClick: handleClick,item: machineryInfoContent.value,km: marKm));
+    return Obx(()=>page(context: context, handleClick: handleClick,item: machineryInfoContent(),km: marKm));
   }
   
 }

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

@@ -25,7 +25,11 @@ Widget page({required CardInfo item,required String km, required BuildContext co
         DefLayout.card(
             top: DefLayout.headHeight - DefLayout.offset,
             height: DefLayout.headHeight,
-            child: Image.network(item.thumb.toString(), fit: BoxFit.cover)
+            child: Image.network(item.thumb.toString(), fit: BoxFit.cover,
+            errorBuilder:  (ctx, exception, stackTrace) {
+              return Container(); //THE WIDGET YOU WANT TO SHOW IF URL NOT RETURN IMAGE
+            },
+            ),
         ),
         DefLayout.card(
             top: (DefLayout.headHeight - DefLayout.offset) * 2,

lib/pages/orderInfo/index.dart

@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:get/get.dart';
+import 'package:farmer_client/widgets/Modal.dart' as modal;
 
 import '../../models/entities/OrderInfoModel.dart';
 import '../../services/orderAPI.dart';
@@ -18,10 +19,9 @@ import '../../widgets/layout/BasicPage.dart';
 
 
 class OrderPageInfo extends BasicPage {
-  String id = '';
-  String orderStateText = '';
-  late Color orderStateColor;
-
+  final id=Rx<String>('');
+  final orderStateText=Rx<String>('待支付');
+  final orderStateColor=Rx<Color>(Colors.black);
   final orderInfoContent = Rx<OrderInfoModel>(OrderInfoModel());
 
   // orderStates
@@ -31,17 +31,18 @@ class OrderPageInfo extends BasicPage {
     // TODO: implement beforeShow
     super.beforeShow();
     if (Get.arguments['id'] != null) {
-      id = Get.arguments['id'];
+      id(Get.arguments['id']);
 
-      orderStateText = Get.arguments['title'];
-      orderStateColor = Get.arguments['styleColor'];
+      orderStateText(Get.arguments['title']);
+      orderStateColor(Get.arguments['styleColor']);
 
-      orderInfo(id).then((value) {
-        orderInfoContent.value = OrderInfoModel.fromJson(value);
+      orderInfo(id()).then((value) {
+        orderInfoContent(OrderInfoModel.fromJson(value));
       });
     }
   }
 
+
   @override
   Widget builder(BuildContext context) {
     naviTitle = '订单详情';
@@ -50,12 +51,12 @@ class OrderPageInfo extends BasicPage {
       children: [
         Obx(() =>
             OrderInfoCard(
-                item: orderInfoContent.value,
-                orderStateText: orderStateText,
-                orderStateColor: orderStateColor
+                item: orderInfoContent(),
+                orderStateText: orderStateText(),
+                orderStateColor: orderStateColor()
             ),
         ),
-        _BottomWidget()
+        Obx(()=>_BottomWidget(id: id()))
         // orderStateText=='已完成'?  Text('')
         //     :orderStateText== '进行中' ?Text('')
         //     :orderStateText=='待评价'? DefaultButton(
@@ -110,7 +111,21 @@ class OrderPageInfo extends BasicPage {
 }
 
 class _BottomWidget extends StatelessWidget {
-  const _BottomWidget({Key? key}) : super(key: key);
+  final id;
+  const _BottomWidget({Key? key, required this.id}) : super(key: key);
+
+
+  void _orderDeletels (){
+    orderDelete(id).then((value) {
+      Fluttertoast.showToast(
+          msg: '订单取消成功！'
+      );
+    });
+
+
+  }
+
+
 
   @override
   Widget build(BuildContext context) {
@@ -132,7 +147,7 @@ class _BottomWidget extends StatelessWidget {
                   height: 49.h,
               child: ElevatedButton(
                 onPressed: () {
-                  Get.back();
+                  _orderDeletels();
                 },
                 child: const Text(
                   "取消",

lib/services/orderAPI.dart

@@ -48,3 +48,16 @@ Future generateOrder(item)async{
 }
 
 
+
+/**
+ * 删除订单
+ * @param {*} data
+ * @returns
+ */
+Future orderDelete(String id)async{
+  return request('/order/$id',options: Options(method: 'DELETE')).catchError((error) =>
+  { Fluttertoast.showToast(
+      msg: error.error['message']
+  ),});
+
+}

lib/widgets/CarsCard.dart

@@ -129,7 +129,7 @@ class _CarsCardPage extends State<CarsCard> {
                     child: ElevatedButton(
                       onPressed: () {
                         Get.toNamed('/orderConfirmation',
-                            arguments: {'machineryId': item.machineryId});
+                            arguments: {'id':item.machineryId});
                       },
                       child: const Text(
                         "预约",

lib/widgets/OrderInfoCard.dart

@@ -193,7 +193,7 @@ class OrderInfoCard extends StatelessWidget {
                                     Color(0xFFFA7878),
                                     Color(0xFFB61515),
                                   ],
-                                  child: const Text('8880',
+                                  child:  Text(( (item.charges??0)/100).toString(),
                                       style: TextStyle(
                                           color: Color(0xffB61515),
                                           fontSize: 16,

lib/widgets/OrderListCard.dart

@@ -288,7 +288,7 @@ class _OrderListCardPages extends State<OrderListCard> {
                                 text:  TextSpan(
                                     children: <InlineSpan>[
                                       TextSpan(
-                                          text:( item.charges!/100).toString(),
+                                          text:( (item.charges??0)/100).toString(),
                                           style: TextStyle(
                                             fontSize: 16,
                                             fontWeight: FontWeight.bold,