feats

lib/pages/OrderConfirmation/index.dart

@@ -88,7 +88,7 @@ class OrderConfirmation extends BasicPage {
                   margin: EdgeInsets.fromLTRB(15, 20, 0, 0),
                   alignment: Alignment.topLeft,
                   child: Text(
-                    '作业面积/公顷',
+                    '作业面积/亩',
                     style: TextStyle(
                         color: Color(0xff222222),
                         fontSize: 17.sp,
@@ -113,14 +113,14 @@ class OrderConfirmation extends BasicPage {
                       ),
                     ),
                     floatingLabelBehavior: FloatingLabelBehavior.never,
-                    hintText: "请输入具体面积(公顷)",
+                    hintText: "请输入具体面积(亩)",
                   ),
                   onChanged: (e) {
                     workingArea(int.parse(e));
                   },
                   // 校验用户名
                   validator: (v) {
-                    return v!.trim().isNotEmpty ? null : "作业面积/公顷不能为空";
+                    return v!.trim().isNotEmpty ? null : "作业面积/亩不能为空";
                   },
                 ),
                 Container(

lib/pages/machinery/widgets/summary.dart

@@ -59,7 +59,7 @@ Widget _title({required CardInfo item}) {
                     fontWeight: FontWeight.bold,
                   )),
               TextSpan(
-                  text: "公顷",
+                  text: "亩",
                   style: TextStyle(
                     fontSize: 12.sp,
                     fontWeight: FontWeight.bold,

lib/pages/order/index.dart

@@ -3,14 +3,10 @@ import 'package:farmer_client/widgets/layout/BasicPage.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_easyrefresh/easy_refresh.dart';
 import 'package:farmer_client/widgets/NullCard.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_easyloading/flutter_easyloading.dart';
-import 'package:flutter_easyrefresh/easy_refresh.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:get/get.dart';
 import 'package:get/get_rx/src/rx_types/rx_types.dart';
-import '../../models/entities/OrderListAll.dart';
+import '../../models/entities/OrderInfoModel.dart';
 import '../../services/orderAPI.dart';
 import '../../widgets/OrderListCard.dart';
 
@@ -21,8 +17,8 @@ class OrderPage extends BasicPage {
   }
   EasyRefreshController _controller = EasyRefreshController();
 
-  final orderListItem = Rx<List<OrderListAll>>([]);
-  final newOrderList = Rx<List<OrderListAll>>([]);
+  final orderListItem = Rx<List<OrderInfoModel>>([]);
+  final newOrderList = Rx<List<OrderInfoModel>>([]);
   var pageIndex = 1; //页数
   var count = 10; //每页10条
   late int maxSum; //最多条数
@@ -35,9 +31,9 @@ class OrderPage extends BasicPage {
     print(params['pageNum']);
     getOrderList(params).then((value) {
       maxSum = value['total'];
-      List<OrderListAll> list = [];
+      List<OrderInfoModel> list = [];
       value['records'].forEach((item) {
-        list.add(OrderListAll.fromJson(item));
+        list.add(OrderInfoModel.fromJson(item));
       });
       orderListItem(list);
       newOrderList(list);
@@ -51,10 +47,10 @@ class OrderPage extends BasicPage {
     print(params['pageNum']);
     getOrderList(params).then((value) {
       maxSum = value['total'];
-      List<OrderListAll> list = [];
-      List<OrderListAll> Newlist = [];
+      List<OrderInfoModel> list = [];
+      List<OrderInfoModel> Newlist = [];
       value['records'].forEach((item) {
-        list.add(OrderListAll.fromJson(item));
+        list.add(OrderInfoModel.fromJson(item));
       });
       newOrderList.value.addAll(list);
       Newlist.addAll(newOrderList.value);
@@ -71,51 +67,48 @@ class OrderPage extends BasicPage {
   }
   @override
   Widget builder(BuildContext context) {
-    return Container(
-      // padding: EdgeInsets.fromLTRB(15, 0, 15, 0),
-      child:Column(
-        children:  [
-          OrderHead(),
-          Expanded(
-            child:
-            (
-      EasyRefresh(
-        controller: _controller,
-        firstRefresh: true,
-        header: ClassicalHeader(refreshingText:'刷新中...',refreshedText: '刷新成功',refreshFailedText:'异常'),
-        onRefresh: () async {
-          await Future.delayed(Duration(seconds: 1), () {
-            print("下拉刷新-----");
-            getNewData();
-            _controller.resetLoadState();
-          });
-        },
-        onLoad: () async {
-          await Future.delayed(Duration(seconds: 1), () {
-            if (_count == maxSum) {
-              Fluttertoast.showToast(msg: '暂无更多数据哦');
-            } else {
-              getMoreData();
-            }
-            _controller.finishLoad(noMore: _count >= maxSum);
+    return Column(
+      children:  [
+        const OrderHead(),
+        Expanded(
+          child:
+          (
+    EasyRefresh(
+      controller: _controller,
+      firstRefresh: true,
+      header: ClassicalHeader(refreshingText:'刷新中...',refreshedText: '刷新成功',refreshFailedText:'异常'),
+      onRefresh: () async {
+        await Future.delayed(const Duration(seconds: 1), () {
+          print("下拉刷新-----");
+          getNewData();
+          _controller.resetLoadState();
+        });
+      },
+      onLoad: () async {
+        await Future.delayed(const Duration(seconds: 1), () {
+          if (_count == maxSum) {
+            Fluttertoast.showToast(msg: '暂无更多数据哦');
+          } else {
+            getMoreData();
+          }
+          _controller.finishLoad(noMore: _count >= maxSum);
 
-          });
-        },
-        child: Obx(
-              () => orderListItem.value.length > 0
-              ?
-          Column(
-            mainAxisSize: MainAxisSize.min,
-            children: orderListItem.value
-                .map((item) => OrderListCard(item: item))
-                .toList(),
-          ): NullCard(text: '您还没有新的订单！'),
-        ),
-      )
-            ),
+        });
+      },
+      child: Obx(
+            () => orderListItem.value.isNotEmpty
+            ?
+        Column(
+          mainAxisSize: MainAxisSize.min,
+          children: orderListItem.value
+              .map((item) => OrderListCard(item: item))
+              .toList(),
+        ): const NullCard(text: '您还没有新的订单！'),
+      ),
+    )
+          ),
   )
-        ],
-      ) ,
+      ],
     );
   }
 }

lib/pages/orderInfo/index.dart

@@ -1,26 +1,22 @@
-import 'package:farmer_client/pages/orderInfo/widgets/star.dart';
-import 'package:farmer_client/services/pay.dart';
-import 'package:farmer_client/widgets/DefaultButton.dart';
 import 'package:ff_stars/ff_stars.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_easyloading/flutter_easyloading.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 'package:fluwx/fluwx.dart' as fluwx;
 import 'package:tobias/tobias.dart' as tobias;
+import 'package:farmer_client/services/pay.dart';
+import 'package:farmer_client/services/orderAPI.dart';
+import 'package:farmer_client/utils/processStatus.dart';
+import 'package:farmer_client/widgets/DefaultButton.dart';
+import 'package:farmer_client/widgets/Bold.dart';
+import 'package:farmer_client/widgets/OrderInfoCard.dart';
+import 'package:farmer_client/widgets/layout/BasicPage.dart';
+import 'package:farmer_client/widgets/Modal.dart' as modal;
+import 'package:farmer_client/models/entities/OrderInfoModel.dart';
 
-import '../../models/entities/OrderInfoModel.dart';
-import '../../services/orderAPI.dart';
-import '../../widgets/OrderInfoCard.dart';
-import '../../widgets/layout/BasicPage.dart';
-
-// class OrderContentInfo {
-//   String title;
-//   Color styleColor;
-//   StyleObj ({ required this.title, required this.styleColor});
-// }
+import './widgets/PayItem.dart';
 
 class OrderPageInfo extends BasicPage {
   final id = Rx<String>('');
@@ -29,6 +25,7 @@ class OrderPageInfo extends BasicPage {
   final orderInfoContent = Rx<OrderInfoModel>(OrderInfoModel());
   final evalText = Rx<String>('');
   final evalStars = Rx<num>(-1);
+  var processStatus;
 
   // orderStates
   @override
@@ -37,17 +34,16 @@ class OrderPageInfo extends BasicPage {
     super.beforeShow();
     if (Get.arguments['id'] != null) {
       id(Get.arguments['id']);
-      print(Get.arguments);
-
-      orderStateText(Get.arguments['title']);
-      orderStateColor(Get.arguments['styleColor']);
 
       orderInfo(id()).then((value) {
         EasyLoading.show(status: '数据加载中...');
-
-        orderInfoContent(OrderInfoModel.fromJson(value));
+        OrderInfoModel orderInfo = OrderInfoModel.fromJson(value);
+        processStatus = getProcessStatus(orderInfo);
+        ProcessSign processSign = getProcessSign(processStatus);
+        orderStateText(processSign.label);
+        orderStateColor(processSign.color);
+        orderInfoContent(orderInfo);
         EasyLoading.dismiss();
-
       });
     }
   }
@@ -64,233 +60,153 @@ class OrderPageInfo extends BasicPage {
               orderStateText: orderStateText(),
               orderStateColor: orderStateColor()),
         ),
-        // Obx(() => _BottomWidget(id: id())),
-
         Obx(
           () => Container(
               padding: EdgeInsets.fromLTRB(15, 50.w, 15, 0),
-              child: _bottomJudgment(id.value)),
+              child: _action(context, id.value)),
         ),
       ],
     );
   }
 
-  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: () {
-                      modal.showDialog(
-                          title: '评价此订单',
-                          content: Container(
-                              alignment: Alignment.center,
-                              child: Container(
-                                margin:
-                                    const EdgeInsets.fromLTRB(15, 20, 15, 20),
-                                child: Column(
-                                  children: [
-                                    Container(
-                                      padding: const EdgeInsets.fromLTRB(
-                                          0, 0, 0, 10),
-                                      decoration: const BoxDecoration(
-                                          border: Border(
-                                              bottom: BorderSide(
-                                                  width: 0.8,
-                                                  color: Color(0x20000000)
-                                                  // 0x17000000
-                                                  ))),
-                                      child: Row(
-                                        children: [
-                                          Text(
-                                            '满意度：',
-                                            style: TextStyle(
-                                                fontSize: 17.sp,
-                                                fontWeight: FontWeight.bold),
-                                          ),
-                                          FFStars(
-                                            //https://pub.dev/packages/ff_stars
-                                            normalStar: Image.asset(
-                                                'images/icons/starOff.png'),
-                                            selectedStar: Image.asset(
-                                                'images/icons/starOn.png'),
-                                            starsChanged:
-                                                (realStars, selectedStars) {
-                                              evalStars(realStars);
-                                              print(
-                                                  "real: $selectedStars, final: $realStars");
-                                            },
-                                            step: 1,
-                                            defaultStars: 0,
-                                          ),
-                                        ],
-                                      ),
-                                    ),
-                                    Container(
-                                      margin: const EdgeInsets.fromLTRB(
-                                          0, 20, 0, 0),
-                                      width: 300.w,
-                                      height: 100.w,
-                                      decoration: BoxDecoration(
-                                        border: Border.all(
-                                          color: Color(0x20000000),
-                                          width: 0.8,
-                                        ),
-                                      ),
-                                      child: TextField(
-                                        minLines: 6,
-                                        maxLines: 6,
-                                        style: TextStyle(
-                                            fontSize: 17.sp, height: 1.5),
-                                        decoration: const InputDecoration(
-                                          isCollapsed: true,
-                                          border: InputBorder.none,
-                                          counterText: '',
-                                          hintText: '请输入评价内容',
-                                          floatingLabelBehavior:
-                                              FloatingLabelBehavior.never,
-                                        ),
-                                        onChanged: (e) {
-                                          evalText(e);
-                                        },
-                                      ),
-                                    )
-                                  ],
-                                ),
-                              )),
-                          onCancel: () => true,
-                          onConfirm: () {
-                            if (evalStars.value != -1 && evalText.value != '') {
-                              orderEvaluation(
-                                      id, evalStars.value, evalText.value)
-                                  .then((value) {
-                                Fluttertoast.showToast(msg: '评价成功！');
-                                Get.offAllNamed('/order');
-                              });
-                            } else {
-                              Fluttertoast.showToast(msg: '请完整选择评分或输入评价内容');
-                              return false;
-                            }
-                          });
-                    },
-                    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.offAllNamed('/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.offAllNamed('/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;
-  final resultMessage = Rx<String>('---');
-
-  _BottomWidget({Key? key, required this.id}) : super(key: key);
-
-
-  void _orderDeletels() {
+  // 取消订单
+  _cancelOrder(String orderId) {
     modal.showDialog(
         title: '提示',
         content: Container(
           alignment: Alignment.center,
-          child: Text('确定要取消此订单吗？'),
+          child: const Text('确定要取消此订单吗？'),
         ),
         onCancel: () => true,
         onConfirm: () => {
-              orderDelete(id).then((value) {
-                Fluttertoast.showToast(msg: '订单取消成功！');
-                Get.offAllNamed('/order');
-              })
-            });
+          orderDelete(orderId).then((value) {
+            Fluttertoast.showToast(msg: '订单取消成功！');
+            Get.offAllNamed('/order');
+          })
+        });
   }
 
+  // 满意度表单
+  Widget _evaluateWidget(Function onEvaluate) {
+    double star = -1;
+    String desc = '';
+
+    return Container(
+        alignment: Alignment.center,
+        child: Container(
+          margin:
+          const EdgeInsets.fromLTRB(15, 20, 15, 20),
+          child: Column(
+            children: [
+              Container(
+                padding: const EdgeInsets.fromLTRB(
+                    0, 0, 0, 10),
+                decoration: const BoxDecoration(
+                    border: Border(
+                        bottom: BorderSide(
+                            width: 0.8,
+                            color: Color(0x20000000)
+                          // 0x17000000
+                        ))),
+                child: Row(
+                  children: [
+                    Text(
+                      '满意度：',
+                      style: TextStyle(
+                          fontSize: 17.sp,
+                          fontWeight: FontWeight.bold),
+                    ),
+                    FFStars(
+                      //https://pub.dev/packages/ff_stars
+                      normalStar: Image.asset(
+                          'images/icons/starOff.png'),
+                      selectedStar: Image.asset(
+                          'images/icons/starOn.png'),
+                      starsChanged:
+                          (realStars, selectedStars) {
+                            star = realStars;
+                            onEvaluate(star, desc);
+                      },
+                      step: 1,
+                      defaultStars: 0,
+                    ),
+                  ],
+                ),
+              ),
+              Container(
+                margin: const EdgeInsets.fromLTRB(
+                    0, 20, 0, 0),
+                width: 300.w,
+                height: 100.w,
+                decoration: BoxDecoration(
+                  border: Border.all(
+                    color: const Color(0x20000000),
+                    width: 0.8,
+                  ),
+                ),
+                child: TextField(
+                  minLines: 6,
+                  maxLines: 6,
+                  style: TextStyle(
+                      fontSize: 17.sp, height: 1.5),
+                  decoration: const InputDecoration(
+                    isCollapsed: true,
+                    border: InputBorder.none,
+                    counterText: '',
+                    hintText: '请输入评价内容',
+                    floatingLabelBehavior:
+                    FloatingLabelBehavior.never,
+                  ),
+                  onChanged: (e) {
+                    desc = e;
+                    onEvaluate(star, desc);
+                  },
+                ),
+              )
+            ],
+          ),
+        ));
+  }
+
+  // 评价
+  _fnEvaluate(String orderId) {
+    int evalStars = -1;
+    String evalText = '';
+
+    onEvaluate(int val1, String val2) {
+      evalStars = val1;
+      evalText = val2;
+    }
+
+    modal.showDialog(
+      title: '评价此订单',
+      content: _evaluateWidget(onEvaluate),
+      onCancel: () => true,
+      onConfirm: () {
+        if (evalStars != -1 && evalText != '') {
+          orderEvaluation(
+              orderId, evalStars, evalText)
+              .then((value) {
+            Fluttertoast.showToast(msg: '评价成功！');
+            Get.offAllNamed('/order');
+          });
+        } else {
+          Fluttertoast.showToast(msg: '请完整选择评分或输入评价内容');
+          return false;
+        }
+      },
+    );
+  }
 
-Future<void> payMoney (String payType) async {
+  // 调用支付接口
+  Future<void> payMoney (String payType) async {
     if(payType=='wxPay'){
       final isInstall=await fluwx.isWeChatInstalled;
       if(!isInstall){
         EasyLoading.showError('请先安装微信');
-        print('isInstall--------$isInstall');
         return;
       }
-      createOrder(id, "wx").then((value) {
-        print('--------------微信支付-----------------');
-        print('result--------$value');
-        print('-------------------------------');
-        print("appid--------${value['appid']}");
-        print("partnerId--------${value['partnerId']}");
-        print("prepayId--------${value['prepayId']}");
-        print("packageValue--------${value['packageValue']}");
-        print("noncestr--------${value['noncestr']}");
-        print("timestamp--------${value['timestamp']}");
-        print("sign--------${value['sign']}");
+      createOrder(id.value, "wx").then((value) {
         fluwx.payWithWeChat(
           appId: value['appid'].toString(),
           partnerId: value['partnerId'].toString(),
@@ -301,20 +217,18 @@ Future<void> payMoney (String payType) async {
           sign: value['sign'].toString(),
         ).then((res) {
           print("payWithWeChat--------${res}");
-        })
-        .catchError((onError){
+        }).catchError((onError){
           print("payWithWeChat错误--------${onError}");
         });
       });
 
-// 监听支付结果
+      // 监听支付结果
       fluwx.weChatResponseEventHandler.listen((event) async {
         print(event.errCode);
         // 支付成功
         if (event.errCode == 0) {
           // EasyLoading.showSuccess('支付成功');
           Get.snackbar('提示', "支付成功");
-
           Get.offAllNamed('/order');
         }else{
 
@@ -322,19 +236,15 @@ Future<void> payMoney (String payType) async {
         }
         // 关闭弹窗
       });
-
-
       return;
-    }else if(payType=='aliPay'){
-      print('--------------支付宝支付-----------------');
+    } else if(payType=='aliPay'){
       final isInstall=await tobias.isAliPayInstalled();
       if(!isInstall){
         EasyLoading.showError('请先安装支付宝');
-        print('isInstall------支付宝--$isInstall');
         return;
       }
       // map["paySign"]
-      createOrder(id, "aliPay").then((value) {
+      createOrder(id.value, "aliPay").then((value) {
         tobias.aliPay(value).then((payResult) {
           print("支付宝:" + payResult.toString());
 
@@ -343,152 +253,99 @@ Future<void> payMoney (String payType) async {
             Get.offAllNamed('/order');
           } else {
             EasyLoading.showError('支付失败');
-
           }
         });
-
-        });
-
-
-
-
+      });
     }
+  }
 
-
-}
-  //显示底部弹框的功能
-  void showBottomSheet(context) {
+  // 支付 sheet
+  _bottomSheet(BuildContext context) {
     //用于在底部打开弹框的效果
     showModalBottomSheet(
         context: context,
         isScrollControlled: false,
         backgroundColor: Colors.white,
-        shape: RoundedRectangleBorder(
+        shape: const RoundedRectangleBorder(
             borderRadius: BorderRadius.all(Radius.circular(10))),
         builder: (BuildContext context) {
-          return Container(
+          return SizedBox(
             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(
-                    onTap: (){
-                      payMoney('aliPay');
-                    },
-                    contentPadding: EdgeInsets.symmetric(horizontal: 0.0),
-                    // 这边使用了contentPadding
-                    leading: Image(
-                      image: AssetImage('images/alipay.png'),
-                      width: 30.w,
-                      height: 30.w,
+                  children: [
+                    Padding(
+                      padding: EdgeInsets.fromLTRB(0, 25.w, 0, 34.w),
+                      child: Bold(text: "支付方式", fontSize: 17.sp),
                     ),
-                    title: Transform(
-                      transform: Matrix4.translationValues(-15, 0.0, 0.0),
-                      child: Text("支付宝",
-                          style: TextStyle(
-                              fontSize: 18.sp, color: Color(0xff333333))),
+                    PayItem(
+                      label: "支付宝",
+                      icon: const AssetImage('images/alipay.png'),
+                      onPress: () {
+                        payMoney('aliPay');
+                      },
                     ),
-                    trailing: Image(
-                      image: AssetImage('images/userRight.png'),
-                      width: 10.w,
-                      height: 18.w,
+                    PayItem(
+                      label: "微信",
+                      icon: const AssetImage('images/weChatPay.png'),
+                      onPress: () {
+                        payMoney('wxPay');
+                      },
                     ),
-                  ),
-                ),
-                Padding(
-                  padding: EdgeInsets.fromLTRB(15.w, 0, 15.w, 0),
-                  child: ListTile(
-                    onTap: () {
-                      payMoney('wxPay');
-                    },
-                    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(
-      alignment: Alignment.bottomCenter,
-      child: Row(
-        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-        children: [
-          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))),
-                ),
-              ),
-            ),
-          ),
-          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,
-            ),
-          ),
-        ],
-      ),
-    );
+  Widget _action(BuildContext context, String orderId) {
+    bool mustAction = false;
+    var btnLabel;
+    var btnFunction;
+
+    switch (processStatus) {
+      case 1:
+      case 2:
+        mustAction = true;
+        btnLabel = '取消';
+        btnFunction = () {
+          _cancelOrder(orderId);
+        };
+        break;
+      case 4:
+        mustAction = true;
+        btnLabel = '支付';
+        btnFunction = () {
+          _bottomSheet(context);
+        };
+        break;
+      case 5:
+        mustAction = true;
+        btnLabel = '评价';
+        btnFunction = () {
+          _fnEvaluate(orderId);
+        };
+        break;
+      case 3:
+      case 6:
+      default:
+        break;
+    }
+
+    if (mustAction) {
+      return DefaultButton(
+        color: const Color(0xffffffff),
+        backColor: const Color(0xFFFF703B),
+        width: 300.w,
+        height: 49.h,
+        text: btnLabel,
+        margin: const EdgeInsets.all(0),
+        fontSize: 20.sp,
+        radius: 24.5.w,
+        onPressed: btnFunction,
+      );
+    } else {
+      return const Text('');
+    }
   }
 }

lib/pages/orderInfo/widgets/PayItem.dart

@@ -0,0 +1,42 @@
+
+import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+
+class PayItem extends StatelessWidget {
+  String label;
+  ImageProvider icon;
+  Function() onPress;
+
+  PayItem({Key? key, required this.label, required this.icon, required this.onPress }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: EdgeInsets.fromLTRB(15.w, 0, 15.w, 0),
+      child: ListTile(
+        onTap: () {
+          onPress();
+        },
+        contentPadding: const EdgeInsets.symmetric(horizontal: 0.0),
+        // 这边使用了contentPadding
+        leading: Image(
+          image: icon,
+          width: 30.w,
+          height: 30.w,
+        ),
+        title: Transform(
+          transform: Matrix4.translationValues(-15, 0.0, 0.0),
+          child: Text(label,
+              style: TextStyle(
+                  fontSize: 18.sp, color: const Color(0xff333333))),
+        ),
+        trailing: Image(
+          image: const AssetImage('images/userRight.png'),
+          width: 10.w,
+          height: 18.w,
+        ),
+      ),
+    );
+  }
+}

lib/utils/Request.dart

@@ -28,9 +28,12 @@ class Response {
 final client = GetPlatform.isAndroid ? 'android' : 'ios';
 
 Dio createRequest() {
+  const isProd = bool.fromEnvironment('dart.vm.product');
+  const host = isProd ? 'https://machine.njyunzhi.com' : 'http://192.168.89.147:7080';
+  final baseUrl = '$host/api/$client/farmer';
+
   var options = BaseOptions(
-    baseUrl: 'https://machine.njyunzhi.com/api/' + client + '/farmer',
-    // baseUrl: 'http://192.168.89.147:7080/api/' + client + '/farmer',
+    baseUrl: baseUrl,
     connectTimeout: 5000,
     receiveTimeout: 3000,
   );

lib/utils/processStatus.dart

@@ -0,0 +1,63 @@
+
+import 'dart:ui';
+
+import 'package:farmer_client/models/entities/OrderInfoModel.dart';
+
+int getProcessStatus(OrderInfoModel orderInfo) {
+  // 订单完成
+  if (orderInfo.isEvaluated == 1) {
+    return 6;
+  }
+
+  // 待支付
+  if (orderInfo.workStatus == 3 && orderInfo.charges! > 0 && orderInfo.payStatus != 1) {
+    return 4;
+  }
+
+  // 待评价
+  if (orderInfo.workStatus == 3 && orderInfo.isEvaluated == 0) {
+    return 5;
+  }
+
+  // 工作中
+  if (orderInfo.workStatus! > 0 && orderInfo.workStatus! < 3 && orderInfo.dispatchStatus == 1) {
+    return 3;
+  }
+
+  // 待接单
+  if (orderInfo.workStatus == 0 && orderInfo.dispatchStatus == 1) {
+    return 2;
+  }
+
+  // 待分配
+  if (orderInfo.status == 1 && orderInfo.dispatchStatus == 0) {
+    return 1;
+  }
+
+  return -1;
+}
+
+class ProcessSign {
+  String label;
+  Color color;
+  ProcessSign({ required this.label, required this.color });
+}
+
+ProcessSign getProcessSign(int processStatus) {
+  switch (processStatus) {
+    case 1:
+      return ProcessSign(label: '待分配', color: const Color(0xFFFF703B));
+    case 2:
+      return ProcessSign(label: '待作业', color: const Color(0xFFFF703B));
+    case 3:
+      return ProcessSign(label: '进行中', color: const Color(0xFF44F68B));
+    case 4:
+      return ProcessSign(label: '待付款', color: const Color(0xFF51D4FF));
+    case 5:
+      return ProcessSign(label: '待评价', color: const Color(0xFF51D4FF));
+    case 6:
+      return ProcessSign(label: '已完成', color: const Color(0xFFFF703B));
+    default:
+      return ProcessSign(label: '未知', color: const Color(0xFFFF0000));
+  }
+}

lib/widgets/Bold.dart

@@ -0,0 +1,29 @@
+
+import 'package:flutter/widgets.dart';
+
+class Bold extends StatelessWidget {
+  String text;
+  double fontSize;
+  Color? color;
+  double? letterSpacing;
+  TextAlign? textAlign;
+
+  Bold({Key? key,
+    required this.text,
+    required this.fontSize,
+    this.color,
+    this.letterSpacing,
+    this.textAlign,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    var textStyle = TextStyle(color: color, fontSize: fontSize, fontWeight: FontWeight.bold, letterSpacing: letterSpacing);
+
+    return Text(
+      text,
+      style: textStyle,
+      textAlign: textAlign,
+    );
+  }
+}

lib/widgets/CarsCard.dart

@@ -113,7 +113,7 @@ class _CarsCardPage extends State<CarsCard> {
                               fontWeight: FontWeight.bold,
                             )),
                         TextSpan(
-                            text: "公顷",
+                            text: "亩",
                             style: TextStyle(
                               fontSize: 12,
                               fontWeight: FontWeight.bold,

lib/widgets/OrderListCard.dart

@@ -1,63 +1,47 @@
+import 'package:farmer_client/utils/processStatus.dart';
+import 'package:farmer_client/widgets/Bold.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 
-import '../models/entities/OrderListAll.dart';
-import '../pages/OrderConfirmation/index.dart';
-import '../pages/orderInfo/index.dart';
+import '../models/entities/OrderInfoModel.dart';
 import 'package:intl/intl.dart';
 import 'LinearGradientText.dart';
 
-class OrderListCard extends StatefulWidget {
-  final OrderListAll item;
-  const OrderListCard({Key? key, required this.item}) : super(key: key);
+class TextCell extends StatelessWidget {
+  String title;
+  String? value;
+
+  TextCell({Key? key, required this.title, this.value}):super(key: key);
 
   @override
-  _OrderListCardPages createState() => _OrderListCardPages(item);
-}
+  Widget build(BuildContext context) {
+    return RichText(
+      text: TextSpan(children: <InlineSpan>[
+        TextSpan(
+            text: title,
+            style: const TextStyle(
+                color: Color(0xff666666),
+                fontSize: 16,
+                fontWeight: FontWeight.bold)),
+        TextSpan(
+            text: value,
+            style: const TextStyle(
+                color: Color(0xff222222),
+                fontSize: 16,
+                fontWeight: FontWeight.bold)),
+      ]),
+    );
+  }
 
-class StyleObj {
-  String title;
-  Color styleColor;
-  StyleObj({required this.title, required this.styleColor});
 }
 
-class _OrderListCardPages extends State<OrderListCard> {
-  final OrderListAll item;
+class OrderListCard extends StatelessWidget {
+  final OrderInfoModel item;
+  late ProcessSign processSign;
 
-  _OrderListCardPages(this.item);
-
-  StyleObj orderStates() {
-    if (item.payStatus == 0) {
-      return StyleObj(title: '待付款', styleColor: Color(0xFF51D4FF));
-    } else if (item.payStatus == 1 &&
-        item.workStatus == 0 &&
-        item.dispatchStatus == 0) {
-      return StyleObj(title: '已付款', styleColor: Color(0xFFFF703B));
-    } else if (item.payStatus == 1 &&
-        item.dispatchStatus == 1 &&
-        item.workStatus == 0) {
-      return StyleObj(title: '待作业', styleColor: Color(0xFFFF703B));
-    } else if (item.payStatus == 1 &&
-        (item.workStatus == 1 || item.workStatus == 2)) {
-      return StyleObj(title: '进行中', styleColor: Color(0xFF44F68B));
-    } else if (item.workStatus == 3 && item.isEvaluated == 0) {
-      return StyleObj(title: '待评价', styleColor: Color(0xFF51D4FF));
-    }
-    if (item.workStatus == 3 &&
-        item.isEvaluated == 1 &&
-        item.dispatchStatus == 1) {
-      return StyleObj(title: '已完成', styleColor: Color(0xFFFF703B));
-    } else if (item.payStatus == -1 &&
-        item.workStatus == 0 &&
-        item.isRefund == 1) {
-      return StyleObj(title: '已退单', styleColor: Color(0xFFFF703B));
-    } else if (item.payStatus == 3 &&
-        (item.dispatchStatus == 1 || item.dispatchStatus == 0)) {
-      return StyleObj(title: '退单申请中', styleColor: Color(0xFFFF703B));
-    } else {
-      return StyleObj(title: '异常', styleColor: Color(0xFFFF0000));
-    }
+  OrderListCard({Key? key, required this.item}) : super(key: key) {
+    processSign = getProcessSign(getProcessStatus(item));
   }
 
   @override
@@ -65,24 +49,24 @@ class _OrderListCardPages extends State<OrderListCard> {
     return Container(
       width: 375.w,
       height: 345.h,
-      margin: EdgeInsets.fromLTRB(0, 0, 0, 20),
+      margin: const EdgeInsets.fromLTRB(0, 0, 0, 20),
       decoration: const BoxDecoration(color: Colors.white, boxShadow: [
         BoxShadow(
             color: Colors.black12,
             offset: Offset(0.0, 15.0), //阴影xy轴偏移量
             blurRadius: 15.0, //阴影模糊程度
             spreadRadius: 1.0 //阴影扩散程度
-            )
+        )
       ]),
       child: Row(
         crossAxisAlignment: CrossAxisAlignment.start,
         mainAxisAlignment: MainAxisAlignment.spaceBetween,
         children: [
           Container(
-            margin: EdgeInsets.fromLTRB(15, 20, 15, 0),
+            margin: const EdgeInsets.fromLTRB(15, 20, 15, 0),
             width: 18.0,
             height: 275.h,
-            child: Image(
+            child: const Image(
               image: AssetImage('images/ordersLeft.png'),
             ),
           ),
@@ -92,142 +76,59 @@ class _OrderListCardPages extends State<OrderListCard> {
               children: [
                 Container(
                   width: 320.w,
-                  margin: EdgeInsets.fromLTRB(0, 10, 0, 15),
-                  padding: EdgeInsets.fromLTRB(0, 0, 0, 20),
+                  margin: const EdgeInsets.fromLTRB(0, 10, 0, 15),
+                  padding: const EdgeInsets.fromLTRB(0, 0, 0, 20),
                   decoration: const BoxDecoration(
                       border: Border(
                           bottom:
-                              BorderSide(width: 0.5, color: Color(0x20000000)
-                                  // 0x17000000
-                                  ))),
-                  child: Row(
-                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                    children: [
-                      Container(
-                        child: RichText(
-                          text: TextSpan(children: <InlineSpan>[
-                            TextSpan(
-                                text: '订单编号：',
-                                style: TextStyle(
-                                    color: Color(0xff666666),
-                                    fontSize: 16,
-                                    fontWeight: FontWeight.bold)),
-                            TextSpan(
-                                text: item.orderNo,
-                                style: TextStyle(
-                                    color: Color(0xff222222),
-                                    fontSize: 16,
-                                    fontWeight: FontWeight.bold)),
-                          ]),
-                        ),
-                      ),
-                      GestureDetector(
-                        child: const Text('详情 >>',
-                            style: TextStyle(
-                              color: Color(0xff222222),
-                              fontSize: 16,
-                              fontWeight: FontWeight.bold,
-                            )),
-                        onTap: () {
-                          print('进入详情');
-                          Get.toNamed('/orderPageInfo', arguments: {
-                            'id': item.orderId,
-                            'title': orderStates().title,
-                            'styleColor': orderStates().styleColor
-                          });
-                        },
-                      )
-                    ],
+                          BorderSide(width: 0.5, color: Color(0x20000000)
+                            // 0x17000000
+                          ))),
+                  child: GestureDetector(
+                    child:
+                    Row(
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      children: [
+                        TextCell(title: '订单编号：', value: item.orderNo),
+                        Bold(text: "详情 >>", fontSize: 16.sp, color: const Color(0xff222222)),
+                      ],
+                    ),
+                    onTap: () {
+                      Get.toNamed('/orderPageInfo', arguments: {
+                        'id': item.orderId,
+                        'title': processSign.label,
+                        'styleColor': processSign.color
+                      });
+                    },
                   ),
                 ),
                 Expanded(
                     child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    Padding(
-                      padding: EdgeInsets.fromLTRB(0, 0, 0, 15),
-                      child: RichText(
-                        text: TextSpan(children: <InlineSpan>[
-                          TextSpan(
-                              text: '农机名称：',
-                              style: TextStyle(
-                                  color: Color(0xff666666),
-                                  fontSize: 16,
-                                  fontWeight: FontWeight.bold)),
-                          TextSpan(
-                              text: item.machineryName,
-                              style: TextStyle(
-                                  color: Color(0xff222222),
-                                  fontSize: 16,
-                                  fontWeight: FontWeight.bold)),
-                        ]),
-                      ),
-                    ),
-                    Padding(
-                      padding: EdgeInsets.fromLTRB(0, 0, 0, 15),
-                      child: RichText(
-                        text: TextSpan(children: <InlineSpan>[
-                          TextSpan(
-                              text: '作业面积：',
-                              style: TextStyle(
-                                  color: Color(0xff666666),
-                                  fontSize: 16,
-                                  fontWeight: FontWeight.bold)),
-                          TextSpan(
-                              text: item.amount.toString(),
-                              style: TextStyle(
-                                  color: Color(0xff222222),
-                                  fontSize: 16,
-                                  fontWeight: FontWeight.bold)),
-                        ]),
-                      ),
-                    ),
-                    Padding(
-                      padding: EdgeInsets.fromLTRB(0, 0, 0, 15),
-                      child: RichText(
-                        text: TextSpan(children: <InlineSpan>[
-                          TextSpan(
-                              text: '需求时间：',
-                              style: TextStyle(
-                                  color: Color(0xff666666),
-                                  fontSize: 16,
-                                  fontWeight: FontWeight.bold)),
-                          TextSpan(
-                              text: DateFormat("yyyy-MM-dd").format(
-                                  DateTime.parse(
-                                      item.appointmentDate.toString())),
-                              style: TextStyle(
-                                  color: Color(0xff222222),
-                                  fontSize: 16,
-                                  fontWeight: FontWeight.bold)),
-                        ]),
-                      ),
-                    ),
-                    Padding(
-                      padding: EdgeInsets.fromLTRB(0, 0, 0, 4),
-                      child: RichText(
-                        text: TextSpan(children: <InlineSpan>[
-                          TextSpan(
-                              text: '下单时间：',
-                              style: TextStyle(
-                                  color: Color(0xff666666),
-                                  fontSize: 16,
-                                  fontWeight: FontWeight.bold)),
-                          TextSpan(
-                              text: DateFormat("yyyy-MM-dd").format(
-                                  DateTime.parse(item.createDate.toString())),
-                              style: TextStyle(
-                                  color: Color(0xff222222),
-                                  fontSize: 16,
-                                  fontWeight: FontWeight.bold)),
-                        ]),
-                      ),
-                    ),
-                  ],
-                )),
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Padding(
+                          padding: const EdgeInsets.fromLTRB(0, 0, 0, 15),
+                          child: TextCell(title: '农机名称：', value: item.machineryName),
+                        ),
+                        Padding(
+                          padding: const EdgeInsets.fromLTRB(0, 0, 0, 15),
+                          child: TextCell(title: '作业面积：', value: item.amount.toString()),
+                        ),
+                        Padding(
+                          padding: const EdgeInsets.fromLTRB(0, 0, 0, 15),
+                          child: TextCell(title: '需求时间：', value: DateFormat("yyyy-MM-dd").format(
+                              DateTime.parse(item.appointmentDate.toString()))),
+                        ),
+                        Padding(
+                          padding: const EdgeInsets.fromLTRB(0, 0, 0, 15),
+                          child: TextCell(title: '需求时间：', value: DateFormat("yyyy-MM-dd").format(
+                              DateTime.parse(item.createDate.toString()))),
+                        ),
+                      ],
+                    )),
                 Container(
-                  margin: EdgeInsets.fromLTRB(0, 0, 0, 30),
-                  padding: EdgeInsets.fromLTRB(0, 20, 0, 0),
+                  margin: const EdgeInsets.fromLTRB(0, 0, 0, 30),
+                  padding: const EdgeInsets.fromLTRB(0, 20, 0, 0),
                   decoration: const BoxDecoration(
                       border: Border(
                           top: BorderSide(
@@ -238,53 +139,51 @@ class _OrderListCardPages extends State<OrderListCard> {
                     children: [
                       RichText(
                         text: TextSpan(children: <InlineSpan>[
-                          TextSpan(
+                          const TextSpan(
                               text: '订单状态：',
                               style: TextStyle(
                                   color: Color(0xff666666),
                                   fontSize: 16,
                                   fontWeight: FontWeight.bold)),
                           TextSpan(
-                              text: orderStates().title,
+                              text: processSign.label,
                               style: TextStyle(
-                                  color: orderStates().styleColor,
+                                  color: processSign.color,
                                   fontSize: 16,
                                   fontWeight: FontWeight.bold)),
                         ]),
                       ),
-                      Container(
-                        child: Row(
-                          children: [
-                            const Text('费用：',
-                                style: TextStyle(
-                                    color: Color(0xff666666),
-                                    fontSize: 16,
-                                    fontWeight: FontWeight.bold)),
-                            LinearGradientText(
-                              colors: const <Color>[
-                                Color(0xFFFA7878),
-                                Color(0xFFB61515),
-                              ],
-                              child: RichText(
-                                text: TextSpan(children: <InlineSpan>[
-                                  TextSpan(
-                                      text: ((item.charges ?? 0) / 100)
-                                          .toString(),
-                                      style: TextStyle(
-                                        fontSize: 16,
-                                        fontWeight: FontWeight.bold,
-                                      )),
-                                  TextSpan(
-                                      text: "元",
-                                      style: TextStyle(
-                                        fontSize: 16,
-                                        fontWeight: FontWeight.bold,
-                                      )),
-                                ]),
-                              ),
+                      Row(
+                        children: [
+                          const Text('费用：',
+                              style: TextStyle(
+                                  color: Color(0xff666666),
+                                  fontSize: 16,
+                                  fontWeight: FontWeight.bold)),
+                          LinearGradientText(
+                            colors: const <Color>[
+                              Color(0xFFFA7878),
+                              Color(0xFFB61515),
+                            ],
+                            child: RichText(
+                              text: TextSpan(children: <InlineSpan>[
+                                TextSpan(
+                                    text: ((item.charges ?? 0) / 100)
+                                        .toString(),
+                                    style: const TextStyle(
+                                      fontSize: 16,
+                                      fontWeight: FontWeight.bold,
+                                    )),
+                                const TextSpan(
+                                    text: "元",
+                                    style: TextStyle(
+                                      fontSize: 16,
+                                      fontWeight: FontWeight.bold,
+                                    )),
+                              ]),
                             ),
-                          ],
-                        ),
+                          ),
+                        ],
                       ),
                     ],
                   ),