调试订单详情页面

RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -2707,8 +2707,8 @@
 		BD1DC6C7228D002200B89C57 /* OrderModel */ = {
 			isa = PBXGroup;
 			children = (
-				BD1DC6C8228D005000B89C57 /* OrderCreateParameterModel.swift */,
 				A7FF1597228D092A00A85748 /* OrderListModel.swift */,
+				BD1DC6C8228D005000B89C57 /* OrderCreateParameterModel.swift */,
 				BD1DC6CA228D157000B89C57 /* OrderCreateBackModel.swift */,
 				BD1DC6CC228D160D00B89C57 /* OrderPurchaseModel.swift */,
 			);

RainbowPlanet/RainbowPlanet/Modules/OrderModule/Order/View/OrderProductTableViewCell.swift

@@ -51,6 +51,7 @@ class OrderProductTableViewCell: UITableViewCell {
             make.centerY.equalToSuperview()
             make.size.equalTo(80)
         }
+
         titleLabel.snp.makeConstraints { (make) in
             make.left.equalTo(productImageView.snp.right).offset(12)
             make.top.equalTo(20)
@@ -58,12 +59,12 @@ class OrderProductTableViewCell: UITableViewCell {
             make.height.equalTo(20)
         }
         timeLabel.snp.makeConstraints { (make) in
-            make.top.equalTo(titleLabel.snp.left).offset(8)
+            make.top.equalTo(titleLabel.snp.bottom).offset(8)
             make.left.equalTo(titleLabel)
             make.height.equalTo(17)
         }
         skuLabel.snp.makeConstraints { (make) in
-            make.top.equalTo(timeLabel.snp.left).offset(8)
+            make.top.equalTo(timeLabel.snp.bottom).offset(8)
             make.left.equalTo(titleLabel)
             make.height.equalTo(17)
         }
@@ -75,6 +76,7 @@ class OrderProductTableViewCell: UITableViewCell {
             make.centerY.equalTo(timeLabel)
             make.right.equalTo(-14)
         }
+        
         lineLabel.snp.makeConstraints { (make) in
             make.bottom.equalToSuperview()
             make.height.equalTo(1)

RainbowPlanet/RainbowPlanet/Modules/OrderModule/Order/View/OrderShopAndStatusTableViewCell.swift

@@ -83,7 +83,7 @@ class OrderShopAndStatusTableViewCell: UITableViewCell {
     var orderModel: OrderModel? {
         didSet {
             shopButton.setTitle(orderModel?.shopName ?? "", for: UIControl.State.normal)
-            shopButton.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.right, imageTitleSpace: 5)
+//            shopButton.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.right, imageTitleSpace: 5)
             if orderModel?.feedbackStatus == 0 { //未维权
                 switch orderModel?.status {
                 case 0: //待付款

RainbowPlanet/RainbowPlanet/Modules/OrderModule/Order/ViewController/OrderListViewController.swift

@@ -159,32 +159,34 @@ extension OrderListViewController : UITableViewDelegate, UITableViewDataSource {
     }
     
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        let orderModel = orderModelArray[indexPath.section]
+        let details = orderModel.detail
         switch indexPath.row {
         case 0:
             let cell = OrderShopAndStatusTableViewCell.cellWith(tableView: tableView, indexPath: indexPath)
-            cell.orderModel = orderModelArray[indexPath.section]
+            cell.orderModel = orderModel
             return cell
         case 1:
             let cell = OrderDeliveryModeAndTimeTableViewCell.cellWith(tableView: tableView, indexPath: indexPath)
-            cell.orderModel = orderModelArray[indexPath.section]
+            cell.orderModel = orderModel
             return cell
-        case orderModelArray.count + 2:
+        case details?.count ?? 0 + 2:
             let cell = OrderTotalAmountTableViewCell.cellWith(tableView: tableView, indexPath: indexPath)
-            cell.orderModel = orderModelArray[indexPath.section]
+            cell.orderModel = orderModel
             return cell
-        case orderModelArray.count + 3:
-            let orderModel = orderModelArray[indexPath.section]
+        case details?.count ?? 0 + 3:
+            let orderModel = orderModel
             switch orderModel.deliverType {
             case 1: //自提
                 if orderModel.feedbackStatus == 0 { //未维权
                     switch orderModel.status {
-                    case 0,5: //待付款/已自提/已完成
+                    case 0,5: //待付款/已自提
                         let cell = OrderDeliveryModeAndButtonTableViewCell.cellWith(tableView: tableView, indexPath: indexPath)
                         return cell
                     case 1,4,7: //待发货/待自提/已关闭
                         let cell = OrderDeliveryModeTableViewCell.cellWith(tableView: tableView, indexPath: indexPath)
                         return cell
-                    case 2,3: //待收货/配送中
+                    case 3: //配送中
                         let cell = OrderButtonTableViewCell.cellWith(tableView: tableView, indexPath: indexPath)
                         return cell
                     default:
@@ -198,11 +200,9 @@ extension OrderListViewController : UITableViewDelegate, UITableViewDataSource {
             case 2: //快递
                 if orderModel.feedbackStatus == 0 { //未维权
                     switch orderModel.status {
-                    case 0,2,3,6: //待付款/待收货//配送中
+                    case 0,2,6: //待付款/待收货/
                         let cell = OrderButtonTableViewCell.cellWith(tableView: tableView, indexPath: indexPath)
                         return cell
-                    case 1,4,5,7: //待发货//待自提//已自提/已关闭
-                        return UITableViewCell()
                     default:
                         return UITableViewCell()
                     }
@@ -217,7 +217,7 @@ extension OrderListViewController : UITableViewDelegate, UITableViewDataSource {
             let cell = OrderProductTableViewCell.cellWith(tableView: tableView, indexPath: indexPath)
             let orderModel = orderModelArray[indexPath.section]
             if !(orderModel.detail?.isEmpty ?? true) {
-                cell.orderModelDetailModel = orderModel.detail?[indexPath.row-2]
+                cell.orderModelDetailModel = details?[indexPath.row - 2]
             }
             return cell
             

RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderDetail/View/OrderDetailContactAddressTableViewCell.swift

@@ -10,7 +10,7 @@ import UIKit
 
 class OrderDetailContactAddressTableViewCell: UITableViewCell {
     
-    class func cellWith(tableView:UITableView,indexPath:IndexPath) -> UITableViewCell {
+    class func cellWith(tableView:UITableView,indexPath:IndexPath) -> OrderDetailContactAddressTableViewCell {
         let ID = "OrderDetailContactAddressTableViewCell"
         tableView.register(OrderDetailContactAddressTableViewCell.self, forCellReuseIdentifier: ID)
         let cell : OrderDetailContactAddressTableViewCell = tableView.dequeueReusableCell(withIdentifier: ID, for: indexPath) as! OrderDetailContactAddressTableViewCell
@@ -75,7 +75,6 @@ class OrderDetailContactAddressTableViewCell: UITableViewCell {
         let contactLabel = UILabel()
         contactLabel.textColor = k333333Color
         contactLabel.font = kBoldFont15
-        contactLabel.text = "图图   158****7201"
         return contactLabel
     }()
     
@@ -83,7 +82,6 @@ class OrderDetailContactAddressTableViewCell: UITableViewCell {
         let addressTitleLabel = UILabel()
         addressTitleLabel.textColor = k666666Color
         addressTitleLabel.font = kRegularFont13
-        addressTitleLabel.text = "自提地址："
         return addressTitleLabel
     }()
     
@@ -91,8 +89,20 @@ class OrderDetailContactAddressTableViewCell: UITableViewCell {
         let addressContentLabel = UILabel()
         addressContentLabel.textColor = k666666Color
         addressContentLabel.font = kRegularFont13
-        addressContentLabel.text = "西安市碑林区建设西路新城智能柜机"
         return addressContentLabel
     }()
+    
+    var orderModel: OrderModel? {
+        didSet {
+            if orderModel?.deliverType == 1 { //自提
+                addressTitleLabel.text = "自提地址："
+            }else { //快递
+                addressTitleLabel.text = "快递地址："
+
+            }
+            contactLabel.text = "\(orderModel?.name ?? "")   \(orderModel?.mobile ?? "")"
+            addressContentLabel.text = orderModel?.address
+        }
+    }
 
 }

RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderDetail/View/OrderDetailExpressSelfMentionTableViewCell.swift

@@ -63,8 +63,24 @@ class OrderDetailExpressSelfMentionTableViewCell: UITableViewCell {
         let contentLabel = UILabel()
         contentLabel.textColor = k333333Color
         contentLabel.font = kRegularFont13
-        contentLabel.text = "快递"
+        
         return contentLabel
     }()
+    
+    var orderModel: OrderModel? {
+        didSet {
+            switch indexPath?.row {
+            case 0:
+                if orderModel?.deliverType == 1 { //自提
+                    contentLabel.text = "自提"
+                }else { //快递
+                    contentLabel.text = "快递"
+                }
+            default:
+                titleLabel.text = "自提点店长"
+                contentLabel.text = orderModel?.pickNodeContact
+            }
+        }
+    }
 
 }

RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderDetail/View/OrderDetailInfoTableViewCell.swift

@@ -84,5 +84,15 @@ class OrderDetailInfoTableViewCell: UITableViewCell {
         copyButton.layer.borderWidth = 1
         return copyButton
     }()
-
+    
+    var titles : [String]? {
+        didSet {
+            titleLabel.text = titles?[(indexPath?.row)!]
+            if indexPath?.row == 0 {
+                copyButton.isHidden = true
+            }else {
+                copyButton.isHidden = false
+            }
+        }
+    }
 }

RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderDetail/View/OrderDetailStatusTableViewCell.swift

@@ -65,16 +65,48 @@ class OrderDetailStatusTableViewCell: UITableViewCell {
         let statusLabel = UILabel()
         statusLabel.textColor = kffffffColor
         statusLabel.font = kBoldFont20
-        statusLabel.text = "已关闭"
         return statusLabel
     }()
     
     private lazy var statusImageView: UIImageView = {
         let statusImageView = UIImageView()
-        statusImageView.image = kImage(name: "order_good")
         return statusImageView
     }()
     
-
-
+    
+    var orderModel: OrderModel? {
+        didSet {
+                switch orderModel?.status {
+                case 0: //待付款
+                    statusLabel.text = "待付款"
+                    statusImageView.image = kImage(name: "order_payment")
+                    break
+                case 1: //待发货
+                    statusLabel.text = "待发货"
+                    statusImageView.image = kImage(name: "order_good")
+                case 2: //已发货/待收货
+                    statusLabel.text = "待收货"
+                    statusImageView.image = kImage(name: "order_good")
+                case 3: //配送中
+                    statusLabel.text = "配送中"
+                    statusImageView.image = kImage(name: "order_good")
+                case 4: //待自提
+                    statusLabel.text = "待自提"
+                    statusImageView.image = kImage(name: "order_pick")
+                case 5: //已自提
+                    statusLabel.text = "已自提"
+                    statusImageView.image = kImage(name: "order_pick_been")
+                    
+                case 6: //已完成
+                    statusLabel.text = "已完成"
+                    statusImageView.image = kImage(name: "order_done")
+                case 7: //已关闭
+                    statusLabel.text = "已关闭"
+                    statusImageView.image = kImage(name: "order_de")
+                    
+                default:
+                    break
+                }
+        }
+    }
 }

RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderDetail/View/OrderDetailView.swift

@@ -25,8 +25,6 @@ class OrderDetailView: BaseView {
         let tableView = UITableView(frame: CGRect.zero, style: UITableView.Style.grouped)
         tableView.separatorStyle = .none
         tableView.backgroundColor = kf7f8faColor
-        tableView.dataSource = self
-        tableView.delegate = self
         tableView.estimatedRowHeight = 0.000001
         tableView.estimatedSectionFooterHeight = 0.000001
         tableView.estimatedSectionHeaderHeight = 0.000001
@@ -35,38 +33,3 @@ class OrderDetailView: BaseView {
     
 }
 
-extension OrderDetailView : UITableViewDelegate, UITableViewDataSource {
-    func numberOfSections(in tableView: UITableView) -> Int {
-        
-        return 0
-    }
-    
-    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return 0
-    }
-    
-    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        return UITableViewCell()
-    }
-    
-    
-    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        return UITableView.automaticDimension
-    }
-    
-    func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
-        return 10
-    }
-    
-    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
-        return nil
-    }
-    
-    func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
-        return 0
-    }
-    
-    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
-        return nil
-    }
-}

RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderDetail/ViewController/OrderDetailViewController.swift

@@ -9,6 +9,14 @@
 import UIKit
 
 class OrderDetailViewController: BaseViewController {
+    
+    let orderModel : OrderModel? = nil
+    
+    var orderDetailModel : OrderModel?
+    
+    var titles = ["订单编码","下单时间","支付时间","支付方式","订单备注"]
+    
+    var contents = ["","","","",""]
 
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -29,12 +37,124 @@ class OrderDetailViewController: BaseViewController {
     }
     
     override func setupData() {
-        
+        orderDetailView.tableView.addHeaderWithHeader(withBeginRefresh: true, animation: false) {
+            [weak self] (page) in
+            self?.orderPurchaseDetailApi()
+        }
+    }
+    
+    
+    /// 订单详情接口
+    func orderPurchaseDetailApi() {
+        SwiftMoyaNetWorkServiceOrder.shared().orderPurchaseDetailApi(purchaseNo:orderModel?.purchaseNo ?? "") {
+            [weak self] (orderDetailModel) -> (Void) in
+            self?.orderDetailModel = orderDetailModel as? OrderModel
+            self?.orderDetailView.tableView.reloadData()
+        }
     }
     
     private lazy var orderDetailView: OrderDetailView = {
         let orderDetailView = OrderDetailView()
+        orderDetailView.tableView.dataSource = self
+        orderDetailView.tableView.delegate = self
         return orderDetailView
     }()
 
 }
+
+extension OrderDetailViewController : UITableViewDelegate, UITableViewDataSource {
+    func numberOfSections(in tableView: UITableView) -> Int {
+        return 4
+    }
+    
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        switch section {
+        case 0:
+            return 2
+        case 1:
+            if self.orderDetailModel?.deliverType == 1 { //自提
+                return 1
+            }else { // 快递
+                return 2
+            }
+        case 2:
+            if self.orderDetailModel?.detail?.isEmpty ?? true {
+                return 2
+            }else {
+                return 2 + (self.orderDetailModel?.detail?.count)!
+            }
+        case 3:
+            switch self.orderDetailModel?.status {
+            case 0: //  0-待付款
+                return 2
+            default: //1-待发货 2-已发货 3-配送中 4-待自提 5-已自提 6-已完成 7-已关闭
+                return titles.count
+            }
+        default:
+            return 0
+        }
+        
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        switch indexPath.section {
+        case 0:
+            if indexPath.row == 0 {
+                let cell = OrderDetailStatusTableViewCell.cellWith(tableView: tableView, indexPath: indexPath)
+                cell.orderModel = self.orderDetailModel
+                return cell
+            }else {
+                let cell = OrderDetailContactAddressTableViewCell.cellWith(tableView: tableView, indexPath: indexPath)
+                 cell.orderModel = self.orderDetailModel
+                return cell
+            }
+        case 1:
+            let cell = OrderDetailExpressSelfMentionTableViewCell.cellWith(tableView: tableView, indexPath: indexPath)
+            cell.orderModel = self.orderDetailModel
+            return cell
+        case 2:
+            let detail = self.orderDetailModel?.detail
+            switch indexPath.row {
+            case 0:
+                let cell = OrderShopAndStatusTableViewCell.cellWith(tableView: tableView, indexPath: indexPath)
+                cell.orderModel = self.orderDetailModel
+                return cell
+            case detail!.count + 1:
+                let cell = OrderTotalAmountTableViewCell.cellWith(tableView: tableView, indexPath: indexPath)
+                cell.orderModel = self.orderDetailModel
+                return cell
+            default:
+                let detail = self.orderDetailModel?.detail
+                let cell = OrderProductTableViewCell.cellWith(tableView: tableView, indexPath: indexPath)
+                cell.orderModelDetailModel = detail?[indexPath.row]
+                return cell
+            }
+        case 3:
+            let cell = OrderDetailInfoTableViewCell.cellWith(tableView: tableView, indexPath: indexPath)
+            return cell
+        default:
+            return UITableViewCell()
+        }
+    }
+    
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        return UITableView.automaticDimension
+    }
+    
+    func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
+        return 10
+    }
+    
+    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+        return nil
+    }
+    
+    func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
+        return 0
+    }
+    
+    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
+        return nil
+    }
+}
+

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ShoppingMall/ViewController/ShoppingMallListViewController.swift

@@ -52,15 +52,10 @@ class ShoppingMallListViewController: UIViewController {
             let cmsModel = cmsModel as! CMSModel
             self?.shoppingMallListView.cmsSectionModels = cmsModel.content
             
-            //任务队列
-            let queue = DispatchQueue(label: "requestHandler")
-            //分组
-            let group = DispatchGroup()
-            
-            queue.async(group: group) {
+            DispatchQueue.global(qos: .default).async {
                 self?.productHomeProductApi(cmsModel: cmsModel)
             }
-            
+        
         }
     }
     
@@ -95,7 +90,7 @@ class ShoppingMallListViewController: UIViewController {
                                     //异步调用返回前，就会一直阻塞在这
                                     sema.wait()
                                     NXLLog("wait\(index)")
-                                    
+                                
                                 }
                             DispatchQueue.main.async {
                                 self.shoppingMallListView.productModelsArrays = self.productModelsArrays

RainbowPlanet/RainbowPlanet/Service/Model/OrderModel/OrderListModel.swift

@@ -30,15 +30,24 @@ class OrderModel : NSObject, Mappable{
     
     var address : String?
     var amount : Int?
+    var cityId : Int?
+    var cityName : String?
     var createdAt : String?
     var deliverType : Int?
     var detail : [OrderModelDetailModel]?
+    var expressNo : String?
     var feedbackStatus : Int?
     var id : Int?
+    var mobile : String?
+    var name : String?
+    var paidAt : String?
     var patchNum : String?
+    var payType : String?
+    var pickNodeContact : String?
     var purchaseNo : String?
     var realPrice : Int?
     var refundNo : String?
+    var remark : String?
     var shopId : Int?
     var shopName : String?
     var status : Int?
@@ -55,22 +64,30 @@ class OrderModel : NSObject, Mappable{
     {
         address <- map["address"]
         amount <- map["amount"]
+        cityId <- map["city_id"]
+        cityName <- map["city_name"]
         createdAt <- map["created_at"]
         deliverType <- map["deliver_type"]
         detail <- map["detail"]
+        expressNo <- map["express_no"]
         feedbackStatus <- map["feedback_status"]
         id <- map["id"]
+        mobile <- map["mobile"]
+        name <- map["name"]
+        paidAt <- map["paid_at"]
         patchNum <- map["patch_num"]
+        payType <- map["pay_type"]
+        pickNodeContact <- map["pick_node_contact"]
         purchaseNo <- map["purchase_no"]
         realPrice <- map["real_price"]
         refundNo <- map["refund_no"]
+        remark <- map["remark"]
         shopId <- map["shop_id"]
         shopName <- map["shop_name"]
         status <- map["status"]
         transPrice <- map["trans_price"]
         
     }
-    
 }
 
 class OrderModelDetailModel : NSObject, Mappable{
@@ -118,3 +135,4 @@ class OrderModelDetailModel : NSObject, Mappable{
         
     }
 }
+

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceOrder/SwiftMoyaNetWorkServiceOrder.swift

@@ -88,11 +88,29 @@ class SwiftMoyaNetWorkServiceOrder: NSObject {
             parameters.updateValue(status, forKey: "search_status")
         }
         parameters.updateValue(page, forKey: "page")
-         SwiftMoyaNetWorkManager.shared().request(OrderListModel.self,target: MultiTarget(SwiftMoyaServiceOrderApi.orderPurchaseOrderList(parameters: parameters))) { (orderListModel) in
+        SwiftProgressHUD.shared().showWait()
+        SwiftMoyaNetWorkManager.shared().request(OrderListModel.self,target: MultiTarget(SwiftMoyaServiceOrderApi.orderPurchaseOrderList(parameters: parameters))) { (orderListModel) in
             SwiftProgressHUD.shared().hide()
             completion(orderListModel)
         }
 
     }
+    
+    // MARK: - 前台订单详情
+    /// 前台订单详情
+    ///
+    /// - Parameters:
+    ///   - status: 订单状态
+    ///   - completion: 回调
+    func orderPurchaseDetailApi(purchaseNo:String = "",completion: @escaping apiCallBack) {
+        var parameters = Dictionary<String,Any>()
+        parameters.updateValue(purchaseNo, forKey: "search_status")
+        SwiftProgressHUD.shared().showWait()
+        SwiftMoyaNetWorkManager.shared().request(OrderModel.self,target: MultiTarget(SwiftMoyaServiceOrderApi.orderPurchaseDetail(parameters: parameters))) { (orderModel) in
+            SwiftProgressHUD.shared().hide()
+            completion(orderModel)
+        }
+        
+    }
         
 }

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceOrder/SwiftMoyaServiceOrderApi.swift

@@ -17,13 +17,22 @@ public let kOrderCreateApi = "/order/purchase/create"
 /// 前台订单列表
 public let kOrderPurchaseOrderListApi = "/order/purchase/orderList"
 
+// MARK: - 前台订单详情
+/// 前台订单详情
+public let kOrderPurchaseDetailApi = "/order/purchase/detail"
+
+
+
 /// 商品
 ///
 /// - productSearch: 搜索、列表、热销
-/// - orderPurchaseOrderList: 搜索、列表、热销
+/// - orderPurchaseOrderList: 前台订单列表
+/// - orderPurchaseOrderList: 前台订单详情
 public enum SwiftMoyaServiceOrderApi {
     case orderCreate(parameters:Dictionary<String, Any>)
     case orderPurchaseOrderList(parameters:Dictionary<String, Any>)
+    case orderPurchaseDetail(parameters:Dictionary<String, Any>)
+
 }
 
 extension SwiftMoyaServiceOrderApi: TargetType {
@@ -31,7 +40,8 @@ extension SwiftMoyaServiceOrderApi: TargetType {
     public var baseURL: URL {
         switch self {
         case .orderCreate,
-             .orderPurchaseOrderList
+             .orderPurchaseOrderList,
+             .orderPurchaseDetail
             :
             return URL(string: kApiDataPrefix())!
         }
@@ -43,6 +53,8 @@ extension SwiftMoyaServiceOrderApi: TargetType {
             return kOrderCreateApi
         case .orderPurchaseOrderList:
             return kOrderPurchaseOrderListApi
+        case .orderPurchaseDetail:
+            return kOrderPurchaseDetailApi
         }
     }
     
@@ -56,7 +68,8 @@ extension SwiftMoyaServiceOrderApi: TargetType {
 //             .productCartAllSel
 //            :
 //            return .put
-        case .orderPurchaseOrderList
+        case .orderPurchaseOrderList,
+             .orderPurchaseDetail
             :
             return .get
 //        case .productCartDelete
@@ -69,7 +82,8 @@ extension SwiftMoyaServiceOrderApi: TargetType {
     public var task: Task {
         switch self {
         case .orderCreate(var parameters),
-             .orderPurchaseOrderList(var parameters)
+             .orderPurchaseOrderList(var parameters),
+             .orderPurchaseDetail(var parameters)
             :
             let sign = SwiftSign.shared().sign(signType:.AccessToken, parameters: parameters)
             parameters.updateValue(sign, forKey: "sign")
@@ -93,7 +107,8 @@ extension SwiftMoyaServiceOrderApi: TargetType {
         //同task，具体选择看后台 有application/x-www-form-urlencoded 、application/json
         switch self {
         case .orderCreate,
-             .orderPurchaseOrderList
+             .orderPurchaseOrderList,
+             .orderPurchaseDetail
             :
             return (headerParameters(headerType: .tokenHeader) as! [String : String])
         }

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceManger/SwiftMoyaNetWorkManager/SwiftMoyaNetWorkManager.swift

@@ -16,7 +16,7 @@ import RxCocoa
 import Result
 
 /// 超时时长
-private var requestTimeOut:Double = 20
+private var requestTimeOut:Double = 10
 
 ///网络请求的基本设置,这里可以拿到是具体的哪个网络请求，可以在这里做一些设置
 private let myEndpointClosure = { (target: MultiTarget) -> Endpoint in
@@ -34,7 +34,7 @@ private let myEndpointClosure = { (target: MultiTarget) -> Endpoint in
         task: task,
         httpHeaderFields: target.headers
     )
-    requestTimeOut = 20//每次请求都会调用endpointClosure 到这里设置超时时长 也可单独每个接口设置
+    requestTimeOut = 10//每次请求都会调用endpointClosure 到这里设置超时时长 也可单独每个接口设置
     
     return endpoint
 }
@@ -415,6 +415,8 @@ extension PrimitiveSequence where TraitType == SingleTrait, ElementType == Respo
                         SwiftProgressHUD.shared().showText(rootModel!.msg ?? "信息有误!!!", textAlignment: .left)
                         return Single<T?>.just(nil)
                     }else {
+                        NXLLog("\nstatusCode=\(response.statusCode)\nerror=\n\(response.description)");
+                        SwiftProgressHUD.shared().showText(response.description)
                         return Single<T?>.just(nil)
                     }
                 }else if response.statusCode == 401 {
@@ -454,6 +456,8 @@ extension PrimitiveSequence where TraitType == SingleTrait, ElementType == Respo
                         SwiftProgressHUD.shared().showText(rootModel!.msg ?? "信息有误!!!", textAlignment: .left)
                         return Single<[T]?>.just(nil)
                     }else {
+                        NXLLog("\nstatusCode=\(response.statusCode)\nerror=\n\(response.description)");
+                        SwiftProgressHUD.shared().showText(response.description)
                         return Single<[T]?>.just(nil)
                     }
                 }else if response.statusCode == 401 {