// 赴港

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AppointCertificate(3 赴港办证预约)/C/YHReAppointViewController.swift

@@ -103,6 +103,7 @@ class YHReAppointViewController: YHBaseViewController {
         item2.itemIndex = 0
         let group1 = YHSelectGroupMemberModel()
         group1.isAllMembersGoHK = true
+        group1.isShowReAppointView = true
         group1.arr = waitAppointMembers
         item2.model = group1
         item2.placeList = self.viewModel.placeList
@@ -145,8 +146,6 @@ extension YHReAppointViewController: UITableViewDelegate, UITableViewDataSource
             if item.type == .confirmGoHKInfo {
                 // 请您确认第X批赴港信息
                 let cell = tableView.dequeueReusableCell(withIdentifier: YHSelectApplicantGroupCell.cellReuseIdentifier, for: indexPath) as! YHSelectApplicantGroupCell
-                cell.isShowSelectUserView = false
-                cell.isShowRepointNameView = true
                 cell.repointMembersNameLabel.text = self.getReAppointMemberNameText()
                 cell.dataModel = item
                 cell.refreshBlock = {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AppointCertificate(3 赴港办证预约)/M/YHAppointItem.swift

@@ -68,4 +68,7 @@ class YHSelectGroupMemberModel {
     
     // 是否统一赴港
     var isAllMembersGoHK: Bool = false
+    
+    // 是否显示重新预约人员名单
+    var isShowReAppointView: Bool = false
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AppointCertificate(3 赴港办证预约)/V/YHCertificateAppointOptionView.swift

@@ -33,7 +33,6 @@ class YHCertificateAppointOptionView: UIView {
         let label = UILabel()
         label.numberOfLines = 0
         label.font = UIFont.PFSC_M(ofSize: 14)
-        label.text = "张全蛋"
         label.textColor = UIColor.mainTextColor
         return label
     }()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AppointCertificate(3 赴港办证预约)/V/YHHaveGrabbedNumberInfoView.swift

@@ -75,7 +75,8 @@ class YHHaveGrabbedNumberInfoView: UIView {
         self.addSubview(intentionInfoView)
         
         lineView.snp.makeConstraints { make in
-            make.left.right.top.equalToSuperview()
+            make.top.equalTo(-0.5)
+            make.left.right.equalToSuperview()
             make.height.equalTo(0.5)
         }
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AppointCertificate(3 赴港办证预约)/V/YHInfoItemOptionView.swift

@@ -159,7 +159,7 @@ class YHInfoItemOptionView: UIView {
         lineView.snp.makeConstraints { make in
             make.left.equalTo(0)
             make.right.equalTo(0)
-            make.top.equalTo(0)
+            make.top.equalTo(-0.5)
             make.height.equalTo(0.5)
         }
 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AppointCertificate(3 赴港办证预约)/V/YHSelectApplicantGroupCell.swift

@@ -41,10 +41,12 @@ class YHSelectApplicantGroupCell: UITableViewCell {
                 }
             }
             
+            reAppontNameView.isHidden = !isShowRepointNameView
             reAppontNameView.snp.remakeConstraints { make in
                 make.top.equalTo(lineView.snp.bottom)
                 make.left.equalTo(18)
                 make.right.equalTo(-18)
+                make.bottom.equalTo(selectPanelView.snp.top)
                 if !isShowRepointNameView {
                     make.height.equalTo(0)
                 }
@@ -63,14 +65,31 @@ class YHSelectApplicantGroupCell: UITableViewCell {
     
     var isShowRepointNameView: Bool = false {
         didSet {
+            
+            selectPanelView.isHidden = !isShowSelectUserView
+            selectPanelView.snp.remakeConstraints { make in
+                make.top.equalTo(reAppontNameView.snp.bottom)
+                make.left.equalTo(0)
+                make.right.equalTo(0)
+                make.bottom.equalTo(optionsView.snp.top)
+                if !isShowSelectUserView {
+                    make.height.equalTo(0)
+                }
+            }
+            
+            optionsView.lineView.isHidden = (!isShowSelectUserView && !isShowRepointNameView)
+
+            reAppontNameView.isHidden = !isShowRepointNameView
             reAppontNameView.snp.remakeConstraints { make in
                 make.top.equalTo(lineView.snp.bottom)
                 make.left.equalTo(18)
                 make.right.equalTo(-18)
+                make.bottom.equalTo(selectPanelView.snp.top)
                 if !isShowRepointNameView {
                     make.height.equalTo(0)
                 }
             }
+            
             self.setNeedsLayout()
             self.layoutIfNeeded()
         }
@@ -231,22 +250,14 @@ class YHSelectApplicantGroupCell: UITableViewCell {
     lazy var reAppontNameView: UIView = {
         let view = UIView()
         
-        let lineView = UIView()
-        lineView.backgroundColor = .separatorColor
-        view.addSubview(lineView)
-        
         let grayView = UIView()
         grayView.backgroundColor = .init(hex: 0xF8F9FB)
         grayView.addSubview(repointMembersNameLabel)
         view.addSubview(grayView)
         
-        lineView.snp.makeConstraints { make in
-            make.left.right.top.equalTo(0)
-            make.height.equalTo(1)
-        }
         grayView.snp.makeConstraints { make in
             make.left.right.equalTo(0)
-            make.top.equalTo(lineView.snp.bottom).offset(12)
+            make.top.equalTo(12)
             make.bottom.equalTo(-12)
         }
         repointMembersNameLabel.snp.makeConstraints { make in
@@ -413,8 +424,8 @@ private extension YHSelectApplicantGroupCell {
         
         if let model = dataModel?.model {
             
-            let isShowSelectList = !model.isAllMembersGoHK
-            self.isShowSelectUserView = isShowSelectList
+            self.isShowSelectUserView = !model.isAllMembersGoHK
+            self.isShowRepointNameView = model.isShowReAppointView
             
             if model.isAllMembersGoHK {
                 let a: ASAttributedString = .init("*", .font(UIFont.PFSC_M(ofSize: 17)),.foreground(UIColor.failColor))