修改铺货数量显示方式

GeliBusinessPlatform/Model/get_dbt_rule_model/getDbtRuleModel.swift

@@ -142,7 +142,8 @@ class supSpreadGoodsModel: Mappable {
 }
 class supSpreadGoodsTotalModel: Mappable {
   
-    var sum_goods : Int?//可铺商品总和
+    var sum_goods : Int?//已铺
+    var sum_goods2 : Int?//可铺
     var res :Array<supSpreadGoodsDataModel>?
     
     required init?( map: Map) {
@@ -150,6 +151,7 @@ class supSpreadGoodsTotalModel: Mappable {
     }
     func mapping(map: Map) {
         sum_goods <- map["sum_goods"]
+        sum_goods2 <- map["sum_goods2"]
         res <- map["res"]
     }
 }

GeliBusinessPlatform/View/AlertView/DistributorSettingAlertView.xib

@@ -21,7 +21,6 @@
                 <outlet property="payJueBtn" destination="puW-3j-GZy" id="tKT-TY-Eje"/>
                 <outlet property="payNumTypelbl" destination="acM-Ba-Vki" id="zmV-zH-M0d"/>
                 <outlet property="payTF" destination="Ysc-L7-nMy" id="En1-Zp-I2f"/>
-                <outlet property="percent_price_lbl" destination="oXq-yW-4YF" id="yoP-x7-g7s"/>
             </connections>
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
@@ -64,7 +63,7 @@
                                             <color key="textColor" name="标题字颜色"/>
                                             <nil key="highlightedColor"/>
                                         </label>
-                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="分销价格:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jKn-y5-ixC">
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="分销价格:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jKn-y5-ixC">
                                             <rect key="frame" x="15" y="68" width="56" height="19"/>
                                             <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
                                             <color key="textColor" name="标题字颜色"/>
@@ -152,15 +151,6 @@
                                                 </userDefinedRuntimeAttribute>
                                             </userDefinedRuntimeAttributes>
                                         </view>
-                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oXq-yW-4YF">
-                                            <rect key="frame" x="209" y="173" width="71" height="15"/>
-                                            <constraints>
-                                                <constraint firstAttribute="height" constant="15" id="mfZ-eM-ZTX"/>
-                                            </constraints>
-                                            <fontDescription key="fontDescription" type="system" pointSize="13"/>
-                                            <color key="textColor" name="密码错误字体颜色"/>
-                                            <nil key="highlightedColor"/>
-                                        </label>
                                     </subviews>
                                     <color key="backgroundColor" name="白色背景色"/>
                                     <constraints>
@@ -186,12 +176,9 @@
                                         <constraint firstAttribute="trailing" secondItem="QMk-dx-2zr" secondAttribute="trailing" constant="10" id="ecH-CC-gfR"/>
                                         <constraint firstItem="f2v-Db-np2" firstAttribute="centerY" secondItem="9SL-t2-xg8" secondAttribute="centerY" id="f3X-gx-xEz"/>
                                         <constraint firstItem="jKn-y5-ixC" firstAttribute="leading" secondItem="xBK-zg-doj" secondAttribute="leading" constant="15" id="nSW-iI-EmW"/>
-                                        <constraint firstItem="oXq-yW-4YF" firstAttribute="leading" secondItem="acM-Ba-Vki" secondAttribute="trailing" constant="10" id="oRJ-fa-Wr0"/>
                                         <constraint firstItem="QMk-dx-2zr" firstAttribute="centerY" secondItem="jKn-y5-ixC" secondAttribute="centerY" id="p6G-o9-C86"/>
-                                        <constraint firstAttribute="trailing" secondItem="oXq-yW-4YF" secondAttribute="trailing" constant="15" id="pBd-Ts-Ors"/>
                                         <constraint firstItem="qLO-Gc-A3W" firstAttribute="centerY" secondItem="o0f-Uf-X61" secondAttribute="centerY" id="pxP-3E-XFK"/>
                                         <constraint firstItem="f0i-Vm-UAy" firstAttribute="leading" secondItem="f2v-Db-np2" secondAttribute="trailing" constant="25" id="qvK-eL-hk6"/>
-                                        <constraint firstItem="oXq-yW-4YF" firstAttribute="centerY" secondItem="acM-Ba-Vki" secondAttribute="centerY" id="xkP-1R-dMu"/>
                                     </constraints>
                                 </view>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="N4C-9w-dcG">
@@ -325,9 +312,6 @@
         <namedColor name="9A9A9A">
             <color red="0.60392156862745094" green="0.60392156862745094" blue="0.60392156862745094" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
-        <namedColor name="密码错误字体颜色">
-            <color red="0.88999998569488525" green="0.27799999713897705" blue="0.27799999713897705" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-        </namedColor>
         <namedColor name="提示视图背景色">
             <color red="0.1803921568627451" green="0.1803921568627451" blue="0.1803921568627451" alpha="0.5" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>

GeliBusinessPlatform/ViewController/供应商分销商品管理/GYS_FX_Product_VC.swift

@@ -16,7 +16,7 @@ class GYS_FX_Product_VC: BaseViewController,UITableViewDelegate,UITableViewDataS
         let model = datas[idx]
         var action = 1
         var intro = "铺货成功~"
-        if bottom_title_lbl.text == "已铺货" {
+        if leftBtn.isSelected {
             action = 2
             intro = "取消成功~"
         }
@@ -32,8 +32,7 @@ class GYS_FX_Product_VC: BaseViewController,UITableViewDelegate,UITableViewDataS
     }
     
     @IBOutlet weak var center_select_btn: UIButton!
-    @IBOutlet weak var count_lbl: UILabel!//已铺货/可铺货 数量
-    @IBOutlet weak var bottom_title_lbl: UILabel!
+   
     @IBOutlet weak var rightBtn: UIButton!
     @IBOutlet weak var leftBtn: UIButton!
     
@@ -48,12 +47,12 @@ class GYS_FX_Product_VC: BaseViewController,UITableViewDelegate,UITableViewDataS
         if sender.tag == 0 {
             rightBtn.isSelected = false
             leftBtn.isSelected = true
-            bottom_title_lbl.text = "已铺货"
+//            bottom_title_lbl.text = "已铺货"
             
         }else{
             rightBtn.isSelected = true
             leftBtn.isSelected = false
-            bottom_title_lbl.text = "可铺货"
+//            bottom_title_lbl.text = "可铺货"
         }
         
         
@@ -107,7 +106,7 @@ class GYS_FX_Product_VC: BaseViewController,UITableViewDelegate,UITableViewDataS
         let vc = GYS_FX_SearchViewController()
         vc.shop_id = shop_id
         vc.UserToken = UserToken as! String
-        if bottom_title_lbl.text != "已铺货"{
+        if leftBtn.isSelected {
             vc.look_type = 2
         }
         cover_Btn.isHidden = true
@@ -196,9 +195,9 @@ class GYS_FX_Product_VC: BaseViewController,UITableViewDelegate,UITableViewDataS
         print("加载数据")
         page = 1
         isUpData = true
-        var look_type = 1
-        if bottom_title_lbl.text != "已铺货"{
-            look_type = 2
+        var look_type = 2
+        if leftBtn.isSelected {
+            look_type = 1
         }
         
         let dic = ["user_token":UserToken as Any,"retrieval":"" as Any,"page":page as Any,"look_type":look_type as Any,"shop_id":shop_id as Any]
@@ -213,11 +212,34 @@ class GYS_FX_Product_VC: BaseViewController,UITableViewDelegate,UITableViewDataS
             self.home_list_tbv.reloadData()
             self.home_list_tbv?.mj_header?.endRefreshing()
             self.page = 2
-            self.count_lbl.text = "0"
             
-            if model.data?.sum_goods != nil {
-                self.count_lbl.text = StringByInt(number: (model.data?.sum_goods!)!)
-            }
+          
+                if self.leftBtn.isSelected {
+                    if model.data?.sum_goods != 0 && model.data?.sum_goods != nil{
+                        self.leftBtn.setTitle("已铺货商品(" + StringByInt(number: (model.data?.sum_goods)!) + ")" , for: .selected)
+                    }else{
+                        self.leftBtn.setTitle("已铺货商品" , for: .selected)
+                    }
+                    
+                    if model.data?.sum_goods2 != 0 && model.data?.sum_goods2 != nil {
+                        self.rightBtn.setTitle("可铺货商品(" + StringByInt(number: (model.data?.sum_goods2)!) + ")" , for: .normal)
+                    }else{
+                        self.rightBtn.setTitle("可铺货商品" , for: .normal)
+                    }
+                }else{
+                    if model.data?.sum_goods != 0 && model.data?.sum_goods != nil{
+                        self.leftBtn.setTitle("已铺货商品(" + StringByInt(number: (model.data?.sum_goods)!) + ")" , for: .normal)
+                    }else{
+                        self.leftBtn.setTitle("已铺货商品" , for: .normal)
+                    }
+                    
+                    if model.data?.sum_goods2 != 0 && model.data?.sum_goods2 != nil {
+                        self.rightBtn.setTitle("可铺货商品(" + StringByInt(number: (model.data?.sum_goods2)!) + ")" , for: .selected)
+                    }else{
+                        self.rightBtn.setTitle("可铺货商品" , for: .selected)
+                    }
+                }
+            
             
             if model.data?.res?.count == 0  {
                 self.home_list_tbv?.mj_footer?.endRefreshingWithNoMoreData()
@@ -233,9 +255,9 @@ class GYS_FX_Product_VC: BaseViewController,UITableViewDelegate,UITableViewDataS
     @objc func loadMoreData(){
         print("加载更多数据")
         
-        var look_type = 1
-        if bottom_title_lbl.text != "已铺货"{
-            look_type = 2
+        var look_type = 2
+        if leftBtn.isSelected {
+            look_type = 1
         }
         
         let dic = ["user_token":UserToken as Any,"retrieval":"" as Any,"page":page as Any,"look_type":look_type as Any,"shop_id":shop_id as Any]
@@ -273,7 +295,7 @@ class GYS_FX_Product_VC: BaseViewController,UITableViewDelegate,UITableViewDataS
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         if tableView == home_list_tbv {
             let cell = tableView.dequeueReusableCell(withIdentifier: "GYS_FX_ProductCellTableViewCell") as! GYS_FX_ProductCellTableViewCell
-            if bottom_title_lbl.text == "已铺货"{
+            if leftBtn.isSelected {
                 cell.submitBtn.setTitle("取消铺货", for: .normal)
             }else{
                 cell.submitBtn.setTitle("铺货", for: .normal)

GeliBusinessPlatform/ViewController/供应商分销商品管理/GYS_FX_Product_VC.xib

@@ -13,10 +13,8 @@
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="GYS_FX_Product_VC" customModule="TestClass" customModuleProvider="target">
             <connections>
                 <outlet property="arrow_Img" destination="6p4-bG-ufu" id="xXL-E7-USo"/>
-                <outlet property="bottom_title_lbl" destination="Oh6-CW-i5P" id="Gz7-Wn-7J9"/>
                 <outlet property="center_Name_Lbl" destination="OQS-2V-AAD" id="X1a-bJ-2ip"/>
                 <outlet property="center_select_btn" destination="0qr-Av-AcW" id="UOK-rA-EFh"/>
-                <outlet property="count_lbl" destination="nTB-Bc-9hg" id="rXO-j1-x1W"/>
                 <outlet property="cover_Btn" destination="kdd-7R-LPi" id="4Go-yO-3vD"/>
                 <outlet property="home_list_tbv" destination="3LK-04-tLV" id="fJG-hs-MYs"/>
                 <outlet property="leftBtn" destination="mxN-nr-p7b" id="doL-Sd-gc3"/>
@@ -150,48 +148,8 @@
                         <constraint firstItem="Sw3-9w-Y9J" firstAttribute="leading" secondItem="OQS-2V-AAD" secondAttribute="trailing" constant="15" id="ySe-vL-Bds"/>
                     </constraints>
                 </view>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FeE-s9-kvq">
-                    <rect key="frame" x="0.0" y="450" width="320" height="30"/>
-                    <subviews>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nTB-Bc-9hg">
-                            <rect key="frame" x="156" y="7" width="8" height="16"/>
-                            <fontDescription key="fontDescription" type="system" pointSize="13"/>
-                            <color key="textColor" name="#F57575"/>
-                            <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="2OI-La-hUy">
-                            <rect key="frame" x="164" y="7" width="40" height="16"/>
-                            <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="Oh6-CW-i5P">
-                            <rect key="frame" x="116" y="7" width="40" height="16"/>
-                            <fontDescription key="fontDescription" type="system" pointSize="13"/>
-                            <color key="textColor" name="标题字颜色"/>
-                            <nil key="highlightedColor"/>
-                        </label>
-                    </subviews>
-                    <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                    <constraints>
-                        <constraint firstItem="2OI-La-hUy" firstAttribute="centerY" secondItem="nTB-Bc-9hg" secondAttribute="centerY" id="1bk-kJ-Vhq"/>
-                        <constraint firstAttribute="height" constant="30" id="1ex-2n-S8O"/>
-                        <constraint firstItem="nTB-Bc-9hg" firstAttribute="centerY" secondItem="FeE-s9-kvq" secondAttribute="centerY" id="2BW-6q-foc"/>
-                        <constraint firstItem="nTB-Bc-9hg" firstAttribute="centerX" secondItem="FeE-s9-kvq" secondAttribute="centerX" id="Cju-JU-W18"/>
-                        <constraint firstItem="nTB-Bc-9hg" firstAttribute="leading" secondItem="Oh6-CW-i5P" secondAttribute="trailing" id="LBb-LX-luX"/>
-                        <constraint firstItem="Oh6-CW-i5P" firstAttribute="centerY" secondItem="nTB-Bc-9hg" secondAttribute="centerY" id="YVT-vA-uS2"/>
-                        <constraint firstItem="2OI-La-hUy" firstAttribute="leading" secondItem="nTB-Bc-9hg" secondAttribute="trailing" id="qys-5S-eug"/>
-                    </constraints>
-                </view>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="0Go-H9-kch">
-                    <rect key="frame" x="0.0" y="449" width="320" height="1"/>
-                    <color key="backgroundColor" name="灰色分界线"/>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="1" id="7By-Ui-CUY"/>
-                    </constraints>
-                </view>
                 <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="3LK-04-tLV">
-                    <rect key="frame" x="0.0" y="93" width="320" height="356"/>
+                    <rect key="frame" x="0.0" y="93" width="320" height="387"/>
                     <color key="backgroundColor" name="app底色"/>
                 </tableView>
                 <button hidden="YES" opaque="NO" alpha="0.69999999999999996" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kdd-7R-LPi">
@@ -213,26 +171,20 @@
             <viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
             <color key="backgroundColor" systemColor="systemBackgroundColor"/>
             <constraints>
+                <constraint firstAttribute="bottom" secondItem="3LK-04-tLV" secondAttribute="bottom" id="1UD-Lz-c5u"/>
                 <constraint firstItem="XbF-u7-Fx8" firstAttribute="top" secondItem="lpa-OV-uRL" secondAttribute="bottom" id="44P-g5-LFE"/>
                 <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="3bn-WT-hnL" secondAttribute="trailing" id="8db-5g-eKL"/>
-                <constraint firstItem="0Go-H9-kch" firstAttribute="top" secondItem="3LK-04-tLV" secondAttribute="bottom" id="EGZ-9T-Ccm"/>
-                <constraint firstItem="fnl-2z-Ty3" firstAttribute="bottom" secondItem="FeE-s9-kvq" secondAttribute="bottom" id="GHR-bb-S4g"/>
                 <constraint firstItem="kdd-7R-LPi" firstAttribute="top" secondItem="XbF-u7-Fx8" secondAttribute="bottom" id="HNi-PN-t8F"/>
                 <constraint firstItem="3bn-WT-hnL" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="IgD-Vn-sTn"/>
                 <constraint firstItem="XbF-u7-Fx8" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="Jdk-wZ-eka"/>
                 <constraint firstAttribute="bottom" secondItem="kdd-7R-LPi" secondAttribute="bottom" id="K62-Me-sng"/>
                 <constraint firstItem="3bn-WT-hnL" firstAttribute="top" secondItem="XbF-u7-Fx8" secondAttribute="bottom" id="Mgr-9Y-PPn"/>
                 <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="lpa-OV-uRL" secondAttribute="trailing" id="NTN-9A-7Ls"/>
-                <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="0Go-H9-kch" secondAttribute="trailing" id="PBk-Wa-ddT"/>
                 <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="3LK-04-tLV" secondAttribute="trailing" id="PsD-fU-Cij"/>
-                <constraint firstItem="FeE-s9-kvq" firstAttribute="top" secondItem="0Go-H9-kch" secondAttribute="bottom" id="WdD-7B-Pdo"/>
                 <constraint firstItem="lpa-OV-uRL" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="Wge-K8-vU3"/>
                 <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="XbF-u7-Fx8" secondAttribute="trailing" id="Y1v-5B-J3N"/>
-                <constraint firstItem="FeE-s9-kvq" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="d2G-Rz-lw5"/>
                 <constraint firstItem="kdd-7R-LPi" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="dKl-00-PcL"/>
                 <constraint firstItem="kdd-7R-LPi" firstAttribute="trailing" secondItem="fnl-2z-Ty3" secondAttribute="trailing" id="f8C-4p-JMc"/>
-                <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="FeE-s9-kvq" secondAttribute="trailing" id="fQw-Y7-Txs"/>
-                <constraint firstItem="0Go-H9-kch" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="gwk-r5-icJ"/>
                 <constraint firstItem="lpa-OV-uRL" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" id="h4P-l1-nNm"/>
                 <constraint firstItem="3LK-04-tLV" firstAttribute="top" secondItem="XbF-u7-Fx8" secondAttribute="bottom" id="qHC-09-2ER"/>
                 <constraint firstItem="3LK-04-tLV" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="yZN-Yu-AtQ"/>
@@ -243,9 +195,6 @@
     <resources>
         <image name="icon_pilingzhongxin" width="19" height="18.5"/>
         <image name="up_blue" width="11.5" height="6"/>
-        <namedColor name="#F57575">
-            <color red="0.96100002527236938" green="0.45899999141693115" blue="0.45899999141693115" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-        </namedColor>
         <namedColor name="app底色">
             <color red="0.94509803921568625" green="0.94509803921568625" blue="0.94509803921568625" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
@@ -258,9 +207,6 @@
         <namedColor name="标题字颜色">
             <color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
-        <namedColor name="灰色分界线">
-            <color red="0.92941176470588238" green="0.92941176470588238" blue="0.92941176470588238" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-        </namedColor>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>