客户列表显示完善

GeliBusinessPlatform/ViewController/客户管理/KeHuGuanLiCell.swift

@@ -11,6 +11,9 @@ import UIKit
     @objc optional func KeHuGuanLiCellEditClick(cell:KeHuGuanLiCell)
 }
 class KeHuGuanLiCell: UITableViewCell {
+    @IBOutlet weak var photoIcon: UIImageView!
+    @IBOutlet weak var nameLbl2: UILabel!
+    @IBOutlet weak var arrowImg: UIImageView!
     var delegate:KeHuGuanLiCellDelegate?
     @IBOutlet weak var iconImg: UIImageView!
     @IBOutlet weak var compenyLbl: UILabel!
@@ -21,9 +24,12 @@ class KeHuGuanLiCell: UITableViewCell {
     @IBOutlet weak var statusLbl1: UILabel!
     @IBOutlet weak var statusLbl2: UILabel!
     @IBOutlet weak var statusLbl3: UILabel!
-    var phoneNum:String? = "phoneNum"
+    var phoneNum = ""
+    var cus_type:Int?
     @IBAction func phoneCallAction(_ sender: Any) {
-        print("打电话方法 拼接\(phoneNum)")
+        if phoneNum.count > 0 {
+            UIApplication.shared.openURL(NSURL.init(string: "tel://\(phoneNum)")! as URL)
+        }
     }
     @IBAction func editAction(_ sender: Any) {
         delegate?.KeHuGuanLiCellEditClick?(cell: self)
@@ -34,7 +40,17 @@ class KeHuGuanLiCell: UITableViewCell {
         
         // Initialization code
     }
-
+    override func layoutIfNeeded() {
+        super.layoutIfNeeded()
+        if cus_type == 1 {
+            statusLbl1.text = "个人"
+            statusLbl1.textColor = UIColor(named: "蓝色字体颜色")
+        }else{
+            statusLbl1.text = "企业"
+            statusLbl1.textColor = UIColor(named: "企业、预售字体")
+        }
+        statusLbl1.layer.borderColor = statusLbl1.textColor.cgColor
+    }
     override func setSelected(_ selected: Bool, animated: Bool) {
         super.setSelected(selected, animated: animated)
         

GeliBusinessPlatform/ViewController/客户管理/KeHuGuanLiCell.xib

@@ -38,12 +38,10 @@
                         </userDefinedRuntimeAttributes>
                     </imageView>
                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="guanlian" translatesAutoresizingMaskIntoConstraints="NO" id="rtn-I2-Cai">
-                        <rect key="frame" x="141" y="18" width="15.5" height="12.5"/>
+                        <rect key="frame" x="140" y="18" width="15.5" height="12.5"/>
                         <constraints>
-                            <constraint firstAttribute="height" constant="12.5" id="ObX-DI-MJc"/>
-                            <constraint firstAttribute="width" constant="15.5" id="YNk-gu-ZgB"/>
-                            <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="15.5" id="kns-IM-PS8"/>
-                            <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="12.5" id="nE9-7d-AHd"/>
+                            <constraint firstAttribute="width" constant="15.5" id="7yB-Fc-kKL"/>
+                            <constraint firstAttribute="height" constant="12.5" id="jHe-YS-2lh"/>
                         </constraints>
                     </imageView>
                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="e0T-VC-b8y">
@@ -104,7 +102,7 @@
                             </userDefinedRuntimeAttribute>
                         </userDefinedRuntimeAttributes>
                     </label>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="标签" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aLo-t5-Mpr">
+                    <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="标签" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aLo-t5-Mpr">
                         <rect key="frame" x="137" y="44.5" width="34.5" height="17"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="17" id="5UD-cG-YKI"/>
@@ -134,7 +132,7 @@
                         <color key="textColor" name="灰色字体颜色"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="标签" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eGe-S8-86F">
+                    <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="标签" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eGe-S8-86F">
                         <rect key="frame" x="181.5" y="44.5" width="32" height="17"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="17" id="NvX-re-wI3"/>
@@ -156,19 +154,18 @@
                         </userDefinedRuntimeAttributes>
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="山东济南宜昌黄总" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uVd-pP-W4G">
-                        <rect key="frame" x="160.5" y="15" width="103.5" height="18.5"/>
+                        <rect key="frame" x="160.5" y="15" width="106.5" height="18.5"/>
                         <constraints>
-                            <constraint firstAttribute="height" constant="18.5" id="4pt-DK-C1E"/>
+                            <constraint firstAttribute="height" constant="18.5" id="KmR-Ha-XRE"/>
                         </constraints>
                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                         <color key="textColor" name="标题字颜色"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="黄小锋" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ApE-sl-nL0">
-                        <rect key="frame" x="95" y="15" width="42" height="18.5"/>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" text="黄小锋" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ApE-sl-nL0">
+                        <rect key="frame" x="95" y="15" width="40" height="18.5"/>
                         <constraints>
-                            <constraint firstAttribute="height" constant="18.5" id="Lnb-jW-pDX"/>
-                            <constraint firstAttribute="width" constant="42" id="i3E-OC-oWE"/>
+                            <constraint firstAttribute="height" constant="18.5" id="y17-om-mxX"/>
                         </constraints>
                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                         <color key="textColor" name="标题字颜色"/>
@@ -177,34 +174,32 @@
                 </subviews>
                 <constraints>
                     <constraint firstAttribute="trailing" secondItem="e0T-VC-b8y" secondAttribute="trailing" id="2rF-hu-IQe"/>
-                    <constraint firstItem="ApE-sl-nL0" firstAttribute="leading" secondItem="Fia-PZ-6qZ" secondAttribute="trailing" constant="10" id="7Pe-kh-eOT"/>
+                    <constraint firstItem="uVd-pP-W4G" firstAttribute="centerY" secondItem="rtn-I2-Cai" secondAttribute="centerY" id="9WY-ie-xFp"/>
+                    <constraint firstItem="rtn-I2-Cai" firstAttribute="leading" secondItem="ApE-sl-nL0" secondAttribute="trailing" constant="5" id="9WZ-7M-HEr"/>
                     <constraint firstItem="v5f-KU-XPa" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="9vw-Ho-aXS"/>
                     <constraint firstItem="I6g-qJ-f8j" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="B6h-Mv-0Vw"/>
                     <constraint firstAttribute="bottom" secondItem="eCa-Of-9CU" secondAttribute="bottom" id="Gup-B5-eE1"/>
-                    <constraint firstItem="rtn-I2-Cai" firstAttribute="centerY" secondItem="ApE-sl-nL0" secondAttribute="centerY" id="HZW-cT-BTb"/>
+                    <constraint firstItem="uVd-pP-W4G" firstAttribute="leading" secondItem="rtn-I2-Cai" secondAttribute="trailing" constant="5" id="JXh-pR-LeB"/>
                     <constraint firstItem="aLo-t5-Mpr" firstAttribute="leading" secondItem="Plu-2M-yeP" secondAttribute="trailing" constant="10" id="LL3-Ug-RiM"/>
                     <constraint firstItem="Fia-PZ-6qZ" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="NPE-bC-yzN"/>
+                    <constraint firstItem="ApE-sl-nL0" firstAttribute="leading" secondItem="Fia-PZ-6qZ" secondAttribute="trailing" constant="10" id="NeT-Hb-A17"/>
                     <constraint firstAttribute="trailing" secondItem="eCa-Of-9CU" secondAttribute="trailing" id="Skp-fE-ZIm"/>
                     <constraint firstItem="e0T-VC-b8y" firstAttribute="leading" secondItem="I6g-qJ-f8j" secondAttribute="trailing" id="VMW-kJ-32g"/>
                     <constraint firstItem="eGe-S8-86F" firstAttribute="leading" secondItem="aLo-t5-Mpr" secondAttribute="trailing" constant="10" id="VW5-9k-sPc"/>
-                    <constraint firstItem="uVd-pP-W4G" firstAttribute="leading" secondItem="rtn-I2-Cai" secondAttribute="trailing" constant="4" id="XiG-el-f2N"/>
                     <constraint firstItem="Cec-Zu-6ft" firstAttribute="top" secondItem="Plu-2M-yeP" secondAttribute="bottom" constant="5" id="YRf-C6-za5"/>
                     <constraint firstItem="e0T-VC-b8y" firstAttribute="leading" secondItem="WCB-QY-tw2" secondAttribute="trailing" id="YdI-QB-MjY"/>
-                    <constraint firstItem="WCB-QY-tw2" firstAttribute="leading" secondItem="uVd-pP-W4G" secondAttribute="trailing" constant="5" id="Yt1-7f-PpV"/>
                     <constraint firstItem="Fia-PZ-6qZ" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="ZVh-hZ-x3n"/>
-                    <constraint firstItem="ApE-sl-nL0" firstAttribute="top" secondItem="Fia-PZ-6qZ" secondAttribute="top" id="cfF-fM-ZHR"/>
                     <constraint firstItem="aLo-t5-Mpr" firstAttribute="centerY" secondItem="Plu-2M-yeP" secondAttribute="centerY" id="chW-fH-DKf"/>
                     <constraint firstItem="WCB-QY-tw2" firstAttribute="leading" secondItem="Cec-Zu-6ft" secondAttribute="trailing" constant="15" id="eew-xP-JH5"/>
-                    <constraint firstItem="rtn-I2-Cai" firstAttribute="leading" secondItem="ApE-sl-nL0" secondAttribute="trailing" constant="4" id="gPf-Aj-PNW"/>
                     <constraint firstItem="eGe-S8-86F" firstAttribute="centerY" secondItem="aLo-t5-Mpr" secondAttribute="centerY" id="h21-V9-Fj2"/>
                     <constraint firstItem="Cec-Zu-6ft" firstAttribute="bottom" secondItem="Fia-PZ-6qZ" secondAttribute="bottom" id="hUo-ac-Xcy"/>
                     <constraint firstItem="eCa-Of-9CU" firstAttribute="top" secondItem="WCB-QY-tw2" secondAttribute="bottom" id="lxN-55-Kmc"/>
                     <constraint firstItem="Cec-Zu-6ft" firstAttribute="leading" secondItem="Fia-PZ-6qZ" secondAttribute="trailing" constant="10" id="m8y-wu-P2O"/>
+                    <constraint firstItem="rtn-I2-Cai" firstAttribute="centerY" secondItem="ApE-sl-nL0" secondAttribute="centerY" id="mE0-ns-oGt"/>
                     <constraint firstItem="WCB-QY-tw2" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="p2X-oP-hGT"/>
-                    <constraint firstItem="uVd-pP-W4G" firstAttribute="top" secondItem="Fia-PZ-6qZ" secondAttribute="top" id="qae-2K-knS"/>
                     <constraint firstItem="Plu-2M-yeP" firstAttribute="leading" secondItem="Fia-PZ-6qZ" secondAttribute="trailing" constant="10" id="r4k-U6-6FY"/>
+                    <constraint firstItem="ApE-sl-nL0" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="15" id="rVP-cE-h75"/>
                     <constraint firstItem="I6g-qJ-f8j" firstAttribute="leading" secondItem="v5f-KU-XPa" secondAttribute="trailing" constant="14.5" id="s1d-rO-tZ7"/>
-                    <constraint firstItem="uVd-pP-W4G" firstAttribute="centerY" secondItem="rtn-I2-Cai" secondAttribute="centerY" id="t3E-b4-na9"/>
                     <constraint firstItem="eCa-Of-9CU" firstAttribute="top" secondItem="e0T-VC-b8y" secondAttribute="bottom" id="uXc-j4-qhT"/>
                     <constraint firstItem="e0T-VC-b8y" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="vqY-Ao-aNQ"/>
                     <constraint firstItem="eCa-Of-9CU" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="vs9-5H-JUV"/>
@@ -212,10 +207,13 @@
             </tableViewCellContentView>
             <viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
             <connections>
+                <outlet property="arrowImg" destination="rtn-I2-Cai" id="Hxv-ne-R5l"/>
                 <outlet property="btnWidth" destination="q6o-zd-stX" id="f4E-Kj-mQF"/>
                 <outlet property="compenyLbl" destination="Cec-Zu-6ft" id="j9H-VL-7hx"/>
                 <outlet property="iconImg" destination="Fia-PZ-6qZ" id="Os5-g6-7rR"/>
                 <outlet property="nameLbl" destination="ApE-sl-nL0" id="ABK-Fz-w3k"/>
+                <outlet property="nameLbl2" destination="uVd-pP-W4G" id="6JA-r4-Vf3"/>
+                <outlet property="photoIcon" destination="v5f-KU-XPa" id="EFo-rw-btG"/>
                 <outlet property="statusLbl1" destination="Plu-2M-yeP" id="0KA-1C-UiL"/>
                 <outlet property="statusLbl2" destination="aLo-t5-Mpr" id="vXd-Ng-jYQ"/>
                 <outlet property="statusLbl3" destination="eGe-S8-86F" id="M4m-6d-i3G"/>

GeliBusinessPlatform/ViewController/客户管理/KeHuListViewController.swift

@@ -303,6 +303,27 @@ class KeHuListViewController: BaseViewController,UITableViewDelegate,UITableView
             cell.compenyLbl.text = rowModel.company
             cell.nameLbl.text = rowModel.cus_name
             cell.delegate = self
+            cell.cus_type = rowModel.cus_type!
+            cell.statusLbl2.isHidden = true
+            if rowModel.discounts_rate != 0 && rowModel.discounts_rate != 100{
+                cell.statusLbl2.isHidden = false
+                cell.statusLbl2.text = "\(rowModel.discounts_rate!)折"
+            }
+            cell.arrowImg.isHidden = true
+            cell.nameLbl2.isHidden = true
+            if rowModel.phone != nil {
+                cell.photoIcon.isHidden = false
+                cell.phoneNum = rowModel.phone!
+            }else{
+                cell.photoIcon.isHidden = true
+            }
+            
+            if rowModel.user_name != nil {
+                cell.nameLbl2.isHidden = false
+                cell.arrowImg.isHidden = false
+                cell.nameLbl2.text = rowModel.user_name!
+            }
+            
             return cell
         }
         let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndTFCell") as! TitleAndTFCell