// 预约

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -470,17 +470,20 @@
 		04912F642CB6885D00CC3105 /* YHResignFamilyMemberInfoCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04912F632CB6885D00CC3105 /* YHResignFamilyMemberInfoCell.swift */; };
 		04912F6E2CB6A64700CC3105 /* YHResignAppointSubmitTipsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04912F6D2CB6A64700CC3105 /* YHResignAppointSubmitTipsView.swift */; };
 		04912F702CB765FE00CC3105 /* YHResignAppointTimeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04912F6F2CB765FE00CC3105 /* YHResignAppointTimeViewController.swift */; };
-		04912F722CB7714300CC3105 /* YHResignAppointTimeCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04912F712CB7714300CC3105 /* YHResignAppointTimeCell.swift */; };
+		04912F722CB7714300CC3105 /* YHResignAppointTimeSingleCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04912F712CB7714300CC3105 /* YHResignAppointTimeSingleCell.swift */; };
 		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 */; };
 		04912F7C2CB7A7EE00CC3105 /* YHResignAppointShowTimeItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04912F7B2CB7A7EE00CC3105 /* YHResignAppointShowTimeItemView.swift */; };
 		04912F7E2CB7B2BA00CC3105 /* YHResignAppointOptionResultCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04912F7D2CB7B2BA00CC3105 /* YHResignAppointOptionResultCell.swift */; };
-		04912F802CB7CC0000CC3105 /* YHResignAppointedScheduleItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04912F7F2CB7CC0000CC3105 /* YHResignAppointedScheduleItemView.swift */; };
+		04912F802CB7CC0000CC3105 /* YHResignAppointedScheduleMultipleItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04912F7F2CB7CC0000CC3105 /* YHResignAppointedScheduleMultipleItemView.swift */; };
 		04912F822CB7CFAE00CC3105 /* YHResignAppointedScheduleLineView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04912F812CB7CFAE00CC3105 /* YHResignAppointedScheduleLineView.swift */; };
-		04912F842CB7D14D00CC3105 /* YHResignAppointedScheduleLineCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04912F832CB7D14D00CC3105 /* YHResignAppointedScheduleLineCell.swift */; };
-		04912F862CB7EF6200CC3105 /* YHResignHaveAppointedInfoCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04912F852CB7EF6100CC3105 /* YHResignHaveAppointedInfoCell.swift */; };
+		04912F842CB7D14D00CC3105 /* YHResignAppointedScheduleLineCollectCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04912F832CB7D14D00CC3105 /* YHResignAppointedScheduleLineCollectCell.swift */; };
+		04912F862CB7EF6200CC3105 /* YHResignHaveAppointedMultipleInfoCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04912F852CB7EF6100CC3105 /* YHResignHaveAppointedMultipleInfoCell.swift */; };
+		04912F882CB8FF3000CC3105 /* YHResignAppointedScheduleSingleItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04912F872CB8FF3000CC3105 /* YHResignAppointedScheduleSingleItemView.swift */; };
+		04912F8A2CB9000200CC3105 /* YHResignHaveAppointedSingleInfoCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04912F892CB9000200CC3105 /* YHResignHaveAppointedSingleInfoCell.swift */; };
+		04912F8C2CB907F200CC3105 /* YHResignAppointTimeMultipleCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04912F8B2CB907F100CC3105 /* YHResignAppointTimeMultipleCell.swift */; };
 		0493B3DC2BA7EFE600AF9393 /* YHCertificateSearchViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0493B3DB2BA7EFE600AF9393 /* YHCertificateSearchViewController.swift */; };
 		0493B3DE2BA80C2300AF9393 /* YHCertificateFilterButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0493B3DD2BA80C2300AF9393 /* YHCertificateFilterButton.swift */; };
 		049537852BA9B28500AF7E59 /* YHCertificateTemplateCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049537842BA9B28500AF7E59 /* YHCertificateTemplateCell.swift */; };
