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/Controller/TravelVC.swift | 77 ++++----------------------------------
1 files changed, 9 insertions(+), 68 deletions(-)
diff --git a/OKProject/Class/Home/Controller/TravelVC.swift b/OKProject/Class/Home/Controller/TravelVC.swift
index 61de98b..b3c2031 100644
--- a/OKProject/Class/Home/Controller/TravelVC.swift
+++ b/OKProject/Class/Home/Controller/TravelVC.swift
@@ -11,65 +11,6 @@
import RxSwift
import HandyJSON
-/// 出行方式 /// 业务类型（1=快车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城，6=包车）
-enum OrderType: Int,HandyJSONEnum{
- // 出租车
- case taxi = 2
- /// 快车
- case special = 1
- /// 跨城
- case travel = 3
- /// 同城物流
- case cityLogistics = 4
- /// 跨城物流
- case acrossLogistics = 5
- /// 包车
- case charter = 6
-
- //公务用车
- case business = 8
-
- func parame() -> Int {
- switch self {
- case .taxi:
- return 2
- case .travel :
- return 3
- case .cityLogistics:
- return 4
- case .acrossLogistics:
- return 5
- case .charter:
- return 6
- case .business:
- return 8
- default:
- return 1
- }
- }
-
- static func type(id: Int) -> OrderType {
- switch id {
- case 2:
- return .taxi
- case 3:
- return .travel
- case 4:
- return .cityLogistics
- case 5:
- return .acrossLogistics
- case 6:
- return .charter
- case 8:
- return .business
- default:
- return .special
- }
- }
-}
-
-
-
/// 出行
class TravelVC: YYViewController {
@@ -219,7 +160,7 @@
// 选择人数
cell.appointment.delegate(on: self) { (self, _) in
- if self.viewModel.orderType.value == .special{
+ if self.viewModel.orderType.value == OrderType.special{
let num = YYMapViewManager.share.passengerNum.value
SpecialSealAffirmView.show(defaultNum: num, affirmClouse: { num in
YYMapViewManager.share.passengerNum.accept(num)
@@ -238,7 +179,7 @@
return
}
- if self.viewModel.orderType.value == .business{
+ if self.viewModel.orderType.value == OrderType.offical{
let view = TaxiReservationView()
view.show(intervalMinute:20)
view.complete.delegate(on: self) { (self, timeStamp) in
@@ -257,7 +198,7 @@
cell.passenger.delegate(on: self) { (self, _) in
//公务车出行事由
- if self.viewModel.orderType.value == .business{
+ if self.viewModel.orderType.value == .offical{
let vc = ReasonforTravelVC()
vc.view.backgroundColor = UIColor.black.withAlphaComponent(0)
vc.view.frame = CGRect(x: 0, y: screenH, width: ScreenWidth, height: ScreenHeight)
@@ -292,7 +233,7 @@
// 添加小费
cell.tip.delegate(on: self) { (self, _) in
//公务车计费方式
- if self.viewModel.orderType.value == .business{
+ if self.viewModel.orderType.value == .offical{
MineInfoView.instance(data: ["单程计费","包车计费"]).show { (row) in
if row == 0{
@@ -389,7 +330,7 @@
super.init(nibName: nil, bundle: nil)
viewModel.orderType.accept(orderType)
- if orderType == .business{
+ if orderType == .offical{
YYMapViewManager.share.state.accept(.appointment)
}
}
@@ -550,7 +491,7 @@
let vc = YYSpecialCarViewController.init(orderId: self.viewModel.orderId.value)
self.yy_push(vc: vc)
break
- case .business:
+ case .offical:
let vc = TravelServiceVC.init(orderId: self.viewModel.orderId.value, orderType: self.viewModel.orderType.value)
self.yy_push(vc: vc)
default:break
@@ -571,7 +512,7 @@
viewModel.number.bind(to: view_carNum.label_content.rx.text).disposed(by: disposeBag)
- view_carNum.didPressTrip.delegate(on: self) { (self, _) in
+ view_carNum.didPressTrip.delegate(on: self) { (_, _) in
switch self.viewModel.orderType.value{
case .taxi:
// 订单流程界面
@@ -585,7 +526,7 @@
let vc = YYSpecialCarViewController.init(orderId: self.viewModel.currentOrderId.value,isCarpool: isCarpool)
self.yy_push(vc: vc)
- case .business:
+ case .offical:
break
case .travel:
break
@@ -611,7 +552,7 @@
self.offset = 0
}
- if viewModel.orderType.value == .business{
+ if viewModel.orderType.value == .offical{
self.cellHeight = 280
}
--
Gitblit v1.7.1