'.'

lib/models/Store.dart

@@ -1,4 +1,3 @@
-
 import '../models/User.dart';
 import 'package:get/get.dart';
 
@@ -8,4 +7,4 @@ class Store {
   init() {
     Get.put(User(), tag: 'user');
   }
-}
+}

lib/models/User.dart

@@ -1,15 +1,13 @@
-
 import '/models/entities/person.dart';
 import 'package:get/get.dart';
 
 class User extends GetxController {
   Person? _person;
   Person? get person => _person;
-  set person (Person? p) {
+  set person(Person? p) {
     _person = p;
     update();
   }
 
   bool get isLogin => _person != null;
-
-}
+}

lib/models/app.dart

@@ -44,7 +44,8 @@ class AppController extends GetxController {
           'path': '/v3/geocode/regeo'
         }).then((value) {
           //json字符串转Map对象
-          address({'address':jsonDecode(value)['regeocode']['formatted_address']});
+          address(
+              {'address': jsonDecode(value)['regeocode']['formatted_address']});
         });
       }
     }

lib/models/bankCardList.dart

@@ -1,7 +1,7 @@
 import 'package:get/get.dart';
 import 'package:worker_client/models/entities/BankCard.dart';
 
-class BankCardListController extends GetxController{
-  static BankCardListController t=Get.find();
-  final bankCardList=Rx<List<BankCardModel>>([]);
-}
+class BankCardListController extends GetxController {
+  static BankCardListController t = Get.find();
+  final bankCardList = Rx<List<BankCardModel>>([]);
+}

lib/models/bankPickerList.dart

@@ -1,6 +1,6 @@
 import 'package:get/get.dart';
 
-class BankPickerListController extends GetxController{
-  static BankPickerListController t=Get.find();
-  final bankPickerList=Rx<List>([]);
-}
+class BankPickerListController extends GetxController {
+  static BankPickerListController t = Get.find();
+  final bankPickerList = Rx<List>([]);
+}

lib/models/entities/BankCard.dart

@@ -1,6 +1,6 @@
 class BankCardModel {
   String? cardId;
-  String cardNo='';
+  String cardNo = '';
   String? createDate;
   String? owerName;
   String? ownerBank;

lib/models/entities/Banner.dart

@@ -17,12 +17,12 @@ class BannerModel {
         status = json["status"],
         createDat = json["createDat"];
   Map<String, dynamic> toJson() => {
-    "bannerId": bannerId,
-    "title": title,
-    "thumb": thumb,
-    "position": position,
-    "sortNo": sortNo,
-    "status": status,
-    "createDat": createDat,
-  };
+        "bannerId": bannerId,
+        "title": title,
+        "thumb": thumb,
+        "position": position,
+        "sortNo": sortNo,
+        "status": status,
+        "createDat": createDat,
+      };
 }

lib/models/entities/ExtendContent.dart

@@ -1,4 +1,3 @@
-
 class ExtendContent {
   // 租户号
   String? extId;
@@ -33,12 +32,12 @@ class ExtendContent {
         createDate = json["createDate"];
 
   Map<String, dynamic> toJson() => {
-    'extId' : extId,
-    'targetType' : targetType,
-    'targetId' : targetId,
-    'contentType' : contentType,
-    'content' : content,
-    'sort' : sort,
-    'createDate' : createDate,
-  };
-}
+        'extId': extId,
+        'targetType': targetType,
+        'targetId': targetId,
+        'contentType': contentType,
+        'content': content,
+        'sort': sort,
+        'createDate': createDate,
+      };
+}

lib/models/entities/Log.dart

@@ -11,27 +11,26 @@ class LogModel {
 
   LogModel();
 
-  LogModel.fromJson(Map<String, dynamic> json):
-  logId=json['logId'],
-  payId=json['payId'],
-  accountId=json['accountId'],
-  feeType=json['feeType'],
-  chargeType=json['chargeType'],
-  money=json['money'],
-  orderId=json['orderId'],
-  remarks=json['remarks'],
-  createDate=json['createDate'];
+  LogModel.fromJson(Map<String, dynamic> json)
+      : logId = json['logId'],
+        payId = json['payId'],
+        accountId = json['accountId'],
+        feeType = json['feeType'],
+        chargeType = json['chargeType'],
+        money = json['money'],
+        orderId = json['orderId'],
+        remarks = json['remarks'],
+        createDate = json['createDate'];
 
   Map<String, dynamic> toJson() => {
-    'logId':logId,
-    'payId':payId,
-    'accountId':accountId,
-    'feeType':feeType,
-    'chargeType':chargeType,
-    'money':money,
-    'orderId':orderId,
-    'remarks':remarks,
-    'createDate':createDate,
-  };
-
-}
+        'logId': logId,
+        'payId': payId,
+        'accountId': accountId,
+        'feeType': feeType,
+        'chargeType': chargeType,
+        'money': money,
+        'orderId': orderId,
+        'remarks': remarks,
+        'createDate': createDate,
+      };
+}

