15

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

@@ -91,7 +91,7 @@ class FXSY_ViewController: BaseViewController,GLTimeSelectViewDelegate,UITableVi
             right_btn.isSelected = false
             last_btn.isSelected = false
             self.bottom_line.snp.updateConstraints { (make) in
-                make.width.equalTo(ScreenWidth*0.5)
+                make.width.equalTo(ScreenWidth*0.33)
                 make.height.equalTo(3)
                 make.left.equalTo(0)
                 make.top.equalTo(self.left_btn.snp_bottom)
@@ -113,7 +113,8 @@ class FXSY_ViewController: BaseViewController,GLTimeSelectViewDelegate,UITableVi
             last_btn.isSelected = true
 //            role_type = 2
             self.bottom_line.snp.updateConstraints { (make) in
-                make.left.width.equalTo(ScreenWidth*0.66)
+                make.left.equalTo(ScreenWidth*0.66)
+                make.width.equalTo(ScreenWidth*0.33)
                 make.height.equalTo(3)
                 make.top.equalTo(self.left_btn.snp_bottom)
             }

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

@@ -67,6 +67,7 @@
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="MGn-lg-139">
                             <rect key="frame" x="276" 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="分销店长">
                                 <color key="titleColor" name="多选按钮字体颜色"/>
                             </state>

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

@@ -10,7 +10,7 @@ import UIKit
 import Parchment
 
 class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchBarDelegate, SearchBarViewDelegate ,HeaderSelectViewDelegate ,SelectContentViewDelegate,TimeShowDownViewDeleagte{
-
+    
     @IBOutlet weak var contentV: UIView!
     
     fileprivate let cities = [
@@ -21,33 +21,46 @@ class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchB
         RetailManageViewController(title: "分销价商品订单"),
         RetailManageViewController(title: "供货价商品订单")
     ]
+    var vcType = 0
     //头部滚动视图
     weak var pagingVC : PagingViewController?
-    
+    var titleStr = ""
     override func viewDidLoad() {
         super.viewDidLoad()
-        navbar.title = "分销订单管理"
+        
+        navbar.title = titleStr
         navbar.lineView.isHidden = true
         self.view.addSubview(navbar)
         SetTopFrameView(view: contentV, btmView: self.view)
         
-        let pagingViewController = PagingViewController(viewControllers: viewControllers)
-        pagingViewController.indicatorColor = UIColor.init(named: "蓝色字体颜色")!
-        pagingViewController.menuItemSize = .fixed(width: 0, height: 44*glscale)
-        pagingViewController.font = UIFont.systemFont(ofSize: 13)
-        pagingViewController.selectedFont = UIFont.systemFont(ofSize: 13)
-        pagingViewController.textColor = UIColor.init(named: "灰色字体颜色")!
-        pagingViewController.selectedTextColor = UIColor.init(named: "蓝色字体颜色")!
-        pagingViewController.delegate = self
-        pagingViewController.dataSource = self
-        pagingViewController.sizeDelegate = self
-        addChild(pagingViewController)
-        contentV.addSubview(pagingViewController.view)
-        contentV.backgroundColor = UIColor(named: "app底色")!
-        contentV.constrainToEdges(pagingViewController.view)
-        pagingViewController.didMove(toParent: self)
-        pagingVC = pagingViewController
-        
+        viewControllers.forEach { (vc) in
+            vc.view.tag = vcType
+        }
+        viewControllers[1].price_type = 1
+        if vcType != 157 {
+            if vcType == 132 {
+                
+            }else{
+                
+            }
+        }else{
+            let pagingViewController = PagingViewController(viewControllers: viewControllers)
+            pagingViewController.indicatorColor = UIColor.init(named: "蓝色字体颜色")!
+            pagingViewController.menuItemSize = .fixed(width: 0, height: 44*glscale)
+            pagingViewController.font = UIFont.systemFont(ofSize: 13)
+            pagingViewController.selectedFont = UIFont.systemFont(ofSize: 13)
+            pagingViewController.textColor = UIColor.init(named: "灰色字体颜色")!
+            pagingViewController.selectedTextColor = UIColor.init(named: "蓝色字体颜色")!
+            pagingViewController.delegate = self
+            pagingViewController.dataSource = self
+            pagingViewController.sizeDelegate = self
+            addChild(pagingViewController)
+            contentV.addSubview(pagingViewController.view)
+            contentV.backgroundColor = UIColor(named: "app底色")!
+            contentV.constrainToEdges(pagingViewController.view)
+            pagingViewController.didMove(toParent: self)
+            pagingVC = pagingViewController
+        }
         initSearchBar()
         initHeaderSelectView()
     }
@@ -55,7 +68,7 @@ class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchB
     var blackBtnView:UIButton! = nil
     var keyword = ""
     let SearchBarContentV = UIView()
-
+    
     var btn_view = UIView()
     var btn_line_view = UIView()
     func initSearchBar() {
@@ -146,7 +159,7 @@ class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchB
     }
     
     func clearSearchAction() {
-    
+        
     }
     func searchBarTextDidEndEditing(_ searchBar: UISearchBar) {
         removeBlackBtnView()
@@ -169,8 +182,8 @@ class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchB
         }
         let vc = viewControllers[selectIndex]
         vc.listView.mj_header?.beginRefreshing()
-
-     }
+        
+    }
     @objc func removeBlackBtnView(){
         if blackBtnView != nil {
             blackBtnView.removeFromSuperview()
@@ -272,7 +285,7 @@ class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchB
                 }
             }
             break
