indofndfinw

lib/models/entities/NewsInformationModel.dart

@@ -0,0 +1,35 @@
+class NewsInformationModel {
+  String? newsId;
+  String? title;
+  String? typeId;
+  String? typeNam;
+  String? thumb;
+  num? weight;
+  num? status;
+  String? createDate;
+  String? contentList;
+  NewsInformationModel();
+
+  NewsInformationModel.fromJson(Map<String, dynamic> json)
+      : newsId=json["newsId"],
+        title=json["title"],
+        typeId=json["typeId"],
+        typeNam=json["typeNam"],
+        thumb=json["thumb"],
+        weight=json["weight"],
+        status=json["status"],
+        createDate=json["createDate"],
+        contentList=json["contentList"];
+
+  Map<String, dynamic> toJson() => {
+    'newsId':newsId,
+    'title':title,
+    'typeId':typeId,
+    'typeNam':typeNam,
+    'thumb':thumb,
+    'weight':weight,
+    'status':status,
+    'createDate':createDate,
+    'contentList':contentList,
+  };
+}

lib/models/entities/OrderInfoModel.dart

@@ -0,0 +1,90 @@
+class OrderInfoModel {
+  String? orderId;
+  String? orderNo;
+  String? personId;
+  String? personName;
+  String? phone;
+  num? charges;
+  num? price;
+  num? amount;
+  String? machineryId;
+  String? machineryName;
+  String? machineryType;
+  String? typeName;
+  String? address;
+  String? appointmentDate;
+  num? payStatus;
+  num? dispatchStatus;
+  num? workStatus;
+  num? isEvaluated;
+  num? payType;
+  num? isRefund;
+  String? orgId;
+  String? orgName;
+  num? status;
+  String? createDate;
+  String? dispatchId;
+  String? workId;
+  String? workName;
+  OrderInfoModel();
+
+  OrderInfoModel.fromJson(Map<String, dynamic> json)
+      : orderId=json["orderId"],
+        orderNo=json["orderNo"],
+        personId=json["personId"],
+        personName=json["personName"],
+        phone=json["phone"],
+        charges=json["charges"],
+        price=json["price"],
+        amount=json["amount"],
+        machineryId=json["machineryId"],
+        machineryName=json["machineryName"],
+        machineryType=json["machineryType"],
+        typeName=json["typeName"],
+        address=json["address"],
+        appointmentDate=json["appointmentDate"],
+        payStatus=json["payStatus"],
+        dispatchStatus=json["dispatchStatus"],
+        workStatus=json["workStatus"],
+        isEvaluated=json["isEvaluated"],
+        payType=json["payType"],
+        isRefund=json["isRefund"],
+        orgId=json["orgId"],
+        orgName=json["orgName"],
+        status=json["status"],
+        createDate=json["createDate"],
+        dispatchId=json["dispatchId"],
+        workId=json["workId"],
+        workName=json["workName"];
+
+  Map<String, dynamic> toJson() => {
+    'orderId':orderId,
+    'orderNo':orderNo,
+    'personId':personId,
+    'personName':personName,
+    'phone':phone,
+    'charges':charges,
+    'price':price,
+    'amount':amount,
+    'machineryId':machineryId,
+    'machineryName':machineryName,
+    'machineryType':machineryType,
+    'typeName':typeName,
+    'address':address,
+    'appointmentDate':appointmentDate,
+    'payStatus':payStatus,
+    'dispatchStatus':dispatchStatus,
+    'workStatus':workStatus,
+    'isEvaluated':isEvaluated,
+    'payType':payType,
+    'isRefund':isRefund,
+    'orgId':orgId,
+    'orgName':orgName,
+    'status':status,
+    'createDate':createDate,
+    'dispatchId':dispatchId,
+    'workId':workId,
+    'workName':workName,
+  };
+}
+

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

@@ -1,5 +1,6 @@
 import 'package:carousel_slider/carousel_slider.dart';
 import 'package:farmer_client/pages/home/widgets/home/widgets/headers.dart';
