'.'

lib/main.dart

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get_storage/get_storage.dart';
+import 'package:worker_client/theme.dart';
 import 'models/index.dart';
-import '../models/Store.dart';
 import 'package:get/get.dart';
 import 'routes/index.dart';
 
@@ -16,7 +16,6 @@ class MyApp extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    Store().init();
 
     return ScreenUtilInit(
       designSize: const Size(375, 812),
@@ -24,7 +23,8 @@ class MyApp extends StatelessWidget {
       splitScreenMode: true,
       builder: (_) {
         return GetMaterialApp(
-          initialRoute: '/splash',
+          initialRoute: '/',
+          theme: getTheme(),
           defaultTransition: Transition.native,
           routingCallback: routingCallback,
           initialBinding: AppBindings(),

lib/pages/Login/index.dart

@@ -115,8 +115,8 @@ class _Login extends State<Login> {
           child: Column(
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
-              Padding(
-                padding: EdgeInsets.fromLTRB(0, 20.h, 0, 11.5.h),
+              SizedBox(
+                height: 44.w,
                 child: Center(
                   child: Text(
                     '登录',

lib/pages/home/index.dart

@@ -1,127 +1,16 @@
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:worker_client/widgets/layout/BasicPage.dart';
+import './widgets/home/index.dart';
 
-class Home extends StatefulWidget {
-  const Home({Key? key}) : super(key: key);
 
-  @override
-  _Home createState() => _Home();
-}
-
-class _Home extends State<Home> {
-  //下标   当前tab
-  int _tabIndex = 0;
-
-  final List _titles = ['首页', '订单列表', '个人中心'];
-  final tabTextStyleSelected = TextStyle(
-      color: const Color(0xFF06B03B),
-      fontSize: 15.sp,
-      fontWeight: FontWeight.bold); //选线卡选中字体颜色
-  final tabTextStyleNormal = TextStyle(
-      color: const Color(0xFF323232),
-      fontSize: 15.sp,
-      fontWeight: FontWeight.bold); //选项卡未选中字体颜色
-
-  TextStyle getTabTextStyle(int curIndex) {
-    //设置tabbar 选中和未选中的状态文本
-    if (curIndex == _tabIndex) {
-      return tabTextStyleSelected;
-    }
-    return tabTextStyleNormal;
-  }
-
-  // 切换底部选项卡，标题的变化设置
-  Text getTabTitle(int curIndex) {
-    return Text(_titles[curIndex], style: getTabTextStyle(curIndex));
-  }
-
-  List images = [
-    ['images/index/index.png', 'images/index/indexActive.png'],
-    ['images/index/job.png', 'images/index/jobActive.png'],
-    ['images/index/user.png', 'images/index/userActive.png'],
-  ];
-  Image getTabIcon(int curIndex) {
-    //设置tabbar选中和未选中的状态图标
-    if (curIndex == _tabIndex) {
-      return Image.asset(
-        images[curIndex][1],
-        width: 26.w,
-        height: 26.w,
-      );
-    }
-    return Image.asset(
-      images[curIndex][0],
-      width: 26.w,
-      height: 26.w,
-    );
-  }
-
-  Image getTabImage(path) {
-    return Image.asset(path, width: 26.w, height: 26.w);
-  }
-
-  //内容
-  var _body = [Text('我是首页'), Text('我是订单列表'), Text('我是个人中心')];
-
-  Widget tabBar(index) {
-    return GestureDetector(
-      behavior: HitTestBehavior.opaque,
-      onTap: () {
-        setState(() {
-          _tabIndex = index;
-        });
-      },
-      child: Container(
-        width: 125.w,
-        height: 65.h,
-        child: Column(
-          children: [
-            getTabIcon(index),
-            Padding(
-              padding: EdgeInsets.fromLTRB(0, 6.h, 0, 0),
-              child: getTabTitle(index),
-            )
-          ],
-        ),
-      ),
-    );
+class Home extends BasicPage {
+  Home({Key? key}) : super(key: key) {
+    tabIndex = 0;
+    naviTitle = '首页';
   }
 
   @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(
-        elevation: 0,
-        centerTitle: true,
-        backgroundColor: Colors.white,
-        title: Text(
-          _titles[_tabIndex],
-          style: TextStyle(
-              color: Colors.black,
-              fontSize: 17.sp,
-              letterSpacing: 2,
-              fontWeight: FontWeight.bold),
-        ),
-      ),
-      body: _body[_tabIndex],
-      bottomNavigationBar: Container(
-        padding: EdgeInsets.fromLTRB(0, 7.h, 0, 7.h),
-        decoration: BoxDecoration(
-          color: const Color(0xFFFFFFFF),
-          boxShadow: [
-            BoxShadow(
-              color: const Color(0x14000000),
-              offset: Offset(0, -2.w),
-              blurRadius: 3.w,
-            ),
-          ],
-        ),
-        child: Row(
-          children:_titles.asMap().keys.map((index) =>tabBar(index)).toList(),
-        ),
-      ),
-    );
+  Widget builder(BuildContext context) {
+    return const HomePage();
   }
 }

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

@@ -0,0 +1,117 @@
+import 'package:carousel_slider/carousel_slider.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:get/get.dart';
+import 'package:worker_client/pages/home/widgets/home/widgets/headers.dart';
+
+class HomePage extends StatefulWidget {
+  const HomePage({Key? key}) : super(key: key);
+
+  @override
+  State<HomePage> createState() => _HomePageState();
+}
+
+class _HomePageState extends State<HomePage> {
+  final List<String> imgList = [
+    'https://images.unsplash.com/photo-1520342868574-5fa3804e551c?ixlib=rb-0.3.5&ixid=eyJhcHBfaWQiOjEyMDd9&s=6ff92caffcdd63681a35134a6770ed3b&auto=format&fit=crop&w=1951&q=80',
+    'https://images.unsplash.com/photo-1522205408450-add114ad53fe?ixlib=rb-0.3.5&ixid=eyJhcHBfaWQiOjEyMDd9&s=368f45b0888aeb0b7b08e3a1084d3ede&auto=format&fit=crop&w=1950&q=80',
+    'https://images.unsplash.com/photo-1519125323398-675f0ddb6308?ixlib=rb-0.3.5&ixid=eyJhcHBfaWQiOjEyMDd9&s=94a1e718d89ca60a6337a6008341ca50&auto=format&fit=crop&w=1950&q=80',
+    'https://images.unsplash.com/photo-1523205771623-e0faa4d2813d?ixlib=rb-0.3.5&ixid=eyJhcHBfaWQiOjEyMDd9&s=89719a0d55dd05e2deae4120227e6efc&auto=format&fit=crop&w=1953&q=80',
+    'https://images.unsplash.com/photo-1508704019882-f9cf40e475b4?ixlib=rb-0.3.5&ixid=eyJhcHBfaWQiOjEyMDd9&s=8c6e5e3aba713b17aa1fe71ab4f0ae5b&auto=format&fit=crop&w=1352&q=80',
+    'https://images.unsplash.com/photo-1519985176271-adb1088fa94c?ixlib=rb-0.3.5&ixid=eyJhcHBfaWQiOjEyMDd9&s=a0c8d632e977f94e5d312d9893258f59&auto=format&fit=crop&w=1355&q=80'
+  ];
+
+  @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: CarouselSlider(
+              items: imgList
+                  .map((item) => Container(
+                        child: Center(
+                            child: Image.network(item,
+                                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),
+                )
+              ],
+            ),
+          ),
+          Container(
+            margin: EdgeInsets.fromLTRB(0, 0, 0, 15.h),
+            padding: EdgeInsets.all(20.w),
+            width: 345.w,
+            height: 90.h,
+            decoration: BoxDecoration(
+              color: Colors.white,
+              boxShadow: [
+                BoxShadow(
+                    color: Color(0xE2000000),
+                    offset: Offset(0, 0),
+                    blurRadius: 22.w)
+              ],
+              borderRadius: BorderRadius.all(Radius.circular(20.w)),
+            ),
+            child: Stack(
+              children: [
+                Positioned(
+                    top: -122.w,
+                    left: -134.w,
+                    child: Container(
+                      width: 225.w,
+                      height: 217.w,
+                      decoration: BoxDecoration(
+                        borderRadius: BorderRadius.all(Radius.circular(137.w)),
+                        border: Border.all(width: 1.w,color: Color(0xFFc7c7c7),style: BorderStyle.solid),
+                        gradient: LinearGradient(
+                          colors: [
+                            Color(0xFF8f8f8f),
+                            Color(0xFFc0c0c0),
+                          ],
+                        ),
+                      ),
+                    ),
+                ),
+
+              ],
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/pages/home/widgets/home/widgets/headers.dart

@@ -0,0 +1,64 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:get/get.dart';
+
+class headers extends StatelessWidget {
+  const headers({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Row(
+      children: [
+        Image.asset(
+          'images/index/position.png',
+          width: 14.w,
+          height: 14.w,
+        ),
+        Padding(
+          padding: EdgeInsets.fromLTRB(4.5.w, 0, 5.w, 0),
+          child: Text(
+            '邓州市',
+            style: TextStyle(
+              color: const Color(0xff202020),
+              fontSize: 16.sp,
+              fontWeight: FontWeight.bold,
+            ),
+          ),
+        ),
+        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.toNamed('/searchPage');
+            },
+            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/index.dart

@@ -2,3 +2,5 @@
 export 'home/index.dart';
 export 'splash/splash.dart';
 export 'Login/index.dart';
+export 'order/index.dart';
+export 'main/index.dart';

lib/pages/main/index.dart

@@ -0,0 +1,14 @@
+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;
+    naviTitle = '我的';
+  }
+
+  @override
+  Widget builder(BuildContext context) {
+    return const Text('我是个人中心页面');
+  }
+}

lib/pages/order/index.dart

@@ -0,0 +1,15 @@
+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;
+    naviTitle = '订单列表';
+  }
+
+  @override
+  Widget builder(BuildContext context) {
+    return Text('我是订单列表页面');
+  }
+}

lib/pages/splash/splash.dart

@@ -1,9 +1,7 @@
 import 'package:flutter/material.dart';
-
 import '../splash/widgets/countdown.dart';
 import 'package:get/get.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
-
 import '../home/index.dart';
 
 class SplashScreen extends StatefulWidget {
@@ -15,7 +13,7 @@ class SplashScreen extends StatefulWidget {
 
 class _SplashScreen extends State<SplashScreen> {
   handleOnFinish() {
-    Get.off(const Home());
+    Get.off(Home());
   }
 
   @override

lib/pages/splash/widgets/countdown.dart

@@ -19,26 +19,19 @@ Widget countdown(int sec, void Function() onFinish) {
   }, 1000);
 
   return Obx(
-    () => GestureDetector(
-      onTap: () {
-        _timer.cancel();
-        // return;
-        // onFinish();
-      },
-      child: Container(
-        width: 50.w,
-        height: 30.h,
-        alignment: const Alignment(0, 0),
-        decoration: const BoxDecoration(
-            borderRadius: BorderRadius.all(Radius.circular(20)),
-            color: Color(0x77222222)),
-        child: Text(
-          _countdown.value.toString() + '跳过',
-          style: TextStyle(
-              fontSize: 13.sp,
-              letterSpacing: 2,
-              color: const Color(0xFFFFFFFF),
-              ),
+    () => Container(
+      width: 20.h,
+      height: 20.h,
+      alignment: const Alignment(0, 0),
+      decoration: const BoxDecoration(
+          borderRadius: BorderRadius.all(Radius.circular(20)),
+          color: Color(0x77222222)),
+      child: Text(
+        _countdown.value.toString(),
+        style: TextStyle(
+          fontSize: 13.sp,
+          letterSpacing: 2,
+          color: const Color(0xFFFFFFFF),
         ),
       ),
     ),

lib/routes/middleWares.dart

@@ -4,14 +4,13 @@ import 'package:get/get.dart';
 import 'package:get_storage/get_storage.dart';
 
 void routingCallback (routing) {
-  GetStorage box = GetStorage();
-  bool isLogin = box.hasData('token');
-  bool isSplashScreen = routing?.current == '/splash';
-  bool isLoginPage = routing?.current == '/login';
-  print(99999999);
-  if (!isLogin && !isSplashScreen && !isLoginPage) {
-    // addPostFrameCallback 作用是等当前帧绘制完成之后再加载
-    // https://github.com/jonataslaw/getx/issues/262
-    SchedulerBinding.instance?.addPostFrameCallback((_) => Get.offNamed('/login'));
-  }
+  // GetStorage box = GetStorage();
+  // bool isLogin = box.hasData('token');
+  // bool isSplashScreen = routing?.current == '/splash';
+  // bool isLoginPage = routing?.current == '/login';
+  // if (!isLogin && !isSplashScreen && !isLoginPage) {
+  //   // addPostFrameCallback 作用是等当前帧绘制完成之后再加载
+  //   // https://github.com/jonataslaw/getx/issues/262
+  //   SchedulerBinding.instance?.addPostFrameCallback((_) => Get.offNamed('/login'));
+  // }
 }

lib/routes/pages.dart

@@ -1,9 +1,16 @@
 
 import 'package:get/get.dart';
+import 'package:get_storage/get_storage.dart';
 import '../pages/index.dart';
 
 List<GetPage> pages = [
-  GetPage(name: '/', page: () =>  Home()),
-  GetPage(name: '/splash', page: () => SplashScreen()),
+  GetPage(name: '/', page: () {
+    GetStorage box = GetStorage();
+    return box.hasData('token') ? Home() : Login();
+  }),
+  // GetPage(name: '/splash', page: () => SplashScreen()),
   GetPage(name: '/login', page: () =>  const Login()),
+  GetPage(name: '/order', page: () =>  Order()),
+  GetPage(name: '/', page: () =>  Home()),
+  GetPage(name: '/main', page: () =>  Main()),
 ];

lib/theme.dart

@@ -0,0 +1,22 @@
+
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+
+ThemeData getTheme() {
+  return ThemeData(
+    appBarTheme: AppBarTheme(
+      centerTitle: true,
+      backgroundColor: Colors.transparent,
+      foregroundColor: const Color(0xFF333333),
+      elevation: 0,
+      toolbarHeight: 44.w,
+      titleTextStyle: TextStyle(
+        color: const Color(0xFF333333),
+        fontWeight: FontWeight.bold,
+        fontSize: 17.sp,
+        letterSpacing: 2
+      ),
+    ),
+    backgroundColor: Colors.white,
+  );
+}

lib/utils/Request.dart

@@ -20,10 +20,10 @@ class Response {
       Response.fromMap(jsonDecode(str) as Map<String, dynamic>);
 
   factory Response.fromMap(Map<String, dynamic> resp) => Response(
-    code: resp['code'],
-    message: resp['message'],
-    data: resp['data'],
-  );
+        code: resp['code'],
+        message: resp['message'],
+        data: resp['data'],
+      );
 }
 
 final client = GetPlatform.isAndroid ? 'android' : 'ios';
@@ -38,12 +38,8 @@ 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");
+    options.headers['Authorization'] = GetStorage().read("token");
     return handler.next(options); //continue
-    // If you want to resolve the request with some custom data，
-    // you can resolve a `Response` object eg: `handler.resolve(response)`.
-    // If you want to reject the request with a error message,
-    // you can reject a `DioError` object eg: `handler.reject(dioError)`
   }, onResponse: (response, handler) {
     var resp = response.data as Map<String, dynamic>;
     if (resp['code'] == 1000) {
@@ -60,14 +56,14 @@ Dio createRequest() {
 
       return handler.next(response);
     } else {
-      DioError error = DioError(requestOptions: response.requestOptions, error: response.data, response: response);
+      DioError error = DioError(
+          requestOptions: response.requestOptions,
+          error: response.data,
+          response: response);
       return handler.reject(error);
     }
   }, onError: (DioError e, handler) {
-    // Do something with response error
     return handler.next(e); //continue
-    // If you want to resolve the request with some custom data，
-    // you can resolve a `Response` object eg: `handler.resolve(response)`.
   }));
 
   return dio;
@@ -77,12 +73,11 @@ var instance = createRequest();
 
 Future request(String path,
     {data,
-      Map<String, dynamic>? queryParameters,
-      CancelToken? cancelToken,
-      Options? options,
-      ProgressCallback? onSendProgress,
-      ProgressCallback? onReceiveProgress}) async {
-
+    Map<String, dynamic>? queryParameters,
+    CancelToken? cancelToken,
+    Options? options,
+    ProgressCallback? onSendProgress,
+    ProgressCallback? onReceiveProgress}) async {
   var resp = await instance.request(path,
       data: data,
       queryParameters: queryParameters,

lib/widgets/DefaultButton.dart

@@ -0,0 +1,94 @@
+import 'package:flutter/material.dart';
+
+
+
+class DefaultButton extends StatefulWidget {
+  //点击回调
+  final GestureTapCallback onPressed;
+  final String text;
+  final EdgeInsetsGeometry margin;
+  final double width;
+  final double height;
+  final double? fontSize;
+  final Color backColor;
+  final Color color;
+  final double? radius;
+
+  EdgeInsetsGeometry marginDefault =
+  const EdgeInsets.fromLTRB(0, 90.0, 0, 30); //按钮默认的margin值
+
+  DefaultButton({
+    Key? key,
+    required this.onPressed,
+    required this.text,
+    required this.margin,
+    required this.width,
+    required this.height,
+    this.fontSize,
+    this.radius,
+    required this.backColor,
+    required this.color,
+  }) : super(key: key);
+
+  @override
+  State createState() {
+    if (margin == null) {
+      return _DefaultButtonState(onPressed, text, marginDefault,width,height,fontSize,backColor,color,radius);
+    }
+    return _DefaultButtonState(onPressed, text, margin,width,height,fontSize,backColor,color,radius);
+  }
+}
+
+class _DefaultButtonState extends State<DefaultButton> {
+  //点击回调
+  final GestureTapCallback onPressed;
+  final String text;
+  final EdgeInsetsGeometry margin;
+  final double width;
+  final double height;
+  final double? fontSize;
+  final Color backColor;
+  final Color color;
+  final double? radius;
+  _DefaultButtonState(
+      this.onPressed,
+      this.text,
+      this.margin,
+      this.width,
+      this.height,
+      this.fontSize,
+      this.backColor,
+      this.color,
+      this.radius
+      );
+
+  @override
+  Widget build(BuildContext context) {
+    Widget _SectionBtn = Container(
+      margin: margin,
+      child: SizedBox(
+        width: width,
+        height: height,
+        child: RaisedButton(
+          color: backColor,
+          disabledColor: const Color(0xF5F6F7ff),
+          disabledTextColor: const Color(0xF5F6F7ff),
+          colorBrightness: Brightness.dark,
+          shape:
+          RoundedRectangleBorder(borderRadius: BorderRadius.circular(radius??5)),
+          child: Text(text,style:  TextStyle(
+              fontSize: fontSize,
+              fontWeight: FontWeight.bold,
+              color: color,
+          ),),
+          textColor: Colors.white,
+          onPressed: onPressed,
+        ),
+      ),
+    );
+
+    return _SectionBtn;
+  }
+
+}
+

lib/widgets/Modal.dart

@@ -0,0 +1,174 @@
+
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:get/get.dart';
+
+typedef ModalFunc = dynamic Function();
+
+/// func 函数如果返回 bool 值, 则只有 true 的情况下才默认关闭弹窗
+/// 如果返回 Future , 则只有正常结束的时候 才关闭弹窗
+/// 其余情况, 都默认关闭弹窗
+void _handleFunc(ModalFunc? func) {
+  if (null != func) {
+    dynamic res = func();
+    if (res.runtimeType == bool) {
+      if (res) {
+        Get.back(closeOverlays: true);
+      }
+    } else if (res is Future) {
+      res.then((_) => Get.back(closeOverlays: true));
+    } else {
+      Get.back(closeOverlays: true);
+    }
+  } else {
+    Get.back(closeOverlays: true);
+  }
+}
+
+/// 打开一个 dialog
+void showDialog({ required 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),
+    )
+  );
+}
+
+/// 打开一个 alert
+void showAlert({ required String title, String? message, Widget? content, ModalFunc? onConfirm }) {
+  Get.dialog(
+      Modal(
+        type: 'alert',
+        title: title,
+        message: message,
+        content: content,
+        onConfirm: () => _handleFunc(onConfirm),
+      )
+  );
+}
+
+class Modal extends StatelessWidget {
+
+  String title;
+  String type;
+  String? message;
+  Widget? content;
+  VoidCallback? onConfirm;
+  VoidCallback? onCancel;
+
+  final _titleStyle = TextStyle(color: const Color(0xFF222222), fontSize: 20.sp, 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 _btnShape = RoundedRectangleBorder(
+    side: const BorderSide(color: Color(0xFFFF703B), width: 2.0),
+    borderRadius: BorderRadius.all(Radius.circular(24.5.w)),
+  );
+
+  void _handleConfirm() {
+    if (null != onConfirm) {
+      onConfirm!();
+    }
+  }
+  void _handleCancel() {
+    if (null != onCancel) {
+      onCancel!();
+    }
+  }
+
+  Modal({Key? key,
+    this.type = 'alert',
+    required this.title,
+    this.message,
+    this.content,
+    this.onConfirm,
+    this.onCancel,
+  }): super(key: key);
+
+  Widget _confirmBtn() {
+    return ElevatedButton(
+      child: Text("确定", style: TextStyle(color: Colors.white, fontSize: 18.sp, letterSpacing: 5.sp)),
+      style: ElevatedButton.styleFrom(
+          primary: _primaryColor,
+          elevation: 0,
+          minimumSize: _btnSize,
+          shape: _btnShape,
+      ),
+      onPressed: _handleConfirm,
+    );
+  }
+
+  Widget _cancelBtn() {
+    return ElevatedButton(
+      child: Text("取消", style: TextStyle(color: _primaryColor, fontSize: 18.sp, letterSpacing: 5.sp)),
+      style: ElevatedButton.styleFrom(
+        primary: Colors.white,
+        elevation: 0,
+        minimumSize: _btnSize,
+        shape: _btnShape,
+      ),
+      onPressed: _handleCancel,
+    );
+  }
+
+  Widget _alert() {
+    return SimpleDialog(
+      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(24.w)),
+      titleTextStyle: _titleStyle,
+      title: Text(title, textAlign: TextAlign.center),
+        children: [
+          if (null != message) Text(message!, textAlign: TextAlign.center, style: _messageStyle),
+          if (null != content) content!,
+          SizedBox(height: 16.w),
+          Center(
+            child: _confirmBtn(),
+          ),
+          SizedBox(height: 10.w),
+        ]
+    );
+  }
+
+  Widget _dialog() {
+    Widget hSpacer = SizedBox(width: 16.w);
+
+    return SimpleDialog(
+        shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(24.w)),
+        titleTextStyle: _titleStyle,
+        title: Text(title, textAlign: TextAlign.center),
+        alignment: Alignment.center,
+        children: [
+          if (null != message) Text(message!, textAlign: TextAlign.center, style: _messageStyle),
+          if (null != content) content!,
+          SizedBox(height: 16.w),
+          Row(
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              hSpacer,
+              Center(
+                child: _confirmBtn(),
+              ),
+              hSpacer,
+              Center(
+                child: _cancelBtn(),
+              ),
+              hSpacer,
+            ],
+          ),
+          SizedBox(height: 10.w),
+        ]
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return type == 'alert' ? _alert() : _dialog();
+  }
+
+}

lib/widgets/NullCard.dart

@@ -0,0 +1,33 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+
+class NullCard extends StatelessWidget {
+  final String text;
+  const NullCard({Key? key, required this.text}) : super(key: key);
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      width: 345.w,
+      padding: EdgeInsets.all(30.w),
+      alignment: Alignment.center,
+      child: Column(
+        children: [
+          Container(
+            margin: EdgeInsets.fromLTRB(0, 0, 0, 22.h),
+            child: Image.asset(
+              'images/noData.png',
+              width: 135.w,
+            ),
+          ),
+          Text(
+            text,
+            style: TextStyle(
+                fontSize: 17.sp, color: Color(0xFFb4b4b4)),
+          )
+        ],
+      ),
+    );
+  }
+
+
+}

lib/widgets/layout/BasicPage.dart

@@ -0,0 +1,112 @@
+
+import '/widgets/layout/bottomBar/BottomBar.dart';
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+
+import 'barList.dart';
+
+abstract class BasicPage extends StatefulWidget {
+  // 导航标题
+  // 用法 naviTitle = xxxx
+  final _title = Rx<String>("");
+  set naviTitle(String t) {
+    _title.value = t;
+  }
+
+  // 当前活动 tab
+  // 如果非 tab 页, 则不传
+  int? tabIndex;
+
+  // 允许滚动 - 不是响应式的
+  bool canScroll;
+
+  //
+  BasicPage({Key? key, this.canScroll = true, this.tabIndex }) : super(key: key);
+
+  @protected
+  Widget builder(BuildContext context);
+
+  // 将要展示
+  @protected
+  @mustCallSuper
+  void beforeShow() {
+    assert(() {
+      print("===========beforeShow===========");
+      return true;
+    }());
+  }
+
+  @protected
+  @mustCallSuper
+  void beforeHide() {
+    assert(() {
+      print("===========beforeHide===========");
+      return true;
+    }());
+  }
+
+  @protected
+  @mustCallSuper
+  void beforeUnmounted() {
+    assert(() {
+      print("===========beforeUnmounted===========");
+      return true;
+    }());
+  }
+
+  @override
+  State<BasicPage> createState() => _BasicPageState();
+}
+
+class _BasicPageState extends State<BasicPage> {
+
+  @override
+  void initState() {
+    super.initState();
+  }
+
+  @override
+  void didChangeDependencies() {
+    super.didChangeDependencies();
+    widget.beforeShow();
+  }
+
+  @override
+  void deactivate() {
+    super.deactivate();
+    widget.beforeHide();
+  }
+
+  @override
+  void dispose() {
+    super.dispose();
+    widget.beforeUnmounted();
+  }
+
+  // appBar 的样式请查询 theme 文件
+  PreferredSizeWidget? _getAppBar() {
+    return AppBar(title: Obx(() => Text(widget._title.value)));
+  }
+
+  Widget _buildChild(BuildContext context) {
+    if (widget.canScroll) {
+      return SingleChildScrollView(
+        child: widget.builder(context),
+      );
+    } else {
+      return widget.builder(context);
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: _getAppBar(),
+      body: SafeArea(
+        child: _buildChild(context),
+      ),
+      bottomNavigationBar: widget.tabIndex == null ? null : BottomBar(list: BarList, current: widget.tabIndex!),
+    );
+  }
+}
+

lib/widgets/layout/barList.dart

@@ -0,0 +1,25 @@
+import 'dart:ui';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+
+import 'bottomBar/item.dart';
+
+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'),
+  ),
+  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'),
+  ),
+  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'),
+  ),
+];

lib/widgets/layout/bottomBar/BottomBar.dart

@@ -0,0 +1,86 @@
+
+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);
+
+  @override
+  Widget build(BuildContext context) {
+    final image = selected ? data.selected.image : data.normal.image;
+    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);
+
+    return GestureDetector(
+      onTap: () {
+        if (!selected) {
+          Get.offNamed(data.page);
+        }
+      },
+      child: Column(
+        children: [
+          Expanded(
+            flex: 1,
+            child: Image.asset(image, fit: BoxFit.cover),
+          ),
+          Expanded(
+            flex: 1,
+            child: Center(
+              child: Text(data.label, style: textStyle),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class BottomBar extends StatelessWidget {
+
+  final int current;
+  List<BarItem> list;
+
+  BottomBar({ Key? key , required this.list, required this.current }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      width: double.infinity,
+      height: 65.w,
+      padding: EdgeInsets.symmetric(vertical: 10.w, horizontal: 0),
+      decoration: BoxDecoration(
+        color: const Color(0xFFFFFFFF),
+        boxShadow: [
+          BoxShadow(
+            color: const Color(0x14000000),
+            offset: Offset(0, -2.w),
+            blurRadius: 3.w,
+          ),
+        ],
+      ),
+      child: Center(
+        child: Row(
+          children: [
+            ...list.map((item) {
+              int index = list.indexOf(item);
+
+              return Expanded(
+                  flex: 1,
+                  child: BottomBarItem(data: item, selected: current == index ),
+              );
+            })
+          ],
+        ),
+      ),
+    );
+  }
+
+}

lib/widgets/layout/bottomBar/item.dart

@@ -0,0 +1,19 @@
+
+import 'dart:ui';
+
+class Item {
+  double fontSize;
+  Color color;
+  String image;
+
+  Item({ required this.fontSize, required this.color, required this.image });
+}
+
+class BarItem {
+  String label;
+  String page;
+  Item normal;
+  Item selected;
+
+  BarItem ({ required this.label, required this.page, required this.normal, required this.selected });
+}

pubspec.lock

@@ -7,14 +7,14 @@ packages:
       name: _fe_analyzer_shared
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "38.0.0"
+    version: "39.0.0"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "3.4.1"
+    version: "4.0.0"
   args:
     dependency: transitive
     description:
@@ -42,7 +42,7 @@ packages:
       name: build
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.2.1"
+    version: "2.3.0"
   build_config:
     dependency: transitive
     description:
@@ -50,6 +50,13 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.0"
+  carousel_slider:
+    dependency: "direct main"
+    description:
+      name: carousel_slider
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "4.0.0"
   characters:
     dependency: transitive
     description:
@@ -112,7 +119,7 @@ packages:
       name: dart_style
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.2.2"
+    version: "2.2.3"
   dio:
     dependency: "direct main"
     description:
@@ -159,7 +166,7 @@ packages:
       name: flutter_screenutil
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "5.4.0"
+    version: "5.4.0+1"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -225,7 +232,7 @@ packages:
       name: json_serializable
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "6.1.5"
+    version: "6.1.6"
   lints:
     dependency: transitive
     description:
@@ -391,14 +398,14 @@ packages:
       name: source_gen
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.2.1"
+    version: "1.2.2"
   source_helper:
     dependency: transitive
     description:
       name: source_helper
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.3.1"
+    version: "1.3.2"
   source_span:
     dependency: transitive
     description:

pubspec.yaml

@@ -41,7 +41,7 @@ dependencies:
   location: ^4.3.0
   fluttertoast: ^8.0.9
   get_storage: ^2.0.3
-
+  carousel_slider: ^4.0.0
 dev_dependencies:
   flutter_test:
     sdk: flutter
@@ -66,23 +66,9 @@ flutter:
   # the material Icons class.
   uses-material-design: true
   assets:
-    - images/login/loginImg.png
-    - images/login/VerificationCode.png
-    - images/login/checkedImg.png
-    - images/login/unChecked.png
-    - images/index/borderImg.png
-    - images/index/goback.png
-    - images/index/index.png
-    - images/index/indexActive.png
-    - images/index/job.png
-    - images/index/jobActive.png
-    - images/index/orderList.png
-    - images/index/position.png
-    - images/index/search.png
-    - images/index/user.png
-    - images/index/userActive.png
-    - images/splash.png
-    - images/logo.png
+    - images/login/
+    - images/index/
+    - images/
   # To add assets to your application, add an assets section, like this:
   # assets:
   #   - images/a_dot_burr.jpeg