From e01bb4a1d21d19006c82cbb355244ae170bd83ba Mon Sep 17 00:00:00 2001
From: younger_times <841720330@qq.com>
Date: 星期五, 02 六月 2023 17:07:51 +0800
Subject: [PATCH] Merge branch 'master' of ssh://sinata.cn:20202/ios/Broker
---
BrokerDriver/ViewModels/OrderViewModel.swift | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/BrokerDriver/ViewModels/OrderViewModel.swift b/BrokerDriver/ViewModels/OrderViewModel.swift
index 4362f24..ff55472 100644
--- a/BrokerDriver/ViewModels/OrderViewModel.swift
+++ b/BrokerDriver/ViewModels/OrderViewModel.swift
@@ -16,22 +16,23 @@
var pickUpTime: String = ""
var portName: String = ""
var start: String = ""
- var status: OrderType = .None
+ var status:OrderType = .None
var type: Int = 0
}
struct OrderDetailModel:HandyJSON {
var containerNumber: String?
- var eLat: String = ""
- var eLon: String = ""
- var lat: String = ""
+ var eLat: CLLocationDistance = 0
+ var eLon: CLLocationDistance = 0
+ var lat: CLLocationDistance = 0
var list = [Dictionary<String,Any>]()
- var lon: String = ""
+ 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 type: Int = 0
}
struct OrderDetailGoodsModel:HandyJSON {
--
Gitblit v1.7.1