UI补充

GeliBusinessPlatform/ViewController/分销员管理/FXYGL_Cell.swift

@@ -15,6 +15,7 @@ class FXYGL_Cell: UITableViewCell {
     @IBAction func cancel_contract_action(_ sender: UIButton) {
         delegate?.FXYGL_CellCancel_Contract(num: self.tag)
     }
+    @IBOutlet weak var typeLbl: UILabel!
     @IBOutlet weak var count_lbl: UILabel!
     @IBOutlet weak var time_lbl: UILabel!
     @IBOutlet weak var money_lbl: UILabel!

GeliBusinessPlatform/ViewController/分销员管理/FXYGL_Cell.xib

@@ -32,18 +32,21 @@
                         </userDefinedRuntimeAttributes>
                     </view>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LTB-jJ-brb">
-                        <rect key="frame" x="25" y="24.5" width="280" height="0.0"/>
+                        <rect key="frame" x="25" y="24.5" width="0.0" height="0.0"/>
                         <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="13"/>
                         <color key="textColor" name="标题字颜色"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="jinru" translatesAutoresizingMaskIntoConstraints="NO" id="OSY-lr-AtN">
-                        <rect key="frame" x="301" y="19.5" width="4" height="9.5"/>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" (内部员工)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dTg-T6-K8O">
+                        <rect key="frame" x="25" y="15" width="65" height="19"/>
                         <constraints>
-                            <constraint firstAttribute="width" constant="4" id="Bb2-JP-sTl"/>
-                            <constraint firstAttribute="height" constant="9.5" id="fqg-Ow-EQP"/>
+                            <constraint firstAttribute="height" constant="19" id="06C-3R-OQb"/>
+                            <constraint firstAttribute="width" constant="65" id="MdR-Tt-5Hb"/>
                         </constraints>
-                    </imageView>
+                        <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" 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="BCP-Y0-f5N">
                         <rect key="frame" x="15" y="68.5" width="65" height="19"/>
                         <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
@@ -109,23 +112,23 @@
                     </view>
                 </subviews>
                 <constraints>
-                    <constraint firstAttribute="trailing" secondItem="OSY-lr-AtN" secondAttribute="trailing" constant="15" id="1Xb-jH-Sno"/>
                     <constraint firstItem="Joj-gd-Rns" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="18" id="5Cy-hX-zMw"/>
                     <constraint firstItem="LTB-jJ-brb" firstAttribute="centerY" secondItem="Joj-gd-Rns" secondAttribute="centerY" id="5ys-fM-ILn"/>
                     <constraint firstItem="Qdu-4Y-Gya" firstAttribute="leading" secondItem="BCP-Y0-f5N" secondAttribute="trailing" id="73V-vl-Kaf"/>
                     <constraint firstItem="xt7-ct-Qh8" firstAttribute="top" secondItem="BCP-Y0-f5N" secondAttribute="bottom" constant="10" id="7zd-BP-gcA"/>
                     <constraint firstItem="Joj-gd-Rns" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="BJG-40-jsZ"/>
                     <constraint firstItem="1i5-QO-HEu" firstAttribute="leading" secondItem="Kmc-7o-JwY" secondAttribute="trailing" id="C0Y-Ar-fSu"/>
-                    <constraint firstItem="OSY-lr-AtN" firstAttribute="centerY" secondItem="LTB-jJ-brb" secondAttribute="centerY" id="J1u-pV-aZz"/>
+                    <constraint firstItem="dTg-T6-K8O" firstAttribute="leading" secondItem="LTB-jJ-brb" secondAttribute="trailing" id="Lyf-pp-TDd"/>
                     <constraint firstItem="BCP-Y0-f5N" firstAttribute="top" secondItem="Kmc-7o-JwY" secondAttribute="bottom" constant="10" id="OJl-cO-QUs"/>
                     <constraint firstItem="1i5-QO-HEu" firstAttribute="centerY" secondItem="Kmc-7o-JwY" secondAttribute="centerY" id="OTF-cD-vbw"/>
-                    <constraint firstItem="OSY-lr-AtN" firstAttribute="trailing" secondItem="LTB-jJ-brb" secondAttribute="trailing" id="RN2-N4-eWn"/>
                     <constraint firstItem="LTB-jJ-brb" firstAttribute="leading" secondItem="Joj-gd-Rns" secondAttribute="trailing" constant="7" id="XdC-Qb-OCM"/>
                     <constraint firstItem="xt7-ct-Qh8" firstAttribute="leading" secondItem="BCP-Y0-f5N" secondAttribute="leading" id="ZWF-cn-4Ry"/>
                     <constraint firstItem="Qdu-4Y-Gya" firstAttribute="centerY" secondItem="BCP-Y0-f5N" secondAttribute="centerY" id="cka-we-dpq"/>
                     <constraint firstItem="xed-U0-QYD" firstAttribute="centerY" secondItem="xt7-ct-Qh8" secondAttribute="centerY" id="erO-08-sm9"/>
+                    <constraint firstItem="dTg-T6-K8O" firstAttribute="centerY" secondItem="LTB-jJ-brb" secondAttribute="centerY" id="f75-hn-4OE"/>
                     <constraint firstAttribute="trailing" secondItem="VGg-je-wQh" secondAttribute="trailing" id="fRP-z7-A3Y"/>
                     <constraint firstItem="JSM-eB-GI5" firstAttribute="centerX" secondItem="hRt-KC-Zeu" secondAttribute="centerX" id="iLP-9r-jmo"/>
+                    <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="dTg-T6-K8O" secondAttribute="trailing" constant="15" id="iVb-PG-2uH"/>
                     <constraint firstItem="Kmc-7o-JwY" firstAttribute="leading" secondItem="Joj-gd-Rns" secondAttribute="leading" id="lAg-lR-tDA"/>
                     <constraint firstItem="BCP-Y0-f5N" firstAttribute="leading" secondItem="Kmc-7o-JwY" secondAttribute="leading" id="n1T-kI-hBu"/>
                     <constraint firstItem="Kmc-7o-JwY" firstAttribute="top" secondItem="LTB-jJ-brb" secondAttribute="bottom" constant="15" id="naL-iX-h6Z"/>
@@ -143,12 +146,12 @@
                 <outlet property="money_lbl" destination="1i5-QO-HEu" id="bLJ-jx-Jwv"/>
                 <outlet property="name_lbl" destination="LTB-jJ-brb" id="4Fs-lX-yHq"/>
                 <outlet property="time_lbl" destination="Qdu-4Y-Gya" id="2RK-XE-FJj"/>
+                <outlet property="typeLbl" destination="dTg-T6-K8O" id="Y27-Hy-Q6k"/>
             </connections>
             <point key="canvasLocation" x="140.57971014492756" y="84.709821428571431"/>
         </tableViewCell>
     </objects>
     <resources>
-        <image name="jinru" width="13" height="23"/>
         <namedColor name="多选按钮字体颜色">
             <color red="0.41176470588235292" green="0.41176470588235292" blue="0.41176470588235292" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>

GeliBusinessPlatform/ViewController/分销员管理/FXYGL_ViewController.swift

@@ -110,7 +110,12 @@ class FXYGL_ViewController: BaseViewController, UISearchBarDelegate, SearchBarVi
         let cell = tableView.dequeueReusableCell(withIdentifier: "FXYGL_Cell") as! FXYGL_Cell
         cell.tag = indexPath.row
         let model = dataArr[indexPath.row]
-        cell.name_lbl.text = model.user_name
+        var typeStr = " (内部员工)"
+        if model.type == 1 {
+            typeStr = " (外部员工)"
+        }
+        cell.typeLbl.text = typeStr
+        cell.name_lbl.text = model.user_name!
         cell.count_lbl.text = StringByInt(number: model.count_customers!)
         cell.money_lbl.text = String(format: "%.02f", model.sum_in_amount!)
         cell.time_lbl.text = model.update_time

GeliBusinessPlatform/ViewController/待审核分销员/DSHFXY_Cell.swift

@@ -15,6 +15,7 @@ class DSHFXY_Cell: UITableViewCell {
     @IBAction func cellAction(_ sender: UIButton) {
         delegate?.DSHFXY_Cell_Choice(num: sender.tag,cell:self)
     }
+    @IBOutlet weak var phone_lbl: UILabel!
     @IBOutlet weak var way_lbl: UILabel!
     @IBOutlet weak var time_lbl: UILabel!
     @IBOutlet weak var name_lbl: UILabel!

GeliBusinessPlatform/ViewController/待审核分销员/DSHFXY_Cell.xib

@@ -30,7 +30,7 @@
                                 </constraints>
                             </imageView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sSO-iZ-15g">
-                                <rect key="frame" x="40" y="23.5" width="235" height="0.0"/>
+                                <rect key="frame" x="40" y="23.5" width="0.0" height="0.0"/>
                                 <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
                                 <color key="textColor" name="标题字颜色"/>
                                 <nil key="highlightedColor"/>
@@ -103,9 +103,20 @@
                                     <constraint firstAttribute="width" constant="1" id="rLP-xB-Ujg"/>
                                 </constraints>
                             </view>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="N7Z-bq-GnR">
+                                <rect key="frame" x="40" y="14.5" width="96" height="18.5"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="96" id="et9-sm-NKt"/>
+                                    <constraint firstAttribute="height" constant="18.5" id="new-EE-RGb"/>
+                                </constraints>
+                                <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
                         </subviews>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
+                            <constraint firstItem="N7Z-bq-GnR" firstAttribute="centerY" secondItem="sSO-iZ-15g" secondAttribute="centerY" id="92l-sh-jw9"/>
                             <constraint firstItem="wdg-qV-Q32" firstAttribute="top" secondItem="ac4-7n-qnV" secondAttribute="bottom" constant="10" id="9Af-5p-wsg"/>
                             <constraint firstAttribute="bottom" secondItem="ao2-nJ-41J" secondAttribute="bottom" id="BNf-C1-y6H"/>
                             <constraint firstItem="ac4-7n-qnV" firstAttribute="leading" secondItem="vbo-ra-lK1" secondAttribute="leading" constant="10" id="Cz8-BY-iZs"/>
@@ -125,7 +136,7 @@
                             <constraint firstItem="ao2-nJ-41J" firstAttribute="top" secondItem="NmW-AL-F9J" secondAttribute="bottom" id="b6f-ys-qKF"/>
                             <constraint firstAttribute="bottom" secondItem="NmW-AL-F9J" secondAttribute="bottom" constant="49" id="ccI-vp-NIr"/>
                             <constraint firstItem="XTT-9N-8Hz" firstAttribute="leading" secondItem="vbo-ra-lK1" secondAttribute="leading" constant="15" id="cet-RD-93r"/>
-                            <constraint firstAttribute="trailing" secondItem="sSO-iZ-15g" secondAttribute="trailing" constant="15" id="ioz-B8-rk2"/>
+                            <constraint firstItem="N7Z-bq-GnR" firstAttribute="leading" secondItem="sSO-iZ-15g" secondAttribute="trailing" id="eom-9q-Zl9"/>
                             <constraint firstItem="XTT-9N-8Hz" firstAttribute="top" secondItem="vbo-ra-lK1" secondAttribute="top" constant="15" id="jX5-iq-d6h"/>
                             <constraint firstItem="dpm-YA-lkq" firstAttribute="leading" secondItem="ao2-nJ-41J" secondAttribute="trailing" id="n4R-LZ-rRG"/>
                             <constraint firstItem="NmW-AL-F9J" firstAttribute="leading" secondItem="vbo-ra-lK1" secondAttribute="leading" id="naT-yh-4MV"/>
@@ -136,6 +147,7 @@
                             <constraint firstItem="dpm-YA-lkq" firstAttribute="width" secondItem="ao2-nJ-41J" secondAttribute="width" id="xTG-PT-B4g"/>
                             <constraint firstItem="iFj-hl-97T" firstAttribute="leading" secondItem="wdg-qV-Q32" secondAttribute="trailing" id="xVZ-SY-XA0"/>
                             <constraint firstItem="wdg-qV-Q32" firstAttribute="leading" secondItem="vbo-ra-lK1" secondAttribute="leading" constant="15" id="xgZ-si-Mou"/>
+                            <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="N7Z-bq-GnR" secondAttribute="trailing" constant="15" id="yoa-ub-wqW"/>
                         </constraints>
                         <userDefinedRuntimeAttributes>
                             <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
@@ -155,6 +167,7 @@
             <viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
             <connections>
                 <outlet property="name_lbl" destination="sSO-iZ-15g" id="7DA-Xg-IYk"/>
+                <outlet property="phone_lbl" destination="N7Z-bq-GnR" id="Bjc-Gw-XiG"/>
                 <outlet property="time_lbl" destination="iFj-hl-97T" id="DAE-Je-Rc1"/>
                 <outlet property="way_lbl" destination="ROS-Fs-rpS" id="tyq-wW-5N6"/>
             </connections>

GeliBusinessPlatform/ViewController/待审核分销员/DSHFXY_ViewController.swift

@@ -61,6 +61,9 @@ class DSHFXY_ViewController: BaseViewController, HeaderSelectViewDelegate, TimeS
         let model = dataArr[indexPath.row]
         cell.name_lbl.text = model.user_name
         cell.time_lbl.text = model.create_time
+        if model.phone!.count > 0 {
+            cell.phone_lbl.text = " (" + model.phone! + ")"
+        }
         switch model.from {
         case 1:
             cell.way_lbl.text = "小程序"