Merge branch 'master' of http://git.ycjcjy.com/nanyang/farmer_client

lib/components/UI/DefaultButton.dart

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

lib/main.dart

@@ -1,4 +1,3 @@
-
 import 'package:farmer_client/theme.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
@@ -13,21 +12,15 @@ 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(
       designSize: const Size(375, 812),
       minTextAdapt: true,
@@ -43,14 +36,12 @@ class MyApp extends StatelessWidget {
             Locale('zh', ''),
             Locale('en', ''),
           ],
-
           theme: getTheme(),
           initialRoute: '/splash',
           defaultTransition: Transition.native,
           routingCallback: routingCallback,
           initialBinding: AppBindings(),
           getPages: pages,
-
         );
       },
     );

lib/pages/ArticleInfo/ArticleInfo.dart

@@ -7,13 +7,20 @@ class ArticleInfo extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-        resizeToAvoidBottomInset: false,
-        appBar: AppBar(
-          title: Text('资讯'),
-          leading: Icon(Icons.arrow_back_ios),
-          // backgroundColor: Colors.transparent,
-          centerTitle: true,
+      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: Container(
           padding: EdgeInsets.fromLTRB(15, 30, 15, 50),
 

lib/pages/MoreCars/index.dart

@@ -0,0 +1,36 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+
+
+class MoreCars extends StatefulWidget {
+  const MoreCars({Key? key}) : super(key: key);
+
+  @override
+  State<MoreCars> createState() => _MoreCarsState();
+}
+
+class _MoreCarsState extends State<MoreCars> {
+  @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: Container(
+        child: Text('wwwwwwwwwww'),
+      ),
+
+    );
+  }
+}

lib/pages/OrderConfirmation/index.dart

@@ -1,4 +1,3 @@
-import 'package:farmer_client/pages/OrderConfirmation/widgets/timeDatePicker.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';

lib/pages/TabBar/index.dart

@@ -5,7 +5,8 @@ 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';
+import '../TabBar/widgets/home/index.dart';
+
 class Home extends StatefulWidget {
   const Home({Key? key}) : super(key: key);
 
@@ -67,7 +68,7 @@ class _Home extends State<Home> {
   }
 
   //内容
-  var _body = [Text('我是首页'), OrderPage(),Information(), MainPage()];
+  var _body = [HomePage(), OrderPage(),Information(), MainPage()];
 
   Widget tabBar(index) {
     return GestureDetector(
@@ -96,6 +97,7 @@ class _Home extends State<Home> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
+      backgroundColor: Colors.white,
       appBar: AppBar(
         elevation: 0,
         centerTitle: true,

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

@@ -3,6 +3,8 @@ 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);
 
@@ -64,7 +66,7 @@ class _InformationState extends State<Information> {
                 ],
               )),
           onTap: () {
-            Get.toNamed('/ArticleInfo');
+            Get.to(ArticleInfo());
           },
         ),
         GestureDetector(

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

@@ -0,0 +1,110 @@
+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 '../../../../widgets/CarsCard.dart';
+import '../../../../widgets/Search.dart';
+import '../../../MoreCars/index.dart';
+
+
+class HomePage extends StatefulWidget {
+  const HomePage({Key? key}) : super(key: key);
+
+  @override
+  State<HomePage> createState() => _HomePageState();
+}
+
+class _HomePageState extends State<HomePage> {
+  final CarouselController _controller = CarouselController();
+  final List<String> imgList = [
+    'https://images.unsplash.com/photo-1520342868574-5fa3804e551c?ixlib=rb-0.3.5&ixid=eyJhcHBfaWQiOjEyMDd9&s=6ff92caffcdd63681a35134a6770ed3b&auto=format&fit=crop&w=1951&q=80',
+    'https://images.unsplash.com/photo-1522205408450-add114ad53fe?ixlib=rb-0.3.5&ixid=eyJhcHBfaWQiOjEyMDd9&s=368f45b0888aeb0b7b08e3a1084d3ede&auto=format&fit=crop&w=1950&q=80',
+    'https://images.unsplash.com/photo-1519125323398-675f0ddb6308?ixlib=rb-0.3.5&ixid=eyJhcHBfaWQiOjEyMDd9&s=94a1e718d89ca60a6337a6008341ca50&auto=format&fit=crop&w=1950&q=80',
+    'https://images.unsplash.com/photo-1523205771623-e0faa4d2813d?ixlib=rb-0.3.5&ixid=eyJhcHBfaWQiOjEyMDd9&s=89719a0d55dd05e2deae4120227e6efc&auto=format&fit=crop&w=1953&q=80',
+    'https://images.unsplash.com/photo-1508704019882-f9cf40e475b4?ixlib=rb-0.3.5&ixid=eyJhcHBfaWQiOjEyMDd9&s=8c6e5e3aba713b17aa1fe71ab4f0ae5b&auto=format&fit=crop&w=1352&q=80',
+    'https://images.unsplash.com/photo-1519985176271-adb1088fa94c?ixlib=rb-0.3.5&ixid=eyJhcHBfaWQiOjEyMDd9&s=a0c8d632e977f94e5d312d9893258f59&auto=format&fit=crop&w=1355&q=80'
+  ];
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      alignment: Alignment.center,
+      padding: EdgeInsets.fromLTRB(15.w, 0, 15.w, 0),
+      child: ListView(
+        children: [
+          headers(),
+          Container(
+            margin: EdgeInsets.fromLTRB(0, 15, 0, 0),
+            child: CarouselSlider(
+              //API  https://pub.dev/documentation/carousel_slider/latest/carousel_options/CarouselOptions-class.html
+              items:imgList
+                  .map((item) => Container(
+                child: Center(
+                    child:
+                    Image.network(item, 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());
+                        },
+                      ),
+                    )
+
+                  ],
+                ),
+                CarsCard(),
+                CarsCard(),
+                CarsCard(),
+              ],
+            )
+
+          ),
+
+        ],
+      ),
+
+
+    );
+  }
+}

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

