// 赴港

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

@@ -194,34 +194,38 @@ class YHCertificateAppointViewController: YHBaseViewController {
             
             if self.isAllMembersGo { // 申请人统一赴港激活签证
                 
-                let item5 = YHAppointItem(type: .confirmGoHKInfo)
-                item5.itemIndex = 0
-                let group1 = YHSelectGroupMemberModel()
-                group1.isAllMembersGoHK = true
-                group1.arr = waitAppointMembers.deepCopy().map {
-                    let member = $0
-                    member.isSelected = true
-                    return member
+                if self.waitAppointMembers.count > 0 {
+                    let item5 = YHAppointItem(type: .confirmGoHKInfo)
+                    item5.itemIndex = 0
+                    let group1 = YHSelectGroupMemberModel()
+                    group1.isAllMembersGoHK = true
+                    group1.arr = waitAppointMembers.deepCopy().map {
+                        let member = $0
+                        member.isSelected = true
+                        return member
+                    }
+                    item5.model = group1
+                    item5.placeList = self.viewModel.placeList
+                    item5.arrHkHolidays = self.viewModel.dataModelForHkHolidays?.legaldays ?? []
+                    selectMemberGroupArr.append(item5)
                 }
-                item5.model = group1
-                item5.placeList = self.viewModel.placeList
-                item5.arrHkHolidays = self.viewModel.dataModelForHkHolidays?.legaldays ?? []
-                selectMemberGroupArr.append(item5)
                 
             } else { // 申请人不是统一赴港激活签证
-                let item6 = YHAppointItem(type: .confirmGoHKInfo)
-                item6.itemIndex = 0
-                let group1 = YHSelectGroupMemberModel()
-                group1.arr = waitAppointMembers.deepCopy().map {
-                    let member = $0
-                    member.isSelected = true
-                    return member
-                }
-                item6.model = group1
-                item6.placeList = self.viewModel.placeList
-                item6.arrHkHolidays = self.viewModel.dataModelForHkHolidays?.legaldays ?? []
-                selectMemberGroupArr.append(item6)
                 
+                if self.waitAppointMembers.count > 0 {
+                    let item6 = YHAppointItem(type: .confirmGoHKInfo)
+                    item6.itemIndex = 0
+                    let group1 = YHSelectGroupMemberModel()
+                    group1.arr = waitAppointMembers.deepCopy().map {
+                        let member = $0
+                        member.isSelected = true
+                        return member
+                    }
+                    item6.model = group1
+                    item6.placeList = self.viewModel.placeList
+                    item6.arrHkHolidays = self.viewModel.dataModelForHkHolidays?.legaldays ?? []
+                    selectMemberGroupArr.append(item6)
+                }
             }
             
         } else { // 有预约过的人员
@@ -277,13 +281,14 @@ class YHCertificateAppointViewController: YHBaseViewController {
                 self.bottomStatus = .confirmSubmitAppoint
                 
             } else if self.isNeedGoHK == 0 { // 赴港办证选否
-                // 底部按钮显示下一步去缴费
-                self.bottomStatus = .nextStepToPay
+                    // 底部按钮显示下一步去缴费
+                    self.bottomStatus = .nextStepToPay
                 
             } else { // 赴港办证未选择
                 // 不显示底部按钮
                 self.bottomStatus = .hidden
             }
+            
         } else { // 有预约过
             if waitAppointMembers.count <= 0 { // 全部都预约完了
                 self.bottomStatus = .nextStepToPay
@@ -748,6 +753,11 @@ extension YHCertificateAppointViewController {
     
     func submitAppointInfo() {
         
+        if self.waitAppointMembers.count <= 0 {
+            YHHUD.flash(message: "无赴港人员")
+            return
+        }
+        
         // 检测各批次是否有日期或办证地点未选择
         var isOK = true
         for item in self.selectMemberGroupArr {

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyViewController.swift

@@ -338,7 +338,7 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
         
         if true {
             let vc = YHCertificateAppointViewController()
-            vc.orderId = 151085
+            vc.orderId = 151086
             // 151296
             self.navigationController?.pushViewController(vc)
             return