修改订单列表和订单详情里面 的付款码显示

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

@@ -325,8 +325,12 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
             btnStr = ["查看订单"]
             break
         }
-        if rowModel.order_status! == 1 {
-            btnStr.append("付款码")
+        if rowModel.pay_status! != 2 {
+            if rowModel.order_status == 1 || rowModel.order_status == 6 || rowModel.order_status == 7 || rowModel.order_status == 10 {
+                if !btnStr.contains("付款码") && btnStr.count < 4 {
+                    btnStr.append("付款码")
+                }
+            }
         }
         cell.delegate = self
         cell.setBtnView(arr: btnStr, index: indexPath.row)

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

@@ -1219,10 +1219,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
             if self.dataMdoel!.order_res?.shipping_status == 1 && self.dataMdoel!.order_res?.pay_status != 2 {
                 titleArr = ["修改价格","付款码","退货"]
             }
-            //            if self.dataMdoel?.order_res.
-            //            if self.dataMdoel!.order_res?.shipping_status == 0 && self.dataMdoel!.order_res?.pay_status == 12 {
-            //                titleArr = ["修改价格","付款码","退定金"]
-            //            }
+     
             break
         case 6:
             //               str = "待发货"
@@ -1267,27 +1264,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
             break
         //订单完成
         case 5:
-            //               str = "订单完成"
-            //            titleArr = ["删除订单"]
-            
-            
-            //            if status_d == 53 {
-            //                if self.dataMdoel?.order_res?.shipping_status == 1 || self.dataMdoel?.order_res?.shipping_status == 2  {
-            //                    titleArr = ["退货","打印","退款"]
-            //
-            //                }else{
-            //                    titleArr = ["打印","退款"]
-            //                }
-            //            }else if status_d == 52{
-            //                titleArr = ["打印","退款"]
-            //            }else if status_d == 51 {
-            //                if self.dataMdoel?.order_res?.shipping_status == 1 || self.dataMdoel?.order_res?.shipping_status == 2  {
-            //                    titleArr = ["退货","打印"]
-            //
-            //                }else{
-            //                    titleArr = []
-            //                }
-            //            }
+            titleArr = []
             break
         case 9:
             //       退款中
@@ -1300,11 +1277,9 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
             break
         //订单关闭
         case 8,2:
-            //               str = "订单关闭"str = "已取消" //用户取消（预售
             titleArr = []
             break
         case 10:
-            //               str = "订单关闭"str = "已取消" //用户取消（预售
             titleArr = ["退款退货"]
             
             if self.dataMdoel!.order_res?.pay_status != 2 {
@@ -1317,14 +1292,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
                 titleArr.insert("付款码", at: 0)
             }
             
-//            if self.dataMdoel!.order_res?.goods_before_pay == 1 && lmIdx == 1{
-//                titleArr = ["付款码"]
-//            }
-            //            if self.dataMdoel!.order_res?.pay_status != 2 {
-            //                if self.dataMdoel?.order_res?.from == 3 || self.dataMdoel?.order_res?.from == 5 {
-            //                    titleArr = ["确认收款"]
-            //                }
-            //            }
+ 
             break
         case 11:
             titleArr = ["查看订单"]
@@ -1339,10 +1307,17 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
             }
             break
         default:
-            titleArr = ["查看订单"]
+            titleArr = []
             break
             
         }
+        if self.dataMdoel!.order_res?.pay_status! != 2 {
+            if status == 1 || status == 6 || status == 7 || status == 10 {
+                if !titleArr.contains("付款码") && titleArr.count < 4 {
+                    titleArr.append("付款码")
+                }
+            }
+        }
         return titleArr
     }