// 确认

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -516,14 +516,14 @@
 		04912F742CB7743900CC3105 /* YHResignAppointSelectTimeItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04912F732CB7743900CC3105 /* YHResignAppointSelectTimeItemView.swift */; };
 		04912F762CB77F4500CC3105 /* YHResignLeaveHKSwitchItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04912F752CB77F4500CC3105 /* YHResignLeaveHKSwitchItemView.swift */; };
 		04912F782CB7A11700CC3105 /* YHResignAppointOptionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04912F772CB7A11700CC3105 /* YHResignAppointOptionCell.swift */; };
-		04912F7A2CB7A5F400CC3105 /* YHResignAppointApplicantInfoCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04912F792CB7A5F400CC3105 /* YHResignAppointApplicantInfoCell.swift */; };
+		04912F7A2CB7A5F400CC3105 /* YHResignHaveAppointedApplicantsInfoCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04912F792CB7A5F400CC3105 /* YHResignHaveAppointedApplicantsInfoCell.swift */; };
 		04912F7C2CB7A7EE00CC3105 /* YHResignAppointShowTimeItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04912F7B2CB7A7EE00CC3105 /* YHResignAppointShowTimeItemView.swift */; };
 		04912F7E2CB7B2BA00CC3105 /* YHResignAppointOptionResultCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04912F7D2CB7B2BA00CC3105 /* YHResignAppointOptionResultCell.swift */; };
 		04912F822CB7CFAE00CC3105 /* YHResignAppointedScheduleLineView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04912F812CB7CFAE00CC3105 /* YHResignAppointedScheduleLineView.swift */; };
-		04912F842CB7D14D00CC3105 /* YHResignAppointedScheduleLineCollectCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04912F832CB7D14D00CC3105 /* YHResignAppointedScheduleLineCollectCell.swift */; };
-		04912F862CB7EF6200CC3105 /* YHResignHaveAppointedMultipleInfoCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04912F852CB7EF6100CC3105 /* YHResignHaveAppointedMultipleInfoCell.swift */; };
+		04912F842CB7D14D00CC3105 /* YHResignScheduleLineCollectCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04912F832CB7D14D00CC3105 /* YHResignScheduleLineCollectCell.swift */; };
+		04912F862CB7EF6200CC3105 /* YHResignScheduleMultipleInfoCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04912F852CB7EF6100CC3105 /* YHResignScheduleMultipleInfoCell.swift */; };
 		04912F882CB8FF3000CC3105 /* YHResignAppointedScheduleSingleItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04912F872CB8FF3000CC3105 /* YHResignAppointedScheduleSingleItemView.swift */; };
-		04912F8A2CB9000200CC3105 /* YHResignHaveAppointedSingleInfoCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04912F892CB9000200CC3105 /* YHResignHaveAppointedSingleInfoCell.swift */; };
+		04912F8A2CB9000200CC3105 /* YHResignScheduleSingleInfoCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04912F892CB9000200CC3105 /* YHResignScheduleSingleInfoCell.swift */; };
 		04912F8C2CB907F200CC3105 /* YHResignAppointTimeMultipleCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04912F8B2CB907F100CC3105 /* YHResignAppointTimeMultipleCell.swift */; };
 		04912F8E2CB916F500CC3105 /* YHResignAppointViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04912F8D2CB916F500CC3105 /* YHResignAppointViewModel.swift */; };
 		04912F902CB917BC00CC3105 /* YHResignAppointMember.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04912F8F2CB917BC00CC3105 /* YHResignAppointMember.swift */; };
@@ -651,7 +651,7 @@
 		04D144762C0452E200EE3758 /* YHOneKeyLoginManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04D144752C0452E200EE3758 /* YHOneKeyLoginManager.swift */; };
 		04D5C5662B8ED92600190021 /* YHBaseModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04D5C5652B8ED92600190021 /* YHBaseModel.swift */; };
 		04DF69B92CB95241005AA41E /* YHResignAppointTimeSettingModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04DF69B82CB95241005AA41E /* YHResignAppointTimeSettingModel.swift */; };