lib/models/entities/PagedResult.dart

@@ -1,4 +1,3 @@
-
 class PagedResult {
   num total;
   num size;
@@ -15,7 +14,7 @@ class PagedResult {
   });
 
   PagedResult.fromJson(Map<String, dynamic> json)
-    : total = json['total'],
+      : total = json['total'],
         size = json['size'],
         pages = json['pages'],
         current = json['current'],

lib/models/index.dart

@@ -1,4 +1,3 @@
-
 export 'app.dart';
 
 import 'package:get/get.dart';
@@ -14,4 +13,3 @@ class AppBindings implements Bindings {
     Get.put(BankPickerListController());
   }
 }
-

lib/pages/addBankCard/index.dart

@@ -24,7 +24,7 @@ class AddBankPage extends BasicPage {
   BankCardListController bankCardListStore = BankCardListController.t;
   BankPickerListController bankPickerListStore = BankPickerListController.t;
   RegExp exp = RegExp(r'^1[3456789]\d{9}$');
-  FocusNode focusNode=FocusNode();
+  FocusNode focusNode = FocusNode();
 
   //表单校验
   bool handleRule() {
@@ -89,7 +89,7 @@ class AddBankPage extends BasicPage {
         });
         bankList(list);
       },
-    ).catchError((error){
+    ).catchError((error) {
       Fluttertoast.showToast(msg: error.error['message']);
     });
   }

lib/pages/bankList/index.dart

@@ -55,11 +55,11 @@ class BankListPages extends BasicPage {
           }
           bankCardListStore.bankCardList(list1);
           EasyLoading.dismiss();
-        }).catchError((error){
+        }).catchError((error) {
           EasyLoading.dismiss();
           Fluttertoast.showToast(msg: error.error['message']);
         });
-      }).catchError((error2){
+      }).catchError((error2) {
         EasyLoading.dismiss();
         Fluttertoast.showToast(msg: error2.error['message']);
       });

lib/pages/bankList/widget/BankCard.dart

