18

GeliBusinessPlatform/ViewController/上游供应商管理/SY_GYS_GL_VC.swift

@@ -10,10 +10,19 @@ import UIKit
 
 class SY_GYS_GL_VC: BaseViewController , UISearchBarDelegate, SearchBarViewDelegate,UITableViewDelegate,UITableViewDataSource,SY_GYS_GL_Cell_Delegate, GeliAlertViewDelegate{
     func sureGeliAlertViewAction(sender: UIButton) {
-        delAgentContract(["user_token":UserToken as Any,"agent_id":sender.tag as Any]) { (data) in
-            self.list_view.mj_header?.beginRefreshing()
-        } failture: { (err) in
+        if view.tag == 165 {
+            delAgentContract(["user_token":UserToken as Any,"agent_id":sender.tag as Any]) { (data) in
+                self.list_view.mj_header?.beginRefreshing()
+            } failture: { (err) in
                 
+            }
+        }else{
+            stopeSupAgeCon(["user_token":UserToken as Any,"sup_id":sender.tag as Any]) { (data) in
+                self.list_view.mj_header?.beginRefreshing()
+            } failture: { (err) in
+                
+            }
+            
         }
     }
     
@@ -24,13 +33,18 @@ class SY_GYS_GL_VC: BaseViewController , UISearchBarDelegate, SearchBarViewDeleg
         alertView.tishiLbl.text = ""
         alertView.titileLbl.text = "是否确定终止合作？"
         alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确定"), for: .normal)
-        let model = upAgentInfoList_Arr[cell.tag]
-        alertView.rightBtn.tag = model.sup_id!
+        if view.tag == 165 {
+            let model = upAgentInfoList_Arr[cell.tag]
+            alertView.rightBtn.tag = model.sup_id!
+        }else{
+            let model = upstream_arr[cell.tag]
+            alertView.rightBtn.tag = model.sup_id!
+        }
         self.view.window?.addSubview(alertView)
         
         
         
-
+        
     }
     
     var titleStr = ""
@@ -45,12 +59,14 @@ class SY_GYS_GL_VC: BaseViewController , UISearchBarDelegate, SearchBarViewDeleg
         if self.view.tag == 165 {
             return upAgentInfoList_Arr.count
         }else{
-            return 3
+            return upstream_arr.count
         }
     }
     var upAgentInfoList_Arr:Array<upAgentInfoList_Data_model> = []
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withIdentifier: "SY_GYS_GL_Cell") as! SY_GYS_GL_Cell
+        cell.delegate = self
+        cell.tag = indexPath.row
         if self.view.tag == 165 {
             let model = upAgentInfoList_Arr[indexPath.row]
             cell.icon.sd_setImage(with:URL(string:SERVERCE_ImageHost + model.shop_img_thumb!), placeholderImage: nil,options:.allowInvalidSSLCertificates)
@@ -58,10 +74,13 @@ class SY_GYS_GL_VC: BaseViewController , UISearchBarDelegate, SearchBarViewDeleg
             cell.adr.text = model.address
             cell.time.text = model.create_time
             cell.status.text = model.status
-            cell.tag = indexPath.row
-            cell.delegate = self
         }else{
-            
+            let model = upstream_arr[indexPath.row]
+            cell.icon.sd_setImage(with:URL(string:SERVERCE_ImageHost + model.shop_img_thumb!), placeholderImage: nil,options:.allowInvalidSSLCertificates)
+            cell.name.text = model.shop_name
+            cell.adr.text = model.address
+            cell.time.text = model.start_time
+            cell.status.text = "合作中"
         }
         return cell
     }
