变更供应商分销商品管理结构

GeliBusinessPlatform.xcodeproj/project.pbxproj

@@ -184,6 +184,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 */; };
+		E07337F82579E8660039767A /* GYS_FX_Product_ListVc.swift in Sources */ = {isa = PBXBuildFile; fileRef = E07337F62579E8660039767A /* GYS_FX_Product_ListVc.swift */; };
+		E07337F92579E8660039767A /* GYS_FX_Product_ListVc.xib in Resources */ = {isa = PBXBuildFile; fileRef = E07337F72579E8660039767A /* GYS_FX_Product_ListVc.xib */; };
 		E074B69C24DD305600777003 /* TitleHeaderCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E074B69A24DD305500777003 /* TitleHeaderCell.swift */; };
 		E074B69D24DD305600777003 /* TitleHeaderCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E074B69B24DD305500777003 /* TitleHeaderCell.xib */; };
 		E077DC5F255124B8000B0DA5 /* GYS_HZ_Vc.swift in Sources */ = {isa = PBXBuildFile; fileRef = E077DC5D255124B8000B0DA5 /* GYS_HZ_Vc.swift */; };
@@ -850,6 +852,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>"; };
+		E07337F62579E8660039767A /* GYS_FX_Product_ListVc.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GYS_FX_Product_ListVc.swift; sourceTree = "<group>"; };
+		E07337F72579E8660039767A /* GYS_FX_Product_ListVc.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GYS_FX_Product_ListVc.xib; 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>"; };
 		E077DC5D255124B8000B0DA5 /* GYS_HZ_Vc.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GYS_HZ_Vc.swift; sourceTree = "<group>"; };
@@ -2335,6 +2339,8 @@
 				E0AD92E82550E50500D82C17 /* GYS_FX_Product_VC.xib */,
 				E0AD92F72550FD1500D82C17 /* GYS_FX_SearchViewController.swift */,
 				E0AD92F82550FD1500D82C17 /* GYS_FX_SearchViewController.xib */,
+				E07337F62579E8660039767A /* GYS_FX_Product_ListVc.swift */,
+				E07337F72579E8660039767A /* GYS_FX_Product_ListVc.xib */,
 			);
 			path = "供应商分销商品管理";
 			sourceTree = "<group>";
@@ -3512,6 +3518,7 @@
 				F961D26F245015D6007FBE70 /* SelectContentView.xib in Resources */,
 				F96E9D60246657B500B5B94A /* HGImage.xcassets in Resources */,
 				E0206329246CD855007A40C4 /* TitleAndLblView.xib in Resources */,
+				E07337F92579E8660039767A /* GYS_FX_Product_ListVc.xib in Resources */,
 				E0AD92FA2550FD1500D82C17 /* GYS_FX_SearchViewController.xib in Resources */,
 				F961D27524503CCF007FBE70 /* OrderSelectMoreView.xib in Resources */,
 				E074B69D24DD305600777003 /* TitleHeaderCell.xib in Resources */,
@@ -3697,6 +3704,7 @@
 				E020632B246CDD36007A40C4 /* OrderDViewFooterView.swift in Sources */,
 				F950FDDE24518B9500C40530 /* FSCalendarWeekdayView.m in Sources */,
 				F9A4AB6E24C927E900094BD1 /* LogisticsCostDetailViewController.swift in Sources */,
+				E07337F82579E8660039767A /* GYS_FX_Product_ListVc.swift in Sources */,
 				E0BE8A7F245A740600E80134 /* ChengGongCell.swift in Sources */,
 				E02DDD90244FE54C00ABB707 /* NewCreateHeader.swift in Sources */,
 				E0228BB0246FDA9A005812FA /* TitleAndLblCell.swift in Sources */,

GeliBusinessPlatform/View/AlertView/DistributorSettingAlertView.swift