-         default: break
+        default: break
         }
     }
     
@@ -322,9 +335,9 @@ class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchB
         }
         let vc = viewControllers[selectIndex]
         vc.listView.mj_header?.beginRefreshing()
- 
+        
     }
-   
+    
     //MARK:---滚动选择
     var selectIndex = 0
     func pagingViewController(_ pagingViewController: PagingViewController, didScrollToItem pagingItem: PagingItem, startingViewController: UIViewController?, destinationViewController: UIViewController, transitionSuccessful: Bool) {
@@ -332,6 +345,7 @@ class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchB
         if selectIndex != item.index {
             selectIndex = item.index
             let vc = viewControllers[selectIndex]
+      
             if !vc.isUpData {
                 vc.listView.mj_header?.beginRefreshing()
             }
@@ -349,10 +363,12 @@ class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchB
 extension RetailListMgVC: PagingViewControllerDataSource {
     
     func pagingViewController(_: PagingViewController, pagingItemAt index: Int) -> PagingItem {
+
         return PagingIndexItem(index: index, title: cities[index])
     }
     
     func pagingViewController(_: PagingViewController, viewControllerAt index: Int) -> UIViewController {
+   
         return viewControllers[index]
     }
     

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

@@ -16,7 +16,7 @@ class RetailManageViewController: BaseViewController,UITableViewDelegate,UITable
     var startTime :Int? = 0
     var endTime :Int? = 0
     var dbt_type : Int = 0
-    var dbt_people : Int = 1 //分销人类型（1我的订单分销，2代销订单）
+    //    var dbt_people : Int = 1 //分销人类型（1我的订单分销，2代销订单）
     var keyword = ""
     var isUpData = false{
         didSet{
@@ -38,9 +38,7 @@ class RetailManageViewController: BaseViewController,UITableViewDelegate,UITable
     init(title: String, content: String) {
         super.init(nibName: nil, bundle: nil)
         self.title = title
-        if self.title == "代销订单" {
-            dbt_people = 2
-        }
+        
     }
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
@@ -59,63 +57,70 @@ class RetailManageViewController: BaseViewController,UITableViewDelegate,UITable
     }
     //MARK:--loadData
     //MARK:--列表数据源
-    var dataArr:Array<dbtOrderLisDataModel> = []
-//    var dataArr2:Array<dbtOrderLisDataModel> = []
+    var dataArr:Array<supDbtOrderLis_Data_model> = []
+    var price_type = 0
     @objc func loadData(){
         isUpData = true
         //结算方式（0全部1人工结算 2自动结算(3待自动结算、4已自动结算)(5待人工结算6已人工结算)）
         page = 1
-        let dic = ["user_token":UserToken as Any,"keyword":keyword,"page":page,"dbt_type":dbt_type,"dbt_people":dbt_people,"start_time":startTime as Any,"end_time":endTime as Any]
-        
-        dbtOrderLis(dic) { (data) in
-            let dataM = data as! dbtOrderLisModel
-            
-            self.dataArr.removeAll()
-            dataM.data?.forEach({ (model) in
-                self.dataArr.append(model)
-            })
-            self.listView.mj_header?.endRefreshing()
-
-            self.listView.reloadData()
-             if dataM.data?.count == 0 {
-                self.listView.mj_footer?.endRefreshingWithNoMoreData()
-            }else{
-                self.listView.mj_footer?.endRefreshing()
-            }
-            self.page = 2
-   
-        } failture: { (error) in
-            self.listView.mj_header?.endRefreshing()
-        }
-    }
-    @objc func loadMoreData(){
-        let dic = ["user_token":UserToken as Any,"keyword":keyword,"page":page,"dbt_type":dbt_type,"dbt_people":dbt_people,"start_time":startTime as Any,"end_time":endTime as Any]
-        dbtOrderLis(dic) { (data) in
-            let dataM = data as! dbtOrderLisModel
-            if dataM.data?.count == 0 {
-                self.listView.mj_footer?.endRefreshingWithNoMoreData()
-            }else{
-                self.page += 1
+        switch view.tag {
+        case 157:
+            print("loaddata")
+            let dic = ["user_token":UserToken as Any,"keyword":keyword,"page":page,"dbt_type":dbt_type,"order_status":order_status as Any,"start_time":startTime as Any,"end_time":endTime as Any,"price_type":price_type as Any]
+            supDbtOrderLis(dic) { (data) in
+                let dataM = data as! supDbtOrderLis_model
+                self.dataArr.removeAll()
                 dataM.data?.forEach({ (model) in
                     self.dataArr.append(model)
                 })
+                self.listView.mj_header?.endRefreshing()
+                
                 self.listView.reloadData()
+                if dataM.data?.count == 0 {
+                    self.listView.mj_footer?.endRefreshingWithNoMoreData()
+                }else{
+                    self.listView.mj_footer?.endRefreshing()
+                }
+                self.page = 2
+            } failture: { (err) in
+                self.listView.mj_header?.endRefreshing()
+            }
+            break
+        default:
+            break
+        }
+    }
+    @objc func loadMoreData(){
+        switch view.tag {
+        case 157:
+            let dic = ["user_token":UserToken as Any,"keyword":keyword,"page":page,"dbt_type":dbt_type,"order_status":order_status as Any,"start_time":startTime as Any,"end_time":endTime as Any,"price_type":price_type as Any]
+            supDbtOrderLis(dic) { (data) in
+                let dataM = data as! supDbtOrderLis_model
+                if dataM.data?.count == 0 {
+                    self.listView.mj_footer?.endRefreshingWithNoMoreData()
+                }else{
+                    self.page += 1
+                    dataM.data?.forEach({ (model) in
+                        self.dataArr.append(model)
+                    })
+                    self.listView.reloadData()
+                    self.listView.mj_footer?.endRefreshing()
+                }
+                
+            } failture: { (err) in
                 self.listView.mj_footer?.endRefreshing()
             }
-            
-            
-
-        } failture: { (error) in
-            self.listView.mj_footer?.endRefreshing()
-
+            break
+        default:
+            break
         }
     }
     func numberOfSections(in tableView: UITableView) -> Int {
-    
+        
         return self.dataArr.count
     }
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
- 
+        
         let goodArrModel = self.dataArr[section]
         
         return goodArrModel.order_goods!.count
@@ -123,51 +128,37 @@ class RetailManageViewController: BaseViewController,UITableViewDelegate,UITable
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withIdentifier: "RetailManageViewCell") as! RetailManageViewCell
         let goodArrModel = self.dataArr[indexPath.section]
-
+        
         let goodModel = goodArrModel.order_goods![indexPath.row]
         
         cell.goodsLbl.text = goodModel.goods_name
         cell.numLbl.text = "x" + StringByInt(number: goodModel.goods_number!)
         cell.priceLbl.text = "￥" + goodModel.amount!
-    
+        
         if (indexPath.row + 1) == goodArrModel.order_goods?.count {
             cell.dotImgV.isHidden = true
-
+            
         }else{
             cell.dotImgV.isHidden = false
         }
         return cell
     }
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        if self.title == "代销订单" {
-            let vc = RetailManageDetailViewController()
-            let goodArrModel = self.dataArr[indexPath.section]
-            vc.orderId = goodArrModel.order_id
-            vc.dbt_shop_id = goodArrModel.shop_id
-            self.navigationController?.pushViewController(vc, animated: true)
-        }else{
-            let vc = RetailManageDetailViewController()
-            let goodArrModel = self.dataArr[indexPath.section]
-            vc.orderId = goodArrModel.order_id
-            self.navigationController?.pushViewController(vc, animated: true)
-        }
+        
+        let vc = RetailManageDetailViewController()
+        let goodArrModel = self.dataArr[indexPath.section]
+        vc.orderId = goodArrModel.order_id
+        self.navigationController?.pushViewController(vc, animated: true)
     }
     
     @objc func didselectCellHorF(sender:UITapGestureRecognizer){
         
-        if self.title == "代销订单" {
-            let vc = RetailManageDetailViewController()
-            let goodArrModel = self.dataArr[sender.view!.tag]
-            vc.orderId = goodArrModel.order_id
-            vc.dbt_shop_id = goodArrModel.shop_id
-            self.navigationController?.pushViewController(vc, animated: true)
-        }else{
-            let vc = RetailManageDetailViewController()
-            let goodArrModel = self.dataArr[sender.view!.tag]
-            vc.orderId = goodArrModel.order_id
-            self.navigationController?.pushViewController(vc, animated: true)
-        }
-
+        let vc = RetailManageDetailViewController()
+        let goodArrModel = self.dataArr[sender.view!.tag]
+        vc.orderId = goodArrModel.order_id
+        self.navigationController?.pushViewController(vc, animated: true)
+        
+        
     }
     func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
         let headerV = UIView()
@@ -201,7 +192,7 @@ class RetailManageViewController: BaseViewController,UITableViewDelegate,UITable
             break
         }
         return headerV
-
+        
     }
     func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
         return 50
@@ -212,7 +203,7 @@ class RetailManageViewController: BaseViewController,UITableViewDelegate,UITable
         let tap = UITapGestureRecognizer(target: self, action: #selector(didselectCellHorF))
         footerV.addGestureRecognizer(tap)
         footerV.tag = section
-
+        
         let contentV = RetailManageFooterView()
         footerV.addSubview(contentV)
         contentV.snp_makeConstraints { (make) in
@@ -222,15 +213,15 @@ class RetailManageViewController: BaseViewController,UITableViewDelegate,UITable
         contentV.priceLbl.text = model.sum_amount!
         if model.commission_status == 1 {
             contentV.moneyLbl.text = model.sum_commission_val! + "(已结算)"
-
+            
         }else{
             contentV.moneyLbl.text = model.sum_commission_val! + "(未结算)"
-
+            
         }
         contentV.actionBtn.tag = section
         contentV.delgate = self
         return footerV
-
+        
     }
     func tapRetailManageFooterBtnAction(sender: Int) {
         //标记为人工结算
@@ -252,11 +243,11 @@ class RetailManageViewController: BaseViewController,UITableViewDelegate,UITable
             HUD.flash(.labeledSubSuccess(subtitle: "确认成功"),delay: 1.2)
             self.listView.reloadSections([sender.tag], with: .none)
         } failture: { (error) in
-
+            
         }
-
+        
     }
-
+    
     func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
         let model = self.dataArr[section]
         //已结算
@@ -268,6 +259,6 @@ class RetailManageViewController: BaseViewController,UITableViewDelegate,UITable
             return 48
         }
         return 100