@@ -96,10 +115,15 @@ class SY_GYS_GL_VC: BaseViewController , UISearchBarDelegate, SearchBarViewDeleg
         headerMJ.setRefreshingTarget(self, refreshingAction: #selector(loadData))
         list_view.mj_header = self.headerMJ
         list_view.mj_header?.beginRefreshing()
-        
-//        footerMJ.setRefreshingTarget(self, refreshingAction: #selector(loadMoreData))
-//        list_view.mj_footer = self.footerMJ
+        if view.tag != 165 {
+            footerMJ.setRefreshingTarget(self, refreshingAction: #selector(loadMoreData))
+            list_view.mj_footer = self.footerMJ
+        }
     }
+    var page = 0
+    
+    var upstream_arr:Array<upstreamSupList_Data_model> = []
+    
     @objc func loadData(){
         print("加载数据")
         if self.view.tag == 165 {
@@ -122,6 +146,25 @@ class SY_GYS_GL_VC: BaseViewController , UISearchBarDelegate, SearchBarViewDeleg
                 
             }
         }else{
+            page = 1
+            let dic = ["user_token":UserToken as Any,"keyword":keyword as Any,"page":page as Any]
+            upstreamSupList(dic) {[self] (data) in
+                upstream_arr.removeAll()
+                let model = data as! upstreamSupList_model
+                model.data?.forEach({ (item) in
+                    upstream_arr.append(item)
+                })
+                list_view.reloadData()
+                list_view.mj_header?.endRefreshing()
+                self.page = 2
+                if model.data?.count == 0  {
+                    list_view?.mj_footer?.endRefreshingWithNoMoreData()
+                }else{
+                    list_view.mj_footer?.endRefreshing()
+                }
+            } failture: { (err) in
+                
+            }
             
         }
     }
@@ -130,7 +173,22 @@ class SY_GYS_GL_VC: BaseViewController , UISearchBarDelegate, SearchBarViewDeleg
         if self.view.tag == 165 {
             
         }else{
-            
+            let dic = ["user_token":UserToken as Any,"keyword":keyword as Any,"page":page as Any]
+            upstreamSupList(dic) {[self] (data) in
+                let model = data as! upstreamSupList_model
+                if model.data?.count == 0 {
+                    list_view.mj_footer?.endRefreshingWithNoMoreData()
+                }else{
+                    page += 1
+                    model.data?.forEach({ (item) in
+                        upstream_arr.append(item)
+                    })
+                    list_view.reloadData()
+                    list_view.mj_footer?.endRefreshing()
+                }
+            } failture: {[self] (err) in
+                list_view.mj_footer?.endRefreshing()
+            }
         }
     }
     

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

