细节优化

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceCenterViewController.swift

@@ -27,6 +27,7 @@ class YHServiceCenterViewController: YHBaseViewController {
     var state: Int = 0
     var isCanSelectStep: Bool = false
     var stepID: Int = 0
+    var headIndex = 0
     
     private lazy var topBkg : UIView = {
         let imagV = UIImageView()
@@ -241,6 +242,7 @@ extension YHServiceCenterViewController {
                     guard let self = self else { return }
                     self.model = model
                     self.state = 0
+                    self.headIndex = 0
                 }
                 self.navigationController?.pushViewController(vc)
             } else {
@@ -274,15 +276,17 @@ extension YHServiceCenterViewController {
                 self.titleLabel.setImage(UIImage(named: "service_center_select_step"), for: .normal)
             }
             if self.state == 3 {
-                self.arrDataForSeviceCenterProgress = self.serviceCenterMainReqVM.mainModel.renewalSection.list.first?.list ?? []
-                self.stepID = self.serviceCenterMainReqVM.mainModel.renewalSection.list.first?.id ?? 0
+                self.arrDataForSeviceCenterProgress = self.serviceCenterMainReqVM.mainModel.renewalSection.list[headIndex].list
+                self.stepID = self.serviceCenterMainReqVM.mainModel.renewalSection.list[headIndex].id
                 self.homeTableView.tableHeaderView = headView
-                self.headView.block = {[weak self] id, array in
+                self.headView.block = {[weak self] stepIndex, id, array in
                     guard let self = self else { return }
+                    self.headIndex = stepIndex
                     self.stepID = id
                     self.arrDataForSeviceCenterProgress = array
                     self.homeTableView.reloadData()
                 }
+                self.headView.selectIndex = self.headIndex
                 self.headView.dataSource = self.serviceCenterMainReqVM.mainModel.renewalSection.list
                 self.titleLabel.setTitle("续签阶段", for: .normal)
                 self.titleLabel.setImage(UIImage(named: "service_center_select_step"), for: .normal)
@@ -346,18 +350,22 @@ extension YHServiceCenterViewController {
                 }
             }
             if self.state == 3 {
-                self.arrDataForSeviceCenterProgress = self.serviceCenterMainReqVM.mainModel.renewalSection.list.first?.list ?? []
-                self.stepID = self.serviceCenterMainReqVM.mainModel.renewalSection.list.first?.id ?? 0
-                self.homeTableView.tableHeaderView = headView
-                self.headView.block = {[weak self] id, array in
-                    guard let self = self else { return }
-                    self.stepID = id
-                    self.arrDataForSeviceCenterProgress = array
-                    self.homeTableView.reloadData()
+                if self.serviceCenterMainReqVM.mainModel.renewalSection.list.count > headIndex {
+                    self.arrDataForSeviceCenterProgress = self.serviceCenterMainReqVM.mainModel.renewalSection.list[headIndex].list
+                    self.stepID = self.serviceCenterMainReqVM.mainModel.renewalSection.list[headIndex].id
+                    self.homeTableView.tableHeaderView = headView
+                    self.headView.block = {[weak self] stepIndex, id , array in
+                        guard let self = self else { return }
+                        self.headIndex = stepIndex
+                        self.stepID = id
+                        self.arrDataForSeviceCenterProgress = array
+                        self.homeTableView.reloadData()
+                    }
+                    self.headView.selectIndex = self.headIndex
+                    self.headView.dataSource = self.serviceCenterMainReqVM.mainModel.renewalSection.list
+                    self.titleLabel.setTitle("续签阶段", for: .normal)
+                    self.titleLabel.setImage(UIImage(named: "service_center_select_step"), for: .normal)
                 }
-                self.headView.dataSource = self.serviceCenterMainReqVM.mainModel.renewalSection.list
-                self.titleLabel.setTitle("续签阶段", for: .normal)
-                self.titleLabel.setImage(UIImage(named: "service_center_select_step"), for: .normal)
             }
             self.homeTableView.reloadData()
         }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignCertificateManage(续期证件管理)/C/YHResignCertificateDetailHkViewController.swift

@@ -136,6 +136,8 @@ class YHResignCertificateDetailHkViewController: YHBaseViewController {
     
     @objc func didSaveBtnClicked() {
         if !checkInfo() {
+            isShowPrompt = true
+            updateData()
             return
         }
         
@@ -143,7 +145,6 @@ class YHResignCertificateDetailHkViewController: YHBaseViewController {
     }
     
     func checkInfo() -> Bool {
-        var errorItemCount = 0
         if urls.first?.count == 0 {
             failString = "请港澳通行证正面"
             return false
@@ -177,7 +178,7 @@ private extension YHResignCertificateDetailHkViewController {
     
     //2、保存旅行证件
     func saveAllTravelCertificate() {
-        let passPort: [String: Any] = ["name": "护照",
+        let hkPassPort: [String: Any] = ["name": "护照",
                                     "issue_start": self.viewModel.dataModel.cert_info.issue_start,
                                     "issue_end": self.viewModel.dataModel.cert_info.issue_end,
                                     "img_front": urls[0],
@@ -185,7 +186,7 @@ private extension YHResignCertificateDetailHkViewController {
                                     "validate_start": self.viewModel.dataModel.cert_info.validate_start,
                                     "validate_end": self.viewModel.dataModel.cert_info.validate_end]
         let params : [String : Any] = [
-            "passPort": passPort,
+            "hkPassPort": hkPassPort,
             "id": dataModel.id
         ]
         viewModel.submitResignCertificateUpdate(params) { success, error in
@@ -254,7 +255,7 @@ extension YHResignCertificateDetailHkViewController: UITableViewDelegate, UITabl
                         }
                     } else {
                         // OCR 无法识别
-                        self.failString = "无法识别，请核查文件"
+                        self.failString = "非逗留(D)签证，请检查文件"
                     }
                     self.updateData()
                 }
@@ -263,6 +264,11 @@ extension YHResignCertificateDetailHkViewController: UITableViewDelegate, UITabl
         cell.deleteBlock = { [weak self] url, index in
             guard let self = self else { return }
             self.urls[index] = url
+            if index == 0 {
+                self.dataModel.cert_info.img_front = ""
+            } else {
+                self.dataModel.cert_info.img_back = ""
+            }
         }
         cell.block = {[weak self] model in
             guard let self = self else { return }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignCertificateManage(续期证件管理)/C/YHResignCertificateDetailPassPortViewController.swift

@@ -165,9 +165,9 @@ private extension YHResignCertificateDetailPassPortViewController {
     //2、保存旅行证件
     func saveAllTravelCertificate() {
         let passPort: [String: Any] = ["name": "护照",
-                                    "issue_start": self.viewModel.dataModel.cert_info.issue_start,
-                                    "issue_end": self.viewModel.dataModel.cert_info.issue_end,
-                                    "img_front": urls[0]]
+                                       "issue_start": self.viewModel.dataModel.cert_info.issue_start,
+                                       "issue_end": self.viewModel.dataModel.cert_info.issue_end,
+                                       "img_front": urls[0]]
         let params : [String : Any] = [
             "passPort": passPort,
             "id": dataModel.id
@@ -224,6 +224,9 @@ extension YHResignCertificateDetailPassPortViewController: UITableViewDelegate,
         cell.deleteBlock = { [weak self] url, index in
             guard let self = self else { return }
             self.urls[index] = url
+            if index == 0 {
+                self.dataModel.cert_info.img_front = ""
+            }
         }
         cell.block = {[weak self] model in
             guard let self = self else { return }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignCertificateManage(续期证件管理)/VM/YHResignCertificateDetailViewModel.swift

@@ -51,9 +51,9 @@ class YHResignCertificateDetailViewModel: YHBaseViewModel {
         case .id2:
             dataModel.cert_info.issue_end = item.message ?? ""
         case .id3:
-            dataModel.cert_info.issue_start = item.message ?? ""
+            dataModel.cert_info.validate_start = item.message ?? ""
         case .id4:
-            dataModel.cert_info.issue_end = item.message ?? ""
+            dataModel.cert_info.validate_end = item.message ?? ""
         default:
             break
         }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHServiceCenterStepThreeTableHeadView.swift

@@ -9,20 +9,21 @@
 import UIKit
 
 class YHServiceCenterStepThreeTableHeadView: UIView {
-    typealias Block = (Int, [YHServiceCenterProgressModel]) -> ()
+    typealias Block = (Int, Int, [YHServiceCenterProgressModel]) -> ()
     var block: Block?
     
     var dataSource: [YHServiceStepProgressThreeModel] = [] {
         didSet {
-            selectIndex = 0
-            let model = dataSource[selectIndex]
-            explainLabel.text = model.personStr
-            if model.personStr.count > 20 {
-                moreButton.isHidden = false
-            } else {
-                moreButton.isHidden = true
+            if dataSource.count > selectIndex {
+                let model = dataSource[selectIndex]
+                explainLabel.text = model.personStr
+                if model.personStr.count > 20 {
+                    moreButton.isHidden = false
+                } else {
+                    moreButton.isHidden = true
+                }
+                self.myCollectView.reloadData()
             }
-            self.myCollectView.reloadData()
         }
     }
     var bgView: UIView!
@@ -85,7 +86,7 @@ class YHServiceCenterStepThreeTableHeadView: UIView {
         explainLabel = {
             let label = UILabel()
             label.textColor = UIColor.mainTextColor70
-            label.text = "本期人员：张大大 (首次)、张笑笑 (第2次)"
+            label.text = ""
             label.font = UIFont.PFSC_M(ofSize: 13)
             return label
         }()
@@ -145,17 +146,19 @@ extension YHServiceCenterStepThreeTableHeadView: UICollectionViewDelegate, UICol
     
     func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
         selectIndex = indexPath.row
-        let model = dataSource[selectIndex]
-        explainLabel.text = model.personStr
-        if model.personStr.count > 20 {
-            moreButton.isHidden = false
-        } else {
-            moreButton.isHidden = true
-        }
-        collectionView.reloadData()
-        let array = model.list
-        if let block = block {
-            block(model.id, array)
+        if dataSource.count > selectIndex {
+            let model = dataSource[selectIndex]
+            explainLabel.text = model.personStr
+            if model.personStr.count > 20 {
+                moreButton.isHidden = false
+            } else {
+                moreButton.isHidden = true
+            }
+            collectionView.reloadData()
+            let array = model.list
+            if let block = block {
+                block(selectIndex, model.id, array)
+            }
         }
     }
 }