先货后款状态变更

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

@@ -25,7 +25,6 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
         didSet{
             if !isUpData {
                 if tableV  != nil {
-//                    loadData()
                     tableV.mj_header?.beginRefreshing()
                 }
             }
@@ -225,9 +224,9 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
         var btnStr:Array<String> = []
         switch rowModel.order_status {
         case 0://待接单
-            btnStr = ["同意接单","拒绝接单"]
+            btnStr = ["同意接单","先货后款","拒绝接单"]
             if rowModel.goods_before_pay == 1 {
-                btnStr = ["同意接单","先货后款","拒绝接单"]
+                btnStr = ["同意接单","拒绝接单"]
             }
             break
         case 1://待付款

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

@@ -827,7 +827,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
                 return
             }
             if glSelectView == nil {
-                let view = GLAlertSelectView(frame: self.view.bounds)
+                let view =  GLAlertSelectView(frame: self.view.bounds)
                 view.tag = cell.tag
                 view.titleLbl.text = "请选择支付方式"
                 view.delegate = self
@@ -1165,6 +1165,9 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
         case 0:
             //               str = "未确定" "待付款"
             titleArr = ["修改价格","拒绝接单","同意接单","先货后款"]
+            if self.dataMdoel!.order_res?.goods_before_pay == 1 {
+                titleArr = ["修改价格","同意接单","拒绝接单"]
+            }
             break
         case 1:
             //               str = "已确定" "待付款"