From 38f768d39ba27d303147c59a222655b7c6cdfb25 Mon Sep 17 00:00:00 2001
From: younger_times <841720330@qq.com>
Date: 星期二, 04 七月 2023 14:45:02 +0800
Subject: [PATCH] 修改BUG
---
OKProject/Class/Home/ViewModel/TravelViewModel.swift | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/OKProject/Class/Home/ViewModel/TravelViewModel.swift b/OKProject/Class/Home/ViewModel/TravelViewModel.swift
index 5d2e097..17befb0 100644
--- a/OKProject/Class/Home/ViewModel/TravelViewModel.swift
+++ b/OKProject/Class/Home/ViewModel/TravelViewModel.swift
@@ -71,7 +71,7 @@
let calType = BehaviorRelay<Int?>(value: nil)
/// 包车结束时间（2020-08-20 10:10）
- let travelEndTime = BehaviorRelay<String?>(value: nil)
+// let travelEndTime = BehaviorRelay<String?>(value: nil)
//1:提醒，0：不提醒
let isNotice = BehaviorRelay<Int?>(value: nil)
@@ -189,6 +189,7 @@
let substitute = YYMapViewManager.share.passenger.value == nil ? 0 : 1
let timeStamp = DateInRegion(Date(), region: Region(calendar: Calendars.gregorian, zone: Zones.current,locale: Locales.current)).toFormat("yyyy-MM-dd HH:mm")
let travelTime = orderType == 2 ? YYMapViewManager.share.timeStamp.value?.toFormat(format: "yyyy-MM-dd HH:mm") ?? timeStamp : timeStamp
+ let endTime = YYMapViewManager.share.timeEndStamp.value?.toFormat(format: "yyyy-MM-dd HH:mm")
if substitute == 1{
YYMapViewManager.share.passenger.accept(PassengerModel(name: app.userInfo.nickName, phone: app.userInfo.phone))
@@ -196,7 +197,7 @@
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, 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)
+ 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, 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: endTime,isNotice: isNotice.value)
APIManager.shared.provider.rx
.request(.saveOrderBusiness(model: reqModel)).map(YYModel<SwitchCityModel>.self)
--
Gitblit v1.7.1