@@ -46,7 +46,7 @@ class BankCard extends StatelessWidget {
               Expanded(
                 flex: 1,
                 child: Text(
-                  item.ownerBank.toString()+'储蓄卡',
+                  item.ownerBank.toString() + '储蓄卡',
                   style: const TextStyle(
                     color: Colors.white,
                   ),

lib/pages/home/index.dart

@@ -189,7 +189,7 @@ class Home extends BasicPage {
   Widget builder(BuildContext context) {
     return Container(
       decoration: const BoxDecoration(color: Colors.white),
-      padding: EdgeInsets.only(top:15.w,left: 15.w,right: 15.w),
+      padding: EdgeInsets.only(top: 15.w, left: 15.w, right: 15.w),
       child: Column(
         children: [
           const headers(),

lib/pages/home/widgets/headers.dart

@@ -27,7 +27,7 @@ class headers extends StatelessWidget {
         ),
         const Icon(Icons.arrow_drop_down),
         Expanded(
-          flex: 1,
+            flex: 1,
             child: Container(
               margin: EdgeInsets.fromLTRB(15.w, 0, 0, 0),
               padding: EdgeInsets.symmetric(vertical: 0, horizontal: 15.w),
@@ -58,8 +58,7 @@ class headers extends StatelessWidget {
                   ],
                 ),
               ),
-            ))
-        ,
+            )),
       ],
     );
   }

lib/pages/machineryDetail/index.dart

@@ -23,8 +23,9 @@ class MachineryDetail extends BasicPage {
     super.beforeShow();
     if (Get.arguments != null) {
       EasyLoading.show(status: '数据加载中...');
-      getMachineryDetail(Get.arguments['id'],
-          {'attached': true, 'location': location}).then((res) {
+      getMachineryDetail(
+              Get.arguments['id'], {'attached': true, 'location': location})
+          .then((res) {
         machinery(Machinery.fromJson(res));
         EasyLoading.dismiss();
       }).catchError((error) {

lib/pages/machineryList/index.dart

@@ -48,8 +48,7 @@ class MachineryList extends BasicPage {
         useState: (state) {
           machineryList(GetList(state));
         },
-        builder: ({required BuildContext context,
-          required Function toggle}) {
+        builder: ({required BuildContext context, required Function toggle}) {
           Refresh = toggle;
           return Obx(
             () => Column(

lib/pages/machineryMap/index.dart

@@ -21,7 +21,6 @@ class MachineryMap extends BasicPage {
   final current = Rx<Machinery>(Machinery());
   final visible = Rx<bool>(true);
 
-
   dynamic locList = [
     '32.685927, 112.106514',
     '32.673406, 112.100406',

lib/pages/main/index.dart

@@ -3,6 +3,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:get_storage/get_storage.dart';
 import 'package:worker_client/models/app.dart';
+import 'package:worker_client/widgets/Copyright.dart';
 import 'package:worker_client/widgets/GradientButton.dart';
 import 'package:worker_client/widgets/MyCell/index.dart';
 import 'package:worker_client/widgets/layout/BasicPage.dart';
@@ -354,6 +355,7 @@ class Main extends BasicPage {
                             ),
                           ),
                         ),
+                        Copyright()
                       ],
                     ),
                   ),

lib/routes/index.dart

@@ -1,3 +1,2 @@
-
 export 'pages.dart';
 export 'middleWares.dart';

lib/routes/middleWares.dart

@@ -1,9 +1,8 @@
-
 import 'package:flutter/scheduler.dart';
 import 'package:get/get.dart';
 import 'package:get_storage/get_storage.dart';
 
-void routingCallback (routing) {
+void routingCallback(routing) {
   // GetStorage box = GetStorage();
   // bool isLogin = box.hasData('token');
   // bool isSplashScreen = routing?.current == '/splash';

lib/routes/pages.dart

@@ -2,14 +2,13 @@ import 'package:get/get.dart';
 import 'package:get_storage/get_storage.dart';
 import 'package:worker_client/pages/index.dart';
 
-
-
-
-List<GetPage> pages=[
-  GetPage(name: '/', page: (){
-    GetStorage box=GetStorage();
-    return box.hasData('token')?Home():Login();
-  }),
+List<GetPage> pages = [
+  GetPage(
+      name: '/',
+      page: () {
+        GetStorage box = GetStorage();
+        return box.hasData('token') ? Home() : Login();
+      }),
   GetPage(name: '/order', page: () => Order()),
   GetPage(name: '/login', page: () => const Login()),
   GetPage(name: '/home', page: () => Home()),
@@ -27,4 +26,4 @@ List<GetPage> pages=[
   GetPage(name: '/aboutUs', page: () => AboutUs()),
   GetPage(name: '/agreement', page: () => Agreement()),
   GetPage(name: '/feedback', page: () => Feedback()),
-];
+];

lib/services/banner.dart

@@ -9,9 +9,8 @@ import 'package:fluttertoast/fluttertoast.dart';
  */
 Future getBannerList(String position) async {
   return request('/banner',
-      options: Options(method: 'GET'), data: {'position': position})
+          options: Options(method: 'GET'), data: {'position': position})
       .catchError((error) => {
-    Fluttertoast.showToast(msg: error.error.toString()),
-  });
+            Fluttertoast.showToast(msg: error.error.toString()),
+          });
 }
-

lib/services/feedback.dart

@@ -10,8 +10,8 @@ import 'package:fluttertoast/fluttertoast.dart';
 
 Future feedback(String content) async {
   return request('/feedback',
-      options: Options(method: 'POST'), data: {'content': content})
+          options: Options(method: 'POST'), data: {'content': content})
       .catchError((error) => {
-    Fluttertoast.showToast(msg: error.error['message']),
-  });
-}
+            Fluttertoast.showToast(msg: error.error['message']),
+          });
+}

lib/services/job.dart

@@ -29,12 +29,13 @@ Future getJobDetail(String id) async {
  */
 Future startJob(String id, params) async {
   return request('/work-job/$id/pause',
-          options: Options(method: 'PUT'), queryParameters: params);
+      options: Options(method: 'PUT'), queryParameters: params);
 }
+
 /// 开始作业
 /// @param {*}
 /// @returns
 Future overJob(String id, data) async {
   return request('/work-job/$id/stop',
       options: Options(method: 'PUT'), data: data);
-}
+}

lib/services/order.dart

@@ -7,20 +7,17 @@ import 'package:fluttertoast/fluttertoast.dart';
 /// @returns
 Future getOrderList(params) async {
   return request('/order',
-      options: Options(method: 'GET'), queryParameters: params)
-      .catchError((error) => {
-    Fluttertoast.showToast(msg: error.error.toString()),
-    print(error)
-  });
+          options: Options(method: 'GET'), queryParameters: params)
+      .catchError((error) =>
+          {Fluttertoast.showToast(msg: error.error.toString()), print(error)});
 }
 
 /// 订单详情
 /// @param {*} data
 /// @returns
 Future getOrderDetail(String id) async {
-  return request('/order/$id',
-      options: Options(method: 'GET'))
+  return request('/order/$id', options: Options(method: 'GET'))
       .catchError((error) => {
-    Fluttertoast.showToast(msg: error.error['message']),
-  });
+            Fluttertoast.showToast(msg: error.error['message']),
+          });
 }

lib/theme.dart

@@ -1,4 +1,3 @@
-
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 
@@ -11,11 +10,10 @@ ThemeData getTheme() {
       elevation: 0,
       toolbarHeight: 44.w,
       titleTextStyle: TextStyle(
-        color: const Color(0xFF333333),
-        fontWeight: FontWeight.bold,
-        fontSize: 17.sp,
-        letterSpacing: 2
-      ),
+          color: const Color(0xFF333333),
+          fontWeight: FontWeight.bold,
+          fontSize: 17.sp,
+          letterSpacing: 2),
     ),
     backgroundColor: Colors.white,
   );