@@ -0,0 +1,73 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+
+
+class headers extends StatelessWidget {
+  const headers({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      child:           Row(
+        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,
+                    ),
+                  ),
+                ),
+                const Icon(Icons.arrow_drop_down)
+              ],
+
+            ),
+          ),
+          Container(
+              padding: EdgeInsets.fromLTRB(15.w, 0, 0, 0),
+              width: 260.w,
+              height: 32.w,
+              decoration: const BoxDecoration(
+                  color: Colors.white
+              ),
+              child: GestureDetector(
+                  onTap: (){
+                    print('点击了搜索');
+                  },
+                  child: Container(
+                    decoration: const BoxDecoration(
+                      // color: Colors.red,
+                      color: Color(0x30cccccc),
+                      borderRadius: BorderRadius.all(Radius.circular(25)),
+                    ),
+                    child: Row(
+                      children: [
+                        Padding(padding: EdgeInsets.fromLTRB(15, 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,3 +1,6 @@
+import 'package:get/get.dart';
+import 'package:get_storage/get_storage.dart';
+
 import './widgets/OtherColumn.dart';
 import './widgets/UserAddress.dart';
 import './widgets/UserInfo.dart';
@@ -12,6 +15,7 @@ class MainPage extends StatefulWidget {
 }
 
 class _MainPageState extends State<MainPage> {
+  GetStorage box = GetStorage();
   @override
   Widget build(BuildContext context) {
     return Container(
@@ -41,8 +45,27 @@ class _MainPageState extends State<MainPage> {
                   height: 49.h,
                   child: ElevatedButton(
                     onPressed: () {
-                      // _handelSubmit();
-                      print('用户点击了支付啊阿松大撒地方');
+                      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(
                       "退出登陆",

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

@@ -1,12 +1,13 @@
 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(
+    return Container(
         alignment: Alignment.center,
         width: 345.w,
         margin: EdgeInsets.fromLTRB(0, 15.w, 0, 15.w),
@@ -45,70 +46,74 @@ class OtherColumn extends StatelessWidget {
             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,
+                  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,
+                        ),
                       ),
                     ),
                   ),
-                  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('/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,
+                        ),
                       ),
                     ),
                   ),
@@ -117,16 +122,13 @@ class OtherColumn extends StatelessWidget {
                     width: 310.w,
                     height: 45.w,
                     decoration: const BoxDecoration(
-                        border:Border(
+                        border: Border(
                             bottom:
-                            BorderSide(width: 0.5, color: Color(0x20000000)
-                              // 0x17000000
-                            ))
-                    ),
-
+                                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,
@@ -145,7 +147,6 @@ class OtherColumn extends StatelessWidget {
                       ),
                     ),
                   ),
-
                 ],
               ),
             )

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

@@ -31,7 +31,6 @@ class _OrderPageState extends State<OrderPage> {
                   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),

lib/pages/aboutUs/index.dart

@@ -0,0 +1,102 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+
+class AboutUs extends StatelessWidget {
+  const AboutUs({Key? key}) : super(key: key);
+
+  @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: const Color(0xFFFFFFFF),
+        padding: EdgeInsets.all(15.w),
+        child: Column(
+          children: [
+            Container(
+              margin: EdgeInsets.fromLTRB(0, 0, 0, 30.h),
+              child: Row(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  Image(
+                      image: const AssetImage('images/icons/decorate.png'),
+                      width: 16.5.w),
+                  Text(
+                    '智慧农机的介绍',
+                    style: TextStyle(
+                        fontSize: 20.sp,
+                        fontWeight: FontWeight.bold,
+                        color: const Color(0xFF222222)),
+                  ),
+                  Image(
+                      image: const AssetImage('images/icons/decorate.png'),
+                      width: 16.5.w),
+                ],
+              ),
+            ),
+            Text(
+              '        智慧农机旨在通过新一代物联网，大数据，3S等信息化技术有效整合省市县各级涉农资源',
+              style: TextStyle(
+                  color: Color(0xFF121212),
+                  fontSize: 15.sp,
+                  letterSpacing: 2,
+                  height: 2),
+            ),
+            Text(
+              '        以顶层设计方式建成“一个平台一个中心N个应用”汇聚农业产业。农业“两区”。',
+              style: TextStyle(
+                  color: Color(0xFF121212),
+                  fontSize: 15.sp,
+                  letterSpacing: 2,
+                  height: 2),
+            ),
+            Text(
+              '        物联网、植保、农机、畜牧、农资、农经，科教等各级农业业务应用及数据，形成大农业”数据中心。',
+              style: TextStyle(
+                  color: Color(0xFF121212),
+                  fontSize: 15.sp,
+                  letterSpacing: 2,
+                  height: 2),
+            ),
+            Text(
+              '        构建互联共享的“互联网+农业”信息服务体系以最终实现科学指导农业生产经营管理，政府决策监管和社会公众服务。',
+              style: TextStyle(
+                  color: Color(0xFF121212),
+                  fontSize: 15.sp,
+                  letterSpacing: 2,
+                  height: 2),
+            ),
+            Text(
+              '        智慧农机旨在通过新一代物联网，大数据，3S等信息化技术有效整合省市县各级涉农资源',
+              style: TextStyle(
+                  color: Color(0xFF121212),
+                  fontSize: 15.sp,
+                  letterSpacing: 2,
+                  height: 2),
+            ),
+            Text(
+              '        以顶层设计方式建成“一个平台一个中心N个应用”汇聚农业产业。农业“两区”。',
+              style: TextStyle(
+                  color: Color(0xFF121212),
+                  fontSize: 15.sp,
+                  letterSpacing: 2,
+                  height: 2),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/pages/addressList/index.dart

@@ -36,7 +36,6 @@ class _AddressList extends State<AddressList> {
         context: context,
         builder: (context) {
           return AlertDialog(
-              title: Text("提示信息"),
               content: Text("您确定要删除此地址吗?"),
               actions: <Widget>[
                 TextButton(

lib/pages/agreement/index.dart

@@ -0,0 +1,54 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+
+class Agreement extends StatelessWidget {
+  const Agreement({Key? key}) : super(key: key);
+
+  @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: const Color(0xFFFFFFFF),
+        padding: EdgeInsets.all(15.w),
+        child: Column(
+          children: [
+            Container(
+              margin: EdgeInsets.fromLTRB(0, 0, 0, 30.h),
+              child:  Row(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  Image(image: const AssetImage(
+                      'images/icons/decorate.png'
+                  ),width: 16.5.w),
+                  Text('用户协议',
+                    style: TextStyle(
+                        fontSize: 20.sp,
+                        fontWeight: FontWeight.bold,
+                        color: const Color(0xFF222222)
+                    ),
+                  ),
+                  Image(image: const AssetImage('images/icons/decorate.png'),width: 16.5.w),
+                ],
+              ),
+            ),
+
+          ],
+        ),
+      ),
+    );
+
+  }
+}

lib/pages/orderInfo/index.dart

@@ -6,7 +6,6 @@ import '../../widgets/OrderInfoCard.dart';
 
 
 
-
 class OrderPageInfo extends StatefulWidget {
   const OrderPageInfo({Key? key}) : super(key: key);
 
@@ -19,13 +18,18 @@ class _OrderPageInfoState extends State<OrderPageInfo> {
   Widget build(BuildContext context) {
     return Scaffold(
       resizeToAvoidBottomInset: false,
-      appBar:  AppBar(
-        title:  Text('订单'),
-        leading:  Icon(Icons.arrow_back_ios),
-        backgroundColor: Color(0xff2b9270),
-        // backgroundColor: Colors.transparent,
+      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:      Column(
         children: [

lib/routes/pages.dart

@@ -1,7 +1,9 @@
 
 import 'package:farmer_client/pages/ArticleInfo/ArticleInfo.dart';
+import 'package:farmer_client/pages/aboutUs/index.dart';
 import 'package:farmer_client/pages/addAddress/index.dart';
 import 'package:farmer_client/pages/addressList/index.dart';
+import 'package:farmer_client/pages/agreement/index.dart';
 import 'package:farmer_client/pages/userInfo/index.dart';
 import 'package:get/get.dart';
 import '../pages/index.dart';
@@ -16,4 +18,6 @@ List<GetPage> pages = [
   GetPage(name: '/addAddress', page: () =>  AddAddress()),
   GetPage(name: '/userInfo', page: () =>  UserInfo()),
   GetPage(name: '/machineryMap', page: () =>  MachineryMapPage()),
+  GetPage(name: '/aboutUs', page: () =>  AboutUs()),
+  GetPage(name: '/agreement', page: () =>  Agreement()),
 ];

lib/utils/Request.dart

@@ -1,7 +1,6 @@
 import 'dart:convert';
 
 import 'package:dio/dio.dart';
-import 'package:flutter/foundation.dart';
 import 'package:get/get.dart';
 import 'package:get_storage/get_storage.dart';
 

lib/widgets/CarsCard.dart

@@ -5,6 +5,7 @@ import 'package:get/get.dart';
 import 'package:get/get_core/src/get_main.dart';
 
 import '../pages/OrderConfirmation/index.dart';
+import '../pages/machinery/map/index.dart';
 
 // class CarItem {
 //   late String name;
@@ -24,6 +25,7 @@ class CarsCard extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Container(
+      margin: EdgeInsets.fromLTRB(0, 20, 0, 20),
       decoration: BoxDecoration(
         color: Color(0xfff2f2f2),
       ),
@@ -89,6 +91,7 @@ class CarsCard extends StatelessWidget {
                       onPressed: () {
                         Get.to(OrderConfirmation());
                         print('点我去预约');
+
                       },
                       child: const Text(
                         "预约",
@@ -142,6 +145,7 @@ class CarsCard extends StatelessWidget {
                             ),
                             onTap: () {
                               print('进入地图');
+                              Get.to(MachineryMapPage());
                             },
                           )
                         ],

lib/widgets/OrderInfoCard.dart

@@ -7,203 +7,202 @@ class OrderInfoCard extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Container(
-      width: 345.w,
-      height: 484.5.h,
-      margin: EdgeInsets.fromLTRB(15.w, 17.w, 15.w, 0),
-      decoration: BoxDecoration(
-        color: Colors.white,
-        //设置四周圆角 角度
-        borderRadius: BorderRadius.all(Radius.circular(2.0)),
-        //设置四周边框
-        boxShadow: [
-          BoxShadow(
-            blurRadius: 10, //阴影范围
-            spreadRadius: 0.1, //阴影浓度
-            color: Colors.grey.withOpacity(0.2), //阴影颜色
-          ),
-        ],
-      ),
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Container(
-              margin: EdgeInsets.fromLTRB(15.w, 0, 0, 0),
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  Container(
-                    padding: EdgeInsets.fromLTRB(0, 15, 0, 20),
-                    width: 314.w,
-                    decoration: const BoxDecoration(
-                        border: Border(
-                            bottom:
-                                BorderSide(width: 0.5, color: Color(0x20000000)
-                                    // 0x17000000
-                                    ))),
-                    child: RichText(
-                      text: const TextSpan(children: <InlineSpan>[
-                        TextSpan(
-                            text: '订单编号：',
-                            style: TextStyle(
-                                color: Color(0xff666666),
-                                fontSize: 16,
-                                fontWeight: FontWeight.bold)),
-                        TextSpan(
-                            text: 'XUHUI12345',
-                            style: TextStyle(
-                                color: Color(0xff222222),
-                                fontSize: 16,
-                                fontWeight: FontWeight.bold)),
-                      ]),
+        width: 345.w,
+        height: 484.5.h,
+        margin: EdgeInsets.fromLTRB(15.w, 17.w, 15.w, 0),
+        decoration: BoxDecoration(
+          color: Colors.white,
+          //设置四周圆角 角度
+          borderRadius: BorderRadius.all(Radius.circular(2.0)),
+          //设置四周边框
+          boxShadow: [
+            BoxShadow(
+              blurRadius: 10, //阴影范围
+              spreadRadius: 0.1, //阴影浓度
+              color: Colors.grey.withOpacity(0.2), //阴影颜色
+            ),
+          ],
+        ),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Container(
+                margin: EdgeInsets.fromLTRB(15.w, 0, 0, 0),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Container(
+                      padding: EdgeInsets.fromLTRB(0, 15, 0, 20),
+                      width: 314.w,
+                      decoration: const BoxDecoration(
+                          border: Border(
+                              bottom: BorderSide(
+                                  width: 0.5, color: Color(0x20000000)
+                                  // 0x17000000
+                                  ))),
+                      child: RichText(
+                        text: const TextSpan(children: <InlineSpan>[
+                          TextSpan(
+                              text: '订单编号：',
+                              style: TextStyle(
+                                  color: Color(0xff666666),
+                                  fontSize: 16,
+                                  fontWeight: FontWeight.bold)),
+                          TextSpan(
+                              text: 'XUHUI12345',
+                              style: TextStyle(
+                                  color: Color(0xff222222),
+                                  fontSize: 16,
+                                  fontWeight: FontWeight.bold)),
+                        ]),
+                      ),
                     ),
-                  ),
-                  Padding(
-                    padding: EdgeInsets.fromLTRB(0, 20, 0, 15),
-                    child: RichText(
-                      text: const TextSpan(children: <InlineSpan>[
-                        TextSpan(
-                            text: '农机名称：',
-                            style: TextStyle(
-                                color: Color(0xff666666),
-                                fontSize: 16,
-                                fontWeight: FontWeight.bold)),
-                        TextSpan(
-                            text: '老李家收割机MVGV-005',
-                            style: TextStyle(
-                                color: Color(0xff222222),
-                                fontSize: 16,
-                                fontWeight: FontWeight.bold)),
-                      ]),
+                    Padding(
+                      padding: EdgeInsets.fromLTRB(0, 20, 0, 15),
+                      child: RichText(
+                        text: const TextSpan(children: <InlineSpan>[
+                          TextSpan(
+                              text: '农机名称：',
+                              style: TextStyle(
+                                  color: Color(0xff666666),
+                                  fontSize: 16,
+                                  fontWeight: FontWeight.bold)),
+                          TextSpan(
+                              text: '老李家收割机MVGV-005',
+                              style: TextStyle(
+                                  color: Color(0xff222222),
+                                  fontSize: 16,
+                                  fontWeight: FontWeight.bold)),
+                        ]),
+                      ),
                     ),
-                  ),
-                  Padding(
-                    padding: EdgeInsets.fromLTRB(0, 0, 0, 15),
-                    child: RichText(
-                      text: const TextSpan(children: <InlineSpan>[
-                        TextSpan(
-                            text: '作业面积：',
-                            style: TextStyle(
-                                color: Color(0xff666666),
-                                fontSize: 16,
-                                fontWeight: FontWeight.bold)),
-                        TextSpan(
-                            text: '1',
-                            style: TextStyle(
-                                color: Color(0xff222222),
-                                fontSize: 16,
-                                fontWeight: FontWeight.bold)),
-                      ]),
+                    Padding(
+                      padding: EdgeInsets.fromLTRB(0, 0, 0, 15),
+                      child: RichText(
+                        text: const TextSpan(children: <InlineSpan>[
+                          TextSpan(
+                              text: '作业面积：',
+                              style: TextStyle(
+                                  color: Color(0xff666666),
+                                  fontSize: 16,
+                                  fontWeight: FontWeight.bold)),
+                          TextSpan(
+                              text: '1',
+                              style: TextStyle(
+                                  color: Color(0xff222222),
+                                  fontSize: 16,
+                                  fontWeight: FontWeight.bold)),
+                        ]),
+                      ),
                     ),
-                  ),
-                  Padding(
-                    padding: EdgeInsets.fromLTRB(0, 0, 0, 15),
-                    child: RichText(
-                      text: const TextSpan(children: <InlineSpan>[
-                        TextSpan(
-                            text: '需求时间：',
-                            style: TextStyle(
-                                color: Color(0xff666666),
-                                fontSize: 16,
-                                fontWeight: FontWeight.bold)),
-                        TextSpan(
-                            text: '2018-08-21',
-                            style: TextStyle(
-                                color: Color(0xff222222),
-                                fontSize: 16,
-                                fontWeight: FontWeight.bold)),
-                      ]),
+                    Padding(
+                      padding: EdgeInsets.fromLTRB(0, 0, 0, 15),
+                      child: RichText(
+                        text: const TextSpan(children: <InlineSpan>[
+                          TextSpan(
+                              text: '需求时间：',
+                              style: TextStyle(
+                                  color: Color(0xff666666),
+                                  fontSize: 16,
+                                  fontWeight: FontWeight.bold)),
+                          TextSpan(
+                              text: '2018-08-21',
+                              style: TextStyle(
+                                  color: Color(0xff222222),
+                                  fontSize: 16,
+                                  fontWeight: FontWeight.bold)),
+                        ]),
+                      ),
                     ),
-                  ),
-                  Padding(
-                    padding: EdgeInsets.fromLTRB(0, 0, 0, 20),
-                    child: RichText(
-                      text: const TextSpan(children: <InlineSpan>[
-                        TextSpan(
-                            text: '下单时间：',
-                            style: TextStyle(
-                                color: Color(0xff666666),
-                                fontSize: 16,
-                                fontWeight: FontWeight.bold)),
-                        TextSpan(
-                            text: '2022-04-13',
-                            style: TextStyle(
-                                color: Color(0xff222222),
-                                fontSize: 16,
-                                fontWeight: FontWeight.bold)),
-                      ]),
+                    Padding(
+                      padding: EdgeInsets.fromLTRB(0, 0, 0, 20),
+                      child: RichText(
+                        text: const TextSpan(children: <InlineSpan>[
+                          TextSpan(
+                              text: '下单时间：',
+                              style: TextStyle(
+                                  color: Color(0xff666666),
+                                  fontSize: 16,
+                                  fontWeight: FontWeight.bold)),
+                          TextSpan(
+                              text: '2022-04-13',
+                              style: TextStyle(
+                                  color: Color(0xff222222),
+                                  fontSize: 16,
+                                  fontWeight: FontWeight.bold)),
+                        ]),
+                      ),
                     ),
-                  ),
-                  Padding(
-                    padding: EdgeInsets.fromLTRB(0, 0, 0, 20),
-                    child: RichText(
-                      text: TextSpan(children: <InlineSpan>[
-                        TextSpan(
-                            text: '订单状态：',
-                            style: TextStyle(
-                                color: Color(0xff666666),
-                                fontSize: 16,
-                                fontWeight: FontWeight.bold)),
-                        TextSpan(
-                            text: '待付款',
-                            style: TextStyle(
-                                color: Color(0xff51D4FF),
-                                fontSize: 16,
-                                fontWeight: FontWeight.bold)),
-                      ]),
+                    Padding(
+                      padding: EdgeInsets.fromLTRB(0, 0, 0, 20),
+                      child: RichText(
+                        text: TextSpan(children: <InlineSpan>[
+                          TextSpan(
+                              text: '订单状态：',
+                              style: TextStyle(
+                                  color: Color(0xff666666),
+                                  fontSize: 16,
+                                  fontWeight: FontWeight.bold)),
+                          TextSpan(
+                              text: '待付款',
+                              style: TextStyle(
+                                  color: Color(0xff51D4FF),
+                                  fontSize: 16,
+                                  fontWeight: FontWeight.bold)),
+                        ]),
+                      ),
                     ),
-                  ),
-                  Container(
-                      padding: EdgeInsets.fromLTRB(0, 20, 0, 0),
-                      width: 314.w,
-                      decoration: const BoxDecoration(
-                          border: Border(
-                              top: BorderSide(
-                                  width: 0.8, color: Color(0x20000000)
-                                  // 0x17000000
-                                  ))),
-                      child: Column(
-                        children: [
-                          Row(
-                            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                            children: [
-                              Text('费用：',
-                                  style: TextStyle(
-                                      color: Color(0xff666666),
-                                      fontSize: 16,
-                                      fontWeight: FontWeight.bold)),
-                              Text('8880',
-                                  style: TextStyle(
-                                      color: Color(0xffB61515),
-                                      fontSize: 16,
-                                      fontWeight: FontWeight.bold)),
-                            ],
-                          ),
-                          Padding(padding: EdgeInsets.fromLTRB(0, 30, 0, 0),
-                            child:  Row(
+                    Container(
+                        padding: EdgeInsets.fromLTRB(0, 20, 0, 0),
+                        width: 314.w,
+                        decoration: const BoxDecoration(
+                            border: Border(
+                                top: BorderSide(
+                                    width: 0.8, color: Color(0x20000000)
+                                    // 0x17000000
+                                    ))),
+                        child: Column(
+                          children: [
+                            Row(
                               mainAxisAlignment: MainAxisAlignment.spaceBetween,
                               children: [
-                                Text('状态：',
+                                Text('费用：',
                                     style: TextStyle(
                                         color: Color(0xff666666),
                                         fontSize: 16,
                                         fontWeight: FontWeight.bold)),
-                                Text('待付款',
+                                Text('8880',
                                     style: TextStyle(
-                                        color: Color(0xff51D4FF),
+                                        color: Color(0xffB61515),
                                         fontSize: 16,
                                         fontWeight: FontWeight.bold)),
                               ],
                             ),
-
-                          ),
-
-                        ],
-                      )),
-                ],
-              )),
-
-        ],
-      ),
+                            Padding(
+                              padding: EdgeInsets.fromLTRB(0, 30, 0, 0),
+                              child: Row(
+                                mainAxisAlignment:
+                                    MainAxisAlignment.spaceBetween,
+                                children: [
+                                  Text('状态：',
+                                      style: TextStyle(
+                                          color: Color(0xff666666),
+                                          fontSize: 16,
+                                          fontWeight: FontWeight.bold)),
+                                  Text('待付款',
+                                      style: TextStyle(
+                                          color: Color(0xff51D4FF),
+                                          fontSize: 16,
+                                          fontWeight: FontWeight.bold)),
+                                ],
+                              ),
+                            ),
+                          ],
+                        )),
+                  ],
+                )),
+          ],
+        ),
 
     );
   }

lib/widgets/OrderListCard.dart

@@ -1,5 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:get/get.dart';
+
+import '../pages/OrderConfirmation/index.dart';
+import '../pages/orderInfo/index.dart';
+import 'OrderInfoCard.dart';
 
 class OrderListCard extends StatelessWidget {
   const OrderListCard({Key? key}) : super(key: key);
@@ -74,6 +79,7 @@ class OrderListCard extends StatelessWidget {
                             )),
                         onTap: () {
                           print('进入详情');
+                          Get.to(OrderPageInfo());
                         },
                       )
                     ],

lib/widgets/Search.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 
+
 class Search extends StatefulWidget {
   const Search({Key? key}) : super(key: key);
 
@@ -12,45 +13,50 @@ class _SearchState extends State<Search> {
 
   @override
   Widget build(BuildContext context) {
-    return Column(
-      children: [
-        Container(
-          height: 46,
-          alignment: Alignment.center,
-          child:  TextField(
-            onChanged: (value) {
-              print('打一个字我搜索一下$value');
-            },
-            onEditingComplete: () {
-              FocusScope.of(context).requestFocus(FocusNode());
-              print('点击键盘搜索');
-            },
-            style: const TextStyle(fontSize: 15, color: Colors.black, textBaseline: TextBaseline.alphabetic),
-            decoration: const InputDecoration(
-              isDense: true,
-              prefixIcon: Padding(
-                padding: EdgeInsets.only(left: 0),
-                child:  Icon(Icons.search,),
-              ),
-              fillColor: Color(0x30cccccc),
-              filled: true,
-              enabledBorder: OutlineInputBorder(
-                  borderSide: BorderSide(color: Color(0x00FF0000)),
-                  borderRadius: BorderRadius.all(Radius.circular(100))),
-              hintText: '请输入关键字查询',
-              hintStyle: TextStyle(
-                  textBaseline: TextBaseline.alphabetic, //用于提示文字对齐
-            ),
-              focusedBorder: OutlineInputBorder(
-                  borderSide: BorderSide(color: Color(0x00000000)),
-                  borderRadius: BorderRadius.all(Radius.circular(100))),
+    return LayoutBuilder(builder: (BuildContext context, BoxConstraints constraints){
+      return  Column(
+        children: [
+          Container(
+            decoration: BoxDecoration(
+              color: Colors.white
             ),
+      width: constraints.maxWidth,
+      height: 34,
+      alignment: Alignment.center,
+      child:  TextField(
+              onChanged: (value) {
+                print('打一个字我搜索一下$value');
+              },
+              onEditingComplete: () {
+                FocusScope.of(context).requestFocus(FocusNode());
+                print('点击键盘搜索');
+              },
+              style: const TextStyle(fontSize: 15, color: Colors.black, textBaseline: TextBaseline.alphabetic),
+              decoration: const InputDecoration(
+                isDense: true,
+                prefixIcon: Padding(
+                  padding: EdgeInsets.only(left: 0),
+                  child:  Icon(Icons.search,),
+                ),
+                fillColor: Color(0x30cccccc),
+                filled: true,
+                border: OutlineInputBorder(borderSide: BorderSide.none),
+      contentPadding: EdgeInsets.all(0),
+                enabledBorder: OutlineInputBorder(
+                    borderSide: BorderSide(color: Color(0x00FF0000)),
+                    borderRadius: BorderRadius.all(Radius.circular(100))),
+                hintText: '请输入关键字查询',
+                hintStyle: TextStyle(
+                  textBaseline: TextBaseline.alphabetic, //用于提示文字对齐
+                ),
 
-          ),
-        ),
-      ],
-    );
+              ),
 
+            ),
+          ),
+        ],
+      );
+    });
 
   }
 }

pubspec.lock

@@ -5,154 +5,161 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "39.0.0"
   amap_flutter_base:
     dependency: transitive
     description:
       name: amap_flutter_base
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "3.0.0"
   amap_flutter_map:
     dependency: "direct main"
     description:
       name: amap_flutter_map
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "3.0.0"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "4.0.0"
   args:
     dependency: transitive
     description:
       name: args
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.3.0"
   async:
     dependency: transitive
     description:
       name: async
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.8.2"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.0"
   build:
     dependency: transitive
     description:
       name: build
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.3.0"
   build_config:
     dependency: transitive
     description:
       name: build_config
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.0"
+  carousel_slider:
+    dependency: "direct main"
+    description:
+      name: carousel_slider
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "4.0.0"
   characters:
     dependency: transitive
     description:
       name: characters
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.2.0"
   charcode:
     dependency: transitive
     description:
       name: charcode
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.3.1"
   checked_yaml:
     dependency: transitive
     description:
       name: checked_yaml
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.1"
   clock:
     dependency: transitive
     description:
       name: clock
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.0"
   collection:
     dependency: transitive
     description:
       name: collection
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.15.0"
   convert:
     dependency: transitive
     description:
       name: convert
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "3.0.1"
   crypto:
     dependency: transitive
     description:
       name: crypto
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "3.0.1"
   cupertino_icons:
     dependency: "direct main"
     description:
       name: cupertino_icons
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.4"
   dart_style:
     dependency: transitive
     description:
       name: dart_style
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.2.3"
   dio:
     dependency: "direct main"
     description:
       name: dio
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "4.0.6"
   fake_async:
     dependency: transitive
     description:
       name: fake_async
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.2.0"
   ffi:
     dependency: transitive
     description:
       name: ffi
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.2"
   file:
     dependency: transitive
     description:
       name: file
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "6.1.2"
   flutter:
@@ -164,7 +171,7 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.4"
   flutter_localizations:
@@ -176,14 +183,14 @@ packages:
     dependency: transitive
     description:
       name: flutter_plugin_android_lifecycle
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.5"
   flutter_screenutil:
     dependency: "direct main"
     description:
       name: flutter_screenutil
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "5.4.0+1"
   flutter_test:
@@ -200,217 +207,217 @@ packages:
     dependency: "direct main"
     description:
       name: fluttertoast
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "8.0.9"
   get:
     dependency: "direct main"
     description:
       name: get
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "4.6.1"
   get_storage:
     dependency: "direct main"
     description:
       name: get_storage
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.3"
   glob:
     dependency: transitive
     description:
       name: glob
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.2"
   http_parser:
     dependency: transitive
     description:
       name: http_parser
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "4.0.0"
   intl:
     dependency: transitive
     description:
       name: intl
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.17.0"
   js:
     dependency: transitive
     description:
       name: js
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.6.3"
   json_annotation:
     dependency: transitive
     description:
       name: json_annotation
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "4.4.0"
   json_serializable:
     dependency: "direct main"
     description:
       name: json_serializable
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "6.1.6"
   lints:
     dependency: transitive
     description:
       name: lints
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.1"
   location:
     dependency: "direct main"
     description:
       name: location
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "4.3.0"
   location_platform_interface:
     dependency: transitive
     description:
       name: location_platform_interface
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.3.0"
   location_web:
     dependency: transitive
     description:
       name: location_web
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "3.1.1"
   logging:
     dependency: transitive
     description:
       name: logging
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.2"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.12.11"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.1.3"
   meta:
     dependency: transitive
     description:
       name: meta
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.7.0"
   package_config:
     dependency: transitive
     description:
       name: package_config
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.2"
   path:
     dependency: transitive
     description:
       name: path
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.8.0"
   path_provider:
     dependency: transitive
     description:
       name: path_provider
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.9"
   path_provider_android:
     dependency: transitive
     description:
       name: path_provider_android
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.12"
   path_provider_ios:
     dependency: transitive
     description:
       name: path_provider_ios
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.8"
   path_provider_linux:
     dependency: transitive
     description:
       name: path_provider_linux
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.5"
   path_provider_macos:
     dependency: transitive
     description:
       name: path_provider_macos
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.5"
   path_provider_platform_interface:
     dependency: transitive
     description:
       name: path_provider_platform_interface
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.3"
   path_provider_windows:
     dependency: transitive
     description:
       name: path_provider_windows
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.5"
   platform:
     dependency: transitive
     description:
       name: platform
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "3.1.0"
   plugin_platform_interface:
     dependency: transitive
     description:
       name: plugin_platform_interface
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.2"
   process:
     dependency: transitive
     description:
       name: process
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "4.2.4"
   pub_semver:
     dependency: transitive
     description:
       name: pub_semver
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.1"
   pubspec_parse:
     dependency: transitive
     description:
       name: pubspec_parse
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.2.0"
   sky_engine:
@@ -422,105 +429,105 @@ packages:
     dependency: transitive
     description:
       name: source_gen
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.2.2"
   source_helper:
     dependency: transitive
     description:
       name: source_helper
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.3.2"
   source_span:
     dependency: transitive
     description:
       name: source_span
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.8.1"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.10.0"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.0"
   stream_transform:
     dependency: transitive
     description:
       name: stream_transform
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.0"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.0"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.2.0"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.4.8"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.3.0"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.1"
   watcher:
     dependency: transitive
     description:
       name: watcher
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.1"
   win32:
     dependency: transitive
     description:
       name: win32
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.5.1"
   xdg_directories:
     dependency: transitive
     description:
       name: xdg_directories
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.2.0+1"
   yaml:
     dependency: transitive
     description:
       name: yaml
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "3.1.0"
 sdks:

pubspec.yaml

@@ -46,6 +46,7 @@ dependencies:
   fluttertoast: ^8.0.9
   location: ^4.3.0
   amap_flutter_map: ^3.0.0
+  carousel_slider: ^4.0.0