Merge branch 'qmas-1130' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into qmas-1130

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/M/YHInformationPerfectModel.swift

@@ -12,6 +12,8 @@ class YHInformationPerfectModel {
     var icon : String = ""
     var name : String = ""
     
+    var helpModel : YHPersonInfoFillStepModel?
+    
     var type : Int = -1 {
         didSet{
             
@@ -52,11 +54,32 @@ class YHInformationPerfectModel {
     var statusColor : UIColor = .failColor
     var isFinished : Bool = false {
         didSet {
-            status = isFinished ? "已完成" : "待完善"
-            color = isFinished ? UIColor.mainTextColor : UIColor.labelTextColor2
-            statusColor = isFinished ? UIColor.successColor : UIColor.labelTextColor2
-            if type != 1 {
-                icon = isFinished ? icon : icon
+            if let helpModel = helpModel,helpModel.policy_switch {
+                
+                if helpModel.step == 6 {
+                    status = "去修改"
+                    color = .mainTextColor
+                    statusColor = .brandMainColor
+                    if type != 1 {
+                        icon = isFinished ? icon : icon
+                    }
+                    
+                } else {
+                    
+                    status = isFinished ? "已完成" : "去修改"
+                    color = isFinished ? UIColor.mainTextColor : UIColor.labelTextColor2
+                    statusColor = isFinished ? UIColor.successColor : UIColor.labelTextColor2
+                    if type != 1 {
+                        icon = isFinished ? icon : icon
+                    }
+                }
+            } else {
+                status = isFinished ? "已完成" : "待完善"
+                color = isFinished ? UIColor.mainTextColor : UIColor.labelTextColor2
+                statusColor = isFinished ? UIColor.successColor : UIColor.labelTextColor2
+                if type != 1 {
+                    icon = isFinished ? icon : icon
+                }
             }
         }
     }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/M/YHPersonInfoFillStepModel.swift

@@ -14,5 +14,6 @@ struct YHPersonInfoFillStepModel: SmartCodable {
     var applicantName : String = ""
     var sweet_notify_status : Int = 0
     var sex : Int = 0
-    var policy_switch : Bool = false // false就是待完善  true : 也提交但不大要求
+    
+    var policy_switch : Bool = false // false就是待完善  true : 已提交但未满足条件
 }

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

@@ -323,12 +323,12 @@ extension YHServiceCenterMainViewModel {
                 
                 for (index,item) in arr.enumerated() {
                     let model = YHInformationPerfectModel()
+                    model.helpModel = resultModel
                     model.type = item
                     arrInfoFillStep.append(model)
                     
                     
                     if targetIndex == -1 {
-                        
                         //已完成6  或者 已提交7
                         model.isDoing = false
                         model.isFinished = true