@@ -1367,17 +1370,20 @@
 		04912F632CB6885D00CC3105 /* YHResignFamilyMemberInfoCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignFamilyMemberInfoCell.swift; sourceTree = "<group>"; };
 		04912F6D2CB6A64700CC3105 /* YHResignAppointSubmitTipsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignAppointSubmitTipsView.swift; sourceTree = "<group>"; };
 		04912F6F2CB765FE00CC3105 /* YHResignAppointTimeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignAppointTimeViewController.swift; sourceTree = "<group>"; };
-		04912F712CB7714300CC3105 /* YHResignAppointTimeCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignAppointTimeCell.swift; sourceTree = "<group>"; };
+		04912F712CB7714300CC3105 /* YHResignAppointTimeSingleCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignAppointTimeSingleCell.swift; sourceTree = "<group>"; };
 		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>"; };
 		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>"; };
-		04912F7F2CB7CC0000CC3105 /* YHResignAppointedScheduleItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignAppointedScheduleItemView.swift; sourceTree = "<group>"; };
+		04912F7F2CB7CC0000CC3105 /* YHResignAppointedScheduleMultipleItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignAppointedScheduleMultipleItemView.swift; sourceTree = "<group>"; };
 		04912F812CB7CFAE00CC3105 /* YHResignAppointedScheduleLineView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignAppointedScheduleLineView.swift; sourceTree = "<group>"; };
-		04912F832CB7D14D00CC3105 /* YHResignAppointedScheduleLineCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignAppointedScheduleLineCell.swift; sourceTree = "<group>"; };
-		04912F852CB7EF6100CC3105 /* YHResignHaveAppointedInfoCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignHaveAppointedInfoCell.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>"; };
+		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>"; };
+		04912F8B2CB907F100CC3105 /* YHResignAppointTimeMultipleCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignAppointTimeMultipleCell.swift; sourceTree = "<group>"; };
 		0493B3DB2BA7EFE600AF9393 /* YHCertificateSearchViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateSearchViewController.swift; sourceTree = "<group>"; };
 		0493B3DD2BA80C2300AF9393 /* YHCertificateFilterButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateFilterButton.swift; sourceTree = "<group>"; };
 		049537842BA9B28500AF7E59 /* YHCertificateTemplateCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateTemplateCell.swift; sourceTree = "<group>"; };
@@ -3460,16 +3466,19 @@
 				04912F732CB7743900CC3105 /* YHResignAppointSelectTimeItemView.swift */,
 				04912F7B2CB7A7EE00CC3105 /* YHResignAppointShowTimeItemView.swift */,
 				04912F752CB77F4500CC3105 /* YHResignLeaveHKSwitchItemView.swift */,
-				04912F7F2CB7CC0000CC3105 /* YHResignAppointedScheduleItemView.swift */,
+				04912F7F2CB7CC0000CC3105 /* YHResignAppointedScheduleMultipleItemView.swift */,
+				04912F872CB8FF3000CC3105 /* YHResignAppointedScheduleSingleItemView.swift */,
 				04912F812CB7CFAE00CC3105 /* YHResignAppointedScheduleLineView.swift */,
 				04F4A5292CB8D5FA0026D469 /* YHForwardArriveHKAlertView.swift */,
 				04F4A52B2CB8F8190026D469 /* YHResignAppointedScheduleRiskTipsView.swift */,
-				04912F712CB7714300CC3105 /* YHResignAppointTimeCell.swift */,
+				04912F712CB7714300CC3105 /* YHResignAppointTimeSingleCell.swift */,
+				04912F8B2CB907F100CC3105 /* YHResignAppointTimeMultipleCell.swift */,
 				04912F772CB7A11700CC3105 /* YHResignAppointOptionCell.swift */,
 				04912F792CB7A5F400CC3105 /* YHResignAppointApplicantInfoCell.swift */,
 				04912F7D2CB7B2BA00CC3105 /* YHResignAppointOptionResultCell.swift */,
-				04912F832CB7D14D00CC3105 /* YHResignAppointedScheduleLineCell.swift */,
-				04912F852CB7EF6100CC3105 /* YHResignHaveAppointedInfoCell.swift */,
+				04912F832CB7D14D00CC3105 /* YHResignAppointedScheduleLineCollectCell.swift */,
+				04912F852CB7EF6100CC3105 /* YHResignHaveAppointedMultipleInfoCell.swift */,
+				04912F892CB9000200CC3105 /* YHResignHaveAppointedSingleInfoCell.swift */,
 			);
 			path = V;
 			sourceTree = "<group>";
@@ -5113,7 +5122,7 @@
 				04CA2BEC2CB7740000F36DE7 /* YHResignUploadTravelCardListfootView.swift in Sources */,
 				A5ACE9362B4564F7002C94D2 /* YHNetworkStatusManager.swift in Sources */,
 				048787D52BCE880B0036E221 /* YHServiceOrderListViewController.swift in Sources */,
-				04912F802CB7CC0000CC3105 /* YHResignAppointedScheduleItemView.swift in Sources */,
+				04912F802CB7CC0000CC3105 /* YHResignAppointedScheduleMultipleItemView.swift in Sources */,
 				0431F8842C9579F7003B84F4 /* YHResignTemplateSheetView.swift in Sources */,
 				A5D0012A2BABC84A001F003C /* YHFileListHeaerView.swift in Sources */,
 				0430E68C2C786257000511E2 /* YHAdopterIncomeViewModel.swift in Sources */,
