Commit 5c9efb5a authored by lujunye's avatar lujunye

发货默认空数组。等UI

parent 64e422a2
...@@ -670,8 +670,10 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie ...@@ -670,8 +670,10 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
} }
let alertView = LogisticalSelectView(frame: self.view.window!.bounds) let alertView = LogisticalSelectView(frame: self.view.window!.bounds)
alertView.delegate = self alertView.delegate = self
if logPayPriceModel?.price_jd != nil { if logPayPriceModel?.total_freight_jd != nil && logPayPriceModel?.total_freight_jd != 0 {
alertView.jdPriceLbl.text = "京东冷运(预估运费" + (logPayPriceModel?.price_jd)! + "元)" alertView.jdPriceLbl.text = "京东冷运(预估运费\(logPayPriceModel?.total_freight_jd)元)"
}else{
alertView.jdPriceLbl.text = "京东冷运(待上门评估)"
} }
if logPayPriceModel?.price_sf != nil && logPayPriceModel?.price_sf != 0 { if logPayPriceModel?.price_sf != nil && logPayPriceModel?.price_sf != 0 {
alertView.sfPriceLbl.text = "顺丰冷运(预估运费" + String(format: "%.2f", (logPayPriceModel?.price_sf)!) + "元)" alertView.sfPriceLbl.text = "顺丰冷运(预估运费" + String(format: "%.2f", (logPayPriceModel?.price_sf)!) + "元)"
...@@ -711,7 +713,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie ...@@ -711,7 +713,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
weak_alertView?.XYfuTitleArr = futitleArr weak_alertView?.XYfuTitleArr = futitleArr
}else if idx == 0{ }else if idx == 0{
let str = "运费:¥\(logPayPriceModel!.total_freight_jd!)" let str = "运费:¥\(logPayPriceModel!.price_jd!)"
let str1 = "揽收费:¥\(logPayPriceModel!.collect_fees!)" let str1 = "揽收费:¥\(logPayPriceModel!.collect_fees!)"
let str2 = "派送费:¥\(logPayPriceModel!.delivery_fee!)" let str2 = "派送费:¥\(logPayPriceModel!.delivery_fee!)"
weak_alertView?.JDfuTitleArr = [str,str1,str2] weak_alertView?.JDfuTitleArr = [str,str1,str2]
......
...@@ -606,7 +606,7 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc ...@@ -606,7 +606,7 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
} }
}else{ }else{
sendOut(["user_token":UserToken as Any,"order_id" : sender.tag as Any], success: { (data) in sendOut(["user_token":UserToken as Any,"order_id" : sender.tag as Any,"goods_info":[] as Any], success: { (data) in
HUD.flash(.labeledSubSuccess(subtitle: "提交成功"),delay: 1.2) HUD.flash(.labeledSubSuccess(subtitle: "提交成功"),delay: 1.2)
NotificationCenter.default.post(name: NSNotification.Name(rawValue: "orderChange"), object: nil) NotificationCenter.default.post(name: NSNotification.Name(rawValue: "orderChange"), object: nil)
......
...@@ -1719,7 +1719,9 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa ...@@ -1719,7 +1719,9 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
} }
}else{ }else{
sendOut(["user_token":UserToken as Any,"order_id" : self.dataMdoel?.order_res?.order_id as Any], success: { (data) in
sendOut(["user_token":UserToken as Any,"order_id" : self.dataMdoel?.order_res?.order_id as Any,"goods_info":[] as Any], success: { (data) in
HUD.flash(.labeledSubSuccess(subtitle: "提交成功"),delay: 1.2) HUD.flash(.labeledSubSuccess(subtitle: "提交成功"),delay: 1.2)
NotificationCenter.default.post(name: NSNotification.Name(rawValue: "orderChange"), object: nil) NotificationCenter.default.post(name: NSNotification.Name(rawValue: "orderChange"), object: nil)
self.delegate?.refishingOrderDchange() self.delegate?.refishingOrderDchange()
......
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