'.'

lib/pages/MoreCars/index.dart

@@ -1,10 +1,10 @@
+import 'package:farmer_client/pages/home/widgets/home/widgets/headers.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 
 import '../../widgets/CarsCard.dart';
 import '../../widgets/Search.dart';
-import '../TabBar/widgets/home/widgets/headers.dart';
 
 class MoreCars extends StatefulWidget {
   const MoreCars({Key? key}) : super(key: key);

lib/pages/TabBar/index.dart

@@ -1,133 +0,0 @@
-
-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 '../TabBar/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(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 = [HomePage(), 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(
-      backgroundColor: Colors.white,
-      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

@@ -1,125 +0,0 @@
-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 '../../../ArticleInfo/ArticleInfo.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.to(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/home/index.dart

@@ -1,140 +0,0 @@
-import 'package:carousel_slider/carousel_slider.dart';
-import 'package:farmer_client/pages/TabBar/widgets/home/widgets/headers.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 '../../../../models/app.dart';
-import '../../../../models/entities/CardInfo.dart';
-import '../../../../services/homeAPI.dart';
-import '../../../../widgets/CarsCard.dart';
-import 'package:farmer_client/models/entities/Banners.dart';
-import '../../../MoreCars/index.dart';
-
-class HomePage extends StatefulWidget {
-  const HomePage({Key? key, }) : super(key: key);
-
-
-  @override
-  _HomePageState createState() => _HomePageState();
-}
-
-
-class _HomePageState extends State<HomePage> {
-  final CarouselController _controller = CarouselController();
-  List<Banners> bannerList = [];
-
-  List<CardInfo> machineryLists = [];
-
-
-
-
-  @override
-  void initState() {
-    super.initState();
-    // final location = AppController.t.location;
-    // print('location+$location');
-
-    getHomeBanner('banner').then((value) {
-      setState(() {
-        value.forEach((item) {
-          bannerList.add(Banners.fromJson(item));
-        });
-      });
-    });
-
-    getMachinery('112.087433,32.687692').then((value) {
-      setState(() {
-        value['records'].forEach((item) {
-          machineryLists.add(CardInfo.fromJson(item));
-        });
-      });
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-
-    return Container(
-      alignment: Alignment.center,
-      padding: EdgeInsets.fromLTRB(15.w, 0, 15.w, 0),
-      child: ListView(
-        children: [
-          Container(
-            width: 20.w,
-            child: TypeHeader(
-              type: true,
-            ),
-          ),
-          Container(
-            margin: EdgeInsets.fromLTRB(0, 15, 0, 0),
-            child:
-                CarouselSlider(
-              items: bannerList.map((item) => Container(
-                    child: Center(
-                        child: Image.network(item.thumb.toString(),
-                            fit: BoxFit.cover, width: 350.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, 20, 0, 20),
-              child: Column(
-                children: [
-                  Row(
-                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                    children: [
-                      Container(
-                        child: Row(
-                          children: [
-                            Padding(
-                              padding: EdgeInsets.fromLTRB(0, 0, 8, 0),
-                              child: Image(
-                                image:
-                                    AssetImage('images/icons/carsListImga.png'),
-                                fit: BoxFit.cover,
-                                width: 20.w,
-                              ),
-                            ),
-                            Text(
-                              '农机列表',
-                              style: TextStyle(
-                                  color: Color(0xff222222),
-                                  fontSize: 20.sp,
-                                  fontWeight: FontWeight.bold),
-                            )
-                          ],
-                        ),
-                      ),
-                      Container(
-                        child: GestureDetector(
-                          child: Text('更多 >>'),
-                          onTap: () {
-                            print('点我进入农机搜索/更多页');
-                            Get.to(MoreCars());
-                          },
-                        ),
-                      )
-                    ],
-                  ),
-            Column(
-              children: machineryLists.map((item) =>CarsCard(item:item)).toList(),
-            )
-
-
-
-                ],
-              )),
-        ],
-      ),
-    );
-  }
-}

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

@@ -1,103 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:get/get.dart';
-
-class TypeHeader extends StatefulWidget {
-  TypeHeader({Key? key, required this.type}) : super(key: key);
-
-  final bool type;
-
-  @override
-  State<TypeHeader> createState() => _TypeHeaderState();
-}
-
-
-class _TypeHeaderState extends State<TypeHeader> {
-  @override
-  Widget build(BuildContext context) {
-    if (widget.type) {
-      return Container(
-        child: Row(
-          // mainAxisAlignment: MainAxisAlignment.start,
-          children: [
-            Container(
-              height: 32.w,
-              decoration: BoxDecoration(color: Colors.white),
-              child: Row(
-                children: [
-                  Image(
-                    image: AssetImage('images/gpsImgae.png'),
-                    fit: BoxFit.cover,
-                    width: 14.w,
-                    height: 17.h,
-                  ),
-                  Padding(
-                    padding: EdgeInsets.fromLTRB(5, 0, 0, 0),
-                    child: Text(
-                      '邓州市',
-                      style: TextStyle(
-                        color: Color(0xff202020),
-                        fontSize: 16.sp,
-                        fontWeight: FontWeight.bold,
-                      ),
-                    ),
-                  ),
-                  Container(
-                    padding: EdgeInsets.fromLTRB(0, 0, 10, 0),
-                    child: Icon(Icons.arrow_drop_down),
-                  ),
-                  _initWidget(),
-                ],
-              ),
-            ),
-          ],
-        ),
-      );
-    } else {
-      return _initWidget();
-    }
-  }
-}
-//
-
-class _initWidget extends StatelessWidget {
-  const _initWidget({Key? key}) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-        width: 255.w,
-        height: 32.w,
-        decoration: const BoxDecoration(color: Colors.white),
-        child: GestureDetector(
-            onTap: () {
-              print('点击了搜索');
-              Get.toNamed('/searchPage');
-            },
-            child: Container(
-              decoration: const BoxDecoration(
-                // color: Colors.red,
-                color: Color(0x30cccccc),
-                borderRadius: BorderRadius.all(Radius.circular(25)),
-              ),
-              child: Row(
-                children: const [
-                  Padding(
-                    padding: EdgeInsets.fromLTRB(5, 0, 5, 0),
-                    child: Icon(
-                      Icons.search,
-                      size: 19,
-                      color: Color(0xff666666),
-                    ),
-                  ),
-                  Text(
-                    '请输入关键字查询',
-                    style: TextStyle(color: Color(0xff666666), fontSize: 14),
-                  )
-                ],
-              ),
-            )
-            // Search(),
-            ));
-  }
-}

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

@@ -1,95 +0,0 @@
-import 'package:get/get.dart';
-import 'package:get_storage/get_storage.dart';
-
-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> {
-  GetStorage box = GetStorage();
-  @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: () {
-                      showDialog(
-                          context: context,
-                          builder: (context) {
-                            return AlertDialog(
-                                content: Text("您确定退出登录吗?"),
-                                actions: <Widget>[
-                                  TextButton(
-                                    child: Text("取消"),
-                                    onPressed: () {
-                                      Navigator.pop(context, 'Cancle');
-                                    },
-                                  ),
-                                  TextButton(
-                                      child: Text("确定"),
-                                      onPressed: () {
-                                        Navigator.pop(context, "Ok");
-                                        box.remove('token');
-                                        Get.offNamed('/login');
-                                      })
-                                ]);
-                          });
-                    },
-                    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

@@ -1,161 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:get/get.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: [
-                  GestureDetector(
-                    onTap: () {
-                      Get.toNamed('/aboutUs');
-                    },
-                    child: 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,
-                        ),
-                      ),
-                    ),
-                  ),
-                  GestureDetector(
-                    onTap: () {
-                      Get.toNamed('/agreement');
-                    },
-                    child: 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,
-                        ),
-                      ),
-                    ),
-                  ),
-                  GestureDetector(
-                    onTap: () {
-                      Get.toNamed('/feedback');
-                    },
-                    child: 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/TabBar/widgets/main/widgets/UserAddress.dart

@@ -1,99 +0,0 @@
-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);
-
-  @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,
-                    ),
-                  ),
-                )),
-            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: Text(
-                            '请填写详细地址请填写详细地址请填写详细地址',
-                            softWrap: true,
-                            maxLines: 1,
-                            textAlign: TextAlign.left,
-                            overflow: TextOverflow.ellipsis,
-                            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/TabBar/widgets/main/widgets/UserInfo.dart

@@ -1,112 +0,0 @@
-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);
-
-  @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,
-      decoration: BoxDecoration(
-        image: const DecorationImage(
-          image: AssetImage("images/mineBack.png"),
-          fit: BoxFit.cover,
-        ),
-        borderRadius: BorderRadius.circular(10),
-      ),
-      child: Stack(
-        fit: StackFit.expand,
-        children: [
-          Positioned(
-            top: 0,
-            right: 0,
-            child: Container(
-                alignment: Alignment.center,
-                height: 24.w,
-                width: 93.w,
-                decoration: const BoxDecoration(
-                  borderRadius: BorderRadius.only(
-                      bottomLeft: Radius.circular(20),
-                      topRight: Radius.circular(20)),
-                  color: Color(0x30000000),
-                ),
-                child: GestureDetector(
-                  child: const Text(
-                    '修改个人信息',
-                    style: TextStyle(color: Colors.white),
-                  ),
-                  onTap: () {
-                    Get.toNamed('/userInfo');
-                  },
-                )),
-          ),
-          Row(
-            children: [
-              Column(
-                mainAxisAlignment: MainAxisAlignment.center,
-                children: [
-                  Container(
-                    decoration: BoxDecoration(
-                      shape: BoxShape.circle,
-                      border: Border.all(
-                        color: Colors.white,
-                        width: 2,
-                      ),
-                    ),
-                    margin: EdgeInsets.fromLTRB(30, 0, 15, 0),
-                    alignment: Alignment.center,
-                    child: Image.asset(
-                      "images/userMoren.png",
-                      width: 63.w,
-                    ),
-                  ),
-                ],
-              ),
-              Container(
-                child: Column(
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    Container(
-                      margin: EdgeInsets.fromLTRB(0, 0, 0, 10),
-                      child: Text(
-                        '符西西',
-                        style: TextStyle(
-                          color: Colors.white,
-                          fontSize: 17,
-                        ),
-                      ),
-                    ),
-                    Container(
-                      margin: EdgeInsets.fromLTRB(0, 10, 0, 0),
-                      child: Text(
-                        '17775000245',
-                        style: TextStyle(
-                          color: Colors.white,
-                          fontSize: 17,
-                        ),
-                      ),
-                    ),
-                    // const Text(
-                    //      '点击登陆',
-                    //      style: TextStyle(
-                    //        color: Colors.white,
-                    //        fontSize: 17,
-                    //      ),
-                    //    ),
-                  ],
-                ),
-              ),
-            ],
-          ),
-        ],
-      ),
-    );
-  }
-}

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

@@ -1,74 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';
-
-import '../../../../models/entities/OrderListAll.dart';
-import '../../../../services/orderAPI.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> {
-  List<OrderListAll> orderListItem = [];
-
-  @override
-  void initState() {
-    // TODO: implement initState
-    super.initState();
-    
-    getOrderList(true).then((value) {
-      setState(() {
-        value['records'].forEach((item) {
-          orderListItem.add(OrderListAll.fromJson(item));
-        });
-      });
-    });
-  }
-
-  @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:
-              orderListItem.map((item) => OrderListCard(item: item)).toList(),
-        ),
-      ],
-    );
-  }
-}

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

@@ -1,5 +1,5 @@
 import 'package:carousel_slider/carousel_slider.dart';
-import 'package:farmer_client/pages/TabBar/widgets/home/widgets/headers.dart';
+import 'package:farmer_client/pages/home/widgets/home/widgets/headers.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';

lib/pages/login/login.dart

@@ -1,6 +1,7 @@
 import 'dart:async';
 import 'dart:ffi';
 import 'package:farmer_client/models/app.dart';
+import 'package:farmer_client/pages/home/index.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
@@ -10,7 +11,6 @@ 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 {