feats"

lib/models/app.dart

@@ -21,8 +21,9 @@ class AppController extends GetxController {
   get locationStr {
     if (null == location.value) return null;
 
-    double longitude = location.value!['longitude'] as double;
-    double latitude = location.value!['latitude'] as double;
+    // 不知道什么问题, 模拟器中 lng 是负值
+    double longitude = (location.value!['longitude'] as double).abs();
+    double latitude = (location.value!['latitude'] as double).abs();
 
     return longitude.toString() + "," + latitude.toString();
   }

lib/pages/OrderConfirmation/index.dart

@@ -1,4 +1,5 @@
 import 'package:farmer_client/models/addressController.dart';
+import 'package:farmer_client/models/app.dart';
 import 'package:farmer_client/models/entities/CardInfo.dart';
 import 'package:farmer_client/widgets/layout/BasicPage.dart';
 import 'package:flutter/material.dart';
@@ -21,6 +22,7 @@ class OrderConfirmation extends BasicPage {
   final selectDate = Rx<DateTime>(DateTime.now()); //选择的时间
   final workingArea = Rx<int>(0);
   AddressController addressController = AddressController.t;
+  AppController appController = AppController.t;
   final item = Rx<CardInfo>(CardInfo()); //全部详情
   final orderInfo = Rx<OrderInfoModel>(OrderInfoModel()); //全部详情
 
@@ -34,7 +36,7 @@ class OrderConfirmation extends BasicPage {
       markId = Get.arguments['id'];
       EasyLoading.show(status: '数据加载中...');
 
-      getMachineryInfo(markId, '122.08400000000002,37.421998333333335', true)
+      getMachineryInfo(markId, appController.locationStr, true)
           .then((value) {
         item(CardInfo.fromJson(value));
         EasyLoading.dismiss();
@@ -162,7 +164,7 @@ class OrderConfirmation extends BasicPage {
                               helpText: '请选择作业开始时间',
                               cancelText: '取消',
                               confirmText: '确定',
-                              initialDate: selectDate() ?? DateTime.now(),
+                              initialDate: selectDate(),
                               firstDate: DateTime.now(),
                               lastDate: DateTime(2030),
                             );

lib/pages/machinery/detail/index.dart

@@ -1,3 +1,4 @@
+import 'package:farmer_client/models/app.dart';
 import 'package:farmer_client/models/entities/CardInfo.dart';
 import 'package:farmer_client/widgets/layout/BasicPage.dart';
 import 'package:flutter/material.dart';
@@ -12,6 +13,8 @@ class MachineryDetailPage extends BasicPage {
   final machineryInfoContent = Rx<CardInfo>(CardInfo()); //全部详情
   final machineryListBanner = Rx<List<BannerImageList>>([]); //banner轮播
   final machineryListContent = Rx<List<ContentImageList>>([]); //图文详情
+  final appController = AppController.t;
+
   // 响应预约事件
   void handleClick() {
     Get.toNamed('/orderConfirmation',
@@ -28,7 +31,7 @@ class MachineryDetailPage extends BasicPage {
       markId = Get.arguments['id'];
       marKm = Get.arguments['km'];
       print(marKm);
-      getMachineryInfo(markId, '122.08400000000002,37.421998333333335', true)
+      getMachineryInfo(markId, appController.locationStr, true)
           .then((value) {
         machineryInfoContent(CardInfo.fromJson(value));
         machineryListBanner(machineryInfoContent().imagesList!);

lib/pages/machinery/map/index.dart

@@ -1,3 +1,4 @@
+import 'package:farmer_client/models/app.dart';
 import 'package:farmer_client/pages/machinery/map/widgets/detail.dart';
 import 'package:farmer_client/widgets/layout/BasicPage.dart';
 import 'package:flutter/material.dart';
@@ -11,6 +12,8 @@ class MachineryMapPage extends BasicPage {
   String markId = '';
   String marKm = '';
   final machineryInfoContent = Rx<CardInfo>(CardInfo()); //全部详情
+  final appController = AppController.t;
+
   // 响应预约事件
   void handleClick() {
     // Get.toNamed("/machineryDetail");
@@ -28,7 +31,7 @@ class MachineryMapPage extends BasicPage {
       markId = Get.arguments['id'];
       marKm = Get.arguments['km'];
       print(marKm);
-      getMachineryInfo(markId, '122.08400000000002,37.421998333333335', true)
+      getMachineryInfo(markId, appController.locationStr, true)
           .then((value) {
         machineryInfoContent(CardInfo.fromJson(value));
         EasyLoading.dismiss();