添加搜索地址功能

GeliBusinessPlatform/Interface/Interface_Z.plist

@@ -232,5 +232,7 @@
 	<string>Logistics/LogisticsTracking</string>
 	<key>取消运单</key>
 	<string>Logistics/cancelLogisticsOrder</string>
+	<key>获取城市下可选车型信息</key>
+	<string>Lalamove/cityCart</string>
 </dict>
 </plist>

GeliBusinessPlatform/Model/LalamoveInterface/LalamoveModel.swift

@@ -41,3 +41,162 @@ class cityListDataModel: Mappable {
         name_en <- map["name_en"]
     }
 }
+
+
+//MARK: - 获取城市下可选车型信息
+class cityCartModel: Mappable {
+    var code:Int?
+    var message : String?
+    var data :cityCartDataModel?
+
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        code <- map["code"]
+        message <- map["message"]
+        data <- map["data"]
+    }
+}
+
+class cityCartDataModel: Mappable {
+    var enable_virtual_number:Int?
+    var vehicle_arr : Array<vehicle_arr_data>?
+    var name :String?
+    var spec_req_arr : Array<spec_req_arr_data>?
+    var enable_ep_virtual_number_status:Int?
+    var city_id:Int?
+    var name_en:String?
+    var revision:Int?
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        enable_virtual_number <- map["enable_virtual_number"]
+        vehicle_arr <- map["vehicle_arr"]
+        name <- map["name"]
+        
+        spec_req_arr <- map["spec_req_arr"]
+        enable_ep_virtual_number_status <- map["enable_ep_virtual_number_status"]
+        city_id <- map["city_id"]
+        
+        name_en <- map["name_en"]
+        revision <- map["revision"]
+    }
+}
+
+class vehicle_arr_data: Mappable {
+    var img_url_high_light:String?
+    var vehicle_std_arr : Array<vehicle_std_arr_data>?
+    var surcharge_desc :String?
+    var carriage_length_cm :String?
+    var vehicle_price_text_item :vehicle_price_text_item_data?
+    
+    var is_truck_direction:Int?
+    var name : String?
+    var order_vehicle_id :Int?
+    var img_url_off_light :String?
+    var carriage_height_cm :String?
+    
+    var carriage_width_cm:String?
+    var spread_remark : String?
+
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        img_url_high_light <- map["img_url_high_light"]
+        vehicle_std_arr <- map["vehicle_std_arr"]
+        surcharge_desc <- map["surcharge_desc"]
+        carriage_length_cm <- map["carriage_length_cm"]
+        vehicle_price_text_item <- map["vehicle_price_text_item"]
+        
+        is_truck_direction <- map["is_truck_direction"]
+        name <- map["name"]
+        order_vehicle_id <- map["order_vehicle_id"]
+        img_url_off_light <- map["img_url_off_light"]
+        carriage_height_cm <- map["carriage_height_cm"]
+        
+        carriage_width_cm <- map["carriage_width_cm"]
+        spread_remark <- map["spread_remark"]
+    }
+}
+
+class vehicle_price_text_item_data: Mappable {
+    var text_weight : String?
+    var exceed_segment_price :Array<exceed_segment_price_data>?
+    var text_desc :String?
+    
+    var text_size : String?
+    var start_distance_km :Float?
+    var text_volume :String?
+    
+    var price_fen_after_start : Float?
+    var start_price_fen :Float?
+
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        text_weight <- map["text_weight"]
+        exceed_segment_price <- map["exceed_segment_price"]
+        text_desc <- map["text_desc"]
+        
+        text_size <- map["text_size"]
+        start_distance_km <- map["start_distance_km"]
+        text_volume <- map["text_volume"]
+        
+        price_fen_after_start <- map["price_fen_after_start"]
+        start_price_fen <- map["start_price_fen"]
+    }
+}
+
+class exceed_segment_price_data: Mappable {
+    var end_exdistancekm : Float?
+    var price_extra_fen :Float?
+    var start_exdistancekm :Float?
+
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        end_exdistancekm <- map["end_exdistancekm"]
+        price_extra_fen <- map["price_extra_fen"]
+        start_exdistancekm <- map["start_exdistancekm"]
+    }
+}
+
+class vehicle_std_arr_data: Mappable {
+    var name : String?
+    var price_fen :Float?
+    var desc :String?
+
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        name <- map["name"]
+        price_fen <- map["price_fen"]
+        desc <- map["desc"]
+    }
+}
+
+
+class spec_req_arr_data: Mappable {
+    var price_value_fen:Float?
+    var name : String?
+    var price_type :Int?
+    var type :Int?
+    var desc :String?
+
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        price_value_fen <- map["price_value_fen"]
+        name <- map["name"]
+        price_type <- map["price_type"]
+        type <- map["type"]
+        desc <- map["desc"]
+    }
+}

