younger_times
2023-07-11 6b08909bd5ada666c758027faea50c79f6612c17
修改逻辑
4个文件已修改
70 ■■■■■ 已修改文件
BrokerDriver/Home/VC/HomeDetailContentVC.swift 66 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
BrokerDriver/Network/Services.swift 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
BrokerDriver/ViewModels/OrderViewModel.swift 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Podfile 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
BrokerDriver/Home/VC/HomeDetailContentVC.swift
@@ -53,34 +53,44 @@
                let tuple = (startCoordinate,endCoordinate)
                NotificationCenter.default.post(name: UpdateMap_Noti, object: tuple)
                switch type{
                    case 1:
                        switch m.status.rawValue{
                            case 2,3,4,5,12,14:view_btn.isHidden = false
                            default:view_btn.isHidden = true
                        }
                    case 2:
                        switch m.status.rawValue{
                            case 6,7,8,15:
                                view_btn.isHidden = false
                            default:view_btn.isHidden = true
                        }
                    case 3:
                        switch m.status.rawValue{
                            case 9,10:
                                view_btn.isHidden = false
                                if m.orderType != "Live Unload" && m.status.rawValue == 9{
                                    view_btn.isHidden = true
                                }
                            default:view_btn.isHidden = true
                        }
                    case 4:
                        switch m.status.rawValue{
                            case 11:view_btn.isHidden = false
                            default:view_btn.isHidden = true
                        }
                    default:view_btn.isHidden = true
                }
                view_btn.isHidden = m.button == 2
//                switch m.status.rawValue{
//                    case 2,3,4,5,12,14:type = 1
//                    case 6,7,8,15:type = 2
//                    case 9,10:type = 3
//                    case 11:type = 4
//                    default:break
//                }
//
//                switch type{
//                    case 1:
//                        switch m.status.rawValue{
//                            case 2,3,4,5,12,14:view_btn.isHidden = false
//                            default:view_btn.isHidden = true
//                        }
//                    case 2:
//                        switch m.status.rawValue{
//                            case 6,7,8,15:
//                                view_btn.isHidden = false
//                            default:view_btn.isHidden = true
//                        }
//                    case 3:
//                        switch m.status.rawValue{
//                            case 9,10:
//                                view_btn.isHidden = false
//                                if m.orderType != "Live Unload" && m.status.rawValue == 9{
//                                    view_btn.isHidden = true
//                                }
//                            default:view_btn.isHidden = true
//                        }
//                    case 4:
//                        switch m.status.rawValue{
//                            case 11:view_btn.isHidden = false
//                            default:view_btn.isHidden = true
//                        }
//                    default:view_btn.isHidden = true
//                }
            }
        }
    }
BrokerDriver/Network/Services.swift
@@ -12,6 +12,7 @@
#if DEBUG
let All_Url = "http://192.168.110.22:8040"
//let All_Url = "http://54.67.44.33:8040"
let Google_Url = "https://roads.googleapis.com/v1"
#else
let All_Url = "http://54.67.44.33:8040"
BrokerDriver/ViewModels/OrderViewModel.swift
@@ -33,6 +33,7 @@
    var nextStatus:OrderType = .None
    var tGoods: OrderDetailGoodsModel?
    var type: Int = 0
    var button:Int = 2
}
struct OrderDetailGoodsModel:HandyJSON {
Podfile
@@ -6,7 +6,7 @@
  inhibit_all_warnings!
  # Pods for BrokerDriver
  pod 'JQTools',:path=> '/Users/yangkai/Developer/MyProject/JQTools'
  pod 'JQTools',:path=> '/Users/yvkd/MyProject/JQTools'
  pod 'FFPage'
  pod 'SPPageMenu'
  pod 'HandyJSON'