张延森 2 anos atrás
pai
commit
02ff4994f5

+ 3
- 2
lib/models/app.dart Ver arquivo

21
   get locationStr {
21
   get locationStr {
22
     if (null == location.value) return null;
22
     if (null == location.value) return null;
23
 
23
 
24
-    double longitude = location.value!['longitude'] as double;
25
-    double latitude = location.value!['latitude'] as double;
24
+    // 不知道什么问题, 模拟器中 lng 是负值
25
+    double longitude = (location.value!['longitude'] as double).abs();
26
+    double latitude = (location.value!['latitude'] as double).abs();
26
 
27
 
27
     return longitude.toString() + "," + latitude.toString();
28
     return longitude.toString() + "," + latitude.toString();
28
   }
29
   }

+ 4
- 2
lib/pages/OrderConfirmation/index.dart Ver arquivo

1
 import 'package:farmer_client/models/addressController.dart';
1
 import 'package:farmer_client/models/addressController.dart';
2
+import 'package:farmer_client/models/app.dart';
2
 import 'package:farmer_client/models/entities/CardInfo.dart';
3
 import 'package:farmer_client/models/entities/CardInfo.dart';
3
 import 'package:farmer_client/widgets/layout/BasicPage.dart';
4
 import 'package:farmer_client/widgets/layout/BasicPage.dart';
4
 import 'package:flutter/material.dart';
5
 import 'package:flutter/material.dart';
21
   final selectDate = Rx<DateTime>(DateTime.now()); //选择的时间
22
   final selectDate = Rx<DateTime>(DateTime.now()); //选择的时间
22
   final workingArea = Rx<int>(0);
23
   final workingArea = Rx<int>(0);
23
   AddressController addressController = AddressController.t;
24
   AddressController addressController = AddressController.t;
25
+  AppController appController = AppController.t;
24
   final item = Rx<CardInfo>(CardInfo()); //全部详情
26
   final item = Rx<CardInfo>(CardInfo()); //全部详情
25
   final orderInfo = Rx<OrderInfoModel>(OrderInfoModel()); //全部详情
27
   final orderInfo = Rx<OrderInfoModel>(OrderInfoModel()); //全部详情
26
 
28
 
34
       markId = Get.arguments['id'];
36
       markId = Get.arguments['id'];
35
       EasyLoading.show(status: '数据加载中...');
37
       EasyLoading.show(status: '数据加载中...');
36
 
38
 
37
-      getMachineryInfo(markId, '122.08400000000002,37.421998333333335', true)
39
+      getMachineryInfo(markId, appController.locationStr, true)
38
           .then((value) {
40
           .then((value) {
39
         item(CardInfo.fromJson(value));
41
         item(CardInfo.fromJson(value));
40
         EasyLoading.dismiss();
42
         EasyLoading.dismiss();
162
                               helpText: '请选择作业开始时间',
164
                               helpText: '请选择作业开始时间',
163
                               cancelText: '取消',
165
                               cancelText: '取消',
164
                               confirmText: '确定',
166
                               confirmText: '确定',
165
-                              initialDate: selectDate() ?? DateTime.now(),
167
+                              initialDate: selectDate(),
166
                               firstDate: DateTime.now(),
168
                               firstDate: DateTime.now(),
167
                               lastDate: DateTime(2030),
169
                               lastDate: DateTime(2030),
168
                             );
170
                             );

+ 4
- 1
lib/pages/machinery/detail/index.dart Ver arquivo

1
+import 'package:farmer_client/models/app.dart';
1
 import 'package:farmer_client/models/entities/CardInfo.dart';
2
 import 'package:farmer_client/models/entities/CardInfo.dart';
2
 import 'package:farmer_client/widgets/layout/BasicPage.dart';
3
 import 'package:farmer_client/widgets/layout/BasicPage.dart';
3
 import 'package:flutter/material.dart';
4
 import 'package:flutter/material.dart';
12
   final machineryInfoContent = Rx<CardInfo>(CardInfo()); //全部详情
13
   final machineryInfoContent = Rx<CardInfo>(CardInfo()); //全部详情
13
   final machineryListBanner = Rx<List<BannerImageList>>([]); //banner轮播
14
   final machineryListBanner = Rx<List<BannerImageList>>([]); //banner轮播
14
   final machineryListContent = Rx<List<ContentImageList>>([]); //图文详情
15
   final machineryListContent = Rx<List<ContentImageList>>([]); //图文详情
16
+  final appController = AppController.t;
17
+
15
   // 响应预约事件
18
   // 响应预约事件
16
   void handleClick() {
19
   void handleClick() {
17
     Get.toNamed('/orderConfirmation',
20
     Get.toNamed('/orderConfirmation',
28
       markId = Get.arguments['id'];
31
       markId = Get.arguments['id'];
29
       marKm = Get.arguments['km'];
32
       marKm = Get.arguments['km'];
30
       print(marKm);
33
       print(marKm);
31
-      getMachineryInfo(markId, '122.08400000000002,37.421998333333335', true)
34
+      getMachineryInfo(markId, appController.locationStr, true)
32
           .then((value) {
35
           .then((value) {
33
         machineryInfoContent(CardInfo.fromJson(value));
36
         machineryInfoContent(CardInfo.fromJson(value));
34
         machineryListBanner(machineryInfoContent().imagesList!);
37
         machineryListBanner(machineryInfoContent().imagesList!);

+ 4
- 1
lib/pages/machinery/map/index.dart Ver arquivo

1
+import 'package:farmer_client/models/app.dart';
1
 import 'package:farmer_client/pages/machinery/map/widgets/detail.dart';
2
 import 'package:farmer_client/pages/machinery/map/widgets/detail.dart';
2
 import 'package:farmer_client/widgets/layout/BasicPage.dart';
3
 import 'package:farmer_client/widgets/layout/BasicPage.dart';
3
 import 'package:flutter/material.dart';
4
 import 'package:flutter/material.dart';
11
   String markId = '';
12
   String markId = '';
12
   String marKm = '';
13
   String marKm = '';
13
   final machineryInfoContent = Rx<CardInfo>(CardInfo()); //全部详情
14
   final machineryInfoContent = Rx<CardInfo>(CardInfo()); //全部详情
15
+  final appController = AppController.t;
16
+
14
   // 响应预约事件
17
   // 响应预约事件
15
   void handleClick() {
18
   void handleClick() {
16
     // Get.toNamed("/machineryDetail");
19
     // Get.toNamed("/machineryDetail");
28
       markId = Get.arguments['id'];
31
       markId = Get.arguments['id'];
29
       marKm = Get.arguments['km'];
32
       marKm = Get.arguments['km'];
30
       print(marKm);
33
       print(marKm);
31
-      getMachineryInfo(markId, '122.08400000000002,37.421998333333335', true)
34
+      getMachineryInfo(markId, appController.locationStr, true)
32
           .then((value) {
35
           .then((value) {
33
         machineryInfoContent(CardInfo.fromJson(value));
36
         machineryInfoContent(CardInfo.fromJson(value));
34
         EasyLoading.dismiss();
37
         EasyLoading.dismiss();