完善订单列表（可测试）

GeliBusinessPlatform/View/MoreBtnView/OrderSelectMoreView.swift

@@ -35,7 +35,7 @@ class OrderSelectMoreView: UIView,TitleAndSelCalendarViewDelegate ,TimeSelectVie
         }
         BeginDate = nil
         EndDate = nil
-        paySArr = [false,false,false,false,false]
+        paySArr = [false,false,false,false,false,false]
         bugSArr = [false,false]
         sendSArr = [false,false,false,false]
         
@@ -97,7 +97,7 @@ class OrderSelectMoreView: UIView,TitleAndSelCalendarViewDelegate ,TimeSelectVie
             make.top.equalTo(timeTilelV.snp_bottom).offset(15*glscale)
         }
         
-        let payV = addTitleAndMoreBtn(title: "支付状态", arrStr: ["未付款","欠款","已付款","月结","已退款"], btnTag: 1000)
+        let payV = addTitleAndMoreBtn(title: "支付状态", arrStr: ["未付款","欠款","已付款","月结","已退款","已付定金"], btnTag: 1000)
         moreBgView.addSubview(payV)
         payV.snp.makeConstraints { (make) in
             make.left.equalTo(15*glscale)
@@ -197,6 +197,16 @@ class OrderSelectMoreView: UIView,TitleAndSelCalendarViewDelegate ,TimeSelectVie
             paySArr[index] = sender.isSelected
         }else if sender.tag < 3000 {
             let index = sender.tag - 2000
+            bugSArr = [false,false]
+            allSelectBtn.forEach { (btn) in
+                if btn.tag < 3000 && btn.tag > 1999 {
+                    if btn.tag != sender.tag {
+                        btn.isSelected = false
+                        btn.setTitleColor(UIColor.init(named: "多选按钮字体颜色"), for: .normal)
+                        btn.backgroundColor = UIColor.init(named: "多选按钮背景颜色")
+                    }
+                }
+            }
             bugSArr[index] = sender.isSelected
         }else{
             let index = sender.tag - 3000

GeliBusinessPlatform/ViewController/订单列表/OrderListViewController.swift

@@ -100,7 +100,7 @@ class OrderListViewController: BaseViewController ,UISearchBarDelegate, SearchBa
     //MARK:--筛选
     var BeginDate: Date! = nil
     var EndDate: Date! = nil
-    var paySArr:Array<Bool> = [false,false,false,false,false]
+    var paySArr:Array<Bool> = [false,false,false,false,false,false]
     var bugSArr:Array<Bool> = [false,false]
     var sendSArr:Array<Bool> = [false,false,false,false]
     var selectV : OrderSelectMoreView! = nil
@@ -137,7 +137,7 @@ class OrderListViewController: BaseViewController ,UISearchBarDelegate, SearchBa
         self.bugSArr = bugSelectArr
         self.sendSArr = sendSelectArr
         
-        //暂时不处理选择方式
+ 
        
         viewControllers.forEach { (vc) in
             if EndDate == nil {
@@ -150,6 +150,84 @@ class OrderListViewController: BaseViewController ,UISearchBarDelegate, SearchBa
                 vc.startTime = Int(timeInterval)
                 vc.endTime = Int(timeIntervalEnd)
             }
+            //支付状态
+            var payStr = ""
+            for i in 0..<self.paySArr.count {
+                let isBool = self.paySArr[i]
+                var tmpeStr = ""
+                if isBool {
+                    switch i {
+                    case 0:
+                        tmpeStr = "0"
+                        break
+                    case 1:
+                        tmpeStr = "1"
+                        break
+                    case 2:
+                        tmpeStr = "2"
+                        break
+                    case 3:
+                        tmpeStr = "10"
+                        break
+                    case 4:
+                        tmpeStr = "11"
+                        break
+                    case 5:
+                        tmpeStr = "12"
+                        break
+                    default:
+                        break
+                    }
+                }
+                if tmpeStr.count > 0 {
+                    if payStr.count == 0 {
+                        payStr = tmpeStr
+                    }else{
+                        payStr = payStr + ";" + tmpeStr
+                    }
+                }
+            }
+            vc.payStatus = payStr
+            //下单方式
+            vc.orderSource = 0
+            for i in 0..<self.bugSArr.count {
+                let isBool = self.bugSArr[i]
+                if isBool {
+                    vc.orderSource = i + 1
+                }
+            }
+            //商品配送状态
+            var shippingStr = ""
+            for i in 0..<self.sendSArr.count {
+                let isBool = self.sendSArr[i]
+                var tmpeStr = ""
+                if isBool {
+                    switch i {
+                    case 0:
+                        tmpeStr = "0"
+                        break
+                    case 1:
+                        tmpeStr = "1"
+                        break
+                    case 2:
+                        tmpeStr = "2"
+                        break
+                    case 3:
+                        tmpeStr = "4"
+                        break
+                    default:
+                        break
+                    }
+                }
+                if tmpeStr.count > 0 {
+                    if shippingStr.count == 0 {
+                        shippingStr = tmpeStr
+                    }else{
+                        shippingStr = shippingStr + ";" + tmpeStr
+                    }
+                }
+            }
+            vc.shippingStatus = shippingStr
             vc.isUpData = false
         }
         let vc = viewControllers[selectIndex]

GeliBusinessPlatform/ViewController/订单详情/OrderDViewController.swift

@@ -55,11 +55,18 @@ class OrderDViewController: BaseViewController {
     //测试数据
     var listArray = ["a","b","c"]
     let btmBtnTitleArray = ["修改价格","打印","确认订单","取消订单"]
+    //MARK:--加载数据
+    func loadData() {
+        let UserToken = UserDefaults.standard.value(forKey: "user_token")
+        orderDetail(["user_token":UserToken as Any,"order_id":orderId], success: { (data) in
             
+        }) { (error) in
+            
+        }
+    }
     override func viewDidLoad() {
         super.viewDidLoad()
       
-        
         navbar.title = "订单详情"
         self.view.addSubview(navbar)
         self.setBottomBtn(sender: bottomView)