1112大是大

GeliBusinessPlatform.xcodeproj/project.pbxproj

@@ -4662,7 +4662,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = NO;
 				CODE_SIGN_ENTITLEMENTS = GeliBusinessPlatform/GeliBusinessPlatform.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5.4;
+				CURRENT_PROJECT_VERSION = 5.5;
 				DEFINES_MODULE = NO;
 				DEVELOPMENT_ASSET_PATHS = "\"GeliBusinessPlatform/Preview Content\"";
 				DEVELOPMENT_TEAM = K48346UACH;
@@ -4716,7 +4716,7 @@
 					"$(PROJECT_DIR)/GeliBusinessPlatform/Other/SDK/GprinterSDKforIOS_v1.0.8",
 					"$(PROJECT_DIR)/GeliBusinessPlatform/Other/SDK",
 				);
-				MARKETING_VERSION = 1.7.3;
+				MARKETING_VERSION = 1.7.4;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -4798,7 +4798,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = NO;
 				CODE_SIGN_ENTITLEMENTS = GeliBusinessPlatform/GeliBusinessPlatform.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5.4;
+				CURRENT_PROJECT_VERSION = 5.5;
 				DEFINES_MODULE = NO;
 				DEVELOPMENT_ASSET_PATHS = "\"GeliBusinessPlatform/Preview Content\"";
 				DEVELOPMENT_TEAM = K48346UACH;
@@ -4852,7 +4852,7 @@
 					"$(PROJECT_DIR)/GeliBusinessPlatform/Other/SDK/GprinterSDKforIOS_v1.0.8",
 					"$(PROJECT_DIR)/GeliBusinessPlatform/Other/SDK",
 				);
-				MARKETING_VERSION = 1.7.3;
+				MARKETING_VERSION = 1.7.4;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

GeliBusinessPlatform/ViewController/店长审核/DZSHViewController.swift

@@ -8,7 +8,41 @@
 
 import UIKit
 
-class DZSHViewController: BaseViewController {
+class DZSHViewController: BaseViewController, UITableViewDelegate, UITableViewDataSource {
+    //MARK: - tableview_delegate
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        return 178.5
+    }
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return dataArr.count
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        let cell = tableView.dequeueReusableCell(withIdentifier: "DZSHCell") as! DZSHCell
+        cell.tag = indexPath.row
+        let model = dataArr[indexPath.row]
+        if type == 2 {
+            cell.resultImg.isHidden = false
+            cell.action_btn.setTitle("查看", for: .normal)
+            if model.vendor_audit_status != 2 {
+                cell.resultImg.image = UIImage(named: "passImg")
+                if model.vendor_audit_status == 3 {
+                    cell.action_btn.setTitle("补齐资料", for: .normal)
+                }
+            }else{
+                cell.resultImg.image = UIImage(named: "nonPassImg")
+            }
+        }else{
+            cell.resultImg.isHidden = true
+            cell.action_btn.setTitle("审核", for: .normal)
+        }
+        cell.name_lbl.text = model.user_name! + "(\(model.phone))"
+        cell.from_lbl.text = model.from
+        cell.date_lbl.text = model.create_time
+        
+        return cell
+    }
+    
     @IBOutlet weak var listView: UITableView!
     var keyword = ""
     var isUpData = false{
@@ -20,8 +54,18 @@ class DZSHViewController: BaseViewController {
             }
         }
     }
+    
+    @IBOutlet weak var top_btn_view: UIView!
+    @IBOutlet weak var searchV: UIView!
+    var page : Int = 0
+    let UserToken = UserDefaults.standard.value(forKey: "user_token")
     var startTime :Int? = 0
     var endTime :Int? = 0