@@ -26,7 +26,6 @@ class DistributorSettingAlertView: UIView {
                 canYuBtn.isSelected = false
                 nonCanYuBtn.isSelected = true
                 cover_view.isHidden = true
-                
             }else{
                 canYuBtn .setImage(UIImage.init(named: "yuxuan"), for: .normal)
                 nonCanYuBtn .setImage(UIImage.init(named: "daixuan"), for: .normal)

GeliBusinessPlatform/View/AlertView/DistributorSettingAlertView.xib

@@ -21,6 +21,7 @@
                 <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="wdb-FY-6e4" id="p3T-cd-yxd"/>
             </connections>
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
@@ -63,7 +64,7 @@
                                             <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="jKn-y5-ixC">
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="253" 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="标题字颜色"/>
@@ -85,8 +86,12 @@
                                                 </userDefinedRuntimeAttribute>
                                             </userDefinedRuntimeAttributes>
                                         </textField>
-                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="%" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="acM-Ba-Vki">
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="%" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="acM-Ba-Vki">
                                             <rect key="frame" x="186" y="171" width="13" height="19"/>
+                                            <constraints>
+                                                <constraint firstAttribute="height" constant="19" id="D7k-P8-osO"/>
+                                                <constraint firstAttribute="width" constant="13" id="rbq-A8-0ov"/>
+                                            </constraints>
                                             <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
                                             <color key="textColor" name="标题字颜色"/>
                                             <nil key="highlightedColor"/>
@@ -151,11 +156,21 @@
                                                 </userDefinedRuntimeAttribute>
                                             </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="wdb-FY-6e4">
+                                            <rect key="frame" x="209" y="173" width="76" height="15"/>
+                                            <constraints>
+                                                <constraint firstAttribute="height" constant="15" id="Ruu-QT-mwo"/>
+                                            </constraints>
+                                            <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                                            <color key="textColor" name="#F57575"/>
+                                            <nil key="highlightedColor"/>
+                                        </label>
                                     </subviews>
                                     <color key="backgroundColor" name="白色背景色"/>
                                     <constraints>
                                         <constraint firstItem="f0i-Vm-UAy" firstAttribute="centerY" secondItem="9SL-t2-xg8" secondAttribute="centerY" id="1BQ-zG-s62"/>
                                         <constraint firstItem="NX8-9C-0fE" firstAttribute="leading" secondItem="hmc-1R-guq" secondAttribute="trailing" constant="10" id="310-ha-ida"/>
+                                        <constraint firstItem="wdb-FY-6e4" firstAttribute="leading" secondItem="acM-Ba-Vki" secondAttribute="trailing" constant="10" id="4cR-mN-YwI"/>
                                         <constraint firstItem="jKn-y5-ixC" firstAttribute="top" secondItem="9SL-t2-xg8" secondAttribute="bottom" constant="34" id="765-h9-jN3"/>
                                         <constraint firstItem="acM-Ba-Vki" firstAttribute="leading" secondItem="Ysc-L7-nMy" secondAttribute="trailing" constant="10" id="7qr-Vt-NUk"/>
                                         <constraint firstItem="f2v-Db-np2" firstAttribute="leading" secondItem="9SL-t2-xg8" secondAttribute="trailing" constant="15" id="8Ez-1B-g3G"/>
@@ -166,6 +181,7 @@
                                         <constraint firstItem="9SL-t2-xg8" firstAttribute="top" secondItem="xBK-zg-doj" secondAttribute="top" constant="15" id="ID1-xU-I44"/>
                                         <constraint firstItem="acM-Ba-Vki" firstAttribute="bottom" secondItem="Ysc-L7-nMy" secondAttribute="bottom" id="JNs-V5-tiN"/>
                                         <constraint firstItem="hmc-1R-guq" firstAttribute="centerY" secondItem="jKn-y5-ixC" secondAttribute="centerY" id="Jv6-D0-t7A"/>
+                                        <constraint firstItem="wdb-FY-6e4" firstAttribute="centerY" secondItem="acM-Ba-Vki" secondAttribute="centerY" id="JxK-w8-3B0"/>
                                         <constraint firstItem="o0f-Uf-X61" firstAttribute="leading" secondItem="xBK-zg-doj" secondAttribute="leading" constant="15" id="L7R-fU-rcO"/>
                                         <constraint firstItem="qLO-Gc-A3W" firstAttribute="leading" secondItem="o0f-Uf-X61" secondAttribute="trailing" constant="15" id="Orv-1C-dcV"/>
                                         <constraint firstItem="hmc-1R-guq" firstAttribute="leading" secondItem="jKn-y5-ixC" secondAttribute="trailing" constant="15" id="VPd-Lb-Ogv"/>
@@ -178,6 +194,7 @@
                                         <constraint firstItem="jKn-y5-ixC" firstAttribute="leading" secondItem="xBK-zg-doj" secondAttribute="leading" constant="15" id="nSW-iI-EmW"/>
                                         <constraint firstItem="QMk-dx-2zr" firstAttribute="centerY" secondItem="jKn-y5-ixC" secondAttribute="centerY" id="p6G-o9-C86"/>
                                         <constraint firstItem="qLO-Gc-A3W" firstAttribute="centerY" secondItem="o0f-Uf-X61" secondAttribute="centerY" id="pxP-3E-XFK"/>
+                                        <constraint firstItem="wdb-FY-6e4" firstAttribute="trailing" secondItem="QMk-dx-2zr" secondAttribute="trailing" id="qPc-DL-kuI"/>
                                         <constraint firstItem="f0i-Vm-UAy" firstAttribute="leading" secondItem="f2v-Db-np2" secondAttribute="trailing" constant="25" id="qvK-eL-hk6"/>
                                     </constraints>
                                 </view>
@@ -309,6 +326,9 @@
     <resources>
         <image name="daixuan" width="19" height="19"/>
         <image name="yuxuan" width="19" height="19"/>
+        <namedColor name="#F57575">
+            <color red="0.96100002527236938" green="0.45899999141693115" blue="0.45899999141693115" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </namedColor>
         <namedColor name="9A9A9A">
             <color red="0.60392156862745094" green="0.60392156862745094" blue="0.60392156862745094" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>

GeliBusinessPlatform/View/AlertView/GLAlertTbAddView.swift

@@ -15,7 +15,6 @@ class GLAlertTbAddView: UIView,UITableViewDelegate,UITableViewDataSource,GLAlert
             if is_gys{
                 title_lbl.text = "新增供应商"
             }
-            loadData()
         }
     }
     let UserToken = UserDefaults.standard.value(forKey: "user_token")
