新增

younger_times

2023-05-06 739a784e0bb13fc37bae846492feaccf02b1af5c

 OKProject/Class/Home/View/TripAddressCell.swift

@@ -60,7 +60,8 @@
    /// 现在
    @IBOutlet weak var button_now: UIButton!
    
    /// 预约
    @IBOutlet weak var view_now: UIView!
        /// 预约
    @IBOutlet weak var button_appointment: UIButton!
    /// 特惠购卡
    @IBOutlet weak var buyCardBtn: UIView!
@@ -369,6 +370,9 @@
                    self.button_tip.isHidden = false
                    if YYMapViewManager.share.orderType.value == .taxi{
                        self.button_date.setTitle(YYMapViewManager.share.timeStamp.value == nil ? "选择时间" : "\(YYMapViewManager.share.timeStamp.value?.toFormat(format: "M月d日 HH:mm") ?? "选择时间")", for: .normal)
                    }else if YYMapViewManager.share.orderType.value == .business{
                        self.button_date.setTitle(YYMapViewManager.share.timeStamp.value == nil ? "时间" : "\(YYMapViewManager.share.timeStamp.value?.toFormat(format: "M月d日 HH:mm") ?? "时间")", for: .normal)
                        self.button_passenger.setTitle(YYMapViewManager.share.passenger.value == nil ? "事由出行" : "\(YYMapViewManager.share.passenger.value?.name ?? "事由出行")", for: .normal)
                    }else{
                        self.button_date.setTitle(YYMapViewManager.share.timeStamp.value == nil ? "现在" : "\(YYMapViewManager.share.timeStamp.value?.toFormat(format: "M月d日 HH:mm") ?? "现在")", for: .normal)
                    }
@@ -405,6 +409,15 @@
                self.sitTogetherView.isHidden = true
                self.sitSingleView.isHidden = true
                self.onePriceView.isHidden = true

                if YYMapViewManager.share.orderType.value == .business{
                    self.view_now.isHidden = true
                    self.view_call.isHidden = false
                    self.view_taxi.isHidden = true
                    self.button_more.isHidden = true
                    self.button_tip.setTitle("计费方式", for: .normal)
                }

                break
            case .called:
                self.button_more.isHidden = true
@@ -436,10 +449,17 @@
                    self.button_tip.isHidden = true
                    self.queryServerCarModel()
                }
                let title = YYMapViewManager.share.orderType.value == .taxi ? "呼叫出租车" : "呼叫快车/专车"
                self.button_submit.setTitle(title, for: .normal)
                
                

                var title = ""
                if YYMapViewManager.share.orderType.value == .taxi{
                    title = "呼叫出租车"
                }else if YYMapViewManager.share.orderType.value == .special {
                    title = "呼叫快车/专车"
                }else if YYMapViewManager.share.orderType.value == .business{
                    title = "预约出行"
                }
            self.button_submit.setTitle(title, for: .normal)

                break
            }
        }).disposed(by: rx.disposeBag)
@@ -454,7 +474,12 @@
        YYMapViewManager.share.tip
        .subscribeOn(MainScheduler.instance)
            .subscribe(onNext: {[unowned self] (string) in
                self.button_tip.setTitle(string == nil ? "小费" : string, for: .normal)
                if YYMapViewManager.share.orderType.value == .business{
                    self.button_tip.setTitle(string == nil ? "计费方式" : string, for: .normal)
                }else{
                    self.button_tip.setTitle(string == nil ? "小费" : string, for: .normal)
                }

            }).disposed(by: rx.disposeBag)

        sitTogetherChooseBtn.rx.tap.subscribe(onNext: {[unowned self](_) in