From dc1998fc1ac124f6b9a0e434ccf91103dd936409 Mon Sep 17 00:00:00 2001
From: 无故事王国 <841720330@qq.com>
Date: 星期四, 25 五月 2023 18:47:57 +0800
Subject: [PATCH] 修改与新增
---
OKProject/Class/Home/ViewModel/TravelServiceViewModel.swift | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/OKProject/Class/Home/ViewModel/TravelServiceViewModel.swift b/OKProject/Class/Home/ViewModel/TravelServiceViewModel.swift
index 4c14005..f8cb6fb 100644
--- a/OKProject/Class/Home/ViewModel/TravelServiceViewModel.swift
+++ b/OKProject/Class/Home/ViewModel/TravelServiceViewModel.swift
@@ -95,7 +95,7 @@
func queryTrack() {
queryTrackSubject.onNext(.loading)
APIManager.shared.provider.rx
- .request(.queryTrack(orderId: orderId.value, orderType: orderType.value.parame()))
+ .request(.queryTrack(orderId: orderId.value, orderType: orderType.value.rawValue))
.map(YYModel<[TrackModel]>.self)
.validate()
.subscribe(onSuccess: { [unowned self] (model) in
@@ -111,7 +111,7 @@
/// 获取详情
func queryOrderInfo() {
APIManager.shared.provider.rx
- .request(.queryOrderInfo(orderId: orderId.value, orderType: orderType.value.parame()))
+ .request(.queryOrderInfo(orderId: orderId.value, orderType: orderType.value.rawValue))
.map(YYModel<TravelServiceModel>.self)
.validate()
.subscribe(onSuccess: { (model) in
@@ -127,7 +127,7 @@
func cancleOrderTaxi() {
cancleOrderTaxiSubject.onNext(.loading)
APIManager.shared.provider.rx
- .request(.cancleOrderTaxi(cancleId: cancelId.value, id: orderId.value,orderType: orderType.value.parame(), payType: payType.value))
+ .request(.cancleOrderTaxi(cancleId: cancelId.value, id: orderId.value,orderType: orderType.value.rawValue, payType: payType.value))
.map(YYModel<PayModel>.self)
.validate()
.subscribe(onSuccess: { [unowned self] (model) in
@@ -142,7 +142,7 @@
func addCancle() {
addCancleSubject.onNext(.loading)
APIManager.shared.provider.rx
- .request(.addCancle(id: orderId.value, orderType: orderType.value.parame(), reason: reason.value, remark: remark.value))
+ .request(.addCancle(id: orderId.value, orderType: orderType.value.rawValue, reason: reason.value, remark: remark.value))
.map(YYModel<SystemMessageModel>.self)
.validate()
.subscribe(onSuccess: { [unowned self] (model) in
@@ -158,12 +158,12 @@
/// 获取司机位置
func queryOrderServer() {
APIManager.shared.provider.rx
- .request(.queryOrderServer(orderId: self.orderId.value, orderType: orderType.value.parame()))
+ .request(.queryOrderServer(orderId: self.orderId.value, orderType: orderType.value.rawValue))
.map(YYModel<SocketInfoModel>.self)
.validate()
.subscribe(onSuccess: { (model) in
guard let data = model.data else{return}
- if data.orderType == self.orderType.value.parame(){
+ if data.orderType == self.orderType.value.rawValue{
self.driverInfo.accept(data)
}
}) { (error) in
@@ -175,7 +175,7 @@
func orderEvaluate() {
evaluateSubject.onNext(.loading)
APIManager.shared.provider.rx
- .request(.orderEvaluate(orderId: self.orderId.value, orderType: orderType.value.parame(), fraction: fraction.value, content: content.value))
+ .request(.orderEvaluate(orderId: self.orderId.value, orderType: orderType.value.rawValue, fraction: fraction.value, content: content.value))
.map(YYModel<Nothing>.self)
.validate()
.subscribe(onSuccess: {[unowned self] (model) in
@@ -190,7 +190,7 @@
func queryRedMoney() {
queryRedMoneySubject.onNext(.loading)
APIManager.shared.provider.rx
- .request(.queryRedMoney(orderId: orderId.value, orderType: orderType.value.parame()))
+ .request(.queryRedMoney(orderId: orderId.value, orderType: orderType.value.rawValue))
.map(YYModel<CancleAmountModel>.self)
.validate()
.subscribe(onSuccess: {[unowned self] (model) in
@@ -205,7 +205,7 @@
func pushOrderTaxi() {
pushOrderTaxiTaxiSubject.onNext(.loading)
APIManager.shared.provider.rx
- .request(.pushOrderTaxi(id: orderId.value,orderType: orderType.value.parame()))
+ .request(.pushOrderTaxi(id: orderId.value,orderType: orderType.value.rawValue))
.map(YYModel<TravelServiceModel>.self)
.validate()
.subscribe(onSuccess: { [unowned self] (model) in
@@ -221,7 +221,7 @@
func queryCancleAmount() {
queryCancleAmountSubject.onNext(.loading)
APIManager.shared.provider.rx
- .request(.queryCancleAmount(id: orderId.value,orderType: orderType.value.parame()))
+ .request(.queryCancleAmount(id: orderId.value,orderType: orderType.value.rawValue))
.map(YYModel<CancleAmountModel>.self)
.validate()
.subscribe(onSuccess: { [unowned self] (model) in
@@ -253,7 +253,7 @@
func shareRedEnvelope() {
shareRedEnvelopeSubject.onNext(.loading)
APIManager.shared.provider.rx
- .request(.shareRedEnvelope(orderId: orderId.value, orderType: orderType.value.parame()))
+ .request(.shareRedEnvelope(orderId: orderId.value, orderType: orderType.value.rawValue))
.map(YYModel<Nothing>.self)
.validate()
.subscribe(onSuccess: {[unowned self] (model) in
@@ -268,7 +268,7 @@
func completeOrder() {
completeOrderSubject.onNext(.loading)
APIManager.shared.provider.rx
- .request(.completeOrder(orderId: orderId.value, orderType: orderType.value.parame()))
+ .request(.completeOrder(orderId: orderId.value, orderType: orderType.value.rawValue))
.map(YYModel<Nothing>.self)
.validate()
.subscribe(onSuccess: {[unowned self] (model) in
@@ -283,7 +283,7 @@
func queryEndPush() {
queryEndPushSubject.onNext(.loading)
APIManager.shared.provider.rx
- .request(.queryEndPush(orderId: orderId.value, orderType: orderType.value.parame()))
+ .request(.queryEndPush(orderId: orderId.value, orderType: orderType.value.rawValue))
.map(YYModel<SocketInfoModel>.self)
.validate()
.subscribe(onSuccess: {[unowned self] (model) in
--
Gitblit v1.7.1