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

lib/models/entities/ExtendContent.dart

@@ -0,0 +1,46 @@
+
+class ExtendContent {
+  // 租户号
+  String? extId;
+
+  // 扩展对象类型;message消息表 bannar轮播图 info资讯
+  String? targetType;
+
+  // 拓展对象Id
+  String? targetId;
+
+  // 内容类型;text文本 image图片
+  String? contentType;
+
+  // 内容
+  String? content;
+
+  // 排序
+  int? sort;
+
+  // 创建时间
+  String? createDate;
+
+  ExtendContent();
+
+  ExtendContent.simple({ this.content, this.contentType });
+
+  ExtendContent.fromJson(Map<String, dynamic> json)
+      : extId = json["extId"],
+        targetType = json["targetType"],
+        targetId = json["targetId"],
+        contentType = json["contentType"],
+        content = json["content"],
+        sort = json["sort"],
+        createDate = json["createDate"];
+
+  Map<String, dynamic> toJson() => {
+    'extId' : extId,
+    'targetType' : targetType,
+    'targetId' : targetId,
+    'contentType' : contentType,
+    'content' : content,
+    'sort' : sort,
+    'createDate' : createDate,
+  };
+}

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/detail/index.dart

@@ -18,7 +18,9 @@ class MachineryDetailPage extends StatelessWidget {
 
     return Scaffold(
       appBar: appBar,
-      body: page(context: context, appbarSize: appBar.preferredSize, handleClick: handleClick),
+      body: SingleChildScrollView(
+        child: page(context: context, handleClick: handleClick),
+      ),
     );
   }
 

lib/pages/machinery/detail/widgets/detail.dart

@@ -1,60 +1,67 @@
 
+import 'package:farmer_client/pages/machinery/widgets/DefLayout.dart';
+import 'package:farmer_client/pages/machinery/widgets/RoundButton.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
-
+import 'package:farmer_client/widgets/ExtendContentList.dart';
+import 'package:farmer_client/models/entities/ExtendContent.dart';
 import '../../widgets/summary.dart';
 