-
+        
     }
 }

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

@@ -637,16 +637,19 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
         //            return
                 case 139: //分销员管理
                     let vc = FXYGL_ViewController()
+                    vc.titleStr = "分销员管理"
                     self.navigationController?.pushViewController(vc, animated: true)
         //            HUD.flash(.label("敬请期待"),delay: 1.2)
                     return
                 case 140://待审核分销员管理
                     let vc = DSHFXY_ViewController()
+                    vc.titleStr = "待审核分销员管理"
                     self.navigationController?.pushViewController(vc, animated: true)
         //            HUD.flash(.label("敬请期待"),delay: 1.2)
                     return
                 case 141://分销客户管理
                     let vc = KHXQ_ViewController()
+                    vc.titleStr = "分销客户管理"
                     self.navigationController?.pushViewController(vc, animated: true)
         //            HUD.flash(.label("敬请期待"),delay: 1.2)
                     return
@@ -656,8 +659,9 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
         //            HUD.flash(.label("敬请期待"),delay: 1.2)
                     return
                 case 136: //分销商品管理
-                    HUD.flash(.label("敬请期待"),delay: 1.2)
+//                    HUD.flash(.label("敬请期待"),delay: 1.2)
                     let vc = FX_Product_GuanLiVC()
+                    vc.titleStr = "设置分销商品"
                     self.navigationController?.pushViewController(vc, animated: true)
                     return
         //        case 137: //分销分账设置
