gitw

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/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

@@ -1,3 +1,4 @@
+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';
@@ -14,6 +15,16 @@ class HomePage extends StatefulWidget {
 }
 
 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(
@@ -22,6 +33,29 @@ class _HomePageState extends State<HomePage> {
       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(

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

@@ -41,7 +41,7 @@ class headers extends StatelessWidget {
               padding: EdgeInsets.fromLTRB(15.w, 0, 0, 0),
               width: 260.w,
               height: 32.w,
-              decoration: BoxDecoration(
+              decoration: const BoxDecoration(
                   color: Colors.white
               ),
               child: GestureDetector(
@@ -49,7 +49,7 @@ class headers extends StatelessWidget {
                     print('点击了搜索');
                   },
                   child: Container(
-                    decoration: BoxDecoration(
+                    decoration: const BoxDecoration(
                       // color: Colors.red,
                       color: Color(0x30cccccc),
                       borderRadius: BorderRadius.all(Radius.circular(25)),

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;
@@ -90,6 +91,7 @@ class CarsCard extends StatelessWidget {
                       onPressed: () {
                         Get.to(OrderConfirmation());
                         print('点我去预约');
+
                       },
                       child: const Text(
                         "预约",
@@ -143,6 +145,7 @@ class CarsCard extends StatelessWidget {
                             ),
                             onTap: () {
                               print('进入地图');
+                              Get.to(MachineryMapPage());
                             },
                           )
                         ],

lib/widgets/OrderInfoCard.dart

@@ -6,205 +6,219 @@ 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), //阴影颜色
-          ),
-        ],
+    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),
+        ),
       ),
-      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)),
-                      ]),
+      body: 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)),
+                        ]),
+                      ),
                     ),
-                  ),
-                  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,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:get/get.dart';
+
+import '../pages/OrderConfirmation/index.dart';
+import 'OrderInfoCard.dart';
 
 class OrderListCard extends StatelessWidget {
   const OrderListCard({Key? key}) : super(key: key);
@@ -74,6 +78,7 @@ class OrderListCard extends StatelessWidget {
                             )),
                         onTap: () {
                           print('进入详情');
+                          Get.to(OrderInfoCard());
                         },
                       )
                     ],

pubspec.lock

@@ -64,6 +64,13 @@ packages:
       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:

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