product_type 1- 优才 2-高才

application_type  1-高a  2-高b  3-高c

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

@@ -13,7 +13,7 @@ import UIKit
  */
 class YHInformationPerfectListVC: YHBaseViewController {
     var orderId : Int?
-    var productType : Int = 0 //0-优才  1-高才A 2-高才B 3-高才C
+    var productType2 : Int = 0 //1-优才  2-高才
     private var firstCheckFlag : Bool = false
     
     private lazy var serviceCenterMainReqVM : YHServiceCenterMainViewModel = {
@@ -111,7 +111,7 @@ class YHInformationPerfectListVC: YHBaseViewController {
     
     override func viewDidLoad() {
         super.viewDidLoad()
-        serviceCenterMainReqVM.productType = productType
+        serviceCenterMainReqVM.productType2 = productType2
         setupUI()
     }
     
@@ -264,10 +264,10 @@ extension YHInformationPerfectListVC {
     
     //我的方案
     @objc func goMySchemeVC() {
-        if productType == 0 { // 优才
+        if productType2 == 1 { // 优才
             YHMyNewSchemeViewController.shared.goToSchemePage()
 
-        } else if productType == 1 || productType == 2 || productType == 3 { // 高才ABC
+        } else if serviceCenterMainReqVM.application_type == 1 || serviceCenterMainReqVM.application_type == 2 || serviceCenterMainReqVM.application_type == 3 { // 高才ABC
             let vc = YHGCMineSchemeViewController()
             navigationController?.pushViewController(vc)
         }
@@ -281,15 +281,15 @@ extension YHInformationPerfectListVC {
     
     private func goInfoListVCOp(index : Int = 0) {
         
-        if productType == 0 { // 优才
+        if productType2 == 1 { // 优才
             let vc = YHPreviewMainViewController()
             vc.orderId = orderId
             vc.myDefaultIndex = index
             navigationController?.pushViewController(vc)
             
-        } else if productType == 1 || productType == 2 || productType == 3 { // 高才ABC
+        } else if serviceCenterMainReqVM.application_type == 1 || serviceCenterMainReqVM.application_type == 2 || serviceCenterMainReqVM.application_type == 3 { // 高才ABC
             let vc = YHGCPreviewMainViewController()
-            vc.productType = productType
+            vc.productType = serviceCenterMainReqVM.application_type
             vc.orderId = orderId
             vc.myDefaultIndex = index
             navigationController?.pushViewController(vc)
@@ -571,7 +571,7 @@ extension YHInformationPerfectListVC : UITableViewDelegate,UITableViewDataSource
     
     private func  handleJumpLogicDebug(tapIndex : Int) {
         
-        if productType == 0 {
+        if productType2 == 1 {
             //优才
             if tapIndex == 0 {
                 if self.serviceCenterMainReqVM.informationFillStepModel?.sweet_notify_status == 0 {
@@ -629,7 +629,7 @@ extension YHInformationPerfectListVC : UITableViewDelegate,UITableViewDataSource
             
         }
         
-        else if productType == 1 {
+        else if serviceCenterMainReqVM.application_type == 1 {
             //高才A
             if tapIndex == 0 {
                 if self.serviceCenterMainReqVM.informationFillStepModel?.sweet_notify_status == 0 {
@@ -668,7 +668,7 @@ extension YHInformationPerfectListVC : UITableViewDelegate,UITableViewDataSource
             
         }
         
-        else if productType == 2 || productType == 3 {
+        else if serviceCenterMainReqVM.application_type == 2 || serviceCenterMainReqVM.application_type == 3 {
             //高才BC
             if tapIndex == 0 {
                 if self.serviceCenterMainReqVM.informationFillStepModel?.sweet_notify_status == 0 {

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

@@ -277,7 +277,7 @@ class YHServiceOrderListViewController: YHBaseViewController {
 //            UIViewController.current?.navigationController?.pushViewController(vc)
             
             let vc = YHInformationPerfectListVC()
-            vc.productType = productType
+            vc.productType2 = productType
             vc.orderId = orderId
             UIViewController.current?.navigationController?.pushViewController(vc)
             
@@ -531,9 +531,9 @@ extension YHServiceOrderListViewController : UITableViewDelegate,UITableViewData
 
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         let model = self.arrDataForSeviceCenterProgress[indexPath.row]
-//        if model.status == 1 || model.status == 4 {
-//            return
-//        } else {
+        if model.status == 1 || model.status == 4 {
+            return
+        } else {
             YHServiceOrderListViewController.jumpToMessageController(type: model.type, orderId: orderID, stepID,productType: productInfoMode.product_type)
             if model.type == 3 {
                 //我的评分
@@ -542,7 +542,7 @@ extension YHServiceOrderListViewController : UITableViewDelegate,UITableViewData
                 //我的方案
                 handleRedPointFor(key: kMyPlanRedPointInfoKey, model: model)
             }
-//        }
+        }
     }
     
     func handleRedPointFor(key: String, model: YHServiceCenterProgressModel) {

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

@@ -18,7 +18,7 @@ struct YHContactItemModel : SmartCodable {
     var type : String = ""
     var mobile: String = ""
     var status: Int = 0
-    var product_type: Int = 0
+    var product_type: Int = 0 //1-优才  2-高才
     var isOther: Bool = false //是否协作单
     var service_name: String = ""
 }

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

@@ -10,7 +10,8 @@ import UIKit
 import SmartCodable
 class YHServiceCenterMainViewModel: YHBaseViewModel {
     
-    var productType : Int = 0 //0-优才  1-高才A 2-高才B 3-高才C
+    var productType2 : Int = 0 //1-优才  2-高才
+    var application_type : Int = 0  // 高才 才使用该数据 1-高A 2-高B 3-高C
     
     //合同列表 数据
     var arrContactList : [YHContactItemModel] = []
@@ -312,16 +313,17 @@ extension YHServiceCenterMainViewModel {
                 arrInfoFillStep.removeAll()
                 informationFillStepModel = resultModel
                 myInfoFillStep = resultModel.step   //当前正在进行的步骤
+                application_type = resultModel.application_type //高才类型
                 
                 
                 var arr : [Int] = []
-                if productType == 0 {
+                if productType2 == 1 {
                     //优才
                     arr = [0,1,2,3,4,5,8]
-                } else if productType == 1 {
+                } else if application_type == 1 {
                     //高A
                     arr = [0,1,2,4,5]
-                } else if productType == 2 || productType == 3 {
+                } else if application_type == 2 || application_type == 3 {
                     //高B、C
                     arr = [0,1,2,3,4,5]
                 } else {
@@ -341,7 +343,7 @@ extension YHServiceCenterMainViewModel {
                 
                 for (index,item) in arr.enumerated() {
                     let model = YHInformationPerfectModel()
-                    model.productType = productType
+                    model.productType = productType2 == 1 ? 0 : application_type
                     model.helpModel = resultModel
                     model.type = item
                     arrInfoFillStep.append(model)