'.'

lib/pages/index.dart

@@ -4,4 +4,5 @@ export 'Login/index.dart';
 export 'order/index.dart';
 export 'main/index.dart';
 export 'jobDetail/index.dart';
-export 'orderDetail/index.dart';
+export 'orderDetail/index.dart';
+export 'machineryList/index.dart';

lib/pages/jobDetail/index.dart

@@ -105,16 +105,13 @@ class JobDetail extends BasicPage {
   void changeJob(Job item) {
     if (item.status == 0) {
       modal.showDialog(
-          title: '',
           content: startContent(),
           onConfirm: () {
             startJob(item.jobId.toString(), {'mode': true})
                 .then((value) => getJob());
-          },
-          onCancel: () => true);
+          });
     } else {
       modal.showDialog(
-          title: '',
           content: endContent(),
           onConfirm: () {
             if (area.value == '') {
@@ -129,8 +126,7 @@ class JobDetail extends BasicPage {
                 Fluttertoast.showToast(msg: '恭喜完成作业');
               });
             }
-          },
-          onCancel: () => true);
+          },);
     }
   }
 

lib/pages/machineryList/index.dart

@@ -0,0 +1,11 @@
+import 'package:flutter/material.dart';
+import 'package:worker_client/widgets/layout/BasicPage.dart';
+
+class MachineryList extends BasicPage{
+  @override
+  Widget builder(BuildContext context) {
+    naviTitle = '我的';
+    return const Text('农机列表');
+  }
+
+}

lib/pages/main/index.dart

@@ -1,6 +1,11 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:get/get.dart';
+import 'package:get_storage/get_storage.dart';
+import 'package:worker_client/widgets/GradientButton.dart';
+import 'package:worker_client/widgets/MyCell/index.dart';
 import 'package:worker_client/widgets/layout/BasicPage.dart';
