// 预览

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/OrderList(服务订单)/C/YHInformationPerfectListVC.swift

@@ -289,9 +289,9 @@ extension YHInformationPerfectListVC {
             
         } else if productType == 1 || productType == 2 || productType == 3 { // 高才ABC
             let vc = YHGCPreviewMainViewController()
+            vc.productType = productType
             vc.orderId = orderId
             vc.myDefaultIndex = index
-            vc.productType = productType
             navigationController?.pushViewController(vc)
         }
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/PersonInfoList(个人信息预览)/C/YHGCPreviewControllerHoldViewController.swift

@@ -11,6 +11,8 @@ import JXSegmentedView
 
 class YHGCPreviewControllerHoldViewController: UIViewController {
     
+    var productType : Int = 0 //0-优才  1-高才A 2-高才B 3-高才C
+
     var canScroll : Bool = false {
         didSet {
             for vc in arrItemVCs {
@@ -25,7 +27,13 @@ class YHGCPreviewControllerHoldViewController: UIViewController {
         }
     }
     
-    let arrItemTitles = ["主申请人信息","家庭成员信息","基本资料","学历/专业资格","工作经验","收入记录","其他信息"]
+    lazy var arrItemTitles:[String] = {
+        if productType == 1 { // 高才A
+            return ["主申请人信息","家庭成员信息","工作经验","收入记录", "基本资料"]
+        }
+        return ["主申请人信息","家庭成员信息","学历/专业资格","工作经验", "基本资料"]
+    }()
+    
     var arrItemVCs : [YHPreviewBaseViewController] = []
     var segmentedView : JXSegmentedView = JXSegmentedView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: 55))
     lazy var segmentedDataSource: JXSegmentedBaseDataSource = {
@@ -53,46 +61,49 @@ class YHGCPreviewControllerHoldViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        do {
+        if productType == 1 { // 高才A
+            
             //主申请人
-            let vc = YHGCPreviewMainApplicantInfoViewController()
-            arrItemVCs.append(vc)
-        }
-        do {
+            let vc1 = YHGCPreviewMainApplicantInfoViewController()
+            arrItemVCs.append(vc1)
             //家庭成员信息
-            let vc = YHGCPreviewFamilyMemberViewController()
-            arrItemVCs.append(vc)
-        }
-        do {
-            //基本资料
-            let vc = YHGCPreviewBasiceInformationViewController()
-            arrItemVCs.append(vc)
-        }
-        do {
-            //学历/专业资格
-            let vc = YHGCPreviewAcademicAndProfessionalQualificationViewController()
-            arrItemVCs.append(vc)
-        }
-        do {
+            let vc2 = YHGCPreviewFamilyMemberViewController()
+            arrItemVCs.append(vc2)
             //工作经验
-            let vc = YHGCPreviewWorkExpViewController()
-            arrItemVCs.append(vc)
-        }
-        
-        do {
+            let vc3 = YHGCPreviewWorkExpViewController()
+            arrItemVCs.append(vc3)
             // 收入记录
             let orderID = UserDefaults.standard.value(forKey: "orderIdForPreview") as? Int ?? 0
-            let vc = YHGCPreviewIncomeRecordViewController(orderId: orderID)
-            arrItemVCs.append(vc)
-        }
-        
-        do {
-            //其他信息
-            let vc = YHGCPreviewOtherInformationViewController()
-            arrItemVCs.append(vc)
+            let vc4 = YHGCPreviewIncomeRecordViewController(orderId: orderID)
+            arrItemVCs.append(vc4)
+            //基本资料
+            let vc5 = YHGCPreviewBasiceInformationViewController()
+            arrItemVCs.append(vc5)
+            
+        } else { // 高才BC
+            
+            //主申请人
+            let vc1 = YHGCPreviewMainApplicantInfoViewController()
+            arrItemVCs.append(vc1)
+            //家庭成员信息
+            let vc2 = YHGCPreviewFamilyMemberViewController()
+            arrItemVCs.append(vc2)
+            //学历/专业资格
+            let vc3 = YHGCPreviewAcademicAndProfessionalQualificationViewController()
+            arrItemVCs.append(vc3)
+            //工作经验
+            let vc4 = YHGCPreviewWorkExpViewController()
+            arrItemVCs.append(vc4)
+//            // 收入记录
+//            let orderID = UserDefaults.standard.value(forKey: "orderIdForPreview") as? Int ?? 0
+//            let vc5 = YHGCPreviewIncomeRecordViewController(orderId: orderID)
+//            arrItemVCs.append(vc5)
+            //基本资料
+            let vc6 = YHGCPreviewBasiceInformationViewController()
+            arrItemVCs.append(vc6)
+            
         }
         
-        
         //segmentedViewDataSource一定要通过属性强持有！！！！！！！！！
         segmentedView.dataSource = segmentedDataSource
         segmentedView.delegate = self

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/PersonInfoList(个人信息预览)/C/YHGCPreviewMainViewController.swift

@@ -34,6 +34,7 @@ class YHGCPreviewMainViewController: YHBaseViewController {
     
     lazy var cellView: YHGCPreviewControllerHoldViewController = {
         let ttt = YHGCPreviewControllerHoldViewController()
+        ttt.productType = self.productType
         ttt.myDefaultNavItemIndex = self.myDefaultIndex
         return ttt
     }()
@@ -126,7 +127,19 @@ extension YHGCPreviewMainViewController {
                     
                     self.nameLable.text = title
 //                    self.phoneLable.text = self.previewVM.mainApplicationInfoPreviewModel?.mobile ?? "-"
-                    self.phoneLable.text = "优才计划"
+                    
+                    var text = "高才"
+                    // 1-高才A 2-高才B 3-高才C
+                    if self.productType == 1 {
+                        text = "高才A类"
+                        
+                    } else if self.productType == 2 {
+                        text = "高才B类"
+                        
+                    } else if self.productType == 3 {
+                        text = "高才C类"
+                    }
+                    self.phoneLable.text = text
 //                    self.handleHeaderIcon()
                     
                 } else {