完善显示逻辑

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

@@ -246,10 +246,14 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
             btnStr = ["发货","取消订单"]
             if rowModel.pay_status == 0{
                 btnStr = ["发货","取消订单","确认收款"]
+                if rowModel.goods_before_pay == 1 && orderStatus == 1{
+                    btnStr = ["付款码","取消订单"]
+                }
             }
             if rowModel.apply_cancel == 1 {
                 btnStr = ["拒绝取消订单","同意取消订单"]
             }
+            
             break
         case 7://待收货
             btnStr = ["确认收货","退款"]

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

@@ -35,7 +35,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
     var orderId:Int? //订单编号
     var isYuShou:Bool = true //是否预售
     
-    var dataArr:NSArray = ["a","b"] //订单产品数据
+    var dataArr:NSArray = [] //订单产品数据
     var btmBtnsTitleArr:Array<String> = []//底栏按钮数据
     
     let yuShouTitleArr = ["定金：","尾款：","商品合计：","物流费用：","其它费用："]
@@ -333,7 +333,6 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
     //MARK: - cell delegate
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         if !isCaneditLatsData {
-            print("abc")
             return
         }
         if indexPath.section == 4 {
@@ -1160,6 +1159,9 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
             titleArr = ["发货","取消订单"]
             if self.dataMdoel!.order_res?.pay_status == 0 {
                 titleArr = ["发货","取消订单","确认收款"]
+                if self.dataMdoel!.order_res?.goods_before_pay == 1 && lmIdx == 1{
+                    titleArr = ["付款码","取消订单"]
+                }
             }
             if self.dataMdoel?.order_res?.apply_cancel == 1 {
                 titleArr = ["拒绝取消订单","同意取消订单"]