修改地址显示

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

@@ -325,7 +325,6 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
             HUD.flash(.label("请选择完整的收发路线"), delay: 1.2)
             return
         }
-        print("明细跳转 ")
         let vc = LogisticsCostDetailViewController()
         vc.model = logisticsCostModel
         //        vc.carModel = carTypesArr[selectCarType]
@@ -492,6 +491,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
             sender = name
             sendPhone = phone
             sendAdr = adr
+            showSendAdr = province_name + city_name + district_name + adr
             sendAddressModel = data
             isSelectSendAddressModel = false
             s_province_name = province_name
@@ -504,6 +504,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
             receiver = name
             receivePhone = phone
             receiveAdr = adr
+            showRecAdr = province_name + city_name + district_name + adr
             receiveAddressModel = data
             isSelectReceiveAddressModel = false
             r_province_name = province_name
@@ -516,14 +517,15 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
         listView.reloadData()
         getLogPayPrice()
     }
-    
+    var showSendAdr = ""
+    var showRecAdr = ""
     func DZGLViewControllerSelect(data: GetAddrsInfoDataModel) {
         print("已选的收发货地址\(data.addr_name!)")
         if isSend {
             sender = data.consignee
             sendPhone = data.mobile
-            print("")
             sendAdr = data.address
+            showSendAdr = data.addr_name!
             isSelectSendAddressModel = true
             sendAddressSelectModel = data
             s_province_name = data.province_cn
@@ -536,6 +538,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
             receiver = data.consignee
             receivePhone = data.mobile
             receiveAdr = data.address
+            showRecAdr = data.addr_name!
             receiveAddressSelectModel = data
             isSelectReceiveAddressModel = true
             r_province_name = data.province_cn
@@ -1752,7 +1755,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
                         cell.nameLbl.text = sender!
                         cell.phoneLbl.text = sendPhone!
                         print("SENDER == ",sendAdr)
-                        cell.adrLbl.text = sendAdr!
+                        cell.adrLbl.text = showSendAdr
                     }
                 }
                 if indexPath.row == 1 {
@@ -1763,7 +1766,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
                         cell.contentV.isHidden = false
                         cell.nameLbl.text = receiver!
                         cell.phoneLbl.text = receivePhone!
-                        cell.adrLbl.text = receiveAdr!
+                        cell.adrLbl.text = showRecAdr
                     }
                 }
                 return cell

GeliBusinessPlatform/ViewController/商品详情/EPViewController.swift

@@ -15,18 +15,18 @@ import Dollar
 protocol EPViewControllerDelegate {
     func EPViewControllerFinishEdit()
 }
+
 class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,TitleAndBtnCellDelegate,GLAlertSelectViewDelegate,GoodsClassViewControllerDelegate,PinPaiListViewControllerDelegate,AddImgCellDelegate,AddGuiGeCellDelegate,CreatNewSpecsViewControllerDelegate,ShangPinGguiGeCellDelegate,UICollectionViewDelegate,UICollectionViewDataSource,UICollectionViewDelegateFlowLayout,TitleAndSwitchCellDelegate,TitleAndTFCellDelegate,YuShouWeiKuanFaHuoCellDelegate,UITextFieldDelegate,ShowTimeSelectViewDelegate, LMNoteViewControllerDelegate,GeliAlertViewDelegate{
     
     let UserToken = UserDefaults.standard.value(forKey: "user_token")
     var delegate:EPViewControllerDelegate?
     
-    @IBOutlet weak var btmColor: UIView!
-    @IBOutlet weak var btmBtnViewH: NSLayoutConstraint!
-    
-    @IBOutlet weak var listTbv: UITableView!
-    @IBOutlet weak var btmBtnBGView: UIView!
+    @IBOutlet weak var btmColor:UIView!
+    @IBOutlet weak var btmBtnViewH:NSLayoutConstraint!
+    @IBOutlet weak var listTbv:UITableView!
+    @IBOutlet weak var btmBtnBGView:UIView!
     
-    var generalInfoModel : GeneralInfoModel? = nil
+    var generalInfoModel:GeneralInfoModel? = nil
     var pinPai = ""//品牌
     var pinPai_id:Int? //品牌id
     var titleStrArr:Array<String>? = []
@@ -56,8 +56,6 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
         glSelectView = nil
     }
     
-    
-    
     var titleArr = ["商品信息","商品图片","商品规格","预售设置","其它信息","商品详情"]
     let spxxArr = ["商品名称","商品类型","商品分类","品牌","起卖数量","是否清真","是否询价"]
     var tishixxArr = ["请输入商品名称","请选择商品类型","请选择商品分类","请选择品牌","请输入起卖数量"]