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

@@ -35,36 +35,39 @@ class _MoreCarsState extends State<MoreCars> with TickerProviderStateMixin {
     return Scaffold(
         resizeToAvoidBottomInset: false,
         appBar: AppBar(
-          elevation: 0,
           centerTitle: true,
-          backgroundColor: Colors.white,
+          backgroundColor: Colors.transparent,
+          foregroundColor: const Color(0xFF333333),
+          elevation: 0,
+          toolbarHeight: 44.w,
           title: Text(
             '更多',
             style: TextStyle(
-                color: Colors.black,
+                color: const Color(0xFF333333),
+                fontWeight: FontWeight.bold,
                 fontSize: 17.sp,
-                letterSpacing: 2,
-                fontWeight: FontWeight.bold),
+                letterSpacing: 2),
           ),
         ),
-
-
-      body: Container(
-        decoration: BoxDecoration(
-            color: Colors.white
-        ),
-        child:       ListView(
-            children: [Column(
+        body: SafeArea(
+            child: Container(
+          decoration: BoxDecoration(color: Colors.white),
+          child: ListView(children: [
+            Column(
               children: [
                 Container(
                   padding: EdgeInsets.fromLTRB(0, 15, 0, 15),
                   width: 350.w,
-                  child: TypeHeader(type: false,),
+                  child: TypeHeader(
+                    type: false,
+                  ),
                 ),
-
                 TabBar(
-                  labelStyle: TextStyle(fontSize: ScreenUtil().setSp(19),fontWeight: FontWeight.bold), //选中的样式
-                  unselectedLabelStyle: TextStyle(fontSize:ScreenUtil().setSp(16)), //未选中的样式
+                  labelStyle: TextStyle(
+                      fontSize: ScreenUtil().setSp(19),
+                      fontWeight: FontWeight.bold), //选中的样式
+                  unselectedLabelStyle:
+                      TextStyle(fontSize: ScreenUtil().setSp(16)), //未选中的样式
                   controller: _controller,
                   isScrollable: true, //可滚动
                   indicatorColor: Colors.black, //指示器的颜色
@@ -75,24 +78,15 @@ class _MoreCarsState extends State<MoreCars> with TickerProviderStateMixin {
                   onTap: (int i) {
                     print('当前+${i}');
                   },
-
                 ),
                 Container(
                   child: Column(
-                    children: [
-
-                    ],
-                  )
-                  ,
+                    children: [],
+                  ),
                 )
-
-
               ],
-            )]
-
-        ),
-      )
-
-    );
+            )
+          ]),
+        )));
   }
 }

lib/pages/OrderConfirmation/index.dart

