'.'

android/app/src/main/AndroidManifest.xml

@@ -24,6 +24,7 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <!--允许读设备等信息，用于问题排查-->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+
    <application
         android:label="worker_client"
         android:name="${applicationName}"

lib/models/app.dart

@@ -35,17 +35,17 @@ class AppController extends GetxController {
     super.onInit();
 
     // 尝试获取 location
-    requireLocation(onLocationChange).then((loc) {
-      _location = loc;
-    }).catchError((e) {
-      print(e);
-
-      showAlert(
-        title: '获取定位失败',
-        message: e.message,
-        onConfirm: () => exit(1),
-      );
-    });
+    // requireLocation(onLocationChange).then((loc) {
+    //   _location = loc;
+    // }).catchError((e) {
+    //   print(e);
+    //
+    //   showAlert(
+    //     title: '获取定位失败',
+    //     message: e.message,
+    //     onConfirm: () => exit(1),
+    //   );
+    // });
 
     // // 尝试获取一次人员信息
     // getCurrent().then((person) {

lib/models/entities/Job.dart

@@ -57,6 +57,7 @@ class Job {
   String? workerName;
 
   Job();
+
   Job.fromJson(Map<String, dynamic> json)
       : jobId = json["jobId"],
         dispatchId = json["dispatchId"],

lib/pages/Login/index.dart

@@ -9,6 +9,7 @@ import 'package:get/get.dart';
 import 'package:worker_client/widgets/Cell.dart';
 import 'package:worker_client/widgets/GradientButton.dart';
 import 'package:worker_client/pages/home/index.dart';
+import 'package:worker_client/widgets/MyButton/index.dart';
 import '../../models/entities/person.dart';
 import '../../services/user.dart';
 
@@ -240,27 +241,14 @@ class _Login extends State<Login> {
                 //找到了 下面就是置底
                 const Spacer(),
                 Center(
-                  child: SizedBox(
-                    width: 315.w,
-                    height: 49.h,
-                    child: GradientButton(
-                        colors: const [
-                          Color(0xFFA0E067),
-                          Color(0xFF00AE39),
-                        ],
-                        borderRadius: BorderRadius.all(Radius.circular(24.5.w)),
-                        onPressed: disableLogin ? null : handleLogin,
-                        child: Text(
-                          '登录',
-                          style: TextStyle(
-                            fontSize: 17.sp,
-                            fontWeight: FontWeight.bold,
-                          ),
-                        )),
-                  ),
+                  child: MyButton(
+                      text: '登录',
+                      type: 0,
+                      disable: disableLogin,
+                      onClick: handleLogin),
                 ),
                 Container(
-                  margin: EdgeInsets.fromLTRB(0, 30.h, 0, 0),
+                  margin: EdgeInsets.fromLTRB(0, 21.h, 0, 0),
                   child: GestureDetector(
                     onTap: () {
                       setState(() {

lib/pages/detail/index.dart

@@ -0,0 +1,45 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/src/widgets/framework.dart';
+import 'package:get/get.dart';
+import 'package:worker_client/models/entities/Job.dart';
+import 'package:worker_client/services/job.dart';
+import 'package:worker_client/widgets/MyCard/index.dart';
+import 'package:worker_client/widgets/layout/BasicPage.dart';
+
+class Detail extends BasicPage {
+  final job = Rx<Job>(Job());
+  @override
+  void beforeShow() {
+    super.beforeShow();
+    if (Get.arguments != null) {
+      //请求详情接口
+      getJobDetail(Get.arguments['id'].toString())
+          .then((value) => {job(Job.fromJson(value))});
+    }
+  }
+
+  void changeJob(Job item) {}
+  void goDetail(Job item) {}
+  @override
+  Widget builder(BuildContext context) {
+    naviTitle = '详情';
+    return Container(
+        alignment: Alignment.topCenter,
+        child: Column(
+          children: [
+            Obx(() => MyCard(
+                  item: job(),
+                  job: true,
+                  detail: true,
+                  onClick: () {
+                    changeJob(job());
+                  },
+                  goDetail: () {
+                    goDetail(job());
+                  },
+                  buttomText: job().status == 0 ? '开始作业' : '完成作业',
+                ))
+          ],
+        ));
+  }
+}

lib/pages/home/widgets/home/index.dart

@@ -7,6 +7,7 @@ import 'package:worker_client/models/entities/Job.dart';
 import 'package:worker_client/pages/home/widgets/home/widgets/headers.dart';
 import 'package:worker_client/services/banner.dart';
 import 'package:worker_client/services/job.dart';
+import 'package:worker_client/widgets/MoreList.dart';
 import 'package:worker_client/widgets/MyCard/index.dart';
 
 class HomePage extends StatefulWidget {
@@ -18,89 +19,118 @@ class HomePage extends StatefulWidget {
 
 class _HomePageState extends State<HomePage> {
   final bannerList = Rx<List<BannerModel>>([]);
-  final jobList = Rx<List<Job>>([]);
+  List<Job> jobList = [];
   final job = Rx<Job>(Job());
   @override
   void initState() {
     super.initState();
     getBannerList('bannerWorker').then((res) {
-      List<BannerModel> list=[];
+      List<BannerModel> list = [];
       for (var item in res) {
         list.add(BannerModel.fromJson(item));
       }
-      bannerList.value=list;
-    });
-    getJobList().then((res) {
-      List<Job> list=[];
-      for (var item in res['records']) {
-        list.add(Job.fromJson(item));
-      }
-      jobList.value=list;
+      bannerList.value = list;
     });
   }
 
+  List<Job> GetList(value) {
+    List<Job> list = [];
+    value.forEach((item) => {list.add(Job.fromJson(item))});
+    return list;
+  }
+
+  Map<String, dynamic> map = {'pageNum': 1};
+
+  void changeJob(Job item) {}
+  void goDetail(Job item) {
+    Get.toNamed('/detail', arguments: {'id': item.jobId});
+  }
+
   @override
   Widget build(BuildContext context) {
-    return Container(
-      decoration: const BoxDecoration(color: Colors.white),
-      padding: EdgeInsets.all(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) => Container(
-                            child: 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, //初始页
+    return MoreList(
+      serves: getJobList,
+      params: map,
+      getJson: (BuildContext context, List<dynamic> jsonData) {
+        jobList = GetList(jsonData);
+        return Column(
+          children: [
+            Container(
+              decoration: const BoxDecoration(color: Colors.white),
+              padding: EdgeInsets.all(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) => Container(
+                                    child: 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,
+                  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),
+                        )
+                      ],
+                    ),
                   ),
-                ),
-                Text(
-                  '作业列表',
-                  style: TextStyle(
-                      color: Color(0xff222222),
-                      fontSize: 20.sp,
-                      fontWeight: FontWeight.w800),
-                )
-              ],
-            ),
-          ),
-          Obx(
-            () => Column(
-              children: jobList.value
-                  .map(
-                    (item) => const MyCard(),
-                  )
-                  .toList(),
+                  Column(
+                    children: jobList
+                        .map(
+                          (item) => MyCard(
+                            item: item,
+                            job: true,
+                            detail: false,
+                            onClick: () {
+                              changeJob(item);
+                            },
+                            goDetail: () {
+                              goDetail(item);
+                            },
+                            buttomText: item.status == 0 ? '开始作业' : '完成作业',
+                          ),
+                        )
+                        .toList(),
+                  ),
+                ],
+              ),
             ),
-          ),
-        ],
-      ),
+          ],
+        );
+      },
     );
   }
 }

lib/pages/index.dart

@@ -4,3 +4,4 @@ export 'splash/splash.dart';
 export 'Login/index.dart';
 export 'order/index.dart';
 export 'main/index.dart';
+export 'detail/index.dart';

lib/pages/main/index.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:worker_client/widgets/layout/BasicPage.dart';
 
+
 class Main extends BasicPage {
   Main({Key? key}) : super(key: key) {
     tabIndex = 2;
@@ -9,6 +10,6 @@ class Main extends BasicPage {
 
   @override
   Widget builder(BuildContext context) {
-    return const Text('我是个人中心页面');
+    return Text('我是个人中心页面');
   }
-}
+}

lib/pages/order/index.dart

@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:worker_client/widgets/layout/BasicPage.dart';
 
-
 class Order extends BasicPage {
   Order({Key? key}) : super(key: key) {
     tabIndex = 1;
@@ -10,6 +9,6 @@ class Order extends BasicPage {
 
   @override
   Widget builder(BuildContext context) {
-    return Text('我是订单列表页面');
+    return Text('我是订单列表');
   }
-}
+}

lib/routes/pages.dart

@@ -13,4 +13,5 @@ List<GetPage> pages = [
   GetPage(name: '/order', page: () =>  Order()),
   GetPage(name: '/', page: () =>  Home()),
   GetPage(name: '/main', page: () =>  Main()),
+  GetPage(name: '/detail', page: () =>  Detail()),
 ];

lib/services/banner.dart

@@ -11,7 +11,7 @@ Future getBannerList(String position) async {
   return request('/banner',
       options: Options(method: 'GET'), data: {'position': position})
       .catchError((error) => {
-    Fluttertoast.showToast(msg: error.error['message']),
+    Fluttertoast.showToast(msg: error.error.toString()),
   });
 }
 

lib/services/job.dart

@@ -5,10 +5,12 @@ import 'package:fluttertoast/fluttertoast.dart';
 /// 作业列表
 /// @param {*} data
 /// @returns
-Future getJobList() async {
-  return request('/work-job', options: Options(method: 'GET'))
+Future getJobList( params) async {
+  return request('/work-job',
+          options: Options(method: 'GET'), queryParameters: params)
       .catchError((error) => {
-            Fluttertoast.showToast(msg: error.error['message']),
+            Fluttertoast.showToast(msg: error.error.toString()),
+    print(error)
           });
 }
 
@@ -16,8 +18,8 @@ Future getJobList() async {
 /// @param {*} data
 /// @returns
 Future getJobDetail(String id) async {
-  return request('/work-job',
-          options: Options(method: 'GET'), queryParameters: {'id': id})
+  return request('/work-job/$id',
+          options: Options(method: 'GET'))
       .catchError((error) => {
             Fluttertoast.showToast(msg: error.error['message']),
           });

lib/widgets/MoreList.dart

@@ -0,0 +1,99 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+
+typedef GetJson = Widget Function(BuildContext context, List<dynamic> jsonData);
+
+class MoreList extends StatefulWidget {
+  final Future Function(Map params)? serves;
+  final Map? params;
+  final GetJson? getJson;
+  final Widget? child;
+
+  const MoreList(
+      {Key? key,
+      required this.serves,
+      required this.getJson,
+      this.child,
+      required this.params})
+      : super(key: key);
+
+  @override
+  _MoreList createState() => _MoreList(serves, params);
+}
+
+//传一个serves进来传一个json出去
+class _MoreList extends State<MoreList> {
+  final Future Function(Map params)? serves;
+  final Map? params;
+  final jsonData = Rx<List<dynamic>>([]);
+  _MoreList(this.serves, this.params);
+
+  final ScrollController _scrollController = ScrollController();
+  final _page = Rx<int>(1);
+  bool isLoading = false;
+  final hasMore = Rx<bool>(false);
+
+  @override
+  void initState() {
+    super.initState();
+    getList();
+    addEvent();
+  }
+  void addEvent(){
+    _scrollController.addListener(() {
+      if (!hasMore.value) {
+        print('暂无更多');
+        return;
+      }
+      if (!isLoading &&
+          _scrollController.position.pixels >=
+              _scrollController.position.maxScrollExtent) {
+        _page.value++;
+        params!['pageNum'] = _page.value;
+        getList();
+      }
+    });
+  }
+
+  void getList() {
+    if (serves != null) {
+      isLoading = true;
+      serves!(params!).then((res) {
+        var list = [];
+        list = [...jsonData.value, ...res['records']];
+        jsonData.value = list;
+        if (res['total'] > jsonData.value.length) {
+          hasMore.value = true;
+        }else {
+          hasMore.value = false;
+        }
+        isLoading=false;
+      });
+    }
+  }
+
+  Future onRefresh() {
+    return Future.delayed(Duration(seconds: 1), () {
+      _page.value = 1;
+      jsonData.value = [];
+      params!['pageNum'] = _page.value;
+      getList();
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    if (serves == null)
+      return ListView(
+        children: [widget.child!],
+      );
+    return RefreshIndicator(
+        onRefresh: onRefresh,
+        child: ListView.builder(
+            controller: _scrollController,
+            itemCount: 1,
+            itemBuilder: (BuildContext context, int position) {
+              return Obx(() => widget.getJson!(context, jsonData.value));
+            }));
+  }
+}

lib/widgets/MyButton/entities/Gradient.dart

@@ -0,0 +1,7 @@
+import 'dart:ui';
+
+class GradientModel {
+  final Color beginColor;
+  final Color endColor;
+  GradientModel(this.beginColor, this.endColor);
+}

lib/widgets/MyButton/index.dart

@@ -0,0 +1,48 @@
+import 'package:flutter/cupertino.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:worker_client/widgets/MyButton/entities/Gradient.dart';
+
+import '../GradientButton.dart';
+
+class MyButton extends StatelessWidget {
+  final String text;
+  //type 1 绿色 2 黄色
+  final int type;
+  //true 有结束动画 false 无变化
+  final bool disable;
+  //点击事件
+  final GestureTapCallback onClick;
+
+  MyButton(
+      {Key? key,
+      required this.text,
+      required this.type,
+      required this.disable,
+      required this.onClick})
+      : super(key: key);
+
+  List<GradientModel> Glist=[
+    GradientModel(Color(0xFFA0E067), Color(0xFF00AE39)),
+    GradientModel(Color(0xFFFFAB8C), Color(0xFFFF703B)),
+  ];
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      margin: EdgeInsets.fromLTRB(0, 12.5.h, 0, 9.h),
+      width: 315.w,
+      height: 49.h,
+      child: GradientButton(
+          colors: [Glist[type].beginColor,Glist[type].endColor],
+          borderRadius: BorderRadius.all(Radius.circular(24.5.w)),
+          onPressed: disable ? null : onClick,
+          child: Text(
+            text,
+            style: TextStyle(
+              fontSize: 17.sp,
+              fontWeight: FontWeight.bold,
+              letterSpacing: 2
+            ),
+          )),
+    );
+  }
+}

lib/widgets/MyCard/entities/ItemColor.dart

@@ -0,0 +1,8 @@
+import 'dart:ui';
+
+class ItemColor{
+  final Color borderColor;
+  final Color leftColor;
+  final Color rightColor;
+  ItemColor(this.borderColor, this.leftColor, this.rightColor);
+}

lib/widgets/MyCard/index.dart

@@ -1,16 +1,77 @@
 import 'dart:math';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:worker_client/models/entities/Job.dart';
+import 'package:worker_client/widgets/MyButton/index.dart';
+import 'package:worker_client/widgets/MyCard/entities/ItemColor.dart';
 import 'package:worker_client/widgets/MyCard/widgets/CardCell.dart';
 
-class MyCard extends StatelessWidget{
+class MyCard extends StatelessWidget {
+  final Job item;
+  final String? type;
+  final String? value;
+  final String buttomText;
+  final bool job;
+  final bool detail;
+  final GestureTapCallback onClick;
+  final GestureTapCallback? goDetail;
+  MyCard(
+      {Key? key,
+      required this.item,
+      this.type,
+      this.value,
+      required this.job,
+      required this.detail,
+      required this.onClick,
+      required this.buttomText,
+      this.goDetail})
+      : super(key: key);
 
-  const MyCard({Key? key}) : super(key: key);
+  List<ItemColor> colors = [
+    ItemColor(const Color(0xFFC7C7C7), const Color(0xFF8F8F8F),
+        const Color(0xFFC0C0C0)),
+    ItemColor(const Color(0xFFFFC937), const Color(0xFFFFAB8C),
+        const Color(0xFFFF703B)),
+    ItemColor(const Color(0xFF06B03B), const Color(0xFF00AE39),
+        const Color(0xFFA0E067)),
+  ];
+
+  String Title() {
+    return type == 'machinery'
+        ? (item.status == 0
+            ? '维修中'
+            : (value != null || value == 3)
+                ? '空闲中'
+                : '使用中')
+        : item.status == 0
+            ? '待作业'
+            : item.status == 1 || item.status == 2
+                ? '进行中'
+                : item.status == 3
+                    ? '已完成'
+                    : '';
+  }
+
+  ItemColor CurrentColor() {
+    return type == 'machinery'
+        ? (item.status == 0
+            ? colors[0]
+            : (value != null || value == 3)
+                ? colors[1]
+                : colors[2])
+        : item.status == 0
+            ? colors[1]
+            : item.status == 1 || item.status == 2
+                ? colors[2]
+                : item.status == 3
+                    ? colors[0]
+                    : colors[0];
+  }
 
   @override
   Widget build(BuildContext context) {
     return Container(
-      margin: EdgeInsets.fromLTRB(0, 0, 0, 15.w),
+      margin: EdgeInsets.fromLTRB(0, 7.5.w, 0, 7.5.w),
       clipBehavior: Clip.hardEdge,
       width: 345.w,
       decoration: BoxDecoration(
@@ -37,12 +98,12 @@ class MyCard extends StatelessWidget{
                   borderRadius: BorderRadius.all(Radius.circular(68.5.w)),
                   border: Border.all(
                       width: 1.w,
-                      color: Color(0xFFc7c7c7),
+                      color: CurrentColor().borderColor,
                       style: BorderStyle.solid),
                   gradient: LinearGradient(
                     colors: [
-                      Color(0xFFA0E067),
-                      Color(0xFF00AE39),
+                      CurrentColor().rightColor,
+                      CurrentColor().leftColor,
                     ],
                   ),
                 ),
@@ -51,11 +112,11 @@ class MyCard extends StatelessWidget{
                   child: Transform.translate(
                     offset: Offset(38.w, 85.w),
                     child: Text(
-                      '进行中',
+                      Title(),
                       style: TextStyle(
                           fontSize: 14.sp,
                           fontWeight: FontWeight.bold,
-                          color: Color(0xffffffff)),
+                          color: const Color(0xffffffff)),
                     ),
                   ),
                 ),
@@ -92,25 +153,30 @@ class MyCard extends StatelessWidget{
                       Expanded(
                         flex: 1,
                         child: Text(
-                          '2025-05-25',
+                          item.appointmentDate != null
+                              ? item.appointmentDate.toString().substring(0, 10)
+                              : '',
                           style: TextStyle(
                               fontSize: 17.sp,
                               color: Color(0xFF101010),
                               fontWeight: FontWeight.bold),
                         ),
                       ),
-                      GestureDetector(
-                        onTap: () {},
-                        child: Container(
-                          margin: EdgeInsets.fromLTRB(0, 0, 7.5.w, 0),
-                          child: Text(
-                            '详情>>',
-                            style: TextStyle(
-                                fontSize: 17.sp,
-                                fontWeight: FontWeight.bold,
-                                color: Color(0xFF606060)),
+                      Visibility(
+                        child: GestureDetector(
+                          onTap: goDetail,
+                          child: Container(
+                            margin: EdgeInsets.fromLTRB(0, 0, 7.5.w, 0),
+                            child: Text(
+                              '详情>>',
+                              style: TextStyle(
+                                  fontSize: 17.sp,
+                                  fontWeight: FontWeight.bold,
+                                  color: Color(0xFF606060)),
+                            ),
                           ),
                         ),
+                        visible: job && !detail,
                       )
                     ],
                   ),
@@ -120,13 +186,90 @@ class MyCard extends StatelessWidget{
                   height: 30.h,
                   thickness: 0.5.w,
                 ),
-                CardCell(lable: '订单号', content: 'M-20220424000003', size: 8.6),
-                CardCell(lable: '农机名称', content: '源盛第四种农机的第一个农机', size: 2),
-                CardCell(lable: '下单人', content: '', size: 8.6),
-                CardCell(lable: '手机号', content: '18082043755', size: 8.6),
-                CardCell(lable: '订单时间', content: '2022-04-24', size: 2),
-                CardCell(lable: '作业时间', content: '2022-04-24 15:54:51 2022-04-25 15:54:51', size: 2),
-                CardCell(lable: '订单费用', content: '0.01元', size: 2),
+                CardCell(
+                    lable: '订单号', content: item.orderNo.toString(), size: 8.6),
+                Visibility(
+                  child: CardCell(
+                      lable: '农机名称',
+                      content: item.machineryName.toString(),
+                      size: 2),
+                  visible: job,
+                ),
+                Visibility(
+                  child: CardCell(
+                      lable: '农机类型',
+                      content: item.machineryTypeName.toString(),
+                      size: 2),
+                  visible: job,
+                ),
+                CardCell(
+                    lable: '下单人',
+                    content: (item.personName ?? ' ').toString(),
+                    size: 8.6),
+                CardCell(
+                    lable: '手机号', content: item.phone.toString(), size: 8.6),
+                CardCell(
+                    lable: '订单时间',
+                    content: item.createDate != null
+                        ? item.createDate.toString().substring(0, 10)
+                        : '',
+                    size: 2),
+                Visibility(
+                    child: CardCell(
+                        lable: '服务地址',
+                        content: item.address.toString(),
+                        size: 2),
+                    visible: detail),
+                Visibility(
+                    child: CardCell(
+                        lable: '作业时间',
+                        content: item.startDate.toString(),
+                        size: 2),
+                    visible: job),
+                Visibility(
+                    child: CardCell(
+                        lable: '',
+                        content: (item.endDate ?? '').toString(),
+                        size: 2),
+                    visible: job),
+                CardCell(
+                    lable: '订单费用',
+                    content: ((item.charges ?? 0) / 100).toString(),
+                    size: 2),
+                Visibility(
+                  visible: job && item.status != 3,
+                  child: MyButton(
+                      text: buttomText,
+                      type: item.status??0 ,
+                      disable: false,
+                      onClick: onClick),
+                ),
+                Visibility(
+                  child: Divider(
+                    color: Color(0xE5000000),
+                    height: 30.h,
+                    thickness: 0.5.w,
+                  ),
+                  visible: !job,
+                ),
+                Visibility(
+                  child: GestureDetector(
+                    onTap: goDetail,
+                    child: Container(
+                      alignment: Alignment.center,
+                      width: 345.w,
+                      padding: EdgeInsets.fromLTRB(0, 12.5.h, 0, 0),
+                      child: const Text(
+                        '详情>>',
+                        style: TextStyle(
+                          fontWeight: FontWeight.bold,
+                          color: Color(0xFF606060),
+                        ),
+                      ),
+                    ),
+                  ),
+                  visible: !job,
+                ),
               ],
             ),
           ),
@@ -134,5 +277,4 @@ class MyCard extends StatelessWidget{
       ),
     );
   }
-
-}
+}

lib/widgets/MyCard/widgets/CardCell.dart

@@ -32,7 +32,7 @@ class CardCell extends StatelessWidget {
             ),
           ),
           Text(
-            '：',
+            lable==''?'    ':'：',
             style: TextStyle(
               fontSize: 17.sp,
               color: const Color(0xFF606060),

lib/widgets/amap/amap.dart

@@ -0,0 +1,42 @@
+import 'package:amap_flutter_map/amap_flutter_map.dart';
+import 'package:amap_flutter_base/amap_flutter_base.dart';
+import 'package:flutter/widgets.dart';
+
+import '/utils/amap/const_config.dart';
+
+// https://developer.amap.com/api/flutter/guide/map-flutter-plug-in/map-flutter-info
+class AMap extends StatelessWidget {
+  late AMapController _mapController;
+  final LatLng? position;
+  final Map<String, Marker> _markers = Map<String, Marker>();
+
+  AMap({Key? key,  this.position }): super(key: key);
+
+  void onMapCreated(AMapController controller) {
+    _mapController = controller;
+  }
+
+  void _initMarkers() {
+    if (null != position) {
+      Marker marker = Marker(
+        position: position!,
+        icon: BitmapDescriptor.fromIconPath("images/locationImage.png")
+      );
+      _markers[marker.id] = marker;
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    _initMarkers();
+
+    return AMapWidget(
+      privacyStatement: ConstConfig.amapPrivacyStatement,
+      apiKey: ConstConfig.amapApiKeys,
+      markers: Set<Marker>.of(_markers.values),
+      // 默认是邓州市中心
+      initialCameraPosition: const CameraPosition(target: LatLng(32.687732, 112.08745)),
+    );
+  }
+
+}

lib/widgets/amap/const_config.dart

@@ -0,0 +1,22 @@
+import 'package:amap_flutter_base/amap_flutter_base.dart';
+import 'package:amap_flutter_map/amap_flutter_map.dart';
+
+class ConstConfig {
+  ///配置您申请的apikey，在此处配置之后，可以在初始化[AMapWidget]时，通过`apiKey`属性设置
+  ///
+  ///注意：使用[AMapWidget]的`apiKey`属性设置的key的优先级高于通过Native配置key的优先级，
+  ///使用[AMapWidget]的`apiKey`属性配置后Native配置的key将失效，请根据实际情况选择使用
+  static const AMapApiKey amapApiKeys = AMapApiKey(
+      androidKey: 'b481b4187e24e625fa0056fd0530e663',
+      iosKey: '您申请的iOS平台的key');
+
+  ///高德隐私合规声明，这里只是示例，实际使用中请按照实际参数设置[AMapPrivacyStatement]的'hasContains''hasShow''hasAgree'这三个参数
+  ///
+  /// 注意：[AMapPrivacyStatement]的'hasContains''hasShow''hasAgree'这三个参数中有一个为false，高德SDK均不会工作，会造成地图白屏等现象
+  ///
+  /// 高德开发者合规指南请参考：https://lbs.amap.com/agreement/compliance
+  ///
+  /// 高德SDK合规使用方案请参考：https://lbs.amap.com/news/sdkhgsy
+  static const AMapPrivacyStatement amapPrivacyStatement =
+  AMapPrivacyStatement(hasContains: true, hasShow: true, hasAgree: true);
+}

lib/widgets/layout/BasicPage.dart

@@ -103,7 +103,7 @@ class _BasicPageState extends State<BasicPage> {
     return Scaffold(
       appBar: _getAppBar(),
       body: SafeArea(
-        child: _buildChild(context),
+        child: widget.builder(context),
       ),
       bottomNavigationBar: widget.tabIndex == null ? null : BottomBar(list: BarList, current: widget.tabIndex!),
     );

pubspec.lock

@@ -126,7 +126,7 @@ packages:
       name: crypto
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "3.0.1"
+    version: "3.0.2"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -194,7 +194,7 @@ packages:
       name: flutter_screenutil
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "5.4.0+1"
+    version: "5.5.0"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -253,14 +253,14 @@ packages:
       name: json_annotation
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "4.4.0"
+    version: "4.5.0"
   json_serializable:
     dependency: "direct main"
     description:
       name: json_serializable
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "6.1.6"
+    version: "6.2.0"
   lints:
     dependency: transitive
     description:
@@ -344,7 +344,7 @@ packages:
       name: path_provider_android
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.12"
+    version: "2.0.13"
   path_provider_ios:
     dependency: transitive
     description:
@@ -545,7 +545,7 @@ packages:
       name: win32
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.5.1"
+    version: "2.5.2"
   xdg_directories:
     dependency: transitive
     description:
@@ -562,4 +562,4 @@ packages:
     version: "3.1.0"
 sdks:
   dart: ">=2.16.1 <3.0.0"
-  flutter: ">=2.8.0"
+  flutter: ">=2.8.1"

pubspec.yaml

@@ -42,7 +42,7 @@ dependencies:
   fluttertoast: ^8.0.9
   get_storage: ^2.0.3
   carousel_slider: ^4.0.0
-#  location: ^4.3.0
+  #  location: ^4.3.0
   amap_flutter_map: ^3.0.0
   amap_flutter_location: ^3.0.0
   permission_handler: ^9.2.0