@@ -5549,7 +5558,7 @@
 				04F2433F2C9ACF5C00DF2C74 /* YHHKRecordsEditContentVC.swift in Sources */,
 				045EEEC12B9F171A0022A143 /* YHOtherInfoFillModel.swift in Sources */,
 				047A3DF52C295AFF0048937B /* YHFriendListModel.swift in Sources */,
-				04912F722CB7714300CC3105 /* YHResignAppointTimeCell.swift in Sources */,
+				04912F722CB7714300CC3105 /* YHResignAppointTimeSingleCell.swift in Sources */,
 				0468D43A2B579EAC00CFB916 /* YHLoginViewModel.swift in Sources */,
 				04CE1AD72C2AD91F001CB80A /* YHActivityDetailViewController.swift in Sources */,
 				045EEE9E2B9F171A0022A143 /* YHWorkExampleModel.swift in Sources */,
@@ -5604,6 +5613,7 @@
 				A567E59F2BD7643D00D5D5A0 /* YHStartPageViewController.swift in Sources */,
 				045EEF202B9F171A0022A143 /* YHCardExampleView.swift in Sources */,
 				A567E5A72BD7643D00D5D5A0 /* YHHomeKingKongBlockView.swift in Sources */,
+				04912F8C2CB907F200CC3105 /* YHResignAppointTimeMultipleCell.swift in Sources */,
 				04A6715E2B9FFCA700C1FB91 /* YHCertificateNameCell.swift in Sources */,
 				047AA3F02C4F912D009C4554 /* YHListViewModel.swift in Sources */,
 				A567E5AF2BD7643D00D5D5A0 /* YHHomeWebViewBottomForSavePicView.swift in Sources */,
@@ -5685,7 +5695,7 @@
 				0435FA7F2BA178C100024EAE /* YHCommonAlertView.swift in Sources */,
 				A5ACE9382B4564F7002C94D2 /* UIApplication+Extension.swift in Sources */,
 				0468D42B2B55019900CFB916 /* YHAnalytics.swift in Sources */,
-				04912F842CB7D14D00CC3105 /* YHResignAppointedScheduleLineCell.swift in Sources */,
+				04912F842CB7D14D00CC3105 /* YHResignAppointedScheduleLineCollectCell.swift in Sources */,
 				0445E6B12BE9E15C003C52F9 /* YHFindAppNewVersionView.swift in Sources */,
 				045EEEBE2B9F171A0022A143 /* YHResultBottomView.swift in Sources */,
 				045EEEEB2B9F171A0022A143 /* YHTest.swift in Sources */,
@@ -5802,7 +5812,7 @@
 				A517A4E12BB573EB000DEECD /* YHDocListCell.swift in Sources */,
 				A58037212BAD7B2A0031C312 /* YHMySchemeModel.swift in Sources */,
 				0493B3DE2BA80C2300AF9393 /* YHCertificateFilterButton.swift in Sources */,
-				04912F862CB7EF6200CC3105 /* YHResignHaveAppointedInfoCell.swift in Sources */,
+				04912F862CB7EF6200CC3105 /* YHResignHaveAppointedMultipleInfoCell.swift in Sources */,
 				04F2435D2C9D153C00DF2C74 /* YHHKRecordsTimeSelectCell.swift in Sources */,
 				0430E6902C7EC78C000511E2 /* YHCardUploadView.swift in Sources */,
 				04FA8B2B2C06F59D00ABE43F /* YHAppleLoginManager.swift in Sources */,
@@ -5831,6 +5841,7 @@
 				04506F552C6F57E600738EA1 /* YHFamilyMemberInfoCell.swift in Sources */,
 				044EE23E2C92E27500A2FE3A /* YHResignCertificateDetailViewController.swift in Sources */,
 				04912F822CB7CFAE00CC3105 /* YHResignAppointedScheduleLineView.swift in Sources */,
+				04912F8A2CB9000200CC3105 /* YHResignHaveAppointedSingleInfoCell.swift in Sources */,
 				04256E102C75BD2700A37BA4 /* YHVisaPaymentVC.swift in Sources */,
 				A5ACE9562B4564F7002C94D2 /* YHBouncesContentView.swift in Sources */,
 				A554A5122B99715000EA5973 /* YHConstantArrayData.swift in Sources */,
@@ -5887,6 +5898,7 @@
 				044BACC72BCFA58E00184C64 /* YHNoDataTipsView.swift in Sources */,
 				04D5C5662B8ED92600190021 /* YHBaseModel.swift in Sources */,
 				A5F8AC082B9F414000A21EFA /* YHCustomTextView.swift in Sources */,
+				04912F882CB8FF3000CC3105 /* YHResignAppointedScheduleSingleItemView.swift in Sources */,
 				0414BDAD2BC7F02C00225367 /* YHMyNotifySettingVC.swift in Sources */,
 				0425E6402BA9357D00A5E763 /* YHScemeItemModel.swift in Sources */,
 				044EE22D2C9184CD00A2FE3A /* YHServiceMoreAlertView.swift in Sources */,

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

