// 信息确认

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

@@ -95,9 +95,36 @@ class YHResignConfirmInfoListViewController: YHBaseViewController {
         showRiskAlertView()
         requestList()
     }
+    
+    func isAllMemberConfirmed() -> Bool {
+        for model in familyArr {
+            if model.confirmStatus == 0 {
+                return false
+            }
+        }
+        return true
+    }
 
     @objc func didBottomBtnClicked() {
         
+        if !isAllMemberConfirmed() {
+            YHHUD.flash(message: "存在未确认信息，此信息涉及后续【续签申请】，辛苦核对")
+            return
+        }
+        
+        YHHUD.show(.progress(message: "加载中..."))
+        self.viewModel.submitAllConfirmInfo(orderId: self.orderId, stepId: self.stepId) {
+            [weak self] success, error in
+            YHHUD.hide()
+            guard let self = self else { return }
+            if !success {
+                let msg = error?.errorMsg ?? ""
+                YHHUD.flash(message: msg)
+                return
+            }
+            self.navigationController?.popToRootViewController(animated: true)
+            goTabBarBy(tabType: .service)
+        }
     }
     
     func showRiskAlertView() {
@@ -148,7 +175,7 @@ extension YHResignConfirmInfoListViewController: UITableViewDelegate, UITableVie
             
             let model = familyArr[indexPath.row]
             let vc = YHResignInfoConfirmModifyViewController()
-            vc.detailMember = model
+            vc.detailMember = model.info
             vc.listId = self.viewModel.listModel.id
             self.navigationController?.pushViewController(vc)
         }

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

@@ -12,7 +12,7 @@ import AttributedString
 class YHResignInfoConfirmModifyViewController: YHBaseViewController {
 
     var listId: Int = 0 
-    var detailMember = YHResignInfoConfirmFamilyInfoModel()
+    var detailMember = YHResignInfoConfirmFamilyModel()
 
     let viewModel = YHResignInfoConfirmViewModel()
     
@@ -74,6 +74,45 @@ class YHResignInfoConfirmModifyViewController: YHBaseViewController {
         return view
     }()
     
+    override func backItemClick(_ sender: Any) {
+        self.view.endEditing(true)
+        if self.isInfoEditing {
+            showRetainAlertView()
+            return
+        }
+        self.navigationController?.popViewController()
+    }
+    
+    // 是否可以返回，包括点击返回和手势返回，默认YES
+    override func navigationShouldPop() -> Bool {
+        self.view.endEditing(true)
+        if self.isInfoEditing {
+            showRetainAlertView()
+            return false
+        }
+        return true
+    }
+    
+    override func viewDidLoad() {
+        
+        super.viewDidLoad()
+        self.gk_navTitle = "续签信息确认"
+        self.view.backgroundColor = .white
+        self.view.addSubview(self.tableView)
+        self.view.addSubview(self.bottomView)
+        
+        self.tableView.snp.makeConstraints { make in
+            make.left.right.equalToSuperview()
+            make.top.equalTo(k_Height_NavigationtBarAndStatuBar+16)
+            make.bottom.equalTo(self.bottomView.snp.top)
+        }
+        self.bottomView.snp.makeConstraints { make in
+            make.left.right.bottom.equalToSuperview()
+            make.height.equalTo(98)
+        }
+        self.updateData()
+    }
+    
     // 展示挽留弹窗
     func  showRetainAlertView() {
         YHCommonAlertView.show("", "您尚未保存修改，确定关闭吗？", "仍然关闭", "继续编辑", fullGuestureEnable: false) {
@@ -96,14 +135,14 @@ class YHResignInfoConfirmModifyViewController: YHBaseViewController {
     }
     
     @objc func didConfirmBtnClicked() {
-        self.detailMember.info.isCheck = true
+        self.detailMember.isCheck = true
         self.updateData()
         
         if !checkInfo() {
             return
         }
         
-        if let detaiParams = self.detailMember.info.toDictionary() {
+        if let detaiParams = self.detailMember.toDictionary() {
             
             let param:[String: Any] = ["id": listId,
                                        "data": detaiParams]
@@ -123,30 +162,6 @@ class YHResignInfoConfirmModifyViewController: YHBaseViewController {
             }
         }
     }
-    
-    
-    
-    
-
-    override func viewDidLoad() {
-        
-        super.viewDidLoad()
-        self.gk_navTitle = "续签信息确认"
-        self.view.backgroundColor = .white
-        self.view.addSubview(self.tableView)
-        self.view.addSubview(self.bottomView)
-        
-        self.tableView.snp.makeConstraints { make in
-            make.left.right.equalToSuperview()
-            make.top.equalTo(k_Height_NavigationtBarAndStatuBar+16)
-            make.bottom.equalTo(self.bottomView.snp.top)
-        }
-        self.bottomView.snp.makeConstraints { make in
-            make.left.right.bottom.equalToSuperview()
-            make.height.equalTo(98)
-        }
-        self.updateData()
-    }
 }
 
 extension YHResignInfoConfirmModifyViewController: UITableViewDelegate, UITableViewDataSource {
@@ -165,7 +180,7 @@ extension YHResignInfoConfirmModifyViewController: UITableViewDelegate, UITableV
             cell.titleLabel.attributed.text = title
             cell.modifyBtn.isHidden = false
             cell.isEditState = self.isInfoEditing
-            cell.familyInfo = self.detailMember.info
+            cell.familyInfo = self.detailMember
             // 更改编辑状态
             cell.editBlock = {
                 [weak self] isEdit in
@@ -174,7 +189,7 @@ extension YHResignInfoConfirmModifyViewController: UITableViewDelegate, UITableV
                     if !checkInfo() {
                         // 检查信息错误
                         self.isInfoEditing = true
-                        self.detailMember.info.isCheck = true
+                        self.detailMember.isCheck = true
                         self.updateData()
                         return
                     }
@@ -242,6 +257,19 @@ extension YHResignInfoConfirmModifyViewController  {
     
     func updateData() {
         
+        items.removeAll()
+        
+        // arr1 信息核实
+        let arr1 = viewModel.getInfoConfirm(self.detailMember, isEditMode: self.isInfoEditing)
+        items.append(arr1)
+        
+        // arr2 递交证件信息
+        if let _ = self.detailMember.identity {
+            let arr2 = viewModel.getCertificateInfo(self.detailMember)
+            items.append(arr2)
+        }
+                
+        self.tableView.reloadData()
     }
 }
 

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

@@ -21,7 +21,7 @@ class YHResignInfoItemView: UIView {
     var updateName:((String)->())?
 
     let rightBtnWidth = 22.0
-    let viewModel = YHFamilyInfoConfirmViewModel()
+    let viewModel = YHResignInfoConfirmViewModel()
     
     lazy var lineView: UIView = {
         let view = UIView()
@@ -369,6 +369,8 @@ extension YHResignInfoItemView: UITextFieldDelegate {
         } else if self.item.id == .hongKongId {
             self.faimilyInfo.hkIdentityid = newText
             
+        } else if self.item.id == .hongkongAddress {
+            self.faimilyInfo.hkAddress = newText
         }
     }