-
+import '/widgets/MyDialog.dart' as modal;
 
 class Main extends BasicPage {
   Main({Key? key}) : super(key: key) {
@@ -8,14 +13,289 @@ class Main extends BasicPage {
     naviTitle = '我的';
   }
 
+  GetStorage box = GetStorage();
+
+  void loginOut() {
+    modal.showAlert(
+        title: '提示',
+        message: '确定要退出登陆吗？',
+        onConfirm: () {
+          box.remove('token');
+          Get.offNamed('/login');
+          return true;
+        },
+        onCancel: () => true);
+  }
+  void goMachinery(){
+    Get.toNamed('/machineryList');
+  }
+
   @override
   Widget builder(BuildContext context) {
-    return Column(
-      children: [
-        Container(
-
-        )
-      ],
+    return Container(
+      decoration: const BoxDecoration(color: Colors.white),
+      child: ListView(
+        children: [
+          Stack(
+            children: [
+              Positioned(
+                top: 0,
+                child: Container(
+                  width: 375.w,
+                  height: 187.5.w,
+                  decoration: const BoxDecoration(
+                    image: DecorationImage(
+                      image: AssetImage("images/main/userBgi.png"),
+                      fit: BoxFit.cover,
+                    ),
+                  ),
+                  child: Row(
+                    crossAxisAlignment: CrossAxisAlignment.center,
+                    children: [
+                      Container(
+                        margin: EdgeInsets.fromLTRB(40.w, 0, 10.w, 0),
+                        child: Image.asset(
+                          'images/main/defaultAvatar.png',
+                          width: 63.w,
+                          height: 63.w,
+                        ),
+                      ),
+                      Column(
+                        mainAxisAlignment: MainAxisAlignment.center,
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          Text(
+                            '姓名',
+                            style: TextStyle(
+                                color: Colors.white,
+                                fontWeight: FontWeight.w500,
+                                fontSize: 17.sp,
+                                letterSpacing: 2,
+                                shadows: [
+                                  BoxShadow(
+                                      color: const Color(0x66000000),
+                                      offset: Offset(0, 1.w),
+                                      blurRadius: 0)
+                                ]),
+                          ),
+                          Container(
+                            margin: EdgeInsets.fromLTRB(0, 19.h, 0, 0),
+                            child: Text(
+                              '手机号',
+                              style: TextStyle(
+                                  color: Colors.white,
+                                  fontWeight: FontWeight.w500,
+                                  fontSize: 17.sp,
+                                  letterSpacing: 2,
+                                  shadows: [
+                                    BoxShadow(
+                                        color: const Color(0x66000000),
+                                        offset: Offset(0, 1.w),
+                                        blurRadius: 0)
+                                  ]),
+                            ),
+                          )
+                        ],
+                      )
+                    ],
+                  ),
+                ),
+              ),
+              Positioned(
+                right: 0,
+                top: 0,
+                child: Container(
+                  decoration: const BoxDecoration(color: Color(0xb2000000)),
+                  child: Text(
+                    '该账号归。。。所属',
+                    style: TextStyle(color: Colors.white, fontSize: 12.sp),
+                  ),
+                ),
+              ),
+              Column(
+                children: [
+                  Container(
+                    margin: EdgeInsets.fromLTRB(15.w, 187.5.w - 15.h, 15.w, 0),
+                    height: 101.h,
+                    decoration: BoxDecoration(
+                        color: Colors.white,
+                        borderRadius: BorderRadius.all(Radius.circular(20.w)),
+                        boxShadow: [
+                          BoxShadow(
+                            color: const Color(0x14000000),
+                            offset: const Offset(0, 0),
+                            blurRadius: 22.w,
+                          ),
+                        ]),
+                    child: Row(
+                      mainAxisAlignment: MainAxisAlignment.spaceAround,
+                      children: [
+                        GestureDetector(
+                          onTap:(){
+                            goMachinery();
+                          },
+                          child: Column(
+                            mainAxisAlignment: MainAxisAlignment.center,
+                            children: [
+                              Image.asset(
+                                'images/main/machinery.png',
+                                width: 30.w,
+                              ),
+                              Text(
+                                '我的农机',
+                                style: TextStyle(
+                                    fontSize: 17.sp,
+                                    fontWeight: FontWeight.bold,
+                                    color: Color(0xFF333333)),
+                              )
+                            ],
+                          ),
+                        ),
+                        Column(
+                          mainAxisAlignment: MainAxisAlignment.center,
+                          children: [
+                            Image.asset(
+                              'images/main/wallet.png',
+                              width: 30.w,
+                            ),
+                            Text(
+                              '我的钱包',
+                              style: TextStyle(
+                                  fontSize: 17.sp,
+                                  fontWeight: FontWeight.bold,
+                                  color: Color(0xFF333333)),
+                            )
+                          ],
+                        ),
+                        Column(
+                          mainAxisAlignment: MainAxisAlignment.center,
+                          children: [
+                            Image.asset(
+                              'images/main/bankCard.png',
+                              width: 30.w,
+                            ),
+                            Text(
+                              '我的银行卡',
+                              style: TextStyle(
+                                  fontSize: 17.sp,
+                                  fontWeight: FontWeight.bold,
+                                  color: Color(0xFF333333)),
+                            )
+                          ],
+                        ),
+                      ],
+                    ),
+                  ),
+                  Container(
+                    margin: EdgeInsets.fromLTRB(0, 15.h, 0, 0),
+                    padding:
+                        EdgeInsets.symmetric(horizontal: 15.w, vertical: 0),
+                    child: Column(
+                      children: [
+                        MyCell(
+                          head: Image.asset(
+                            'images/main/account.png',
+                            width: 19.w,
+                          ),
+                          body: Text(
+                            '账号与安全',
+                            style: TextStyle(
+                              fontSize: 17.sp,
+                              color: Color(0xff333333),
+                              fontWeight: FontWeight.bold,
+                            ),
+                          ),
+                          action: Image.asset(
+                            'images/main/goto.png',
+                            width: 10.w,
+                          ),
+                          onClick: () {},
+                        ),
+                        MyCell(
+                          head: Image.asset(
+                            'images/main/aboutUs.png',
+                            width: 19.w,
+                          ),
+                          body: Text(
+                            '关于我们',
+                            style: TextStyle(
+                                fontSize: 17.sp,
+                                fontWeight: FontWeight.bold,
+                                color: Color(0xff333333)),
+                          ),
+                          action: Image.asset(
+                            'images/main/goto.png',
+                            width: 10.w,
+                          ),
+                          onClick: () {},
+                        ),
+                        MyCell(
+                          head: Image.asset(
+                            'images/main/update.png',
+                            width: 19.w,
+                          ),
+                          body: Text(
+                            '用户协议及隐私政策',
+                            style: TextStyle(
+                                fontSize: 17.sp,
+                                fontWeight: FontWeight.bold,
+                                color: Color(0xff333333)),
+                          ),
+                          action: Image.asset(
+                            'images/main/goto.png',
+                            width: 10.w,
+                          ),
+                          onClick: () {},
+                        ),
+                        MyCell(
+                          head: Image.asset(
+                            'images/main/Feedback.png',
+                            width: 19.w,
+                          ),
+                          body: Text(
+                            '意见反馈',
+                            style: TextStyle(
+                                fontSize: 17.sp,
+                                fontWeight: FontWeight.bold,
+                                color: Color(0xff333333)),
+                          ),
+                          action: Image.asset(
+                            'images/main/goto.png',
+                            width: 10.w,
+                          ),
+                          onClick: () {},
+                        ),
+                        Container(
+                            height: 45.5.h,
+                            width: 345.w,
+                            margin: EdgeInsets.only(top: 30.h, bottom: 30.h),
+                            child: GradientButton(
+                                colors: const [
+                                  Color(0xFFF8F8F8),
+                                  Color(0xFFF8F8F8)
+                                ],
+                                borderRadius:
+                                    BorderRadius.all(Radius.circular(24.5.w)),
+                                onPressed: () {
+                                  loginOut();
+                                },
+                                child: Text(
+                                  "退出登陆",
+                                  style: TextStyle(
+                                    fontSize: 20.sp,
+                                    fontWeight: FontWeight.bold,
+                                    color: const Color(0xFF333333),
+                                  ),
+                                )))
+                      ],
+                    ),
+                  ),
+                ],
+              )
+            ],
+          )
+        ],
+      ),
     );
   }
 }

lib/routes/pages.dart

@@ -8,9 +8,10 @@ List<GetPage> pages=[
     return box.hasData('token')?Home():Login();
   }),
   GetPage(name: '/order', page: () => Order()),
