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

.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Wed Apr 20 15:13:32 CST 2022
-gradle.version=6.8

lib/models/entities/Address.dart

@@ -1,14 +1,33 @@
 class Address {
   String? address;
   bool? isDefault;
+  String? addressId;
+  String? ownerType;
+  String? ownerId;
+  num? sortNo;
+  String? orgId;
+  num? status;
+
   Address();
 
   Address.fromJson(Map<String, dynamic> json)
       : address = json["address"],
-        isDefault = json["isDefault"];
+        isDefault = json["isDefault"],
+        addressId = json["addressId"],
+        ownerType = json["ownerType"],
+        ownerId = json["ownerId"],
+        sortNo = json["sortNo"],
+        orgId = json["orgId"],
+        status = json["status"];
 
   Map<String, dynamic> toJson() => {
         'address': address,
         'isDefault': isDefault,
+        'addressId': addressId,
+        'ownerType': ownerType,
+        'ownerId': ownerId,
+        'sortNo': sortNo,
+        'orgId': orgId,
+        'status': status,
       };
 }

lib/models/entities/CardInfo.dart

@@ -91,7 +91,7 @@ class ContentImageList {
   String? contentType;
   String? createDate;
   String? extId;
-  String? sort;
+  num? sort;
   String? targetId;
   String? targetType;
   ContentImageList();

lib/pages/OrderConfirmation/index.dart

@@ -8,13 +8,15 @@ import 'package:fluttertoast/fluttertoast.dart';
 import 'package:get/get.dart';
 import 'package:intl/intl.dart';
 
+import '../../models/entities/CardListModel.dart';
 import '../../models/entities/OrderInfoModel.dart';
+import '../../services/homeAPI.dart';
 import '../../services/orderAPI.dart';
 
 class OrderConfirmation extends BasicPage {
   TextEditingController _unameController = TextEditingController();
   GlobalKey _formKey = GlobalKey<FormState>();
-
+  String markId = '';
   final selectDate = Rx<DateTime>(DateTime.now()); //选择的时间
   final workingArea = Rx<int>(0);
   AddressController addressController = AddressController.t;
@@ -26,8 +28,16 @@ class OrderConfirmation extends BasicPage {
     // TODO: implement beforeShow
     super.beforeShow();
     if(Get.arguments['item']!=null){
-      item.value=Get.arguments['item'];
+      item(Get.arguments['item']);
     }else{
+      markId=Get.arguments['id'];
+      getMachineryInfo(markId, '122.08400000000002,37.421998333333335', true).then((value) {
+        item(CardInfo.fromJson(value));
+
+      });
+
+      // item(CardInfo.fromJson(Get.arguments['item']));
+
       return;
     }
   }
@@ -53,12 +63,11 @@ class OrderConfirmation extends BasicPage {
         'appointmentDate': '${DateFormat("yyyy-MM-dd").format(selectDate.value)} 08:00:00',
       };
       generateOrder(data).then((value) {
-        orderInfo.value=OrderInfoModel.fromJson(value);
+        orderInfo(OrderInfoModel.fromJson(value));
         Fluttertoast.showToast(
             msg: '预约成功'
         );
-        Get.to('/OrderInfoCard',arguments: {'id':orderInfo.value.orderId});
-
+        Get.offNamed('/orderPageInfo',arguments: {'id':orderInfo().orderId});
 
       });
       //验证通过提交数据
@@ -88,7 +97,7 @@ class OrderConfirmation extends BasicPage {
               ),
             ),
             TextFormField(
-              // autofocus: true,
+              autofocus: false,
               keyboardType: TextInputType.number,
               controller: _unameController,
               decoration: const InputDecoration(
@@ -108,7 +117,7 @@ class OrderConfirmation extends BasicPage {
                 hintText: "请输入具体面积(公顷)",
               ),
               onChanged: (e) {
-                workingArea.value = int.parse(e);
+                workingArea(int.parse(e));
               },
               // 校验用户名
               validator: (v) {
@@ -152,19 +161,19 @@ class OrderConfirmation extends BasicPage {
                             helpText: '请选择作业开始时间',
                             cancelText: '取消',
                             confirmText: '确定',
-                            initialDate: selectDate.value == null
+                            initialDate: selectDate() == null
                                 ? DateTime.now()
-                                : selectDate.value,
+                                : selectDate(),
                             firstDate: DateTime.now(),
                             lastDate: DateTime(2030),
                           );
-                          selectDate.value = handleChnage!;
+                          selectDate(handleChnage!);
                           print('${selectDate}+');
                         },
                         child: Obx(()=>
                             Text(selectDate == null
                                 ? '请选择日期'
-                                : '${DateFormat("yyyy-MM-dd").format(selectDate.value)}'),
+                                : '${DateFormat("yyyy-MM-dd").format(selectDate())}'),
                         )
 
                       ),

lib/pages/addAddress/index.dart

@@ -1,4 +1,5 @@
 import 'package:farmer_client/models/entities/Address.dart';
+import 'package:farmer_client/services/address.dart';
 import 'package:farmer_client/widgets/DefaultButton.dart';
 import 'package:farmer_client/widgets/layout/BasicPage.dart';
 import 'package:flutter/material.dart';
@@ -10,13 +11,16 @@ class AddAddress extends BasicPage {
 
   final address =Rx<Address>(Address());
   late String text = '';
+  late String id = '';
 
   @override
   void beforeShow() {
     super.beforeShow();
     if (Get.arguments != null) {
-      address.value = Get.arguments['item'];
-      text = address.value.address.toString();
+      print( Get.arguments['item']);
+      // address(Get.arguments['item']);
+      text = Get.arguments['item'];
+      id = Get.arguments['id'];
     }
   }
 
@@ -58,7 +62,7 @@ class AddAddress extends BasicPage {
                 floatingLabelBehavior: FloatingLabelBehavior.never,
               ),
               onChanged: (e) {
-                  address.value.address = e;
+                  address().address=e;
               },
             ),
           ),
