新增头cell,地址选择修改

GeliBusinessPlatform.xcodeproj/project.pbxproj

@@ -179,6 +179,8 @@
 		E0707DD024624A2F00E039A8 /* AMapSearchKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E0707DCF24624A2F00E039A8 /* AMapSearchKit.framework */; };
 		E0707DD224624A3700E039A8 /* MAMapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E0707DD124624A3700E039A8 /* MAMapKit.framework */; };
 		E0707DD624624B5200E039A8 /* AMap.bundle in Resources */ = {isa = PBXBuildFile; fileRef = E0707DD524624B5200E039A8 /* AMap.bundle */; };
+		E074B69C24DD305600777003 /* TitleHeaderCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E074B69A24DD305500777003 /* TitleHeaderCell.swift */; };
+		E074B69D24DD305600777003 /* TitleHeaderCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E074B69B24DD305500777003 /* TitleHeaderCell.xib */; };
 		E07B1E5E24591AA50055BA3C /* KeHuXQViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E07B1E5C24591AA50055BA3C /* KeHuXQViewController.swift */; };
 		E07B1E5F24591AA50055BA3C /* KeHuXQViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E07B1E5D24591AA50055BA3C /* KeHuXQViewController.xib */; };
 		E07B1E62245921A60055BA3C /* KeHuXQCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E07B1E60245921A60055BA3C /* KeHuXQCell.swift */; };
@@ -796,6 +798,8 @@
 		E0707DD124624A3700E039A8 /* MAMapKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = MAMapKit.framework; sourceTree = "<group>"; };
 		E0707DD324624A6800E039A8 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
 		E0707DD524624B5200E039A8 /* AMap.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = AMap.bundle; path = MAMapKit.framework/AMap.bundle; sourceTree = "<group>"; };
+		E074B69A24DD305500777003 /* TitleHeaderCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TitleHeaderCell.swift; sourceTree = "<group>"; };
+		E074B69B24DD305500777003 /* TitleHeaderCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TitleHeaderCell.xib; sourceTree = "<group>"; };
 		E07B1E5C24591AA50055BA3C /* KeHuXQViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeHuXQViewController.swift; sourceTree = "<group>"; };
 		E07B1E5D24591AA50055BA3C /* KeHuXQViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KeHuXQViewController.xib; sourceTree = "<group>"; };
 		E07B1E60245921A60055BA3C /* KeHuXQCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeHuXQCell.swift; sourceTree = "<group>"; };
@@ -2451,6 +2455,8 @@
 				E002465124A8697B00049DBC /* TitleAndTFBtnCell.xib */,
 				E0706EF224B40BE800D8251C /* TitleAndTfYuanCell.swift */,
 				E0706EF324B40BE800D8251C /* TitleAndTfYuanCell.xib */,
+				E074B69A24DD305500777003 /* TitleHeaderCell.swift */,
+				E074B69B24DD305500777003 /* TitleHeaderCell.xib */,
 			);
 			path = Cell;
 			sourceTree = "<group>";
@@ -3291,6 +3297,7 @@
 				F96E9D60246657B500B5B94A /* HGImage.xcassets in Resources */,
 				E0206329246CD855007A40C4 /* TitleAndLblView.xib in Resources */,
 				F961D27524503CCF007FBE70 /* OrderSelectMoreView.xib in Resources */,
+				E074B69D24DD305600777003 /* TitleHeaderCell.xib in Resources */,
 				E042F74524529B8500CDFA12 /* JiTuoWuXinXiView.xib in Resources */,
 				E01C26B12446989700ADCC70 /* Interface_Z.plist in Resources */,
 				E0A409CD2464026B00CFF109 /* SecondCell.xib in Resources */,
@@ -3530,6 +3537,7 @@
 				E0F3C2CB24590C86006F0D1F /* XinZengAndBianJiKeHuViewController.swift in Sources */,
 				F956D5B4246A2D9C003FF510 /* UIImage+LMNStore.m in Sources */,
 				F9531F412465108800724BEE /* JXPhotoBrowserView.swift in Sources */,
+				E074B69C24DD305600777003 /* TitleHeaderCell.swift in Sources */,
 				F956D5AB246A2D9C003FF510 /* LMNNumberingLine.m in Sources */,
 				F96E9D5B246656A700B5B94A /* HGImageCollectionViewCell.swift in Sources */,
 				E0EFB9C624930C0D005FB0CD /* CGDListViewController.swift in Sources */,

GeliBusinessPlatform/View/Cell/TitleHeaderCell.swift