+import 'package:farmer_client/widgets/NullCard.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
@@ -55,7 +56,7 @@ class _HomePageState extends State<HomePage> {
       ),
       alignment: Alignment.center,
       padding: EdgeInsets.fromLTRB(15.w, 0, 15.w, 0),
-      child: Column(
+      child:  Column(
         children: [
           TypeHeader(
             type: true,
@@ -120,11 +121,12 @@ class _HomePageState extends State<HomePage> {
                       )
                     ],
                   ),
+                  machineryLists.length>=0?
                   Column(
                     children: machineryLists
                         .map((item) => CarsCard(item: item))
                         .toList(),
-                  )
+                  ):NullCard(text: '暂无农机信息！')
                 ],
               )),
         ],

lib/pages/infomation/index.dart

@@ -2,14 +2,36 @@ import 'package:farmer_client/pages/infomation/widgets/Information/index.dart';
 import 'package:farmer_client/widgets/layout/BasicPage.dart';
 import 'package:flutter/material.dart';
 
+import '../../models/entities/NewsInformationModel.dart';
+import '../../services/news.dart';
+
 class Infomation extends BasicPage {
   Infomation({Key? key}) : super(key: key) {
     tabIndex = 2;
-    naviTitle = '咨讯';
+    naviTitle = '资讯';
   }
+  List<NewsInformationModel> newsListItem = [];
+
+
+@override
+  void beforeShow() {
+    // TODO: implement beforeShow
+    super.beforeShow();
+  getNewsList().then((value) {
+     value['records'].forEach((item) {
+       newsListItem.add(NewsInformationModel.fromJson(item));
+      });
+  });
+
+}
 
   @override
   Widget builder(BuildContext context) {
-    return  Information();
+
+
+    return  Column(
+      mainAxisSize: MainAxisSize.min,
+      children: newsListItem.map((item) => Information(item: item)).toList(),
+    );
   }
 }

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

@@ -3,22 +3,30 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:get/get_core/src/get_main.dart';
 
+import '../../../../models/entities/NewsInformationModel.dart';
+
+import 'package:intl/intl.dart';
 import '../../../ArticleInfo/ArticleInfo.dart';
 
 class Information extends StatefulWidget {
-  const Information({Key? key}) : super(key: key);
+  final NewsInformationModel item;
+  const Information({Key? key, required this.item}) : super(key: key);
 
   @override
   State<Information> createState() => _InformationState();
+
+  // getNewsList
 }
 
 class _InformationState extends State<Information> {
+  late final NewsInformationModel item;
+
+
   @override
   Widget build(BuildContext context) {
     return Column(
       children: [
         // ListTile用不好
-
         GestureDetector(
           child: Container(
               padding: EdgeInsets.fromLTRB(0, 30, 0, 30),
@@ -47,7 +55,7 @@ class _InformationState extends State<Information> {
                       Container(
                         width: 240.w,
                         padding: EdgeInsets.fromLTRB(0, 0, 0, 30),
-                        child: Text("我我就是一个标题，什阿三大苏打333萨达萨达萨达v么特不是",
+                        child: Text('',
                             softWrap: true,
                             maxLines: 2,
                             textAlign: TextAlign.left,
@@ -58,7 +66,8 @@ class _InformationState extends State<Information> {
                             )),
                       ),
                       Container(
-                        child: Text('2022-02-09'),
+
+                        child: Text(''),
                       )
                     ],
                   )
@@ -68,55 +77,6 @@ class _InformationState extends State<Information> {
             Get.to(ArticleInfo());
           },
         ),
-        GestureDetector(
-          child: Container(
-              padding: EdgeInsets.fromLTRB(0, 30, 0, 30),
-              decoration: const BoxDecoration(
-                  border: Border(
-                      bottom: BorderSide(width: 0.5, color: Color(0x20000000)
-                          // 0x17000000
-                          ))),
-              child: Row(
-                children: [
-                  Container(
-                    margin: EdgeInsets.fromLTRB(15, 0, 11, 0),
-                    width: 100,
-                    height: 100,
-                    decoration: BoxDecoration(
-                      image: DecorationImage(
-                        image: AssetImage('images/cars.png'),
-                        fit: BoxFit.cover,
-                      ),
-                      borderRadius: BorderRadius.circular(12),
-                    ),
-                  ),
-                  Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      Container(
-                        width: 240.w,
-                        padding: EdgeInsets.fromLTRB(0, 0, 0, 30),
-                        child: Text("我我就是一个标题，什阿三大苏打333萨达萨达萨达v么特不是",
-                            softWrap: true,
-                            maxLines: 2,
-                            textAlign: TextAlign.left,
-                            overflow: TextOverflow.ellipsis,
-                            style: TextStyle(
-                              fontSize: 17.sp,
-                              fontWeight: FontWeight.bold,
-                            )),
-                      ),
-                      Container(
-                        child: Text('2022-02-09'),
-                      )
-                    ],
-                  )
-                ],
-              )),
-          onTap: () {
-            print('进入资讯详情');
-          },
-        )
       ],
     );
   }

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

