修改与新增

无故事王国

2023-05-25 dc1998fc1ac124f6b9a0e434ccf91103dd936409

 OKProject/Class/Order/Controller/TaxiOrderListVC.swift

@@ -16,7 +16,7 @@
    /// viewModel
    let viewModel = TaxiOrderViewModel()
    
    init(orderType: Int) {
    init(orderType: OrderType) {
        super.init(nibName: nil, bundle: nil)
        viewModel.type.accept(orderType)
    }
@@ -78,21 +78,37 @@
    
    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
        let data = viewModel.dataSource.value[indexPath.row]

        // 8=待评价，9=已完成
        if data.state == 8 || data.state == 9{
            // 新的界面 有轨迹
            let vc = TaxiOrderDetailsVC.init(orderId: data.orderId, orderType: OrderType(rawValue: viewModel.type.value) ?? .taxi)
            let vc = TaxiOrderDetailsVC.init(orderId: data.orderId, orderType: viewModel.type.value)
            self.yy_push(vc: vc) 
        }else{
            // 订单流程界面
            if self.viewModel.type.value == 1{
            if self.viewModel.type.value == .special{

                var isCarpool:Bool = false
                if data.rideType == .seating{isCarpool = true}
                let vc = YYSpecialCarViewController.init(orderId: data.orderId,isCarpool: isCarpool)
                vc.viewModel.orderType.accept(.special)
                self.yy_push(vc: vc)
            }else if self.viewModel.type.value == 3{
            }else if viewModel.type.value == .scenic{
                if data.state == 7{
                    let vc = TravelOrderSuccessVC()
                    vc.id.accept(data.orderId)
                    vc.statusType = .MyOrder
                    yy_push(vc: vc)
                    return
                }

                let vc = TravelServiceVC(orderId: data.orderId, orderType: .scenic)
                wy_pushAnimate(vc: vc)
//                let vc = YYSpecialCarViewController.init(orderId: data.orderId)
//                vc.viewModel.orderType.accept(.scenic)
//                self.yy_push(vc: vc)

            }else if self.viewModel.type.value == .travel{
                if data.state == 7 {
                    //待支付
                    let vc = TravelOrderSuccessVC()
@@ -112,7 +128,7 @@
                vc.viewModel.orderType.accept(.travel)
                self.yy_push(vc: vc)
            }else{
                let vc = TravelServiceVC.init(orderId: data.orderId, orderType: OrderType(rawValue: viewModel.type.value) ?? .taxi)
                let vc = TravelServiceVC.init(orderId: data.orderId, orderType: viewModel.type.value)
                self.yy_push(vc: vc)
            }
        }