Commit ad04a038 authored by 刘俊宏's avatar 刘俊宏

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

parent 8772d33b
...@@ -68,6 +68,8 @@ class OrderDetailResModel: Mappable { ...@@ -68,6 +68,8 @@ class OrderDetailResModel: Mappable {
var order_status : Int?//订单状态 var order_status : Int?//订单状态
var order_status_d : Int?//订单详细状态 var order_status_d : Int?//订单详细状态
var shipping_type : Int?//配送方式:1派送,2自提 var shipping_type : Int?//配送方式:1派送,2自提
var shipping_status : Int?//商品配送情况;0未发货,1已发货,2已收货,4退货
var sale_res : OrderDetailSaleResModel?//订单预售详情(不是预售订单为空数组,无key=>value) var sale_res : OrderDetailSaleResModel?//订单预售详情(不是预售订单为空数组,无key=>value)
required init?( map: Map) { required init?( map: Map) {
...@@ -105,6 +107,7 @@ class OrderDetailResModel: Mappable { ...@@ -105,6 +107,7 @@ class OrderDetailResModel: Mappable {
other_price <- map["other_price"] other_price <- map["other_price"]
shipping_type <- map["shipping_type"] shipping_type <- map["shipping_type"]
sale_res <- map["sale_res"] sale_res <- map["sale_res"]
shipping_status <- map["shipping_status"]
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment