merge

lib/main.dart

@@ -5,21 +5,27 @@ import 'package:get/get.dart';
 import 'package:get_storage/get_storage.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 
+import 'package:flutter_localizations/flutter_localizations.dart';
+
 import 'models/index.dart';
 import 'routes/index.dart';
 
 void main() async {
   await GetStorage.init();
 
+
   runApp(const MyApp());
 }
 
 class MyApp extends StatelessWidget {
   const MyApp({Key? key}) : super(key: key);
 
+
+
   // This widget is the root of your application.
   @override
   Widget build(BuildContext context) {
+
     GetStorage box = GetStorage();
 
     return ScreenUtilInit(
@@ -28,12 +34,23 @@ class MyApp extends StatelessWidget {
       splitScreenMode: true,
       builder: (_) {
         return GetMaterialApp(
+          localizationsDelegates: const [
+            GlobalMaterialLocalizations.delegate,
+            GlobalWidgetsLocalizations.delegate,
+            GlobalCupertinoLocalizations.delegate,
+          ],
+          supportedLocales: [
+            Locale('zh', ''),
+            Locale('en', ''),
+          ],
+
           theme: getTheme(),
           initialRoute: '/splash',
           defaultTransition: Transition.native,
           routingCallback: routingCallback,
           initialBinding: AppBindings(),
           getPages: pages,
+
         );
       },
     );

lib/models/entities/Address.dart

@@ -0,0 +1,14 @@
+class Address {
+  String? address;
+  bool? isDefault;
+  Address();
+
+  Address.fromJson(Map<String, dynamic> json)
+      : address = json["address"],
+        isDefault = json["isDefault"];
+
+  Map<String, dynamic> toJson() => {
+        'address': address,
+        'isDefault': isDefault,
+      };
+}

lib/pages/ArticleInfo/ArticleInfo.dart

@@ -0,0 +1,59 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+
+class ArticleInfo extends StatelessWidget {
+  const ArticleInfo({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+        resizeToAvoidBottomInset: false,
+        appBar: AppBar(
+          title: Text('资讯'),
+          leading: Icon(Icons.arrow_back_ios),
+          // backgroundColor: Colors.transparent,
+          centerTitle: true,
+        ),
+        body: Container(
+          padding: EdgeInsets.fromLTRB(15, 30, 15, 50),
+
+          child: Column(
+            children: [
+              Container(
+                alignment: Alignment.center,
+                child:  Row(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  children: [
+                    Image(image: AssetImage('images/icons/decorate.png'),width: 17,),
+                    Text('我是22222222222标题',
+                    style: TextStyle(
+                      fontSize: 17.sp,
+                      fontWeight: FontWeight.bold,
+
+                    ),
+                    ),
+                    Image(image: AssetImage('images/icons/decorate.png'),width: 17),
+
+                  ],
+                ),
+              ),
+              Container(
+                padding: EdgeInsets.fromLTRB(0, 20, 0, 10),
+                width: 344.w,
+                child: Text('gr一年之计在于春，连日来，农业生产工作正在热火朝天的进行着：农技人员走村串户指导农户春耕生产，大型拖拉机忙着翻垦农田，植保无人机 ',
+                style: TextStyle(
+                  fontSize: 14.sp
+                ),
+                ) ,
+              ),
+              Container(
+                padding: EdgeInsets.fromLTRB(0, 10, 0,10),
+                child: Image(image: AssetImage('images/cars.png'),width:320.w,height:260.w,fit: BoxFit.fill,),
+              )
+            ],
+          ),
+        ),
+    );
+
+  }
+}

lib/pages/OrderConfirmation/index.dart

@@ -0,0 +1,267 @@
+import 'package:farmer_client/pages/OrderConfirmation/widgets/timeDatePicker.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:get/get.dart';
+import 'package:intl/intl.dart';
+
+class OrderConfirmation extends StatefulWidget {
+  const OrderConfirmation({Key? key}) : super(key: key);
+
+  @override
+  State<OrderConfirmation> createState() => _OrderConfirmationState();
+}
+
+class _OrderConfirmationState extends State<OrderConfirmation> {
+  TextEditingController _unameController = TextEditingController();
+  TextEditingController _pwdController = TextEditingController();
+  GlobalKey _formKey = GlobalKey<FormState>();
+
+  var selectDate; //选择的时间
+  var workingArea;
+
+
+//  20:59:59
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      resizeToAvoidBottomInset: false,
+      appBar: AppBar(
+        elevation: 0,
+        centerTitle: true,
+        backgroundColor: Colors.white,
+        title: Text(
+          '预约',
+          style: TextStyle(
+              color: Colors.black,
+              fontSize: 17.sp,
+              letterSpacing: 2,
+              fontWeight: FontWeight.bold),
+        ),
+      ),
+      body: Form(
+        key: _formKey, //设置globalKey，用于后面获取FormState
+        autovalidateMode: AutovalidateMode.onUserInteraction,
+        child: Column(
+          children: <Widget>[
+            Container(
+              margin: EdgeInsets.fromLTRB(15, 20, 0, 0),
+              alignment: Alignment.topLeft,
+              child: Text(
+                '作业面积/公顷',
+                style: TextStyle(
+                    color: Color(0xff222222),
+                    fontSize: 17.sp,
+                    fontWeight: FontWeight.bold),
+              ),
+            ),
+            TextFormField(
+              // autofocus: true,
+              keyboardType: TextInputType.number,
+              controller: _unameController,
+              decoration: const InputDecoration(
+                isCollapsed: true,
+                contentPadding:
+                    EdgeInsets.symmetric(vertical: 8, horizontal: 16),
+                counterText: '', //去掉计数
+                ///   UnderlineInputBorder 只有下边框  默认使用的就是下边框
+                border: UnderlineInputBorder(
+                  borderRadius: BorderRadius.all(Radius.circular(10)),
+                  borderSide: BorderSide(
+                    color: Color(0x30000000),
+                    width: 2.0,
+                  ),
+                ),
+                floatingLabelBehavior: FloatingLabelBehavior.never,
+                hintText: "请输入具体面积(公顷)",
+              ),
+              onChanged: (e){
+                setState(() {
+                  workingArea=e;
+                });
+              },
+              // 校验用户名
+              validator: (v) {
+                return v!.trim().isNotEmpty ? null : "作业面积/公顷不能为空";
+              },
+            ),
+            Container(
+              margin: EdgeInsets.fromLTRB(15, 20, 0, 0),
+              alignment: Alignment.topLeft,
+              child: Text(
+                '作业时间：',
+                style: TextStyle(
+                    color: Color(0xff222222),
+                    fontSize: 17.sp,
+                    fontWeight: FontWeight.bold),
+              ),
+            ),
+            Container(
+                width: 345.w,
+                padding: EdgeInsets.fromLTRB(0, 15, 0, 15),
+                decoration: const BoxDecoration(
+                  border: Border(
+                      bottom: BorderSide(width: 1, color: Color(0x20000000)
+                          // 0x17000000
+                          )),
+                ),
+                child: Row(
+                  children: [
+                    Image(
+                      image: AssetImage('images/icons/timeImage.png'),
+                      fit: BoxFit.cover,
+                      width: 18.w,
+                      height: 18.w,
+                    ),
+                    Padding(
+                      padding: EdgeInsets.fromLTRB(10, 0, 0, 0),
+                      child: GestureDetector(
+                        onTap: () async {
+                          var handleChnage = await showDatePicker(
+                            context: context,
+                            helpText: '请选择作业开始时间',
+                            cancelText: '取消',
+                            confirmText: '确定',
+                            initialDate: selectDate == null
+                                ? DateTime.now()
+                                : selectDate,
+                            firstDate: DateTime.now(),
+                            lastDate: DateTime(2030),
+                          );
+                          setState(() {
+                            selectDate = handleChnage;
+                            print('${selectDate}+');
+                          });
+                        },
+                        child: Text(selectDate == null
+                            ? '请选择日期'
+                            : '${DateFormat("yyyy-MM-dd").format(selectDate)}'),
+                      ),
+                    )
+                  ],
+                )),
+            Container(
+              margin: EdgeInsets.fromLTRB(15, 20, 0, 0),
+              alignment: Alignment.topLeft,
+              child: Text(
+                '作业位置：',
+                style: TextStyle(
+                    color: Color(0xff222222),
+                    fontSize: 17.sp,
+                    fontWeight: FontWeight.bold),
+              ),
+            ),
+            Container(
+              width: 345.w,
+              padding: EdgeInsets.fromLTRB(0, 15, 0, 15),
+              decoration: BoxDecoration(
+                border: Border(
+                    bottom: BorderSide(width: 1, color: Color(0x20000000)
+                        // 0x17000000
+                        )),
+              ),
+              child: Row(
+                mainAxisAlignment: MainAxisAlignment.start,
+                children: [
+                  Image(
+                    image: AssetImage('images/gpsImgae.png'),
+                    fit: BoxFit.cover,
+                    width: 14.w,
+                    height: 17.h,
+                  ),
+                  Padding(
+                      padding: EdgeInsets.fromLTRB(10, 0, 0, 0),
+                      child: GestureDetector(
+                        onTap: () {},
+                        child: Container(
+                          width: 290.w,
+                          child: Text(
+                            '请选择详细地址',
+                            softWrap: true,
+                            maxLines: 1,
+                            textAlign: TextAlign.left,
+                            overflow: TextOverflow.ellipsis,
+                          ),
+                        ),
+                      ))
+                ],
+              ),
+            ),
+
+            // 登录按钮
+            Spacer(),
+            Container(
+              alignment: Alignment.bottomCenter,
+              child: SizedBox(
+                width: 315.w,
+                height: 49.h,
+                child: ElevatedButton(
+                  onPressed: () {
+                    if ((_formKey.currentState as FormState).validate()) {
+                      var a={selectDate,workingArea};
+                      print('我确定了$a');
+                      //验证通过提交数据
+                    }
+                  },
+                  child: const Text(
+                    "确定",
+                    style: TextStyle(
+                        fontSize: 18,
+                        color: Colors.white,
+                        fontWeight: FontWeight.bold),
+                  ),
+                  style: ButtonStyle(
+                    elevation: MaterialStateProperty.all(0),
+                    backgroundColor:
+                        MaterialStateProperty.all(const Color(0xFFFF703B)),
+                    shape: MaterialStateProperty.all(
+                        const RoundedRectangleBorder(
+                            borderRadius:
+                                BorderRadius.all(Radius.circular(24.4)))),
+                  ),
+                ),
+              ),
+            ),
+            Container(
+              margin: EdgeInsets.fromLTRB(0, 30.w, 0, 30.w),
+              alignment: Alignment.bottomCenter,
+              child: SizedBox(
+                width: 315.w,
+                height: 49.h,
+                child: ElevatedButton(
+                  onPressed: () {
+                    Get.back();
+                  },
+                  child: const Text(
+                    "取消",
+                    style: TextStyle(
+                        fontSize: 18,
+                        color: Color(0xFFFF703B),
+                        fontWeight: FontWeight.bold),
+                  ),
+                  style: ButtonStyle(
+                    side: MaterialStateProperty.all(
+                        BorderSide(width: 1, color: Color(0xFFFF703B))), //边框
+                    elevation: MaterialStateProperty.all(0),
+                    backgroundColor: MaterialStateProperty.all(Colors.white),
+                    shape: MaterialStateProperty.all(
+                      RoundedRectangleBorder(
+                          borderRadius:
+                              BorderRadius.all(Radius.circular(24.4))),
+                    ),
+                  ),
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+
+
+

lib/pages/TabBar/index.dart

@@ -0,0 +1,131 @@
+
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+
+import '../TabBar/widgets/Information/index.dart';
+import '../TabBar/widgets/main/index.dart';
+import '../TabBar/widgets/order/index.dart';
+// import 'package:farmer_client/pages/TabBar/widgets/orderInfo/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(0xFFFF703B),
+      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/HomesOFFImgaes.png', 'images/index/HomesNOImgaes.png'],
+    ['images/index/OrdersOFFImgaes.png', 'images/index/OrdersNOImgaes.png'],
+    ['images/index/newsONImages.png', 'images/index/newsOFFImages.png'],
+    ['images/index/MineOFFImgaes.png', 'images/index/MineNOImgaes.png'],
+  ];
+  Image getTabIcon(int curIndex) {
+    //设置tabbar选中和未选中的状态图标
+    if (curIndex == _tabIndex) {
+      return Image.asset(
+        images[curIndex][1],
+        width: 22.w,
+        height: 22.w,
+      );
+    }
+    return Image.asset(
+      images[curIndex][0],
+      width: 22.w,
+      height: 22.w,
+    );
+  }
+
+  Image getTabImage(path) {
+    return Image.asset(path, width: 22.w, height: 22.w);
+  }
+
+  //内容
+  var _body = [Text('我是首页'), OrderPage(),Information(), MainPage()];
+
+  Widget tabBar(index) {
+    return GestureDetector(
+      behavior: HitTestBehavior.opaque,
+      onTap: () {
+        setState(() {
+          _tabIndex = index;
+        });
+      },
+      child: Container(
+        width: 93.w,
+        height: 65.h,
+        child: Column(
+          children: [
+            getTabIcon(index),
+            Padding(
+              padding: EdgeInsets.fromLTRB(0, 6.h, 0, 0),
+              child: getTabTitle(index),
+            )
+          ],
+        ),
+      ),
+    );
+  }
+
+  @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(),
+        ),
+      ),
+    );
+  }
+}

lib/pages/TabBar/widgets/Information/index.dart

@@ -0,0 +1,123 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:get/get.dart';
+import 'package:get/get_core/src/get_main.dart';
+
+class Information extends StatefulWidget {
+  const Information({Key? key}) : super(key: key);
+
+  @override
+  State<Information> createState() => _InformationState();
+}
+
+class _InformationState extends State<Information> {
+  @override
+  Widget build(BuildContext context) {
+    return ListView(
+      children: [
+        // ListTile用不好
+
+        GestureDetector(
+          child: Container(
+              padding: EdgeInsets.fromLTRB(0, 30, 0, 30),
+              width: 310.w,
+              decoration: const BoxDecoration(
+                  border: Border(
+                      bottom: BorderSide(width: 0.5, color: Color(0x20000000)
+                          // 0x17000000
+                          ))),
+              child: Row(
+                children: [
+                  Container(
+                    margin: EdgeInsets.fromLTRB(15, 0, 11, 0),
+                    width: 100,
+                    height: 100,
+                    decoration: BoxDecoration(
+                      image: DecorationImage(
+                        image: AssetImage('images/cars.png'),
+                        fit: BoxFit.cover,
+                      ),
+                      borderRadius: BorderRadius.circular(12),
+                    ),
+                  ),
+                  Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Container(
+                        width: 240.w,
+                        padding: EdgeInsets.fromLTRB(0, 0, 0, 30),
+                        child: Text("我我就是一个标题，什阿三大苏打333萨达萨达萨达v么特不是",
+                            softWrap: true,
+                            maxLines: 2,
+                            textAlign: TextAlign.left,
+                            overflow: TextOverflow.ellipsis,
+                            style: TextStyle(
+                              fontSize: 17.sp,
+                              fontWeight: FontWeight.bold,
+                            )),
+                      ),
+                      Container(
+                        child: Text('2022-02-09'),
+                      )
+                    ],
+                  )
+                ],
+              )),
+          onTap: () {
+            Get.toNamed('/ArticleInfo');
+          },
+        ),
+        GestureDetector(
+          child: Container(
+              padding: EdgeInsets.fromLTRB(0, 30, 0, 30),
+              width: 310.w,
+              decoration: const BoxDecoration(
+                  border: Border(
+                      bottom: BorderSide(width: 0.5, color: Color(0x20000000)
+                          // 0x17000000
+                          ))),
+              child: Row(
+                children: [
+                  Container(
+                    margin: EdgeInsets.fromLTRB(15, 0, 11, 0),
+                    width: 100,
+                    height: 100,
+                    decoration: BoxDecoration(
+                      image: DecorationImage(
+                        image: AssetImage('images/cars.png'),
+                        fit: BoxFit.cover,
+                      ),
+                      borderRadius: BorderRadius.circular(12),
+                    ),
+                  ),
+                  Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Container(
+                        width: 240.w,
+                        padding: EdgeInsets.fromLTRB(0, 0, 0, 30),
+                        child: Text("我我就是一个标题，什阿三大苏打333萨达萨达萨达v么特不是",
+                            softWrap: true,
+                            maxLines: 2,
+                            textAlign: TextAlign.left,
+                            overflow: TextOverflow.ellipsis,
+                            style: TextStyle(
+                              fontSize: 17.sp,
+                              fontWeight: FontWeight.bold,
+                            )),
+                      ),
+                      Container(
+                        child: Text('2022-02-09'),
+                      )
+                    ],
+                  )
+                ],
+              )),
+          onTap: () {
+            print('进入资讯详情');
+          },
+        )
+      ],
+    );
+  }
+}

