From dc1998fc1ac124f6b9a0e434ccf91103dd936409 Mon Sep 17 00:00:00 2001 From: 无故事王国 <841720330@qq.com> Date: 星期四, 25 五月 2023 18:47:57 +0800 Subject: [PATCH] 修改与新增 --- OKProject/Class/SpecialCar/ViewModel/YYSpecialCarViewModel.swift | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/OKProject/Class/SpecialCar/ViewModel/YYSpecialCarViewModel.swift b/OKProject/Class/SpecialCar/ViewModel/YYSpecialCarViewModel.swift index 31c8976..9b638ff 100644 --- a/OKProject/Class/SpecialCar/ViewModel/YYSpecialCarViewModel.swift +++ b/OKProject/Class/SpecialCar/ViewModel/YYSpecialCarViewModel.swift @@ -75,7 +75,7 @@ return APIManager.shared.provider.rx - .request(.queryOrderInfo(orderId: orderId.value, orderType: orderType.value.parame())) + .request(.queryOrderInfo(orderId: orderId.value, orderType: orderType.value.rawValue)) .mapThenValidate(YYSpecialCarModel.self) .catchError { Single.just(.failure($0)) } .asObservable() @@ -85,7 +85,7 @@ /// 取消订单获取金额 func queryCancleAmount() -> Observable<Result<CancleAmountModel?, Error>> { return APIManager.shared.provider.rx - .request(.queryCancleAmount(id: orderId.value,orderType: orderType.value.parame())) + .request(.queryCancleAmount(id: orderId.value,orderType: orderType.value.rawValue)) .mapThenValidate(CancleAmountModel.self) .catchError { Single.just(.failure($0)) } .asObservable() @@ -113,7 +113,7 @@ func queryOrderServer() -> Observable<Result<SocketInfoModel?, Error>> { return APIManager.shared.provider.rx - .request(.queryOrderServer(orderId: self.orderId.value, orderType: orderType.value.parame())) + .request(.queryOrderServer(orderId: self.orderId.value, orderType: orderType.value.rawValue)) .mapThenValidate(SocketInfoModel.self) .catchError { Single.just(.failure($0)) } .asObservable() @@ -123,7 +123,7 @@ func queryEndPush() -> Observable<Result<SocketInfoModel?, Error>> { return APIManager.shared.provider.rx - .request(.queryEndPush(orderId: orderId.value, orderType: orderType.value.parame())) + .request(.queryEndPush(orderId: orderId.value, orderType: orderType.value.rawValue)) .mapThenValidate(SocketInfoModel.self) .catchError { Single.just(.failure($0)) } .asObservable() @@ -134,7 +134,7 @@ func pushOrder() -> Observable<Result<TravelServiceModel?, Error>> { return APIManager.shared.provider.rx - .request(.pushOrderTaxi(id: orderId.value, orderType: orderType.value.parame())) + .request(.pushOrderTaxi(id: orderId.value, orderType: orderType.value.rawValue)) .mapThenValidate(TravelServiceModel.self) .catchError { Single.just(.failure($0)) } .asObservable() @@ -144,7 +144,7 @@ func orderEvaluate() -> Observable<Result<Nothing?, Error>> { return 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)) .mapThenValidate(Nothing.self) .catchError { Single.just(.failure($0)) } .asObservable() @@ -176,7 +176,7 @@ func queryRedMoney() -> Observable<Result<CancleAmountModel?, Error>> { return APIManager.shared.provider.rx - .request(.queryRedMoney(orderId: orderId.value,orderType: orderType.value.parame())) + .request(.queryRedMoney(orderId: orderId.value,orderType: orderType.value.rawValue)) .mapThenValidate(CancleAmountModel.self) .catchError { Single.just(.failure($0)) } .asObservable() @@ -185,7 +185,7 @@ /// 评论成功后获取红包金额 func shareRedEnvelope() -> Observable<Result<Nothing?, Error>> { APIManager.shared.provider.rx - .request(.shareRedEnvelope(orderId: orderId.value, orderType: orderType.value.parame())) + .request(.shareRedEnvelope(orderId: orderId.value, orderType: orderType.value.rawValue)) .mapThenValidate(Nothing.self) .catchError { Single.just(.failure($0)) } .asObservable() -- Gitblit v1.7.1