-Widget page({ required BuildContext context, required Size appbarSize, required void Function() handleClick}) {
-  final _offset = 20.w;
-  final width = MediaQuery.of(context).size.width;
-  final height = MediaQuery.of(context).size.height
-      - appbarSize.height
-      - MediaQuery.of(context).padding.top;
-  final _bannerHeight = 250.w;
+Widget page({ required BuildContext context, VoidCallback? handleClick}) {
   final img = 'https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/index-icon19.jpg';
 
-  return Stack(
-    alignment: Alignment.topCenter,
+  final list = <ExtendContent>[
+    ExtendContent.simple(content: img, contentType: "image" ),
+    ExtendContent.simple(content: "有时，你可能想要创建一个水平滑动（而不是竖直滑动）的列表。 ListView widget 本身就支持水平列表的创建。我们将会使用标准的 ListView 构造方法，通过指定 scrollDirection 的值为水平方向，来覆盖默认的竖直方向。", contentType: "text" ),
+    ExtendContent.simple(content: img, contentType: "image" ),
+    ExtendContent.simple(content: "有时，你可能想要创建一个水平滑动（而不是竖直滑动）的列表。 ListView widget 本身就支持水平列表的创建。我们将会使用标准的 ListView 构造方法，通过指定 scrollDirection 的值为水平方向，来覆盖默认的竖直方向。", contentType: "text" ),
+    ExtendContent.simple(content: img, contentType: "image" ),
+    ExtendContent.simple(content: "有时，你可能想要创建一个水平滑动（而不是竖直滑动）的列表。 ListView widget 本身就支持水平列表的创建。我们将会使用标准的 ListView 构造方法，通过指定 scrollDirection 的值为水平方向，来覆盖默认的竖直方向。", contentType: "text" ),
+    ExtendContent.simple(content: img, contentType: "image" ),
+  ];
+
+  return DefLayout(
+      head: Image.network(img, fit: BoxFit.cover),
       children: [
-        // 第一个组件用来撑满全屏
-        SizedBox(
-          width: width,
-          height: height,
-        ),
-        Positioned(
-          left: 0,
-          top: 0,
-          child: SizedBox(
-            height: _bannerHeight,
-            child: _banner(img),
-          ),
-        ),
-        Positioned(
-          left: 0,
-          top: _bannerHeight - _offset,
-          child: _content(context),
-        ),
-      ],
+        DefLayout.card(
+          top: DefLayout.headHeight - DefLayout.offset,
+          padding: EdgeInsets.only(top: 45.w, left: 15.w, right: 15.w, bottom: 20.w),
+          child: _content(context, list, handleClick),
+        )
+      ]
   );
 }
 
-Widget _banner(String imgUrl) {
-  return Image.network(imgUrl);
+Widget _content(BuildContext context, List<ExtendContent> list, VoidCallback? handleClick) {
+  return Column(
+    children: [
+      summary(),
+      _sectionHead('农机详情'),
+      ExtendContentList(list: list),
+      SizedBox(height: 20.w,),
+      RoundButton(text: "预约", onPressed: handleClick,)
+    ],
+  );
 }
 
-Widget _content(BuildContext context) {
-  final _border = 20.w;
+Widget _sectionHead(String title) {
+  Widget img = SizedBox(
+    width: 16.w,
+    height: 16.w,
+    child: Image.asset('images/decorate.png'),
+  );
+
   return Container(
-    width: MediaQuery.of(context).size.width,
-    padding: EdgeInsets.only(top: 45.w, left: 15.w, right: 15.w, bottom: 20.w),
-    decoration: BoxDecoration(
-      color: Colors.white,
-        borderRadius: BorderRadius.vertical(top: Radius.circular(_border))
-    ),
-    child: Column(
+    padding: EdgeInsets.fromLTRB(0, 20.w, 0, 20.w),
+    child: Row(
+      mainAxisAlignment: MainAxisAlignment.center,
       children: [
-        summary(),
+        img,
+        SizedBox(width: 20.w),
+        Text(title, style: TextStyle(fontSize: 16.sp, color: const Color(0xFF222222), fontWeight: FontWeight.w500),),
+        SizedBox(width: 20.w),
+        img,
       ],
     ),
   );

lib/pages/machinery/map/index.dart

@@ -16,7 +16,14 @@ class MachineryMapPage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final appBar = AppBar(title: Obx(() => Text(title.value)), centerTitle: true,);
-    return Scaffold(appBar: appBar, body: page(context: context, appbarSize: appBar.preferredSize, handleClick: handleClick),);
+    return Scaffold(
+      appBar: appBar,
+      body: SafeArea(
+        child: SingleChildScrollView (
+          child: page(context: context, handleClick: handleClick),
+        ),
+      )
+    );
   }
   
 }

lib/pages/machinery/map/widgets/detail.dart

@@ -1,4 +1,6 @@
 
+import 'package:farmer_client/pages/machinery/widgets/DefLayout.dart';
+import 'package:farmer_client/pages/machinery/widgets/RoundButton.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
@@ -7,92 +9,38 @@ import 'package:farmer_client/widgets/amap/amap.dart';
 
 import '../../widgets/summary.dart';
 
-Widget page({ required BuildContext context, required Size appbarSize, required void Function() handleClick}) {
+Widget page({ required BuildContext context, VoidCallback? handleClick}) {
   final _offset = 20.w;
   final width = MediaQuery.of(context).size.width;
-  final height = MediaQuery.of(context).size.height
-      - appbarSize.height
-      - MediaQuery.of(context).padding.top;
-  final mapHeight = height * 0.3;
-  final cardHeight = (height - mapHeight) / 2 + _offset;
+  final mapHeight = 226.5.w;
+  final cardHeight = 250.w;
 
 
   final img = 'https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/index-icon19.jpg';
   final LatLng position = LatLng(32.690712, 112.091892);
 
-  return Stack(
-    alignment: Alignment.topCenter,
-    children: [
-      // 第一个组件用来撑满全屏
-      SizedBox(
-        width: width,
-        height: height,
-      ),
-      SizedBox(
-        width: width,
-        height: mapHeight,
-        child: AMap(position: position),
-      ),
-      Positioned(
-        left: 0,
-        top: mapHeight - _offset,
-        height: cardHeight,
-        child: _thumb(context, img),
-      ),
-      Positioned(
-        left: 0,
-        top: mapHeight + cardHeight - 2 * _offset,
-        height: cardHeight,
-        child: _content(context, handleClick),
-      ),
-    ],);
-}
-
-Widget _card(BuildContext context, Widget child) {
-  final _border = 20.w;
-  return Container(
-    width: MediaQuery.of(context).size.width,
-    clipBehavior: Clip.hardEdge,
-    decoration: BoxDecoration(
-        borderRadius: BorderRadius.vertical(top: Radius.circular(_border))
-    ),
-    child: child,
+  return DefLayout(
+      head: AMap(position: position),
+      children: [
+        DefLayout.card(
+            top: DefLayout.headHeight - DefLayout.offset,
+            height: DefLayout.headHeight,
+            child: Image.network(img, fit: BoxFit.cover)
+        ),
+        DefLayout.card(
+            top: (DefLayout.headHeight - DefLayout.offset) * 2,
+            padding: EdgeInsets.only(top: 45.w, left: 15.w, right: 15.w, bottom: 20.w),
+            child: _content(context, handleClick)
+        ),
+      ]
   );
 }
 
-Widget _thumb(BuildContext context, String imgUrl) {
-  return _card(context, Image.network(imgUrl, fit: BoxFit.cover));
-}
-
-
-Widget _button(void Function() handleClick) {
-  return ElevatedButton(
-    child: const Text("预约"),
-    style: ElevatedButton.styleFrom(
-        primary: const Color(0xFFFF703B),
-        textStyle: TextStyle(color: Colors.white, fontSize: 20.sp, letterSpacing: 5.sp),
-        elevation: 0,
-        minimumSize: Size(double.infinity, 49.w),
-        shape: RoundedRectangleBorder(
-          borderRadius: BorderRadius.all(Radius.circular(24.5.w)),
-        )
-    ),
-    onPressed: handleClick,
+Widget _content(BuildContext context, VoidCallback? handleClick) {
+  return Column(
+    children: [
+      summary(),
+      RoundButton(text: "预约", onPressed: handleClick,),
+    ],
   );
-}
-
-Widget _content(BuildContext context, void Function() handleClick) {
-  return _card(context, Container(
-    padding: EdgeInsets.only(top: 45.w, left: 15.w, right: 15.w, bottom: 20.w),
-    decoration: const BoxDecoration(
-      color: Colors.white,
-    ),
-    child: Column(
-
-      children: [
-        summary(),
-        _button(handleClick),
-      ],
-    ),
-  ));
 }

lib/pages/machinery/widgets/DefLayout.dart

@@ -0,0 +1,44 @@
+
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+
+class DefLayout extends StatelessWidget {
+  Widget head;
+  List<Widget> children;
+
+  DefLayout({Key? key, required this.head, required this.children}): super(key: key);
+
+  static double headHeight = 250.w;
+  static double offset = 20.w;
+
+  static Widget card({required double top, required Widget child, double? height, EdgeInsetsGeometry? padding}) {
+    final _border = 20.w;
+    return Container(
+      margin: EdgeInsets.only(top: top),
+      padding: padding,
+      height: height,
+      clipBehavior: Clip.hardEdge,
+      decoration: BoxDecoration(
+          color: Colors.white,
+          borderRadius: BorderRadius.vertical(top: Radius.circular(_border))
+      ),
+      child: child,
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final width = MediaQuery.of(context).size.width;
+
+    return Stack(
+      children: [
+        SizedBox(
+          width: width,
+          height: headHeight,
+          child: head,
+        ),
+        ...children,
+      ],
+    );
+  }
+}

lib/pages/machinery/widgets/RoundButton.dart

@@ -0,0 +1,30 @@
+
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+
+class RoundButton extends StatelessWidget {
+
+  String text;
+  VoidCallback? onPressed;
+
+  RoundButton({Key? key, this.onPressed, required this.text}): super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+
+    return ElevatedButton(
+      child: Text(text),
+      style: ElevatedButton.styleFrom(
+          primary: const Color(0xFFFF703B),
+          textStyle: TextStyle(color: Colors.white, fontSize: 20.sp, letterSpacing: 5.sp),
+          elevation: 0,
+          minimumSize: Size(double.infinity, 49.w),
+          shape: RoundedRectangleBorder(
+            borderRadius: BorderRadius.all(Radius.circular(24.5.w)),
+          )
+      ),
+      onPressed: onPressed,
+    );
+  }
+
+}

lib/pages/machinery/widgets/summary.dart

@@ -23,7 +23,7 @@ Widget _title() {
       Expanded(
           child: Text("收割机001--S001",
               style: TextStyle(
-                color: Color(0xFF222222),
+                color: const Color(0xFF222222),
                 fontSize: 18.sp,
                 fontWeight: FontWeight.bold,
               )),
@@ -60,10 +60,6 @@ Widget _title() {
                 ]
             ),
           ),
-
-
-
-
         ),
       )
     ],
@@ -76,7 +72,7 @@ Widget _desc() {
       Icon(Icons.location_on_outlined, size: 16.sp,),
       Expanded(
         flex: 1,
-        child: Text("距离当前位置2.3公里 >>", style: TextStyle(color: Color(0xFF222222), fontSize: 15.sp),),
+        child: Text("距离当前位置2.3公里 >>", style: TextStyle(color: const Color(0xFF222222), fontSize: 15.sp),),
       ),
     ],
   );
@@ -85,6 +81,6 @@ Widget _desc() {
 Widget _detail() {
   return Container(
     alignment: Alignment.centerLeft,
-    child: Text("农机手1的收割机", style: TextStyle(color: Color(0xFF222222), fontSize: 15.sp),),
+    child: Text("农机手1的收割机", style: TextStyle(color: const Color(0xFF222222), fontSize: 15.sp),),
   );
 }

lib/routes/pages.dart

@@ -9,6 +9,7 @@ import 'package:farmer_client/pages/feedback/index.dart';
 import 'package:farmer_client/pages/orderInfo/index.dart';
 import 'package:farmer_client/pages/userInfo/index.dart';
 import 'package:get/get.dart';
+import '../pages/MoreCars/index.dart';
 import '../pages/index.dart';
 
 
@@ -21,6 +22,7 @@ List<GetPage> pages = [
   GetPage(name: '/addAddress', page: () =>  AddAddress()),
   GetPage(name: '/userInfo', page: () =>  UserInfo()),
   GetPage(name: '/machineryMap', page: () =>  MachineryMapPage()),
+  GetPage(name: '/machineryDetail', page: () =>  MachineryDetailPage()),
   GetPage(name: '/aboutUs', page: () =>  AboutUs()),
   GetPage(name: '/agreement', page: () =>  Agreement()),
   GetPage(name: '/feedback', page: () =>  Feedback()),

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/ExtendContentList.dart

@@ -0,0 +1,41 @@
+
+import 'package:flutter/widgets.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+
+import '../models/entities/ExtendContent.dart';
+
+class ExtendContentList extends StatelessWidget {
+  final List<ExtendContent> list;
+
+  ExtendContentList({ Key? key, required this.list }) : super(key: key);
+  
+  Widget? _image(String? content) {
+    if (null == content || content.isEmpty) return null;
+    return Image.network(content, fit: BoxFit.cover);
+  }
+
+  Widget? _text(String? content) {
+    if (null == content || content.isEmpty) return null;
+    return Text(content);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+
+    List<Widget> _widgets = [];
+    for (var i = 0; i < list.length; i += 1) {
+      if (i != 0 ) {
+        _widgets.add(SizedBox(height: 20.w,));
+      }
+      var item = list[i];
+      _widgets.add(Container(
+        child: item.contentType == "image" ? _image(item.content) : _text(item.content),
+      ));
+    }
+
+    return Column(
+      children: _widgets,
+    );
+  }
+
+}

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,
+                                          )),
+
+                                    ]
+                                ),
+                              ),
+                            ),
+
+                          ],
+                        ),
                       ),
+
                     ],
                   ),
                 ),