修改BUG

younger_times

2023-07-04 38f768d39ba27d303147c59a222655b7c6cdfb25

 OKProject/Class/Taxi/Controller/TravelServicePayVC.swift

@@ -46,7 +46,10 @@
    /// 余额支付
    @IBOutlet weak var button_balance: UIButton!
    
    /// 优惠券
    @IBOutlet weak var button_company: UIButton!
    @IBOutlet weak var button_companyState: UIButton!
    @IBOutlet weak var label_company: UILabel!
        /// 优惠券
    @IBOutlet weak var button_coupons: UIButton!
    @IBOutlet weak var button_couponHeiCons: NSLayoutConstraint!

@@ -88,6 +91,8 @@
    private var money: Double = 0
    
    private var orderId = 0

    private var payway = 0
    
    let refresh = Delegate<Void,Void>()
    /// 支付失败或者 取消支付
@@ -99,11 +104,13 @@
    var isLogisicUgentPay = false
    /// Self
    /// - Parameter orderId: 订单Id
    init(orderId: Int,money: Double,orderType: OrderType,isLogisicUgentPay:Bool = false) {
    init(orderId: Int,money: Double,orderType: OrderType,isLogisicUgentPay:Bool = false,payway:Int = 1) {
        super.init(nibName: String.init(describing: TravelServicePayVC.self), bundle: Bundle.main)
        viewModel.orderId.accept(orderId)
        viewModel.payway.accept(payway)
        viewModel.orderType.accept(orderType)
        self.money = money
        self.payway = payway
        self.isLogisicUgentPay = isLogisicUgentPay
    }
    
@@ -128,6 +135,11 @@
//        }

//        queryCouponList(orderType: viewModel.orderType.value, orderId: viewModel.orderId.value)

        button_company.isHidden = payway == 1
        button_weChat.isHidden = payway == 2
        button_ali.isHidden = payway == 2
        button_balance.isHidden = payway == 2
    }
    
    
@@ -198,6 +210,8 @@
                        self.label_payMoney.text = String(format: "%@元", tempMoney.ld_formatFloat)
                        self.button_submit.setTitle(String(format: "立即支付%.2lf元", tempMoney), for: .normal)

                        self.label_company.text = "企业支付（授信额度：\(data.companyLimit)元）"

                        var temp = PaymentCouponModel()
                        temp.money = data.discountAmount
                        temp.dataType = data.type
@@ -221,7 +235,7 @@
                    break
                case .success(let model):
                    self.hide()
                    if self.payType.value == .balance{
                        if self.payType.value == .balance || self.payType.value == .company{
                        alert(text: "支付成功")
                        self.giveAwayMerchantCoupon()
                        self.dismiss()
@@ -292,6 +306,9 @@
                case .offline:
                    self.updateButtonState(sender: self.button_offlineState)
                    break
                    case .company:
                        self.updateButtonState(sender: self.button_companyState)
                        break
                }
            }).disposed(by: rx.disposeBag)
        
@@ -308,6 +325,11 @@
        button_balance.rx.tap
            .subscribe(onNext: {[unowned self] (_) in
                self.payType.accept(.balance)
            }).disposed(by: rx.disposeBag)

        button_company.rx.tap
            .subscribe(onNext: {[unowned self] (_) in
                self.payType.accept(.company)
            }).disposed(by: rx.disposeBag)
        
        button_coupons.rx.tap
@@ -375,7 +397,7 @@
    /// 更新按钮状态
    /// - Parameter sender: 按钮
    func updateButtonState(sender: UIButton)  {
        let array = [button_balanceState,button_weChatState,button_aliState,button_offlineState]
        let array = [button_balanceState,button_weChatState,button_aliState,button_offlineState,button_companyState]
        for item in array{
            item?.isSelected = item == sender
        }