-		04DF69BB2CBA1CC5005AA41E /* YHResignAppointApplicantCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04DF69BA2CBA1CC5005AA41E /* YHResignAppointApplicantCell.swift */; };
+		04DF69BB2CBA1CC5005AA41E /* YHResignSelectApplicantCollectCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04DF69BA2CBA1CC5005AA41E /* YHResignSelectApplicantCollectCell.swift */; };
 		04E41DE82BD240570077EAE3 /* YHOrderDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04E41DE72BD240570077EAE3 /* YHOrderDetailViewController.swift */; };
 		04E86E0D2B70D51D00A35F4B /* YHWebViewViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04E86E0C2B70D51D00A35F4B /* YHWebViewViewController.swift */; };
 		04E86E662B86EB6F00A35F4B /* YHLoginManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04E86E652B86EB6F00A35F4B /* YHLoginManager.swift */; };
@@ -1480,14 +1480,14 @@
 		04912F732CB7743900CC3105 /* YHResignAppointSelectTimeItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignAppointSelectTimeItemView.swift; sourceTree = "<group>"; };
 		04912F752CB77F4500CC3105 /* YHResignLeaveHKSwitchItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignLeaveHKSwitchItemView.swift; sourceTree = "<group>"; };
 		04912F772CB7A11700CC3105 /* YHResignAppointOptionCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignAppointOptionCell.swift; sourceTree = "<group>"; };
-		04912F792CB7A5F400CC3105 /* YHResignAppointApplicantInfoCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignAppointApplicantInfoCell.swift; sourceTree = "<group>"; };
+		04912F792CB7A5F400CC3105 /* YHResignHaveAppointedApplicantsInfoCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignHaveAppointedApplicantsInfoCell.swift; sourceTree = "<group>"; };
 		04912F7B2CB7A7EE00CC3105 /* YHResignAppointShowTimeItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignAppointShowTimeItemView.swift; sourceTree = "<group>"; };
 		04912F7D2CB7B2BA00CC3105 /* YHResignAppointOptionResultCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignAppointOptionResultCell.swift; sourceTree = "<group>"; };
 		04912F812CB7CFAE00CC3105 /* YHResignAppointedScheduleLineView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignAppointedScheduleLineView.swift; sourceTree = "<group>"; };
-		04912F832CB7D14D00CC3105 /* YHResignAppointedScheduleLineCollectCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignAppointedScheduleLineCollectCell.swift; sourceTree = "<group>"; };
-		04912F852CB7EF6100CC3105 /* YHResignHaveAppointedMultipleInfoCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignHaveAppointedMultipleInfoCell.swift; sourceTree = "<group>"; };
+		04912F832CB7D14D00CC3105 /* YHResignScheduleLineCollectCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignScheduleLineCollectCell.swift; sourceTree = "<group>"; };
+		04912F852CB7EF6100CC3105 /* YHResignScheduleMultipleInfoCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignScheduleMultipleInfoCell.swift; sourceTree = "<group>"; };
 		04912F872CB8FF3000CC3105 /* YHResignAppointedScheduleSingleItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignAppointedScheduleSingleItemView.swift; sourceTree = "<group>"; };
-		04912F892CB9000200CC3105 /* YHResignHaveAppointedSingleInfoCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignHaveAppointedSingleInfoCell.swift; sourceTree = "<group>"; };
+		04912F892CB9000200CC3105 /* YHResignScheduleSingleInfoCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignScheduleSingleInfoCell.swift; sourceTree = "<group>"; };
 		04912F8B2CB907F100CC3105 /* YHResignAppointTimeMultipleCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignAppointTimeMultipleCell.swift; sourceTree = "<group>"; };
 		04912F8D2CB916F500CC3105 /* YHResignAppointViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignAppointViewModel.swift; sourceTree = "<group>"; };
 		04912F8F2CB917BC00CC3105 /* YHResignAppointMember.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignAppointMember.swift; sourceTree = "<group>"; };
@@ -1615,7 +1615,7 @@
 		04D144752C0452E200EE3758 /* YHOneKeyLoginManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHOneKeyLoginManager.swift; sourceTree = "<group>"; };
 		04D5C5652B8ED92600190021 /* YHBaseModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHBaseModel.swift; sourceTree = "<group>"; };
 		04DF69B82CB95241005AA41E /* YHResignAppointTimeSettingModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignAppointTimeSettingModel.swift; sourceTree = "<group>"; };
-		04DF69BA2CBA1CC5005AA41E /* YHResignAppointApplicantCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignAppointApplicantCell.swift; sourceTree = "<group>"; };
+		04DF69BA2CBA1CC5005AA41E /* YHResignSelectApplicantCollectCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignSelectApplicantCollectCell.swift; sourceTree = "<group>"; };
 		04E41DE72BD240570077EAE3 /* YHOrderDetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHOrderDetailViewController.swift; sourceTree = "<group>"; };
 		04E86E0C2B70D51D00A35F4B /* YHWebViewViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHWebViewViewController.swift; sourceTree = "<group>"; };
 		04E86E652B86EB6F00A35F4B /* YHLoginManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHLoginManager.swift; sourceTree = "<group>"; };
@@ -3640,12 +3640,12 @@
 				04912F712CB7714300CC3105 /* YHResignAppointTimeSingleCell.swift */,
 				04912F8B2CB907F100CC3105 /* YHResignAppointTimeMultipleCell.swift */,
 				04912F772CB7A11700CC3105 /* YHResignAppointOptionCell.swift */,
