订单的分销字段增加完成

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

@@ -203,16 +203,24 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
         cell.beforeOrderLbl.isHidden = true
  
         if rowModel.order_type == 4 {
+            //预售
             cell.yuShouStatus.isHidden = false
+            cell.yuShouStatus.text = "预售"
         }else{
-            cell.yuShouStatus.isHidden = true
+            if rowModel.order_type == 5 {
+                //分销
+                cell.yuShouStatus.isHidden = false
+                cell.yuShouStatus.text = "分销"
+            }else{
+                cell.yuShouStatus.isHidden = true
+            }
         }
         if rowModel.from == 3 {
             cell.formLbl.isHidden = false
             if cell.yuShouStatus.isHidden {
                 cell.formNSlayout.constant = 8
             }else{
-                cell.formNSlayout.constant = 8 + 18 + 8
+                cell.formNSlayout.constant = 8 + 30 + 8
             }
         }else{
             cell.formLbl.isHidden = true
@@ -222,11 +230,11 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
             if cell.yuShouStatus.isHidden && cell.formLbl.isHidden {
                 cell.beforeNSLayout.constant = 8
             }else if cell.yuShouStatus.isHidden && !cell.formLbl.isHidden {
-                cell.beforeNSLayout.constant = 8 + 18 + 8
+                cell.beforeNSLayout.constant = 8 + 30 + 8
             }else if !cell.yuShouStatus.isHidden && cell.formLbl.isHidden {
-                cell.beforeNSLayout.constant = 8 + 18 + 8
+                cell.beforeNSLayout.constant = 8 + 30 + 8
             }else{
-                cell.beforeNSLayout.constant = 8 + 18 + 8 + 18 + 8
+                cell.beforeNSLayout.constant = 8 + 30 + 8 + 18 + 8
             }
         }else{
             cell.beforeOrderLbl.isHidden = true

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

@@ -39,9 +39,9 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
     var dataArr:NSArray = [] //订单产品数据
     var btmBtnsTitleArr:Array<String> = []//底栏按钮数据
     
-    let yuShouTitleArr = ["定金：","尾款：","商品合计：","物流费用：","其它费用："]
-    let nonYuShouTitleArr = ["商品合计：","物流费用：","其它费用："]
-    
+    var yuShouTitleArr = ["定金：","尾款：","商品合计：","物流费用：","其它费用："]
+    var nonYuShouTitleArr = ["商品合计：","物流费用：","其它费用："]
+
     let YuShouPart3Arr = ["订单编号","下单时间","订单来源","提货方式","物流公司","运单号","支付方式","支付状态","买家留言","订单备注"]
     let isYuShouPart3Arr = ["订单编号","下单时间","订单来源","提货方式","物流公司","运单号","定金支付方式","定金支付状态","尾款支付方式","尾款支付状态","买家留言","订单备注"]
     
@@ -152,6 +152,17 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
             if self.dataMdoel?.order_res?.invoice_link != nil {
                 self.inputInfoTFString = (self.dataMdoel?.order_res?.invoice_link)!
 
+            }
+            //是否是分销订单
+            if self.dataMdoel?.order_res?.order_type == 5 {
+                if self.dataMdoel?.order_res?.dbt_target == 2 {
+                    yuShouTitleArr.append("分销商")
+                    nonYuShouTitleArr.append("分销商")
+                }else if self.dataMdoel?.order_res?.dbt_target == 3 {
+                    yuShouTitleArr.append("分销员")
+                    nonYuShouTitleArr.append("分销员")
+                }
+
             }
             self.listView.reloadData()
             
@@ -450,6 +461,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
             if isYuShou {
                 cell.nameLbl.text = yuShouTitleArr[indexPath.row]
                 cell.textTF.text = yuShouTitleArr[indexPath.row]
+
                 cell.delegate = self
                 //MARK:--预售商品，定金，尾款，合计，物流费用，其他费用 cell
                 
@@ -481,6 +493,10 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
                 case 4:
                     cell.textTF.text = "￥" + (self.dataMdoel?.order_res?.other_price)!
                     break
+                case 5:
+                    //分销才有
+                    cell.textTF.text = (self.dataMdoel?.order_res?.target_name)!
+                    break
                 default:
                     break
                     
@@ -492,6 +508,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
             }else{
                 //MARK:--普通商品合计，物流费用，其他费用 cell
                 cell.nameLbl.text = nonYuShouTitleArr[indexPath.row]
+
                 switch indexPath.row {
                 case 0:
                     cell.textTF.text = "￥" + (self.dataMdoel?.order_res?.goods_amount)!
@@ -502,6 +519,10 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
                 case 2:
                     cell.textTF.text = "￥" + (self.dataMdoel?.order_res?.other_price)!
                     break
+                case 3:
+                    //分销才有
+                    cell.textTF.text = (self.dataMdoel?.order_res?.target_name)!
+                    break
                 default:
                     break
                     
@@ -1037,8 +1058,14 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
             }
         case 2://费用信息section
             if isYuShou{
+                if self.dataMdoel?.order_res?.order_type == 5 { //分销
+                    return yuShouTitleArr.count
+                }
                 return 5
             }else{
+                if self.dataMdoel?.order_res?.order_type == 5 {//分销
+                    return nonYuShouTitleArr.count
+                }
                 return 3
             }
         case 3://收货人信息section
@@ -1075,7 +1102,12 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
             }
         case 2:
             let view = OrderDViewSumFooter(frame: CGRect(x: 0, y: 0, width: fullScreenWidth, height: 59))
-            view.priceLbl.text = "￥" + (self.dataMdoel?.order_res!.sum_amount)!
+            if self.dataMdoel?.order_res?.order_type == 5 {
+                //分销的话
+                view.priceLbl.text = "￥" + (self.dataMdoel?.order_res!.sum_amount)! + "(佣金" + (self.dataMdoel?.order_res!.sum_commission_val)! + ")"
+            }else{
+                view.priceLbl.text = "￥" + (self.dataMdoel?.order_res!.sum_amount)!
+            }
             return view
         default:
             break