Merge branch 'master' of http://git.ycjcjy.com/nanyang/farmer_client

ios/Runner.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 50;
+	objectVersion = 51;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -76,7 +76,6 @@
 				805A6DB5EC13EB9FC8C0F263 /* Pods-Runner.release.xcconfig */,
 				E4D5DB9E3D4475D04602FE2B /* Pods-Runner.profile.xcconfig */,
 			);
-			name = Pods;
 			path = Pods;
 			sourceTree = "<group>";
 		};

ios/Runner/Info.plist

@@ -28,6 +28,8 @@
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
 	<string>Main</string>
+	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
+	<string>需要您提供定位信息，才能使用获取您附近的农机</string>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
@@ -45,5 +47,13 @@
 	<false/>
 	<key>CADisableMinimumFrameDurationOnPhone</key>
 	<true/>
+	<key>io.flutter.embedded_views_preview</key>
+	<string>YES</string>	
+	<key>NSLocationAlwaysUsageDescription</key>
+	<string>需要您提供后台定位信息，才能使用获取您附近的农机</string>
+	<key>NSLocationUsageDescription</key>
+	<string>需要您提供定位信息，才能使用获取您附近的农机</string>
+	<key>NSLocationWhenInUseUsageDescription</key>
+	<string>需要您提供定位信息，才能使用获取您附近的农机</string>
 </dict>
 </plist>

lib/main.dart

@@ -1,5 +1,4 @@
 import 'package:farmer_client/theme.dart';
-import 'package:farmer_client/utils/location.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:fluwx/fluwx.dart';

lib/pages/OrderConfirmation/index.dart

@@ -3,14 +3,12 @@ import 'package:farmer_client/models/app.dart';
 import 'package:farmer_client/models/entities/CardInfo.dart';
 import 'package:farmer_client/widgets/layout/BasicPage.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:get/get.dart';
 import 'package:intl/intl.dart';
 
-import '../../models/entities/CardListModel.dart';
 import '../../models/entities/OrderInfoModel.dart';
 import '../../services/homeAPI.dart';
 import '../../services/orderAPI.dart';
@@ -32,19 +30,19 @@ class OrderConfirmation extends BasicPage {
     super.beforeShow();
     if (Get.arguments['item'] != null) {
       item(Get.arguments['item']);
-    } else {
+    } else if (Get.arguments['id'] != null) {
       markId = Get.arguments['id'];
       EasyLoading.show(status: '数据加载中...');
-
-      getMachineryInfo(markId, appController.locationStr, true)
+      //苹果模拟器看不到定位所以加一个默认定位是邓州市中心位置
+      getMachineryInfo(Get.arguments['id'],
+              appController.locationStr ?? '112.091892,32.690712', true)
           .then((value) {
         item(CardInfo.fromJson(value));
         EasyLoading.dismiss();
+      }).catchError((error) {
+        EasyLoading.dismiss();
+        Fluttertoast.showToast(msg: error.error['message']);
       });
-
-      // item(CardInfo.fromJson(Get.arguments['item']));
-
-      return;
     }
   }
 
@@ -69,7 +67,7 @@ class OrderConfirmation extends BasicPage {
         orderInfo(OrderInfoModel.fromJson(value));
         Fluttertoast.showToast(msg: '预约成功');
         Get.offNamed('/orderPageInfo', arguments: {
-          'id': orderInfo().orderId,
+          'orderId': value['orderId'],
           'title': '待付款',
           'styleColor': Color(0xFF51D4FF)
         });
@@ -81,7 +79,7 @@ class OrderConfirmation extends BasicPage {
   @override
   Widget builder(BuildContext context) {
     naviTitle = '预约';
-    return Container(
+    return SizedBox(
       height: 700.h,
       child: Form(
         key: _formKey, //设置globalKey，用于后面获取FormState
@@ -174,7 +172,8 @@ class OrderConfirmation extends BasicPage {
                           child: Obx(
                             () => Text(selectDate == null
                                 ? '请选择日期'
-                                : DateFormat("yyyy-MM-dd").format(selectDate())),
+                                : DateFormat("yyyy-MM-dd")
+                                    .format(selectDate())),
                           )),
                     )
                   ],
@@ -212,8 +211,9 @@ class OrderConfirmation extends BasicPage {
                       padding: const EdgeInsets.fromLTRB(10, 0, 0, 0),
                       child: GestureDetector(
                         onTap: () {
-                          Get.toNamed('/addressList',
-                              arguments: {'isBack': true});
+                          Get.toNamed('/addressList', arguments: {
+                            'isBack': true,
+                          });
                         },
                         child: SizedBox(
                           width: 290.w,
@@ -277,8 +277,8 @@ class OrderConfirmation extends BasicPage {
                         fontWeight: FontWeight.bold),
                   ),
                   style: ButtonStyle(
-                    side: MaterialStateProperty.all(
-                        const BorderSide(width: 1, color: Color(0xFFFF703B))), //边框
+                    side: MaterialStateProperty.all(const BorderSide(
+                        width: 1, color: Color(0xFFFF703B))), //边框
                     elevation: MaterialStateProperty.all(0),
                     backgroundColor: MaterialStateProperty.all(Colors.white),
                     shape: MaterialStateProperty.all(

lib/pages/addressList/index.dart

@@ -58,13 +58,13 @@ class AddressList extends BasicPage {
         ),
         onCancel: () => true,
         onConfirm: () {
-              addressDelete(id).then((value) {
-                List<Address> list = addressController.addressList.value.toList();
-                list.removeWhere((element) => element.addressId == id);
-                addressController.addressList(list);
-                Fluttertoast.showToast(msg: '删除成功！');
-              });
-            });
+          addressDelete(id).then((value) {
+            List<Address> list = addressController.addressList.value.toList();
+            list.removeWhere((element) => element.addressId == id);
+            addressController.addressList(list);
+            Fluttertoast.showToast(msg: '删除成功！');
+          });
+        });
   }
 
   Widget buildList() {
@@ -97,7 +97,9 @@ class AddressList extends BasicPage {
         );
       }).toList();
 
-      return Column(children: children,);
+      return Column(
+        children: children,
+      );
     });
   }
 

