// 确认

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

@@ -322,7 +322,8 @@ extension YHResignCertificateDetailHkViewController: UITableViewDelegate, UITabl
                             if !result.issuing_authority.isEmpty {
                                 self.dataModel.cert_info.address = result.issuing_authority
                             }
-                            if !result.back_term_begins.isEmpty {                                    self.dataModel.cert_info.validate_start = result.back_term_begins
+                            if !result.back_term_begins.isEmpty {
+                                self.dataModel.cert_info.validate_start = result.back_term_begins
                             }
                             if !result.back_end_of_term.isEmpty {
                                 self.dataModel.cert_info.validate_end = result.back_end_of_term

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

@@ -638,6 +638,7 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
     }
     
     @objc func frontImageClick() {
+        self.endEditing(true)
         if firstUrl.count != 0 {
             let vc = YHImageViewController()
             vc.imgString = firstUrl
@@ -664,6 +665,7 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
     }
     
     @objc func backSurfaceImageClick() {
+        self.endEditing(true)
         if lastUrl.count != 0 {
             let vc = YHImageViewController()
             vc.imgString = lastUrl

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

@@ -59,8 +59,8 @@ class YHResignCertificateDetailViewModel: YHBaseViewModel {
         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:"请选择开始时间")
-        let item2 = YHItemModel(id: .id2, isNeed: true, title: "到期时间", isUserKeyBoard: false, prompts: "请选择", message: getResultString(dataModel.cert_info.issue_end), type: .time, 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:"请选择开始时间")
+        let item2 = YHItemModel(id: .id2, isNeed: true, title: "届满时间", isUserKeyBoard: false, prompts: "请选择", message: getResultString(dataModel.cert_info.issue_end), type: .time, isShowPrompts: isShowPrompt, alertMessage:"请选择到期时间")
         let item3 = YHItemModel(id: .id3, isNeed: true, title: "开始时间", isUserKeyBoard: false, prompts: "请选择", message: getResultString(dataModel.cert_info.validate_start), type: .time, isShowPrompts: isShowPrompt, alertMessage:"请选择开始时间")
         let item4 = YHItemModel(id: .id4, isNeed: true, title: "到期时间", isUserKeyBoard: false, prompts: "请选择", message: getResultString(dataModel.cert_info.validate_end), type: .time, isShowPrompts: isShowPrompt, alertMessage:"请选择到期时间")
         return [item5, item6, item1, item2, item3, item4]

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

@@ -97,7 +97,7 @@ class YHResignConfirmInfoListViewController: YHBaseViewController {
     
     func isAllMemberConfirmed() -> Bool {
         for model in familyArr {
-            if model.confirmStatus == 0 {
+            if !model.isConfirmed() {
                 return false
             }
         }

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

@@ -42,6 +42,10 @@ class YHResignInfoConfirmFamilyInfoModel: SmartCodable {
     var info: YHResignInfoConfirmFamilyModel = YHResignInfoConfirmFamilyModel()
     var confirmStatus: Int = 0
 
+    func isConfirmed() -> Bool {
+        return self.confirmStatus == 2
+    }
+    
     enum CodingKeys: String, CodingKey {
         case info = "info"
         case confirmStatus = "confirm_status"

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

@@ -16,8 +16,8 @@ class YHResignFamilyMemberInfoCell: UITableViewCell {
         self.relationLabel.text = model.info.getRelation()
         self.nameLabel.text = model.info.name
         self.pinyinLabel.text = "\(model.info.familyName) \(model.info.givenName)"
-        self.statusLabel.text = model.confirmStatus == 2 ? "已确认" : "待核对"
-        let textColor: UIColor = model.confirmStatus == 2 ? .init(hex: 0x3CC694) : .brandMainColor
+        self.statusLabel.text = model.isConfirmed() ? "已确认" : "待核对"
+        let textColor: UIColor = model.isConfirmed() ? .init(hex: 0x3CC694) : .brandMainColor
         self.statusLabel.textColor = textColor
         
         let img = UIImage(named: "family_info_status_arrow")?.withRenderingMode(.alwaysTemplate)

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

@@ -418,10 +418,10 @@ extension YHResignInfoItemView: UITextFieldDelegate {
             return "请输入职业"
             
         } else if self.item.id == .hongKongId {
-            return "A123456(A)"
+            return "示例：A123456(A)"
             
         } else if self.item.id == .hongkongAddress {
-            return "请输入香港地址"
+            return "请输入香港住址"
         }
         return ""
     }

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

@@ -254,7 +254,7 @@ extension YHResignInfoConfirmViewModel {
                                                            isMust: false,
                                                            title: "香港住址",
                                                            value: model.hkAddress,
-                                                           previousTitle: "原香港地址",
+                                                           previousTitle: "原香港住址",
                                                            previousValue: model.hkAddressHistory,
                                                            isEditMode: isEditMode,
                                                            isShowPreviousInfo: !isEditMode && !model.hkAddressHistory.isEmpty)