订单详情预售点击补充

GeliBusinessPlatform.xcworkspace/contents.xcworkspacedata

@@ -4,22 +4,6 @@
    <FileRef
       location = "group:GeliBusinessPlatform.xcodeproj">
    </FileRef>
-   <Group
-      location = "group:GeliBusinessPlatform/Model/../.."
-      name = "Products">
-      <FileRef
-         location = "build:GeliBusinessPlatform.app"
-         assignedFileDataType = "com.apple.application-bundle">
-      </FileRef>
-      <FileRef
-         location = "build:GeliBusinessPlatformTests.xctest"
-         assignedFileDataType = "com.apple.xcode.cfbundle">
-      </FileRef>
-      <FileRef
-         location = "build:GeliBusinessPlatformUITests.xctest"
-         assignedFileDataType = "com.apple.xcode.cfbundle">
-      </FileRef>
-   </Group>
    <FileRef
       location = "group:Pods/Pods.xcodeproj">
    </FileRef>

GeliBusinessPlatform/View/AlertView/GLAlertSelectView.swift

@@ -203,11 +203,10 @@ class GLAlertSelectView: UIView,UITableViewDelegate,UITableViewDataSource,TitleA
                 cell.selectBtn.isSelected = true
             }
         }
-        print("deSelectArr.count",deSelectArr.count)
         if deSelectArr.count > 0 {
             for i in deSelectArr {
                 if i == indexPath.row {
-                    cell.titleLbl.textColor = UIColor(named: "灰色字体颜色")
+                    cell.titleLbl.textColor = UIColor(named: "#999999")
                     cell.selectBtn.isUserInteractionEnabled = false
                 }
             }

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

@@ -53,7 +53,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
     let zhiFuStatus = ["未付款","欠款","月结","已付款"]
     var zhiFuStatusSelect:Int?//付款状态
     
-//    let wuLiuFSArr = ["京东冷链","顺丰冷运","达达速运"]
+    //    let wuLiuFSArr = ["京东冷链","顺丰冷运","达达速运"]
     var wuLiuFSArr:Array<String> = []
     
     var wuLiuSelect:Int?//物流选择
@@ -63,7 +63,9 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
     @IBOutlet weak var listView: UITableView!
     @IBOutlet weak var bottomBgView: UIView!
     
-    
+    //MARK: - 定金支付方式
+    var dj_payWay = 1
+    var wk_payWay = 1//尾款支付方式
     
     //MARK:--加载数据
     var dataMdoel: OrderDetailDataModel? = nil
@@ -417,24 +419,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
             let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndTFCell") as! TitleAndTFCell
             cell.textTF.isUserInteractionEnabled = false
             cell.nameLbl.text = nonYuShouPart3Arr[indexPath.row]
-            
-//            if self.dataMdoel?.receiving == nil {
             cell.textTF.text = "-"
-//            }else{
-//                switch indexPath.row {
-//                case 0:
-//                    cell.textTF.text = (self.dataMdoel?.receiving?.consignee)!
-//                    break
-//                case 1:
-//                    cell.textTF.text = (self.dataMdoel?.receiving?.mobile)!
-//                    break
-//                case 2:
-//                    cell.textTF.text = (self.dataMdoel?.receiving?.addr_str)!
-//                    break
-//                default:
-//                    break
-//                }
-//            }
             return cell
         case 4:
             //MARK:--订单信息cell
@@ -448,10 +433,8 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
                 cell.tag = indexPath.row
                 if isYuShou {
                     cell.nameLbl.text = isYuShouPart3Arr[indexPath.row]
-
                 }else{
                     cell.nameLbl.text = YuShouPart3Arr[indexPath.row]
-
                 }
                 
                 switch indexPath.row {
@@ -483,7 +466,6 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
             if indexPath.row == 4 || indexPath.row == 6 || indexPath.row == 7 || indexPath.row == (6 + isYushoucount) || indexPath.row == (7 + isYushoucount){
                 if isYuShou {
                     cell.nameLbl.text = isYuShouPart3Arr[indexPath.row]
-
                 }else{
                     cell.nameLbl.text = YuShouPart3Arr[indexPath.row]
                     
@@ -496,8 +478,8 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
                     break
                 case 6:
                     if isYuShou {
-                        cell.contentLbl.text = StringByInt(number: (self.dataMdoel?.order_res?.sale_res?.dj_pay_type!)!)
-
+//                        dj_payWay = (self.dataMdoel?.order_res?.sale_res?.dj_pay_type!)!
+                        cell.contentLbl.text = zhiFuFangShiArr[dj_payWay]
                     }else{
                         cell.contentLbl.text = self.dataMdoel?.order_res?.pay_type_cn
                         
@@ -514,7 +496,12 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
                     cell.arrowImg.isHidden = true
                     break
                 case 8:
+                    if isYuShou {
+//                        wk_payWay = (self.dataMdoel?.order_res?.sale_res?.wk_pay_type!)!
+                        cell.contentLbl.text = zhiFuFangShiArr[wk_payWay]
+                    }else{
                         cell.contentLbl.text = StringByInt(number: (self.dataMdoel?.order_res?.sale_res?.wk_pay_type!)!)
+                    }
                     break
                 case 9:
                     cell.contentLbl.text = StringByInt(number: (self.dataMdoel?.order_res?.sale_res?.wk_pay_status!)!)
@@ -668,11 +655,38 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
             //无需处理：根据网络变更
             break
         case "定金支付方式":
-            print("定金支付方式")
+            if glSelectView == nil {
+                let view = GLAlertSelectView(frame: self.view.bounds)
+                view.tag = cell.tag
+                view.titleLbl.text = "请选择定金支付方式"
+                view.delegate = self
+                view.dataArr = zhiFuFangShiArr
+                view.selectNum = dj_payWay
+                if dj_payWay != 0 {
+                    view.deSelectArr = [0]
+                }
+                view.tempNum = view.selectNum
+                self.view.addSubview(view)
+                glSelectView = view
+            }
             break
         case "尾款支付方式":
             print("尾款支付方式")
-
+            print(cell.tag)
+            if glSelectView == nil {
+                let view = GLAlertSelectView(frame: self.view.bounds)
+                view.tag = cell.tag
+                view.titleLbl.text = "请选择定尾款支付方式"
+                view.delegate = self
+                view.dataArr = zhiFuFangShiArr
+                view.selectNum = wk_payWay
+                if wk_payWay != 0 {
+                    view.deSelectArr = [0]
+                }
+                view.tempNum = view.selectNum
+                self.view.addSubview(view)
+                glSelectView = view
+            }
             break
             
         default:
@@ -680,6 +694,13 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
         }
     }
     func GLAlertSelectViewClick(selectNum: Int, view: GLAlertSelectView) {
+        if view.titleLbl.text == "请选择定金支付方式"{
+            dj_payWay = selectNum
+            
+        }
+        if view.titleLbl.text == "请选择定尾款支付方式"{
+            wk_payWay = selectNum
+        }
         if view.titleLbl.text == "请选择支付方式" {
             //MARK:--选择支付方式回调
             let UserToken = UserDefaults.standard.value(forKey: "user_token")