From 1001da93be5ea3049311bd99f21653072bce42b7 Mon Sep 17 00:00:00 2001
From: younger_times <841720330@qq.com>
Date: 星期三, 31 五月 2023 18:55:36 +0800
Subject: [PATCH] 包车流程
---
OKProject/Class/Home/ViewModel/TravelViewModel.swift | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/OKProject/Class/Home/ViewModel/TravelViewModel.swift b/OKProject/Class/Home/ViewModel/TravelViewModel.swift
index 43cc2ec..eb78392 100644
--- a/OKProject/Class/Home/ViewModel/TravelViewModel.swift
+++ b/OKProject/Class/Home/ViewModel/TravelViewModel.swift
@@ -70,6 +70,12 @@
/// 计费方式
let calType = BehaviorRelay<Int?>(value: nil)
+ /// 包车结束时间（2020-08-20 10:10）
+ let travelEndTime = BehaviorRelay<String?>(value: nil)
+
+ //1:提醒，0：不提醒
+ let isNotice = BehaviorRelay<Int?>(value: nil)
+
/// 获取正在进行中的订单
func queryServingOrder() {
APIManager.shared.provider.rx
@@ -188,7 +194,9 @@
YYMapViewManager.share.passenger.accept(PassengerModel(name: app.userInfo.nickName, phone: app.userInfo.phone))
}
- let reqModel = OfficalRequstModel(serverCarModelId:selectedCarType.value?.id,calType: .Single, endAddress: destination.name, endLat: destination.lat, endLon: destination.lon, orderSource: 1, orderType: orderType, passengers: YYMapViewManager.share.passenger.value?.name, passengersPhone: YYMapViewManager.share.passenger.value?.phone, payWay: officalPaymentType.value.rawValue, people: passengers.value.arrayToJson(), peopleNum: passengers.value.count, placementLat: Double(YYMapViewManager.share.userLocation.latitude), placementLon: Double(YYMapViewManager.share.userLocation.longitude), reason: trailContentReason.value, reasonTypeNames: trailReason.value, startAddress: originInfo.name, startLat: originInfo.lat, startLon: originInfo.lon, substitute: substitute, travelTime: timeStamp, type: 1)
+ let calType = CalType(rawValue: YYMapViewManager.share.calType.value!)
+
+ let reqModel = OfficalRequstModel(serverCarModelId:selectedCarType.value?.id,calType: calType, endAddress: destination.name, endLat: destination.lat, endLon: destination.lon, orderSource: 1, orderType: orderType, passengers: YYMapViewManager.share.passenger.value?.name, passengersPhone: YYMapViewManager.share.passenger.value?.phone, payWay: officalPaymentType.value.rawValue, people: passengers.value.arrayToJson(), peopleNum: passengers.value.count, placementLat: Double(YYMapViewManager.share.userLocation.latitude), placementLon: Double(YYMapViewManager.share.userLocation.longitude), reason: trailContentReason.value, reasonTypeNames: trailReason.value, startAddress: originInfo.name, startLat: originInfo.lat, startLon: originInfo.lon, substitute: substitute, travelTime: timeStamp, type: 1,travelEndTime: travelEndTime.value,isNotice: isNotice.value)
APIManager.shared.provider.rx
.request(.saveOrderBusiness(model: reqModel)).map(YYModel<SwitchCityModel>.self)
--
Gitblit v1.7.1