// 消息

galaxy/galaxy/Classes/Modules/Message(消息)/C/YHMessageDetailListVC.swift

@@ -269,15 +269,47 @@ extension YHMessageDetailListVC: UITableViewDelegate, UITableViewDataSource {
                 self.navigationController?.popToRootViewController(animated: false)
                 goTabBarBy(tabType: .service)
                 
-            } else if self.type == YHMessageType.identityApproved.rawValue { // 身份获批
-                self.navigationController?.popToRootViewController(animated: false)
-                goTabBarBy(tabType: .service)
-                
-            } else if self.type == YHMessageType.goToHK.rawValue { // 赴港办证
-                
+            } else if (self.type == YHMessageType.identityApproved.rawValue ||
+                       self.type == YHMessageType.goToHK.rawValue)
             
-            } else if self.type == YHMessageType.renewal.rawValue { // 身份续签
+            { // 身份获批 或 赴港办证
+                let orderId = Int(item.orderId) ?? 0
                 
+                if item.redirectPage == "add_dependent" { // 新增受养人
+                    let vc = YHAddAdoptersViewController()
+                    vc.orderId = orderId
+                    navigationController?.pushViewController(vc)
+                    
+                } else if item.redirectPage == "principal_approval_success" { // 原则批获批成功
+                    let vc = YHPrincipleApprovedWaitSubmitVC()
+                    vc.orderId = orderId
+                    navigationController?.pushViewController(vc)
+                    
+                } else if item.redirectPage == "pay_electronic_visa" { // 电子签证缴费
+                    let vc = YHVisaPaymentVC()
+                    vc.orderID = orderId
+                    navigationController?.pushViewController(vc)
+                    
+                } else if item.redirectPage == "prepare_travel_certificate" { // 旅行证件准备
+                    let vc = YHTravelDocsPreparationListViewController()
+                    vc.orderId = orderId
+                    navigationController?.pushViewController(vc)
+                    
+                } else if item.redirectPage == "upload_pass_certificate" { // 上传过关证件
+                    let vc = YHUploadCertificateVC()
+                    vc.orderId = orderId
+                    navigationController?.pushViewController(vc)
+                    
+                } else if item.redirectPage == "appoint_for_id_card" { // 赴港办证预约
+                    let vc = YHCertificateAppointViewController()
+                    vc.orderId = orderId
+                    navigationController?.pushViewController(vc)
+                } else if self.type == YHMessageType.renewal.rawValue { // 身份续签
+                    
+                } else { // 其余条件进入服务页
+                    self.navigationController?.popToRootViewController(animated: false)
+                    goTabBarBy(tabType: .service)
+                }
             }
         }
     }

galaxy/galaxy/Classes/Modules/Message(消息)/M/YHMsgListModel.swift

@@ -104,6 +104,7 @@ class YHDetailMessageModel: SmartCodable {
     var isRead: Bool = false
     var orderId: String = ""
     var url: String = ""
+    var redirectPage: String = ""
     
     required init() {
         
@@ -113,5 +114,6 @@ class YHDetailMessageModel: SmartCodable {
         case id, title, content, time, url
         case isRead = "is_read"
         case orderId = "order_id"
+        case redirectPage = "redirect_page"
     }
 }