From aec51d7dba8960905c0bfeb9e94689c96aeb721c Mon Sep 17 00:00:00 2001
From: younger_times <841720330@qq.com>
Date: 星期三, 16 八月 2023 16:40:15 +0800
Subject: [PATCH] 新版本
---
BrokerDriver/ViewModels/OrderViewModel.swift | 38 ++++++++++++++++++++++++++------------
1 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/BrokerDriver/ViewModels/OrderViewModel.swift b/BrokerDriver/ViewModels/OrderViewModel.swift
index 1a40fba..4ed3de6 100644
--- a/BrokerDriver/ViewModels/OrderViewModel.swift
+++ b/BrokerDriver/ViewModels/OrderViewModel.swift
@@ -21,20 +21,34 @@
}
struct OrderDetailModel:HandyJSON {
- var containerNumber: String?
- var eLat: CLLocationDistance = 0
- var eLon: CLLocationDistance = 0
- var lat: CLLocationDistance = 0
- var list = [Dictionary<String,Any>]()
- var lon: CLLocationDistance = 0
- var orderId: String = ""
- var orderType: String = ""
- var status: OrderType = .None
- var nextStatus:OrderType = .None
- var tGoods: OrderDetailGoodsModel?
- var type: String = ""
+ var data:OrderDetailDataModel?
+ var lonlat = [CoordinateModel]() // 1:起点，2:检查站 ,3:场地，4:终点
}
+struct OrderDetailDataModel:HandyJSON {
+ var containerNumber: String?
+ var eLat: CLLocationDistance = 0
+ var eLon: CLLocationDistance = 0
+ var lat: CLLocationDistance = 0
+ var list = [Dictionary<String,Any>]()
+ var lon: CLLocationDistance = 0
+ var orderId: String = ""
+ var orderType: String = ""
+ var status: OrderType = .None
+ var nextStatus:OrderType = .None
+ var tGoods: OrderDetailGoodsModel?
+ var type: Int = 0
+ var button:Int = 2
+}
+
+struct CoordinateModel:HandyJSON{
+ var lon:Double = 0
+ var lat:Double = 0
+ var type:CoordinateType = .StartPoint
+}
+
+
+
struct OrderDetailGoodsModel:HandyJSON {
var billNumber: String = ""
var containerNumber: String = ""
--
Gitblit v1.7.1