Commit f75be8af authored by lujunye's avatar lujunye

修复修改价格bug

parent d0d6eb17
...@@ -95,7 +95,7 @@ class DaiKeXiaDanGouWuViewController: BaseViewController,UITableViewDataSource,U ...@@ -95,7 +95,7 @@ class DaiKeXiaDanGouWuViewController: BaseViewController,UITableViewDataSource,U
"is_adsale":is_adsale as Any, "is_adsale":is_adsale as Any,
"goods_info":goods_info as Any, "goods_info":goods_info as Any,
"order_info":order_info as Any] as [String : Any] "order_info":order_info as Any] as [String : Any]
print(order)
orderData = order orderData = order
let alertView = GeliAlertView(frame: self.view.window!.bounds) let alertView = GeliAlertView(frame: self.view.window!.bounds)
alertView.delegate = self; alertView.delegate = self;
......
...@@ -1666,16 +1666,22 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo ...@@ -1666,16 +1666,22 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
var skuArr:Array<Any> = [] var skuArr:Array<Any> = []
for i in 0 ..< dataArr.count{ for i in 0 ..< dataArr.count{
let item = dataArr[i] let item = dataArr[i]
var pData = ""
if isPurnNumber(str: item.price) { if item.price.contains(",") {
let pArr = item.price.components(separatedBy: ",")
pData = pArr.joined(separator: "")
}else{
pData = item.price
}
if isPurnNumber(str: pData) {
if isgetP { if isgetP {
let peiceP = Float(item.price)! //第n个售价(n > 1) let peiceP = Float(pData)! //第n个售价(n > 1)
if peiceP < price { if peiceP < price {
price = peiceP price = peiceP
model = item model = item
} }
}else { }else {
price = Float(item.price)! //第一个售价 price = Float(pData)! //第一个售价
model = item model = item
isgetP = true isgetP = true
} }
......
...@@ -46,7 +46,6 @@ class WuLiuGenZongViewController: BaseViewController,UITableViewDelegate,UITable ...@@ -46,7 +46,6 @@ class WuLiuGenZongViewController: BaseViewController,UITableViewDelegate,UITable
}else if self.dataModel?.lc_name == "顺丰冷运" { }else if self.dataModel?.lc_name == "顺丰冷运" {
if self.dataModel?.sf_tracking?.code == 200 { if self.dataModel?.sf_tracking?.code == 200 {
self.dataArr = self.dataModel?.sf_tracking?.model! as! Array<Any> self.dataArr = self.dataModel?.sf_tracking?.model! as! Array<Any>
} }
} }
self.listView.reloadData() self.listView.reloadData()
......
...@@ -569,8 +569,8 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea ...@@ -569,8 +569,8 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea
vc.orderID = rowModel.id vc.orderID = rowModel.id
self.navigationController?.pushViewController(vc, animated: true) self.navigationController?.pushViewController(vc, animated: true)
} }
} }
var BeginDate: Date! = nil var BeginDate: Date! = nil
var EndDate: Date! = nil var EndDate: Date! = nil
@IBAction func timeSelectAction(_ sender: Any) { @IBAction func timeSelectAction(_ sender: Any) {
...@@ -579,7 +579,6 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea ...@@ -579,7 +579,6 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea
timeBgH.constant = 0 timeBgH.constant = 0
scvContentH.constant = 680 scvContentH.constant = 680
calendarV.removeFromSuperview() calendarV.removeFromSuperview()
}else{ }else{
timeBgH.constant = 235 timeBgH.constant = 235
scvContentH.constant = 915 scvContentH.constant = 915
...@@ -592,8 +591,8 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea ...@@ -592,8 +591,8 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea
calendarV.setOldDate(beginD: BeginDate!, endD: EndDate!) calendarV.setOldDate(beginD: BeginDate!, endD: EndDate!)
} }
} }
} }
//MARK:--日历代理 //MARK:--日历代理
func selectMoreDate(beginDate: Date, endginDate: Date) { func selectMoreDate(beginDate: Date, endginDate: Date) {
//bug //bug
...@@ -603,8 +602,8 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea ...@@ -603,8 +602,8 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea
timeTF.text = dayByDouble(sender: timeInterval) + "," + dayByDouble(sender: timeIntervalEnd) timeTF.text = dayByDouble(sender: timeInterval) + "," + dayByDouble(sender: timeIntervalEnd)
EndDate = endginDate EndDate = endginDate
BeginDate = beginDate BeginDate = beginDate
} }
//MARK: - 加载数据 //MARK: - 加载数据
var start_time = 0 var start_time = 0
var end_time = 0 var end_time = 0
...@@ -703,6 +702,7 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea ...@@ -703,6 +702,7 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea
blackBtnView.addTarget(self, action: #selector(removeBlackBtnView), for: .touchUpInside) blackBtnView.addTarget(self, action: #selector(removeBlackBtnView), for: .touchUpInside)
return true return true
} }
@objc func removeBlackBtnView(){ @objc func removeBlackBtnView(){
if blackBtnView != nil { if blackBtnView != nil {
blackBtnView.removeFromSuperview() blackBtnView.removeFromSuperview()
...@@ -712,8 +712,7 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea ...@@ -712,8 +712,7 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea
//MARK:--搜索按钮代理 //MARK:--搜索按钮代理
func searchBarSearchButtonClicked(_ searchBar: UISearchBar) { func searchBarSearchButtonClicked(_ searchBar: UISearchBar) {
print("点击搜索关键字进行--\(searchBar.text)")
searchBar.resignFirstResponder()
if blackBtnView != nil { if blackBtnView != nil {
blackBtnView.removeFromSuperview() blackBtnView.removeFromSuperview()
} }
...@@ -726,6 +725,7 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea ...@@ -726,6 +725,7 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea
func clearSearchAction() { func clearSearchAction() {
} }
//MARK:--编辑即将结束 //MARK:--编辑即将结束
func searchBarTextDidEndEditing(_ searchBar: UISearchBar) { func searchBarTextDidEndEditing(_ searchBar: UISearchBar) {
print("编辑即将结束了--") print("编辑即将结束了--")
...@@ -759,7 +759,6 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea ...@@ -759,7 +759,6 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea
} }
if ((rowModel.freight)! > 0) && rowModel.pay_status == 1 { if ((rowModel.freight)! > 0) && rowModel.pay_status == 1 {
return 257 return 257
} }
return 227 return 227
...@@ -773,7 +772,6 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea ...@@ -773,7 +772,6 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea
cell.delegate = self cell.delegate = self
cell.tag = indexPath.row cell.tag = indexPath.row
cell.acButton.isHidden = true cell.acButton.isHidden = true
let rowModel = datas[indexPath.row] let rowModel = datas[indexPath.row]
......
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