@@ -73,9 +77,23 @@ class AddAddress extends BasicPage {
                 Fluttertoast.showToast(
                     msg: '请输入地址！');
               } else{
-                Fluttertoast.showToast(
-                    msg: '保存成功！');
-                Get.back();
+                if(text==''){
+                  addressSave(address().address.toString()).then((value){
+                    Fluttertoast.showToast(
+                        msg: '添加地址成功！');
+                    Get.back();
+                  });
+
+                }else{
+                  addressUpdate(id,address().address.toString()).then((value) {
+                    Fluttertoast.showToast(
+                        msg: '修改地址成功！');
+                    Get.back();
+                  });
+                  
+                }
+
+
               }
             },
             margin: const EdgeInsets.all(0),

lib/pages/addressList/index.dart

@@ -8,35 +8,57 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:get/get.dart';
 
+import '../../services/address.dart';
+
 class AddressList extends BasicPage {
   bool isBack = false;
   AddressController addressController=AddressController.t;
+  final addressList = Rx<List<Address>>([]);
+
 
   @override
   void beforeShow() {
     super.beforeShow();
+    getAddress().then((value) {
+      final list = <Address>[];
+      value['records'].forEach((item) {
+        list.add(Address.fromJson(item));
+      });
+      addressList(list);
+    });
     if (Get.arguments != null) {
       isBack = Get.arguments['isBack'];
     }
   }
 
-  final addressList = Rx<List<Address>>([
-    Address.fromJson({'address': '777', 'isDefault': false}),
-    Address.fromJson({'address': '999', 'isDefault': false}),
-    Address.fromJson({'address': '这是一个正经的地址', 'isDefault': false}),
-  ]);
 
-  void onChange(index) {
-    for (var element in addressList.value) {
-      if (element.isDefault == true) {
-        element.isDefault = false;
+  void onChange(id) {
+    print(id);
+    addressDefault(id.toString()).then((value){
+      final defaultlist = [...addressList()];
+      for (var element in addressList()) {
+        if (element.isDefault == true) {
+          element.isDefault = false;
+        }
       }
-    }
-    addressList.value[index].isDefault = true;
+      addressList(defaultlist);
+    });
+
   }
 
-  void onDelete(index) {
-    Fluttertoast.showToast(msg: '删除成功！');
+  void onDelete(id) {
+    print(id);
+
+    addressDelete(id).then((value) {
+      final newslist = [...addressList()];
+      for (var item in addressList()) {
+        if (item.addressId == id) {
+          newslist.remove(item);
+        }
+      }
+      addressList(newslist);
+      Fluttertoast.showToast(msg: '删除成功！');
+    });
   }
 
   @override
@@ -50,8 +72,8 @@ class AddressList extends BasicPage {
             //左对齐
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
-              Column(
-                  children: addressList.value
+              Obx(()=>Column(
+                  children: addressList()
                       .asMap()
                       .keys
                       .map(
@@ -60,22 +82,23 @@ class AddressList extends BasicPage {
                           item: addressList.value[e],
                           isBack: isBack,
                           onChange: () {
-                            onChange(e);
+                            onChange(addressList()[e].addressId);
                           },
                           onEdit: () {
                             Get.toNamed('/addAddress',
-                                arguments: {'item': addressList.value[e]});
+                                arguments: {'id':addressList.value[e].addressId,'item': addressList.value[e].address.toString()});
                           },
                           onDelete: () {
-                            onDelete(e);
+                            onDelete(addressList.value[e].addressId);
                           },
                           onBack: () {
+                            //选择地址
                             addressController.address.value=addressList.value[e];
                             Get.back();
                           },
                         ),
                       )
-                      .toList()),
+                      .toList()),),
               DefaultButton(
                 color: const Color(0xffffffff),
                 backColor: const Color(0xFFFF703B),
@@ -96,3 +119,4 @@ class AddressList extends BasicPage {
     );
   }
 }
+

lib/pages/machinery/detail/index.dart

@@ -13,7 +13,7 @@ class MachineryDetailPage extends BasicPage {
   final machineryListContent= Rx<List<ContentImageList>>([]);//图文详情
   // 响应预约事件
   void handleClick() {
-    Get.toNamed('/orderConfirmation',arguments: {'item':machineryInfoContent.value});
+    Get.toNamed('/orderConfirmation',arguments: {'item':machineryInfoContent()});
   }
 
 
@@ -26,9 +26,9 @@ class MachineryDetailPage extends BasicPage {
      marKm = Get.arguments['km'];
      print(marKm);
       getMachineryInfo(markId, '122.08400000000002,37.421998333333335', true).then((value) {
-        machineryInfoContent.value=CardInfo.fromJson(value);
-        machineryListBanner.value=machineryInfoContent.value.imagesList!;
-        machineryListContent.value=machineryInfoContent.value.contentList!;
+        machineryInfoContent(CardInfo.fromJson(value));
+        machineryListBanner(machineryInfoContent().imagesList!);
+        machineryListContent(machineryInfoContent().contentList!);
 
       });
 

lib/pages/machinery/map/index.dart

@@ -13,7 +13,9 @@ class MachineryMapPage extends BasicPage {
   final machineryInfoContent = Rx<CardInfo>(CardInfo());//全部详情
   // 响应预约事件
   void handleClick() {
-    Get.toNamed("/machineryDetail");
+    // Get.toNamed("/machineryDetail");
+    Get.toNamed('/orderConfirmation',arguments: {'item':machineryInfoContent()});
+
   }
 
   @override
@@ -25,7 +27,7 @@ class MachineryMapPage extends BasicPage {
       marKm = Get.arguments['km'];
       print(marKm);
       getMachineryInfo(markId, '122.08400000000002,37.421998333333335', true).then((value) {
-        machineryInfoContent.value=CardInfo.fromJson(value);
+        machineryInfoContent(CardInfo.fromJson(value));
 
       });
 
@@ -43,7 +45,7 @@ class MachineryMapPage extends BasicPage {
   @override
   Widget builder(BuildContext context) {
     naviTitle = "查看地图";
-    return Obx(()=>page(context: context, handleClick: handleClick,item: machineryInfoContent.value,km: marKm));
+    return Obx(()=>page(context: context, handleClick: handleClick,item: machineryInfoContent(),km: marKm));
   }
   
 }

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

@@ -25,7 +25,11 @@ Widget page({required CardInfo item,required String km, required BuildContext co
         DefLayout.card(
             top: DefLayout.headHeight - DefLayout.offset,
             height: DefLayout.headHeight,
-            child: Image.network(item.thumb.toString(), fit: BoxFit.cover)
+            child: Image.network(item.thumb.toString(), fit: BoxFit.cover,
+            errorBuilder:  (ctx, exception, stackTrace) {
+              return Container(); //THE WIDGET YOU WANT TO SHOW IF URL NOT RETURN IMAGE
+            },
+            ),
         ),
         DefLayout.card(
             top: (DefLayout.headHeight - DefLayout.offset) * 2,

lib/pages/main/index.dart

@@ -1,15 +1,39 @@
 import 'package:farmer_client/pages/main/widgets/main/index.dart';
 import 'package:farmer_client/widgets/layout/BasicPage.dart';
 import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:get/get_rx/src/rx_types/rx_types.dart';
+
+import '../../models/entities/Address.dart';
+import '../../services/address.dart';
 
 class Main extends BasicPage {
   Main({Key? key}) : super(key: key) {
     tabIndex = 3;
     naviTitle = '我的';
   }
+  final addressListInfo = Rx<List<Address>>([]);
+
+  @override
+  void beforeShow() {
+    // TODO: implement beforeShow
+    super.beforeShow();
+    getAddress().then((value) {
+       List<Address> list = [];
+      value['records'].forEach((item) {
+        list.add(Address.fromJson(item));
+      });
+       addressListInfo(list);
+    });
+  }
+
 
   @override
   Widget builder(BuildContext context) {
-    return const MainPage();
+    return Obx(()=> MainPage(
+        item:addressListInfo()[0].address.toString()
+     )
+
+    );
   }
 }

lib/pages/main/widgets/main/index.dart

@@ -1,3 +1,4 @@
+import 'package:farmer_client/models/entities/Address.dart';
 import 'package:get/get.dart';
 import 'package:get_storage/get_storage.dart';
 
@@ -8,16 +9,32 @@ import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 
 class MainPage extends StatefulWidget {
-  const MainPage({Key? key}) : super(key: key);
+  final String item;
+
+
+
+   MainPage({Key? key, required this.item}) : super(key: key);
 
   @override
-  State<MainPage> createState() => _MainPageState();
+  State<MainPage> createState() => _MainPageState(item);
+
 }
 
 class _MainPageState extends State<MainPage> {
   GetStorage box = GetStorage();
+  late String item='请维护详细地址！';
+  _MainPageState(this.item);
+
+  @override
+  void initState() {
+    super.initState();
+    print('644444444444444+$item');
+
+  }
+
   @override
   Widget build(BuildContext context) {
+
     return Container(
       alignment: Alignment.center,
       child: Column(
@@ -25,7 +42,7 @@ class _MainPageState extends State<MainPage> {
           Column(
             children: [
               UserInfo(), //头部，头像手机号姓名
-              UserAddress(), //用户地址
+              UserAddress(item:item),//用户地址
               OtherColumn(), //功能菜单栏
               Container(
                 height: 70.h,

lib/pages/main/widgets/main/widgets/UserAddress.dart

@@ -2,8 +2,12 @@ import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 
+import '../../../../../models/entities/Address.dart';
+
 class UserAddress extends StatelessWidget {
-  const UserAddress({Key? key}) : super(key: key);
+  final String item;
+
+  const UserAddress({Key? key, required this.item}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -62,7 +66,7 @@ class UserAddress extends StatelessWidget {
                         Container(
                           width: 260,
                           child: Text(
-                            '请填写详细地址请填写详细地址请填写详细地址',
+                            item != null? item: '请设置默认地址',
                             softWrap: true,
                             maxLines: 1,
                             textAlign: TextAlign.left,

lib/pages/orderInfo/index.dart

@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:get/get.dart';
+import 'package:farmer_client/widgets/Modal.dart' as modal;
 
 import '../../models/entities/OrderInfoModel.dart';
 import '../../services/orderAPI.dart';
@@ -18,10 +19,9 @@ import '../../widgets/layout/BasicPage.dart';
 
 
 class OrderPageInfo extends BasicPage {
-  String id = '';
-  String orderStateText = '';
-  late Color orderStateColor;
-
+  final id=Rx<String>('');
+  final orderStateText=Rx<String>('待支付');
+  final orderStateColor=Rx<Color>(Colors.black);
   final orderInfoContent = Rx<OrderInfoModel>(OrderInfoModel());
 
   // orderStates
@@ -31,17 +31,18 @@ class OrderPageInfo extends BasicPage {
     // TODO: implement beforeShow
     super.beforeShow();
     if (Get.arguments['id'] != null) {
-      id = Get.arguments['id'];
+      id(Get.arguments['id']);
 
-      orderStateText = Get.arguments['title'];
-      orderStateColor = Get.arguments['styleColor'];
+      orderStateText(Get.arguments['title']);
+      orderStateColor(Get.arguments['styleColor']);
 
-      orderInfo(id).then((value) {
-        orderInfoContent.value = OrderInfoModel.fromJson(value);
+      orderInfo(id()).then((value) {
+        orderInfoContent(OrderInfoModel.fromJson(value));
       });
     }
   }
 
+
   @override
   Widget builder(BuildContext context) {
     naviTitle = '订单详情';
@@ -50,12 +51,12 @@ class OrderPageInfo extends BasicPage {
       children: [
         Obx(() =>
             OrderInfoCard(
-                item: orderInfoContent.value,
-                orderStateText: orderStateText,
-                orderStateColor: orderStateColor
+                item: orderInfoContent(),
+                orderStateText: orderStateText(),
+                orderStateColor: orderStateColor()
             ),
         ),
-        _BottomWidget()
+        Obx(()=>_BottomWidget(id: id()))
         // orderStateText=='已完成'?  Text('')
         //     :orderStateText== '进行中' ?Text('')
         //     :orderStateText=='待评价'? DefaultButton(
@@ -110,7 +111,21 @@ class OrderPageInfo extends BasicPage {
 }
 
 class _BottomWidget extends StatelessWidget {
-  const _BottomWidget({Key? key}) : super(key: key);
+  final id;
+  const _BottomWidget({Key? key, required this.id}) : super(key: key);
+
+
+  void _orderDeletels (){
+    orderDelete(id).then((value) {
+      Fluttertoast.showToast(
+          msg: '订单取消成功！'
+      );
+    });
+
+
+  }
+
+
 
   @override
   Widget build(BuildContext context) {
@@ -132,7 +147,7 @@ class _BottomWidget extends StatelessWidget {
                   height: 49.h,
               child: ElevatedButton(
                 onPressed: () {
-                  Get.back();
+                  _orderDeletels();
                 },
                 child: const Text(
                   "取消",

lib/services/address.dart

@@ -0,0 +1,73 @@
+
+import 'package:dio/dio.dart';
+import 'package:farmer_client/utils/Request.dart';
+import 'package:fluttertoast/fluttertoast.dart';
+
+/**
+ * 地址列表
+ * @param {*} data
+ * @returns
+ */
+Future getAddress() async {
+  return request('/address',
+      options: Options(method: 'GET')).catchError((error) => {
+    Fluttertoast.showToast(msg: error.error['message']),
+  });
+}
+
+
+/**
+ * 地址保存
+ * @param {*} data
+ * @returns
+ */
+Future addressSave(String address) async {
+  return request('/address',
+      options: Options(method: 'POST'), data: {'address': address})
+      .catchError((error) => {
+    Fluttertoast.showToast(msg: error.error['message']),
+  });
+}
+
+
+
+/**
+ * 地址删除
+ * @param {*} data
+ * @returns
+ */
+Future addressDelete(String id)async{
+  return request('/address/$id',options: Options(method: 'DELETE')).catchError((error) =>
+  { Fluttertoast.showToast(
+      msg: error.error['message']
+  ),});
+
+}
+
+
+/**
+ * 地址修改更新
+ * @param {*} data
+ * @returns
+ */
+Future addressUpdate(String id,String address)async{
+  return request('/address/$id',options: Options(method: 'PUT'),data: {'address':address}).catchError((error) =>
+  { Fluttertoast.showToast(
+      msg: error.error['message']
+  ),});
+
+}
+
+
+/**
+ * 地址是否默认
+ * @param {*} data
+ * @returns
+ */
+Future addressDefault(String id)async{
+  return request('/address/$id/default',options: Options(method: 'PUT')).catchError((error) =>
+  { Fluttertoast.showToast(
+      msg: error.error['message']
+  ),});
+
+}

lib/services/orderAPI.dart

@@ -48,3 +48,16 @@ Future generateOrder(item)async{
 }
 
 
+
+/**
+ * 删除订单
+ * @param {*} data
+ * @returns
+ */
+Future orderDelete(String id)async{
+  return request('/order/$id',options: Options(method: 'DELETE')).catchError((error) =>
+  { Fluttertoast.showToast(
+      msg: error.error['message']
+  ),});
+
+}

lib/widgets/CarsCard.dart

@@ -129,7 +129,7 @@ class _CarsCardPage extends State<CarsCard> {
                     child: ElevatedButton(
                       onPressed: () {
                         Get.toNamed('/orderConfirmation',
-                            arguments: {'machineryId': item.machineryId});
+                            arguments: {'id':item.machineryId});
                       },
                       child: const Text(
                         "预约",

lib/widgets/OrderInfoCard.dart

@@ -193,7 +193,7 @@ class OrderInfoCard extends StatelessWidget {
                                     Color(0xFFFA7878),
                                     Color(0xFFB61515),
                                   ],
-                                  child: const Text('8880',
+                                  child:  Text(( (item.charges??0)/100).toString(),
                                       style: TextStyle(
                                           color: Color(0xffB61515),
                                           fontSize: 16,

lib/widgets/OrderListCard.dart

@@ -288,7 +288,7 @@ class _OrderListCardPages extends State<OrderListCard> {
                                 text:  TextSpan(
                                     children: <InlineSpan>[
                                       TextSpan(
-                                          text:( item.charges!/100).toString(),
+                                          text:( (item.charges??0)/100).toString(),
                                           style: TextStyle(
                                             fontSize: 16,
                                             fontWeight: FontWeight.bold,

pubspec.lock

@@ -335,7 +335,7 @@ packages:
       name: path_provider_android
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.12"
+    version: "2.0.13"
   path_provider_ios:
     dependency: transitive
     description:
@@ -536,7 +536,7 @@ packages:
       name: win32
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.5.1"
+    version: "2.5.2"
   xdg_directories:
     dependency: transitive
     description:
@@ -553,4 +553,4 @@ packages:
     version: "3.1.0"
 sdks:
   dart: ">=2.16.1 <3.0.0"
-  flutter: ">=2.8.0"
+  flutter: ">=2.8.1"