旧物流下单选择填写地址完成

GeliBusinessPlatform/Interface/Interface_Z.plist

@@ -220,5 +220,7 @@
 	<string>Order/confirmReceiving</string>
 	<key>商品上下/架</key>
 	<string>Goods/onOff</string>
+	<key>下运单收发地址信息</key>
+	<string>Logistics/getAddr</string>
 </dict>
 </plist>

GeliBusinessPlatform/Model/AdressInterface.swift

@@ -60,7 +60,7 @@ consignee 联系人
  is_send_default 是否默发收货地址，1是0非
  */
 func AddAddress(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
-    NetworkRequest.sharedInstance.postRequest("新增地址", params, { (rep:DataResponse<AddAddressDataModel>) in
+    NetworkRequest.sharedInstance.postRequest("新增地址", params, { (rep:DataResponse<AddAddressModel>) in
     }, success: { (data) in
         success(data)
     }) { (error) in

GeliBusinessPlatform/Model/LogisticsInterface.swift

@@ -81,3 +81,16 @@ func logisticsOrderDetails(_ params:[String:Any],success:@escaping (_ res:Any)->
     }
 }
 
+
+//MARK:-- 下运单收发地址信息
+/*
+ user_token 验证token
+ */
+func getAddr(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("下运单收发地址信息", params, { (rep:DataResponse<GetAddrsInfoModel>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}

GeliBusinessPlatform/Model/OrderManageModel/GetAddrsInfoModel.swift

@@ -37,6 +37,7 @@ class GetAddrsInfoDataModel: Mappable {
     var mobile:String? //联系方式
     var is_default:Int?
     var addr_cn:String?  //联系人详细地址
+    var addr_name:String?  ////完整地址信息(下单收发货才有)
 
     required init?( map: Map) {
         
@@ -53,5 +54,7 @@ class GetAddrsInfoDataModel: Mappable {
         mobile <- map["mobile"]
         is_default <- map["is_default"]
         addr_cn <- map["addr_cn"]
+        addr_name <- map["addr_name"]
+
     }
 }

GeliBusinessPlatform/ViewController/代客下单（货运）/下运单/XiaYunDanViewController.swift

@@ -11,39 +11,70 @@ import WebKit
 
 class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,JiTuoWuXinXiViewDelegate,JiPaiFangShiViewControllerDelegate,ZengZhiServicesViewControllerDelegate,AdressSelectCellDelegate,DZGLViewControllerDelegate,XinZengDiZhiViewControllerDelegate{
     
+ 
     var sender:String?
     var sendPhone:String?
     var sendAdr:String?
+    var sendAddressModel:AddAddressDataModel?
+    var sendAddressSelectModel:GetAddrsInfoDataModel?
+    var isSelectSendAddressModel = false
     
     var receiver:String?
     var receivePhone:String?
     var receiveAdr:String?
-    func XinZengDiZhiViewControllerFinishAction(name: String, phone: String, adr: String) {
+    var receiveAddressModel:AddAddressDataModel?
+    var receiveAddressSelectModel:GetAddrsInfoDataModel?
+    var isSelectReceiveAddressModel = false
+
+    
+    
+    func XinZengDiZhiViewControllerFinishAction(name: String, phone: String, adr: String, data: AddAddressDataModel?) {
         
         if isSend {
             sender = name
             sendPhone = phone
             sendAdr = adr
+            sendAddressModel = data
+            isSelectSendAddressModel = false
         }else{
             receiver = name
             receivePhone = phone
             receiveAdr = adr
+            receiveAddressModel = data
+            isSelectReceiveAddressModel = false
         }
         
         listView.reloadData()
     }
     
-    
-    
     func DZGLViewControllerSelect(data: GetAddrsInfoDataModel) {
+        print("已选的收发货地址\(data.addr_name!)")
+        if isSend {
+            sender = data.consignee
+            sendPhone = data.mobile
+            sendAdr = data.addr_name
+            isSelectSendAddressModel = true
+            sendAddressSelectModel = data
+        }else{
+            receiver = data.consignee
+            receivePhone = data.mobile
+            receiveAdr = data.addr_name
+            receiveAddressSelectModel = data
+            isSelectReceiveAddressModel = true
+        }
         
+        listView.reloadData()
     }
     
     func AdressSelectCellBtnCLick(row: Int) {
         let vc = DZGLViewController()
-        vc.cus_id = 365
+        vc.isSelectlogAddress = true
         vc.isSelectMotion = true
         vc.delegate = self
+        isSend = true
+        if row == 1 {
+            isSend = false
+        }
         self.navigationController?.pushViewController(vc, animated: true )
     }
     var isSend = true
@@ -108,58 +139,17 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
         let vc = XiaDanChengGongViewController()
         self.navigationController?.pushViewController(vc, animated: true)
     }
-    @IBOutlet weak var topBtnView: UIView!
     @IBOutlet weak var bottomView: UIView!
     @IBOutlet weak var listView: UITableView!
-    var locBtn = UIButton()
-    
-    @IBOutlet weak var hListView: UITableView!
-    
-    
-    
-    @IBAction func selectAction(_ sender: UIButton) {
-        if rightBtn == sender {
-            rightBtn.isSelected = true
-            leftBtn.isSelected = false
-            lineV.frame.origin.x = fullScreenWidth * 0.5
-            hllView.isHidden = false
-            
-            if fullScreenHeight > 736 {
-                hBtnViewH.constant = 83
-            }else{
-                hBtnViewH.constant = 49
-            }
-        }else{
-            rightBtn.isSelected = false
-            leftBtn.isSelected = true
-            lineV.frame.origin.x = 0
-            hllView.isHidden = true
-        }
-    }
-    @IBOutlet weak var lineV: UIView!
-    @IBOutlet weak var leftBtn: UIButton!
-    
-    @IBOutlet weak var hBtnViewH: NSLayoutConstraint!
-    @IBOutlet weak var hllView: UIView!
-    
-    @IBOutlet weak var rightBtn: UIButton!
     override func viewDidLoad() {
         super.viewDidLoad()
-    
-        
         navbar.title = "运单列表"
         self.view.addSubview(navbar)
-        
-        locBtn.backgroundColor = UIColor.red
-        self.view.addSubview(locBtn)
-        locBtn.snp_makeConstraints({ (make) in
-            make.right.equalTo(-15)
-            make.centerY.equalTo(navbar.snp_centerY).offset(10)
-            make.height.equalTo(30)
-            make.width.equalTo(100)
-        })
-        
-        SetTopFrame(view: topBtnView, height: 44)
+        listView.snp.makeConstraints { (make) in
+            make.top.equalTo(NavCGRect.height)
+            make.left.right.equalTo(0)
+            make.bottom.equalTo(bottomView.snp_top)
+        }
         listView.separatorStyle = .none
         listView.register(UINib(nibName: "AdressSelectCell", bundle: nil), forCellReuseIdentifier: "AdressSelect")
         listView.register(UINib(nibName: "PersonCenterCell", bundle: nil), forCellReuseIdentifier: "PersonCenter")
@@ -308,7 +298,6 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
         return 49
     }
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-//        if tableView == listView {
         switch indexPath.section {
         case 0:
             let cell = tableView.dequeueReusableCell(withIdentifier: "AdressSelect") as! AdressSelectCell
@@ -380,7 +369,6 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
             cell.nameLbl.text = title2Arr[indexPath.row]
             return cell
         }
-//        }
     }
     
 }

GeliBusinessPlatform/ViewController/地址管理/DZGLViewController.swift

@@ -13,10 +13,11 @@ protocol DZGLViewControllerDelegate {
     func DZGLViewControllerSelect(data:GetAddrsInfoDataModel)
 }
 class DZGLViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,SwipeTableViewCellDelegate,UISearchBarDelegate,SearchBarViewDelegate,XinZengDiZhiViewControllerDelegate,GeliAlertViewDelegate{
-    func XinZengDiZhiViewControllerFinishAction(name: String, phone: String, adr: String) {
+    func XinZengDiZhiViewControllerFinishAction(name: String, phone: String, adr: String, data: AddAddressDataModel?) {
         listView.mj_header?.beginRefreshing()
     }
     
+ 
     func sureGeliAlertViewAction(sender: UIButton) {
         
         let model  = adrArrs[sender.tag]
@@ -85,7 +86,7 @@ class DZGLViewController: BaseViewController,UITableViewDelegate,UITableViewData
     var isSelectMotion = false
     var selectIdx:IndexPath?
     var adrInfo:GetAddrsInfoModel?
-    
+    var isSelectlogAddress = false
     
     //列表
     var adrArrs:Array<AddressListDataModel> = []
@@ -109,7 +110,17 @@ class DZGLViewController: BaseViewController,UITableViewDelegate,UITableViewData
         super.viewDidLoad()
         navbar.title = "地址管理"
         self.view.addSubview(navbar)
+        if isSelectlogAddress {
+            HUD.flash(.progress)
+            searchBgH.constant = 0
+            getAddr(["user_token":UserToken as Any], success: { (data) in
+                self.adrInfo = (data as! GetAddrsInfoModel)
+                self.listView.reloadData()
+                HUD.hide()
+            }) { (error) in
                 
+            }
+        }else{
             if cus_id != nil {
                 HUD.flash(.progress)
                 searchBgH.constant = 0
@@ -143,6 +154,8 @@ class DZGLViewController: BaseViewController,UITableViewDelegate,UITableViewData
                 self.listView!.mj_header = headerMJ
                 self.listView.mj_header?.beginRefreshing()
             }
+        }
+        
         listView.separatorStyle = .none
         //        SetTopFrameView(view: listView, btmView: btmLbl)
         SetTopFrame(view: searchBg, height: 45)
@@ -193,6 +206,11 @@ class DZGLViewController: BaseViewController,UITableViewDelegate,UITableViewData
         self.navigationController?.pushViewController(vc, animated: true)
     }
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        if isSelectlogAddress{
+            if adrInfo != nil {
+                   return (adrInfo?.data!.count)!
+               }
+        }
         if cus_id != nil {
             if adrInfo != nil {
                 return (adrInfo?.data!.count)!
@@ -204,6 +222,21 @@ class DZGLViewController: BaseViewController,UITableViewDelegate,UITableViewData
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withIdentifier: "DiZhiGuanLiCell") as! DiZhiGuanLiCell
         cell.delegate = self
+        if isSelectlogAddress {
+            let model = adrInfo?.data![indexPath.row]
+            cell.nameLbl.text = model?.consignee
+            cell.phoneLbl.text = model?.mobile
+            cell.adrLbl.text = model?.addr_name
+            
+            if isSelectMotion == false {
+                cell.btnH.constant = 0
+                cell.xValue.constant = 0
+            }else{
+                if indexPath == selectIdx {
+                    cell.btn.isSelected = true
+                }
+            }
+        }else{
             if cus_id != nil {//选择
                 let model = adrInfo?.data![indexPath.row]
                 cell.nameLbl.text = model?.consignee
@@ -252,6 +285,8 @@ class DZGLViewController: BaseViewController,UITableViewDelegate,UITableViewData
                     
                 }
             }
+        }
+        
         return cell
     }
     

GeliBusinessPlatform/ViewController/地址管理/XinZengDiZhiViewController.swift

@@ -9,7 +9,7 @@
 import UIKit
 import SwiftyJSON
 protocol XinZengDiZhiViewControllerDelegate {
-    func XinZengDiZhiViewControllerFinishAction(name:String,phone:String,adr:String)
+    func XinZengDiZhiViewControllerFinishAction(name:String,phone:String,adr:String, data: AddAddressDataModel?)
 }
 class XinZengDiZhiViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,TitleAndTFAndBtnCellDelegate, UIPickerViewDelegate, UIPickerViewDataSource,SJMapViewControllerDelegate,UITextFieldDelegate,TitleAndSwitchCellDelegate,GeliAlertViewDelegate{
     var address_id:Int?
@@ -18,7 +18,7 @@ class XinZengDiZhiViewController: BaseViewController,UITableViewDelegate,UITable
         if sender.tag == 999 {
             
             AddressDel(["user_token":UserToken as Any,"address_id":address_id as Any], success: { (data) in
-                self.delegate?.XinZengDiZhiViewControllerFinishAction(name: self.nameStr, phone: self.phone, adr: self.adrStr)
+                self.delegate?.XinZengDiZhiViewControllerFinishAction(name: self.nameStr, phone: self.phone, adr: self.adrStr, data: nil)
                 self.navigationController?.popViewController(animated: true)
             }) { (error) in
                 
@@ -64,7 +64,7 @@ class XinZengDiZhiViewController: BaseViewController,UITableViewDelegate,UITable
                 "is_send_default":send_default as Any,
             ]
             EditAddress(dict, success: { (data) in
-                self.delegate?.XinZengDiZhiViewControllerFinishAction(name: self.nameStr, phone: self.phone, adr: self.adrStr)
+                self.delegate?.XinZengDiZhiViewControllerFinishAction(name: self.nameStr, phone: self.phone, adr: self.adrStr, data: nil)
                 self.navigationController?.popViewController(animated: true)
                 HUD.hide()
             }) { (error) in
@@ -87,7 +87,8 @@ class XinZengDiZhiViewController: BaseViewController,UITableViewDelegate,UITable
                 "is_send_default":send_default as Any,
             ]
             AddAddress(dict, success: { (data) in
-                self.delegate?.XinZengDiZhiViewControllerFinishAction(name: self.nameStr, phone: self.phone, adr: self.adrStr)
+                let dataModel = data as! AddAddressModel
+                self.delegate?.XinZengDiZhiViewControllerFinishAction(name: self.nameStr, phone: self.phone, adr: self.adrStr, data: dataModel.data)
                 self.navigationController?.popViewController(animated: true)
                 HUD.hide()
             }) { (error) in