'.'

lib/main.dart

@@ -24,7 +24,7 @@ class MyApp extends StatelessWidget {
       designSize: const Size(375, 812),
       minTextAdapt: true,
       splitScreenMode: true,
-      builder: (_) {
+      builder: (context , child) {
         return GetMaterialApp(
           initialRoute: '/',
           theme: getTheme(),

lib/models/app.dart

@@ -1,6 +1,7 @@
 import 'dart:convert';
 import 'dart:io';
 import 'package:amap_flutter_location/amap_flutter_location.dart';
+import 'package:fluttertoast/fluttertoast.dart';
 import 'package:get/get.dart';
 import 'package:get_storage/get_storage.dart';
 import 'package:worker_client/services/amap.dart';
@@ -14,7 +15,8 @@ class AppController extends GetxController {
   static AppController t = Get.find();
   GetStorage box = GetStorage();
   final user = Rx<Person>(Person());
-  final location = Rxn<Map<String, Object>>({'address':''});
+  final location = Rxn<Map<String, Object>>();
+  final address = Rxn<Map<String, Object>>({'address': ''});
   final testInt = 1.obs;
 
   AMapFlutterLocation? _location;
@@ -29,19 +31,22 @@ class AppController extends GetxController {
   }
 
   void onLocationChange(Map<String, Object> result) {
-    if (box.read('token') == null) {
+    if (result['errorCode'] == null) {
       location(result);
-    } else if (location.value!['address'] == '') {
-      setAmap({
-        //定位有问题
-        // 'params': 'location=${result['longitude'].toString()},${result['latitude'].toString()}',
-        'params': 'location=118.84002,31.95266',
-        'path': '/v3/geocode/regeo'
-      }).then((value) {
-        //json字符串转Map对象
-        result['address'] = jsonDecode(value)['regeocode']['formatted_address'];
-        location(result);
-      });
+      if (address.value!['address'] == '' &&
+          box.read('token') != null &&
+          location.value!['longitude'] != null) {
+        setAmap({
+          //定位有问题
+          'params':
+              'location=${result['longitude'].toString()},${result['latitude'].toString()}',
+          // 'params': 'location=116.397128,39.916527',
+          'path': '/v3/geocode/regeo'
+        }).then((value) {
+          //json字符串转Map对象
+          address({'address':jsonDecode(value)['regeocode']['formatted_address']});
+        });
+      }
     }
   }
 

lib/pages/home/index.dart

@@ -1,3 +1,5 @@
+import 'dart:convert';
+
 import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:get/get.dart';
@@ -8,6 +10,7 @@ import 'package:worker_client/models/app.dart';
 import 'package:worker_client/models/entities/Banner.dart';
 import 'package:worker_client/models/entities/Job.dart';
 import 'package:worker_client/pages/home/widgets/headers.dart';
+import 'package:worker_client/services/amap.dart';
 import 'package:worker_client/services/banner.dart';
 import 'package:worker_client/services/job.dart';
 import 'package:worker_client/widgets/MyCard/index.dart';
@@ -87,7 +90,7 @@ class Home extends BasicPage {
         Container(
           margin: EdgeInsets.fromLTRB(65.w, 0, 65.w, 50.h),
           child: Text(
-            AppController.t.location.value!['address'].toString(),
+            AppController.t.address.value!['address'].toString(),
             style: TextStyle(
               fontSize: 17.sp,
               fontWeight: FontWeight.w800,
@@ -186,52 +189,52 @@ class Home extends BasicPage {
   Widget builder(BuildContext context) {
     return Container(
       decoration: const BoxDecoration(color: Colors.white),
-      padding: EdgeInsets.all(15.w),
+      padding: EdgeInsets.only(top:15.w,left: 15.w,right: 15.w),
       child: Column(
         children: [
-          // const headers(),
-          // //banner
-          // Container(
-          //   margin: EdgeInsets.fromLTRB(0, 15.h, 0, 15.h),
-          //   child: Obx(() => CarouselSlider(
-          //         items: bannerList.value
-          //             .map((item) => Center(
-          //                 child: Image.network(item.thumb.toString(),
-          //                     fit: BoxFit.cover, width: 345.w)))
-          //             .toList(),
-          //         options: CarouselOptions(
-          //           autoPlay: true,
-          //           enlargeCenterPage: false,
-          //           //图片中心放大
-          //           viewportFraction: 1,
-          //           //每个页面应占据的视口部分。默认为 0.8，这意味着每个页面填充 80% 的轮播。
-          //           // aspectRatio: 1.6,//纵横比
-          //           height: 214.w,
-          //           initialPage: 1, //初始页
-          //         ),
-          //       )),
-          // ),
-          // Container(
-          //   margin: EdgeInsets.fromLTRB(0, 15.h, 0, 20.h),
-          //   child: Row(
-          //     children: [
-          //       Padding(
-          //         padding: EdgeInsets.fromLTRB(0, 0, 10.w, 0),
-          //         child: Image.asset(
-          //           'images/index/orderList.png',
-          //           width: 20.w,
-          //         ),
-          //       ),
-          //       Text(
-          //         '作业列表',
-          //         style: TextStyle(
-          //             color: Color(0xff222222),
-          //             fontSize: 20.sp,
-          //             fontWeight: FontWeight.w800),
-          //       )
-          //     ],
-          //   ),
-          // ),
+          const headers(),
+          //banner
+          Container(
+            margin: EdgeInsets.fromLTRB(0, 15.h, 0, 15.h),
+            child: Obx(() => CarouselSlider(
+                  items: bannerList.value
+                      .map((item) => Center(
+                          child: Image.network(item.thumb.toString(),
+                              fit: BoxFit.cover, width: 345.w)))
+                      .toList(),
+                  options: CarouselOptions(
+                    autoPlay: true,
+                    enlargeCenterPage: false,
+                    //图片中心放大
+                    viewportFraction: 1,
+                    //每个页面应占据的视口部分。默认为 0.8，这意味着每个页面填充 80% 的轮播。
+                    // aspectRatio: 1.6,//纵横比
+                    height: 214.w,
+                    initialPage: 1, //初始页
+                  ),
+                )),
+          ),
+          Container(
+            margin: EdgeInsets.fromLTRB(0, 15.h, 0, 20.h),
+            child: Row(
+              children: [
+                Padding(
+                  padding: EdgeInsets.fromLTRB(0, 0, 10.w, 0),
+                  child: Image.asset(
+                    'images/index/orderList.png',
+                    width: 20.w,
+                  ),
+                ),
+                Text(
+                  '作业列表',
+                  style: TextStyle(
+                      color: Color(0xff222222),
+                      fontSize: 20.sp,
+                      fontWeight: FontWeight.w800),
+                )
+              ],
+            ),
+          ),
           Expanded(
             flex: 1,
             child: RefreshMoreList(

lib/pages/home/widgets/headers.dart

@@ -26,38 +26,40 @@ class headers extends StatelessWidget {
           ),
         ),
         const Icon(Icons.arrow_drop_down),
-        Container(
-          margin: EdgeInsets.fromLTRB(15.w, 0, 0, 0),
-          padding: EdgeInsets.symmetric(vertical: 0, horizontal: 15.w),
-          width: 246.w,
-          height: 34.h,
-          decoration: const BoxDecoration(
-            color: Color(0x30cccccc),
-            borderRadius: BorderRadius.all(Radius.circular(25)),
-          ),
-          child: GestureDetector(
-            onTap: () {
-              Get.offNamed('/order');
-            },
-            child: Row(
-              children: [
-                Container(
-                  margin: EdgeInsets.fromLTRB(0, 0, 3.w, 0),
-                  child: Image.asset(
-                    'images/index/search.png',
-                    width: 15.w,
-                    height: 15.w,
-                  ),
-                ),
-                Text(
-                  '请输入关键字查询订单',
-                  style: TextStyle(
-                      color: const Color(0xFFB6B6B6), fontSize: 14.sp),
+        Expanded(
+          flex: 1,
+            child: Container(
+              margin: EdgeInsets.fromLTRB(15.w, 0, 0, 0),
+              padding: EdgeInsets.symmetric(vertical: 0, horizontal: 15.w),
+              height: 34.h,
+              decoration: const BoxDecoration(
+                color: Color(0x30cccccc),
+                borderRadius: BorderRadius.all(Radius.circular(25)),
+              ),
+              child: GestureDetector(
+                onTap: () {
+                  Get.offNamed('/order');
+                },
+                child: Row(
+                  children: [
+                    Container(
+                      margin: EdgeInsets.fromLTRB(0, 0, 3.w, 0),
+                      child: Image.asset(
+                        'images/index/search.png',
+                        width: 15.w,
+                        height: 15.w,
+                      ),
+                    ),
+                    Text(
+                      '请输入关键字查询订单',
+                      style: TextStyle(
+                          color: const Color(0xFFB6B6B6), fontSize: 14.sp),
+                    ),
+                  ],
                 ),
-              ],
-            ),
-          ),
-        ),
+              ),
+            ))
+        ,
       ],
     );
   }

lib/pages/jobDetail/index.dart

@@ -50,7 +50,7 @@ class JobDetail extends BasicPage {
         Container(
           margin: EdgeInsets.fromLTRB(65.w, 0, 65.w, 50.h),
           child: Text(
-            AppController.t.location.value!['address'].toString(),
+            AppController.t.address.value!['address'].toString(),
             style: TextStyle(
               fontSize: 17.sp,
               fontWeight: FontWeight.w800,

lib/pages/machineryDetail/index.dart

@@ -4,6 +4,7 @@ import 'package:get/get.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:worker_client/models/app.dart';
 import 'package:worker_client/models/entities/Machinery.dart';
 import 'package:worker_client/services/machinery.dart';
 import 'package:worker_client/widgets/Jianbian/index.dart';
@@ -15,13 +16,15 @@ class MachineryDetail extends BasicPage {
     naviTitle = '查看详情';
   }
   final machinery = Rx<Machinery>(Machinery());
+  String? location = AppController.t.locationStr;
+
   @override
   void beforeShow() {
     super.beforeShow();
     if (Get.arguments != null) {
       EasyLoading.show(status: '数据加载中...');
       getMachineryDetail(Get.arguments['id'],
-          {'attached': true, 'location': '118.84002,31.95266'}).then((res) {
+          {'attached': true, 'location': location}).then((res) {
         machinery(Machinery.fromJson(res));
         EasyLoading.dismiss();
       }).catchError((error) {

lib/pages/machineryList/widgets/MachineryCard.dart

@@ -46,8 +46,8 @@ class MachineryCard extends StatelessWidget {
                 child: Row(
                   mainAxisAlignment: MainAxisAlignment.spaceBetween,
                   children: [
-                    SizedBox(
-                      width: 250.w,
+                    Expanded(
+                      flex: 1,
                       child: GestureDetector(
                         onTap: goDetail,
                         child: Text(

lib/pages/machineryMap/index.dart

@@ -21,6 +21,7 @@ class MachineryMap extends BasicPage {
   final current = Rx<Machinery>(Machinery());
   final visible = Rx<bool>(true);
 
+
   dynamic locList = [
     '32.685927, 112.106514',
     '32.673406, 112.100406',
@@ -41,7 +42,7 @@ class MachineryMap extends BasicPage {
       getMachineryDetail(Get.arguments['id'], {
         'attached': true,
         //查询农机详情时需要把当前定位传到服务端
-        'location': '118.84002,31.95266'
+        'location': location
       })
           .then((res) => {
                 getMachineryList({'pageSize': 500, 'location': location})

lib/widgets/Cell.dart

@@ -43,7 +43,7 @@ class Cell extends StatelessWidget {
           ),
           Expanded(child: child,),
           if (null != footer) ConstrainedBox (
-            constraints: BoxConstraints(maxWidth: 100.w),
+            constraints: const BoxConstraints(),
             child: footer,
           )
         ],

lib/widgets/Jianbian/index.dart

@@ -80,7 +80,7 @@ class Jianbian extends StatelessWidget {
           child: Transform.rotate(
             angle: -pi / 2.3,
             child: Transform.translate(
-              offset: Offset(38.w, 85.w),
+              offset: Offset(35.w, 85.w),
               child: Text(
                 Title(),
                 style: TextStyle(

lib/widgets/MoneyCard/index.dart

@@ -17,7 +17,6 @@ class _MoneyCardState extends State<MoneyCard> {
   Widget build(BuildContext context) {
     return Container(
       width: 345.w,
-      height: 172.5.w,
       padding: EdgeInsets.fromLTRB(40.w, 33.5.w, 0, 22.5.w),
       decoration: BoxDecoration(
         borderRadius: BorderRadius.all(Radius.circular(20.w)),
@@ -49,8 +48,8 @@ class _MoneyCardState extends State<MoneyCard> {
               ),
             ),
           ),
-          Visibility(
-            visible: !widget.type,
+          Opacity(
+            opacity: !widget.type?1:0,
             child: GestureDetector(
               onTap: widget.goWithDrawal,
               child: Container(

lib/widgets/MyCard/index.dart

@@ -55,16 +55,13 @@ class MyCard extends StatelessWidget {
                   padding: EdgeInsets.fromLTRB(19.w, 9.w, 0, 9.w),
                   child: Row(
                     children: [
-                      SizedBox(
-                        width: 70,
-                        child: Text(
-                          '需求时间',
-                          style: TextStyle(
-                              fontSize: 17.sp,
-                              color: const Color(0xFF606060),
-                              fontWeight: FontWeight.bold,
-                              letterSpacing: 2),
-                        ),
+                      Text(
+                        '需求时间',
+                        style: TextStyle(
+                            fontSize: 17.sp,
+                            color: const Color(0xFF606060),
+                            fontWeight: FontWeight.bold,
+                            letterSpacing: 2),
                       ),
                       Text(
                         '：',

lib/widgets/MyCard/widgets/CardCell.dart

@@ -21,7 +21,6 @@ class CardCell extends StatelessWidget {
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
           SizedBox(
-            width: 65.w,
             child: Text(
               lable,
               style: TextStyle(

lib/widgets/RefreshMoreList.dart

@@ -79,50 +79,60 @@ class _RefreshMoreList extends State<RefreshMoreList> {
 
   @override
   Widget build(BuildContext context) {
-    return Obx(() => dataList.value.isNotEmpty
-        ? EasyRefresh(
-            controller: _controller,
-            header: ClassicalHeader(
-              infoText:DateTime.now().toString().substring(0,19),
-              refreshedText: '刷新完成',
-              refreshText: '刷新中....',
-              refreshingText: '刷新中....',
-              refreshReadyText: '刷新完毕',
-              noMoreText: '',
-              textColor: const Color(0xff666666),
-              infoColor: const Color(0xff666666),
-            ),
-            footer: ClassicalFooter(
-              infoText: DateTime.now().toString().substring(0,19),
-              loadText: '上拉加载更多',
-              loadingText: '加载中....',
-              loadedText: '',
-              loadReadyText: '释放加载',
-              noMoreText: '暂无更多',
-              enableInfiniteLoad: false,
-              textColor: const Color(0xff666666),
-              infoColor: const Color(0xff666666),
-            ),
-            // firstRefresh: true,//是否首次刷新
-            onRefresh: () async {
-              await Future.delayed(const Duration(seconds: 1), () {
-                // print("下拉刷新-----");
-                getNewData();
-                _count = dataList.value.length;
-                // print("最新条数" + _count.toString());
-                _controller.resetLoadState();
-              });
-            },
-            onLoad: () async {
-              await Future.delayed(const Duration(seconds: 1), () {
-                // print("上拉加载-----");
-                getMoreData();
-                _count = dataList.value.length;
-                // print("加载更多条数" + _count.toString());
-                _controller.finishLoad(noMore: _count >= maxSum);
-              });
-            },
-            child: widget.builder(context: context, toggle: toggle))
-        : NullCard(text: cardText));
+    return Obx(
+      () => EasyRefresh(
+        controller: _controller,
+        header: ClassicalHeader(
+          infoText: DateTime.now().toString().substring(0, 19),
+          refreshedText: '刷新完成',
+          refreshText: '刷新中....',
+          refreshingText: '刷新中....',
+          refreshReadyText: '刷新完毕',
+          noMoreText: '',
+          textColor: const Color(0xff666666),
+          infoColor: const Color(0xff666666),
+        ),
+        footer: ClassicalFooter(
+          infoText: DateTime.now().toString().substring(0, 19),
+          loadText: '上拉加载更多',
+          loadingText: '加载中....',
+          loadedText: '',
+          loadReadyText: '释放加载',
+          noMoreText: '暂无更多',
+          enableInfiniteLoad: false,
+          textColor: const Color(0xff666666),
+          infoColor: const Color(0xff666666),
+        ),
+        // firstRefresh: true,//是否首次刷新
+        onRefresh: () async {
+          await Future.delayed(const Duration(seconds: 1), () {
+            // print("下拉刷新-----");
+            getNewData();
+            _count = dataList.value.length;
+            // print("最新条数" + _count.toString());
+            _controller.resetLoadState();
+          });
+        },
+        onLoad: () async {
+          await Future.delayed(const Duration(seconds: 1), () {
+            // print("上拉加载-----");
+            getMoreData();
+            _count = dataList.value.length;
+            // print("加载更多条数" + _count.toString());
+            _controller.finishLoad(noMore: _count >= maxSum);
+          });
+        },
+        child: Column(
+          children: [
+            widget.builder(context: context, toggle: toggle),
+            dataList.value.isEmpty
+                ? NullCard(text: cardText)
+                : const SizedBox(
+                    height: 0.1,
+                  )
+          ],
+        ),
+      ),
+    );
   }
 }

pubspec.lock

@@ -7,7 +7,7 @@ packages:
       name: _fe_analyzer_shared
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "39.0.0"
+    version: "40.0.0"
   amap_flutter_base:
     dependency: transitive
     description:
@@ -35,14 +35,14 @@ packages:
       name: analyzer
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "4.0.0"
+    version: "4.1.0"
   args:
     dependency: transitive
     description:
       name: args
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.3.0"
+    version: "2.3.1"
   async:
     dependency: transitive
     description:
@@ -168,7 +168,7 @@ packages:
       name: ffi
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.1.2"
+    version: "1.2.1"
   file:
     dependency: transitive
     description:
@@ -222,7 +222,7 @@ packages:
       name: flutter_screenutil
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "5.5.2"
+    version: "5.5.3+1"
   flutter_spinkit:
     dependency: transitive
     description:
@@ -274,7 +274,7 @@ packages:
       name: http_parser
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "4.0.0"
+    version: "4.0.1"
   js:
     dependency: transitive
     description:
@@ -400,7 +400,7 @@ packages:
       name: path_provider_platform_interface
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.3"
+    version: "2.0.4"
   path_provider_windows:
     dependency: transitive
     description:
@@ -587,7 +587,7 @@ packages:
       name: yaml
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "3.1.0"
+    version: "3.1.1"
 sdks:
   dart: ">=2.16.1 <3.0.0"
   flutter: ">=2.8.1"