+//
+//  TitleHeaderCell.swift
+//  GeliBusinessPlatform
+//
+//  Created by junye lu on 2020/8/7.
+//  Copyright © 2020 junye lu. All rights reserved.
+//
+
+import UIKit
+
+class TitleHeaderCell: UITableViewCell {
+
+    @IBOutlet weak var nameLbl: UILabel!
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        self.selectionStyle = .none
+        
+        // Initialization code
+    }
+
+    override func setSelected(_ selected: Bool, animated: Bool) {
+        super.setSelected(selected, animated: animated)
+
+        // Configure the view for the selected state
+    }
+    
+}

GeliBusinessPlatform/View/Cell/TitleHeaderCell.xib

+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="TitleHeaderCell" customModule="TestClass" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
+                <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="【已支付】" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KOf-o4-7xH">
+                        <rect key="frame" x="15" y="25.5" width="65.5" height="18.5"/>
+                        <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="13"/>
+                        <color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="0.84705882352941175" colorSpace="calibratedRGB"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                </subviews>
+                <constraints>
+                    <constraint firstItem="KOf-o4-7xH" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="07w-Wn-nOh"/>
+                    <constraint firstAttribute="bottom" secondItem="KOf-o4-7xH" secondAttribute="bottom" id="hun-fv-7d4"/>
+                </constraints>
+            </tableViewCellContentView>
+            <viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
+            <connections>
+                <outlet property="nameLbl" destination="KOf-o4-7xH" id="feB-p9-N1n"/>
+            </connections>
+            <point key="canvasLocation" x="132" y="107"/>
+        </tableViewCell>
+    </objects>
+</document>

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

@@ -90,35 +90,28 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
                 extractedFunc()
             }
         }
-        if idx != 10086 {
-            if idx != 0  {
-                if idx == 1 && adrArr.count == 0{
+
+                if idx != 0 && adrArr.count == 0{
                     let dic = NSMutableDictionary()
                     dic["locName"] = "空"
                     adrArr.append(dic)
                     adrArr.append(dict as NSDictionary)
                 }else{
-                    if adrArr.count < 2 {
-                        adrArr.append(dict as NSDictionary)
+                    
+                    if adrArr.count > idx {
+                        adrArr.insert(dict as NSDictionary, at: idx)
+                        adrArr.remove(at: idx+1)
                     }else{
-                        if adrArr.count > idx {
-                            adrArr.insert(dict as NSDictionary, at: idx)
-                            adrArr.remove(at: idx+1)
-                        }
+                        adrArr.append(dict as NSDictionary)
                     }
+
                 }
-            }else{
-                
-                if idx == 0 && adrArr.count > 0 {
-                    adrArr.insert(dict as NSDictionary, at: 0)
-                    adrArr.remove(at:1)
-                }else{
-                    adrArr.append(dict as NSDictionary)
-                }
-            }
-        }else{
-            adrArr.append(dict as NSDictionary)
-        }
+
+//        if adrArr.count > 1 {
+//            addBtn?.setTitle("继续添加收货地址", for: .normal)
+//        }else{
+//            addBtn?.setTitle("添加收货地址", for: .normal)
+//        }
         
         let view = hListView.footerView(forSection: 1)
         view?.layoutIfNeeded()
@@ -127,8 +120,6 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
         hListView.reloadData()
     }
     
-    
-    
     var loc:cityListDataModel!
     
     func CityListViewControllerLocSelect(loc: cityListDataModel) {
@@ -731,7 +722,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
                     view.addSubview(leftBtn)
                     let rightBtn = UIButton(frame: CGRect(x: fullScreenWidth*0.5, y: 0, width: fullScreenWidth*0.5, height: 44))
                     rightBtn.titleLabel?.font = UIFont.systemFont(ofSize: 13)
-                    rightBtn.setTitle("添加收货地址", for: .normal)
+                    rightBtn.setTitle("继续添加收货地址", for: .normal)
                     rightBtn.tag = 1
                     rightBtn.addTarget(self, action: #selector(huoLLAdrAction(sender:)), for: .touchUpInside)
                     rightBtn.setTitleColor(UIColor(named: "蓝色字体颜色"), for: .normal)
@@ -741,10 +732,14 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
                     addBtn.titleLabel?.font = UIFont.systemFont(ofSize: 13)
                     addBtn.backgroundColor = UIColor.white
                     addBtn.setTitle("添加收货地址", for: .normal)
+                    if adrArr.count > 1 {
+                        addBtn.setTitle("继续添加收货地址", for: .normal)
+                    }
                     addBtn.tag = 1
                     addBtn.addTarget(self, action: #selector(huoLLAdrAction(sender:)), for: .touchUpInside)
                     addBtn.setTitleColor(UIColor(named: "蓝色字体颜色"), for: .normal)
                     view.addSubview(addBtn)
+                    
                 }
                 return view
             }