@@ -36,39 +35,19 @@ class GLAlertTbAddView: UIView,UITableViewDelegate,UITableViewDataSource,GLAlert
     
     
     
-    func loadData(){
-        HUD.flash(.progress)
-        if is_gys {
-            if gys_centers.count == 0 {
-                    getSupShop(["user_token":UserToken as Any]) { (data) in
-                        let model = data as! getSupShopModel
-                        model.data?.forEach({ (item) in
-                            self.gys_centers.append(item)
-                        })
-                        self.bottom_tableview.reloadData()
-                        HUD.hide()
-                    } failture: { (err) in
-                }
-            }
-            return
-        }else{
-            if centers.count == 0 {
-                getAllShop(["user_token":UserToken as Any]) { (data) in
-                        let model = data as! getAllShopModel
-                        model.data?.forEach({ (item) in
-                            self.centers.append(item)
-                        })
-                        self.bottom_tableview.reloadData()
-                        HUD.hide()
-                    } failture: { (err) in
-                        
-                    
-                }
-            }
+    
+    var centers:Array<getAllShopDataModel> = []{
+        didSet{
+            print(centers.count,gys_centers.count)
+            bottom_tableview.reloadData()
+        }
+    }
+    var gys_centers:Array<getSupShopDataModel> = []{
+        didSet{
+            print(centers.count,gys_centers.count)
+            bottom_tableview.reloadData()
         }
     }
-    var centers:Array<getAllShopDataModel> = []
-    var gys_centers:Array<getSupShopDataModel> = []
     var datas:Array<String> = [""]
     @IBOutlet weak var center_view_height: NSLayoutConstraint!
     

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

+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17156" 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="17125"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="GYS_FX_Product_ListVc" customModule="TestClass" customModuleProvider="target">
+            <connections>
+                <outlet property="contentV" destination="ykd-qP-rIi" id="1L5-IW-z1a"/>
+                <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
+            </connections>
+        </placeholder>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
+            <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ykd-qP-rIi">
+                    <rect key="frame" x="0.0" y="44" width="414" height="818"/>
+                    <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                </view>
+            </subviews>
+            <viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
+            <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+            <constraints>
+                <constraint firstItem="ykd-qP-rIi" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" id="FdE-sU-hOR"/>
+                <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="ykd-qP-rIi" secondAttribute="trailing" id="UKk-oE-mPt"/>
+                <constraint firstItem="fnl-2z-Ty3" firstAttribute="bottom" secondItem="ykd-qP-rIi" secondAttribute="bottom" id="dVT-NB-9eO"/>
+                <constraint firstItem="ykd-qP-rIi" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="pyX-Q1-KPs"/>
+            </constraints>
+            <point key="canvasLocation" x="141" y="94"/>
+        </view>
+    </objects>
+    <resources>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+    </resources>
+</document>

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

@@ -137,7 +137,7 @@ class GYS_FX_SearchViewController: BaseViewController,UITableViewDelegate,UITabl
         print("加载数据")
         page = 1
 
-        let dic = ["user_token":UserToken as Any,"retrieval":keyword as Any,"page":page as Any,"look_type":look_type as Any,"shop_id":shop_id as Any]
+        let dic = ["user_token":UserToken as Any,"keyword":keyword as Any,"page":page as Any,"look_type":look_type as Any,"shop_id":shop_id as Any]
         
         supSpreadGoods(dic) { (data) in
             
@@ -163,7 +163,7 @@ class GYS_FX_SearchViewController: BaseViewController,UITableViewDelegate,UITabl
     @objc func loadMoreData(){
         print("加载更多数据")
         
-        let dic = ["user_token":UserToken as Any,"retrieval":keyword as Any,"page":page as Any,"look_type":look_type as Any,"shop_id":shop_id as Any]
+        let dic = ["user_token":UserToken as Any,"keyword":keyword as Any,"page":page as Any,"look_type":look_type as Any,"shop_id":shop_id as Any]
         supSpreadGoods(dic, success: { (data) in
             let model = data  as! supSpreadGoodsModel
             if model.data?.res?.count == 0 || model.data?.res == nil {

GeliBusinessPlatform/ViewController/供应商合作管理/GYS_HZ_Vc.swift

@@ -44,16 +44,68 @@ class GYS_HZ_Vc: BaseViewController,UITableViewDelegate,UITableViewDataSource, U
         self.view.window?.addSubview(alertView)
     }
     
-    func rightBtnClick() {
-        print("新增店铺")//GLAlertTbAddView
-        let alertView = GLAlertTbAddView(frame: self.view.bounds)
-        alertView.bottom_tableview.isHidden = true
-        if title_str != "分销商管理" {
-            alertView.is_gys = true
+    var centers:Array<getAllShopDataModel> = []
+    var gys_centers:Array<getSupShopDataModel> = []
+    
+    var is_gys = true
+    
+    func loadCenterData(){
+        HUD.flash(.progress)
+        if is_gys {
+            
+            if gys_centers.count == 0 {
+                    getSupShop(["user_token":UserToken as Any]) { (data) in
+                        let model = data as! getSupShopModel
+                        model.data?.forEach({ (item) in
+                            self.gys_centers.append(item)
+                        })
+                        
+                        HUD.hide()
+                        let alertView = GLAlertTbAddView(frame: self.view.bounds)
+                        alertView.is_gys = self.is_gys
+                        alertView.bottom_tableview.isHidden = true
+                        alertView.gys_centers = self.gys_centers
+                        self.view.addSubview(alertView)
+                    } failture: { (err) in
+                }
+            }else{
+                let alertView = GLAlertTbAddView(frame: self.view.bounds)
+                alertView.bottom_tableview.isHidden = true
+                alertView.is_gys = self.is_gys
+                alertView.gys_centers = self.gys_centers
+                self.view.addSubview(alertView)
+            }
+            return
         }else{
-            alertView.is_gys = false
+            if centers.count == 0 {
+                getAllShop(["user_token":UserToken as Any]) { (data) in
+                        let model = data as! getAllShopModel
+                        model.data?.forEach({ (item) in
+                            self.centers.append(item)
+                        })
+                    let alertView = GLAlertTbAddView(frame: self.view.bounds)
+                    alertView.bottom_tableview.isHidden = true
+                    alertView.centers = self.centers
+                    alertView.is_gys = self.is_gys
+                    self.view.addSubview(alertView)
+                        HUD.hide()
+                    } failture: { (err) in
+                }
+            }else{
+                let alertView = GLAlertTbAddView(frame: self.view.bounds)
+                alertView.bottom_tableview.isHidden = true
+                alertView.centers = self.centers
+                alertView.is_gys = self.is_gys
+                self.view.addSubview(alertView)
+            }
         }
-        self.view.addSubview(alertView)
+    }
+    
+    
+    func rightBtnClick() {
+        print("新增店铺")//GLAlertTbAddView
+        loadCenterData()
+        
     }
     
     func searchBarSearchButtonClicked(_ searchBar: UISearchBar) {
@@ -117,9 +169,10 @@ class GYS_HZ_Vc: BaseViewController,UITableViewDelegate,UITableViewDataSource, U
         if title_str == "分销商管理" {
             navbar.rightTitle = "新增店铺"
             holder_str = "请输入分销商名称"
-            
+            is_gys = false
         }else{
             navbar.rightTitle = "新增供应商"
+            is_gys = true
         }
         
         searchBr.placeholderStr = holder_str
@@ -144,6 +197,8 @@ class GYS_HZ_Vc: BaseViewController,UITableViewDelegate,UITableViewDataSource, U
         self.home_list_tbv.mj_header?.beginRefreshing()
         
         NotificationCenter.default.addObserver(self, selector: #selector(getNoti(noti:)), name: NSNotification.Name(rawValue: "haveAdd"), object: nil)
+        
+        
     }
     deinit {
         /// 移除通知

GeliBusinessPlatform/ViewController/分销商品管理/FX_Product_GuanLiVC.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17506" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17156" 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="17505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17125"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>

GeliBusinessPlatform/ViewController/分销订单管理/RetailListMgVC.swift

@@ -129,13 +129,14 @@ class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchB
     }
     //MARK:--HeaderSelectView
     let changeBgView = UIView()
-    var startTime :Int? = 0
-    var endTime :Int? = 0
+   
     weak var selectV: HeaderSelectView! = nil
     var showSelectvIndex = 0
+    var selectIndexArr = [0,0,0]
     weak var showSelectV: SelectContentView! = nil
     weak var timeShowDView: TimeShowDownView! = nil
-    var selectIndexArr = [0,0,0]
+    var startTime :Int? = 0
+    var endTime :Int? = 0
     func initHeaderSelectView() {
         contentV.addSubview(changeBgView)
         changeBgView.snp.makeConstraints { (make) in
@@ -254,7 +255,7 @@ class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchB
         vc.listView.mj_header?.beginRefreshing()
  
     }
-    
+   
     //MARK:---滚动选择
     var selectIndex = 0
     func pagingViewController(_ pagingViewController: PagingViewController, didScrollToItem pagingItem: PagingItem, startingViewController: UIViewController?, destinationViewController: UIViewController, transitionSuccessful: Bool) {

GeliBusinessPlatform/ViewController/分销订单管理/RetailManageViewController.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17506" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17156" 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="17505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17125"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>

GeliBusinessPlatform/ViewController/工作中心/WorkCViewController.swift

@@ -671,7 +671,7 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
             return
         case 142: //供应商商品管理
 //            HUD.flash(.label("敬请期待"),delay: 1.2)
-            let vc = GYS_FX_Product_VC()
+            let vc = GYS_FX_Product_ListVc()
             self.navigationController?.pushViewController(vc, animated: true)
             return
         default: