// 续签

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

@@ -11,6 +11,8 @@ import AttributedString
 
 class YHResignCertificateDetailPassPortViewController: YHBaseViewController {
     
+    var updateBlock: ((YHResignCertificateInfoModel) ->())?
+
     lazy var viewModel: YHResignCertificateDetailViewModel = {
         let vm = YHResignCertificateDetailViewModel()
         return vm
@@ -145,6 +147,14 @@ class YHResignCertificateDetailPassPortViewController: YHBaseViewController {
             return false
         }
         
+        if self.viewModel.dataModel.cert_info.number.count <= 0 { // 证件号码为空
+            return false
+        }
+        
+        if self.viewModel.dataModel.cert_info.address.count <= 0 { // 证件签发地为空
+            return false
+        }
+        
         if self.viewModel.dataModel.cert_info.issue_start.count == 0 {
             return false
         }
@@ -207,6 +217,8 @@ private extension YHResignCertificateDetailPassPortViewController {
         let passPort: [String: Any] = ["name": "护照",
                                        "issue_start": self.viewModel.dataModel.cert_info.issue_start,
                                        "issue_end": self.viewModel.dataModel.cert_info.issue_end,
+                                       "number": self.viewModel.dataModel.cert_info.number,
+                                       "address": self.viewModel.dataModel.cert_info.address,
                                        "img_front": urls[0],
                                        "submit": true,
                                        "is_show": true]
@@ -216,6 +228,7 @@ private extension YHResignCertificateDetailPassPortViewController {
         ]
         viewModel.submitResignCertificateUpdate(params) { success, error in
             if success {
+                self.updateBlock?(self.viewModel.dataModel.cert_info)
                 YHHUD.flash(message: "保存成功")
                 self.navigationController?.popViewController()
                 
@@ -288,10 +301,11 @@ extension YHResignCertificateDetailPassPortViewController: UITableViewDelegate,
                     let message = item.message ?? ""
                     let isNeed = item.isNeed ?? false
                     if isShow && message.count == 0 && isNeed {
+    
                         tatol = tatol + 20
                     }
                 }
-                return CGFloat(345 + tatol)
+                return CGFloat(520 + tatol)
             }
         }
         return UITableView.automaticDimension

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

@@ -24,6 +24,10 @@ class YHResignCertificatePassportTableViewCell: UITableViewCell {
     var frontDeleteButton: UIButton!
     var activityIndicator: UIActivityIndicatorView!
     var showMessageLabel: UILabel!
+    var cerInfoLabel: UILabel!
+    var cerNumberView: YHItemView!
+    var cerSignPlaceView: YHItemView!
+    var cardLabel: UILabel!
     var cardBeginView: YHItemView!
     var cardEndView: YHItemView!
     var viewModel: YHBaseViewModel = YHBaseViewModel()
@@ -103,6 +107,32 @@ class YHResignCertificatePassportTableViewCell: UITableViewCell {
                         failString = "有效期不足，需要为\(self.dataModel.valid_date)或以后"
                     }
                 }
+                
+                if item.id == .id36 { // 证件信息 证件号码
+                    cerNumberView.dataSource = item
+                    if isShow && message.count == 0 && isNeed {
+                        cerNumberView.snp.updateConstraints { make in
+                            make.height.equalTo(72)
+                        }
+                    } else {
+                        cerNumberView.snp.updateConstraints { make in
+                            make.height.equalTo(52)
+                        }
+                    }
+                }
+                
+                if item.id == .id37 { // 证件信息 签发地
+                    cerSignPlaceView.dataSource = item
+                    if isShow && message.count == 0 && isNeed {
+                        cerSignPlaceView.snp.updateConstraints { make in
+                            make.height.equalTo(72)
+                        }
+                    } else {
+                        cerSignPlaceView.snp.updateConstraints { make in
+                            make.height.equalTo(52)
+                        }
+                    }
+                }
             }
         }
     }
@@ -273,6 +303,87 @@ class YHResignCertificatePassportTableViewCell: UITableViewCell {
             make.height.equalTo(20)
         }
         
+        // 【证件信息 UI】
+        cerInfoLabel =  {
+            let label = UILabel()
+            label.font = UIFont.PFSC_M(ofSize: 15)
+            label.textColor = UIColor.mainTextColor
+            label.text = "证件信息"
+            return label
+        }()
+        centerView.addSubview(cerInfoLabel)
+        cerInfoLabel.snp.makeConstraints { make in
+            make.left.equalTo(18)
+            make.right.equalTo(-18)
+            make.top.equalTo(229)
+            make.height.equalTo(20)
+        }
+        cerNumberView = {
+            let view = YHItemView()
+            let line = UIView()
+            line.backgroundColor = UIColor.separatorColor
+            view.addSubview(line)
+            line.snp.makeConstraints { make in
+                make.left.right.bottom.equalToSuperview()
+                make.height.equalTo(0.5)
+            }
+            return view
+        }()
+        cerNumberView.block = {[weak self] model in
+            guard let self = self else { return }
+            if let block = self.block {
+                block(model)
+            }
+        }
+        centerView.addSubview(cerNumberView)
+        cerNumberView.snp.makeConstraints { make in
+            make.left.equalTo(18)
+            make.top.equalTo(cerInfoLabel.snp.bottom)
+            make.height.equalTo(52)
+            make.right.equalTo(-18)
+        }
+        
+        cerSignPlaceView = {
+            let view = YHItemView()
+            let line = UIView()
+            line.backgroundColor = UIColor.separatorColor
+            view.addSubview(line)
+            line.snp.makeConstraints { make in
+                make.left.right.bottom.equalToSuperview()
+                make.height.equalTo(0.5)
+            }
+            return view
+        }()
+        cerSignPlaceView.block = {[weak self] model in
+            guard let self = self else { return }
+            if let block = self.block {
+                block(model)
+            }
+        }
+        centerView.addSubview(cerSignPlaceView)
+        cerSignPlaceView.snp.makeConstraints { make in
+            make.left.equalTo(18)
+            make.top.equalTo(cerNumberView.snp.bottom)
+            make.height.equalTo(52)
+            make.right.equalTo(-18)
+        }
+        
+        // 【卡片有效期 UI】
+        cardLabel = {
+            let label = UILabel()
+            label.font = UIFont.PFSC_M(ofSize: 15)
+            label.textColor = UIColor.mainTextColor
+            label.text = "卡片有效期"
+            return label
+        }()
+        centerView.addSubview(cardLabel)
+        cardLabel.snp.makeConstraints { make in
+            make.left.equalTo(18)
+            make.right.equalTo(-18)
+            make.top.equalTo(cerSignPlaceView.snp.bottom).offset(24)
+            make.height.equalTo(20)
+        }
+        
         cardBeginView = {
             let view = YHItemView()
             let line = UIView()
@@ -293,7 +404,7 @@ class YHResignCertificatePassportTableViewCell: UITableViewCell {
         centerView.addSubview(cardBeginView)
         cardBeginView.snp.makeConstraints { make in
             make.left.equalTo(18)
-            make.top.equalTo(229)
+            make.top.equalTo(cardLabel.snp.bottom).offset(0)
             make.height.equalTo(52)
             make.right.equalTo(-18)
         }

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

@@ -56,7 +56,7 @@ class YHResignCertificateDetailViewModel: YHBaseViewModel {
     
     func getBaseDatadSource(_ isShowPrompt: Bool) -> [YHItemModel] {
         
-        let item5 = YHItemModel(id: .id36, isNeed: true, title: "证件号码", isUserKeyBoard: true, prompts: "A123456(A)", message: getResultString(dataModel.cert_info.number), isShowPrompts: isShowPrompt, alertMessage:"请输入证件号码")
+        let item5 = YHItemModel(id: .id36, isNeed: true, title: "证件号码", isUserKeyBoard: true, prompts: "请输入", message: getResultString(dataModel.cert_info.number), isShowPrompts: isShowPrompt, alertMessage:"请输入证件号码")
         let item6 = YHItemModel(id: .id37, isNeed: true, title: "签发地", isUserKeyBoard: true, prompts: "请输入", message: getResultString(dataModel.cert_info.address), isShowPrompts: isShowPrompt, alertMessage:"请输入签发地")
         
         let item1 = YHItemModel(id: .id1, isNeed: true, title: "开始时间", isUserKeyBoard: false, prompts: "请选择", message: getResultString(dataModel.cert_info.issue_start), type: .time, isShowPrompts: isShowPrompt, alertMessage:"请选择开始时间")
@@ -68,7 +68,7 @@ class YHResignCertificateDetailViewModel: YHBaseViewModel {
     
     func getPassPortdDataSource(_ isShowPrompt: Bool) -> [YHItemModel] {
         
-        let item3 = YHItemModel(id: .id36, isNeed: true, title: "证件号码", isUserKeyBoard: true, prompts: "A123456(A)", message: getResultString(dataModel.cert_info.number), isShowPrompts: isShowPrompt, alertMessage:"请输入证件号码")
+        let item3 = YHItemModel(id: .id36, isNeed: true, title: "证件号码", isUserKeyBoard: true, prompts: "请输入", message: getResultString(dataModel.cert_info.number), isShowPrompts: isShowPrompt, alertMessage:"请输入证件号码")
         let item4 = YHItemModel(id: .id37, isNeed: true, title: "签发地", isUserKeyBoard: true, prompts: "请输入", message: getResultString(dataModel.cert_info.address), isShowPrompts: isShowPrompt, alertMessage:"请输入签发地")
         
         let item1 = YHItemModel(id: .id5, isNeed: true, title: "签发日期", isUserKeyBoard: false, prompts: "请选择", message: getResultString(dataModel.cert_info.issue_start), type: .time, isShowPrompts: isShowPrompt, alertMessage:"请选择开始时间")

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignInfoConfirm(续签信息确认)/C/YHResignInfoConfirmModifyViewController.swift

@@ -232,11 +232,11 @@ extension YHResignInfoConfirmModifyViewController: UITableViewDelegate, UITableV
                 [weak self] in
                 guard let self = self else { return }
                 if let identity = self.detailMember.identity {
-                     if identity.type == 2 {
-                        // 港澳通行证
+                     if identity.type == 2 { // 港澳通行证
+                        
                         let vc = YHResignCertificateDetailHkViewController()
                         vc.cerId = identity.id
-                         vc.updateBlock = {
+                        vc.updateBlock = {
                              [weak self] cerInfo in
                              guard let self = self else { return }
                              if let identity = self.detailMember.identity {
@@ -248,10 +248,19 @@ extension YHResignInfoConfirmModifyViewController: UITableViewDelegate, UITableV
                          }
                         self.navigationController?.pushViewController(vc)
                          
-                     } else if identity.type == 3 {
-                         // 护照
+                     } else if identity.type == 3 { // 普通护照
                          let vc = YHResignCertificateDetailPassPortViewController()
                          vc.cerId = identity.id
+                         vc.updateBlock = {
+                              [weak self] cerInfo in
+                              guard let self = self else { return }
+                              if let identity = self.detailMember.identity {
+                                  identity.number = cerInfo.number
+                                  identity.begin = cerInfo.issue_start
+                                  identity.end = cerInfo.issue_end
+                                  self.updateData()
+                              }
+                          }
                          self.navigationController?.pushViewController(vc)
                      }
                 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignInfoConfirm(续签信息确认)/V/YHResignInfoItemView.swift

@@ -418,7 +418,7 @@ extension YHResignInfoItemView: UITextFieldDelegate {
             return "请输入职业"
             
         } else if self.item.id == .hongKongId {
-            return "请输入香港身份证号"
+            return "A123456(A)"
             
         } else if self.item.id == .hongkongAddress {
             return "请输入香港地址"