-				04912F792CB7A5F400CC3105 /* YHResignAppointApplicantInfoCell.swift */,
+				04912F792CB7A5F400CC3105 /* YHResignHaveAppointedApplicantsInfoCell.swift */,
 				04912F7D2CB7B2BA00CC3105 /* YHResignAppointOptionResultCell.swift */,
-				04912F832CB7D14D00CC3105 /* YHResignAppointedScheduleLineCollectCell.swift */,
-				04912F852CB7EF6100CC3105 /* YHResignHaveAppointedMultipleInfoCell.swift */,
-				04912F892CB9000200CC3105 /* YHResignHaveAppointedSingleInfoCell.swift */,
-				04DF69BA2CBA1CC5005AA41E /* YHResignAppointApplicantCell.swift */,
+				04912F832CB7D14D00CC3105 /* YHResignScheduleLineCollectCell.swift */,
+				04912F852CB7EF6100CC3105 /* YHResignScheduleMultipleInfoCell.swift */,
+				04912F892CB9000200CC3105 /* YHResignScheduleSingleInfoCell.swift */,
+				04DF69BA2CBA1CC5005AA41E /* YHResignSelectApplicantCollectCell.swift */,
 			);
 			path = V;
 			sourceTree = "<group>";
@@ -5507,7 +5507,7 @@
 				04F2435B2C9D140C00DF2C74 /* YHHKRecordsTitleCell.swift in Sources */,
 				044F393A2CB7772D007CA277 /* YHVisaRenewalGuideRemarkCell.swift in Sources */,
 				041892242C91BCF100B9FB94 /* YHResignRoundCellType.swift in Sources */,
-				04912F7A2CB7A5F400CC3105 /* YHResignAppointApplicantInfoCell.swift in Sources */,
+				04912F7A2CB7A5F400CC3105 /* YHResignHaveAppointedApplicantsInfoCell.swift in Sources */,
 				0430E6722C749E74000511E2 /* YHAdopterBirthViewController.swift in Sources */,
 				048058392C7F289700502CAA /* YHTravelCertificateItemView.swift in Sources */,
 				045EEE7B2B9F171A0022A143 /* YHPersonInfoCellModel2.swift in Sources */,
@@ -5961,7 +5961,7 @@
 				0430E6642C7482DD000511E2 /* YHYHAdopterTravelViewModel.swift in Sources */,
 				A5CA3F502C7447FB00EB22F5 /* YHUploadCertificateVC.swift in Sources */,
 				04A7BD192BA441D400BD35A2 /* YHMyDocumentsUrlModel.swift in Sources */,
-				04DF69BB2CBA1CC5005AA41E /* YHResignAppointApplicantCell.swift in Sources */,
+				04DF69BB2CBA1CC5005AA41E /* YHResignSelectApplicantCollectCell.swift in Sources */,
 				04174D792BCD5B74000BA46D /* YHMessageSessionCell.swift in Sources */,
 				044F39362CB6574D007CA277 /* YHVisaRenewalGuideHeaderCell.swift in Sources */,
 				04C85DE92C36BF49008B20D6 /* YHMyFileListFooterView.swift in Sources */,