-  GetPage(name: '/login', page: () => Login()),
+  GetPage(name: '/login', page: () => const Login()),
   GetPage(name: '/home', page: () => Home()),
   GetPage(name: '/main', page: () => Main()),
   GetPage(name: '/jobDetail', page: () => JobDetail()),
   GetPage(name: '/orderDetail', page: () => OrderDetail()),
+  GetPage(name: '/machineryList', page: () => MachineryList()),
 ];

lib/utils/Request.dart

@@ -29,7 +29,8 @@ final client = GetPlatform.isAndroid ? 'android' : 'ios';
 
 Dio createRequest() {
   var options = BaseOptions(
-    baseUrl: 'https://machine.njyunzhi.com/api/' + client + '/worker',
+    baseUrl: 'http://192.168.89.147:7080/api/' + client + '/worker',
+    // baseUrl: 'https://machine.njyunzhi.com/api/' + client + '/worker',
     connectTimeout: 5000,
     receiveTimeout: 3000,
   );

lib/widgets/MyCell/index.dart

@@ -0,0 +1,45 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+
+class MyCell extends StatelessWidget {
+  final Widget head;
+  final Widget body;
+  final Widget? action;
+  final GestureTapCallback? onClick;
+
+  const MyCell(
+      {Key? key,
+      required this.head,
+      required this.body,
+      this.action,
+      this.onClick})
+      : super(key: key);
+  @override
+  Widget build(BuildContext context) {
+    return GestureDetector(
+      onTap: onClick,
+      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: [
+          BoxShadow(
+              color: const Color(0x1f000000),
+              offset: Offset(0, 1.w),
+              blurRadius: 0)
+        ]),
+        child: Row(
+          children: [
+            Container(
+              margin: EdgeInsets.fromLTRB(0, 0, 11.5.w, 0),
+              child: head,
+            ),
+            Expanded(flex: 1, child: body),
+            action ?? const Text(''),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/widgets/MyDialog.dart

@@ -29,18 +29,17 @@ void _handleFunc(ModalFunc? func) {
 
 /// 打开一个 dialog
 void showDialog(
-    {required String title,
+    {String? title,
     String? message,
     Widget? content,
     ModalFunc? onConfirm,
-    ModalFunc? onCancel}) {
+    }) {
   Get.dialog(Modal(
     type: 'dialog',
     title: title,
     message: message,
     content: content,
     onConfirm: () => _handleFunc(onConfirm),
-    onCancel: () => _handleFunc(onCancel),
   ));
 }
 
@@ -49,13 +48,16 @@ void showAlert(
     {required String title,
     String? message,
     Widget? content,
-    ModalFunc? onConfirm}) {
+    ModalFunc? onConfirm,
+      ModalFunc? onCancel
+    }) {
   Get.dialog(Modal(
     type: 'alert',
     title: title,
     message: message,
     content: content,
     onConfirm: () => _handleFunc(onConfirm),
+    onCancel: () => _handleFunc(onCancel),
   ));
 }
 
@@ -65,7 +67,7 @@ void _closeModal() {
 }
 
 class Modal extends StatelessWidget {
-  String title;
+  String? title;
   String type;
   String? message;
   Widget? content;
@@ -78,11 +80,11 @@ class Modal extends StatelessWidget {
       fontWeight: FontWeight.bold);
   final _messageStyle =
       TextStyle(color: const Color(0xFF666666), fontSize: 18.sp);
-  final _primaryColor = const Color(0xFFFF703B);
-  final _btnSize = Size(90.w, 36.w);
+  final _primaryColor = const Color(0xFF5BD583);
+  final _btnSize = Size(100.w, 49.h);
   final _btnShape = RoundedRectangleBorder(
-    side: const BorderSide(color: Color(0xFFFF703B), width: 2.0),
-    borderRadius: BorderRadius.all(Radius.circular(24.5.w)),
+    side: const BorderSide(color: Color(0xFF00AE39), width: 1),
+    borderRadius: BorderRadius.all(Radius.circular(17.w)),
   );
 
   void _handleConfirm() {
@@ -100,7 +102,7 @@ class Modal extends StatelessWidget {
   Modal({
     Key? key,
     this.type = 'alert',
-    required this.title,
+    this.title,
     this.message,
     this.content,
     this.onConfirm,
@@ -108,8 +110,7 @@ class Modal extends StatelessWidget {
   }) : super(key: key);
 
   Widget _confirmBtn() {
-    return Container(
-      margin: EdgeInsets.fromLTRB(0, 25.w, 0, 0),
+    return SizedBox(
       width: 100.w,
       height: 49.h,
       child: GradientButton(
@@ -128,7 +129,7 @@ class Modal extends StatelessWidget {
     return ElevatedButton(
       child: Text("取消",
           style: TextStyle(
-              color: _primaryColor, fontSize: 18.sp, letterSpacing: 5.sp)),
+              color: _primaryColor, fontSize: 17.sp,letterSpacing: 2)),
       style: ElevatedButton.styleFrom(
         primary: Colors.white,
         elevation: 0,
@@ -140,18 +141,25 @@ class Modal extends StatelessWidget {
   }
 
   Widget _alert() {
+    Widget hSpacer = SizedBox(width: 16.w);
     return SimpleDialog(
         shape:
             RoundedRectangleBorder(borderRadius: BorderRadius.circular(24.w)),
         titleTextStyle: _titleStyle,
-        title: Text(title, textAlign: TextAlign.center),
+        title: Text(title!, textAlign: TextAlign.center),
         children: [
           if (null != message)
             Text(message!, textAlign: TextAlign.center, style: _messageStyle),
           if (null != content) content!,
-          Center(
-            child: _confirmBtn(),
-          ),
+          SizedBox(height: 16.w),
+          Row(
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              _confirmBtn(),
+              hSpacer,
+              _cancelBtn()
+            ],
+          )
         ]);
   }
 
@@ -160,9 +168,9 @@ class Modal extends StatelessWidget {
         shape:
             RoundedRectangleBorder(borderRadius: BorderRadius.circular(24.w)),
         titleTextStyle: _titleStyle,
-        title: Text(title, textAlign: TextAlign.center),
         alignment: Alignment.center,
         children: [
+          SizedBox(height: 50.h),
           if (null != message)
             Text(message!, textAlign: TextAlign.center, style: _messageStyle),
           if (null != content) content!,
@@ -172,6 +180,7 @@ class Modal extends StatelessWidget {
               _confirmBtn(),
             ],
           ),
+          SizedBox(height: 50.h)
         ]);
   }
 

pubspec.yaml

@@ -70,9 +70,10 @@ flutter:
   # the material Icons class.
   uses-material-design: true
   assets:
+    - images/
     - images/login/
     - images/index/
-    - images/
+    - images/main/
   # To add assets to your application, add an assets section, like this:
   # assets:
   #   - images/a_dot_burr.jpeg