// 收起状态

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/PrincipleBatch(原则批)/C/YHPrincipleApprovedWaitSubmitVC.swift

@@ -98,6 +98,7 @@ class YHPrincipleApprovedWaitSubmitVC: YHBaseViewController {
         viewModel.getEnvelopeInfo(orderId: orderId) { success, error in
             self.items.removeAll()
             // 已获得港府甄选名额
+            self.viewModel.envelopModel.isUnfold = true
             self.items.append(self.viewModel.envelopModel)
             self.tableView.reloadData()
         }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/PrincipleBatch(原则批)/C/YHPrincipleWaitResultViewController.swift

@@ -9,6 +9,18 @@
 import UIKit
 import AttributedString
 
+enum YHCustomerServiceStatus: Int {
+    
+    case none = 0
+    
+    case principleWaitResult = 11 // 原则批等待结果
+    case principleSupplement = 12 // 原则批待补件
+    case principleApproved = 13   // 原则批已获批
+    case principleRejected = 14   // 原则批未获批准
+    
+    case officialApproved = 15    // 正式批已获批
+}
+
 class YHPrincipleWaitResultViewController: YHBaseViewController {
 
     var orderId: Int = -1
@@ -47,16 +59,13 @@ class YHPrincipleWaitResultViewController: YHBaseViewController {
         super.viewDidLoad()
         self.view.backgroundColor = .white
         
-        // 11 原则批等待结果
-        // 12 原则批待补件
-        // 14 原则批未获批准
-        if self.status == 11 {
+        if self.status == YHCustomerServiceStatus.principleWaitResult.rawValue {
             self.gk_navTitle = "等待中"
             
-        } else if self.status == 12 {
+        } else if self.status == YHCustomerServiceStatus.principleRejected.rawValue {
             self.gk_navTitle = "未获批准"
         
-        } else if self.status == 14 {
+        } else if self.status == YHCustomerServiceStatus.principleSupplement.rawValue {
             self.gk_navTitle = "待补件"
         }
         gk_navigationBar.backgroundColor = .clear
@@ -96,24 +105,38 @@ extension YHPrincipleWaitResultViewController {
             }
             
             // 入境处已认收受理
-            if !waitResultModel.applicationFileNumberAttachment.isEmpty {
-                let model2 = waitResultModel.copy()
-                model2.type = .entry
-                model2.title = "入境处已认收受理"
-                model2.subTitle = "申请确认通知书：(来自香港入境处)"
-                model2.isUnfold = true
-                self.items.append(model2)
+            let model2 = waitResultModel.copy()
+            model2.type = .entry
+            model2.title = "入境处已认收受理"
+            model2.subTitle = "申请确认通知书：(来自香港入境处)"
+            if self.status ==  YHCustomerServiceStatus.principleWaitResult.rawValue { // 原则批等待结果
+                model2.isUnfold = waitResultModel.resultImageList.count <= 0
+                
+            } else if self.status == YHCustomerServiceStatus.principleSupplement.rawValue { // 原则批待补件
+                model2.isUnfold = false
+                
+            } else if self.status == YHCustomerServiceStatus.principleRejected.rawValue { // 原则批未获批准
+                model2.isUnfold = false
             }
+            self.items.append(model2)
+            
             
             // 申请资料已递交港府留档
-            if waitResultModel.fileNumberList.count > 0 {
-                let model3 = waitResultModel.copy()
-                model3.type = .profile
-                model3.title = "申请资料已递交港府留档"
-                model3.subTitle = "档案号："
-                model3.isUnfold = true
-                self.items.append(model3)
+            let model3 = waitResultModel.copy()
+            model3.type = .profile
+            model3.title = "申请资料已递交港府留档"
+            model3.subTitle = "档案号："
+            if self.status ==  YHCustomerServiceStatus.principleWaitResult.rawValue { // 原则批等待结果
+                model3.isUnfold = waitResultModel.resultImageList.count <= 0
+                
+            } else if self.status == YHCustomerServiceStatus.principleSupplement.rawValue { // 原则批待补件
+                model3.isUnfold = false
+                
+            } else if self.status == YHCustomerServiceStatus.principleRejected.rawValue { // 原则批未获批准
+                model3.isUnfold = false
             }
+            self.items.append(model3)
+            
            
             self.tableView.reloadData()
         }
@@ -188,7 +211,7 @@ extension YHPrincipleWaitResultViewController: UITableViewDelegate, UITableViewD
             name = String(name.prefix(5)) + "..."
         }
         let callName = self.viewModel.waitResultModel.applicant.sex == 2 ? "女士" : "先生"
-        let helloName = self.status == 12 ? "很遗憾，" : "您好，"
+        let helloName = self.status == YHCustomerServiceStatus.principleRejected.rawValue ? "很遗憾，" : "您好，"
         let title: ASAttributedString = .init("\(helloName)\(name)\(callName)！", .font(UIFont.PFSC_M(ofSize: 24)),.foreground(UIColor.mainTextColor))
         titleLabel.attributed.text = title
         view.addSubview(titleLabel)
@@ -245,7 +268,7 @@ extension YHPrincipleWaitResultViewController: UITableViewDelegate, UITableViewD
         // 13 原则批已获批
         // 14 未获批准~
     
-        if status == 11 { // 等待原则批结果
+        if status == YHCustomerServiceStatus.principleWaitResult.rawValue { // 等待原则批结果
             let str1: ASAttributedString = .init("您的【优秀人才入境计划】赴港居留申请资料已经递交港府，且入境事务处已经认收受理！港府审核周期预计在12个月内，", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor(alpha: 0.7)))
             let str2: ASAttributedString = .init("我们将实时为您查询身份申请进度", .font(UIFont.PFSC_B(ofSize: 14)),.foreground(UIColor.brandMainColor))
             var str3: ASAttributedString = .init("，请您耐心等待！", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor(alpha: 0.7)))
@@ -254,12 +277,12 @@ extension YHPrincipleWaitResultViewController: UITableViewDelegate, UITableViewD
             }
             return str1 + str2 + str3
             
-        } else if status == 12 { // 待补件
+        } else if status == YHCustomerServiceStatus.principleSupplement.rawValue { // 待补件
             let str1: ASAttributedString = .init("受港府邮件通知，需要您补充资料才能继续后续流程。", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor(alpha: 0.7)))
             let str2: ASAttributedString = .init("请联系为您服务的生活管家，为您提供更多详情！", .font(UIFont.PFSC_B(ofSize: 14)),.foreground(UIColor.brandMainColor))
             return str1 + str2
             
-        } else if status == 14 { // 未获批准~
+        } else if status == YHCustomerServiceStatus.principleRejected.rawValue { // 未获批准~
             
             let str1: ASAttributedString = .init("您【与家人】申请的【优秀人才入境计划】", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor(alpha: 0.7)))
             let str2: ASAttributedString = .init("未获批准", .font(UIFont.PFSC_B(ofSize: 14)),.foreground(UIColor.brandMainColor))