// 赴港

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

@@ -91,12 +91,14 @@ class YHCertificateAppointViewController: YHBaseViewController {
         
         sections.removeAll()
         items1.removeAll()
+        items2.removeAll()
+        
         // *赴港办证
         let item1 = YHAppointItem(type: .goHKMakeCertificate)
         items1.append(item1)
         
         if self.isNeedGoHK != 1 { // 是否赴港办证没有选择是
-            self.tableView.reloadData()
+            refreshData()
             return
         }
         // 赴港办证选择了是
@@ -117,10 +119,12 @@ class YHCertificateAppointViewController: YHBaseViewController {
             items1.append(item4)
             
             if self.isAllMembersGo { // 申请人统一赴港激活签证
-                
+                let item5 = YHAppointItem(type: .confirmGoHKInfo)
+                items2.append(item4)
                 
             } else { // 申请人不是统一赴港激活签证
-                
+                let item6 = YHAppointItem(type: .confirmGoHKInfo)
+                items2.append(item6)
             }
             
         } else { // 有预约过的人员
@@ -134,16 +138,19 @@ class YHCertificateAppointViewController: YHBaseViewController {
             // 赴港办理抢号中批次
             if self.waitList.count > 0 {
                 let item6 = YHAppointItem(type: .grabingNumberBatch)
-                items1.append(item6)
+                items2.append(item6)
             }
             
             // 赴港办理已抢号批次
             if self.successList.count > 0 {
-                let item6 = YHAppointItem(type: .haveGrabedNumberBatch)
-                items1.append(item6)
+                let item7 = YHAppointItem(type: .haveGrabedNumberBatch)
+                items2.append(item7)
             }
         }
-        
+        refreshData()
+    }
+    
+    func refreshData() {
         if items1.count > 0 {
             sections.append(items1)
         }
@@ -327,10 +334,8 @@ extension YHCertificateAppointViewController {
     }
     
     func requetAppointMembers(completion:(()->())?) {
-        YHHUD.show(.progress(message: "加载中..."))
         viewModel.getGoHKFamilyMembers(orderId: orderId) {
             [weak self] success, error in
-            YHHUD.hide()
             guard let self = self else { return }
             let users = self.viewModel.hkUsers
             noNeedAppointMembers.removeAll()

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

@@ -15,9 +15,9 @@ class YHGrabingNumberListCell: UITableViewCell {
     var listArr: [YHAppointMemberGroupModel] = [] {
         didSet {
             listContainView.removeSubviews()
-            var lastView: YHHaveGrabbedNumberInfoView? = nil
+            var lastView: YHGrabingNumberListView? = nil
             for  (index, group) in listArr.enumerated() {
-                let listView = YHHaveGrabbedNumberInfoView(frame: .zero)
+                let listView = YHGrabingNumberListView(frame: .zero)
                 let chineseNum = convertNumberToChineseText(index+1)
                 listView.titleLabel.text = "第\(chineseNum)批"
                 listView.membersLabel.text = "成员：\(group.getMemberNames())"

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

@@ -60,12 +60,12 @@ class YHGrabingNumberListView: UIView {
         return view
     }()
     
-    lazy var intentionInfoView: UIView = {
+    lazy var intentionInfoView: YHGrabNumberInfoView = {
         let view = YHGrabNumberInfoView(frame: .zero)
         view.titleLabel.text = "意向信息"
-        let items = [YHGrabItem(type: .info, title: "期望赴港时间：", detail: "2023-07-17 ~ 2023-08-22"),
-                     YHGrabItem(type: .info, title: "期望香港办证点：", detail: "屯门办事处(屯门)"),
-                     YHGrabItem(type: .files, title: "抢号反馈回执：", detail: "", files: ["","","","",""]),]
+        let items = [YHGrabItem(type: .info, title: "期望赴港时间：", detail: ""),
+                     YHGrabItem(type: .info, title: "期望香港办证点：", detail: ""),
+                     YHGrabItem(type: .files, title: "抢号反馈回执：", detail: ""),]
         view.updateItems(items)
         return view
     }()
@@ -118,14 +118,12 @@ class YHGrabingNumberListView: UIView {
         grabInfoView.snp.makeConstraints { make in
             make.left.right.equalToSuperview()
             make.top.equalTo(membersLabel.snp.bottom).offset(16)
-//            make.height.equalTo(166)
         }
         
         intentionInfoView.snp.makeConstraints { make in
             make.left.right.equalToSuperview()
             make.top.equalTo(grabInfoView.snp.bottom).offset(16)
-//            make.height.equalTo(130)
-            make.bottom.equalTo(-16)
+            make.bottom.equalTo(0)
         }
     }
 }