@@ -16,7 +16,7 @@ class OrderConfirmation extends BasicPage {
 
   @override
   Widget builder(BuildContext context) {
-    naviTitle = '咨讯';
+    naviTitle = '预约';
     return Container(
       height: 700.h,
       child: Form(

lib/pages/home/index.dart

@@ -20,7 +20,7 @@ class Home extends BasicPage {
       //   return Modal(type: 'dialog', title: '测试', message: '这是一段 message ！', onConfirm: () => print('hahahaha'),);
       // } );
       // Get.dialog(Modal(type: 'dialog', title: '测试', message: '这是一段 message ！', onConfirm: () => print('hahahaha'),));
-      modal.showDialog(title: '测试', content: SizedBox(width: 400, height: 300,), onConfirm: () => false);
+      // modal.showDialog(title: '测试', content: SizedBox(width: 400, height: 300,), onConfirm: () => false);
     }, 2000);
     
     return const HomePage();

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

@@ -50,6 +50,9 @@ class _HomePageState extends State<HomePage> {
   @override
   Widget build(BuildContext context) {
     return Container(
+      decoration: BoxDecoration(
+        color: Colors.white
+      ),
       alignment: Alignment.center,
       padding: EdgeInsets.fromLTRB(15.w, 0, 15.w, 0),
       child: Column(

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

@@ -65,7 +65,7 @@ class _initWidget extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Container(
-        width: 255.w,
+        width: 250.w,
         height: 32.w,
         decoration: const BoxDecoration(color: Colors.white),
         child: GestureDetector(

lib/pages/index.dart

@@ -11,7 +11,7 @@ export 'infomation/index.dart';
 export 'main/index.dart';
 export 'order/index.dart';
 export 'orderInfo/index.dart';
-export 'search/index.jsx.dart';
+export 'search/index.dart';
 export 'userInfo/index.dart';
 export 'splash/splash.dart';
 export 'login/login.dart';

lib/pages/search/index.jsx.dart → lib/pages/search/index.dart

@@ -2,15 +2,15 @@ import 'package:farmer_client/widgets/layout/BasicPage.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 
+import '../../widgets/NullCard.dart';
+
 class SearchPage extends BasicPage {
 
   @override
   Widget builder(BuildContext context) {
     naviTitle = '搜索';
     return Container(
-        decoration: const BoxDecoration(
-          color: Colors.white,
-        ),
+
         child: Column(children: [
           Container(
             width: 345.w,
@@ -48,12 +48,10 @@ class SearchPage extends BasicPage {
               ],
             ),
           ),
-          Container(
-            child: Column(
-              children: [
-                // NullCard(text: '暂无农机信息'),
-              ],
-            ),
+          Column(
+            children: [
+              NullCard(text: '暂无农机信息'),
+            ],
           )
         ]));
   }

lib/widgets/OrderListCard.dart

@@ -11,7 +11,6 @@ import 'LinearGradientText.dart';
 class OrderListCard extends StatefulWidget {
 
   final OrderListAll item;
-
   const OrderListCard({Key? key, required this.item}) : super(key: key);
 
   @override
@@ -19,66 +18,77 @@ class OrderListCard extends StatefulWidget {
 }
 
 
+class StyleObj {
+  String title;
+  Color styleColor;
+  StyleObj ({ required this.title, required this.styleColor});
+}
+
 
 
 class _OrderListCardPages extends State<OrderListCard> {
 
-  final OrderListAll item;
 
-  _OrderListCardPages(this.item);
 
+  @override
+  void initState() {
+    // TODO: implement initState
+    super.initState();
 
-  void orderStates(item){
-    // if (item.payStatus == 0) {
-    //   return {
-    //     title: '待付款',
-    //     styleColor: '#51D4FF'
-    //   };
-    // } else if (item.payStatus == 1 && item.workStatus == 0 && item.dispatchStatus == 0) {
-    //   return {
-    //     title: '已付款',
-    //     styleColor: '#FF703B'
-    //   };
-    // } else if (item.payStatus == 1 && item.dispatchStatus == 1 && item.workStatus == 0) {
-    //   return {
-    //     title: '待作业',
-    //     styleColor: '#FF703B'
-    //   };
-    //
-    // } else if (item.payStatus == 1 && (item.workStatus == 1 || item.workStatus == 2)) {
-    //   return {
-    //     title: '进行中',
-    //     styleColor: '#44F68B'
-    //   };
-    // } else if (item.workStatus == 3 && item.isEvaluated == 0) {
-    //   return {
-    //     title: '待评价',
-    //     styleColor: '#51D4FF'
-    //   };
-    // } if (item.workStatus == 3 && item.isEvaluated == 1 && item.dispatchStatus == 1) {
-    //   return {
-    //     title: '已完成',
-    //     styleColor: '#FF703B'
-    //   };
-    // } else if (item.payStatus == -1 && item.workStatus == 0 && item.isRefund == 1) {
-    //   return {
-    //     title: '已退单',
-    //     styleColor: '#FF703B'
-    //   };
-    // } else if (item.payStatus == 3 && (item.dispatchStatus == 1 || item.dispatchStatus == 0)) {
-    //   return {
-    //     title: '退单申请中',
-    //     styleColor: '#FF703B'
-    //   };
-    // } else {
-    //   return {
-    //     title: '异常',
-    //     styleColor: '#FF0000'
-    //   };
-    // }
+  }
 
+  final OrderListAll item;
+
+  _OrderListCardPages(this.item);
 
 
+  StyleObj  orderStates(){
+    if (item.payStatus == 0) {
+      return StyleObj(
+          title: '待付款',
+          styleColor: Color(0xFF51D4FF)
+      );
+    } else if (item.payStatus == 1 && item.workStatus == 0 && item.dispatchStatus == 0) {
+      return StyleObj(
+          title: '已付款',
+          styleColor: Color(0xFFFF703B)
+      );
+    } else if (item.payStatus == 1 && item.dispatchStatus == 1 && item.workStatus == 0) {
+      return StyleObj(
+          title: '待作业',
+          styleColor: Color(0xFFFF703B)
+      );
+    } else if (item.payStatus == 1 && (item.workStatus == 1 || item.workStatus == 2)) {
+      return StyleObj(
+          title: '进行中',
+          styleColor: Color(0xFF44F68B)
+      );
+    } else if (item.workStatus == 3 && item.isEvaluated == 0) {
+      return StyleObj(
+          title: '待评价',
+          styleColor: Color(0xFF51D4FF)
+      );
+    } if (item.workStatus == 3 && item.isEvaluated == 1 && item.dispatchStatus == 1) {
+      return StyleObj(
+          title: '已完成',
+          styleColor: Color(0xFFFF703B)
+      );
+    } else if (item.payStatus == -1 && item.workStatus == 0 && item.isRefund == 1) {
+      return StyleObj(
+          title: '已退单',
+          styleColor: Color(0xFFFF703B)
+      );
+    } else if (item.payStatus == 3 && (item.dispatchStatus == 1 || item.dispatchStatus == 0)) {
+      return StyleObj(
+          title: '退单申请中',
+          styleColor: Color(0xFFFF703B)
+      );
+    } else {
+      return StyleObj(
+          title: '异常',
+          styleColor: Color(0xFFFF0000)
+      );
+    }
   }
 
 
@@ -252,17 +262,17 @@ class _OrderListCardPages extends State<OrderListCard> {
                     mainAxisAlignment: MainAxisAlignment.spaceBetween,
                     children: [
                       RichText(
-                        text: const TextSpan(children: <InlineSpan>[
+                        text:  TextSpan(children: <InlineSpan>[
                           TextSpan(
                               text: '订单状态：',
                               style: TextStyle(
-                                  color: Color(0xff666666),
+                                  color:Color(0xff666666),
                                   fontSize: 16,
                                   fontWeight: FontWeight.bold)),
                           TextSpan(
-                              text: '待付款',
+                              text: orderStates().title,
                               style: TextStyle(
-                                  color: Color(0xff51D4FF),
+                                  color:orderStates().styleColor,
                                   fontSize: 16,
                                   fontWeight: FontWeight.bold)),
                         ]),
@@ -315,3 +325,4 @@ class _OrderListCardPages extends State<OrderListCard> {
     );
   }
 }
+