@@ -5989,7 +5989,7 @@
 				0435FA7F2BA178C100024EAE /* YHCommonAlertView.swift in Sources */,
 				A5ACE9382B4564F7002C94D2 /* UIApplication+Extension.swift in Sources */,
 				0468D42B2B55019900CFB916 /* YHAnalytics.swift in Sources */,
-				04912F842CB7D14D00CC3105 /* YHResignAppointedScheduleLineCollectCell.swift in Sources */,
+				04912F842CB7D14D00CC3105 /* YHResignScheduleLineCollectCell.swift in Sources */,
 				0445E6B12BE9E15C003C52F9 /* YHFindAppNewVersionView.swift in Sources */,
 				045EEEBE2B9F171A0022A143 /* YHResultBottomView.swift in Sources */,
 				045EEEEB2B9F171A0022A143 /* YHTest.swift in Sources */,
@@ -6117,7 +6117,7 @@
 				A517A4E12BB573EB000DEECD /* YHDocListCell.swift in Sources */,
 				A58037212BAD7B2A0031C312 /* YHMySchemeModel.swift in Sources */,
 				0493B3DE2BA80C2300AF9393 /* YHCertificateFilterButton.swift in Sources */,
-				04912F862CB7EF6200CC3105 /* YHResignHaveAppointedMultipleInfoCell.swift in Sources */,
+				04912F862CB7EF6200CC3105 /* YHResignScheduleMultipleInfoCell.swift in Sources */,
 				04912F8E2CB916F500CC3105 /* YHResignAppointViewModel.swift in Sources */,
 				04F2435D2C9D153C00DF2C74 /* YHHKRecordsTimeSelectCell.swift in Sources */,
 				0430E6902C7EC78C000511E2 /* YHCardUploadView.swift in Sources */,
@@ -6149,7 +6149,7 @@
 				04506F552C6F57E600738EA1 /* YHFamilyMemberInfoCell.swift in Sources */,
 				044EE23E2C92E27500A2FE3A /* YHResignCertificateDetailViewController.swift in Sources */,
 				04912F822CB7CFAE00CC3105 /* YHResignAppointedScheduleLineView.swift in Sources */,
-				04912F8A2CB9000200CC3105 /* YHResignHaveAppointedSingleInfoCell.swift in Sources */,
+				04912F8A2CB9000200CC3105 /* YHResignScheduleSingleInfoCell.swift in Sources */,
 				04256E102C75BD2700A37BA4 /* YHVisaPaymentVC.swift in Sources */,
 				A5ACE9562B4564F7002C94D2 /* YHBouncesContentView.swift in Sources */,
 				A554A5122B99715000EA5973 /* YHConstantArrayData.swift in Sources */,

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignHKAppoint(在港递交预约)/C/YHResignAppointScheduleListViewController.swift

