'.'

lib/pages/order/index.dart

@@ -1,7 +1,6 @@
 import 'package:farmer_client/pages/order/widgets/index.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:get/get_rx/src/rx_types/rx_types.dart';
 import 'package:farmer_client/models/entities/OrderInfoModel.dart';
 import 'package:farmer_client/services/orderAPI.dart';
 import 'package:farmer_client/widgets/OrderListCard.dart';

lib/pages/order/widgets/index.dart

@@ -7,36 +7,28 @@ class OrderHead extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Container(
-      padding: EdgeInsets.fromLTRB(15, 0, 15, 0),
+      padding: const EdgeInsets.fromLTRB(15, 0, 15, 0),
       height: 55.w,
-      decoration: BoxDecoration(color: Colors.white),
+      decoration: const BoxDecoration(color: Colors.white),
       child: Row(
-        mainAxisAlignment: MainAxisAlignment.spaceBetween,
         children: [
-          Row(
-            children: [
-              Padding(
-                padding: EdgeInsets.fromLTRB(0, 0, 8, 0),
-                child: Image(
-                  image: AssetImage('images/ordersListImga.png'),
-                  fit: BoxFit.cover,
-                  width: 18.w,
-                ),
-              ),
-              Text(
-                '订单列表',
-                style: TextStyle(
-                    color: Color(0xff222222),
-                    fontSize: 20.sp,
-                    fontWeight: FontWeight.bold),
-              )
-            ],
+          Padding(
+            padding: const EdgeInsets.fromLTRB(0, 0, 8, 0),
+            child: Image(
+              image: const AssetImage('images/ordersListImga.png'),
+              fit: BoxFit.cover,
+              width: 18.w,
+            ),
           ),
+          Text(
+            '订单列表',
+            style: TextStyle(
+                color: const Color(0xff222222),
+                fontSize: 20.sp,
+                fontWeight: FontWeight.bold),
+          )
         ],
       ),
     );
-
   }
 }
-
-

lib/pages/orderInfo/index.dart

