处理 get请求的传参方式

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/FileList(文件清单)/C/YHFileListViewController.swift

@@ -51,6 +51,18 @@ class YHFileListViewController: YHBaseViewController {
         super.viewWillAppear(animated)
         loadData()
     }
+    
+    
+    private lazy var footLable : UILabel = {
+       
+        let footLable = UILabel()
+        footLable.text = "*感谢您对银河移民的信赖，以上信息均用于香港优才签证申 请银河移民承诺对您所提供的信息将绝对保密"
+        footLable.textColor = .white
+        footLable.font = UIFont.PFSC_R(ofSize: 12)
+        footLable.numberOfLines = 0
+        footLable.lineBreakMode = .byWordWrapping
+        return footLable
+    }()
 }
 
 extension YHFileListViewController {
@@ -62,6 +74,7 @@ extension YHFileListViewController {
             certificateReqVM.getCertificateFileListData(params: param) { success, error in
                 if success == true {
                     self.myContentView.dataModel = self.certificateReqVM.arrFileListData
+                    self.layoutMyUI()
                 } else {
                     YHHUD.flash(message: error?.errorMsg ?? "请求出错")
                 }
@@ -90,6 +103,7 @@ extension YHFileListViewController {
         }
         
         myScrollView.backgroundColor = UIColor(hex:0x0D37C7, alpha: 1.0)
+        
         view.addSubview(myScrollView)
         myScrollView.snp.makeConstraints { make in
             make.top.equalToSuperview().offset(k_Height_NavigationtBarAndStatuBar)
@@ -108,15 +122,9 @@ extension YHFileListViewController {
             make.top.equalTo(217)
             make.left.equalTo(kMargin)
             make.width.equalTo(KScreenWidth - 2*kMargin)
-//            make.height.equalTo(1700) //for test hjl
         }
         
-        let footLable = UILabel()
-        footLable.text = "*感谢您对银河移民的信赖，以上信息均用于香港优才签证申 请银河移民承诺对您所提供的信息将绝对保密"
-        footLable.textColor = .white
-        footLable.font = UIFont.PFSC_R(ofSize: 12)
-        footLable.numberOfLines = 0
-        footLable.lineBreakMode = .byWordWrapping
+       
         
         myScrollView.addSubview(footLable)
         footLable.snp.makeConstraints { make in
@@ -131,4 +139,29 @@ extension YHFileListViewController {
         printLog(myScrollView.contentSize)
         return
     }
+    
+    func layoutMyUI() {
+        myContentView.snp.removeConstraints()
+        myContentView.snp.remakeConstraints { make in
+            make.top.equalTo(217)
+            make.left.equalTo(kMargin)
+            make.width.equalTo(KScreenWidth - 2*kMargin)
+//            make.height.equalTo(2700) //for test hjl
+        }
+        myContentView.backgroundColor = .yellow//for test hjl
+        
+       
+        
+        footLable.snp.removeConstraints()
+        footLable.snp.remakeConstraints { make in
+            make.top.equalTo(myContentView.snp.bottom).offset(29)
+            make.left.equalTo(28)
+            make.width.equalTo(KScreenWidth - 2*28)
+            make.bottom.equalToSuperview().offset(-41)
+        }
+        
+        myScrollView.layoutIfNeeded()
+        
+        printLog("============")
+    }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/FileList(文件清单)/V/YHFileListContentView.swift

@@ -36,13 +36,15 @@ private extension YHFileListContentView {
 
 extension YHFileListContentView {
     func updataUI() {
-        
         guard let arrData = dataModel,arrData.count > 0 else { return }
+        removeSubviews()
         
         let sessionBkgImageV : UIImageView = UIImageView(image: UIImage(named: "file_list_head_bkg"))
         sessionBkgImageV.contentMode = .scaleAspectFill
         
         addSubview(sessionBkgImageV)
+        
+        if arrData.isEmpty {
             sessionBkgImageV.snp.makeConstraints { make in
                 make.top.equalToSuperview().offset(2)
                 make.left.equalToSuperview().offset(2)
@@ -52,9 +54,52 @@ extension YHFileListContentView {
                 make.bottom.equalToSuperview().offset(-20)
             }
             
+        } else {
             
-        for (index,item) in arrData.enumerated() {
+            sessionBkgImageV.snp.makeConstraints { make in
+                make.top.equalToSuperview().offset(2)
+                make.left.equalToSuperview().offset(2)
+                make.right.equalToSuperview().offset(-2)
+                make.height.equalTo(70)
+            }
+            
+        }
         
+        var lastView : UIView?
+        for (index,item) in arrData.enumerated() {
+            let view = YHFileListItemsView()
+            view.dataModel = item
+            addSubview(view)
+            if let lastView = lastView {
+                if index == arrData.count - 1 {
+                    
+                    view.snp.makeConstraints { make in
+                        make.top.equalTo(lastView.snp.bottom)
+                        make.left.right.equalToSuperview()
+                        make.bottom.equalToSuperview().offset(-20)
+                    }
+                } else {
+                    view.snp.makeConstraints { make in
+                        make.top.equalTo(lastView.snp.bottom)
+                        make.left.right.equalToSuperview()
+                    }
+                }
+            } else {
+                if index == arrData.count - 1 {
+                    view.snp.makeConstraints { make in
+                        make.top.equalToSuperview()
+                        make.left.right.equalToSuperview()
+                        make.bottom.equalToSuperview().offset(-20)
+                    }
+                } else {
+                    view.snp.makeConstraints { make in
+                        make.top.equalToSuperview()
+                        make.left.right.equalToSuperview()
+                    }
+                }
+            }
+            lastView = view
         }
+        layoutIfNeeded()
     }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/FileList(文件清单)/V/YHFileListItemView.swift

@@ -63,6 +63,14 @@ class YHFileListItemView: UIView {
         view.backgroundColor = .separatorColor
         return view
     }()
+    
+    
+    
+    var dataModel : YHFileListSubModel? {
+        didSet {
+            updateUI()
+        }
+    }
 }
 
 private extension YHFileListItemView {
@@ -106,3 +114,29 @@ private extension YHFileListItemView {
         }
     }
 }
+
+extension YHFileListItemView {
+    func updateUI() {
+        guard let dataModel = dataModel else { return }
+        titleLable.text = dataModel.name
+        subtitleLable.text = dataModel.type_name
+        
+        var text : String = "--"
+        var color : UIColor = .failColor
+        
+        
+        if dataModel.checks_tatus == 2 {
+            text = "需重传"
+            color = .failColor
+        } else if  dataModel.checks_tatus == 3 {
+            text = "待提交"
+            color = .brandMainColor
+        } else {
+            text = "需过滤" + String(dataModel.checks_tatus)
+            color = UIColor.purple
+        }
+        
+        statusLable.text = text
+        statusLable.textColor = color
+    }
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/FileList(文件清单)/V/YHFileListItemsView.swift

@@ -23,10 +23,117 @@ class YHFileListItemsView: UIView {
     }
     
     
+    private lazy var topBkg : UIView = {
+        let imagV = UIImageView()
+        imagV.image = UIImage(named: "file_list_session_bkg")
+        imagV.contentMode = .scaleAspectFill
+        return imagV
+    }()
+    
+    
+    
+    private lazy var titleLable : UILabel = {
+        let lable0 = UILabel(text: "title")
+        lable0.textColor = UIColor.mainTextColor
+        lable0.font = UIFont.PFSC_R(ofSize: 18)
+        return lable0
+    }()
+    
+    
+    
+    
     
 }
 
 private extension YHFileListItemsView {
     func updateUI() {
+        removeSubviews()
+        
+        guard let dataModel = dataModel else { return }
+        
+        addSubview(topBkg)
+        topBkg.snp.makeConstraints { make in
+            make.top.equalTo(22)
+            make.centerX.equalToSuperview()
+            make.width.equalTo(146)
+            make.height.equalTo(28)
+        }
+        
+        titleLable.text = dataModel.ApplicantName.defaultStringIfEmpty(detaultValue: "--")
+        addSubview(titleLable)
+        titleLable.snp.makeConstraints { make in
+            make.top.equalTo(22)
+            make.centerX.equalToSuperview()
+            make.left.right.equalToSuperview()
+            make.height.equalTo(28)
+        }
+        
+        
+        let holdView : UIView = UIView()
+        holdView.layer.cornerRadius = kCornerRadius6
+        holdView.clipsToBounds = true
+        holdView.layer.borderWidth = 0.5
+        holdView.layer.borderColor = UIColor.separatorColor.cgColor
+        
+        addSubview(holdView)
+        holdView.snp.makeConstraints { make in
+            make.top.equalTo(titleLable.snp.bottom).offset(14)
+            make.left.right.equalToSuperview()
+        }
+        
+    
+        let sessionView : UIView = UIView()
+        sessionView.backgroundColor = UIColor(hex: 0xD9E4FD, alpha: 1.0)
+        holdView.addSubview(sessionView)
+        
+        if dataModel.supplement_list.isEmpty {
+            
+            sessionView.snp.makeConstraints { make in
+                make.top.left.right.equalToSuperview()
+                make.height.equalTo(38)
+                
+                make.bottom.equalToSuperview()
+            }
+            
+        } else {
+            
+            sessionView.snp.makeConstraints { make in
+                make.top.left.right.equalToSuperview()
+                make.height.equalTo(38)
+            }
+        }
+        
+        
+        var lastView : UIView = sessionView
+        for (index,item) in dataModel.supplement_list.enumerated() {
+            
+            let view = YHFileListItemView()
+            view.dataModel = item
+            holdView.addSubview(view)
+            
+            if index == dataModel.supplement_list.count - 1 {
+                view.snp.makeConstraints { make in
+                    make.top.equalTo(lastView.snp.bottom)
+                    make.left.right.equalToSuperview()
+                    
+                    
+                    make.height.equalTo(72) //for test hjl
+                    
+                    make.bottom.equalToSuperview()
+                    
+                    
+                }
+                
+            } else {
+                view.snp.makeConstraints { make in
+                    make.top.equalTo(lastView.snp.bottom)
+                    make.left.right.equalToSuperview()
+                    
+                    make.height.equalTo(72)
+                }
+            }
+            lastView = view
+        }
+        
     }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/VM/YHMainApplicantInformationViewModel.swift

@@ -395,9 +395,6 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
     func requestMainInformation(_ orderID: String, callBackBlock:@escaping (_ success: YHMainInformationModel?, _ error:YHErrorModel?)->()) {
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.OrderInformation.getInformation
         let param: [String: Any] = ["order_id": orderID]
-
-//        let strUrl = "http://192.168.25.48:18088/" + YHAllApiName.OrderInformation.getInformation  + "?order_id=\(orderID)"
-//        let params: [String : Any] = ["order_id": orderID]
         let _ = YHNetRequest.getRequest(url: strUrl, params: param) { [weak self] json, code in
             //1. json字符串 转 对象
             guard let self = self else { return }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/ViewModel/YHCompanyViewModel.swift

@@ -14,10 +14,15 @@ class YHCompanyViewModel: YHBaseViewModel {
     }
     
     func requestCompany(_ key: String, callBackBlock:@escaping (_ success: [YHCompanyModelListModel]?, _ error:YHErrorModel?)->()) {
-        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.WorkExperience.company + "?company_name=\(key)&page_size=20&current_page=1"
-        let _ = YHNetRequest.getRequest(url: strUrl) { [weak self] json, code in
+//        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.WorkExperience.company + "?company_name=\(key)&page_size=20&current_page=1"
+        
+        
+        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.WorkExperience.company
+        let params = ["company_name":key,"page_size":20,"current_page":1] as [String : Any]
+        
+        let _ = YHNetRequest.getRequest(url: strUrl,params: params) { [weak self] json, code in
             //1. json字符串 转 对象
-            guard let self = self else { return }
+            guard self != nil else { return }
             if json.code == 200 {
                 let dic = json.data
                 guard let result = YHCompanyModel.deserialize(from: dic as? Dictionary) else {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/ViewModel/YHWorkExperienceViewModel.swift

@@ -229,8 +229,11 @@ class YHWorkExperienceViewModel: YHBaseViewModel {
     }
     
     func requestWorkDetail(_ workId: String, callBackBlock:@escaping (_ success: Bool?, _ error:YHErrorModel?)->()) {
-        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.WorkExperience.detail + "?id=\(workId)"
-        let _ = YHNetRequest.getRequest(url: strUrl) { [weak self] json, code in
+//        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.WorkExperience.detail + "?id=\(workId)"
+        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.WorkExperience.detail
+        let param: [String: Any] = ["id": workId]
+        
+        let _ = YHNetRequest.getRequest(url: strUrl,params: param) { [weak self] json, code in
             //1. json字符串 转 对象
             guard let self = self else { return }
             if json.code == 200 {
@@ -335,8 +338,11 @@ class YHWorkExperienceViewModel: YHBaseViewModel {
     }
     
     func requestWorkInfoProject(_ workId: String, callBackBlock:@escaping (_ success: [YHWorkExperienceProjectModel]?, _ error:YHErrorModel?)->()){
-        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.WorkExperience.projectList + "?work_id=\(workId)"
-        let _ = YHNetRequest.getRequest(url: strUrl) { [weak self] json, code in
+//        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.WorkExperience.projectList + "?work_id=\(workId)"
+        
+        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.WorkExperience.projectList
+        let param: [String: Any] = ["work_id": workId]
+        let _ = YHNetRequest.getRequest(url: strUrl,params: param) { [weak self] json, code in
             //1. json字符串 转 对象
             guard let self = self else { return }
             if json.code == 200 {
@@ -374,9 +380,10 @@ class YHWorkExperienceViewModel: YHBaseViewModel {
     }
     
     func requestFileMessage(_ url: String, callBackBlock:@escaping (_ success: Bool, _ model: YHFileContent?,_ error:YHErrorModel?)->()) {
-        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.WorkExperience.ocrFileContent + "?file_url=\(url)"
-//        let params: [String : Any] = ["url": url]
-        let _ = YHNetRequest.getRequest(url: strUrl) { [weak self] json, code in
+//        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.WorkExperience.ocrFileContent + "?file_url=\(url)"
+        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.WorkExperience.ocrFileContent
+        let params: [String : Any] = ["file_url": url]
+        let _ = YHNetRequest.getRequest(url: strUrl,params: params) { [weak self] json, code in
             //1. json字符串 转 对象
             guard let self = self else { return }
             if json.code == 200 {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/ViewModel/YHWorkIntroductionViewModel.swift

@@ -65,8 +65,11 @@ class YHWorkIntroductionViewModel: YHBaseViewModel {
     }
     
     func requestFileMessage(_ url: String, callBackBlock:@escaping (_ success: Bool, _ model: YHFileContent?,_ error:YHErrorModel?)->()) {
-        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.WorkExperience.ocrFileContent + "?file_url=\(url)"
-        let _ = YHNetRequest.getRequest(url: strUrl) { [weak self] json, code in
+//        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.WorkExperience.ocrFileContent + "?file_url=\(url)"
+        
+        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.WorkExperience.ocrFileContent
+        let param: [String: Any] = ["file_url": url]
+        let _ = YHNetRequest.getRequest(url: strUrl,params:param) { [weak self] json, code in
             //1. json字符串 转 对象
             guard let self = self else { return }
             if json.code == 200 {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/ViewModel/YHWorkItemListViewModel.swift

@@ -17,8 +17,11 @@ class YHWorkItemListViewModel: YHBaseViewModel {
     }
     
     func requestWorkList(_ orderId: String, callBackBlock:@escaping (_ success: [YHWorkItemListModel]?, _ error:YHErrorModel?)->()) {
-        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.WorkExperience.list + "?order_id=\(orderId)"
-        let _ = YHNetRequest.getRequest(url: strUrl) { [weak self] json, code in
+//        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.WorkExperience.list + "?order_id=\(orderId)"
+        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.WorkExperience.list
+        let params: [String : Any] = ["order_id": orderId]
+        
+        let _ = YHNetRequest.getRequest(url: strUrl,params: params) { [weak self] json, code in
             //1. json字符串 转 对象
             guard let self = self else { return }
             if json.code == 200 {

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/清单列表/file_list_session_bkg.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Rectangle 2573@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Rectangle 2573@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}