@@ -682,6 +686,8 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
         //            return
                 case 132: //分销订单管理
                     let vc = RetailListMgVC()
+                    vc.vcType = 132
+                    vc.titleStr = "分销订单管理"
                     self.navigationController?.pushViewController(vc, animated: true)
                     return
         //        case 135: //供应商分销商品管理
@@ -691,6 +697,7 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
         //            return
                 case 146://店长申请审核
                     let vc = DZSH_Mg_ViewController()
+                    vc.titleStr = "店长申请审核"
                     self.navigationController?.pushViewController(vc, animated: true)
                     return
         case 148://下游代理商管理
@@ -748,7 +755,8 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
             return
         case 157://分销订单管理
             let vc = RetailListMgVC()
-            vc.view.tag = 157
+            vc.vcType = 157
+            vc.titleStr = "分销订单管理"
             self.navigationController?.pushViewController(vc, animated: true)
             return
         case 159://上游供应商管理
@@ -769,7 +777,8 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
             return
         case 162://代理订单管理
             let vc = RetailListMgVC()
-            vc.view.tag = 162
+            vc.vcType = 162
+            vc.titleStr = "代理订单管理"
             self.navigationController?.pushViewController(vc, animated: true)
             return
         case 164://上游供应商管理
@@ -795,7 +804,8 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
             return
         case 168://店长订单管理
             let vc = RetailListMgVC()
-            vc.view.tag = 168
+            vc.vcType = 168
+            vc.titleStr = "店长订单管理"
             self.navigationController?.pushViewController(vc, animated: true)
             return
         case 171://分销收益