lib/pages/TabBar/widgets/main/index.dart

@@ -0,0 +1,72 @@
+import './widgets/OtherColumn.dart';
+import './widgets/UserAddress.dart';
+import './widgets/UserInfo.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+
+class MainPage extends StatefulWidget {
+  const MainPage({Key? key}) : super(key: key);
+
+  @override
+  State<MainPage> createState() => _MainPageState();
+}
+
+class _MainPageState extends State<MainPage> {
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      alignment: Alignment.center,
+      child: ListView(
+        children: [
+          Column(
+            children: [
+              UserInfo(), //头部，头像手机号姓名
+              UserAddress(), //用户地址
+              OtherColumn(), //功能菜单栏
+              Container(
+                height: 70.h,
+                margin: EdgeInsets.only(top: 0, bottom: 40.0),
+                alignment: Alignment.bottomCenter,
+                decoration: BoxDecoration(
+                  boxShadow: [
+                    BoxShadow(
+                      blurRadius: 10, //阴影范围
+                      spreadRadius: 0.1, //阴影浓度
+                      color: Colors.grey.withOpacity(0.2), //阴影颜色
+                    ),
+                  ],
+                ),
+                child: SizedBox(
+                  width: 315.w,
+                  height: 49.h,
+                  child: ElevatedButton(
+                    onPressed: () {
+                      // _handelSubmit();
+                      print('用户点击了支付啊阿松大撒地方');
+                    },
+                    child: const Text(
+                      "退出登陆",
+                      style: TextStyle(
+                          fontSize: 18,
+                          color: Colors.black,
+                          fontWeight: FontWeight.bold),
+                    ),
+                    style: ButtonStyle(
+                      elevation: MaterialStateProperty.all(0),
+                      backgroundColor:
+                          MaterialStateProperty.all(const Color(0xFFFFFFFF)),
+                      shape: MaterialStateProperty.all(
+                          const RoundedRectangleBorder(
+                              borderRadius:
+                                  BorderRadius.all(Radius.circular(24.4)))),
+                    ),
+                  ),
+                ),
+              ),
+            ],
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/pages/TabBar/widgets/main/widgets/OtherColumn.dart

@@ -0,0 +1,155 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+
+class OtherColumn extends StatelessWidget {
+  const OtherColumn({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return  Container(
+        alignment: Alignment.center,
+        width: 345.w,
+        margin: EdgeInsets.fromLTRB(0, 15.w, 0, 15.w),
+        decoration: BoxDecoration(
+          borderRadius: BorderRadius.circular(30),
+          color: Colors.white,
+          boxShadow: [
+            BoxShadow(
+              blurRadius: 10, //阴影范围
+              spreadRadius: 0.1, //阴影浓度
+              color: Colors.grey.withOpacity(0.2), //阴影颜色
+            ),
+          ],
+        ),
+        child: Column(
+          children: [
+            Container(
+                margin: EdgeInsets.fromLTRB(0, 30.w, 0, 20.w),
+                alignment: Alignment.topLeft,
+                decoration: const BoxDecoration(
+                    border: Border(
+                        left: BorderSide(width: 5, color: Color(0xff000000)
+                            // 0x17000000
+                            ))),
+                child: Padding(
+                  padding: EdgeInsets.fromLTRB(12.w, 0, 0, 0),
+                  child: Text(
+                    '设置',
+                    style: TextStyle(
+                      color: Color(0xff333333),
+                      fontWeight: FontWeight.bold,
+                      fontSize: 17.sp,
+                    ),
+                  ),
+                )),
+            Container(
+              child: Column(
+                children: [
+                  Container(
+                    height: 45.w,
+                    width: 310.w,
+                    margin: EdgeInsets.fromLTRB(0, 10.w, 0, 0),
+
+                    decoration: const BoxDecoration(
+                        border:Border(
+                            bottom:
+                            BorderSide(width: 0.5, color: Color(0x20000000)
+                              // 0x17000000
+                            ))
+                    ),
+
+                    child: ListTile(
+                      contentPadding: EdgeInsets.symmetric(horizontal: 0.0),
+                      // 这边使用了contentPadding
+                      leading: Image(
+                        image: AssetImage('images/aboutUs.png'),
+                        width: 18.w,
+                        height: 21.w,
+                      ),
+                      title: Transform(
+                        transform: Matrix4.translationValues(-20, 0.0, 0.0),
+                        child: Text("版本更新",
+                            style: TextStyle(
+                                fontSize: 17.sp, color: Color(0xff333333))),
+                      ),
+                      trailing: Image(
+                        image: AssetImage('images/userRight.png'),
+                        width: 10.w,
+                        height: 18.w,
+                      ),
+                    ),
+                  ),
+                  Container(
+                    margin: EdgeInsets.fromLTRB(0, 10.w, 0, 0),
+                    width: 310.w,
+                    height: 45.w,
+                    decoration: const BoxDecoration(
+                        border:Border(
+                            bottom:
+                            BorderSide(width: 0.5, color: Color(0x20000000)
+                              // 0x17000000
+                            ))
+                    ),
+
+                    child: ListTile(
+                      contentPadding: EdgeInsets.symmetric(horizontal: 0.0),
+
+                      leading: Image(
+                        image: AssetImage('images/versionUpdate.png'),
+                        width: 18.w,
+                        height: 21.w,
+                      ),
+                      title: Transform(
+                        transform: Matrix4.translationValues(-20, 0.0, 0.0),
+                        child: Text("用户协议及隐私政策",
+                            style: TextStyle(
+                                fontSize: 17.sp, color: Color(0xff333333))),
+                      ),
+                      trailing: Image(
+                        image: AssetImage('images/userRight.png'),
+                        width: 10.w,
+                        height: 18.w,
+                      ),
+                    ),
+                  ),
+                  Container(
+                    margin: EdgeInsets.fromLTRB(0, 10.w, 0, 20.w),
+                    width: 310.w,
+                    height: 45.w,
+                    decoration: const BoxDecoration(
+                        border:Border(
+                            bottom:
+                            BorderSide(width: 0.5, color: Color(0x20000000)
+                              // 0x17000000
+                            ))
+                    ),
+
+                    child: ListTile(
+                      contentPadding: EdgeInsets.symmetric(horizontal: 0.0),
+
+                      leading: Image(
+                        image: AssetImage('images/feedbacks.png'),
+                        width: 18.w,
+                        height: 21.w,
+                      ),
+                      title: Transform(
+                        transform: Matrix4.translationValues(-20, 0.0, 0.0),
+                        child: Text("意见反馈",
+                            style: TextStyle(
+                                fontSize: 17.sp, color: Color(0xff333333))),
+                      ),
+                      trailing: Image(
+                        image: AssetImage('images/userRight.png'),
+                        width: 10.w,
+                        height: 18.w,
+                      ),
+                    ),
+                  ),
+
+                ],
+              ),
+            )
+          ],
+        ));
+  }
+}

lib/pages/main/widgets/UserAddress.dart → lib/pages/TabBar/widgets/main/widgets/UserAddress.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:get/get.dart';
 
 class UserAddress extends StatelessWidget {
   const UserAddress({Key? key}) : super(key: key);
@@ -43,23 +44,23 @@ class UserAddress extends StatelessWidget {
                     ),
                   ),
                 )),
-            Row(
-              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-              children: [
-                Container(
-                  child: Row(
-                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                    children: [
-                      Padding(
-                        padding: EdgeInsets.fromLTRB(17.w, 0, 10.w, 0),
-                        child: Image(
-                          image: AssetImage('images/gpsImgae.png'),
-                          width: 12.w,
+            GestureDetector(
+              child: Row(
+                mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                children: [
+                  Container(
+                    child: Row(
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      children: [
+                        Padding(
+                          padding: EdgeInsets.fromLTRB(17.w, 0, 10.w, 0),
+                          child: Image(
+                            image: AssetImage('images/gpsImgae.png'),
+                            width: 12.w,
+                          ),
                         ),
-                      ),
-                      Container(
-                        width: 260,
-                        child: GestureDetector(
+                        Container(
+                          width: 260,
                           child: Text(
                             '请填写详细地址请填写详细地址请填写详细地址',
                             softWrap: true,
@@ -71,26 +72,26 @@ class UserAddress extends StatelessWidget {
                               fontSize: 17,
                             ),
                           ),
-                          onTap: () {
-                            print('修改地址');
-                          },
                         ),
-                      )
-                    ],
+                      ],
+                    ),
                   ),
-                ),
-                Container(
-                  alignment: Alignment.center,
-                  padding: EdgeInsets.fromLTRB(0, 0, 30.w, 0),
-                  child: Text(
-                    '>>',
-                    style: TextStyle(
-                      fontWeight: FontWeight.bold,
-                      fontSize: 17,
+                  Container(
+                    alignment: Alignment.center,
+                    padding: EdgeInsets.fromLTRB(0, 0, 30.w, 0),
+                    child: Text(
+                      '>>',
+                      style: TextStyle(
+                        fontWeight: FontWeight.bold,
+                        fontSize: 17,
+                      ),
                     ),
                   ),
-                ),
-              ],
+                ],
+              ),
+              onTap: () {
+                Get.toNamed("/addressList");
+              },
             ),
           ],
         ));

lib/pages/main/widgets/UserInfo.dart → lib/pages/TabBar/widgets/main/widgets/UserInfo.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:get/get.dart';
 
 class UserInfo extends StatelessWidget {
   const UserInfo({Key? key}) : super(key: key);
@@ -7,6 +8,8 @@ class UserInfo extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Container(
+      margin: EdgeInsets.only(top: 20.0, bottom: 0.0),
+
       alignment: Alignment.center,
       height: 173.w,
       width: 345.w,
@@ -39,7 +42,7 @@ class UserInfo extends StatelessWidget {
                     style: TextStyle(color: Colors.white),
                   ),
                   onTap: () {
-                    print('修改个人信息');
+                    Get.toNamed('/userInfo');
                   },
                 )),
           ),

lib/pages/TabBar/widgets/order/index.dart

@@ -0,0 +1,62 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+
+import '../../../../widgets/OrderListCard.dart';
+import '../../../orderInfo/index.dart';
+
+class OrderPage extends StatefulWidget {
+  const OrderPage({Key? key}) : super(key: key);
+
+  @override
+  State<OrderPage> createState() => _OrderPageState();
+}
+
+class _OrderPageState extends State<OrderPage> {
+  @override
+  Widget build(BuildContext context) {
+    return ListView(
+      children: [
+        Container(
+          padding: EdgeInsets.fromLTRB(15, 0, 15, 0),
+          height: 55.w,
+          decoration: BoxDecoration(
+            color: Colors.white
+          ),
+          child: Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+
+            children: [
+              Row(
+                children: [
+                  Padding(padding: EdgeInsets.fromLTRB(0, 0, 8, 0),
+                  child:Image(image: AssetImage('images/ordersListImga.png'),fit: BoxFit.cover,width: 18.w,),
+                  ),
+
+                  Text('订单列表',
+                    style: TextStyle(
+                      color: Color(0xff222222),
+                      fontSize: 20.sp,
+                      fontWeight: FontWeight.bold
+                    ),
+                  )
+                ],
+              ),
+            ],
+          ),
+        ),
+ Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          OrderListCard(),
+          OrderListCard(),
+          OrderListCard(),
+          OrderListCard(),
+
+
+        ],
+      ),
+
+    ],
+    );
+  }
+}

lib/pages/addAddress/index.dart

@@ -0,0 +1,110 @@
+import 'package:farmer_client/models/entities/Address.dart';
+import 'package:farmer_client/widgets/DefaultButton.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:fluttertoast/fluttertoast.dart';
+import 'package:get/get.dart';
+
+class AddAddress extends StatefulWidget {
+  const AddAddress({Key? key}) : super(key: key);
+
+  @override
+  _AddAddress createState() => _AddAddress();
+}
+
+class _AddAddress extends State<AddAddress> {
+  late Address address=Address();
+  late String text = '';
+
+  @override
+  void initState() {
+    super.initState();
+    if (Get.arguments != null) {
+      address = Get.arguments['item'];
+      text = address.address.toString();
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        elevation: 0,
+        centerTitle: true,
+        backgroundColor: Colors.white,
+        title: Text(
+          '添加地址',
+          style: TextStyle(
+              color: Colors.black,
+              fontSize: 17.sp,
+              letterSpacing: 2,
+              fontWeight: FontWeight.bold),
+        ),
+      ),
+      body: Container(
+        padding: EdgeInsets.all(15.w),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Text(
+              '详细地址：',
+              style: TextStyle(
+                  fontWeight: FontWeight.bold,
+                  fontSize: 17.sp,
+                  color: const Color(0xFF333333)),
+            ),
+            Container(
+              margin: EdgeInsets.fromLTRB(0, 0, 0, 50.h),
+              padding: EdgeInsets.symmetric(vertical: 5.w, horizontal: 18.5.w),
+              decoration: BoxDecoration(
+                  color: const Color(0xFFfefefe),
+                  borderRadius: BorderRadius.all(Radius.circular(10.w)),
+                  border: Border.all(
+                      color: const Color(0xcc000000),
+                      width: 1.h,
+                      style: BorderStyle.solid)),
+              child: TextFormField(
+                initialValue: text,
+                minLines: 6,
+                maxLines: 6,
+                style: TextStyle(fontSize: 17.sp, height: 1.5),
+                decoration: const InputDecoration(
+                  isCollapsed: true,
+                  hintText: '请输入地址信息',
+                  border: InputBorder.none,
+                  counterText: '', //去掉计数
+                  floatingLabelBehavior: FloatingLabelBehavior.never,
+                ),
+                onChanged: (e) {
+                  setState(() {
+                    address.address = e;
+                  });
+                },
+              ),
+            ),
+            DefaultButton(
+              color: const Color(0xffffffff),
+              backColor: const Color(0xFFFF703B),
+              width: 345.w,
+              height: 49.h,
+              text: '保存',
+              onPressed: () {
+                if(address.address==null){
+                  Fluttertoast.showToast(
+                      msg: '请输入地址！');
+                } else{
+                  Fluttertoast.showToast(
+                      msg: '保存成功！');
+                  Get.back();
+                }
+              },
+              margin: const EdgeInsets.all(0),
+              fontSize: 20.sp,
+              radius: 24.5.w,
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/pages/addressList/index.dart

@@ -0,0 +1,127 @@
+import 'package:farmer_client/models/entities/Address.dart';
+import 'package:farmer_client/pages/addressList/widget/AddressCard.dart';
+import 'package:farmer_client/widgets/DefaultButton.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:fluttertoast/fluttertoast.dart';
+import 'package:get/get.dart';
+
+
+class AddressList extends StatefulWidget {
+  const AddressList({Key? key}) : super(key: key);
+
+  @override
+  _AddressList createState() => _AddressList();
+}
+
+class _AddressList extends State<AddressList> {
+
+  List<Address> addressList = [
+    Address.fromJson({'address': '777', 'isDefault': false}),
+    Address.fromJson({'address': '999', 'isDefault': false}),
+    Address.fromJson({'address': '这是一个正经的地址', 'isDefault': false}),
+  ];
+  void onChange(index) {
+    setState(() {
+      addressList.forEach((element) {
+        if (element.isDefault == true) {
+          element.isDefault = false;
+        }
+      });
+      addressList[index].isDefault = true;
+    });
+  }
+  void onDelete(index){
+    showDialog(
+        context: context,
+        builder: (context) {
+          return AlertDialog(
+              title: Text("提示信息"),
+              content: Text("您确定要删除此地址吗?"),
+              actions: <Widget>[
+                TextButton(
+                  child: Text("取消"),
+                  onPressed: () {
+                    print("取消");
+                    Navigator.pop(context, 'Cancle');
+                  },
+                ),
+                TextButton(
+                    child: Text("确定"),
+                    onPressed: () {
+                      // setState(() {
+                      //   addressList.remove(addressList[e]);
+                      // });
+                      Navigator.pop(context, "Ok");
+                      Fluttertoast.showToast(
+                          msg: '删除成功！');
+                    })
+              ]);
+        });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        elevation: 0,
+        centerTitle: true,
+        backgroundColor: Colors.white,
+        title: Text(
+          '地址管理',
+          style: TextStyle(
+              color: Colors.black,
+              fontSize: 17.sp,
+              letterSpacing: 2,
+              fontWeight: FontWeight.bold),
+        ),
+      ),
+      body: ListView(
+        children: [
+          Container(
+            padding: EdgeInsets.all(15.w),
+            child: Column(
+              //左对齐
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Column(
+                    children: addressList
+                        .asMap()
+                        .keys
+                        .map(
+                          (e) => AddressCard(
+                            No: e + 1,
+                            item: addressList[e],
+                            onChange: () {
+                              onChange(e);
+                            },
+                            onEdit: () {
+                              Get.toNamed('/addAddress',arguments: {'item':addressList[e]});
+                            },
+                            onDelete: () {
+                              onDelete(e);
+                            },
+                          ),
+                        )
+                        .toList()),
+                DefaultButton(
+                  color: const Color(0xffffffff),
+                  backColor: const Color(0xFFFF703B),
+                  width: 345.w,
+                  height: 49.h,
+                  text: '+新增收货地址',
+                  onPressed: () {
+                    Get.toNamed('/addAddress');
+                  },
+                  margin: const EdgeInsets.all(0),
+                  fontSize: 20.sp,
+                  radius: 24.5.w,
+                ),
+              ],
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/pages/addressList/widget/AddressCard.dart

@@ -0,0 +1,153 @@
+import 'package:farmer_client/models/entities/Address.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:get/get_rx/src/rx_typedefs/rx_typedefs.dart';
+
+class AddressCard extends StatefulWidget {
+  final Address item;
+  final int No;
+  final GestureTapCallback onChange;
+  final GestureTapCallback onDelete;
+  final GestureTapCallback onEdit;
+  AddressCard(
+      {Key? key,
+      required this.item,
+      required this.No,
+      required this.onChange,
+      required this.onDelete,
+      required this.onEdit})
+      : super(key: key);
+
+  @override
+  _AddressCard createState() =>
+      _AddressCard(item, No, onChange, onDelete, onEdit);
+}
+
+class _AddressCard extends State<AddressCard> {
+  final Address item;
+  final int No;
+  final GestureTapCallback onChange;
+  final GestureTapCallback onDelete;
+  final GestureTapCallback onEdit;
+  _AddressCard(this.item, this.No, this.onChange, this.onDelete, this.onEdit);
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      width: 345.w,
+      padding: EdgeInsets.all(15.w),
+      margin: EdgeInsets.fromLTRB(0, 0, 0, 15.w),
+      decoration: BoxDecoration(
+        color: const Color(0xFFFFFFFF),
+        borderRadius: BorderRadius.all(Radius.circular(10.w)),
+        boxShadow: [
+          BoxShadow(
+              color: const Color(0x19000000),
+              offset: Offset(0, 5.w),
+              blurRadius: 12.w),
+        ],
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Row(
+            children: [
+              if (item.isDefault == true)
+                Container(
+                  margin: EdgeInsets.fromLTRB(0, 0, 5.w, 0),
+                  padding: EdgeInsets.symmetric(vertical: 1.w, horizontal: 5.w),
+                  decoration: BoxDecoration(
+                    color: const Color(0xffff0000),
+                    borderRadius: BorderRadius.all(Radius.circular(5.w)),
+                  ),
+                  child: Text(
+                    '默认地址',
+                    style: TextStyle(
+                      fontSize: 15.sp,
+                      fontWeight: FontWeight.bold,
+                      color: const Color(0xffffffff),
+                    ),
+                  ),
+                ),
+              Text(
+                '我的地址' + No.toString(),
+                style: TextStyle(fontSize: 15.sp, fontWeight: FontWeight.w700),
+              ),
+            ],
+          ),
+          GestureDetector(
+            onTap: onEdit,
+            child: Container(
+              padding: EdgeInsets.symmetric(vertical: 5.h, horizontal: 0),
+              decoration: BoxDecoration(
+                border: Border(
+                  bottom: BorderSide(
+                      width: 0.5.h,
+                      color: const Color(0xcc000000),
+                      style: BorderStyle.solid),
+                ),
+              ),
+              child: Row(
+                mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                children: [
+                  Container(
+                    padding: EdgeInsets.symmetric(vertical: 5.w, horizontal: 0),
+                    width: 282.w,
+                    child: Text(
+                      item.address.toString(),
+                      //最多显示两行
+                      maxLines: 2,
+                      //多余文本用点点点表示
+                      overflow: TextOverflow.ellipsis,
+                      style: TextStyle(
+                        fontSize: 15.sp,
+                        color: const Color(0xff666666),
+                      ),
+                    ),
+                  ),
+                  Image.asset(
+                    'images/icons/edit.png',
+                    width: 33.w,
+                    height: 33.w,
+                  ),
+                ],
+              ),
+            ),
+          ),
+          Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              GestureDetector(
+                onTap: onChange,
+                child: Row(
+                  children: [
+                    const Text('设为默认地址'),
+                    Radio<bool>(
+                        value: true,
+                        activeColor: const Color(0xFFFF703B),
+                        groupValue: item.isDefault,
+                        onChanged: (value){
+                          onChange();
+                        }),
+                  ],
+                ),
+              ),
+              GestureDetector(
+                onTap: onDelete,
+                child: Row(
+                  children: [
+                    const Text('删除'),
+                    Image.asset(
+                      'images/icons/delete.png',
+                      width: 25.w,
+                      height: 25.w,
+                    ),
+                  ],
+                ),
+              ),
+            ],
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/pages/home/index.dart

@@ -1,11 +0,0 @@
-
-import 'package:flutter/material.dart';
-
-class Home extends StatelessWidget {
-  @override
-  Widget build(BuildContext context) {
-    // controller.person
-    return const Scaffold(body: Text("首页"),);
-  }
-
-}

lib/pages/home2.dart

@@ -1,109 +0,0 @@
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';
-
-class Home extends StatefulWidget {
-  const Home({Key? key}) : super(key: key);
-
-  @override
-  _Home createState() => _Home();
-}
-
-class _Home extends State<Home> {
-  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'],
-  ];
-
-  final List _titles = ['首页', '订单列表', '个人中心'];
-  int _currentIndex = 0;
-  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); //选项卡未选中字体颜色
-  int _tabIndex = 0; //选项卡下标
-
-  var _body = [Text('我是首页'), Text('我是订单列表'), Text('我是个人中心')];
-  TextStyle getTabTextStyle(int curIndex) {
-    //设置tabbar 选中和未选中的状态文本
-    if (curIndex == _tabIndex) {
-      return tabTextStyleSelected;
-    }
-    return tabTextStyleNormal;
-  }
-
-  Image getTabIcon(int curIndex) {
-    //设置tabbar选中和未选中的状态图标
-    if (curIndex == _tabIndex) {
-      return Image.asset(
-        images[curIndex][1],
-        width: 20.w,
-        height: 20.w,
-      );
-    }
-    return Image.asset(
-      images[curIndex][0],
-      width: 20.w,
-      height: 20.w,
-    );
-  }
-
-  Image getTabImage(path) {
-    return Image.asset(path, width: 26.w, height: 26.w);
-  }
-
-  // 切换底部选项卡，标题的变化设置
-  Text getTabTitle(int curIndex) {
-    return Text(_titles[curIndex], style: getTabTextStyle(curIndex));
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(
-        elevation: 0,
-        centerTitle: true,
-        backgroundColor: Colors.white,
-        title: Text(
-          '首页',
-          style: TextStyle(
-              color: Colors.black,
-              fontSize: 17.sp,
-              letterSpacing: 2,
-              fontWeight: FontWeight.bold
-          ),
-        ),
-      ),
-      body: _body[_tabIndex],
-      bottomNavigationBar: Container(
-        height: 65.h,
-
-        child: Row(
-          mainAxisAlignment: MainAxisAlignment.spaceAround,
-          children: [
-            Column(
-              children: [
-                getTabIcon(0),
-                getTabTitle(0)
-              ],
-            ),
-            Column(
-              children: [
-                getTabIcon(1),
-                getTabTitle(1)
-              ],
-            ),
-            Column(
-              children: [
-                getTabIcon(2),
-                getTabTitle(2)
-              ],
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}

lib/pages/index.dart

@@ -1,6 +1,6 @@
 
-export 'home/index.dart';
+export 'TabBar/index.dart';
 export 'splash/splash.dart';
 export 'login/login.dart';
 export 'machinery/map/index.dart';
-export 'main/index.dart';
+// export 'main/index.dart';

lib/pages/login/login.dart

@@ -10,6 +10,7 @@ import 'package:get/get.dart';
 import '../../models/entities/person.dart';
 import '../../services/user.dart';
 import '../../widgets/Cell.dart';
+import '../TabBar/index.dart';
 
 
 class MyRouteLogin extends StatefulWidget {
@@ -19,30 +20,30 @@ class MyRouteLogin extends StatefulWidget {
 
 class _RouteLogin extends State<MyRouteLogin> {
 
-var  userInfo= AppController.t.user;
+  var  userInfo= AppController.t.user;
 
-bool isButtonEnable = true; //按钮状态  是否可点击
-String buttonText = '发送验证码'; //初始文本
-int count = 60; //初始倒计时时间
-var timer; //倒计时的计时器
-TextEditingController mController = TextEditingController();
+  bool isButtonEnable = true; //按钮状态  是否可点击
+  String buttonText = '发送验证码'; //初始文本
+  int count = 60; //初始倒计时时间
+  var timer; //倒计时的计时器
+  TextEditingController mController = TextEditingController();
 
 //获取验证码
-void _initTimer() {
-  timer = Timer.periodic(Duration(seconds: 1), (Timer timer) {
-    count--;
-    setState(() {
-      if (count == 0) {
-        timer.cancel(); //倒计时结束取消定时器
-        isButtonEnable = true; //按钮可点击
-        count = 60; //重置时间
-        buttonText = '发送验证码'; //重置按钮文本
-      } else {
-        buttonText = '重新发送($count)'; //更新文本内容
-      }
+  void _initTimer() {
+    timer = Timer.periodic(Duration(seconds: 1), (Timer timer) {
+      count--;
+      setState(() {
+        if (count == 0) {
+          timer.cancel(); //倒计时结束取消定时器
+          isButtonEnable = true; //按钮可点击
+          count = 60; //重置时间
+          buttonText = '发送验证码'; //重置按钮文本
+        } else {
+          buttonText = '重新发送($count)'; //更新文本内容
+        }
+      });
     });
-  });
-}
+  }
 
 
 
@@ -75,12 +76,12 @@ void _initTimer() {
 
 
   void _handlePhone(e) => {
-        setState(() => {handlePhones = e})
-      };
+    setState(() => {handlePhones = e})
+  };
 
   void _handleCode(e) => {
-        setState(() => {handleCodes = e})
-      };
+    setState(() => {handleCodes = e})
+  };
 
 
 
@@ -104,11 +105,11 @@ void _initTimer() {
       Fluttertoast.showToast(msg: '请输入验证码或手机号！');
     }else{
       if(_newValue){
-        print('已同意协议');
         userLogin(handlePhones,handleCodes).then((value) {
-          userInfo(Person.fromJson(value.date.person));
-          Get.back();
+          userInfo(Person.fromJson(value['person']));
+          print('已同意协议');
 
+          Get.off(Home());
         });
       }else{
         Fluttertoast.showToast(msg: '请阅读并同意相关隐私政策！');
@@ -122,14 +123,14 @@ void _initTimer() {
       backgroundColor: Colors.transparent,
       resizeToAvoidBottomInset: false,
       body: Container(
-      decoration: const BoxDecoration(
-        image: DecorationImage(
-          image: AssetImage("images/icon_login.png"),
-          fit: BoxFit.cover,
+        decoration: const BoxDecoration(
+          image: DecorationImage(
+            image: AssetImage("images/icon_login.png"),
+            fit: BoxFit.cover,
+          ),
         ),
-      ),
 
-      child:  Container(
+        child:  Container(
           child: Column(
             mainAxisAlignment: MainAxisAlignment.end,
             crossAxisAlignment: CrossAxisAlignment.start,
@@ -149,7 +150,7 @@ void _initTimer() {
                 ),
               ),
               Cell(
-                  // margin: EdgeInsets.symmetric(horizontal: 13.w),
+                // margin: EdgeInsets.symmetric(horizontal: 13.w),
                   margin: const EdgeInsets.fromLTRB(13, 43, 10, 0),
                   header: Text(
                     "+86",
@@ -166,7 +167,7 @@ void _initTimer() {
                     decoration: const InputDecoration(
                       isCollapsed: true,
                       contentPadding:
-                          EdgeInsets.symmetric(vertical: 8, horizontal: 16),
+                      EdgeInsets.symmetric(vertical: 8, horizontal: 16),
                       labelText: "请输入手机号码",
                       counterText: '', //去掉计数
                       border: InputBorder.none,
@@ -194,11 +195,11 @@ void _initTimer() {
                         backgroundColor: isButtonEnable
                             ? MaterialStateProperty.all(const Color(0xFFFF703B))
                             : MaterialStateProperty.all(
-                                const Color(0xFFCBCBCB)),
+                            const Color(0xFFCBCBCB)),
                         shape: MaterialStateProperty.all(
                             const RoundedRectangleBorder(
                                 borderRadius:
-                                    BorderRadius.all(Radius.circular(10)))),
+                                BorderRadius.all(Radius.circular(10)))),
                       ),
                     ),
                   )),
@@ -223,7 +224,7 @@ void _initTimer() {
                   decoration: const InputDecoration(
                     isCollapsed: true,
                     contentPadding:
-                        EdgeInsets.symmetric(vertical: 8, horizontal: 16),
+                    EdgeInsets.symmetric(vertical: 8, horizontal: 16),
                     labelText: "请输入验证码",
                     border: InputBorder.none,
                     floatingLabelBehavior: FloatingLabelBehavior.never,
@@ -254,11 +255,11 @@ void _initTimer() {
                     style: ButtonStyle(
                       elevation: MaterialStateProperty.all(0),
                       backgroundColor:
-                          MaterialStateProperty.all(const Color(0xFFFF703B)),
+                      MaterialStateProperty.all(const Color(0xFFFF703B)),
                       shape: MaterialStateProperty.all(
                           const RoundedRectangleBorder(
                               borderRadius:
-                                  BorderRadius.all(Radius.circular(24.4)))),
+                              BorderRadius.all(Radius.circular(24.4)))),
                     ),
                   ),
                 ),
@@ -286,10 +287,10 @@ void _initTimer() {
                             text: '文本协议/隐私政策，',
                             style: TextStyle(color: Color(0xffce3800)),
                             recognizer:
-                                TapGestureRecognizer() //踩坑。。。recognizer 是手势交互 除了我现在些的是 点击交互，其他一般都是抽象类。
-                                  ..onTap = () {
-                                    print('阅读已同意！！！');
-                                  },
+                            TapGestureRecognizer() //踩坑。。。recognizer 是手势交互 除了我现在些的是 点击交互，其他一般都是抽象类。
+                              ..onTap = () {
+                                print('阅读已同意！！！');
+                              },
                           ),
                           const TextSpan(
                               text: '确认之后选择此项',

lib/pages/main/index.dart

@@ -1,40 +0,0 @@
-import 'package:farmer_client/pages/main/widgets/OtherColumn.dart';
-import 'package:farmer_client/pages/main/widgets/UserAddress.dart';
-import 'package:farmer_client/pages/main/widgets/UserInfo.dart';
-import 'package:flutter/material.dart';
-
-
-class MainPage extends StatefulWidget {
-  const MainPage({Key? key}) : super(key: key);
-
-  @override
-  State<MainPage> createState() => _MainPageState();
-}
-
-class _MainPageState extends State<MainPage> {
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      resizeToAvoidBottomInset: false,
-      appBar:  AppBar(
-        title:  Text('我的'),
-        leading:  Icon(Icons.arrow_back_ios),
-        // backgroundColor: Colors.transparent,
-        centerTitle: true,
-
-      ),
-      body:Container(
-        alignment: Alignment.center,
-        child:   Column(
-          children: [
-            UserInfo(),
-            UserAddress(),
-            OtherColumn()
-          ],
-        ),
-      )
-
-
-    );
-  }
-}

lib/pages/main/widgets/OtherColumn.dart

@@ -1,97 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';
-
-class OtherColumn extends StatelessWidget {
-  const OtherColumn({Key? key}) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-        alignment: Alignment.center,
-        height: 123.w,
-        width: 345.w,
-        margin: EdgeInsets.fromLTRB(0, 15.w, 0, 15.w),
-        decoration: BoxDecoration(
-          borderRadius: BorderRadius.circular(30),
-          color: Colors.white,
-          boxShadow: [
-            BoxShadow(
-              blurRadius: 10, //阴影范围
-              spreadRadius: 0.1, //阴影浓度
-              color: Colors.grey.withOpacity(0.2), //阴影颜色
-            ),
-          ],
-        ),
-        child: Column(
-          children: [
-            Container(
-                margin: EdgeInsets.fromLTRB(0, 30.w, 0, 20.w),
-                alignment: Alignment.topLeft,
-                decoration: const BoxDecoration(
-                    border: Border(
-                        left: BorderSide(width: 5, color: Color(0xff000000)
-                          // 0x17000000
-                        ))),
-                child: Padding(
-                  padding: EdgeInsets.fromLTRB(12.w, 0, 0, 0),
-                  child: Text(
-                    '地址信息',
-                    style: TextStyle(
-                      color: Color(0xff333333),
-                      fontWeight: FontWeight.bold,
-                      fontSize: 17.sp,
-                    ),
-                  ),
-                )),
-            Row(
-              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-              children: [
-                Container(
-                  child: Row(
-                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                    children: [
-                      Padding(
-                        padding: EdgeInsets.fromLTRB(17.w, 0, 10.w, 0),
-                        child: Image(
-                          image: AssetImage('images/aboutUs.png'),
-                          width: 17.w,
-                          height: 21.w,
-                        ),
-                      ),
-                      Container(
-                        width: 260,
-                        child: GestureDetector(
-                          child: Text(
-                            '请填写详细地址请填写详细地址请填写详细地址',
-                            softWrap: true,
-                            maxLines: 1,
-                            textAlign: TextAlign.left,
-                            overflow: TextOverflow.ellipsis,
-                            style: TextStyle(
-                              fontWeight: FontWeight.bold,
-                              fontSize: 17,
-                            ),
-                          ),
-                          onTap: () {
-                            print('修改地址');
-                          },
-                        ),
-                      )
-                    ],
-                  ),
-                ),
-                Container(
-                  alignment: Alignment.center,
-                  padding: EdgeInsets.fromLTRB(0, 0, 30.w, 0),
-                  child: Image(
-                    image: AssetImage('images/userRight.png'),
-                    width: 10.w,
-                    height: 18.w,
-                  ),
-                ),
-              ],
-            ),
-          ],
-        ));
-  }
-}

lib/pages/order/index.dart → lib/pages/orderInfo/index.dart

@@ -7,14 +7,14 @@ import '../../widgets/OrderInfoCard.dart';
 
 
 
-class OrderPage extends StatefulWidget {
-  const OrderPage({Key? key}) : super(key: key);
+class OrderPageInfo extends StatefulWidget {
+  const OrderPageInfo({Key? key}) : super(key: key);
 
   @override
-  State<OrderPage> createState() => _OrderPageState();
+  State<OrderPageInfo> createState() => _OrderPageInfoState();
 }
 
-class _OrderPageState extends State<OrderPage> {
+class _OrderPageInfoState extends State<OrderPageInfo> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(

lib/pages/splash/splash.dart

@@ -1,16 +1,57 @@
-
-import 'package:farmer_client/pages/splash/widgets/countdown.dart';
-import 'package:flutter/widgets.dart';
-import 'package:get/get.dart';
-
-import '../home/index.dart';
-
-class SplashScreen extends StatelessWidget {
-  handleOnFinish () {
-    Get.off(Home(), routeName: '/');
-  }
-  @override
-  Widget build(BuildContext context) {
-    return countdown(3, handleOnFinish);
-  }
-}
+
+import 'package:farmer_client/pages/splash/widgets/countdown.dart';
+import 'package:get/get.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:flutter/material.dart';
+
+import '../TabBar/index.dart';
+
+class SplashScreen extends StatefulWidget {
+  const SplashScreen({Key? key}) : super(key: key);
+
+  @override
+  State<SplashScreen> createState() => _SplashScreen();
+}
+
+class _SplashScreen extends State<SplashScreen> {
+  handleOnFinish() {
+    Get.off(Home());
+    // Get.toNamed("/addressList");
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+        body: Container(
+          decoration: const BoxDecoration(
+            image: DecorationImage(
+                image: AssetImage("images/splash.png"),
+                fit: BoxFit.cover,
+                alignment: Alignment.topCenter),
+          ),
+          child: Stack(
+            children: [
+              Positioned(
+                right: 15.w,
+                top: 50.h,
+                child: countdown(3, handleOnFinish),
+              ),
+              Positioned(
+                bottom: 0,
+                child: Container(
+                  width: 375.w,
+                  height: 60.w,
+                  child: Center(
+                    child: Image.asset(
+                      'images/logo.png',
+                      width: 218.w,
+                      height: 50.w,
+                    ),
+                  ),
+                ),
+              ),
+            ],
+          ),
+        ));
+  }
+}

lib/pages/splash/widgets/countdown.dart

@@ -1,45 +1,39 @@
-
-import 'dart:async';
-
-import 'package:farmer_client/utils/timer.dart';
-import 'package:flutter/widgets.dart';
-import 'package:get/get.dart';
-
-// Widget countdown(void Function() onFinish) {
-//   int _countdown = 3;
-//   late StateSetter _update;
-//   late Timer _timer;
-//   _timer = setInterval((_) {
-//     if (_countdown <= 1) {
-//       _timer.cancel();
-//       onFinish();
-//       return;
-//     }
-//
-//     _update((){
-//       _countdown -= 1;
-//     });
-//   }, 1000);
-//
-//   return StatefulBuilder(builder: (context, setState) {
-//     _update = setState;
-//     return Text(_countdown.toString());
-//   });
-// }
-
-Widget countdown(int sec, void Function() onFinish) {
-  var _countdown = Rx<int>(sec);
-
-  late Timer _timer;
-  _timer = setInterval((_) {
-    if (_countdown.value <= 1) {
-      _timer.cancel();
-      onFinish();
-      return;
-    }
-
-    _countdown.value -= 1;
-  }, 1000);
-
-  return Obx(() =>Text(_countdown.value.toString()));
-}
+import 'dart:async';
+
+import 'package:farmer_client/utils/timer.dart';
+import 'package:flutter/widgets.dart';
+import 'package:get/get.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+
+Widget countdown(int sec, void Function() onFinish) {
+  var _countdown = Rx<int>(sec);
+
+  late Timer _timer;
+  _timer = setInterval((_) {
+    if (_countdown.value <= 1) {
+      _timer.cancel();
+      onFinish();
+      return;
+    }
+    _countdown.value -= 1;
+  }, 1000);
+
+  return Obx(
+    () => 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/pages/userInfo/index.dart

@@ -0,0 +1,127 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:fluttertoast/fluttertoast.dart';
+import 'package:get/get.dart';
+
+class UserInfo extends StatefulWidget {
+  const UserInfo({Key? key}) : super(key: key);
+
+  @override
+  _UserInfo createState() => _UserInfo();
+}
+
+class _UserInfo extends State<UserInfo> {
+  String name = '';
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        elevation: 0,
+        centerTitle: true,
+        backgroundColor: Colors.white,
+        title: Text(
+          '个人信息',
+          style: TextStyle(
+              color: Colors.black,
+              fontSize: 17.sp,
+              letterSpacing: 2,
+              fontWeight: FontWeight.bold),
+        ),
+      ),
+      body: Container(
+        color: Color(0xFFffffff),
+        padding: EdgeInsets.all(15.w),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Container(
+              margin: EdgeInsets.fromLTRB(0, 0, 0, 40.h),
+              padding: EdgeInsets.symmetric(vertical: 15.h, horizontal: 0),
+              decoration: BoxDecoration(
+                color: const Color(0xFFFFFFFF),
+                boxShadow: [
+                  BoxShadow(
+                    color: const Color(0x1F000000),
+                    offset: Offset(0, 1.w),
+                    blurRadius: 0,
+                  ),
+                ],
+              ),
+              child: Row(
+                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                  children: [
+                    Image.asset(
+                      'images/userMoren.png',
+                      width: 62.w,
+                      height: 62.w,
+                    ),
+                    Text(
+                      '更换头像',
+                      style: TextStyle(
+                          fontSize: 17.sp,
+                          color: Color(0xFF333333),
+                          letterSpacing: 2,
+                          fontWeight: FontWeight.w500),
+                    ),
+                  ]),
+            ),
+            Text(
+              '姓名：',
+              style: TextStyle(
+                  color: const Color(0xFF333333),
+                  fontSize: 17.sp,
+                  letterSpacing: 2,
+                  fontWeight: FontWeight.bold),
+            ),
+            Container(
+                margin: EdgeInsets.fromLTRB(0, 20.h, 0, 40.h),
+                padding: EdgeInsets.symmetric(vertical: 19.h, horizontal: 0),
+                decoration: BoxDecoration(
+                  color: const Color(0xFFFFFFFF),
+                  boxShadow: [
+                    BoxShadow(
+                      color: const Color(0x1F000000),
+                      offset: Offset(0, 1.w),
+                      blurRadius: 0,
+                    ),
+                  ],
+                ),
+                child: Column(
+                  children: [
+                    Row(
+                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                        children: [
+                          Container(
+                            width: 200.w,
+                            child: TextFormField(
+                              initialValue: name,
+                              style: TextStyle(
+                                  color: Color(0xFF333333),
+                                  fontSize: 17.sp,
+                                  letterSpacing: 2,
+                                  fontWeight: FontWeight.bold),
+                              decoration: const InputDecoration(
+                                isCollapsed: true,
+                                hintText: '请输入您的姓名',
+                                border: InputBorder.none,
+                                counterText: '', //去掉计数
+                                floatingLabelBehavior:
+                                    FloatingLabelBehavior.never,
+                              ),
+                              onChanged: (e) {},
+                            ),
+                          ),
+                          Image.asset(
+                            'images/icons/cancel.png',
+                            width: 18.w,
+                            height: 18.w,
+                          )
+                        ]),
+                  ],
+                )),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/routes/pages.dart

@@ -1,9 +1,19 @@
 
+import 'package:farmer_client/pages/ArticleInfo/ArticleInfo.dart';
+import 'package:farmer_client/pages/addAddress/index.dart';
+import 'package:farmer_client/pages/addressList/index.dart';
+import 'package:farmer_client/pages/userInfo/index.dart';
 import 'package:get/get.dart';
-import '../pages/index.dart';//Home
+import '../pages/index.dart';
+
 
 List<GetPage> pages = [
-  // GetPage(name: '/', page: () =>  MachineryMapPage()),
-  GetPage(name: '/splash', page: () => MachineryMapPage()),
-  // GetPage(name: '/login', page: () =>  MyRouteLogin()),
+  GetPage(name: '/', page: () =>  Home()),
+  GetPage(name: '/ArticleInfo', page: () =>  ArticleInfo()),//资讯详情
+  GetPage(name: '/splash', page: () => SplashScreen()),//SplashScreen
+  GetPage(name: '/login', page: () =>  MyRouteLogin()),
+  GetPage(name: '/addressList', page: () =>  AddressList()),
+  GetPage(name: '/addAddress', page: () =>  AddAddress()),
+  GetPage(name: '/userInfo', page: () =>  UserInfo()),
+  GetPage(name: '/machineryMap', page: () =>  MachineryMapPage()),
 ];

lib/widgets/CarsCard.dart

@@ -1,6 +1,10 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:get/get.dart';
+import 'package:get/get_core/src/get_main.dart';
+
+import '../pages/OrderConfirmation/index.dart';
 
 // class CarItem {
 //   late String name;
@@ -83,6 +87,7 @@ class CarsCard extends StatelessWidget {
                     height: 44.h, //+10
                     child: ElevatedButton(
                       onPressed: () {
+                        Get.to(OrderConfirmation());
                         print('点我去预约');
                       },
                       child: const Text(

lib/widgets/DefaultButton.dart

@@ -12,6 +12,7 @@ class DefaultButton extends StatefulWidget {
   final double? fontSize;
   final Color backColor;
   final Color color;
+  final double? radius;
 
   EdgeInsetsGeometry marginDefault =
   const EdgeInsets.fromLTRB(0, 90.0, 0, 30); //按钮默认的margin值
@@ -24,6 +25,7 @@ class DefaultButton extends StatefulWidget {
     required this.width,
     required this.height,
     this.fontSize,
+    this.radius,
     required this.backColor,
     required this.color,
   }) : super(key: key);
@@ -31,9 +33,9 @@ class DefaultButton extends StatefulWidget {
   @override
   State createState() {
     if (margin == null) {
-      return _DefaultButtonState(onPressed, text, marginDefault,width,height,fontSize,backColor,color);
+      return _DefaultButtonState(onPressed, text, marginDefault,width,height,fontSize,backColor,color,radius);
     }
-    return _DefaultButtonState(onPressed, text, margin,width,height,fontSize,backColor,color);
+    return _DefaultButtonState(onPressed, text, margin,width,height,fontSize,backColor,color,radius);
   }
 }
 
@@ -47,6 +49,7 @@ class _DefaultButtonState extends State<DefaultButton> {
   final double? fontSize;
   final Color backColor;
   final Color color;
+  final double? radius;
   _DefaultButtonState(
       this.onPressed,
       this.text,
@@ -55,7 +58,8 @@ class _DefaultButtonState extends State<DefaultButton> {
       this.height,
       this.fontSize,
       this.backColor,
-      this.color
+      this.color,
+      this.radius
       );
 
   @override
@@ -71,9 +75,10 @@ class _DefaultButtonState extends State<DefaultButton> {
           disabledTextColor: const Color(0xF5F6F7ff),
           colorBrightness: Brightness.dark,
           shape:
-          RoundedRectangleBorder(borderRadius: BorderRadius.circular(5.0)),
+          RoundedRectangleBorder(borderRadius: BorderRadius.circular(radius??5)),
           child: Text(text,style:  TextStyle(
               fontSize: fontSize,
+              fontWeight: FontWeight.bold,
               color: color,
           ),),
           textColor: Colors.white,

lib/widgets/OrderListCard.dart

@@ -9,6 +9,7 @@ class OrderListCard extends StatelessWidget {
     return Container(
       width: 375.w,
       height: 345.h,
+      margin: EdgeInsets.fromLTRB(0, 0, 0, 20),
       decoration: const BoxDecoration(color: Colors.white, boxShadow: [
         BoxShadow(
             color: Colors.black12,

pubspec.lock

@@ -167,6 +167,11 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.4"
+  flutter_localizations:
+    dependency: "direct main"
+    description: flutter
+    source: sdk
+    version: "0.0.0"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:
@@ -226,6 +231,13 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "4.0.0"
+  intl:
+    dependency: transitive
+    description:
+      name: intl
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "0.17.0"
   js:
     dependency: transitive
     description:

pubspec.yaml

@@ -20,17 +20,21 @@ version: 1.0.0+1
 environment:
   sdk: ">=2.16.1 <3.0.0"
 
-# Dependencies specify other packages that your package needs in order to work.
+# Dependencies specify other packages that your package needs in orderInfo to work.
 # To automatically upgrade your package dependencies to the latest versions
 # consider running `flutter pub upgrade --major-versions`. Alternatively,
 # dependencies can be manually updated by changing the version numbers below to
 # the latest version available on pub.dev. To see which dependencies have newer
 # versions available, run `flutter pub outdated`.
 dependencies:
+  # 添加国际化
+  flutter_localizations:
+    sdk: flutter
   flutter:
     sdk: flutter
 
 
+
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^1.0.2
@@ -43,6 +47,8 @@ dependencies:
   location: ^4.3.0
   amap_flutter_map: ^3.0.0
 
+
+
 dev_dependencies:
   flutter_test:
     sdk: flutter
@@ -70,14 +76,14 @@ flutter:
   assets:
     - images/icon_login.png
     - images/phoneCode.png
-    - images/HomesNOImgaes.png
-    - images/HomesOFFImgaes.png
-    - images/MineNOImgaes.png
-    - images/MineOFFImgaes.png
-    - images/newsOFFImages.png
-    - images/newsONImages.png
-    - images/OrdersNOImgaes.png
-    - images/OrdersOFFImgaes.png
+    - images/index/HomesNOImgaes.png
+    - images/index/HomesOFFImgaes.png
+    - images/index/MineNOImgaes.png
+    - images/index/MineOFFImgaes.png
+    - images/index/newsOFFImages.png
+    - images/index/newsONImages.png
+    - images/index/OrdersNOImgaes.png
+    - images/index/OrdersOFFImgaes.png
     - images/cars.png
     - images/gpsImgae.png
     - images/ordersLeft.png
@@ -88,6 +94,13 @@ flutter:
     - images/userRight.png
     - images/versionUpdate.png
     - images/locationImage.png
+    - images/logo.png
+    - images/splash.png
+    - images/icons/decorate.png
+    - images/icons/edit.png
+    - images/icons/delete.png
+    - images/icons/cancel.png
+    - images/ordersListImga.png
 
   # An image asset can refer to one or more resolution-specific "variants", see
   # https://flutter.dev/assets-and-images/#resolution-aware.