23

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

@@ -14,29 +14,45 @@ class GYS_FX_Product_ListVc: BaseViewController ,PagingViewControllerDelegate,UI
     var titleStr = ""
     
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        if vcType != 180 {
+        switch vcType {
+        case 180:
+            return centersArr.count
+        case 167:
+            return gys_centersArr.count
+        default:
             return dls_centersArr.count
         }
-        return centersArr.count
     }
     var selectIndex = 0
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndSelectCell") as! TitleAndSelectCell
         cell.is_center_select = true
-        if vcType != 180 {
-            let model = dls_centersArr[indexPath.row]
+        
+        switch vcType {
+        case 180:
+            let model = centersArr[indexPath.row]
+            cell.titleLbl.text = model.shop_name
+            cell.selectBtn.isSelected = false
+            if shop_id == model.shop_id {
+                cell.selectBtn.isSelected = true
+            }
+            break
+        case 167:
+            let model = gys_centersArr[indexPath.row]
             cell.titleLbl.text = model.shop_name
             cell.selectBtn.isSelected = false
             if shop_id == model.sup_id {
                 cell.selectBtn.isSelected = true
             }
-        }else{
-            let model = centersArr[indexPath.row]
+            break
+        default:
+            let model = dls_centersArr[indexPath.row]
             cell.titleLbl.text = model.shop_name
             cell.selectBtn.isSelected = false
-            if shop_id == model.shop_id {
+            if shop_id == model.sup_id {
                 cell.selectBtn.isSelected = true
             }
+            break
         }
         
         return cell
@@ -147,22 +163,56 @@ class GYS_FX_Product_ListVc: BaseViewController ,PagingViewControllerDelegate,UI
     var select_list_tbv_height = 0
     func setSelectCenterView(){
         HUD.flash(.progress)
-        if vcType != 180 {
-            if dls_centersArr.count == 0 {
-                getsupList(["user_token":UserToken as Any]) {[self] (data) in
-                    let model = data as! getsupList_model
-                    dls_centersArr.removeAll()
+        switch vcType {
+        case 180:
+            if centersArr.count == 0 {
+                getDbtShop(["user_token":UserToken as Any]) { (data) in
+                    let model = data as! getDbtShopModel
+                    self.centersArr.removeAll()
                     model.data?.forEach({ (item) in
-                        dls_centersArr.append(item)
+                        self.centersArr.append(item)
                     })
-                    if dls_centersArr.count != 0 {
+                    if self.centersArr.count != 0 {
                         //MARK: -  限制中心选择高度
-                        self.select_list_tbv_height = self.dls_centersArr.count * 49
+                        self.select_list_tbv_height = self.centersArr.count * 49
                         if self.select_list_tbv_height > 350 {
                             self.select_list_tbv_height = 350
                         }
                         
-                        self.center_title_lbl.text = self.dls_centersArr.first?.shop_name
+                        self.center_title_lbl.text = self.centersArr.first?.shop_name
+                        self.arrow_img.image = UIImage(named: "down_blue")
+                        if model.code == 1 {
+                            HUD.hide()
+                        }
+                        self.shop_id = (model.data?.first?.shop_id)!
+                        self.viewControllers.forEach { (vc) in
+                            vc.shop_id = self.shop_id
+                            vc.isUpData = false
+                        }
+                        let vc = self.viewControllers[self.selectIndex]
+                        vc.home_list_tbv.mj_header?.beginRefreshing()
+                    }
+                } failture: { (err) in
+                    
+                }
+            }
+            break
+        case 167:
+            if gys_centersArr.count == 0 {
+                ageConList(["user_token":UserToken as Any]) { [self](data) in
+                    let model = data as! ageConList_model
+                    gys_centersArr.removeAll()
+                    model.data?.forEach({ (item) in
+                        gys_centersArr.append(item)
+                    })
+                    if gys_centersArr.count != 0 {
+                        //MARK: -  限制中心选择高度
+                        self.select_list_tbv_height = gys_centersArr.count * 49
+                        if self.select_list_tbv_height > 350 {
+                            self.select_list_tbv_height = 350
+                        }
+                        
+                        self.center_title_lbl.text = gys_centersArr.first?.shop_name
                         self.arrow_img.image = UIImage(named: "down_blue")
                         if model.code == 1 {
                             HUD.hide()
@@ -178,28 +228,30 @@ class GYS_FX_Product_ListVc: BaseViewController ,PagingViewControllerDelegate,UI
                 } failture: { (err) in
                     
                 }
+                
             }
-        }else{
-            if centersArr.count == 0 {
-                getDbtShop(["user_token":UserToken as Any]) { (data) in
-                    let model = data as! getDbtShopModel
-                    self.centersArr.removeAll()
+            break
+        default:
+            if dls_centersArr.count == 0 {
+                getsupList(["user_token":UserToken as Any]) {[self] (data) in
+                    let model = data as! getsupList_model
+                    dls_centersArr.removeAll()
                     model.data?.forEach({ (item) in
-                        self.centersArr.append(item)
+                        dls_centersArr.append(item)
                     })
-                    if self.centersArr.count != 0 {
+                    if dls_centersArr.count != 0 {
                         //MARK: -  限制中心选择高度
-                        self.select_list_tbv_height = self.centersArr.count * 49
+                        self.select_list_tbv_height = self.dls_centersArr.count * 49
                         if self.select_list_tbv_height > 350 {
                             self.select_list_tbv_height = 350
                         }
                         
-                        self.center_title_lbl.text = self.centersArr.first?.shop_name
+                        self.center_title_lbl.text = self.dls_centersArr.first?.shop_name
                         self.arrow_img.image = UIImage(named: "down_blue")
                         if model.code == 1 {
                             HUD.hide()
                         }
-                        self.shop_id = (model.data?.first?.shop_id)!
+                        self.shop_id = (model.data?.first?.sup_id)!
                         self.viewControllers.forEach { (vc) in
                             vc.shop_id = self.shop_id
                             vc.isUpData = false
@@ -211,9 +263,11 @@ class GYS_FX_Product_ListVc: BaseViewController ,PagingViewControllerDelegate,UI
                     
                 }
             }
+            break
         }
         
         
+        
         contentV.addSubview(bg_view)
         bg_view.snp.makeConstraints { (make) in
             make.top.equalTo(50)
@@ -274,6 +328,7 @@ class GYS_FX_Product_ListVc: BaseViewController ,PagingViewControllerDelegate,UI
     
     var dls_centersArr:Array<getsupList_Data_model> = []
     
+    var gys_centersArr:Array<ageConList_Data_model> = []
     
     let UserToken = UserDefaults.standard.value(forKey: "user_token")
     
@@ -288,15 +343,24 @@ class GYS_FX_Product_ListVc: BaseViewController ,PagingViewControllerDelegate,UI
     }
     
     @objc func btnAction(){
-        if vcType != 180 {
-            if dls_centersArr.count == 0 {
+        switch vcType {
+        case 180:
+            if centersArr.count == 0 {
                 return
             }
-        }else{
-            if centersArr.count == 0 {
+            break
+        case 167:
+            if gys_centersArr.count == 0 {
+                return
+            }
+            break
+        default:
+            if dls_centersArr.count == 0 {
                 return
             }
+            break
         }
+        
         arrow_img.image = UIImage(named: "up_blue")
         if cover_btn == nil {
             let btn = UIButton()
@@ -341,8 +405,10 @@ class GYS_FX_Product_ListVc: BaseViewController ,PagingViewControllerDelegate,UI
         cell.selectBtn.isSelected = true
         
         closeAction()
-        if vcType != 180 {
-            let model = dls_centersArr[indexPath.row]
+        
+        switch vcType {
+        case 167:
+            let model = gys_centersArr[indexPath.row]
             center_title_lbl.text = model.shop_name
             
             self.shop_id = model.sup_id!
@@ -350,7 +416,8 @@ class GYS_FX_Product_ListVc: BaseViewController ,PagingViewControllerDelegate,UI
                 vc.shop_id = self.shop_id
                 vc.isUpData = false
             }
-        }else{
+            break
+        case 180:
             let model = centersArr[indexPath.row]
             center_title_lbl.text = model.shop_name
             
@@ -359,7 +426,19 @@ class GYS_FX_Product_ListVc: BaseViewController ,PagingViewControllerDelegate,UI
                 vc.shop_id = self.shop_id
                 vc.isUpData = false
             }
+            break
+        default:
+            let model = dls_centersArr[indexPath.row]
+            center_title_lbl.text = model.shop_name
+            
+            self.shop_id = model.sup_id!
+            self.viewControllers.forEach { (vc) in
+                vc.shop_id = self.shop_id
+                vc.isUpData = false
             }
+            break
+        }
+        
         let vc = self.viewControllers[self.selectIndex]
         vc.home_list_tbv.mj_header?.beginRefreshing()
     }

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

@@ -10,11 +10,40 @@ import UIKit
 
 class GYS_FX_Product_VC: BaseViewController,UITableViewDelegate,UITableViewDataSource,GYS_FX_ProductCellDelegate, UISearchBarDelegate, SearchBarViewDelegate, GYS_FX_Product_VC_Cell_Delegate, GeliAlertViewDelegate{
     func sureGeliAlertViewAction(sender: UIButton) {
-        if vcType != 180 {
-            let model = dls_datas[cellTag]
+        
+        switch vcType {
+        case 180:
+            let model = datas[cellTag]
+            if sender.tag == 1 {
+                let cell = home_list_tbv.cellForRow(at: IndexPath(row: cellTag, section:0 )) as! GYS_FX_Product_VC_Cell
+                var action = 1
+                if cell.up_down_btn.titleLabel!.text!.contains("下架") {
+                    action = 2
+                }
+                setSupGoodsAttr(["user_token":UserToken as Any,"sku_id":model.sku_id as Any,"action":action as Any]) { (data) in
+                    self.home_list_tbv.mj_header?.beginRefreshing()
+                    NotificationCenter.default.post(name: NSNotification.Name(rawValue: "haveChange"), object: "setting")
+                } failture: { (err) in
+                    
+                }
+             return
+            }
+            var action = 1
+            if sender.tag == 0 {
+                action = 2
+            }
+            spreadGoods(["user_token":UserToken as Any,"sku_id":model.sku_id as Any,"shop_id":model.shop_id as Any,"action":action as Any]) { (data) in
+                self.home_list_tbv.mj_header?.beginRefreshing()
+                NotificationCenter.default.post(name: NSNotification.Name(rawValue: "haveChange"), object: "setting")
+            } failture: { (err) in
+                
+            }
+            break
+        case 167:
+            let model = gys_datas[cellTag]
             switch sender.tag {
             case 0:
-                delAgentDbt(["user_token":UserToken as Any,"sku_id":model.sku_id as Any]) { (data) in
+                delDbtListInfo(["user_token":UserToken as Any,"sku_id":model.sku_id as Any,"shop_id":shop_id as Any]) { (data) in
                     self.home_list_tbv.mj_header?.beginRefreshing()
                     NotificationCenter.default.post(name: NSNotification.Name(rawValue: "haveChange"), object: "setting")
                 } failture: { (err) in
@@ -26,9 +55,9 @@ class GYS_FX_Product_VC: BaseViewController,UITableViewDelegate,UITableViewDataS
                 let cell = home_list_tbv.cellForRow(at: IndexPath(row: cellTag, section:0 )) as! GYS_FX_Product_VC_Cell
                 var action = 1
                 if cell.up_down_btn.titleLabel!.text!.contains("下架") {
-                    action = 2
+                    action = 0
                 }
-                ageSetGoodsAttr(["user_token":UserToken as Any,"sku_id":model.sku_id as Any,"action":action as Any]) { (data) in
+                dbtSetGoodsAttr(["user_token":UserToken as Any,"sku_id":model.sku_id as Any,"action":action as Any,"agent_id":model.agent_id as Any]) { (data) in
                     self.home_list_tbv.mj_header?.beginRefreshing()
                     NotificationCenter.default.post(name: NSNotification.Name(rawValue: "haveChange"), object: "setting")
                 } failture: { (err) in
@@ -36,69 +65,43 @@ class GYS_FX_Product_VC: BaseViewController,UITableViewDelegate,UITableViewDataS
                 }
                 break
             default:
+                
                 break
             }
-        }else{
-            let model = datas[cellTag]
-            if sender.tag == 1 {
-                let cell = home_list_tbv.cellForRow(at: IndexPath(row: cellTag, section:0 )) as! GYS_FX_Product_VC_Cell
-                var action = 1
-                if cell.up_down_btn.titleLabel!.text!.contains("下架") {
-                    action = 2
-                }
-                setSupGoodsAttr(["user_token":UserToken as Any,"sku_id":model.sku_id as Any,"action":action as Any]) { (data) in
+            break
+        default:
+            let model = dls_datas[cellTag]
+            switch sender.tag {
+            case 0:
+                delAgentDbt(["user_token":UserToken as Any,"sku_id":model.sku_id as Any]) { (data) in
                     self.home_list_tbv.mj_header?.beginRefreshing()
                     NotificationCenter.default.post(name: NSNotification.Name(rawValue: "haveChange"), object: "setting")
                 } failture: { (err) in
                     
                 }
-             return
-            }
-            
+                break
+            case 1:
+                let cell = home_list_tbv.cellForRow(at: IndexPath(row: cellTag, section:0 )) as! GYS_FX_Product_VC_Cell
                 var action = 1
-            if sender.tag == 0 {
+                if cell.up_down_btn.titleLabel!.text!.contains("下架") {
                     action = 2
                 }
-            spreadGoods(["user_token":UserToken as Any,"sku_id":model.sku_id as Any,"shop_id":model.shop_id as Any,"action":action as Any]) { (data) in
+                ageSetGoodsAttr(["user_token":UserToken as Any,"sku_id":model.sku_id as Any,"action":action as Any]) { (data) in
                     self.home_list_tbv.mj_header?.beginRefreshing()
                     NotificationCenter.default.post(name: NSNotification.Name(rawValue: "haveChange"), object: "setting")
                 } failture: { (err) in
                     
                 }
-           
+                break
+            default:
+                break
+            }
+            break
         }
     }
     var cellTag = -1
     func GYS_FX_Product_VC_Cell_Action(cell: GYS_FX_Product_VC_Cell, action: Int) {
         cellTag = cell.tag
-        if vcType != 180 {
-            switch action {
-            case 0:
-                let alertView = GeliAlertView(frame: self.view.window!.bounds)
-                alertView.delegate = self;
-                alertView.tishiLbl.text = ""
-                alertView.titileLbl.text = "是否取消分销？"
-                alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确认"), for: .normal)
-                alertView.rightBtn.tag = action
-                self.view.window?.addSubview(alertView)
-                break
-            case 1:
-                let alertView = GeliAlertView(frame: self.view.window!.bounds)
-                alertView.delegate = self;
-                alertView.tishiLbl.text = ""
-                if cell.up_down_btn.titleLabel!.text!.contains("下架") {//下架
-                    alertView.titileLbl.text = "是否下架？"
-                }else{//上架
-                    alertView.titileLbl.text = "是否上架？"
-                }
-                alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确认"), for: .normal)
-                alertView.rightBtn.tag = action
-                self.view.window?.addSubview(alertView)
-                break
-            default:
-                break
-            }
-        }else{
         switch action {
         case 0://取消分销
             let alertView = GeliAlertView(frame: self.view.window!.bounds)
@@ -123,6 +126,8 @@ class GYS_FX_Product_VC: BaseViewController,UITableViewDelegate,UITableViewDataS
             self.view.window?.addSubview(alertView)
             break
         default://设置分销
+            switch vcType {
+            case 180:
                 let alertView = GeliAlertView(frame: self.view.window!.bounds)
                 alertView.delegate = self;
                 alertView.tishiLbl.text = ""
@@ -131,8 +136,15 @@ class GYS_FX_Product_VC: BaseViewController,UITableViewDelegate,UITableViewDataS
                 alertView.rightBtn.tag = action
                 self.view.window?.addSubview(alertView)
                 break
+            case 167:
+                break
+            default:
+                break
             }
+           
+            break
         }
+      
     }
     
     @IBOutlet weak var contentV: UIView!
@@ -228,11 +240,10 @@ class GYS_FX_Product_VC: BaseViewController,UITableViewDelegate,UITableViewDataS
     
     var datas:Array<supSpreadGoodsDataModel> = []
     var dls_datas:Array<selAgeDbtGoodsList_Data_D_model> = []
+    var gys_datas:Array<selDbtGoodsList_Data_D_model> = []
     
     @IBOutlet weak var home_list_tbv: UITableView!//主视图列表
   
-//    var centersArr:Array<getDbtShopDataModel> = []
-   
     //MARK:--VC 初始化
     convenience init(title: String) {
         self.init(title: title, content: "")
@@ -297,13 +308,16 @@ class GYS_FX_Product_VC: BaseViewController,UITableViewDelegate,UITableViewDataS
         print("加载数据")
         page = 1
         isUpData = true
-        if vcType != 180 {
-            let dict = ["user_token":UserToken as Any,"tab_type":look_type as Any,"keyword":keyword as Any,"sup_id":shop_id as Any,"page":page as Any]
-            selAgeDbtGoodsList(dict) {[self] (data) in
-                let model = data  as! selAgeDbtGoodsList_model
-                dls_datas.removeAll()
+        
+        switch vcType {
+        case 180:
+            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]
+            supSpreadGoods(dic) { (data) in
+                
+                let model = data  as! supSpreadGoodsModel
+                self.datas.removeAll()
                 model.data?.res?.forEach({ (item) in
-                    self.dls_datas.append(item)
+                    self.datas.append(item)
                 })
                 self.home_list_tbv.reloadData()
                 self.home_list_tbv?.mj_header?.endRefreshing()
@@ -318,24 +332,41 @@ class GYS_FX_Product_VC: BaseViewController,UITableViewDelegate,UITableViewDataS
                 }else{
                     self.home_list_tbv?.mj_footer?.endRefreshing()
                 }
-                
-
             } failture: { (err) in
                 self.home_list_tbv?.mj_header?.endRefreshing()
-                
             }
+            break
+        case 167:
+            let dict = ["user_token":UserToken as Any,"tab_type":look_type as Any,"keyword":keyword as Any,"shop_id":shop_id as Any,"page":page as Any]
+            selDbtGoodsList(dict) {[self] (data) in
+                let model = data  as! selDbtGoodsList_model
+                gys_datas.removeAll()
+                model.data?.res?.forEach({ (item) in
+                    self.gys_datas.append(item)
+                })
+                home_list_tbv.reloadData()
+                home_list_tbv?.mj_header?.endRefreshing()
+                page = 2
                 
-            return
+                if model.data?.sum_goods2 != nil && model.data?.sum_goods != nil{
+                    NotificationCenter.default.post(name: NSNotification.Name(rawValue: "sum_goods_count"), object: nil, userInfo: ["sum_goods":model.data!.sum_goods!,"sum_goods2":model.data!.sum_goods2!] )
                 }
               
-        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]
-        
-        supSpreadGoods(dic) { (data) in
+                if model.data?.res?.count == 0  {
+                    home_list_tbv?.mj_footer?.endRefreshingWithNoMoreData()
+                }
+            } failture: { (err) in
+                self.home_list_tbv?.mj_header?.endRefreshing()
+            }
 
-            let model = data  as! supSpreadGoodsModel
-            self.datas.removeAll()
+            break
+        default:
+            let dict = ["user_token":UserToken as Any,"tab_type":look_type as Any,"keyword":keyword as Any,"sup_id":shop_id as Any,"page":page as Any]
+            selAgeDbtGoodsList(dict) {[self] (data) in
+                let model = data  as! selAgeDbtGoodsList_model
+                dls_datas.removeAll()
                 model.data?.res?.forEach({ (item) in
-                self.datas.append(item)
+                    self.dls_datas.append(item)
                 })
                 self.home_list_tbv.reloadData()
                 self.home_list_tbv?.mj_header?.endRefreshing()
@@ -350,24 +381,34 @@ class GYS_FX_Product_VC: BaseViewController,UITableViewDelegate,UITableViewDataS
                 }else{
                     self.home_list_tbv?.mj_footer?.endRefreshing()
                 }
+                
+
             } failture: { (err) in
                 self.home_list_tbv?.mj_header?.endRefreshing()
+                
             }
+            break
+        }
+        
+        
+        
+        
         
     }
     //MARK:--加载更多数据
     @objc func loadMoreData(){
         print("加载更多数据")
-        if vcType != 180 {
-            let dict = ["user_token":UserToken as Any,"tab_type":look_type as Any,"keyword":keyword as Any,"sup_id":shop_id as Any,"page":page as Any]
-            selAgeDbtGoodsList(dict, success: { (data) in
-                let model = data  as! selAgeDbtGoodsList_model
+        switch vcType {
+        case 180:
+            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]
+            supSpreadGoods(dic, success: { (data) in
+                let model = data  as! supSpreadGoodsModel
                 if model.data?.res?.count == 0 {
                     self.home_list_tbv?.mj_footer?.endRefreshingWithNoMoreData()
                 }else{
                     self.page += 1
                     model.data?.res?.forEach({ (item) in
-                        self.dls_datas.append(item)
+                        self.datas.append(item)
                     })
                     self.home_list_tbv.reloadData()
                     self.home_list_tbv?.mj_footer?.endRefreshing()
@@ -375,17 +416,36 @@ class GYS_FX_Product_VC: BaseViewController,UITableViewDelegate,UITableViewDataS
             }) { (error) in
                 self.home_list_tbv?.mj_footer?.endRefreshing()
             }
-            return
+            break
+        case 167:
+            let dict = ["user_token":UserToken as Any,"tab_type":look_type as Any,"keyword":keyword as Any,"shop_id":shop_id as Any,"page":page as Any]
+            selDbtGoodsList(dict) { (data) in
+                let model = data  as! selDbtGoodsList_model
+                if model.data?.res?.count == 0 {
+                    self.home_list_tbv?.mj_footer?.endRefreshingWithNoMoreData()
+                }else{
+                    self.page += 1
+                    model.data?.res?.forEach({ (item) in
+                        self.gys_datas.append(item)
+                    })
+                    self.home_list_tbv.reloadData()
+                    self.home_list_tbv?.mj_footer?.endRefreshing()
                 }
-        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]
-        supSpreadGoods(dic, success: { (data) in
-            let model = data  as! supSpreadGoodsModel
+            } failture: { (err) in
+                self.home_list_tbv?.mj_footer?.endRefreshing()
+            }
+
+            break
+        default:
+            let dict = ["user_token":UserToken as Any,"tab_type":look_type as Any,"keyword":keyword as Any,"sup_id":shop_id as Any,"page":page as Any]
+            selAgeDbtGoodsList(dict, success: { (data) in
+                let model = data  as! selAgeDbtGoodsList_model
                 if model.data?.res?.count == 0 {
                     self.home_list_tbv?.mj_footer?.endRefreshingWithNoMoreData()
                 }else{
                     self.page += 1
                     model.data?.res?.forEach({ (item) in
-                    self.datas.append(item)
+                        self.dls_datas.append(item)
                     })
                     self.home_list_tbv.reloadData()
                     self.home_list_tbv?.mj_footer?.endRefreshing()
@@ -393,15 +453,22 @@ class GYS_FX_Product_VC: BaseViewController,UITableViewDelegate,UITableViewDataS
             }) { (error) in
                 self.home_list_tbv?.mj_footer?.endRefreshing()
             }
+            break
+        }
     }
     
  
     //MARK: - tableview_delegate
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        if vcType != 180 {
+        switch vcType {
+        case 180:
+            return datas.count
+        case 167:
+            return gys_datas.count
+        default:
             return dls_datas.count
         }
-            return datas.count
+       
         
     }
     
@@ -418,8 +485,24 @@ class GYS_FX_Product_VC: BaseViewController,UITableViewDelegate,UITableViewDataS
             cell.cancel_btn_w.constant = 0
             cell.up_down_btn_w.constant = 0
         }
-        if vcType != 180 {//代理商品管理
-            let model = dls_datas[indexPath.row]
+        
+        switch vcType {
+        case 180:
+            let model = datas[indexPath.row]
+            cell.icon.sd_setImage(with:URL(string:SERVERCE_ImageHost + model.goods_thumb!), placeholderImage: nil,options:.allowInvalidSSLCertificates)
+            cell.name.text = model.goods_name
+            cell.price.text = "分销价:"
+            cell.comission.text = "￥\(model.dbt_price!)（固定提成:\(model.commission_val!)）"
+            cell.inventory.isHidden = true
+            cell.store.text = "库存:\(model.inventory!)"
+            cell.up_down_btn.setTitle("商品上架", for: .normal)
+            if model.is_show == 1 {
+                cell.up_down_btn.setTitle("商品下架", for: .normal)
+            }
+            cell.fx_price.isHidden = true
+            break
+        case 167:
+            let model = gys_datas[indexPath.row]
             cell.icon.sd_setImage(with:URL(string:SERVERCE_ImageHost + model.goods_thumb!), placeholderImage: nil,options:.allowInvalidSSLCertificates)
             cell.name.text = model.goods_name
             cell.price.text = "分销价:"
@@ -432,10 +515,9 @@ class GYS_FX_Product_VC: BaseViewController,UITableViewDelegate,UITableViewDataS
             }
             cell.fx_price.isHidden = true
 
-           
-         
-        }else{//180 上游供应商品管理
-            let model = datas[indexPath.row]
+            break
+        default:
+            let model = dls_datas[indexPath.row]
             cell.icon.sd_setImage(with:URL(string:SERVERCE_ImageHost + model.goods_thumb!), placeholderImage: nil,options:.allowInvalidSSLCertificates)
             cell.name.text = model.goods_name
             cell.price.text = "分销价:"
@@ -447,6 +529,8 @@ class GYS_FX_Product_VC: BaseViewController,UITableViewDelegate,UITableViewDataS
                 cell.up_down_btn.setTitle("商品下架", for: .normal)
             }
             cell.fx_price.isHidden = true
+           
+            break
         }
         
             return cell

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

@@ -798,8 +798,9 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
             self.navigationController?.pushViewController(vc, animated: true)
             return
         case 167://上游代理商商品管理
-            let vc = FX_Product_GuanLiVC()
+            let vc = GYS_FX_Product_ListVc()
             vc.titleStr = "上游代理商商品管理"
+            vc.vcType = 167
             self.navigationController?.pushViewController(vc, animated: true)
             return
         case 168://店长订单管理