@@ -26,11 +26,13 @@ class YHResignAppointTimeViewController: YHBaseViewController {
         tableView.backgroundColor = .clear
         tableView.separatorStyle = .none
         tableView.bounces = false
-        tableView.register(YHResignAppointTimeCell.self, forCellReuseIdentifier: YHResignAppointTimeCell.cellReuseIdentifier)
+        tableView.register(YHResignAppointTimeSingleCell.self, forCellReuseIdentifier: YHResignAppointTimeSingleCell.cellReuseIdentifier)
         tableView.register(YHResignAppointOptionCell.self, forCellReuseIdentifier: YHResignAppointOptionCell.cellReuseIdentifier)
         tableView.register(YHResignAppointApplicantInfoCell.self, forCellReuseIdentifier: YHResignAppointApplicantInfoCell.cellReuseIdentifier)
         tableView.register(YHResignAppointOptionResultCell.self, forCellReuseIdentifier: YHResignAppointOptionResultCell.cellReuseIdentifier)
-        tableView.register(YHResignHaveAppointedInfoCell.self, forCellReuseIdentifier: YHResignHaveAppointedInfoCell.cellReuseIdentifier)
+        tableView.register(YHResignHaveAppointedMultipleInfoCell.self, forCellReuseIdentifier: YHResignHaveAppointedMultipleInfoCell.cellReuseIdentifier)
+        tableView.register(YHResignHaveAppointedSingleInfoCell.self, forCellReuseIdentifier: YHResignHaveAppointedSingleInfoCell.cellReuseIdentifier)
+        tableView.register(YHResignAppointTimeMultipleCell.self, forCellReuseIdentifier: YHResignAppointTimeMultipleCell.cellReuseIdentifier)
         tableView.delegate = self
         tableView.dataSource = self
         return tableView
@@ -110,7 +112,7 @@ extension YHResignAppointTimeViewController: UITableViewDelegate, UITableViewDat
     
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         
-        let cell2 = tableView.dequeueReusableCell(withIdentifier: YHResignAppointTimeCell.cellReuseIdentifier, for: indexPath) as! YHResignAppointTimeCell
+        let cell2 = tableView.dequeueReusableCell(withIdentifier: YHResignAppointTimeSingleCell.cellReuseIdentifier, for: indexPath) as! YHResignAppointTimeSingleCell
         
         if 0 <= indexPath.row && indexPath.row < familyArr.count {
             
@@ -130,7 +132,12 @@ extension YHResignAppointTimeViewController: UITableViewDelegate, UITableViewDat
             }
             
             if indexPath.row == 3 {
-                let cell1 = tableView.dequeueReusableCell(withIdentifier: YHResignHaveAppointedInfoCell.cellReuseIdentifier, for: indexPath) as! YHResignHaveAppointedInfoCell
+                let cell1 = tableView.dequeueReusableCell(withIdentifier: YHResignHaveAppointedSingleInfoCell.cellReuseIdentifier, for: indexPath) as! YHResignHaveAppointedSingleInfoCell
+                return cell1
+            }
+            
+            if indexPath.row == 4 {
+                let cell1 = tableView.dequeueReusableCell(withIdentifier: YHResignAppointTimeMultipleCell.cellReuseIdentifier, for: indexPath) as! YHResignAppointTimeMultipleCell
                 return cell1
             }
         }

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

+//
+//  YHResignAppointTimeMultipleCell.swift
+//  galaxy
+//
+//  Created by edy on 2024/10/11.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+import AttributedString
+
+class YHResignAppointTimeMultipleCell: UITableViewCell {
+
+    static let cellReuseIdentifier = "YHResignAppointTimeMultipleCell"
+    
+    var arr:[YHHKMemberModel] = {
+        let m1 = YHHKMemberModel()
+        m1.name = "侯林"
+        let m2 = YHHKMemberModel()
+        m2.name = "李小龙"
+        let m3 = YHHKMemberModel()
+        m3.name = "啊发顺丰进啦司法局阿里司法"
+        let m4 = YHHKMemberModel()
+        m4.name = "司法"
+        return [m1, m2, m3, m4]
+
+    }()
+    
+    lazy var whiteContentView: UIView = {
+        let view = UIView()
+        view.backgroundColor = .white
+        view.layer.cornerRadius = kCornerRadius6
+        return view
+    }()
+    
+    lazy var titleLabel: UILabel = {
+        let titleLabel = UILabel(frame: CGRect(x: 18, y: 16, width: KScreenWidth, height: 24.0))
+        let mustTag: ASAttributedString = .init("* ", .font(UIFont.PFSC_M(ofSize: 17)),.foreground(UIColor.failColor))
+        var title: ASAttributedString = .init("请确认第X批递交信息", .font(UIFont.PFSC_M(ofSize: 17)),.foreground(UIColor.mainTextColor))
+        title = mustTag + title
+        titleLabel.attributed.text = title
+        return titleLabel
+    }()
+    
+    lazy var lineView: UIView = {
+        let view = UIView()
+        view.backgroundColor = .separatorColor
+        return view
+    }()
+    
+    lazy var subTitleLabel: UILabel = {
+        let label = UILabel()
+        label.numberOfLines = 0
+        label.font = UIFont.PFSC_R(ofSize: 14)
+        label.textColor = UIColor.mainTextColor
+        label.text = "选择第X批赴港递交的申请人"
+        return label
+    }()
+    
+    lazy var selectBgView: UIView = {
+        let groupBgview = UIView()
+        groupBgview.backgroundColor = .init(hex: 0xF8F9FB)
+        groupBgview.layer.cornerRadius = kCornerRadius3
+        groupBgview.addSubview(collectionView)
+        
+        collectionView.snp.makeConstraints { make in
+            make.left.equalTo(14)
+            make.right.equalTo(-14)
+            make.height.equalTo(0)
+            make.top.equalTo(14)
+            make.bottom.equalTo(-14)
+        }
+        
+        return groupBgview
+    }()
+    
+    lazy var collectionView: UICollectionView = {
+        let layout = UICollectionViewFlowLayout()
+        layout.scrollDirection = .vertical
+        layout.minimumInteritemSpacing = 0.0
+        layout.minimumLineSpacing = 16.0
+        
+        let collectView = UICollectionView(frame:.zero, collectionViewLayout: layout)
+        collectView.delegate = self
+        collectView.dataSource = self
+        collectView.backgroundColor = .clear
+        // 注册自定义单元格
+        collectView.register(YHSelectApplicantCell.self, forCellWithReuseIdentifier: YHSelectApplicantCell.cellReuseIdentifier)
+        return collectView
+    }()
+    
+    lazy var submitTimeItemView: YHResignAppointSelectTimeItemView = {
+        let view = YHResignAppointSelectTimeItemView(frame: .zero)
+        view.title = "预约在港递交时间"
+        view.placeHolder = "请选择"
+        view.isNeedShowErrorTips = false
+        view.errorTips = "请选择在港递交时间"
+        view.detail = ""
+        view.updateLineMargin(-18.0)
+        view.clickBlock = {
+            [weak self] in
+            guard let self = self else { return }
+        }
+        return view
+    }()
+    
+    lazy var leaveTimeItemView: YHResignAppointSelectTimeItemView = {
+        let view = YHResignAppointSelectTimeItemView(frame: .zero)
+        view.title = "预计离港时间"
+        view.placeHolder = "请选择"
+        view.errorTips = "请选择离港时间"
+        view.isNeedShowErrorTips = false
+        view.detail = ""
+        view.clickBlock = {
+            [weak self] in
+            guard let self = self else { return }
+        }
+        return view
+    }()
+    
+    lazy var leaveHKSwithView: YHResignLeaveHKSwitchItemView = {
+        let view = YHResignLeaveHKSwitchItemView()
+        view.title = "暂不离港"
+        return view
+    }()
+    
+    required init?(coder: NSCoder) {
+        super.init(coder: coder)
+    }
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        setupUI()
+    }
+    
+    func setupUI() {
+        
+        self.selectionStyle = .none
+        self.backgroundColor = .clear
+        self.contentView.backgroundColor = .clear
+        
+        self.contentView.addSubview(whiteContentView)
+        whiteContentView.addSubview(titleLabel)
+        whiteContentView.addSubview(lineView)
+        whiteContentView.addSubview(subTitleLabel)
+        whiteContentView.addSubview(selectBgView)
+        whiteContentView.addSubview(submitTimeItemView)
+        whiteContentView.addSubview(leaveTimeItemView)
+        whiteContentView.addSubview(leaveHKSwithView)
+
+        whiteContentView.snp.makeConstraints { make in
+            make.left.right.top.equalToSuperview()
+            make.bottom.equalTo(-16)
+        }
+        
+        titleLabel.snp.makeConstraints { make in
+            make.left.equalTo(18)
+            make.right.equalTo(-18)
+            make.top.equalTo(16)
+            make.height.equalTo(24)
+        }
+        
+        lineView.snp.makeConstraints { make in
+            make.left.equalTo(0)
+            make.right.equalTo(0)
+            make.top.equalTo(titleLabel.snp.bottom).offset(12)
+            make.height.equalTo(0.5)
+        }
+        
+        subTitleLabel.snp.makeConstraints { make in
+            make.left.equalTo(18)
+            make.right.equalTo(-18)
+            make.top.equalTo(lineView.snp.bottom).offset(16)
+        }
+        
+        selectBgView.snp.makeConstraints { make in
+            make.left.equalTo(18)
+            make.right.equalTo(-18)
+            make.top.equalTo(subTitleLabel.snp.bottom).offset(12)
+        }
+        
+        submitTimeItemView.snp.makeConstraints { make in
+            make.left.equalTo(18)
+            make.right.equalTo(-18)
+            make.top.equalTo(selectBgView.snp.bottom).offset(16)
+        }
+        
+        leaveTimeItemView.snp.makeConstraints { make in
+            make.left.equalTo(18)
+            make.right.equalTo(-18)
+            make.top.equalTo(submitTimeItemView.snp.bottom)
+        }
+        
+        leaveHKSwithView.snp.makeConstraints { make in
+            make.left.equalTo(18)
+            make.right.equalTo(-18)
+            make.top.equalTo(leaveTimeItemView.snp.bottom)
+            make.bottom.equalToSuperview()
+        }
+        
+        updateUI()
+    }
+    
+    func updateUI() {
+        collectionView.reloadData()
+        collectionView.snp.updateConstraints { make in
+            make.height.equalTo(self.getCollectionViewHeight())
+        }
+        self.setNeedsLayout()
+        self.layoutIfNeeded()
+    }
+    
+    func getCollectionViewHeight() -> CGFloat {
+        
+        let rowHeight = 20.0
+        let gap = 16.0
+        var rowCount = arr.count/3
+        if arr.count%3 != 0 {
+            rowCount += 1
+        }
+        var height = 0.0
+        if rowCount > 0 {
+            height = rowHeight * Double(rowCount) + gap * Double(rowCount-1)
+        }
+        return height
+    }
+}
+
+extension YHResignAppointTimeMultipleCell: UICollectionViewDelegate, UICollectionViewDataSource, UICollectionViewDelegateFlowLayout  {
+    
+        // 返回单元格数量
+        func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
+            return arr.count
+        }
+        
+        // 返回每个单元格的大小
+        func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
+            
+            let listWidth = KScreenWidth-(14.0+18.0+16.0)*2.0
+            return CGSize(width: floorl(listWidth/3.0), height: 20)
+        }
+        
+        // 返回自定义单元格
+        func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
+            let cell = collectionView.dequeueReusableCell(withReuseIdentifier: YHSelectApplicantCell.cellReuseIdentifier, for: indexPath) as! YHSelectApplicantCell
+//            if let arr = dataModel?.model?.arr {
+                if 0 <= indexPath.item && indexPath.item < arr.count {
+                    let applicant = arr[indexPath.item]
+                    cell.updateApplicantInfo(applicant)
+                }
+//            }
+            
+            return cell
+        }
+    
+    func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
+        
+//        if let dataModel = self.dataModel, let model = dataModel.model {
+//            if 0 <= indexPath.item && indexPath.item < model.arr.count {
+//                let member = model.arr[indexPath.item]
+//                let selectArr = model.arr.filter {
+//                    return $0.isSelected == true
+//                }
+//                if selectArr.count == 1, member.isSelected == true, member.id == selectArr[0].id {
+//                    // 分组中仅有一个选中用户 且点击的是该用户
+//                    YHHUD.flash(message: "每一批赴港申请人不可为空，请确保每位申请人都在列")
+//                    return
+//                }
+//                selectBlock?(member, !member.isSelected, dataModel.itemIndex)
+//            }
+//        }
+    }
+}

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

