112121321312341234ffdasfd

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

@@ -524,7 +524,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
             //MARK:--商品cell
             let cell = tableView.dequeueReusableCell(withIdentifier: "DaiKeXiaDanGouWuCell") as! DaiKeXiaDanGouWuCell
             
-            if self.dataMdoel?.order_res?.shipping_status == 1 || isYuShou{
+            if self.dataMdoel?.order_res?.shipping_status != 0 || isYuShou{
                 cell.non_add_icon.isHidden = true
                 cell.text_line.isHidden = true
                 cell.text_line.isHidden = true
@@ -532,30 +532,30 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
                 cell.status_text_lbl.isHidden = true
             }
             
-            //            if (self.dataMdoel?.order_res?.order_status == 6  && self.dataMdoel?.order_res?.from != 3 && self.dataMdoel?.order_res?.from != 5) {
-            
             let arr = piCiArr![indexPath.row]
             if self.dataMdoel?.order_res?.order_type == 5 {
                 cell.yong_jin_lbl.isHidden = false
             }else{
                 cell.yong_jin_lbl.isHidden = true
             }
-            if arr.count > 0 {
-                cell.non_add_icon.isHidden = true
-                cell.text_line.isHidden = true
-                cell.right_margin.constant = 5
-                cell.text_line.isHidden = true
-                cell.already_add_icon.isHidden = false
-                cell.status_text_lbl.textColor = UIColor(named: "多选按钮字体颜色")
-            }else{
-                cell.non_add_icon.isHidden = false
-                cell.already_add_icon.isHidden = true
-                cell.text_line.isHidden = false
-                cell.status_text_lbl.isHidden = false
-                cell.right_margin.constant = -5
-                cell.status_text_lbl.textColor = UIColor(named: "#F57575")
+            if self.dataMdoel?.order_res?.shipping_status == 0 {
+                if arr.count > 0 {
+                    cell.non_add_icon.isHidden = true
+                    cell.text_line.isHidden = true
+                    cell.right_margin.constant = 5
+                    cell.text_line.isHidden = true
+                    cell.already_add_icon.isHidden = false
+                    cell.status_text_lbl.textColor = UIColor(named: "多选按钮字体颜色")
+                }else{
+                    cell.non_add_icon.isHidden = false
+                    cell.already_add_icon.isHidden = true
+                    cell.text_line.isHidden = false
+                    cell.status_text_lbl.isHidden = false
+                    cell.right_margin.constant = -5
+                    cell.status_text_lbl.textColor = UIColor(named: "#F57575")
+                }
             }
-            //            }
+            
             
             cell.delegate = self
             cell.isDetail = true