lib/pages/login/login.dart

@@ -1,9 +1,7 @@
 import 'dart:async';
-import 'dart:ffi';
 import 'package:farmer_client/models/app.dart';
 import 'package:farmer_client/pages/home/index.dart';
 import 'package:fluttertoast/fluttertoast.dart';
-import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
@@ -109,7 +107,7 @@ class _RouteLogin extends State<MyRouteLogin> {
     });
   }
 
-  //登陆按钮
+  //登录按钮
   void _handelSubmit() {
     if (handleCodes == '' || handlePhones == '') {
       Fluttertoast.showToast(msg: '请输入验证码或手机号！');
@@ -147,99 +145,53 @@ class _RouteLogin extends State<MyRouteLogin> {
               fit: BoxFit.cover,
             ),
           ),
-          child: Container(
-            child: ListView(
-              // mainAxisAlignment: MainAxisAlignment.end,
-              // crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Padding(
-                  padding: EdgeInsets.fromLTRB(15, 0, 0, 5),
-                  child: const Text(
-                    '您好!',
+          child: ListView(
+            children: [
+              SizedBox(
+                height: 44.w,
+                child: Center(
+                  child: Text(
+                    '登录',
                     style: TextStyle(
+                      letterSpacing: 3,
                       fontWeight: FontWeight.bold,
-                      fontSize: 33,
+                      color: const Color(0xFF333333),
+                      fontSize: 17.sp,
                     ),
                   ),
                 ),
-                Padding(
-                  padding: EdgeInsets.fromLTRB(15, 0, 0, 0),
-                  child: const Text(
-                    '欢迎进入农户端应用!',
-                    style: TextStyle(
-                      fontWeight: FontWeight.bold,
-                      fontSize: 27,
-                    ),
+              ),
+              Padding(
+                padding: EdgeInsets.fromLTRB(15, 0, 0, 5),
+                child: const Text(
+                  '您好!',
+                  style: TextStyle(
+                    fontWeight: FontWeight.bold,
+                    fontSize: 33,
                   ),
                 ),
-                Cell(
-                    // margin: EdgeInsets.symmetric(horizontal: 13.w),
-                    margin: const EdgeInsets.fromLTRB(13, 43, 10, 0),
-                    header: Text(
-                      "+86",
-                      style: TextStyle(
-                        fontSize: 19.sp,
-                      ),
-                    ),
-                    child: TextField(
-                      maxLength: 11,
-                      keyboardType: TextInputType.number,
-                      style: TextStyle(
-                        fontSize: 17.sp,
-                      ),
-                      decoration: const InputDecoration(
-                        isCollapsed: true,
-                        contentPadding:
-                            EdgeInsets.symmetric(vertical: 8, horizontal: 16),
-                        labelText: "请输入手机号码",
-                        counterText: '', //去掉计数
-                        border: InputBorder.none,
-                        floatingLabelBehavior: FloatingLabelBehavior.never,
-                      ),
-                      onChanged: (e) {
-                        _handlePhone(e);
-                      },
-                    ),
-                    footer: SizedBox(
-                      child: ElevatedButton(
-                        onPressed: () => {
-                          setState(() {
-                            _buttonClickListen();
-                          })
-                        },
-                        child: Text(
-                          '$buttonText',
-                          style: TextStyle(
-                            fontSize: 15.sp,
-                          ),
-                        ),
-                        style: ButtonStyle(
-                          backgroundColor: isButtonEnable
-                              ? MaterialStateProperty.all(
-                                  const Color(0xFFFF703B))
-                              : MaterialStateProperty.all(
-                                  const Color(0xFFCBCBCB)),
-                          shape: MaterialStateProperty.all(
-                              const RoundedRectangleBorder(
-                                  borderRadius:
-                                      BorderRadius.all(Radius.circular(10)))),
-                        ),
-                      ),
-                    )),
-                Cell(
+              ),
+              Padding(
+                padding: EdgeInsets.fromLTRB(15, 0, 0, 0),
+                child: const Text(
+                  '欢迎进入农户端应用!',
+                  style: TextStyle(
+                    fontWeight: FontWeight.bold,
+                    fontSize: 27,
+                  ),
+                ),
+              ),
+              Cell(
                   // margin: EdgeInsets.symmetric(horizontal: 13.w),
-                  margin: const EdgeInsets.fromLTRB(13, 16, 10, 0),
-
-                  header: Align(
-                    alignment: FractionalOffset(0.1, 0.5),
-                    child: Image.asset(
-                      'images/phoneCode.png',
-                      width: 20,
-                      height: 20,
+                  margin: const EdgeInsets.fromLTRB(13, 43, 10, 0),
+                  header: Text(
+                    "+86",
+                    style: TextStyle(
+                      fontSize: 19.sp,
                     ),
                   ),
-
                   child: TextField(
+                    maxLength: 11,
                     keyboardType: TextInputType.number,
                     style: TextStyle(
                       fontSize: 17.sp,
@@ -248,97 +200,152 @@ class _RouteLogin extends State<MyRouteLogin> {
                       isCollapsed: true,
                       contentPadding:
                           EdgeInsets.symmetric(vertical: 8, horizontal: 16),
-                      labelText: "请输入验证码",
+                      labelText: "请输入手机号码",
+                      counterText: '', //去掉计数
                       border: InputBorder.none,
                       floatingLabelBehavior: FloatingLabelBehavior.never,
                     ),
                     onChanged: (e) {
-                      _handleCode(e);
+                      _handlePhone(e);
                     },
                   ),
-                ),
-                Container(
-                  height: 350.h,
-                  alignment: Alignment.bottomCenter,
-                  child: SizedBox(
-                    width: 315.w,
-                    height: 49.h,
+                  footer: SizedBox(
                     child: ElevatedButton(
-                      onPressed: () {
-                        _handelSubmit();
+                      onPressed: () => {
+                        setState(() {
+                          _buttonClickListen();
+                        })
                       },
-                      child: const Text(
-                        "登陆",
+                      child: Text(
+                        '$buttonText',
                         style: TextStyle(
-                            fontSize: 18,
-                            color: Colors.white,
-                            fontWeight: FontWeight.bold),
+                          fontSize: 15.sp,
+                        ),
                       ),
                       style: ButtonStyle(
-                        elevation: MaterialStateProperty.all(0),
-                        backgroundColor:
-                            MaterialStateProperty.all(const Color(0xFFFF703B)),
+                        backgroundColor: isButtonEnable
+                            ? MaterialStateProperty.all(const Color(0xFFFF703B))
+                            : MaterialStateProperty.all(
+                                const Color(0xFFCBCBCB)),
                         shape: MaterialStateProperty.all(
                             const RoundedRectangleBorder(
                                 borderRadius:
-                                    BorderRadius.all(Radius.circular(24.4)))),
+                                    BorderRadius.all(Radius.circular(10)))),
                       ),
                     ),
+                  )),
+              Cell(
+                // margin: EdgeInsets.symmetric(horizontal: 13.w),
+                margin: const EdgeInsets.fromLTRB(13, 16, 10, 0),
+
+                header: Align(
+                  alignment: FractionalOffset(0.1, 0.5),
+                  child: Image.asset(
+                    'images/phoneCode.png',
+                    width: 20,
+                    height: 20,
                   ),
                 ),
-                Container(
-                    padding: EdgeInsets.fromLTRB(10.0, 10, 0, 10),
-                    child: Row(
-                      children: <Widget>[
-                        Radio<bool>(
-                            value: true,
-                            activeColor: Color(0xFFFF703B),
-                            groupValue: _newValue,
-                            onChanged: (value) {
-                              setState(() {
-                                _newValue = value!;
-                              });
-                            }),
-                        // SizedBox(
-                        //   child:Text('文本协议/隐私政策',style: TextStyle(fontSize:15.sp,color: Color(0xffce3800))),
-                        // ),
-                        Text('请认真查看',
-                            style: TextStyle(
-                                fontSize: 14.sp, color: Color(0xff2a2a2a))),
-                        GestureDetector(
-                          onTap: () {
-                            Get.toNamed('/agreement');
-                          },
-                          child: Text('文本协议/隐私政策',
-                              style: TextStyle(
-                                  fontSize: 14.sp, color: Color(0xffce3800))),
-                        ),
-                        Text('，确认之后选择此项',
+
+                child: TextField(
+                  keyboardType: TextInputType.number,
+                  style: TextStyle(
+                    fontSize: 17.sp,
+                  ),
+                  decoration: const InputDecoration(
+                    isCollapsed: true,
+                    contentPadding:
+                        EdgeInsets.symmetric(vertical: 8, horizontal: 16),
+                    labelText: "请输入验证码",
+                    border: InputBorder.none,
+                    floatingLabelBehavior: FloatingLabelBehavior.never,
+                  ),
+                  onChanged: (e) {
+                    _handleCode(e);
+                  },
+                ),
+              ),
+              Container(
+                height: 350.h,
+                alignment: Alignment.bottomCenter,
+                child: SizedBox(
+                  width: 315.w,
+                  height: 49.h,
+                  child: ElevatedButton(
+                    onPressed: () {
+                      _handelSubmit();
+                    },
+                    child: const Text(
+                      "登录",
+                      style: TextStyle(
+                          fontSize: 18,
+                          color: Colors.white,
+                          fontWeight: FontWeight.bold),
+                    ),
+                    style: ButtonStyle(
+                      elevation: MaterialStateProperty.all(0),
+                      backgroundColor:
+                          MaterialStateProperty.all(const Color(0xFFFF703B)),
+                      shape: MaterialStateProperty.all(
+                          const RoundedRectangleBorder(
+                              borderRadius:
+                                  BorderRadius.all(Radius.circular(24.4)))),
+                    ),
+                  ),
+                ),
+              ),
+              Container(
+                  padding: EdgeInsets.fromLTRB(10.0, 10, 0, 10),
+                  child: Row(
+                    children: <Widget>[
+                      Radio<bool>(
+                          value: true,
+                          activeColor: Color(0xFFFF703B),
+                          groupValue: _newValue,
+                          onChanged: (value) {
+                            setState(() {
+                              _newValue = value!;
+                            });
+                          }),
+                      // SizedBox(
+                      //   child:Text('文本协议/隐私政策',style: TextStyle(fontSize:15.sp,color: Color(0xffce3800))),
+                      // ),
+                      Text('请认真查看',
+                          style: TextStyle(
+                              fontSize: 14.sp, color: Color(0xff2a2a2a))),
+                      GestureDetector(
+                        onTap: () {
+                          Get.toNamed('/agreement');
+                        },
+                        child: Text('文本协议/隐私政策',
                             style: TextStyle(
-                                fontSize: 14.sp, color: Color(0xff2a2a2a))),
-                        // RichText(
-                        //   text: TextSpan(children: <InlineSpan>[
-                        //     const TextSpan(
-                        //         text: '请认真查看',
-                        //         style: TextStyle(color: Color(0xff2a2a2a))),
-                        //     TextSpan(
-                        //       text: '文本协议/隐私政策，',
-                        //       style: TextStyle(color: Color(0xffce3800)),
-                        //       recognizer:
-                        //           TapGestureRecognizer() //踩坑。。。recognizer 是手势交互 除了我现在些的是 点击交互，其他一般都是抽象类。
-                        //             ..onTap = () {
-                        //               Get.toNamed('/agreement');
-                        //             },
-                        //     ),
-                        //     const TextSpan(
-                        //         text: '确认之后选择此项',
-                        //         style: TextStyle(color: Color(0xff2a2a2a))),
-                        //   ]),
-                        // ),
-                      ],
-                    )),
-              ],
-            ),
+                                fontSize: 14.sp, color: Color(0xffce3800))),
+                      ),
+                      Text('，确认之后选择此项',
+                          style: TextStyle(
+                              fontSize: 14.sp, color: Color(0xff2a2a2a))),
+                      // RichText(
+                      //   text: TextSpan(children: <InlineSpan>[
+                      //     const TextSpan(
+                      //         text: '请认真查看',
+                      //         style: TextStyle(color: Color(0xff2a2a2a))),
+                      //     TextSpan(
+                      //       text: '文本协议/隐私政策，',
+                      //       style: TextStyle(color: Color(0xffce3800)),
+                      //       recognizer:
+                      //           TapGestureRecognizer() //踩坑。。。recognizer 是手势交互 除了我现在些的是 点击交互，其他一般都是抽象类。
+                      //             ..onTap = () {
+                      //               Get.toNamed('/agreement');
+                      //             },
+                      //     ),
+                      //     const TextSpan(
+                      //         text: '确认之后选择此项',
+                      //         style: TextStyle(color: Color(0xff2a2a2a))),
+                      //   ]),
+                      // ),
+                    ],
+                  )),
+            ],
           ),
         ),
       ),

lib/pages/machinery/detail/index.dart

@@ -3,6 +3,7 @@ import 'package:farmer_client/models/entities/CardInfo.dart';
 import 'package:farmer_client/widgets/layout/BasicPage.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_easyloading/flutter_easyloading.dart';
+import 'package:fluttertoast/fluttertoast.dart';
 import 'package:get/get.dart';
 import '../../../services/homeAPI.dart';
 import 'widgets/detail.dart';
@@ -31,13 +32,16 @@ class MachineryDetailPage extends BasicPage {
       markId = Get.arguments['id'];
       marKm = Get.arguments['km'];
       print(marKm);
-      getMachineryInfo(markId, appController.locationStr, true)
+      getMachineryInfo(
+              markId, appController.locationStr ?? '112.091892,32.690712', true)
           .then((value) {
         machineryInfoContent(CardInfo.fromJson(value));
         machineryListBanner(machineryInfoContent().imagesList!);
         machineryListContent(machineryInfoContent().contentList!);
         EasyLoading.dismiss();
-
+      }).catchError((error) {
+        EasyLoading.dismiss();
+        Fluttertoast.showToast(msg: error.error['message']);
       });
     }
     print("----show----detail page--------------");

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

@@ -5,8 +5,6 @@ import 'package:flutter/widgets.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:farmer_client/widgets/ExtendContentList.dart';
-import 'package:farmer_client/models/entities/ExtendContent.dart';
-import 'package:get/get.dart';
 import '../../../../models/entities/CardInfo.dart';
 import '../../widgets/summary.dart';
 
@@ -20,11 +18,9 @@ Widget page(
   return DefLayout(
       head: CarouselSlider(
         items: bnnerItem
-            .map((item) => Container(
-                  child: Center(
-                      child: Image.network(item.url.toString(),
-                          fit: BoxFit.fitWidth, width: 370.w)),
-                ))
+            .map((item) => Center(
+                child: Image.network(item.url.toString(),
+                    fit: BoxFit.fitWidth, width: 370.w)))
             .toList(),
         options: CarouselOptions(
           autoPlay: true,

lib/pages/machinery/map/index.dart

@@ -3,6 +3,7 @@ import 'package:farmer_client/pages/machinery/map/widgets/detail.dart';
 import 'package:farmer_client/widgets/layout/BasicPage.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_easyloading/flutter_easyloading.dart';
+import 'package:fluttertoast/fluttertoast.dart';
 import 'package:get/get.dart';
 
 import '../../../models/entities/CardInfo.dart';
@@ -31,11 +32,14 @@ class MachineryMapPage extends BasicPage {
       markId = Get.arguments['id'];
       marKm = Get.arguments['km'];
       print(marKm);
-      getMachineryInfo(markId, appController.locationStr, true)
+      getMachineryInfo(
+              markId, appController.locationStr ?? '112.091892,32.690712', true)
           .then((value) {
         machineryInfoContent(CardInfo.fromJson(value));
         EasyLoading.dismiss();
-
+      }).catchError((error) {
+        EasyLoading.dismiss();
+        Fluttertoast.showToast(msg: error.error['message']);
       });
     }
     print("----show----map page--------------");

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

@@ -27,6 +27,7 @@ Widget page(
       height: DefLayout.headHeight,
       child: Image.network(
         item.thumb.toString(),
+        width:375.w,
         fit: BoxFit.cover,
         errorBuilder: (ctx, exception, stackTrace) {
           return Container(); //THE WIDGET YOU WANT TO SHOW IF URL NOT RETURN IMAGE

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

@@ -15,13 +15,12 @@ class MainPage extends StatelessWidget {
 
   GetStorage box = GetStorage();
 
-
   void _userOut() {
     modal.showDialog(
         title: '提示',
         content: Container(
           alignment: Alignment.center,
-          child: Text('确定要退出登陆吗？'),
+          child: Text('确定要退出登录吗？'),
         ),
         onCancel: () => true,
         onConfirm: () => {
@@ -43,9 +42,10 @@ class MainPage extends StatelessWidget {
               OtherColumn(), //功能菜单栏
               Card(
                 //设置圆角
-                shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20.0)),
+                shape: RoundedRectangleBorder(
+                    borderRadius: BorderRadius.circular(20.0)),
                 // 普通的边
-                elevation: 1,// 阴影大小
+                elevation: 1, // 阴影大小
                 // height: 70.h,
                 margin: EdgeInsets.only(top: 10, bottom: 40.0),
                 child: SizedBox(
@@ -56,7 +56,7 @@ class MainPage extends StatelessWidget {
                       _userOut();
                     },
                     child: const Text(
-                      "退出登陆",
+                      "退出登录",
                       style: TextStyle(
                           fontSize: 18,
                           color: Colors.black,
@@ -76,8 +76,10 @@ class MainPage extends StatelessWidget {
               ),
               Container(
                 margin: EdgeInsets.fromLTRB(0, 5, 0, 15),
-                child: Text('南京市云致科技有限公司 提供技术支持',style: TextStyle(fontSize: 15.sp,color: Color(
-                    0xff999999)),),
+                child: Text(
+                  '南京市云致科技有限公司 提供技术支持',
+                  style: TextStyle(fontSize: 15.sp, color: Color(0xff999999)),
+                ),
               )
             ],
           ),

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

@@ -108,7 +108,7 @@ class UserInfo extends StatelessWidget {
                       ),
                     ),
                     // const Text(
-                    //      '点击登陆',
+                    //      '点击登录',
                     //      style: TextStyle(
                     //        color: Colors.white,
                     //        fontSize: 17,

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

@@ -22,24 +22,24 @@ class OrderPageInfo extends BasicPage {
   final id = Rx<String>('');
   final orderStateText = Rx<String>('待支付');
   final orderStateColor = Rx<Color>(Colors.black);
-  final orderInfoContent = Rx<OrderInfoModel>(OrderInfoModel());
+  final orderInfoContent = Rx<OrderInfoModel>(OrderInfoModel.fromJson(
+      {'status': 6, 'dispatchStatus': 6, 'workStatus': 6}));
+
   final evalText = Rx<String>('');
   final evalStars = Rx<num>(-1);
-  var processStatus;
 
   // orderStates
   @override
   void beforeShow() {
     // TODO: implement beforeShow
     super.beforeShow();
-    if (Get.arguments['id'] != null) {
-      id(Get.arguments['id']);
+    if (Get.arguments != null && Get.arguments['orderId'] != null) {
+      id(Get.arguments['orderId']);
 
-      orderInfo(id()).then((value) {
+      orderInfo(Get.arguments['orderId']).then((value) {
         EasyLoading.show(status: '数据加载中...');
         OrderInfoModel orderInfo = OrderInfoModel.fromJson(value);
-        processStatus = getProcessStatus(orderInfo);
-        ProcessSign processSign = getProcessSign(processStatus);
+        ProcessSign processSign = getProcessSign(getProcessStatus(orderInfo));
         orderStateText(processSign.label);
         orderStateColor(processSign.color);
         orderInfoContent(orderInfo);
@@ -48,6 +48,57 @@ class OrderPageInfo extends BasicPage {
     }
   }
 
+  Widget _action(BuildContext context, String orderId) {
+    bool mustAction = false;
+    var btnLabel;
+    var btnFunction;
+
+    switch (getProcessStatus(orderInfoContent.value)) {
+      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('');
+    }
+  }
+
   @override
   Widget builder(BuildContext context) {
     naviTitle = '订单详情';
@@ -79,11 +130,11 @@ class OrderPageInfo extends BasicPage {
         ),
         onCancel: () => true,
         onConfirm: () => {
-          orderDelete(orderId).then((value) {
-            Fluttertoast.showToast(msg: '订单取消成功！');
-            Get.offAllNamed('/order');
-          })
-        });
+              orderDelete(orderId).then((value) {
+                Fluttertoast.showToast(msg: '订单取消成功！');
+                Get.offAllNamed('/order');
+              })
+            });
   }
 
   // 满意度表单
@@ -94,38 +145,30 @@ class OrderPageInfo extends BasicPage {
     return Container(
         alignment: Alignment.center,
         child: Container(
-          margin:
-          const EdgeInsets.fromLTRB(15, 20, 15, 20),
+          margin: const EdgeInsets.fromLTRB(15, 20, 15, 20),
           child: Column(
             children: [
               Container(
-                padding: const EdgeInsets.fromLTRB(
-                    0, 0, 0, 10),
+                padding: const EdgeInsets.fromLTRB(0, 0, 0, 10),
                 decoration: const BoxDecoration(
                     border: Border(
-                        bottom: BorderSide(
-                            width: 0.8,
-                            color: Color(0x20000000)
-                          // 0x17000000
-                        ))),
+                        bottom: BorderSide(width: 0.8, color: Color(0x20000000)
+                            // 0x17000000
+                            ))),
                 child: Row(
                   children: [
                     Text(
                       '满意度：',
                       style: TextStyle(
-                          fontSize: 17.sp,
-                          fontWeight: FontWeight.bold),
+                          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);
+                      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,
@@ -134,8 +177,7 @@ class OrderPageInfo extends BasicPage {
                 ),
               ),
               Container(
-                margin: const EdgeInsets.fromLTRB(
-                    0, 20, 0, 0),
+                margin: const EdgeInsets.fromLTRB(0, 20, 0, 0),
                 width: 300.w,
                 height: 100.w,
                 decoration: BoxDecoration(
@@ -147,15 +189,13 @@ class OrderPageInfo extends BasicPage {
                 child: TextField(
                   minLines: 6,
                   maxLines: 6,
-                  style: TextStyle(
-                      fontSize: 17.sp, height: 1.5),
+                  style: TextStyle(fontSize: 17.sp, height: 1.5),
                   decoration: const InputDecoration(
                     isCollapsed: true,
                     border: InputBorder.none,
                     counterText: '',
                     hintText: '请输入评价内容',
-                    floatingLabelBehavior:
-                    FloatingLabelBehavior.never,
+                    floatingLabelBehavior: FloatingLabelBehavior.never,
                   ),
                   onChanged: (e) {
                     desc = e;
@@ -170,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;
     }
@@ -184,9 +224,7 @@ class OrderPageInfo extends BasicPage {
       onCancel: () => true,
       onConfirm: () {
         if (evalStars != -1 && evalText != '') {
-          orderEvaluation(
-              orderId, evalStars, evalText)
-              .then((value) {
+          orderEvaluation(orderId, evalStars, evalText).then((value) {
             Fluttertoast.showToast(msg: '评价成功！');
             Get.offAllNamed('/order');
           });
@@ -199,15 +237,16 @@ class OrderPageInfo extends BasicPage {
   }
 
   // 调用支付接口
-  Future<void> payMoney (String payType) async {
-    if(payType=='wxPay'){
-      final isInstall=await fluwx.isWeChatInstalled;
-      if(!isInstall){
+  Future<void> payMoney(String payType) async {
+    if (payType == 'wxPay') {
+      final isInstall = await fluwx.isWeChatInstalled;
+      if (!isInstall) {
         EasyLoading.showError('请先安装微信');
         return;
       }
       createOrder(id.value, "wx").then((value) {
-        fluwx.payWithWeChat(
+        fluwx
+            .payWithWeChat(
           appId: value['appid'].toString(),
           partnerId: value['partnerId'].toString(),
           prepayId: value['prepayId'].toString(),
@@ -215,9 +254,10 @@ class OrderPageInfo extends BasicPage {
           nonceStr: value['noncestr'].toString(),
           timeStamp: int.parse(value['timestamp'].toString()),
           sign: value['sign'].toString(),
-        ).then((res) {
+        )
+            .then((res) {
           print("payWithWeChat--------${res}");
-        }).catchError((onError){
+        }).catchError((onError) {
           print("payWithWeChat错误--------${onError}");
         });
       });
@@ -230,16 +270,15 @@ class OrderPageInfo extends BasicPage {
           // EasyLoading.showSuccess('支付成功');
           Get.snackbar('提示', "支付成功");
           Get.offAllNamed('/order');
-        }else{
-
+        } else {
           EasyLoading.showError('支付失败');
         }
         // 关闭弹窗
       });
       return;
-    } else if(payType=='aliPay'){
-      final isInstall=await tobias.isAliPayInstalled();
-      if(!isInstall){
+    } else if (payType == 'aliPay') {
+      final isInstall = await tobias.isAliPayInstalled();
+      if (!isInstall) {
         EasyLoading.showError('请先安装支付宝');
         return;
       }
@@ -273,79 +312,28 @@ class OrderPageInfo extends BasicPage {
             height: 200.w, //对话框高度就是此高度
             child: Center(
                 child: Column(
-                  children: [
-                    Padding(
-                      padding: EdgeInsets.fromLTRB(0, 25.w, 0, 34.w),
-                      child: Bold(text: "支付方式", fontSize: 17.sp),
-                    ),
-                    PayItem(
-                      label: "支付宝",
-                      icon: const AssetImage('images/alipay.png'),
-                      onPress: () {
-                        payMoney('aliPay');
-                      },
-                    ),
-                    PayItem(
-                      label: "微信",
-                      icon: const AssetImage('images/weChatPay.png'),
-                      onPress: () {
-                        payMoney('wxPay');
-                      },
-                    ),
-                  ],
-                )),
+              children: [
+                Padding(
+                  padding: EdgeInsets.fromLTRB(0, 25.w, 0, 34.w),
+                  child: Bold(text: "支付方式", fontSize: 17.sp),
+                ),
+                PayItem(
+                  label: "支付宝",
+                  icon: const AssetImage('images/alipay.png'),
+                  onPress: () {
+                    payMoney('aliPay');
+                  },
+                ),
+                PayItem(
+                  label: "微信",
+                  icon: const AssetImage('images/weChatPay.png'),
+                  onPress: () {
+                    payMoney('wxPay');
+                  },
+                ),
+              ],
+            )),
           );
         });
   }
-
-  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/userInfo/index.dart

@@ -20,10 +20,12 @@ class UserInfo extends BasicPage {
   @override
   void beforeShow() {
     super.beforeShow();
-    _cName = TextEditingController(text: userInfo.user().nickName.toString());
-    _cPhone = TextEditingController(text: userInfo.user().phone.toString());
-    name = userInfo.user().nickName.toString();
+    name = userInfo.user().nickName != null
+        ? userInfo.user().nickName.toString()
+        : '';
     phone = userInfo.user().phone.toString();
+    _cName = TextEditingController(text: name);
+    _cPhone = TextEditingController(text: phone);
   }
 
   bool disableLogin = false;
@@ -41,7 +43,6 @@ class UserInfo extends BasicPage {
     } else {
       data = {
         ...userInfo.user().toJson(),
-        'avatar': userInfo.user().avatar ?? '',
         'nickName': name,
         'phone': phone
       };
@@ -134,7 +135,7 @@ class UserInfo extends BasicPage {
                   Row(
                       mainAxisAlignment: MainAxisAlignment.spaceBetween,
                       children: [
-                        Container(
+                        SizedBox(
                           width: 327.w,
                           child: TextField(
                             controller: _cName,
@@ -158,6 +159,7 @@ class UserInfo extends BasicPage {
                           ),
                         ),
                         GestureDetector(
+                          behavior: HitTestBehavior.opaque,
                           onTap: () {
                             name = '';
                             _cName.clear();
@@ -223,6 +225,7 @@ class UserInfo extends BasicPage {
                           ),
                         ),
                         GestureDetector(
+                          behavior: HitTestBehavior.opaque,
                           onTap: () {
                             phone = '';
                             _cPhone.clear();

lib/services/homeAPI.dart

@@ -34,15 +34,14 @@ Future getMachinery(params) async {
  * @param {*} data
  * @returns
  */
-Future searchMachinery(
-    params
-) async {
+Future searchMachinery(params) async {
   return request('/machinery',
-      options: Options(method: 'GET'),
-      queryParameters: params,
-      data: params).catchError((error) => {
-        Fluttertoast.showToast(msg: error.error['message']),
-      });
+          options: Options(method: 'GET'),
+          queryParameters: params,
+          data: params)
+      .catchError((error) => {
+            Fluttertoast.showToast(msg: error.error['message']),
+          });
 }
 
 /**
@@ -76,11 +75,8 @@ Future typeMachinery(
 
 Future getMachineryInfo(String id, String location, bool attached) async {
   return request('/machinery-summary/$id',
-          options: Options(method: 'GET'),
-          queryParameters: {'location': location, 'attached': attached})
-      .catchError((error) => {
-            Fluttertoast.showToast(msg: error.error['message']),
-          });
+      options: Options(method: 'GET'),
+      queryParameters: {'location': location, 'attached': attached});
 }
 
 /**
@@ -89,8 +85,6 @@ Future getMachineryInfo(String id, String location, bool attached) async {
  * @returns
  */
 Future getMachineryType(params) async {
-  return request('/machinery-type', options: Options(method: 'GET'),queryParameters: params);
+  return request('/machinery-type',
+      options: Options(method: 'GET'), queryParameters: params);
 }
-
-
-

lib/services/user.dart

@@ -12,14 +12,14 @@ Future getSMSCaptch(String phone) async {
   });
 }
 
-//登陆
+//登录
 Future userLogin(String userName, String password) async {
   return request(
     '/login',
     options: Options(method: 'POST'),
     data: {'userName': userName, 'password': password},
   ).catchError((error) => {
-        Fluttertoast.showToast(msg: error.error['message']),
+        Fluttertoast.showToast(msg: error['message']),
       });
 }
 

lib/utils/Request.dart

@@ -1,6 +1,7 @@
 import 'dart:convert';
 
 import 'package:dio/dio.dart';
+import 'package:fluttertoast/fluttertoast.dart';
 import 'package:get/get.dart';
 import 'package:get_storage/get_storage.dart';
 
@@ -39,6 +40,7 @@ Dio createRequest() {
   );
 
   var dio = Dio(options);
+  GetStorage box = GetStorage();
   dio.interceptors.add(InterceptorsWrapper(onRequest: (options, handler) {
     // Do something before request is sent
     options.headers['Authorization'] = GetStorage().read("token");
@@ -50,6 +52,12 @@ Dio createRequest() {
     // you can reject a `DioError` object eg: `handler.reject(dioError)`
   }, onResponse: (response, handler) {
     var resp = response.data as Map<String, dynamic>;
+    if(resp['code']==1001){
+      Fluttertoast.showToast(msg: '登录过期请重新登录！');
+      box.remove('token');
+      Get.offAllNamed('/login');
+      return handler.next(response);
+    }
     if (resp['code'] == 1000) {
       response.data = resp['data'];
 

lib/utils/location.dart

@@ -33,6 +33,12 @@ void showPrivacy() {
 
 // 判断定位权限
 Future _requirePermission() async {
+  print(1);
+  // print(Permission.location);
+  print(2);
+  // print(Permission.locationAlways);
+  print(3);
+
   PermissionStatus _permissionGranted = await Permission.location.status;
   if (_permissionGranted == PermissionStatus.denied) {
     // 如果未允许, 尝试申请一次
@@ -40,6 +46,9 @@ Future _requirePermission() async {
     if (_permissionGranted != PermissionStatus.granted) {
       throw Exception("请设置允许当前程序定位功能");
     }
+    // if (await PermissionHelper.check(Permission.locationAlways)) {
+    //   // 这里写应用获取权限之后的业务逻辑
+    // }
   }
 }
 

lib/widgets/CarsCard.dart

@@ -1,14 +1,8 @@
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
-import 'package:get/get_core/src/get_main.dart';
-
-import '../models/entities/CardInfo.dart';
 import '../models/entities/CardListModel.dart';
-import '../pages/OrderConfirmation/index.dart';
 import '../pages/machinery/detail/index.dart';
-import '../pages/machinery/map/index.dart';
 import 'LinearGradientText.dart';
 
 class CarsCard extends StatefulWidget {

lib/widgets/ExtendContentList.dart

@@ -1,10 +1,6 @@
 import 'package:flutter/widgets.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:get/get_rx/src/rx_types/rx_types.dart';
-import 'package:get/get_state_manager/src/rx_flutter/rx_obx_widget.dart';
-
 import '../models/entities/CardInfo.dart';
-import '../models/entities/ExtendContent.dart';
 
 class ExtendContentList extends StatelessWidget {
   final List<ContentImageList> item;
@@ -23,37 +19,20 @@ class ExtendContentList extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    //
-    // List<Widget> _widgets = [];
-    // Container(
-    //   child: item.contentType == "image" ? _image(item.content) : _text(item.content),
-    // );
-    // for (var i = 0; i < item.length; i += 1) {
-    //   if (i != 0 ) {
-    //     _widgets.add(SizedBox(height: 20.w,));
-    //   }
-    //   var item = item[i];
-    //   _widgets.add(Container(
-    //     child: item.contentType == "image" ? _image(item.content) : _text(item.content),
-    //   ));
-    // }
-
-    return Container(
-      child: Column(
-        children: item.map((item) {
-          if (item.contentType != 'image') {
-            return Container(
-                padding: EdgeInsets.fromLTRB(0, 20, 0, 10),
-                width: 344.w,
-                child: _text(item.content));
-          } else {
-            return Container(
-              padding: EdgeInsets.fromLTRB(0, 10, 0, 10),
-              child: _image(item.content),
-            );
-          }
-        }).toList(),
-      ),
+    return Column(
+      children: item.map((item) {
+        if (item.contentType != 'image') {
+          return Container(
+              padding: EdgeInsets.fromLTRB(0, 20, 0, 10),
+              width: 344.w,
+              child: _text(item.content));
+        } else {
+          return Container(
+            padding: EdgeInsets.fromLTRB(0, 10, 0, 10),
+            child: _image(item.content),
+          );
+        }
+      }).toList(),
     );
   }
 }

lib/widgets/OrderListCard.dart

@@ -12,7 +12,7 @@ class TextCell extends StatelessWidget {
   String title;
   String? value;
 
-  TextCell({Key? key, required this.title, this.value}):super(key: key);
+  TextCell({Key? key, required this.title, this.value}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -20,20 +20,19 @@ 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)),
       ]),
     );
   }
-
 }
 
 class OrderListCard extends StatelessWidget {
@@ -48,148 +47,158 @@ 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,
             offset: Offset(0.0, 15.0), //阴影xy轴偏移量
             blurRadius: 15.0, //阴影模糊程度
             spreadRadius: 1.0 //阴影扩散程度
-        )
+            )
       ]),
       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: {
-                        'id': 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: TextStyle(
+                                    fontSize: 16.sp,
+                                    fontWeight: FontWeight.bold,
+                                  ),
+                                ),
                                 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: "元",
+                                  style: TextStyle(
+                                    fontSize: 16.sp,
+                                    fontWeight: FontWeight.bold,
+                                  ),
+                                ),
+                              ],
                             ),
                           ),
-                        ],
-                      ),
-                    ],
-                  ),
+                        ),
+                      ],
+                    ),
+                  ],
                 ),
-              ],
-            ),
+              ),
+            ],
           ),
         ],
       ),

lib/widgets/layout/BasicPage.dart

@@ -96,19 +96,25 @@ class _BasicPageState extends State<BasicPage> {
     }
   }
 
+  final client = GetPlatform.isAndroid ? true : false;
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
       resizeToAvoidBottomInset: false,
       appBar: _getAppBar(),
       body: SafeArea(
-        child: GestureDetector(
-          behavior: HitTestBehavior.translucent,
-          onTap: () {
-            FocusScope.of(context).requestFocus(FocusNode());
-          },
-          child: widget.builder(context),
-        ),
+        //判断是否是安卓手机  因为安卓手机键盘有收起功能所以普通就行
+        //如果是苹果系统 因为苹果键盘没有收起功能只能点击屏幕收起所以需要加一个代码
+        child: client
+            ? widget.builder(context)
+            : GestureDetector(
+                behavior: HitTestBehavior.translucent,
+                onTap: () {
+                  FocusScope.of(context).requestFocus(FocusNode());
+                },
+                child: widget.builder(context),
+              ),
       ),
       bottomNavigationBar: widget.tabIndex == null
           ? null