@@ -9,9 +9,9 @@
 import UIKit
 import AttributedString
 
-class YHResignAppointTimeCell: UITableViewCell {
+class YHResignAppointTimeSingleCell: UITableViewCell {
 
-    static let cellReuseIdentifier = "YHResignFamilyMemberInfoCell"
+    static let cellReuseIdentifier = "YHResignAppointTimeSingleCell"
     
     lazy var whiteContentView: UIView = {
         let view = UIView()

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

@@ -8,9 +8,9 @@
 
 import UIKit
 
-class YHResignAppointedScheduleLineCell: UICollectionViewCell {
+class YHResignAppointedScheduleLineCollectCell: UICollectionViewCell {
     
-    static let cellReuseIdentifier = "YHResignAppointedScheduleLineCell"
+    static let cellReuseIdentifier = "YHResignAppointedScheduleLineCollectCell"
 
     lazy var numLabel: UILabel =  {
         var label = UILabel()

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

@@ -44,7 +44,7 @@ class YHResignAppointedScheduleLineView: UIView {
         
         let collectinoView = UICollectionView(frame: .zero, collectionViewLayout: flowLayout)
         collectinoView.backgroundColor = .init(hex: 0xF8F9FB)
-        collectinoView.register(YHResignAppointedScheduleLineCell.self, forCellWithReuseIdentifier:YHResignAppointedScheduleLineCell.cellReuseIdentifier)
+        collectinoView.register(YHResignAppointedScheduleLineCollectCell.self, forCellWithReuseIdentifier:YHResignAppointedScheduleLineCollectCell.cellReuseIdentifier)
         collectinoView.delegate = self
         collectinoView.dataSource = self
         collectinoView.bounces = false
@@ -96,7 +96,7 @@ extension YHResignAppointedScheduleLineView: UICollectionViewDelegate, UICollect
         
         // 返回自定义单元格
         func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
-            let cell = collectionView.dequeueReusableCell(withReuseIdentifier: YHResignAppointedScheduleLineCell.cellReuseIdentifier, for: indexPath) as! YHResignAppointedScheduleLineCell
+            let cell = collectionView.dequeueReusableCell(withReuseIdentifier: YHResignAppointedScheduleLineCollectCell.cellReuseIdentifier, for: indexPath) as! YHResignAppointedScheduleLineCollectCell
             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/YHResignAppointedScheduleItemView.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignHKAppoint(在港递交预约)/V/YHResignAppointedScheduleMultipleItemView.swift

@@ -8,7 +8,7 @@
 
 import UIKit
 
-class YHResignAppointedScheduleItemView: UIView {
+class YHResignAppointedScheduleMultipleItemView: UIView {
 
     lazy var lineView: UIView = {
         let view = UIView()

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

+//
+//  YHResignAppointedScheduleSingleItemView.swift
+//  galaxy
+//
+//  Created by edy on 2024/10/11.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHResignAppointedScheduleSingleItemView: UIView {
+
+    lazy var lineView: UIView = {
+        let view = UIView()
+        view.backgroundColor = .separatorColor
+        return view
+    }()
+    
+    lazy var applicantNamesLabel: UILabel = {
+        let label = UILabel()
+        label.font = UIFont.PFSC_M(ofSize: 14)
+        label.textColor = .mainTextColor
+        label.text = "申请人："
+        return label
+    }()
+    
+    lazy var confirmInHKLabel: UILabel = {
+        let label = UILabel()
+        label.text = "已确认在港"
+        label.font = UIFont.PFSC_M(ofSize: 13)
+        label.textColor = .init(hex: 0x3CC694)
+        return label
+    }()
+    
+    lazy var confirmInHKBtn: UIButton = {
+        let btn = UIButton()
+        btn.layer.cornerRadius = 2.0
+        btn.backgroundColor = .brandMainColor
+        btn.setTitleColor(.white, for: .normal)
+        btn.setTitle("确认在港", for: .normal)
+        btn.titleLabel?.font = .PFSC_M(ofSize: 11)
+        return btn
+    }()
+    
+    lazy var submitTimeLabel: UILabel = {
+        let label = UILabel()
+        label.font = UIFont.PFSC_R(ofSize: 12)
+        label.textColor = .mainTextColor(alpha: 0.5)
+        label.text = "预约递交时间: 0000-00-00  00:00"
+        return label
+    }()
+    
+    lazy var confirmHKTimeLabel: UILabel = {
+        let label = UILabel()
+        label.font = UIFont.PFSC_R(ofSize: 12)
+        label.textColor = .mainTextColor(alpha: 0.5)
+        label.text = "确认在港时间: 0000-00-00  00:00"
+        return label
+    }()
+    
+    lazy var scheduleView: YHResignAppointedScheduleLineView = {
+        let view = YHResignAppointedScheduleLineView(frame: .zero)
+        return view
+    }()
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        createUI()
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    func createUI() {
+        self.addSubview(lineView)
+        self.addSubview(applicantNamesLabel)
+        self.addSubview(confirmInHKBtn)
+        self.addSubview(confirmInHKLabel)
+        self.addSubview(confirmHKTimeLabel)
+        self.addSubview(submitTimeLabel)
+        self.addSubview(confirmHKTimeLabel)
+        self.addSubview(scheduleView)
+
+        lineView.snp.makeConstraints { make in
+            make.left.right.top.equalToSuperview()
+            make.height.equalTo(0.5)
+        }
+        
+        applicantNamesLabel.snp.makeConstraints { make in
+            make.left.equalTo(18)
+            make.right.equalTo(-18)
+            make.top.equalTo(lineView.snp.bottom).offset(18)
+        }
+        
+        confirmInHKBtn.snp.makeConstraints { make in
+            make.right.equalTo(-18)
+            make.width.equalTo(68)
+            make.height.equalTo(28)
+            make.centerY.equalTo(applicantNamesLabel)
+        }
+        
+        confirmInHKLabel.snp.makeConstraints { make in
+            make.right.equalTo(-18)
+            make.top.equalTo(applicantNamesLabel)
+            make.height.equalTo(18)
+        }
+        
+        submitTimeLabel.snp.makeConstraints { make in
+            make.left.equalTo(18)
+            make.right.equalTo(-18)
+            make.top.equalTo(applicantNamesLabel.snp.bottom).offset(8)
+
+        }
+        
+        confirmHKTimeLabel.snp.makeConstraints { make in
+            make.left.equalTo(18)
+            make.right.equalTo(-18)
+            make.top.equalTo(submitTimeLabel.snp.bottom).offset(8)
+        }
+        
+        scheduleView.snp.makeConstraints { make in
+            make.left.equalTo(18)
+            make.right.equalTo(-18)
+            make.top.equalTo(confirmHKTimeLabel.snp.bottom).offset(18)
+            make.height.equalTo(84.0)
+            make.bottom.equalTo(-18)
+        }
+    }
+}

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

@@ -8,9 +8,9 @@
 
 import UIKit
 
-class YHResignHaveAppointedInfoCell: UITableViewCell {
+class YHResignHaveAppointedMultipleInfoCell: UITableViewCell {
 
-    static let cellReuseIdentifier = "YHResignHaveAppointedInfoCell"
+    static let cellReuseIdentifier = "YHResignHaveAppointedMultipleInfoCell"
     
     lazy var whiteContentView: UIView = {
         let view = UIView()
@@ -94,9 +94,9 @@ class YHResignHaveAppointedInfoCell: UITableViewCell {
         
         let arr = ["", ""]
         batchView.removeSubviews()
-        var lastView: YHResignAppointedScheduleItemView? = nil
+        var lastView: YHResignAppointedScheduleMultipleItemView? = nil
         for (index, model) in arr.enumerated() {
-            let itemView = YHResignAppointedScheduleItemView(frame: .zero)
+            let itemView = YHResignAppointedScheduleMultipleItemView(frame: .zero)
             batchView.addSubview(itemView)
             itemView.snp.makeConstraints { make in
                 make.left.equalTo(0)

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

+//
+//  YHResignHaveAppointedSingleInfoCell.swift
+//  galaxy
+//
+//  Created by edy on 2024/10/11.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHResignHaveAppointedSingleInfoCell: UITableViewCell {
+
+    static let cellReuseIdentifier = "YHResignHaveAppointedSingleInfoCell"
+    
+    lazy var whiteContentView: UIView = {
+        let view = UIView()
+        view.backgroundColor = .white
+        view.layer.cornerRadius = kCornerRadius6
+        return view
+    }()
+    
+    lazy var titleLabel: UILabel = {
+        let label = UILabel()
+        label.numberOfLines = 0
+        label.font = UIFont.PFSC_M(ofSize: 17)
+        label.textColor = .mainTextColor
+        label.text = "赴港递交已预约"
+        return label
+    }()
+    
+    lazy var modifyBtn: UIButton = {
+        let btn = UIButton()
+        btn.setTitle("修改", for: .normal)
+        btn.setTitleColor(.brandMainColor, for: .normal)
+        btn.titleLabel?.font = .PFSC_M(ofSize: 14)
+        return btn
+    }()
+    
+    lazy var batchView: YHResignAppointedScheduleSingleItemView = {
+        let view = YHResignAppointedScheduleSingleItemView(frame: .zero)
+        return view
+    }()
+
+    required init?(coder: NSCoder) {
+        super.init(coder: coder)
+    }
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        setupUI()
+    }
+    
+    func setupUI() {
+        self.selectionStyle = .none
+        self.backgroundColor = .clear
+        self.contentView.backgroundColor = .clear
+        contentView.addSubview(whiteContentView)
+        whiteContentView.addSubview(titleLabel)
+        whiteContentView.addSubview(modifyBtn)
+        whiteContentView.addSubview(batchView)
+        
+        whiteContentView.snp.makeConstraints { make in
+            make.top.equalTo(0)
+            make.left.equalTo(0)
+            make.right.equalTo(0)
+            make.bottom.equalTo(-16)
+        }
+        
+        titleLabel.snp.makeConstraints { make in
+            make.top.equalTo(16)
+            make.left.equalTo(18)
+            make.right.equalTo(-18)
+            make.height.equalTo(24)
+        }
+        
+        modifyBtn.snp.makeConstraints { make in
+            make.width.equalTo(28)
+            make.height.equalTo(24)
+            make.right.equalTo(-18)
+            make.centerY.equalTo(titleLabel)
+        }
+        
+        batchView.snp.makeConstraints { make in
+            make.left.equalTo(0)
+            make.right.equalTo(0)
+            make.bottom.equalTo(0)
+            make.top.equalTo(titleLabel.snp.bottom).offset(12)
+        }
+    }
+
+}