@@ -1,3 +1,4 @@
+import 'package:farmer_client/widgets/NullCard.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 
@@ -32,7 +33,8 @@ class _OrderPageState extends State<OrderPage> {
 
   @override
   Widget build(BuildContext context) {
-    return Column(
+    return orderListItem.length >= 0?
+      Column(
       children: [
         Container(
           padding: EdgeInsets.fromLTRB(15, 0, 15, 0),
@@ -69,6 +71,6 @@ class _OrderPageState extends State<OrderPage> {
           orderListItem.map((item) => OrderListCard(item: item)).toList(),
         ),
       ],
-    );
+    ):NullCard(text: '您还没有新的订单！');
   }
 }

lib/pages/orderInfo/index.dart

@@ -4,83 +4,169 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:get/get.dart';
 
+import '../../models/entities/OrderInfoModel.dart';
+import '../../services/orderAPI.dart';
 import '../../widgets/OrderInfoCard.dart';
 import '../../widgets/layout/BasicPage.dart';
 
-// class OrderPageInfo extends StatefulWidget {
-//   const OrderPageInfo({Key? key}) : super(key: key);
-//
-//   @override
-//   State<OrderPageInfo> createState() => _OrderPageInfoState();
+// class OrderContentInfo {
+//   String title;
+//   Color styleColor;
+//   StyleObj ({ required this.title, required this.styleColor});
 // }
 
+
+
 class OrderPageInfo extends BasicPage {
+  String id = '';
+  String orderStateText = '';
+  late Color orderStateColor;
+
+  final orderInfoContent = Rx<OrderInfoModel>(OrderInfoModel());
+
+  // orderStates
+
   @override
+  void beforeShow() {
+    // TODO: implement beforeShow
+    super.beforeShow();
+    if (Get.arguments['id'] != null) {
+      id = Get.arguments['id'];
 
+      orderStateText = Get.arguments['title'];
+      orderStateColor = Get.arguments['styleColor'];
 
-  void onCancel() {
+      orderInfo(id).then((value) {
+        orderInfoContent.value = OrderInfoModel.fromJson(value);
+      });
+    }
+  }
+
+  @override
+  Widget builder(BuildContext context) {
+    naviTitle = '订单详情';
+
+    return Column(
+      children: [
+        Obx(() =>
+            OrderInfoCard(
+                item: orderInfoContent.value,
+                orderStateText: orderStateText,
+                orderStateColor: orderStateColor
+            ),
+        ),
+        _BottomWidget()
+        // orderStateText=='已完成'?  Text('')
+        //     :orderStateText== '进行中' ?Text('')
+        //     :orderStateText=='待评价'? DefaultButton(
+        //   color: const Color(0xffffffff),
+        //   backColor: const Color(0xFFFF703B),
+        //   width: 300.w,
+        //   height: 49.h,
+        //   text: '评价',
+        //   onPressed: () {
+        //     Fluttertoast.showToast(msg: '评价成功！');
+        //     Get.offAllNamed('/');
+        //   },
+        //   margin: const EdgeInsets.all(0),
+        //   fontSize: 20.sp,
+        //   radius: 24.5.w,
+        // )
+        //     :orderStateText=='待作业'?DefaultButton(
+        //   color: const Color(0xffffffff),
+        //   backColor: const Color(0xFFFF703B),
+        //   width: 300.w,
+        //   height: 49.h,
+        //   text: '退单',
+        //   onPressed: () {
+        //     Fluttertoast.showToast(msg: '评价成功！');
+        //     Get.offAllNamed('/');
+        //   },
+        //   margin: const EdgeInsets.all(0),
+        //   fontSize: 20.sp,
+        //   radius: 24.5.w,
+        // )
+        //     :orderStateText=='待付款'?_BottomWidget
+        //     :orderStateText=='已退单'?Text('')
+        //     :orderStateText=='退单申请中'?DefaultButton(
+        //   color: const Color(0xffffffff),
+        //   backColor: const Color(0xFFFF703B),
+        //   width: 300.w,
+        //   height: 49.h,
+        //   text: orderStateText,
+        //   onPressed: () {
+        //     Fluttertoast.showToast(msg: '评价成功！');
+        //     Get.offAllNamed('/');
+        //   },
+        //   margin: const EdgeInsets.all(0),
+        //   fontSize: 20.sp,
+        //   radius: 24.5.w,
+        // ):Text(''),
 
+        // Spacer(),
+      ],
+    );
   }
+}
+
+class _BottomWidget extends StatelessWidget {
+  const _BottomWidget({Key? key}) : super(key: key);
 
   @override
-  Widget builder (BuildContext context) {
-    naviTitle= '订单详情';
-    return  Column(
+  Widget build(BuildContext context) {
+
+    return Container(
+      height: 100.w,
+      alignment: Alignment.bottomCenter,
+      margin: EdgeInsets.fromLTRB(15.w, 0, 15.w, 50.h),
+      child: Row(
+        mainAxisAlignment: MainAxisAlignment.spaceBetween,
         children: [
-          OrderInfoCard(),
-          // Spacer(),
-          Container(
-            height: 100.w,
-            alignment: Alignment.bottomCenter,
-            margin: EdgeInsets.fromLTRB(15.w, 0, 15.w, 50.h),
-            child: Row(
-              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-              children: [
-                GestureDetector(
-                  onTap: () {
-                    onCancel();
-                  },
-                  child: Container(
-                    width: 150.w,
-                    height: 49.h,
-                    decoration: BoxDecoration(
-                        color: const Color(0xffffffff),
-                        border: Border.all(
-                            color: const Color(0xFFFF703B),
-                            width: 1.w,
-                            style: BorderStyle.solid),
-                        borderRadius:
-                            BorderRadius.all(Radius.circular(24.5.w))),
-                    child: Center(
-                      child: Text(
-                        '取消',
-                        style: TextStyle(
-                            fontSize: 20.sp,
-                            color: const Color(0xFFFF703B),
-                            fontWeight: FontWeight.bold),
-                      ),
-                    ),
-                  ),
-                ),
-                DefaultButton(
+          GestureDetector(
+            onTap: () {
+              // onCancel();
+            },
+            child: Container(
+              width: 150.w,
+              height: 49.h,
+              decoration: BoxDecoration(
                   color: const Color(0xffffffff),
-                  backColor: const Color(0xFFFF703B),
-                  width: 150.w,
-                  height: 49.h,
-                  text: '支付',
-                  onPressed: () {
-                    Fluttertoast.showToast(msg: '支付成功！');
-                    Get.offAllNamed('/');
-                  },
-                  margin: const EdgeInsets.all(0),
-                  fontSize: 20.sp,
-                  radius: 24.5.w,
+                  border: Border.all(
+                      color: const Color(0xFFFF703B),
+                      width: 1.w,
+                      style: BorderStyle.solid),
+                  borderRadius:
+                  BorderRadius.all(Radius.circular(24.5.w))),
+              child: Center(
+                child: Text(
+                  '取消',
+                  style: TextStyle(
+                      fontSize: 20.sp,
+                      color: const Color(0xFFFF703B),
+                      fontWeight: FontWeight.bold),
                 ),
-              ],
+              ),
             ),
           ),
+          DefaultButton(
+            color: const Color(0xffffffff),
+            backColor: const Color(0xFFFF703B),
+            width: 150.w,
+            height: 49.h,
+            text: '支付',
+            onPressed: () {
+              Fluttertoast.showToast(msg: '支付成功！');
+              Get.offAllNamed('/');
+            },
+            margin: const EdgeInsets.all(0),
+            fontSize: 20.sp,
+            radius: 24.5.w,
+          ),
         ],
+      ),
     );
-
   }
 }
+
+
+

lib/services/news.dart

@@ -0,0 +1,36 @@
+
+
+import 'package:dio/dio.dart';
+import 'package:farmer_client/utils/Request.dart';
+import 'package:fluttertoast/fluttertoast.dart';
+
+
+/**
+ * 农机资讯
+ * @param {*} data
+ * @returns
+ */
+Future getNewsList()async{
+  return request('/news',options: Options(method: 'GET')).catchError((error) =>
+  { Fluttertoast.showToast(
+      msg: error.error['message']
+  ),});
+
+}
+
+/**
+ * 农机资讯详情
+ * @param {*} data
+ * @returns
+ */
+Future getNewsInfo(String id)async{
+  return request('/news/$id',options: Options(method: 'GET'),).catchError((error) =>
+  { Fluttertoast.showToast(
+      msg: error.error['message']
+  ),});
+
+}
+
+
+
+

lib/services/orderAPI.dart

@@ -11,7 +11,21 @@ import 'package:fluttertoast/fluttertoast.dart';
  * @returns
  */
 Future getOrderList(bool mine)async{
-  return request('/order',options: Options(method: 'GET'),data: { 'mine': mine}).catchError((error) =>
+  return request('/order',options: Options(method: 'GET'),queryParameters: { 'mine': mine}).catchError((error) =>
+  { Fluttertoast.showToast(
+      msg: error.error['message']
+  ),});
+
+}
+
+
+/**
+ * 订单详情
+ * @param {*} data
+ * @returns
+ */
+Future orderInfo(String id)async{
+  return request('/order/$id',options: Options(method: 'GET'),).catchError((error) =>
   { Fluttertoast.showToast(
       msg: error.error['message']
   ),});

lib/widgets/OrderInfoCard.dart

@@ -1,10 +1,21 @@
+import 'package:farmer_client/models/entities/OrderInfoModel.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:get/get.dart';
+import 'package:intl/intl.dart';
 
 import 'LinearGradientText.dart';
 
 class OrderInfoCard extends StatelessWidget {
-  const OrderInfoCard({Key? key}) : super(key: key);
+  final OrderInfoModel item;
+  final String orderStateText;
+  final Color orderStateColor;
+
+ // final  DateTime timeNew=item.appointmentDate;
+
+  const OrderInfoCard({Key? key, required this.item, required this.orderStateColor, required this.orderStateText}) : super(key: key);
+
+
 
   @override
   Widget build(BuildContext context) {
@@ -43,7 +54,7 @@ class OrderInfoCard extends StatelessWidget {
                                   // 0x17000000
                                   ))),
                       child: RichText(
-                        text: const TextSpan(children: <InlineSpan>[
+                        text:  TextSpan(children: <InlineSpan>[
                           TextSpan(
                               text: '订单编号：',
                               style: TextStyle(
@@ -51,7 +62,7 @@ class OrderInfoCard extends StatelessWidget {
                                   fontSize: 16,
                                   fontWeight: FontWeight.bold)),
                           TextSpan(
-                              text: 'XUHUI12345',
+                              text: item.orderNo.toString(),
                               style: TextStyle(
                                   color: Color(0xff222222),
                                   fontSize: 16,
@@ -62,7 +73,7 @@ class OrderInfoCard extends StatelessWidget {
                     Padding(
                       padding: EdgeInsets.fromLTRB(0, 20, 0, 15),
                       child: RichText(
-                        text: const TextSpan(children: <InlineSpan>[
+                        text:  TextSpan(children: <InlineSpan>[
                           TextSpan(
                               text: '农机名称：',
                               style: TextStyle(
@@ -70,7 +81,7 @@ class OrderInfoCard extends StatelessWidget {
                                   fontSize: 16,
                                   fontWeight: FontWeight.bold)),
                           TextSpan(
-                              text: '老李家收割机MVGV-005',
+                              text: item.machineryName.toString(),
                               style: TextStyle(
                                   color: Color(0xff222222),
                                   fontSize: 16,
@@ -81,7 +92,7 @@ class OrderInfoCard extends StatelessWidget {
                     Padding(
                       padding: EdgeInsets.fromLTRB(0, 0, 0, 15),
                       child: RichText(
-                        text: const TextSpan(children: <InlineSpan>[
+                        text:  TextSpan(children: <InlineSpan>[
                           TextSpan(
                               text: '作业面积：',
                               style: TextStyle(
@@ -89,7 +100,7 @@ class OrderInfoCard extends StatelessWidget {
                                   fontSize: 16,
                                   fontWeight: FontWeight.bold)),
                           TextSpan(
-                              text: '1',
+                              text: item.amount.toString(),
                               style: TextStyle(
                                   color: Color(0xff222222),
                                   fontSize: 16,
@@ -100,7 +111,7 @@ class OrderInfoCard extends StatelessWidget {
                     Padding(
                       padding: EdgeInsets.fromLTRB(0, 0, 0, 15),
                       child: RichText(
-                        text: const TextSpan(children: <InlineSpan>[
+                        text:  TextSpan(children: <InlineSpan>[
                           TextSpan(
                               text: '需求时间：',
                               style: TextStyle(
@@ -108,7 +119,8 @@ class OrderInfoCard extends StatelessWidget {
                                   fontSize: 16,
                                   fontWeight: FontWeight.bold)),
                           TextSpan(
-                              text: '2018-08-21',
+                          // '${DateFormat("yyyy-MM-dd").format(item.appointmentDate.toString())}'
+                              text: DateFormat("yyyy-MM-dd").format(DateTime.parse(item.appointmentDate.toString())),
                               style: TextStyle(
                                   color: Color(0xff222222),
                                   fontSize: 16,
@@ -119,7 +131,7 @@ class OrderInfoCard extends StatelessWidget {
                     Padding(
                       padding: EdgeInsets.fromLTRB(0, 0, 0, 20),
                       child: RichText(
-                        text: const TextSpan(children: <InlineSpan>[
+                        text:  TextSpan(children: <InlineSpan>[
                           TextSpan(
                               text: '下单时间：',
                               style: TextStyle(
@@ -127,7 +139,8 @@ class OrderInfoCard extends StatelessWidget {
                                   fontSize: 16,
                                   fontWeight: FontWeight.bold)),
                           TextSpan(
-                              text: '2022-04-13',
+                              text: DateFormat("yyyy-MM-dd").format(DateTime.parse(item.createDate.toString())),
+
                               style: TextStyle(
                                   color: Color(0xff222222),
                                   fontSize: 16,
@@ -138,7 +151,7 @@ class OrderInfoCard extends StatelessWidget {
                     Padding(
                       padding: EdgeInsets.fromLTRB(0, 0, 0, 20),
                       child: RichText(
-                        text: const TextSpan(children: <InlineSpan>[
+                        text:  TextSpan(children: <InlineSpan>[
                           TextSpan(
                               text: '订单状态：',
                               style: TextStyle(
@@ -146,9 +159,9 @@ class OrderInfoCard extends StatelessWidget {
                                   fontSize: 16,
                                   fontWeight: FontWeight.bold)),
                           TextSpan(
-                              text: '待付款',
+                              text: orderStateText,
                               style: TextStyle(
-                                  color: Color(0xff51D4FF),
+                                  color:orderStateColor,
                                   fontSize: 16,
                                   fontWeight: FontWeight.bold)),
                         ]),
@@ -185,7 +198,6 @@ class OrderInfoCard extends StatelessWidget {
                                           fontWeight: FontWeight.bold)),
                                 ),
 
-
                               ],
                             ),
                             Padding(
@@ -193,15 +205,15 @@ class OrderInfoCard extends StatelessWidget {
                               child: Row(
                                 mainAxisAlignment:
                                 MainAxisAlignment.spaceBetween,
-                                children: const [
+                                children:  [
                                   Text('状态：',
                                       style: TextStyle(
                                           color: Color(0xff666666),
                                           fontSize: 16,
                                           fontWeight: FontWeight.bold)),
-                                  Text('待付款',
+                                  Text(orderStateText,
                                       style: TextStyle(
-                                          color: Color(0xff51D4FF),
+                                          color: orderStateColor,
                                           fontSize: 16,
                                           fontWeight: FontWeight.bold)),
                                 ],

lib/widgets/OrderListCard.dart

@@ -5,6 +5,7 @@ import 'package:get/get.dart';
 import '../models/entities/OrderListAll.dart';
 import '../pages/OrderConfirmation/index.dart';
 import '../pages/orderInfo/index.dart';
+import 'package:intl/intl.dart';
 import 'LinearGradientText.dart';
 
 
@@ -28,17 +29,9 @@ class StyleObj {
 
 class _OrderListCardPages extends State<OrderListCard> {
 
-
-
-  @override
-  void initState() {
-    // TODO: implement initState
-    super.initState();
-
-  }
-
   final OrderListAll item;
 
+
   _OrderListCardPages(this.item);
 
 
@@ -94,7 +87,8 @@ class _OrderListCardPages extends State<OrderListCard> {
 
   @override
   Widget build(BuildContext context) {
-    return Container(
+    return
+      Container(
       width: 375.w,
       height: 345.h,
       margin: EdgeInsets.fromLTRB(0, 0, 0, 20),
@@ -162,7 +156,7 @@ class _OrderListCardPages extends State<OrderListCard> {
                             )),
                         onTap: () {
                           print('进入详情');
-                          Get.toNamed('/orderPageInfo');
+                          Get.toNamed('/orderPageInfo',arguments:{'id':item.orderId,'title':orderStates().title,'styleColor':orderStates().styleColor});
                         },
                       )
                     ],
@@ -221,7 +215,8 @@ class _OrderListCardPages extends State<OrderListCard> {
                                   fontSize: 16,
                                   fontWeight: FontWeight.bold)),
                           TextSpan(
-                              text: item.appointmentDate.toString(),
+                              text: DateFormat("yyyy-MM-dd").format(DateTime.parse(item.appointmentDate.toString())),
+
                               style: TextStyle(
                                   color: Color(0xff222222),
                                   fontSize: 16,
@@ -240,7 +235,7 @@ class _OrderListCardPages extends State<OrderListCard> {
                                   fontSize: 16,
                                   fontWeight: FontWeight.bold)),
                           TextSpan(
-                              text: item.createDate.toString(),
+                              text: DateFormat("yyyy-MM-dd").format(DateTime.parse(item.createDate.toString())),
                               style: TextStyle(
                                   color: Color(0xff222222),
                                   fontSize: 16,

pubspec.lock

@@ -5,168 +5,168 @@ 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_location:
     dependency: "direct main"
     description:
       name: amap_flutter_location
-      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.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "4.1.1"
   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:
@@ -178,7 +178,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:
@@ -190,14 +190,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:
@@ -214,231 +214,231 @@ 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"
   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"
   permission_handler:
     dependency: "direct main"
     description:
       name: permission_handler
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "9.2.0"
   permission_handler_android:
     dependency: transitive
     description:
       name: permission_handler_android
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "9.0.2+1"
   permission_handler_apple:
     dependency: transitive
     description:
       name: permission_handler_apple
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "9.0.4"
   permission_handler_platform_interface:
     dependency: transitive
     description:
       name: permission_handler_platform_interface
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "3.7.0"
   permission_handler_windows:
     dependency: transitive
     description:
       name: permission_handler_windows
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.1.0"
   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:
@@ -450,105 +450,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: