aaa

lib/pages/MoreCars/index.dart

@@ -1,6 +1,11 @@
+
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 
+import '../../widgets/CarsCard.dart';
+import '../../widgets/Search.dart';
+import '../TabBar/widgets/home/widgets/headers.dart';
+
 
 class MoreCars extends StatefulWidget {
   const MoreCars({Key? key}) : super(key: key);
@@ -9,16 +14,33 @@ class MoreCars extends StatefulWidget {
   State<MoreCars> createState() => _MoreCarsState();
 }
 
-class _MoreCarsState extends State<MoreCars> {
+class _MoreCarsState extends State<MoreCars> with TickerProviderStateMixin  {
+
+  late TabController _controller = TabController(length: tabText.length, vsync: this);
+   List<String> tabText= [
+     '全部',
+     '播种机',
+     '收割机',
+     '挺长名字的农机选项分类',
+  ];
+
+
+
+  @override
+  void initState() {
+    // TODO: implement initState
+    super.initState();
+  }
   @override
   Widget build(BuildContext context) {
+    // _controller=TabController(length: tabText.length, vsync: this);
     return Scaffold(
       resizeToAvoidBottomInset: false,
       appBar: AppBar(
         elevation: 0,
         centerTitle: true,
         backgroundColor: Colors.white,
-        title: Text(
+        title:Text(
           '更多',
           style: TextStyle(
               color: Colors.black,
@@ -26,11 +48,81 @@ class _MoreCarsState extends State<MoreCars> {
               letterSpacing: 2,
               fontWeight: FontWeight.bold),
         ),
+
       ),
-      body: Container(
-        child: Text('wwwwwwwwwww'),
-      ),
+      body: ListView(
+          children: [Column(
+          children: [
+            Container(
+              padding: EdgeInsets.fromLTRB(20, 15, 20, 15),
+
+              decoration: BoxDecoration(
+                color: Colors.white
+              ),
+              // child:Search(),
+              child:          Container(
+                  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(),
+                  )
+              ),
+            ),
+            
+            TabBar(
+              labelStyle: TextStyle(fontSize: ScreenUtil().setSp(19),fontWeight: FontWeight.bold), //选中的样式
+              unselectedLabelStyle: TextStyle(fontSize:ScreenUtil().setSp(16)), //未选中的样式
+              controller: _controller,
+              isScrollable: true, //可滚动
+              indicatorColor: Colors.black, //指示器的颜色
+              labelColor: Colors.black, //选中文字颜色
+              unselectedLabelColor: Color(0xffadadad),
+              // indicatorSize: TabBarIndicatorSize.label, //指示器与文字等宽
+              tabs: tabText.map((e) => Tab(text: e)).toList(),
+              onTap: (int i) {
+                print('当前+${i}');
+              },
+
+            ),
+            Container(
+              child: Column(
+                children: [
+                  CarsCard(),
+                  CarsCard(),
+                  CarsCard(),
+                  CarsCard(),
+                ],
+              )
+              ,
+            )
+
+
+          ],
+        )]
+
+      )
 
     );
   }
 }
+

lib/pages/machinery/widgets/summary.dart

@@ -60,10 +60,6 @@ Widget _title() {
                 ]
             ),
           ),
-
-
-
-
         ),
       )
     ],

lib/routes/pages.dart

@@ -6,13 +6,14 @@ 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/MoreCars/index.dart';
 import '../pages/index.dart';
 
 
 List<GetPage> pages = [
   GetPage(name: '/', page: () =>  Home()),
   GetPage(name: '/ArticleInfo', page: () =>  ArticleInfo()),//资讯详情
-  GetPage(name: '/splash', page: () => MachineryDetailPage()),//SplashScreen
+  GetPage(name: '/splash', page: () => SplashScreen()),//SplashScreen
   GetPage(name: '/login', page: () =>  MyRouteLogin()),
   GetPage(name: '/addressList', page: () =>  AddressList()),
   GetPage(name: '/addAddress', page: () =>  AddAddress()),

lib/widgets/CarsCard.dart

@@ -5,7 +5,9 @@ import 'package:get/get.dart';
 import 'package:get/get_core/src/get_main.dart';
 
 import '../pages/OrderConfirmation/index.dart';
+import '../pages/machinery/detail/index.dart';
 import '../pages/machinery/map/index.dart';
+import 'LinearGradientText.dart';
 
 // class CarItem {
 //   late String name;
@@ -33,12 +35,19 @@ class CarsCard extends StatelessWidget {
       // height: 389.h,
       child: Column(
         children: [
-          Image.network(
-            "http://yz-shigongli.oss-accelerate.aliyuncs.com/2022-03/1648094119154-7b280bbf63105a8e90299e2d79c8c6ee.jpeg",
-            width: 345.w,
-            height: 230.h,
-            fit: BoxFit.cover,
+          GestureDetector(
+            onTap: (){
+              Get.to(MachineryDetailPage());
+
+            },
+            child:Image.network(
+              "http://yz-shigongli.oss-accelerate.aliyuncs.com/2022-03/1648094119154-7b280bbf63105a8e90299e2d79c8c6ee.jpeg",
+              width: 345.w,
+              height: 230.h,
+              fit: BoxFit.cover,
+            ),
           ),
+
           Container(
             padding: EdgeInsets.fromLTRB(15, 20, 0, 0),
             child: Row(
@@ -62,21 +71,35 @@ class CarsCard extends StatelessWidget {
               mainAxisAlignment: MainAxisAlignment.spaceBetween,
               children: <Widget>[
                 Container(
-                  child: RichText(
-                    text: const TextSpan(children: <InlineSpan>[
-                      TextSpan(
-                          text: '8555元/',
-                          style: TextStyle(
-                              color: Color(0xffce3800),
-                              fontSize: 22,
-                              fontWeight: FontWeight.bold)),
-                      TextSpan(
-                          text: '公顷',
-                          style: TextStyle(
-                              color: Color(0xffce3800),
-                              fontSize: 10,
-                              fontWeight: FontWeight.bold)),
-                    ]),
+                  child: LinearGradientText(
+                    colors: const <Color>[
+                      Color(0xFFFA7878),
+                      Color(0xFFB61515),
+                    ],
+                    child: RichText(
+                      text: TextSpan(
+                          children: <InlineSpan>[
+                            TextSpan(
+                                text: "4508",
+                                style: TextStyle(
+                                  fontSize: 22,
+                                  fontWeight: FontWeight.bold,
+                                )),
+                            TextSpan(
+                                text: "元/",
+                                style: TextStyle(
+                                  fontSize: 22,
+                                  fontWeight: FontWeight.bold,
+                                )),
+                            TextSpan(
+                                text: "公顷",
+                                style: TextStyle(
+                                  fontSize: 12,
+                                  fontWeight: FontWeight.bold,
+                                )),
+                          ]
+                      ),
+                    ),
                   ),
                 ),
                 Align(

lib/widgets/OrderInfoCard.dart

@@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 
+import 'LinearGradientText.dart';
+
 class OrderInfoCard extends StatelessWidget {
   const OrderInfoCard({Key? key}) : super(key: key);
 
@@ -136,7 +138,7 @@ class OrderInfoCard extends StatelessWidget {
                     Padding(
                       padding: EdgeInsets.fromLTRB(0, 0, 0, 20),
                       child: RichText(
-                        text: TextSpan(children: <InlineSpan>[
+                        text: const TextSpan(children: <InlineSpan>[
                           TextSpan(
                               text: '订单状态：',
                               style: TextStyle(
@@ -165,25 +167,33 @@ class OrderInfoCard extends StatelessWidget {
                           children: [
                             Row(
                               mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                              children: [
-                                Text('费用：',
+                              children:  [
+                                const Text('费用：',
                                     style: TextStyle(
                                         color: Color(0xff666666),
                                         fontSize: 16,
                                         fontWeight: FontWeight.bold)),
-                                Text('8880',
-                                    style: TextStyle(
-                                        color: Color(0xffB61515),
-                                        fontSize: 16,
-                                        fontWeight: FontWeight.bold)),
+                                LinearGradientText(
+                                  colors: const <Color>[
+                                    Color(0xFFFA7878),
+                                    Color(0xFFB61515),
+                                  ],
+                                  child: const Text('8880',
+                                      style: TextStyle(
+                                          color: Color(0xffB61515),
+                                          fontSize: 16,
+                                          fontWeight: FontWeight.bold)),
+                                ),
+
+
                               ],
                             ),
                             Padding(
                               padding: EdgeInsets.fromLTRB(0, 30, 0, 0),
                               child: Row(
                                 mainAxisAlignment:
-                                    MainAxisAlignment.spaceBetween,
-                                children: [
+                                MainAxisAlignment.spaceBetween,
+                                children: const [
                                   Text('状态：',
                                       style: TextStyle(
                                           color: Color(0xff666666),

lib/widgets/OrderListCard.dart

@@ -4,6 +4,7 @@ import 'package:get/get.dart';
 
 import '../pages/OrderConfirmation/index.dart';
 import '../pages/orderInfo/index.dart';
+import 'LinearGradientText.dart';
 import 'OrderInfoCard.dart';
 
 class OrderListCard extends StatelessWidget {
@@ -194,22 +195,43 @@ class OrderListCard extends StatelessWidget {
                                   fontWeight: FontWeight.bold)),
                         ]),
                       ),
-                      RichText(
-                        text: const TextSpan(children: <InlineSpan>[
-                          TextSpan(
-                              text: '费用：',
-                              style: TextStyle(
-                                  color: Color(0xff666666),
-                                  fontSize: 16,
-                                  fontWeight: FontWeight.bold)),
-                          TextSpan(
-                              text: '850元',
-                              style: TextStyle(
-                                  color: Color(0xffB61515),
-                                  fontSize: 16,
-                                  fontWeight: FontWeight.bold)),
-                        ]),
+                      Container(
+                        child: Row(
+                          children: [
+                            const Text('费用：',style: TextStyle(
+                                color: Color(0xff666666),
+                                fontSize: 16,
+                                fontWeight: FontWeight.bold)),
+                            LinearGradientText(
+                              colors: const <Color>[
+                                Color(0xFFFA7878),
+                                Color(0xFFB61515),
+                              ],
+                              child: RichText(
+                                text: const TextSpan(
+                                    children: <InlineSpan>[
+                                      TextSpan(
+                                          text: "8808",
+                                          style: TextStyle(
+                                            fontSize: 16,
+                                            fontWeight: FontWeight.bold,
+                                          )),
+                                      TextSpan(
+                                          text: "元",
+                                          style: TextStyle(
+                                            fontSize: 16,
+                                            fontWeight: FontWeight.bold,
+                                          )),
+
+                                    ]
+                                ),
+                              ),
+                            ),
+
+                          ],
+                        ),
                       ),
+
                     ],
                   ),
                 ),