// 预约

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceOrderListViewController.swift

@@ -258,6 +258,10 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
                 navigationController?.pushViewController(vc)
             } else if model.type == 24 {
                 //赴港时间预约
+                let vc = YHCertificateAppointViewController()
+                vc.orderId = orderID
+                self.navigationController?.pushViewController(vc)
+                
             } else if model.type == 25 {
                 //赴港行程指引
             } else if model.type == 26 {

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

@@ -132,7 +132,7 @@ class YHCertificateAppointViewController: YHBaseViewController {
         requestData()
     }
     
-    func requestData() {
+    func requestData(completion:(()->())? = nil) {
         YHHUD.show(.progress(message: "加载中..."))
         self.requetIsGoToHK { // 请求是否赴港办证选项和是否已预约过
             self.requetAppointMembers { // 请求赴港办证人员名单
@@ -141,10 +141,12 @@ class YHCertificateAppointViewController: YHBaseViewController {
                     self.requestAppointResultList { // 请求预约结果
                         YHHUD.hide()
                         self.updateData()
+                        completion?()
                     }
                 } else { // 没有预约过
                     YHHUD.hide()
                     self.updateData()
+                    completion?()
                 }
             }
         }
@@ -468,13 +470,6 @@ extension YHCertificateAppointViewController: UITableViewDelegate, UITableViewDa
         return UITableView.automaticDimension
     }
     
-    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        if 0 <= indexPath.section && indexPath.section < items1.count {
-            
-            self.saveHkexpectServicOp()//for test hjl
-        }
-    }
-    
     private func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> CGFloat {
         return 0.01
     }
@@ -556,7 +551,7 @@ extension YHCertificateAppointViewController {
 
 extension YHCertificateAppointViewController {
     //预约成功后调用
-    func saveHkexpectServicOp() {
+    func showSelectHKServiceAlertView() {
         
         if self.orderId > 0 {
             let key = "hkExpectService_\(self.orderId)"
@@ -566,7 +561,10 @@ extension YHCertificateAppointViewController {
             }
         }
         
-        self.viewModel.getServicelist { success, error in
+        YHHUD.show(.progress(message: "加载中..."))
+        self.viewModel.getServicelist {
+            success, error in
+            YHHUD.hide()
             let view = YHServiceSelectAlertView.alertView()
             view.items = self.viewModel.serviceArr
             view.confirmBlock = {
@@ -723,6 +721,9 @@ extension YHCertificateAppointViewController {
             
         } else if self.bottomStatus == .nextStepToPay {
             // 下一步去缴费
+            let vc = YHVisaPaymentVC()
+            vc.orderID = orderId
+            navigationController?.pushViewController(vc)
         }
     }
     
@@ -804,7 +805,9 @@ extension YHCertificateAppointViewController {
             guard let self = self else { return }
             if success {
                 YHHUD.flash(message: "提交成功")
-                self.requestData()
+                self.requestData {
+                    self.showSelectHKServiceAlertView()
+                }
                 return
             }
             let msg = error?.errorMsg ?? ""