626 iOS：“待发货”的现货订单详情，点击“退款”后，不应该还有“退货”&“打印”按钮，因为还没“发货”。

GeliBusinessPlatform/Model/OrderManageModel/OrderDetailModel.swift

@@ -68,6 +68,8 @@ class OrderDetailResModel: Mappable {
     var order_status : Int?//订单状态
     var order_status_d : Int?//订单详细状态
     var shipping_type : Int?//配送方式：1派送,2自提
+    var shipping_status : Int?//商品配送情况;0未发货,1已发货,2已收货,4退货
+
     var sale_res : OrderDetailSaleResModel?//订单预售详情(不是预售订单为空数组，无key=>value)
 
     required init?( map: Map) {
@@ -105,6 +107,7 @@ class OrderDetailResModel: Mappable {
         other_price <- map["other_price"]
         shipping_type <- map["shipping_type"]
         sale_res <- map["sale_res"]
+        shipping_status <- map["shipping_status"]
 
     }
 }

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

@@ -1071,8 +1071,15 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
         case 7:
             //               str = "待收货"
             if self.dataMdoel?.order_res?.pay_status != 2 &&  self.dataMdoel?.order_res?.pay_status != 11  {
+                if self.dataMdoel?.order_res?.shipping_status == 1 || self.dataMdoel?.order_res?.shipping_status == 2  {
                     titleArr = ["退货","打印","退款"]
                     
+                }else{
+                    titleArr = ["打印","退款"]
+                    
+                }
+                
+                
             }else{
                 titleArr = ["打印","退款"]
             }
@@ -1081,11 +1088,21 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
         case 5:
             //               str = "订单完成"
             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 = []
+                }
             }
             
             break