lib/utils/Request.dart

@@ -4,7 +4,6 @@ import 'package:dio/dio.dart';
 import 'package:get/get.dart';
 import 'package:get_storage/get_storage.dart';
 
-
 class Response {
   late int code;
   String? message;
@@ -38,7 +37,6 @@ Dio createRequest() {
 
   var dio = Dio(options);
   dio.interceptors.add(InterceptorsWrapper(onRequest: (options, handler) {
-
     // Do something before request is sent
     options.headers['Authorization'] = GetStorage().read("token");
     return handler.next(options); //continue

lib/utils/amap/const_config.dart

@@ -7,8 +7,7 @@ class ConstConfig {
   ///注意：使用[AMapWidget]的`apiKey`属性设置的key的优先级高于通过Native配置key的优先级，
   ///使用[AMapWidget]的`apiKey`属性配置后Native配置的key将失效，请根据实际情况选择使用
   static const AMapApiKey amapApiKeys = AMapApiKey(
-      androidKey: 'b481b4187e24e625fa0056fd0530e663',
-      iosKey: '您申请的iOS平台的key');
+      androidKey: 'b481b4187e24e625fa0056fd0530e663', iosKey: '您申请的iOS平台的key');
 
   ///高德隐私合规声明，这里只是示例，实际使用中请按照实际参数设置[AMapPrivacyStatement]的'hasContains''hasShow''hasAgree'这三个参数
   ///
@@ -18,5 +17,5 @@ class ConstConfig {
   ///
   /// 高德SDK合规使用方案请参考：https://lbs.amap.com/news/sdkhgsy
   static const AMapPrivacyStatement amapPrivacyStatement =
-  AMapPrivacyStatement(hasContains: true, hasShow: true, hasAgree: true);
+      AMapPrivacyStatement(hasContains: true, hasShow: true, hasAgree: true);
 }

lib/utils/location.dart

@@ -6,7 +6,7 @@ import 'package:permission_handler/permission_handler.dart';
 
 import 'amap/const_config.dart';
 
-typedef AMAPListener = void Function (Map<String, Object>);
+typedef AMAPListener = void Function(Map<String, Object>);
 
 void showPrivacy() {
   /// 设置是否已经包含高德隐私政策并弹窗展示显示用户查看，如果未包含或者没有弹窗展示，高德定位SDK将不会工作
@@ -44,7 +44,8 @@ Future _requirePermission() async {
 }
 
 Future requireLocation(AMAPListener listener) async {
-  AMapFlutterLocation.setApiKey(ConstConfig.amapApiKeys.androidKey!, ConstConfig.amapApiKeys.iosKey!);
+  AMapFlutterLocation.setApiKey(
+      ConstConfig.amapApiKeys.androidKey!, ConstConfig.amapApiKeys.iosKey!);
   showPrivacy();
   await _requirePermission();
   final AMapFlutterLocation location = AMapFlutterLocation();
@@ -100,7 +101,6 @@ _getAMapLocationOption() {
   return locationOption;
 }
 
-
 // import 'dart:io';
 //
 // import 'package:flutter_baidu_mapapi_base/flutter_baidu_mapapi_base.dart'
@@ -131,4 +131,4 @@ _getAMapLocationOption() {
 //   }
 //
 //   return location;
-// }
+// }

lib/utils/timer.dart

@@ -1,12 +1,11 @@
-
 import 'dart:async';
 
-Timer setInterval(void Function (Timer) f, int milliseconds) {
+Timer setInterval(void Function(Timer) f, int milliseconds) {
   var duration = Duration(milliseconds: milliseconds);
   return Timer.periodic(duration, f);
 }
 
-Timer setTimeout(void Function () f, int milliseconds) {
+Timer setTimeout(void Function() f, int milliseconds) {
   var duration = Duration(milliseconds: milliseconds);
   return Timer(duration, f);
 }

lib/widgets/Cell.dart

@@ -1,10 +1,9 @@
-
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 
 class Cell extends StatelessWidget {
-  const Cell ({
+  const Cell({
     Key? key,
     this.header,
     required this.child,
@@ -19,36 +18,35 @@ class Cell extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-
     return Container(
       margin: margin,
       padding: EdgeInsets.symmetric(vertical: 10.h, horizontal: 0.0),
       decoration: const BoxDecoration(
-        border: Border(
-          bottom: BorderSide(width: 1.0, color: Color(0x1F000000)),
-        )
-      ),
+          border: Border(
+        bottom: BorderSide(width: 1.0, color: Color(0x1F000000)),
+      )),
       child: Row(
         children: [
-          if (null != header) SizedBox(
-            width: 53.w,
-            child: Container(
-              decoration: const BoxDecoration(
-                border: Border(
-                  right: BorderSide(width: 1, color: Color(0xFF333333))
-                )
+          if (null != header)
+            SizedBox(
+              width: 53.w,
+              child: Container(
+                decoration: const BoxDecoration(
+                    border: Border(
+                        right: BorderSide(width: 1, color: Color(0xFF333333)))),
+                child: header,
               ),
-              child: header,
             ),
+          Expanded(
+            child: child,
           ),
-          Expanded(child: child,),
-          if (null != footer) ConstrainedBox (
-            constraints: const BoxConstraints(),
-            child: footer,
-          )
+          if (null != footer)
+            ConstrainedBox(
+              constraints: const BoxConstraints(),
+              child: footer,
+            )
         ],
       ),
     );
   }
-  
-}
+}

lib/widgets/Copyright.dart

@@ -0,0 +1,18 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+
+class Copyright extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      margin: const EdgeInsets.fromLTRB(0, 5, 0, 15),
+      child: Text(
+        '南京市云致科技服务有限公司 提供技术支持',
+        style: TextStyle(
+          fontSize: 15.sp,
+          color: const Color(0xff999999),
+        ),
+      ),
+    );
+  }
+}

lib/widgets/GradientButton.dart

@@ -1,5 +1,3 @@
-
-
 import 'package:flutter/material.dart';
 
 class GradientButton extends StatelessWidget {
@@ -46,7 +44,12 @@ class GradientButton extends StatelessWidget {
 
     return DecoratedBox(
       decoration: BoxDecoration(
-        gradient: disabled ? null : LinearGradient(begin: linearStart??Alignment.topCenter, end: linearEnd??Alignment.bottomCenter, colors: _colors),
+        gradient: disabled
+            ? null
+            : LinearGradient(
+                begin: linearStart ?? Alignment.topCenter,
+                end: linearEnd ?? Alignment.bottomCenter,
+                colors: _colors),
         color: disabled ? disabledColor ?? theme.disabledColor : null,
         borderRadius: radius,
       ),
@@ -84,4 +87,4 @@ class GradientButton extends StatelessWidget {
       ),
     );
   }
-}
+}

lib/widgets/Modal.dart

@@ -38,7 +38,7 @@ void _handleFunc(ModalFunc? func, bool lazy) {
 /// 打开一个 dialog
 void showDialog(
     {required String title,
-      lazy = false,
+    lazy = false,
     String? message,
     Widget? content,
     ModalFunc? onConfirm,
@@ -48,15 +48,15 @@ void showDialog(
     title: title,
     message: message,
     content: content,
-    onConfirm: () => _handleFunc(onConfirm,lazy),
-    onCancel: () => _handleFunc(onCancel,lazy),
+    onConfirm: () => _handleFunc(onConfirm, lazy),
+    onCancel: () => _handleFunc(onCancel, lazy),
   ));
 }
 
 /// 打开一个 alert
 void showAlert(
     {required String title,
-      bool lazy = false,
+    bool lazy = false,
     String? message,
     Widget? content,
     ModalFunc? onConfirm}) {
@@ -65,7 +65,7 @@ void showAlert(
     title: title,
     message: message,
     content: content,
-    onConfirm: () => _handleFunc(onConfirm,lazy),
+    onConfirm: () => _handleFunc(onConfirm, lazy),
   ));
 }
 

lib/widgets/MoneyCard/index.dart

@@ -5,14 +5,18 @@ class MoneyCard extends StatefulWidget {
   final bool type;
   final double amounts;
   final GestureTapCallback goWithDrawal;
-  const MoneyCard({Key? key, this.type = false, required this.amounts, required this.goWithDrawal}) : super(key: key);
+  const MoneyCard(
+      {Key? key,
+      this.type = false,
+      required this.amounts,
+      required this.goWithDrawal})
+      : super(key: key);
 
   @override
   State<MoneyCard> createState() => _MoneyCardState();
 }
 
 class _MoneyCardState extends State<MoneyCard> {
-
   @override
   Widget build(BuildContext context) {
     return Container(
@@ -49,7 +53,7 @@ class _MoneyCardState extends State<MoneyCard> {
             ),
           ),
           Opacity(
-            opacity: !widget.type?1:0,
+            opacity: !widget.type ? 1 : 0,
             child: GestureDetector(
               onTap: widget.goWithDrawal,
               child: Container(

lib/widgets/MyButton/entities/Gradient.dart

@@ -4,4 +4,4 @@ class GradientModel {
   final Color beginColor;
   final Color endColor;
   GradientModel(this.beginColor, this.endColor);
-}
+}

lib/widgets/MyButton/index.dart

@@ -19,10 +19,11 @@ class MyButton extends StatelessWidget {
       required this.text,
       required this.type,
       required this.disable,
-      required this.onClick, this.pwith})
+      required this.onClick,
+      this.pwith})
       : super(key: key);
 
-  List<GradientModel> Glist=[
+  List<GradientModel> Glist = [
     GradientModel(Color(0xFFA0E067), Color(0xFF00AE39)),
     GradientModel(Color(0xFFFFAB8C), Color(0xFFFF703B)),
   ];
@@ -30,19 +31,16 @@ class MyButton extends StatelessWidget {
   Widget build(BuildContext context) {
     return Container(
       margin: EdgeInsets.fromLTRB(0, 12.5.h, 0, 9.h),
-      width: 315.w+(pwith??0),
+      width: 315.w + (pwith ?? 0),
       height: 49.h,
       child: GradientButton(
-          colors: [Glist[type].beginColor,Glist[type].endColor],
+          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
-            ),
+                fontSize: 17.sp, fontWeight: FontWeight.bold, letterSpacing: 2),
           )),
     );
   }

lib/widgets/MyCard/entities/ItemColor.dart

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

lib/widgets/MyCard/index.dart

@@ -46,7 +46,7 @@ class MyCard extends StatelessWidget {
       ),
       child: Stack(
         children: [
-          Jianbian(status: job?item.status:item.workStatus),
+          Jianbian(status: job ? item.status : item.workStatus),
           Container(
             padding: EdgeInsets.all(20.w),
             child: Column(
@@ -146,10 +146,14 @@ class MyCard extends StatelessWidget {
                 Visibility(
                     child: CardCell(
                         lable: '作业时间',
-                        content:  item is Job ? item.startDate.toString() : '' +
-                            (item is Job ? (item?.endDate != null
-                            ? '\n' + item.endDate.toString()
-                            : '') : ''),
+                        content: item is Job
+                            ? item.startDate.toString()
+                            : '' +
+                                (item is Job
+                                    ? (item?.endDate != null
+                                        ? '\n' + item.endDate.toString()
+                                        : '')
+                                    : ''),
                         size: 2),
                     visible: job),
                 CardCell(

lib/widgets/MyCard/widgets/CardCell.dart

@@ -8,9 +8,9 @@ class CardCell extends StatelessWidget {
 
   const CardCell(
       {Key? key,
-        required this.lable,
-        required this.content,
-        required this.size})
+      required this.lable,
+      required this.content,
+      required this.size})
       : super(key: key);
 
   @override
@@ -31,7 +31,7 @@ class CardCell extends StatelessWidget {
             ),
           ),
           Text(
-            lable==''?'    ':'：',
+            lable == '' ? '    ' : '：',
             style: TextStyle(
               fontSize: 17.sp,
               color: const Color(0xFF606060),
@@ -47,12 +47,11 @@ class CardCell extends StatelessWidget {
                   fontSize: 17.sp,
                   color: Color(0xFF101010),
                   fontWeight: FontWeight.bold,
-                  height: 1.5
-              ),
+                  height: 1.5),
             ),
           ),
         ],
       ),
     );
   }
-}
+}

lib/widgets/MyCell/index.dart

@@ -21,9 +21,7 @@ class MyCell extends StatelessWidget {
       child: Container(
         margin: EdgeInsets.fromLTRB(0, 0, 0, 1.h),
         padding: EdgeInsets.symmetric(horizontal: 17.5.w, vertical: 19.h),
-        decoration: BoxDecoration(
-            color: Colors.white,
-            boxShadow: [
+        decoration: BoxDecoration(color: Colors.white, boxShadow: [
           BoxShadow(
               color: const Color(0x1f000000),
               offset: Offset(0, 1.w),

lib/widgets/MyDialog.dart

@@ -36,38 +36,37 @@ void _handleFunc(ModalFunc? func, bool lazy) {
 }
 
 /// 打开一个 dialog
-void showDialog(
-    {String? title,
-      lazy = false,
-    String? message,
-    Widget? content,
-    ModalFunc? onConfirm,
-    }) {
+void showDialog({
+  String? title,
+  lazy = false,
+  String? message,
+  Widget? content,
+  ModalFunc? onConfirm,
+}) {
   Get.dialog(Modal(
     type: 'dialog',
     title: title,
     message: message,
     content: content,
-    onConfirm: () => _handleFunc(onConfirm,lazy),
+    onConfirm: () => _handleFunc(onConfirm, lazy),
   ));
 }
 
 /// 打开一个 alert
 void showAlert(
     {required String title,
-      lazy = false,
+    lazy = false,
     String? message,
     Widget? content,
     ModalFunc? onConfirm,
-      ModalFunc? onCancel
-    }) {
+    ModalFunc? onCancel}) {
   Get.dialog(Modal(
     type: 'alert',
     title: title,
     message: message,
     content: content,
-    onConfirm: () => _handleFunc(onConfirm,lazy),
-    onCancel: () => _handleFunc(onCancel,lazy),
+    onConfirm: () => _handleFunc(onConfirm, lazy),
+    onCancel: () => _handleFunc(onCancel, lazy),
   ));
 }
 
@@ -139,7 +138,7 @@ class Modal extends StatelessWidget {
     return ElevatedButton(
       child: Text("取消",
           style: TextStyle(
-              color: _primaryColor, fontSize: 17.sp,letterSpacing: 2)),
+              color: _primaryColor, fontSize: 17.sp, letterSpacing: 2)),
       style: ElevatedButton.styleFrom(
         primary: Colors.white,
         elevation: 0,
@@ -164,11 +163,7 @@ class Modal extends StatelessWidget {
           SizedBox(height: 16.w),
           Row(
             mainAxisAlignment: MainAxisAlignment.center,
-            children: [
-              _confirmBtn(),
-              hSpacer,
-              _cancelBtn()
-            ],
+            children: [_confirmBtn(), hSpacer, _cancelBtn()],
           )
         ]);
   }

lib/widgets/MyTitle/index.dart

@@ -1,8 +1,7 @@
-
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 
-class MyTitle extends StatelessWidget{
+class MyTitle extends StatelessWidget {
   final String title;
 
   const MyTitle({Key? key, required this.title}) : super(key: key);
@@ -29,4 +28,4 @@ class MyTitle extends StatelessWidget{
       ),
     );
   }
-}
+}

lib/widgets/NullCard.dart

@@ -21,13 +21,10 @@ class NullCard extends StatelessWidget {
           ),
           Text(
             text,
-            style: TextStyle(
-                fontSize: 17.sp, color: Color(0xFFb4b4b4)),
+            style: TextStyle(fontSize: 17.sp, color: Color(0xFFb4b4b4)),
           )
         ],
       ),
     );
   }
-
-
-}
+}

lib/widgets/layout/BasicPage.dart

@@ -1,4 +1,3 @@
-
 import '/widgets/layout/bottomBar/BottomBar.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
@@ -6,7 +5,6 @@ import 'package:get/get.dart';
 import 'barList.dart';
 
 abstract class BasicPage extends StatefulWidget {
-
   // 导航标题
   // 用法 naviTitle = xxxx
   final _title = Rx<String>("");
@@ -24,7 +22,8 @@ abstract class BasicPage extends StatefulWidget {
   bool? isPop;
 
   //
-  BasicPage({Key? key, this.canScroll = true,this.isPop, this.tabIndex }) : super(key: key);
+  BasicPage({Key? key, this.canScroll = true, this.isPop, this.tabIndex})
+      : super(key: key);
 
   @protected
   Widget builder(BuildContext context);
@@ -62,7 +61,6 @@ abstract class BasicPage extends StatefulWidget {
 }
 
 class _BasicPageState extends State<BasicPage> {
-
   @override
   void initState() {
     super.initState();
@@ -103,15 +101,15 @@ class _BasicPageState extends State<BasicPage> {
 
   @override
   Widget build(BuildContext context) {
-
     return Scaffold(
-      resizeToAvoidBottomInset: widget.isPop==null? false:true,
+      resizeToAvoidBottomInset: widget.isPop == null ? false : true,
       appBar: _getAppBar(),
       body: SafeArea(
         child: widget.builder(context),
       ),
-      bottomNavigationBar: widget.tabIndex == null ? null : BottomBar(list: BarList, current: widget.tabIndex!),
+      bottomNavigationBar: widget.tabIndex == null
+          ? null
+          : BottomBar(list: BarList, current: widget.tabIndex!),
     );
   }
 }
-

lib/widgets/layout/barList.dart

@@ -7,19 +7,37 @@ final BarList = <BarItem>[
   BarItem(
     label: '首页',
     page: '/',
-    normal: Item (color: const Color(0xFF323232), fontSize: 15.sp, image: 'images/index/index.png'),
-    selected: Item (color: const Color(0xFF06B03B), fontSize: 15.sp, image: 'images/index/indexActive.png'),
+    normal: Item(
+        color: const Color(0xFF323232),
+        fontSize: 15.sp,
+        image: 'images/index/index.png'),
+    selected: Item(
+        color: const Color(0xFF06B03B),
+        fontSize: 15.sp,
+        image: 'images/index/indexActive.png'),
   ),
   BarItem(
     label: '订单列表',
     page: '/order',
-    normal: Item (color: const Color(0xFF323232), fontSize: 15.sp, image: 'images/index/job.png'),
-    selected: Item (color: const Color(0xFF06B03B), fontSize: 15.sp, image: 'images/index/jobActive.png'),
+    normal: Item(
+        color: const Color(0xFF323232),
+        fontSize: 15.sp,
+        image: 'images/index/job.png'),
+    selected: Item(
+        color: const Color(0xFF06B03B),
+        fontSize: 15.sp,
+        image: 'images/index/jobActive.png'),
   ),
   BarItem(
     label: '个人中心',
     page: '/main',
-    normal: Item (color: const Color(0xFF323232), fontSize: 15.sp, image: 'images/index/user.png'),
-    selected: Item (color: const Color(0xFF06B03B), fontSize: 15.sp, image: 'images/index/userActive.png'),
+    normal: Item(
+        color: const Color(0xFF323232),
+        fontSize: 15.sp,
+        image: 'images/index/user.png'),
+    selected: Item(
+        color: const Color(0xFF06B03B),
+        fontSize: 15.sp,
+        image: 'images/index/userActive.png'),
   ),
 ];

lib/widgets/layout/bottomBar/BottomBar.dart

@@ -1,15 +1,14 @@
-
 import 'package:flutter/widgets.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'item.dart';
 
 class BottomBarItem extends StatelessWidget {
-
   final bool selected;
   final BarItem data;
 
-  BottomBarItem({Key? key, required this.selected, required this.data }) : super(key: key);
+  BottomBarItem({Key? key, required this.selected, required this.data})
+      : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -17,7 +16,8 @@ class BottomBarItem extends StatelessWidget {
     final color = selected ? data.selected.color : data.normal.color;
     final fontSize = selected ? data.selected.fontSize : data.normal.fontSize;
 
-    final textStyle = TextStyle(color: color, fontSize: fontSize, fontWeight: FontWeight.bold);
+    final textStyle = TextStyle(
+        color: color, fontSize: fontSize, fontWeight: FontWeight.bold);
 
     return GestureDetector(
       onTap: () {
@@ -44,11 +44,11 @@ class BottomBarItem extends StatelessWidget {
 }
 
 class BottomBar extends StatelessWidget {
-
   final int current;
   List<BarItem> list;
 
-  BottomBar({ Key? key , required this.list, required this.current }) : super(key: key);
+  BottomBar({Key? key, required this.list, required this.current})
+      : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -73,8 +73,8 @@ class BottomBar extends StatelessWidget {
               int index = list.indexOf(item);
 
               return Expanded(
-                  flex: 1,
-                  child: BottomBarItem(data: item, selected: current == index ),
+                flex: 1,
+                child: BottomBarItem(data: item, selected: current == index),
               );
             })
           ],
@@ -82,5 +82,4 @@ class BottomBar extends StatelessWidget {
       ),
     );
   }
-
 }

lib/widgets/layout/bottomBar/item.dart

@@ -1,4 +1,3 @@
-
 import 'dart:ui';
 
 class Item {
@@ -6,7 +5,7 @@ class Item {
   Color color;
   String image;
 
-  Item({ required this.fontSize, required this.color, required this.image });
+  Item({required this.fontSize, required this.color, required this.image});
 }
 
 class BarItem {
@@ -15,5 +14,9 @@ class BarItem {
   Item normal;
   Item selected;
 
-  BarItem ({ required this.label, required this.page, required this.normal, required this.selected });
+  BarItem(
+      {required this.label,
+      required this.page,
+      required this.normal,
+      required this.selected});
 }