// 确认

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

@@ -354,7 +354,7 @@ extension YHResignCertificateDetailHkViewController: UITableViewDelegate, UITabl
         }
         cell.block = {[weak self] model in
             guard let self = self else { return }
-            self.viewModel.updateModel(model)
+            self.viewModel.updatesModel(model)
             self.dataModel = self.viewModel.dataModel
         }
         return cell

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

@@ -281,7 +281,7 @@ extension YHResignCertificateDetailPassPortViewController: UITableViewDelegate,
         }
         cell.block = {[weak self] model in
             guard let self = self else { return }
-            self.viewModel.updateModel(model)
+            self.viewModel.updatesModel(model)
         }
         return cell
     }

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

@@ -140,7 +140,7 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
                 let isShow = item.isShowPrompts ?? false
                 let message = item.message ?? ""
                 let isNeed = item.isNeed ?? false
-                if item.id == .id1 { // 卡片有效期开始时间
+                if item.id == .id38 { // 卡片有效期签发日期
                     cardBeginView.dataSource = item
                     if isShow && message.count == 0 && isNeed {
                         cardBeginView.snp.updateConstraints { make in
@@ -152,7 +152,7 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
                         }
                     }
                 }
-                if item.id == .id2 { // 卡片有效期到期时间
+                if item.id == .id39 { // 卡片有效期届满日期
                     cardEndView.dataSource = item
                     if isShow && message.count == 0 && isNeed {
                         cardEndView.snp.updateConstraints { make in

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

@@ -86,7 +86,7 @@ class YHResignCertificatePassportTableViewCell: UITableViewCell {
                 let isShow = item.isShowPrompts ?? false
                 let message = item.message ?? ""
                 let isNeed = item.isNeed ?? false
-                if item.id == .id5 {
+                if item.id == .id38 {
                     cardBeginView.dataSource = item
                     if isShow && message.count == 0 && isNeed {
                         cardBeginView.snp.updateConstraints { make in
@@ -98,7 +98,7 @@ class YHResignCertificatePassportTableViewCell: UITableViewCell {
                         }
                     }
                 }
-                if item.id == .id6 {
+                if item.id == .id39 {
                     cardEndView.dataSource = item
                     if isShow && message.count == 0 && isNeed {
                         cardEndView.snp.updateConstraints { make in

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: dataModel.cert_info.number, isShowPrompts: isShowPrompt, alertMessage:"请输入证件号码")
         let item6 = YHItemModel(id: .id37, isNeed: true, title: "签发地", isUserKeyBoard: true, prompts: "请输入", message: 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: .id38, isNeed: true, title: "签发日期", isUserKeyBoard: false, prompts: "请选择", message: getResultString(dataModel.cert_info.issue_start), type: .time, isShowPrompts: isShowPrompt, alertMessage:"请选择签发日期")
+        let item2 = YHItemModel(id: .id39, 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]
@@ -71,27 +71,23 @@ class YHResignCertificateDetailViewModel: YHBaseViewModel {
         let item3 = YHItemModel(id: .id36, isNeed: true, title: "证件号码", isUserKeyBoard: true, prompts: "请输入", message: dataModel.cert_info.number, isShowPrompts: isShowPrompt, alertMessage:"请输入证件号码")
         let item4 = YHItemModel(id: .id37, isNeed: true, title: "签发地", isUserKeyBoard: true, prompts: "请输入", message: 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:"请选择开始时间")
-        let item2 = YHItemModel(id: .id6, isNeed: true, title: "届满日期", isUserKeyBoard: false, prompts: "请选择", message: getResultString(dataModel.cert_info.issue_end), type: .time, isShowPrompts: isShowPrompt, alertMessage:"请选择到期时间")
+        let item1 = YHItemModel(id: .id38, isNeed: true, title: "签发日期", isUserKeyBoard: false, prompts: "请选择", message: getResultString(dataModel.cert_info.issue_start), type: .time, isShowPrompts: isShowPrompt, alertMessage:"请选择签发日期")
+        let item2 = YHItemModel(id: .id39, isNeed: true, title: "届满日期", isUserKeyBoard: false, prompts: "请选择", message: getResultString(dataModel.cert_info.issue_end), type: .time, isShowPrompts: isShowPrompt, alertMessage:"请选择届满日期")
         
         return [item3, item4, item1, item2]
     }
     
-    func updateModel(_ item: YHItemModel) {
+    func updatesModel(_ item: YHItemModel) {
         guard let type = item.id else { return }
         switch type {
-        case .id1:
+        case .id38:
             dataModel.cert_info.issue_start = item.message ?? ""
-        case .id2:
+        case .id39:
             dataModel.cert_info.issue_end = item.message ?? ""
         case .id3:
             dataModel.cert_info.validate_start = item.message ?? ""
         case .id4:
             dataModel.cert_info.validate_end = item.message ?? ""
-        case .id5:
-            dataModel.cert_info.issue_start = item.message ?? ""
-        case .id6:
-            dataModel.cert_info.issue_end = item.message ?? ""
         case .id36:
             dataModel.cert_info.number = item.message ?? ""
         case .id37:

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

@@ -63,6 +63,8 @@ enum YHItemID: Int {
     
     case id36 = 35 // 证件号码
     case id37 = 36 // 证件签发地
+    case id38 = 37 // 卡片有效期签发日期
+    case id39 = 38 // 卡片有效期届满日期
 }
 
 

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

@@ -462,11 +462,11 @@ class YHItemView: UIView {
         case .time:
             var title = ""
             var isLastDay = false
-            if dataSource?.id == .id5 || dataSource?.id == .id10 || dataSource?.id == .id14 || dataSource?.id == .id19 {
+            if dataSource?.id == .id5 || dataSource?.id == .id10 || dataSource?.id == .id14 || dataSource?.id == .id19 || dataSource?.id == .id38 {
                 title = "请选择签发日期"
                 isLastDay = true
             }
-            if dataSource?.id == .id6 || dataSource?.id == .id11 || dataSource?.id == .id15 || dataSource?.id == .id20 {
+            if dataSource?.id == .id6 || dataSource?.id == .id11 || dataSource?.id == .id15 || dataSource?.id == .id20 || dataSource?.id == .id39 {
                 title = "请选择届满日期"
                 isLastDay = false
             }

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

@@ -326,6 +326,10 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
             printLog("不需要")
         case .id37:
             printLog("不需要")
+        case .id38:
+            printLog("不需要")
+        case .id39:
+            printLog("不需要")
 
             
         }