@@ -39,8 +39,8 @@ class YHResignAppointScheduleListViewController: YHBaseViewController {
         tableView.separatorStyle = .none
         tableView.bounces = false
 
-        tableView.register(YHResignHaveAppointedMultipleInfoCell.self, forCellReuseIdentifier: YHResignHaveAppointedMultipleInfoCell.cellReuseIdentifier)
-        tableView.register(YHResignHaveAppointedSingleInfoCell.self, forCellReuseIdentifier: YHResignHaveAppointedSingleInfoCell.cellReuseIdentifier)
+        tableView.register(YHResignScheduleMultipleInfoCell.self, forCellReuseIdentifier: YHResignScheduleMultipleInfoCell.cellReuseIdentifier)
+        tableView.register(YHResignScheduleSingleInfoCell.self, forCellReuseIdentifier: YHResignScheduleSingleInfoCell.cellReuseIdentifier)
         tableView.delegate = self
         tableView.dataSource = self
         return tableView
@@ -360,7 +360,7 @@ extension YHResignAppointScheduleListViewController: UITableViewDelegate, UITabl
         if 0 <= indexPath.row && indexPath.row < scheduleArr.count {
             let model = scheduleArr[indexPath.row]
             if scheduleArr.count <= 1 {
-                let cell = tableView.dequeueReusableCell(withIdentifier: YHResignHaveAppointedSingleInfoCell.cellReuseIdentifier, for: indexPath) as! YHResignHaveAppointedSingleInfoCell
+                let cell = tableView.dequeueReusableCell(withIdentifier: YHResignScheduleSingleInfoCell.cellReuseIdentifier, for: indexPath) as! YHResignScheduleSingleInfoCell
                 cell.updateModel(model)
                 // 点击确认在港或未确认在港按钮
                 cell.clickConfirmBtnBlock = {
@@ -379,7 +379,7 @@ extension YHResignAppointScheduleListViewController: UITableViewDelegate, UITabl
             }
             
             // 分组
-            let cell2 = tableView.dequeueReusableCell(withIdentifier: YHResignHaveAppointedMultipleInfoCell.cellReuseIdentifier, for: indexPath) as! YHResignHaveAppointedMultipleInfoCell
+            let cell2 = tableView.dequeueReusableCell(withIdentifier: YHResignScheduleMultipleInfoCell.cellReuseIdentifier, for: indexPath) as! YHResignScheduleMultipleInfoCell
             model.batchIndex = indexPath.row+1
             cell2.updateModel(model)
             cell2.clickConfirmBtnBlock = {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignHKAppoint(在港递交预约)/C/YHResignAppointTimeModifyViewController.swift

@@ -33,7 +33,7 @@ class YHResignAppointTimeModifyViewController: YHBaseViewController {
         tableView.separatorStyle = .none
         tableView.bounces = false
         tableView.register(YHResignAppointOptionResultCell.self, forCellReuseIdentifier: YHResignAppointOptionResultCell.cellReuseIdentifier)
-        tableView.register(YHResignAppointApplicantInfoCell.self, forCellReuseIdentifier: YHResignAppointApplicantInfoCell.cellReuseIdentifier)
+        tableView.register(YHResignHaveAppointedApplicantsInfoCell.self, forCellReuseIdentifier: YHResignHaveAppointedApplicantsInfoCell.cellReuseIdentifier)
         tableView.register(YHResignAppointTimeMultipleCell.self, forCellReuseIdentifier: YHResignAppointTimeMultipleCell.cellReuseIdentifier)
         tableView.delegate = self
         tableView.dataSource = self
@@ -129,7 +129,7 @@ extension YHResignAppointTimeModifyViewController: UITableViewDelegate, UITableV
         if 0 <= indexPath.row && indexPath.row < selectGroupArr.count {
             let model = selectGroupArr[indexPath.row]
             if model.isHaveAppointed { // 已确认在港 只展示信息
-                let cell1 = tableView.dequeueReusableCell(withIdentifier: YHResignAppointApplicantInfoCell.cellReuseIdentifier, for: indexPath) as! YHResignAppointApplicantInfoCell
+                let cell1 = tableView.dequeueReusableCell(withIdentifier: YHResignHaveAppointedApplicantsInfoCell.cellReuseIdentifier, for: indexPath) as! YHResignHaveAppointedApplicantsInfoCell
                 cell1.updateModel(model)
                 return cell1
             }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignHKAppoint(在港递交预约)/V/YHResignAppointTimeMultipleCell.swift

@@ -84,7 +84,7 @@ class YHResignAppointTimeMultipleCell: UITableViewCell {
         collectView.dataSource = self
         collectView.backgroundColor = .clear
         // 注册自定义单元格
-        collectView.register(YHResignAppointApplicantCell.self, forCellWithReuseIdentifier: YHResignAppointApplicantCell.cellReuseIdentifier)
+        collectView.register(YHResignSelectApplicantCollectCell.self, forCellWithReuseIdentifier: YHResignSelectApplicantCollectCell.cellReuseIdentifier)
         return collectView
     }()
     
@@ -425,7 +425,7 @@ extension YHResignAppointTimeMultipleCell: UICollectionViewDelegate, UICollectio
         // 返回自定义单元格
         func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
             
-            let cell = collectionView.dequeueReusableCell(withReuseIdentifier: YHResignAppointApplicantCell.cellReuseIdentifier, for: indexPath) as! YHResignAppointApplicantCell
+            let cell = collectionView.dequeueReusableCell(withReuseIdentifier: YHResignSelectApplicantCollectCell.cellReuseIdentifier, for: indexPath) as! YHResignSelectApplicantCollectCell
             if 0 <= indexPath.item && indexPath.item < arr.count {
                 let applicant = arr[indexPath.item]
                 cell.updateApplicantInfo(applicant)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignHKAppoint(在港递交预约)/V/YHResignAppointedScheduleLineView.swift

@@ -44,7 +44,7 @@ class YHResignAppointedScheduleLineView: UIView {
         
         let collectionView = UICollectionView(frame: .zero, collectionViewLayout: flowLayout)
         collectionView.backgroundColor = .clear
-        collectionView.register(YHResignAppointedScheduleLineCollectCell.self, forCellWithReuseIdentifier:YHResignAppointedScheduleLineCollectCell.cellReuseIdentifier)
+        collectionView.register(YHResignScheduleLineCollectCell.self, forCellWithReuseIdentifier:YHResignScheduleLineCollectCell.cellReuseIdentifier)
         collectionView.delegate = self
         collectionView.dataSource = self
         collectionView.bounces = false
@@ -134,7 +134,7 @@ extension YHResignAppointedScheduleLineView: UICollectionViewDelegate, UICollect
         
         // 返回自定义单元格
         func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
-            let cell = collectionView.dequeueReusableCell(withReuseIdentifier: YHResignAppointedScheduleLineCollectCell.cellReuseIdentifier, for: indexPath) as! YHResignAppointedScheduleLineCollectCell
+            let cell = collectionView.dequeueReusableCell(withReuseIdentifier: YHResignScheduleLineCollectCell.cellReuseIdentifier, for: indexPath) as! YHResignScheduleLineCollectCell
             if 0 <= indexPath.item && indexPath.item < steps.count {
                 let model = steps[indexPath.item]
                 model.index = indexPath.item+1

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignHKAppoint(在港递交预约)/V/YHResignAppointApplicantInfoCell.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignHKAppoint(在港递交预约)/V/YHResignHaveAppointedApplicantsInfoCell.swift

 //
-//  YHResignAppointApplicantInfoCell.swift
+//  YHResignHaveAppointedApplicantsInfoCell.swift
 //  galaxy
 //
 //  Created by edy on 2024/10/10.
@@ -9,9 +9,9 @@
 import UIKit
 import AttributedString
 
-class YHResignAppointApplicantInfoCell: UITableViewCell {
+class YHResignHaveAppointedApplicantsInfoCell: UITableViewCell {
 
-    static let cellReuseIdentifier = "YHResignAppointApplicantInfoCell"
+    static let cellReuseIdentifier = "YHResignHaveAppointedApplicantsInfoCell"
 
     lazy var whiteContentView: UIView = {
         let view = UIView()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignHKAppoint(在港递交预约)/V/YHResignAppointedScheduleLineCollectCell.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignHKAppoint(在港递交预约)/V/YHResignScheduleLineCollectCell.swift

 //
-//  YHResignAppointedScheduleLineCell.swift
+//  YHResignScheduleLineCollectCell.swift
 //  galaxy
 //
 //  Created by edy on 2024/10/10.
@@ -8,9 +8,9 @@
 
 import UIKit
 
-class YHResignAppointedScheduleLineCollectCell: UICollectionViewCell {
+class YHResignScheduleLineCollectCell: UICollectionViewCell {
     
-    static let cellReuseIdentifier = "YHResignAppointedScheduleLineCollectCell"
+    static let cellReuseIdentifier = "YHResignScheduleLineCollectCell"
 
     lazy var numLabel: UILabel =  {
         var label = UILabel()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignHKAppoint(在港递交预约)/V/YHResignHaveAppointedMultipleInfoCell.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignHKAppoint(在港递交预约)/V/YHResignScheduleMultipleInfoCell.swift

 //
-//  YHResignHaveAppointedInfoCellTableViewCell.swift
+//  YHResignScheduleMultipleInfoCell.swift
 //  galaxy
 //
 //  Created by edy on 2024/10/10.
@@ -8,9 +8,9 @@
 
 import UIKit
 
-class YHResignHaveAppointedMultipleInfoCell: UITableViewCell {
+class YHResignScheduleMultipleInfoCell: UITableViewCell {
 
-    static let cellReuseIdentifier = "YHResignHaveAppointedMultipleInfoCell"
+    static let cellReuseIdentifier = "YHResignScheduleMultipleInfoCell"
     
     var confirmHKStatus: YHResignConfirmHKStatus = .waitConfirmHK
     var clickConfirmBtnBlock: ((YHResignConfirmHKStatus)->())?

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignHKAppoint(在港递交预约)/V/YHResignHaveAppointedSingleInfoCell.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignHKAppoint(在港递交预约)/V/YHResignScheduleSingleInfoCell.swift

 //
-//  YHResignHaveAppointedSingleInfoCell.swift
+//  YHResignScheduleSingleInfoCell.swift
 //  galaxy
 //
 //  Created by edy on 2024/10/11.
@@ -14,9 +14,9 @@ enum YHResignConfirmHKStatus: Int {
     case haveConfirmHK = 2 // 已确认在港
 }
 
-class YHResignHaveAppointedSingleInfoCell: UITableViewCell {
+class YHResignScheduleSingleInfoCell: UITableViewCell {
 
-    static let cellReuseIdentifier = "YHResignHaveAppointedSingleInfoCell"
+    static let cellReuseIdentifier = "YHResignScheduleSingleInfoCell"
     
     var clickConfirmBtnBlock: ((YHResignConfirmHKStatus)->())?
     var modifyBtnBlock: (()->())?

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignHKAppoint(在港递交预约)/V/YHResignAppointApplicantCell.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignHKAppoint(在港递交预约)/V/YHResignSelectApplicantCollectCell.swift

 //
-//  YHResignAppointApplicantCell.swift
+//  YHResignSelectApplicantCollectCell.swift
 //  galaxy
 //
 //  Created by edy on 2024/10/12.
@@ -8,9 +8,9 @@
 
 import UIKit
 
-class YHResignAppointApplicantCell: UICollectionViewCell {
+class YHResignSelectApplicantCollectCell: UICollectionViewCell {
 
-    static let cellReuseIdentifier = "YHResignAppointApplicantCell"
+    static let cellReuseIdentifier = "YHResignSelectApplicantCollectCell"
 
     lazy var selectImgView:UIImageView = {
         let view = UIImageView(image: UIImage(named: ""))

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

@@ -167,6 +167,21 @@ class YHResignInfoConfirmModifyViewController: YHBaseViewController {
             }
         }
     }
+    
+    func requestNamePinYin() {
+        YHHUD.hide()
+        if !self.detailMember.name.isEmpty, self.detailMember.familyName.isEmpty {
+            YHHUD.show(.progress(message: "加载中..."))
+            self.viewModel.getPinYinFromName(self.detailMember.name) {
+                [weak self] firstName, lastName in
+                YHHUD.hide()
+                guard let self = self else { return }
+                self.detailMember.familyName = firstName
+                self.detailMember.givenName = lastName
+                self.updateData()
+            }
+        }
+    }
 }
 
 extension YHResignInfoConfirmModifyViewController: UITableViewDelegate, UITableViewDataSource {
@@ -202,13 +217,21 @@ extension YHResignInfoConfirmModifyViewController: UITableViewDelegate, UITableV
                         self.isInfoEditing = true
                         self.detailMember.isNeedCheck = true
                         self.updateData()
+                        self.requestNamePinYin()
                         return
                     }
                 }
+                
                 self.isInfoEditing = isEdit
                 self.updateData()
+                self.requestNamePinYin()
                 
             }
+            cell.updateNamePinYinBlock = {
+                [weak self] in
+                guard let self = self else { return }
+                self.requestNamePinYin()
+            }
             // 选择出生国家/地区
             cell.selectBirthNation = {
                 [weak self] isInChina in

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

@@ -143,6 +143,8 @@ class YHResignFamilyInfoListCell: UITableViewCell {
     
     // 是否进入编辑模式
     var editBlock:((Bool)->())?
+    // 更新姓名拼音
+    var updateNamePinYinBlock:(()->())?
     // 选择出生国家
     var selectBirthNation:((Bool)->())?
     // 姓名更改
@@ -249,32 +251,12 @@ class YHResignFamilyInfoListCell: UITableViewCell {
                     guard let self = self else { return }
                     self.updateList?()
                 }
-//                itemView.updateName = {
-//                    [weak self] text in
-//                    guard let self = self else { return }
-//                    for subView in self.itemsContentView.subviews {
-//                        if subView is YHResignInfoItemView {
-//                            let targetView = subView as! YHResignInfoItemView
-//                            if targetView.item.id == .firstName {
-//                                targetView.item.value = self.familyInfo.familyName
-//                            }
-//                            if targetView.item.id == .lastName {
-//                                targetView.item.value = self.familyInfo.givenName
-//                                targetView.updateItem(targetView.item, familyInfo: self.familyInfo)
-//                            }
-//                            targetView.updateItem(targetView.item, familyInfo: self.familyInfo)
-//                        }
-//                    }
-//                    self.itemsContentView.snp.updateConstraints { make in
-//                        make.top.equalTo(self.titleLabel.snp.bottom).offset(12)
-//                        make.left.equalTo(18)
-//                        make.right.equalTo(-18)
-//                        make.bottom.equalTo(0)
-//                    }
-//                    self.setNeedsLayout()
-//                    self.layoutIfNeeded()
-//
-//                }
+                itemView.updateNamePinYinBlock = {
+                    [weak self] in
+                    guard let self = self else { return }
+                    self.updateNamePinYinBlock?()
+                }
+                
             } else if let itemView = itemView as? YHResignInfoValidTimeItemView {
                 itemsContentView.addSubview(itemView)
                 itemView.updateItem(item, familyInfo: familyInfo)

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

@@ -17,8 +17,8 @@ class YHResignInfoItemView: UIView {
     
     var item: YHResignFamilyInfoItem = YHResignFamilyInfoItem()
     var faimilyInfo = YHResignInfoConfirmFamilyModel()
-    // 姓名更改
-    var updateName:((String)->())?
+    // 更新姓名拼音
+    var updateNamePinYinBlock:(()->())?
     var updateList:(()->())?
 
     let rightBtnWidth = 22.0
@@ -350,11 +350,8 @@ extension YHResignInfoItemView: UITextFieldDelegate {
     func textFieldDidEndEditing(_ textField: UITextField) {
         
         if self.item.id == .mainApplicantName || self.item.id == .spouseName || self.item.id == .childName {
-            // 名称编辑时需防抖请求拼音
-            debounceTimer?.invalidate()
-            debounceTimer = Timer.scheduledTimer(withTimeInterval: 1.0, repeats: false) { [weak self] _ in
-                self?.updateNamePinYin()
-            }
+            self.updateNamePinYin()
+
         } else {
             self.updateList?()
         }
@@ -371,17 +368,7 @@ extension YHResignInfoItemView: UITextFieldDelegate {
                 self.updateList?()
                 return
             }
-            
-            YHHUD.show(.progress(message: "加载中..."))
-            self.viewModel.getPinYinFromName(text) {
-                [weak self] firstNamePinYin, lastNamePinYin in
-                YHHUD.hide()
-                guard let self = self else { return }
-                self.faimilyInfo.familyName = firstNamePinYin
-                self.faimilyInfo.givenName = lastNamePinYin
-                self.updateList?()
-
-            }
+            self.updateNamePinYinBlock?()
         }
     }
     
@@ -395,6 +382,8 @@ extension YHResignInfoItemView: UITextFieldDelegate {
                 self.faimilyInfo.familyName = ""
                 self.faimilyInfo.givenName = ""
                 self.updateList?()
+            } else {
+                
             }
             return
         }

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

@@ -105,7 +105,7 @@ class YHResignInfoConfirmViewModel {
         }
     }
     
-    func getPinYinFromName(_ name: String, callback:((String, String)->())?) {
+    func getPinYinFromName(_ name: String, callback: @escaping ((String, String)->())) {
         
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.FamilyInfoConfirm.pinyinInfo
         let _ = YHNetRequest.getRequest(url: strUrl,params: ["name" : name]) { [weak self] json, code in
@@ -117,19 +117,19 @@ class YHResignInfoConfirmViewModel {
                 
                 guard let dic = json.data?.peel as? [String : Any], let resultModel = YHFamilyNamePinYin.deserialize(from: dic) else {
                     let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
-                    callback?("", "")
+                    callback("", "")
                     return
                 }
                 self.pinyinInfo = resultModel
-                callback?(resultModel.family_name, resultModel.given_name)
+                callback(resultModel.family_name, resultModel.given_name)
             } else {
                 
                 let err = YHErrorModel(errorCode: Int32(json.code), errorMsg: json.msg.isEmpty ? "" : json.msg)
-                callback?("", "")
+                callback("", "")
             }
             
         } failBlock: { err in
-            callback?("", "")
+            callback("", "")
         }
     }
 }