GeliBusinessPlatform/Model/LogisticsInterface.swift

@@ -146,3 +146,19 @@ func LogisticsTracking(_ params:[String:Any],success:@escaping (_ res:Any)->(),f
         failture(error)
     }
 }
+
+//MARK:-- 获取城市下可选车型信息
+
+/*
+ user_token 验证token
+ nonce_str
+ city_id
+ */
+func cityCart(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("获取城市下可选车型信息", params, { (rep:DataResponse<cityCartModel>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}

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

@@ -33,7 +33,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
     
     @IBOutlet weak var topCarBtnSelectView: UIView!
     
-    var adrArr:Array<String> = ["1","2","3"]
+    var adrArr:Array<String> = []
     //MARK:--地址信息
     var sender:String?
     var sendPhone:String?
@@ -265,6 +265,20 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
                 hBtnViewH.constant = 49
             }
             if isAlready {
+                
+                var city_id = 0
+                for item in adrDatas {
+                    if item.name == selectLoc {
+                        city_id = item.city_id!
+                    }
+                }
+                
+                cityCart(["user_token":UserToken as Any,"nonce_str":String.randomStr(len: 30) as Any,"city_id":city_id as Any], success: { (data) in
+                    
+                }) { (err) in
+                    
+                }
+                
                 setBtnUI(carTypesArr: carTypesArr,view: topCarBtnSelectView)
                 
                 let line = UIView()
@@ -288,21 +302,15 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
     @IBOutlet weak var hBtnViewH: NSLayoutConstraint!
     @IBOutlet weak var hllView: UIView!
     @IBOutlet weak var rightBtn: UIButton!
-    
+    var adrDatas:Array<cityListDataModel> = []
     @objc func locSelect(){
-        
-        cityList(["user_token":UserToken as Any,"nonce_str":String.randomStr(len: 30) as Any], success: { (data) in
-            let model = data as! cityListModel
-            if model.data!.count > 0 {
+        if adrDatas.count > 0 {
             let vc = CityListViewController()
-                vc.adrDatas = model.data!
+            vc.adrDatas = adrDatas
             vc.locatStr = self.selectLoc
             vc.delegate = self
             self.navigationController?.pushViewController(vc, animated: true)
         }
-        }) { (err) in
-            
-        }
     }
     
     
@@ -320,7 +328,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
                 print("反地理编码成功")
                 guard let plsResult = pls else {return}
                 let firstPL = plsResult.first
-                print(firstPL?.postalAddress?.city)
+                
                 if self.selectLoc.count == 0 {
                     self.locBtn.isUserInteractionEnabled = false
                     self.locBtn.setImage(UIImage(named: "dzdingwei"), for: .normal)
@@ -339,7 +347,6 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
                         make.height.equalTo(30)
                         make.width.equalTo(self.locBtn.bounds.size.width)
                     })
-                    
                 }
             }else {
                 print("错误")
@@ -350,6 +357,18 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
     
     override func viewDidLoad() {
         super.viewDidLoad()
+        
+        cityList(["user_token":UserToken as Any,"nonce_str":String.randomStr(len: 30) as Any], success: { (data) in
+            let model = data as! cityListModel
+            self.adrDatas.removeAll()
+            for item in model.data! {
+                self.adrDatas.append(item)
+            }
+            
+        }) { (err) in
+            
+        }
+        
         navbar.title = "运单列表"
         self.view.addSubview(navbar)
         
@@ -730,7 +749,11 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
             }
         }else{//货拉拉
             switch section {
-            case 1:return adrArr.count
+            case 1:
+                if adrArr.count == 0 {
+                    return 2
+                }
+                return adrArr.count
             case 2:return 4
             case 3:return 2
             default: return 1
@@ -789,6 +812,13 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
         }else{//MARK: - 货拉拉did select
             
             print(indexPath.section,indexPath.row)
+            if indexPath.section == 1 {
+                let vc = ToAndFormSelectViewController()
+                vc.idx = indexPath.row
+                self.navigationController?.pushViewController(vc, animated: true)
+            }
+            
+            
             if indexPath.section == 2 {
                 if indexPath.row == 1 {
                     let view = XiaDanUserInfoViewController()
@@ -989,11 +1019,17 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
                 cell.iconH.constant = 22
                 cell.iconLbl.layer.cornerRadius = 11
                 cell.lineTopView.isHidden = false
+                cell.delBtn.isHidden = true
+                if adrArr.count > 1 {
                     cell.delBtn.isHidden = false
-                
+                    cell.nodataLbl.isHidden = true
                     cell.addressLbl.text = adrArr[indexPath.row]
                     cell.addressDetailLbl.text = adrArr[indexPath.row]
                     cell.namePhoneLbl.text = adrArr[indexPath.row]
+                    cell.topH.constant = 5
+                }else{
+                    cell.topH.constant = 25
+                }
                 
                 if indexPath.row == 0 {
                     cell.namePhoneLbl.text = ""
@@ -1001,9 +1037,12 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
                     cell.iconLbl.text = "发"
                     cell.iconLbl.backgroundColor = UIColor.init(named: "蓝色字体颜色")
                     cell.lineTopView.isHidden = true
+                    if adrArr.count > 0 {
+                         cell.topH.constant = 5
+                    }
                 }
                 
-                if indexPath.row != adrArr.count - 1 && indexPath.row != 0 {
+                if indexPath.row != adrArr.count - 1 && indexPath.row != 0 && adrArr.count != 0{
                     cell.iconLbl.text = ""
                     cell.iconLbl.backgroundColor = UIColor.init(named: "虚线分界线颜色")
                     cell.iconW.constant = 12
@@ -1011,10 +1050,12 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
                     cell.iconLbl.layer.cornerRadius = 6
                 }
                 
-                if indexPath.row == adrArr.count - 1 {
+                
+                if indexPath.row == adrArr.count - 1 || adrArr.count == 0 && indexPath.row != 0{
                     //最后的不显示lineview
                     cell.lineView.isHidden = true
                     cell.iconLbl.text = "收"
+                    cell.nodataLbl.text = "请选择或填写收货信息"
                     cell.iconLbl.backgroundColor = UIColor.init(named: "企业、预售字体")
                 }else{
                     cell.lineView.isHidden = false
@@ -1108,8 +1149,10 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
             topBtnLine.isHidden = true
             btn.addSubview(topBtnLine)
             topBtnLine.snp.makeConstraints { (make) in
-                make.left.bottom.right.equalToSuperview()
-                make.height.equalTo(2.5)
+                make.bottom.equalToSuperview()
+                make.left.equalTo(10)
+                make.right.equalTo(-10)
+                make.height.equalTo(3)
             }
             lineArr.append(topBtnLine)
         }

GeliBusinessPlatform/ViewController/货拉拉/收发货地址/ToAndFormSelectViewController.swift

@@ -16,18 +16,24 @@ import IQKeyboardManagerSwift
 
 class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLocationManagerDelegate, AMapSearchDelegate, UISearchBarDelegate, SearchBarViewDelegate,UITableViewDelegate,UITableViewDataSource{
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        if tableView == searchList {
+            return adrArr.count
+        }
         return 5
     }
+    var idx:Int?
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         return UITableView.automaticDimension
     }
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        
         let cell = tableView.dequeueReusableCell(withIdentifier: "HuoLaLaDiZhiCell") as! HuoLaLaDiZhiCell
-        cell.nameLbl.text = "测试"
-        cell.contentLbl.text = "adasf"
-        if indexPath.row == 0 {
-            cell.contentLbl.text = "asfdasldfkj;alsjdf;lasjfasl;jfda;lskjfda;lsfjals;kfjasl;fjasl;fjasl;fjasl;fdjasl;fjaslfdjaslfdjaslfkjasfdlkajsflsajfdlk"
+        cell.nameLbl.text = "1"
+        if tableView == searchList {
+        let data = adrArr[indexPath.row]
+            cell.nameLbl.text = data.name
         }
+        
         return cell
     }
     
@@ -75,6 +81,7 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
     }
     @IBOutlet weak var listViewBG: UIView!
     
+    @IBOutlet weak var searchList: UITableView!
     @IBAction func backToUserLocation(_ sender: Any) {
         
     }
@@ -116,6 +123,9 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
         manger.requestAlwaysAuthorization()
         manger.requestWhenInUseAuthorization()
         manger.startUpdatingLocation()
+        
+        
+        searchList.register(UINib(nibName: "HuoLaLaDiZhiCell", bundle: nil), forCellReuseIdentifier: "HuoLaLaDiZhiCell")
     }
     
     func initMapView(){
@@ -162,7 +172,7 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
     var titleLbl:UILabel?
     var contentLbl:UILabel?
     var adrArr:Array<AMapPOI> = []
-    
+    var keyword = ""
     func onPOISearchDone(_ request: AMapPOISearchBaseRequest!, response: AMapPOISearchResponse!) {
         
         if response.count == 0 {
@@ -173,8 +183,11 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
         response.pois.forEach { (poi) in
             adrArr.append(poi)
         }
-        print(adrArr.count)
         
+        if keyword.count > 0 {
+            searchList.isHidden = false
+            searchList.reloadData()
+        }
         
         if introView == nil {
             introView = UIView()
@@ -332,8 +345,11 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
     }
     func searchBarSearchButtonClicked(_ searchBar: UISearchBar) {
        
-        
+        keyword = searchBar.text!
         print("点击搜索进行--")
+        if searchBar.text!.count == 0 {
+            searchList.isHidden = true
+        }
         searchBar.resignFirstResponder()
         let request = AMapPOIKeywordsSearchRequest()
         request.keywords = searchBar.text
@@ -341,6 +357,7 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
         request.cityLimit = true
         request.requireSubPOIs = true
         search.aMapPOIKeywordsSearch(request)
+        
     }
     
     

GeliBusinessPlatform/ViewController/货拉拉/收发货地址/ToAndFormSelectViewController.xib

@@ -20,6 +20,7 @@
                 <outlet property="nameTF" destination="tlN-2m-Au1" id="DpV-qf-Z56"/>
                 <outlet property="navBgView" destination="gLT-4M-bfs" id="fjx-Hf-4GS"/>
                 <outlet property="phoneTF" destination="zpG-8r-dzl" id="nwC-VM-snC"/>
+                <outlet property="searchList" destination="WO7-AX-Flw" id="11Q-2y-4IB"/>
                 <outlet property="selectListV" destination="FkD-95-sVW" id="wNv-R5-d7Z"/>
                 <outlet property="sureSelectLbl" destination="nZK-ad-fmq" id="5gq-Yd-d6B"/>
                 <outlet property="toFormTitleLbl" destination="kjg-a9-QU1" id="8Fc-oo-P93"/>
@@ -280,6 +281,14 @@
                                 <outlet property="delegate" destination="-1" id="Abz-vu-2hp"/>
                             </connections>
                         </tableView>
+                        <tableView hidden="YES" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="WO7-AX-Flw">
+                            <rect key="frame" x="0.0" y="0.0" width="414" height="748"/>
+                            <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                            <connections>
+                                <outlet property="dataSource" destination="-1" id="jmz-eX-3c5"/>
+                                <outlet property="delegate" destination="-1" id="f1a-0P-OnF"/>
+                            </connections>
+                        </tableView>
                     </subviews>
                     <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                     <constraints>
@@ -287,12 +296,14 @@
                         <constraint firstItem="FkD-95-sVW" firstAttribute="leading" secondItem="c1E-9c-vVT" secondAttribute="leading" id="5BV-xv-6A3"/>
                         <constraint firstAttribute="trailing" secondItem="NcV-XI-uHx" secondAttribute="trailing" id="5VT-22-5AL"/>
                         <constraint firstItem="FkD-95-sVW" firstAttribute="top" secondItem="7b1-Dd-JY1" secondAttribute="bottom" id="6vs-qH-hJx"/>
+                        <constraint firstItem="WO7-AX-Flw" firstAttribute="top" secondItem="NcV-XI-uHx" secondAttribute="top" id="EIF-oU-wRI"/>
                         <constraint firstItem="qwS-jQ-IIf" firstAttribute="top" secondItem="7b1-Dd-JY1" secondAttribute="bottom" id="EZn-ty-rFI"/>
                         <constraint firstItem="NcV-XI-uHx" firstAttribute="leading" secondItem="c1E-9c-vVT" secondAttribute="leading" id="G3b-qJ-edd"/>
                         <constraint firstItem="DCc-3H-FXA" firstAttribute="top" secondItem="0Ha-lY-Z5m" secondAttribute="bottom" constant="18" id="J19-GU-2qe"/>
                         <constraint firstAttribute="trailing" secondItem="qwS-jQ-IIf" secondAttribute="trailing" id="JRb-Nt-Cku"/>
                         <constraint firstItem="DCc-3H-FXA" firstAttribute="leading" secondItem="c1E-9c-vVT" secondAttribute="leading" constant="15" id="MCw-hb-LLg"/>
                         <constraint firstItem="qwS-jQ-IIf" firstAttribute="leading" secondItem="c1E-9c-vVT" secondAttribute="leading" constant="15" id="Pmh-ZZ-L8z"/>
+                        <constraint firstItem="WO7-AX-Flw" firstAttribute="leading" secondItem="c1E-9c-vVT" secondAttribute="leading" id="S9m-dc-boe"/>
                         <constraint firstItem="NcV-XI-uHx" firstAttribute="top" secondItem="c1E-9c-vVT" secondAttribute="top" id="TGz-FC-jnc"/>
                         <constraint firstItem="qwS-jQ-IIf" firstAttribute="top" secondItem="whf-6g-CGo" secondAttribute="bottom" constant="15.5" id="UlX-s6-M7Q"/>
                         <constraint firstItem="whf-6g-CGo" firstAttribute="centerY" secondItem="DCc-3H-FXA" secondAttribute="centerY" id="Xfv-A8-A4u"/>
@@ -300,8 +311,10 @@
                         <constraint firstItem="whf-6g-CGo" firstAttribute="leading" secondItem="DCc-3H-FXA" secondAttribute="trailing" constant="10" id="c07-MW-tgw"/>
                         <constraint firstAttribute="trailing" secondItem="0Ha-lY-Z5m" secondAttribute="trailing" id="c9z-Tw-2yO"/>
                         <constraint firstAttribute="trailing" secondItem="FkD-95-sVW" secondAttribute="trailing" id="eFd-Tv-CIv"/>
+                        <constraint firstAttribute="trailing" secondItem="WO7-AX-Flw" secondAttribute="trailing" id="gcJ-OI-uJa"/>
                         <constraint firstItem="qwS-jQ-IIf" firstAttribute="top" secondItem="0Ha-lY-Z5m" secondAttribute="bottom" constant="49" id="lOX-5M-Ru5"/>
                         <constraint firstItem="0Ha-lY-Z5m" firstAttribute="leading" secondItem="c1E-9c-vVT" secondAttribute="leading" id="lqg-ah-mQ6"/>
+                        <constraint firstAttribute="bottom" secondItem="WO7-AX-Flw" secondAttribute="bottom" id="rIv-eF-gan"/>
                         <constraint firstItem="7b1-Dd-JY1" firstAttribute="top" secondItem="0Ha-lY-Z5m" secondAttribute="bottom" id="wMf-gc-4TG"/>
                         <constraint firstAttribute="bottom" secondItem="FkD-95-sVW" secondAttribute="bottom" id="wmq-WJ-9rk"/>
                         <constraint firstAttribute="trailing" secondItem="7b1-Dd-JY1" secondAttribute="trailing" id="zc6-2p-wci"/>

GeliBusinessPlatform/ViewController/货拉拉/运单详情/cell/WayBillAddressCanDelItemCell.swift

@@ -10,6 +10,8 @@ import UIKit
 
 class WayBillAddressCanDelItemCell: UITableViewCell {
 
+    @IBOutlet weak var topH: NSLayoutConstraint!
+    @IBOutlet weak var nodataLbl: UILabel!
     @IBOutlet weak var delBtn: UIButton!
     @IBOutlet weak var lineTopView: UIView!
     @IBOutlet weak var iconW: NSLayoutConstraint!

GeliBusinessPlatform/ViewController/货拉拉/运单详情/cell/WayBillAddressCanDelItemCell.xib

@@ -18,7 +18,7 @@
                 <rect key="frame" x="0.0" y="0.0" width="358" height="100"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="大岭中街17巷7号" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wxD-2W-Kct">
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wxD-2W-Kct">
                         <rect key="frame" x="46" y="5" width="297" height="19"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="19" id="xRT-Rm-QDF"/>
@@ -48,7 +48,7 @@
                             </userDefinedRuntimeAttribute>
                         </userDefinedRuntimeAttributes>
                     </label>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="黄小丽 18378147992" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="d4F-L8-sHy">
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="d4F-L8-sHy">
                         <rect key="frame" x="46" y="74" width="297" height="16"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="16" id="bGF-qJ-Zma"/>
@@ -59,15 +59,7 @@
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JfY-Q9-10Q">
                         <rect key="frame" x="46" y="29" width="232" height="42"/>
-                        <attributedString key="attributedText">
-                            <fragment content="广东省广州市白云区嘉禾望岗白云大道交叉路口东南侧（望岗村民委员会西侧约150米">
-                                <attributes>
-                                    <color key="NSColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                    <font key="NSFont" size="11" name="PingFangSC-Regular"/>
-                                    <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" lineSpacing="3" tighteningFactorForTruncation="0.0"/>
-                                </attributes>
-                            </fragment>
-                        </attributedString>
+                        <attributedString key="attributedText"/>
                         <nil key="highlightedColor"/>
                     </label>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="eV0-oM-vuy">
@@ -105,6 +97,12 @@
                             </userDefinedRuntimeAttribute>
                         </userDefinedRuntimeAttributes>
                     </button>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="请选择或填写发货信息" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xQh-lb-yiJ">
+                        <rect key="frame" x="46" y="6.5" width="133" height="16"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                        <color key="textColor" name="提示语字体颜色"/>
+                        <nil key="highlightedColor"/>
+                    </label>
                 </subviews>
                 <constraints>
                     <constraint firstAttribute="trailing" secondItem="wxD-2W-Kct" secondAttribute="trailing" constant="15" id="0az-l1-1Hw"/>
@@ -121,9 +119,11 @@
                     <constraint firstItem="JJG-L3-lyj" firstAttribute="top" secondItem="Zm0-Vi-78r" secondAttribute="bottom" constant="2" id="YGa-qO-R9y"/>
                     <constraint firstItem="Zm0-Vi-78r" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="ZMj-hd-wiR"/>
                     <constraint firstItem="JfY-Q9-10Q" firstAttribute="leading" secondItem="wxD-2W-Kct" secondAttribute="leading" id="d9o-tS-vGG"/>
+                    <constraint firstItem="xQh-lb-yiJ" firstAttribute="centerY" secondItem="JJG-L3-lyj" secondAttribute="centerY" id="dYT-mH-Xx6"/>
                     <constraint firstAttribute="bottom" secondItem="d4F-L8-sHy" secondAttribute="bottom" constant="10" id="enF-EC-E99"/>
                     <constraint firstAttribute="trailing" secondItem="d4F-L8-sHy" secondAttribute="trailing" constant="15" id="fik-0a-bN6"/>
                     <constraint firstItem="d4F-L8-sHy" firstAttribute="leading" secondItem="wxD-2W-Kct" secondAttribute="leading" id="geB-F3-UYR"/>
+                    <constraint firstItem="xQh-lb-yiJ" firstAttribute="leading" secondItem="JJG-L3-lyj" secondAttribute="trailing" constant="10" id="rId-AJ-tk5"/>
                     <constraint firstAttribute="trailing" secondItem="JfY-Q9-10Q" secondAttribute="trailing" constant="80" id="rWE-FX-NSP"/>
                     <constraint firstItem="eV0-oM-vuy" firstAttribute="centerX" secondItem="JJG-L3-lyj" secondAttribute="centerX" id="wRy-Qd-9t3"/>
                     <constraint firstItem="Zm0-Vi-78r" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="24.5" id="ygX-wP-k9T"/>
@@ -141,6 +141,8 @@
                 <outlet property="lineTopView" destination="Zm0-Vi-78r" id="8jr-df-3Cj"/>
                 <outlet property="lineView" destination="eV0-oM-vuy" id="6LP-YK-WUE"/>
                 <outlet property="namePhoneLbl" destination="d4F-L8-sHy" id="4lt-Va-UDs"/>
+                <outlet property="nodataLbl" destination="xQh-lb-yiJ" id="fUE-Ri-LqT"/>
+                <outlet property="topH" destination="PRU-ei-cCI" id="x5c-Om-dQZ"/>
             </connections>
             <point key="canvasLocation" x="194.20289855072465" y="120.53571428571428"/>
         </tableViewCell>
@@ -149,6 +151,9 @@
         <namedColor name="企业、预售字体">
             <color red="1" green="0.68627450980392157" blue="0.47058823529411764" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
+        <namedColor name="提示语字体颜色">
+            <color red="0.70588235294117652" green="0.70588235294117652" blue="0.70588235294117652" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </namedColor>
         <namedColor name="标题字颜色">
             <color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>