@@ -10,7 +10,7 @@ import UIKit
 import Parchment
 
 class GYS_FX_Product_ListVc: BaseViewController ,PagingViewControllerDelegate,UITableViewDelegate,UITableViewDataSource{
-    
+    var vcType = 0
     var titleStr = ""
     
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
@@ -68,6 +68,10 @@ class GYS_FX_Product_ListVc: BaseViewController ,PagingViewControllerDelegate,UI
         self.view.addSubview(navbar)
         SetTopFrameView(view: contentV, btmView: self.view)
         
+        viewControllers.forEach { (vc) in
+            vc.vcType = vcType
+        }
+        
         let pagingViewController = PagingViewController(viewControllers: viewControllers)
         pagingViewController.indicatorColor = UIColor.init(named: "蓝色字体颜色")!
         pagingViewController.menuItemSize = .fixed(width: 0, height: 44*glscale)

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

@@ -92,7 +92,7 @@ class GYS_FX_Product_VC: BaseViewController,UITableViewDelegate,UITableViewDataS
         didSet{
             if isUpData {
                 if home_list_tbv != nil {
-                    home_list_tbv.mj_header?.beginRefreshing()
+                   home_list_tbv.mj_header?.beginRefreshing()
                 }
             }
         }
@@ -106,9 +106,7 @@ class GYS_FX_Product_VC: BaseViewController,UITableViewDelegate,UITableViewDataS
     @IBOutlet weak var home_list_tbv: UITableView!//主视图列表
     
 //    var centersArr:Array<getDbtShopDataModel> = []
-    
- 
-    
+   
     //MARK:--VC 初始化
     convenience init(title: String) {
         self.init(title: title, content: "")
@@ -126,9 +124,10 @@ class GYS_FX_Product_VC: BaseViewController,UITableViewDelegate,UITableViewDataS
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
-    
+    var vcType = 0
     override func viewDidLoad() {
         super.viewDidLoad()
+        
         let searchBr = SearchBarView.init()
         searchV = searchBr
         self.contentV.addSubview(searchBr)
@@ -231,13 +230,18 @@ class GYS_FX_Product_VC: BaseViewController,UITableViewDelegate,UITableViewDataS
     }
     
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
- 
-            let cell = tableView.dequeueReusableCell(withIdentifier: "GYS_FX_Product_VC_Cell") as! GYS_FX_Product_VC_Cell
+        let cell = tableView.dequeueReusableCell(withIdentifier: "GYS_FX_Product_VC_Cell") as! GYS_FX_Product_VC_Cell
+        if vcType != 180 {
+            let model = datas[indexPath.row]
+           
             if self.title!.contains("已铺货") {
 //                cell.submitBtn.setTitle("取消铺货", for: .normal)
             }else{
 //                cell.submitBtn.setTitle("铺货", for: .normal)
             }
+         
+        }
+            
 //            cell.tag = indexPath.row
 //            cell.delegate = self
 //            let model = datas[indexPath.row]
@@ -269,7 +273,7 @@ class GYS_FX_Product_VC: BaseViewController,UITableViewDelegate,UITableViewDataS
 //                cell.new_price_Lbl.text = "¥" + model.dbt_price!
 //            }
 //            cell.old_price_Lbl.text = model.price
-//            cell.item_Icon_Img.sd_setImage(with:URL(string:SERVERCE_ImageHost +  model.goods_thumb!), placeholderImage: nil,options:.allowInvalidSSLCertificates)
+//
             return cell
         
     }

GeliBusinessPlatform/ViewController/分销收益页/FXSY_ViewController.swift

@@ -101,7 +101,7 @@ class FXSY_ViewController: BaseViewController,GLTimeSelectViewDelegate,UITableVi
             left_btn.isSelected = false
             right_btn.isSelected = true
             last_btn.isSelected = false
-            role_type = 2
+            role_type = 4
             self.bottom_line.snp.updateConstraints { (make) in
                 make.left.width.equalTo(ScreenWidth*0.33)
                 make.height.equalTo(3)
@@ -111,7 +111,7 @@ class FXSY_ViewController: BaseViewController,GLTimeSelectViewDelegate,UITableVi
             left_btn.isSelected = false
             right_btn.isSelected = false
             last_btn.isSelected = true
-//            role_type = 2
+            role_type = 2
             self.bottom_line.snp.updateConstraints { (make) in
                 make.left.equalTo(ScreenWidth*0.66)
                 make.width.equalTo(ScreenWidth*0.33)

GeliBusinessPlatform/ViewController/分销收益页/FXSY_ViewController.xib

@@ -54,10 +54,10 @@
                             <rect key="frame" x="138" y="0.0" width="138" height="44"/>
                             <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="13"/>
                             <color key="tintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                            <state key="normal" title="分销商">
+                            <state key="normal" title="代理商">
                                 <color key="titleColor" name="多选按钮字体颜色"/>
                             </state>
-                            <state key="selected" title="分销商">
+                            <state key="selected" title="代理商">
                                 <color key="titleColor" name="按钮渐变色下,字体颜色"/>
                             </state>
                             <connections>

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

@@ -770,9 +770,9 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
             vc.titleStr = "下游店长管理"
             self.navigationController?.pushViewController(vc, animated: true)
             return
-        case 161://上游代理商商品
+        case 161://代理商商品管理
             let vc = GYS_FX_Product_ListVc()
-            vc.titleStr = "上游代理商商品"
+            vc.titleStr = "代理商商品管理"
             self.navigationController?.pushViewController(vc, animated: true)
             return
         case 162://代理订单管理
@@ -808,14 +808,14 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
             vc.titleStr = "店长订单管理"
             self.navigationController?.pushViewController(vc, animated: true)
             return
-        case 171://分销收益
+        case 179://上游供应商管理
             HUD.flash(.label("敬请期待"),delay: 1.2)
             return
-        case 179://分销收益
-            HUD.flash(.label("敬请期待"),delay: 1.2)
-            return
-        case 180://分销收益
-            HUD.flash(.label("敬请期待"),delay: 1.2)
+        case 180://上游供应商商品
+            let vc = GYS_FX_Product_ListVc()
+            vc.titleStr = "上游供应商商品"
+            vc.vcType = 180
+            self.navigationController?.pushViewController(vc, animated: true)
             return
         default:
             break;