+    var type :Int? = 0 //1为待审核列表查询，2为已审核列表查询
+    var from = 0 //来源：1:小程序,2:格利食品网
+    var audit_type = 0 //审核类型 1审核通过 2审核不通过 3审核通过待补齐资料 100全部
+    
+    
     //MARK:--VC 初始化
     convenience init(title: String) {
         self.init(title: title, content: "")
@@ -37,18 +81,74 @@ class DZSHViewController: BaseViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        // Do any additional setup after loading the view.
+        listView.register(UINib(nibName: "DZSHCell", bundle: nil), forCellReuseIdentifier: "DZSHCell")
+        listView.separatorStyle = .none
+        listView.delegate = self
+        listView.dataSource = self
+        headerMJ.setRefreshingTarget(self, refreshingAction: #selector(loadData))
+        listView.mj_header = headerMJ
+        footerMJ.setRefreshingTarget(self, refreshingAction: #selector(loadMoreData))
+        listView.mj_footer = footerMJ
+        listView.mj_header?.beginRefreshing()
+    }
+
+
+    //MARK:--loadData
+    //MARK:--列表数据源
+    var dataArr:Array<queryStoreListInfoData_model> = []
+//    var dataArr2:Array<dbtOrderLisDataModel> = []
+    @objc func loadData(){
+        isUpData = true
+        page = 1
+        if audit_type == 0 {
+            audit_type = 100
+        }
+        
+        let dic = ["user_token":UserToken as Any,"keyword":keyword,"page":page,"start_time":startTime as Any,"end_time":endTime as Any,"from":from as Any,"audit_type":audit_type as Any,"type":type as Any]
+      
+        queryStoreListInfo(dic) { (data) in
+            let dataM = data as! queryStoreListInfo_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: { (error) in
+            self.listView.mj_header?.endRefreshing()
+        }
     }
+    @objc func loadMoreData(){
+        let dic = ["user_token":UserToken as Any,"keyword":keyword,"page":page,"start_time":startTime as Any,"end_time":endTime as Any,"from":from as Any,"audit_type":audit_type as Any,"type":type as Any]
+        
+        queryStoreListInfo(dic) { (data) in
+            let dataM = data as! queryStoreListInfo_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()
+            }
 
 
-    /*
-    // MARK: - Navigation
 
-    // In a storyboard-based application, you will often want to do a little preparation before navigation
-    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
-        // Get the new view controller using segue.destination.
-        // Pass the selected object to the new view controller.
+        } failture: { (error) in
+            self.listView.mj_footer?.endRefreshing()
+
+        }
     }
-    */
 
 }

GeliBusinessPlatform/ViewController/店长审核/DZSHViewController.xib

@@ -13,6 +13,8 @@
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="DZSHViewController" customModule="TestClass" customModuleProvider="target">
             <connections>
                 <outlet property="listView" destination="lSX-9b-cFw" id="zZH-ZZ-QGI"/>
+                <outlet property="searchV" destination="8L7-vJ-qVH" id="xg8-AR-gOV"/>
+                <outlet property="top_btn_view" destination="bHR-an-pKl" id="aGx-3m-jrJ"/>
                 <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
             </connections>
         </placeholder>

GeliBusinessPlatform/ViewController/店长审核/DZSH_Mg_ViewController.swift

@@ -32,7 +32,8 @@ class DZSH_Mg_ViewController: BaseViewController ,PagingViewControllerDelegate,
         navbar.lineView.isHidden = true
         self.view.addSubview(navbar)
         SetTopFrameView(view: contentV, btmView: self.view)
-        
+        viewControllers.first?.type = 1
+        viewControllers.last?.type = 2
         let pagingViewController = PagingViewController(viewControllers: viewControllers)
         pagingViewController.indicatorColor = UIColor.init(named: "蓝色字体颜色")!
         pagingViewController.menuItemSize = .fixed(width: 0, height: 44*glscale)
@@ -176,7 +177,7 @@ class DZSH_Mg_ViewController: BaseViewController ,PagingViewControllerDelegate,
                 selectV.firstBtn.setTitle(arr1[selectIndexArr.first!], for: .normal)
             }
             if selectIndexArr.last != -1  && idx == 0{
-                let arr1 = ["全部", "审核通过", "审核未通过"]
+                let arr1 = ["全部", "审核通过", "审核未通过","审核通过待补齐资料"]
                 selectV.thereBtn.setTitle(arr1[selectIndexArr.last!], for: .normal)
             }
         }
@@ -232,7 +233,7 @@ class DZSH_Mg_ViewController: BaseViewController ,PagingViewControllerDelegate,
                     make.top.equalTo(changeBgView.snp_bottom)
                 }
                 showSelectV = showSelectView
-                showSelectView.dataArr = ["全部","审核通过", "审核未通过"]
+                showSelectView.dataArr = ["全部","审核通过", "审核未通过","审核通过待补齐资料"]
                 showSelectView.selectIndx = selectIndexArr[2]
             }
             break
@@ -251,14 +252,14 @@ class DZSH_Mg_ViewController: BaseViewController ,PagingViewControllerDelegate,
     
     //MARK:--SelectContentViewDelegate
     func didselectCell(sender: Int, SelectContentView: SelectContentView) {
-//        selectIndexArr[showSelectvIndex] = sender
-//        selectV.colseBytitleArr(arr: [], index:showSelectvIndex)
-//        viewControllers.forEach { (vc) in
-//            //            vc.dbt_type = selectIndexArr[0]
-//            vc.isUpData = false
-//        }
-//        let vc = viewControllers[selectIndex]
-//        vc.listView.mj_header?.beginRefreshing()
+        //        selectIndexArr[showSelectvIndex] = sender
+        //        selectV.colseBytitleArr(arr: [], index:showSelectvIndex)
+        //        viewControllers.forEach { (vc) in
+        //            //            vc.dbt_type = selectIndexArr[0]
+        //            vc.isUpData = false
+        //        }
+        //        let vc = viewControllers[selectIndex]
+        //        vc.listView.mj_header?.beginRefreshing()
         
         selectIndexArr[showSelectvIndex] = sender
         var arr:[String] = []
@@ -266,14 +267,26 @@ class DZSH_Mg_ViewController: BaseViewController ,PagingViewControllerDelegate,
             let arr1 = ["全部", "小程序", "格利食品网"]
             arr.append(arr1[sender])
         }else if showSelectvIndex == 2{
-            let arr1 = ["全部", "审核通过", "审核未通过"]
+            let arr1 = ["全部", "审核通过", "审核未通过","审核通过待补齐资料"]
             arr.append(arr1[sender])
         }
+        
+        viewControllers.forEach { (vc) in
+            
+            if selectIndexArr.first != -1 {
+                vc.from = selectIndexArr.first!
+            }
+            if selectIndexArr.last != -1 {
+                vc.audit_type = selectIndexArr.last!
+            }
+            vc.isUpData = false
+        }
+        
         selectV.colseBytitleArr(arr: arr, index:showSelectvIndex)
-
+        
         viewControllers.forEach { (vc) in
-        vc.isUpData = false
-       }
+            vc.isUpData = false
+        }
         let vc = viewControllers[selectIndex]
         vc.listView.mj_header?.beginRefreshing()
         
@@ -317,7 +330,7 @@ class DZSH_Mg_ViewController: BaseViewController ,PagingViewControllerDelegate,
         selectV.removeFromSuperview()
         selectV = nil
         initHeaderSelectView(idx: selectIndex)
-       
+        
         if selectIndex != item.index {
             selectIndex = item.index
             let vc = viewControllers[selectIndex]