@@ -210,10 +210,10 @@ class OrderPageInfo extends BasicPage {
 
   // 评价
   _fnEvaluate(String orderId) {
-    int evalStars = -1;
+    double evalStars = -1;
     String evalText = '';
 
-    onEvaluate(int val1, String val2) {
+    onEvaluate(double val1, String val2) {
       evalStars = val1;
       evalText = val2;
     }

lib/utils/Request.dart

@@ -29,7 +29,7 @@ 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';
+  const host = isProd ? 'https://machine.njyunzhi.com' : 'http://192.168.89.25:7080';
   final baseUrl = '$host/api/$client/farmer';
 
   var options = BaseOptions(

lib/widgets/OrderListCard.dart

@@ -20,15 +20,15 @@ class TextCell extends StatelessWidget {
       text: TextSpan(children: <InlineSpan>[
         TextSpan(
             text: title,
-            style: const TextStyle(
-                color: Color(0xff666666),
-                fontSize: 16,
+            style: TextStyle(
+                color: const Color(0xff666666),
+                fontSize: 16.sp,
                 fontWeight: FontWeight.bold)),
         TextSpan(
             text: value,
-            style: const TextStyle(
-                color: Color(0xff222222),
-                fontSize: 16,
+            style: TextStyle(
+                color: const Color(0xff222222),
+                fontSize: 16.sp,
                 fontWeight: FontWeight.bold)),
       ]),
     );
@@ -47,8 +47,8 @@ class OrderListCard extends StatelessWidget {
   Widget build(BuildContext context) {
     return Container(
       width: 375.w,
-      height: 345.h,
-      margin: const EdgeInsets.fromLTRB(0, 0, 0, 20),
+      margin: EdgeInsets.only(bottom: 20.h),
+      padding: EdgeInsets.symmetric(vertical: 30.h, horizontal: 15.w),
       decoration: const BoxDecoration(color: Colors.white, boxShadow: [
         BoxShadow(
             color: Colors.black12,
@@ -58,145 +58,147 @@ class OrderListCard extends StatelessWidget {
             )
       ]),
       child: Row(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        mainAxisAlignment: MainAxisAlignment.spaceBetween,
         children: [
           Container(
-            margin: const EdgeInsets.fromLTRB(15, 20, 15, 0),
-            width: 18.0,
-            height: 275.h,
+            margin: EdgeInsets.only(right: 15.w),
+            width: 17.w,
+            height: 320.h,
             child: const Image(
               image: AssetImage('images/ordersLeft.png'),
             ),
           ),
-          Expanded(
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Container(
-                  width: 320.w,
-                  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: GestureDetector(
-                    child: Row(
-                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                      children: [
-                        TextCell(title: '订单编号：', value: item.orderNo),
-                        Bold(
-                            text: "详情 >>",
-                            fontSize: 16.sp,
-                            color: const Color(0xff222222)),
-                      ],
+          Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Container(
+                width: 313.w,
+                margin: EdgeInsets.only(bottom: 20.h),
+                padding: EdgeInsets.only(bottom: 20.h),
+                decoration: const BoxDecoration(
+                  border: Border(
+                    bottom: BorderSide(
+                      width: 0.5,
+                      color: Color(0x20000000),
                     ),
-                    onTap: () {
-                      Get.toNamed('/orderPageInfo', arguments: {
-                        'orderId': item.orderId,
-                        'title': processSign.label,
-                        'styleColor': processSign.color
-                      });
-                    },
                   ),
                 ),
-                Expanded(
-                    child: Column(
-                  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: const EdgeInsets.fromLTRB(0, 0, 0, 30),
-                  padding: const EdgeInsets.fromLTRB(0, 20, 0, 0),
-                  decoration: const BoxDecoration(
-                      border: Border(
-                          top: BorderSide(
-                              width: 0.5, color: Color(0x20000000)))),
-                  width: 320.w,
+                child: GestureDetector(
                   child: Row(
                     mainAxisAlignment: MainAxisAlignment.spaceBetween,
                     children: [
-                      RichText(
-                        text: TextSpan(children: <InlineSpan>[
-                          const TextSpan(
-                              text: '订单状态：',
-                              style: TextStyle(
-                                  color: Color(0xff666666),
-                                  fontSize: 16,
-                                  fontWeight: FontWeight.bold)),
+                      TextCell(title: '订单编号：', value: item.orderNo),
+                      Bold(
+                        text: "详情 >>",
+                        fontSize: 16.sp,
+                        color: const Color(0xff222222),
+                      ),
+                    ],
+                  ),
+                  onTap: () {
+                    Get.toNamed('/orderPageInfo', arguments: {
+                      'orderId': item.orderId,
+                      'title': processSign.label,
+                      'styleColor': processSign.color
+                    });
+                  },
+                ),
+              ),
+              Padding(
+                padding: EdgeInsets.only(bottom: 30.h),
+                child: TextCell(title: '农机名称：', value: item.machineryName),
+              ),
+              Padding(
+                padding: EdgeInsets.only(bottom: 30.h),
+                child: TextCell(title: '作业面积：', value: item.amount.toString()),
+              ),
+              Padding(
+                padding: EdgeInsets.only(bottom: 30.h),
+                child: TextCell(
+                    title: '需求时间：',
+                    value: DateFormat("yyyy-MM-dd").format(
+                        DateTime.parse(item.appointmentDate.toString()))),
+              ),
+              TextCell(
+                title: '下单时间：',
+                value: DateFormat("yyyy-MM-dd")
+                    .format(DateTime.parse(item.createDate.toString())),
+              ),
+              Container(
+                margin: EdgeInsets.only(top: 22.h),
+                padding: EdgeInsets.only(top: 30.h),
+                decoration: const BoxDecoration(
+                  border: Border(
+                    top: BorderSide(
+                      width: 0.5,
+                      color: Color(0x20000000),
+                    ),
+                  ),
+                ),
+                width: 313.w,
+                child: Row(
+                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                  children: [
+                    RichText(
+                      text: TextSpan(
+                        children: <InlineSpan>[
                           TextSpan(
-                              text: processSign.label,
-                              style: TextStyle(
-                                  color: processSign.color,
-                                  fontSize: 16,
-                                  fontWeight: FontWeight.bold)),
-                        ]),
+                            text: '订单状态：',
+                            style: TextStyle(
+                                color: const Color(0xff666666),
+                                fontSize: 16.sp,
+                                fontWeight: FontWeight.bold),
+                          ),
+                          TextSpan(
+                            text: processSign.label,
+                            style: TextStyle(
+                                color: processSign.color,
+                                fontSize: 16.sp,
+                                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>[
+                    ),
+                    Row(
+                      children: [
+                        Text(
+                          '费用：',
+                          style: TextStyle(
+                              color: const Color(0xff666666),
+                              fontSize: 16.sp,
+                              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,
-                                    )),
-                              ]),
+                                  text: ((item.charges ?? 0) / 100).toString(),
+                                  style: TextStyle(
+                                    fontSize: 16.sp,
+                                    fontWeight: FontWeight.bold,
+                                  ),
+                                ),
+                                TextSpan(
+                                  text: "元",
+                                  style: TextStyle(
+                                    fontSize: 16.sp,
+                                    fontWeight: FontWeight.bold,
+                                  ),
+                                ),
+                              ],
                             ),
                           ),
-                        ],
-                      ),
-                    ],
-                  ),
+                        ),
+                      ],
+                    ),
+                  ],
                 ),
-              ],
-            ),
+              ),
+            ],
           ),
         ],
       ),

pubspec.lock

@@ -112,7 +112,7 @@ packages:
       name: collection
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.16.0"
+    version: "1.15.0"
   convert:
     dependency: transitive
     description:
@@ -154,7 +154,7 @@ packages:
       name: fake_async
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.3.0"
+    version: "1.2.0"
   ff_stars:
     dependency: "direct main"
     description:
@@ -293,7 +293,7 @@ packages:
       name: js
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.6.4"
+    version: "0.6.3"
   json_annotation:
     dependency: transitive
     description:
@@ -335,7 +335,7 @@ packages:
       name: material_color_utilities
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.1.4"
+    version: "0.1.3"
   meta:
     dependency: transitive
     description:
@@ -356,7 +356,7 @@ packages:
       name: path
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.8.1"
+    version: "1.8.0"
   path_provider:
     dependency: transitive
     description:
@@ -501,7 +501,7 @@ packages:
       name: source_span
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.8.2"
+    version: "1.8.1"
   stack_trace:
     dependency: transitive
     description:
@@ -543,7 +543,7 @@ packages:
       name: test_api
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.4.9"
+    version: "0.4.8"
   tobias:
     dependency: "direct main"
     description:
@@ -564,7 +564,7 @@ packages:
       name: vector_math
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.1"
   watcher:
     dependency: transitive
     description:
@@ -594,5 +594,5 @@ packages:
     source: hosted
     version: "3.1.1"
 sdks:
-  dart: ">=2.17.0-0 <3.0.0"
+  dart: ">=2.16.1 <3.0.0"
   flutter: ">=2.8.1"