Commit ecd23545 authored by lujunye's avatar lujunye

补充约束

parent 39cc4635
...@@ -70,6 +70,7 @@ ...@@ -70,6 +70,7 @@
<outlet property="btmLine" destination="FhC-zl-Pqx" id="q0E-2a-h3I"/> <outlet property="btmLine" destination="FhC-zl-Pqx" id="q0E-2a-h3I"/>
<outlet property="btmW" destination="HMa-Pi-Faw" id="htd-Lp-MF8"/> <outlet property="btmW" destination="HMa-Pi-Faw" id="htd-Lp-MF8"/>
<outlet property="contentLbl" destination="zee-Po-sID" id="GmM-kp-g5c"/> <outlet property="contentLbl" destination="zee-Po-sID" id="GmM-kp-g5c"/>
<outlet property="contentRight" destination="JnM-Iz-OpH" id="VeM-Xf-Neb"/>
<outlet property="imgRight" destination="Qok-R2-hO0" id="aeV-7Q-HFP"/> <outlet property="imgRight" destination="Qok-R2-hO0" id="aeV-7Q-HFP"/>
<outlet property="nameLbl" destination="yit-1Y-dYH" id="S4K-8f-ncw"/> <outlet property="nameLbl" destination="yit-1Y-dYH" id="S4K-8f-ncw"/>
</connections> </connections>
......
...@@ -60,12 +60,13 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie ...@@ -60,12 +60,13 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
view?.layoutIfNeeded() view?.layoutIfNeeded()
hListView.reloadData() hListView.reloadData()
} }
var carModel:cityCartDataModel?
fileprivate func extractedFunc() { fileprivate func extractedFunc() {
HUD.flash(.progress) HUD.flash(.progress)
cityCart(["user_token":UserToken as Any,"nonce_str":String.randomStr(len: 30) as Any,"city_id":city_id as Any], success: { (data) in cityCart(["user_token":UserToken as Any,"nonce_str":String.randomStr(len: 30) as Any,"city_id":city_id as Any], success: { (data) in
HUD.hide() HUD.hide()
let model = data as! cityCartModel let model = data as! cityCartModel
self.carModel = model.data
self.carTypesArr.removeAll() self.carTypesArr.removeAll()
for item in model.data!.vehicle_arr! { for item in model.data!.vehicle_arr! {
self.carTypesArr.append(item) self.carTypesArr.append(item)
...@@ -78,7 +79,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie ...@@ -78,7 +79,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
} }
@IBAction func toDetailpage(_ sender: Any) { @IBAction func toDetailpage(_ sender: Any) {
print("明细跳转") print("明细跳转 ")
let vc = LogisticsCostDetailViewController() let vc = LogisticsCostDetailViewController()
self.navigationController?.pushViewController(vc, animated: true) self.navigationController?.pushViewController(vc, animated: true)
} }
...@@ -97,28 +98,37 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie ...@@ -97,28 +98,37 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
extractedFunc() extractedFunc()
} }
} }
if idx != 0 && adrArr.count == 0{ if idx != 0 && adrArr.count == 0{
let dic = NSMutableDictionary() let dic = NSMutableDictionary()
dic["locName"] = "空" dic["locName"] = "空"
adrArr.append(dic) adrArr.append(dic)
adrArr.append(dict as NSDictionary) adrArr.append(dict as NSDictionary)
}else{ }else{
if adrArr.count > idx { if adrArr.count > idx {
adrArr.insert(dict as NSDictionary, at: idx) adrArr.insert(dict as NSDictionary, at: idx)
adrArr.remove(at: idx+1) adrArr.remove(at: idx+1)
}else{ }else{
adrArr.append(dict as NSDictionary) adrArr.append(dict as NSDictionary)
} }
} }
// if adrArr.count > 1 {
// addBtn?.setTitle("继续添加收货地址", for: .normal) let firstData = adrArr.first! as NSDictionary
// }else{ if firstData["locName"] as! String != "空" && adrArr.count > 1 {
// addBtn?.setTitle("添加收货地址", for: .normal) let fD = adrArr.first!
// } let cityData = fD["adr"] as! cityListDataModel
let params = ["user_token":UserToken as Any,
"nonce_str":String.randomStr(len: 30) as Any,
"city_id":cityData.city_id as Any,
"city_info_revision":carModel?.revision as Any,
"order_vehicle_id":carTypesArr[selectCarType].order_vehicle_id as Any,
// ""
]
// orderPriceCalculate(<#T##params: [String : Any]##[String : Any]#>, success: <#T##(Any) -> ()#>, failture: <#T##(Error) -> ()#>)
}
let view = hListView.footerView(forSection: 1) let view = hListView.footerView(forSection: 1)
view?.layoutIfNeeded() view?.layoutIfNeeded()
...@@ -610,7 +620,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie ...@@ -610,7 +620,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
let hPart2 = ["请选择用车时间","下单联系人信息","额外需求","货物保障"] let hPart2 = ["请选择用车时间","下单联系人信息","额外需求","货物保障"]
var hPart2P = ["","","",""] var hPart2P = ["","","",""]
let hPart3 = ["关联平台:","关联订单号:"] let hPart3 = ["关联平台:","关联订单号:"]
//MARK: - CELL DELEGATE //MARK: - CELL DELEGATE
//MARK: - 货拉拉 headerView //MARK: - 货拉拉 headerView
...@@ -1083,7 +1093,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie ...@@ -1083,7 +1093,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
} }
self.bgBtn = btn self.bgBtn = btn
} }
if self.btmView == nil { if self.btmView == nil {
let view = UIView() let view = UIView()
view.backgroundColor = UIColor.white view.backgroundColor = UIColor.white
......
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