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

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

@@ -14,4 +14,6 @@ class YHServiceCenterProgressModel : YHBaseModel {
     var status : Int = 0 // 0未知 1待开始 2进行中 3 已完成 4 后台进行中
     var num : Int = 0
     var type : Int = 0 // 1 证件 2 信息完善 3 我的评分 4 我的方案 5 我的签字 6我的文书
+    var pro_version : Int = 0
+    var reject_status : Int = 0
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHServiceOrderProgressTableViewCell.swift

@@ -106,10 +106,17 @@ extension YHServiceOrderProgressTableViewCell {
             if model.type == 2 {
                 titleLabel.text = "我的信息"
                 buttonLabel.text = "去填写"
-                let a: ASAttributedString = .init("您还有", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor(hex: 0x94a3b8)))
-                let aa: ASAttributedString = .init(NSAttributedString(string: "\(model.num)份"), .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.brandMainColor))
-                let aaa: ASAttributedString = .init("信息待填写哦~", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor(hex: 0x94a3b8)))
-                messageLabel.attributed.text = a + aa + aaa
+                if model.reject_status == 0 {
+                    let a: ASAttributedString = .init("您还有", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor(hex: 0x94a3b8)))
+                    let aa: ASAttributedString = .init(NSAttributedString(string: "\(model.num)份"), .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.brandMainColor))
+                    let aaa: ASAttributedString = .init("信息待填写哦~", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor(hex: 0x94a3b8)))
+                    messageLabel.attributed.text = a + aa + aaa
+                } else {
+                    let a: ASAttributedString = .init("您的信息被", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor(hex: 0x94a3b8)))
+                    let aa: ASAttributedString = .init(NSAttributedString(string: "驳回"), .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.warnColor))
+                    let aaa: ASAttributedString = .init("了哦～", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor(hex: 0x94a3b8)))
+                    messageLabel.attributed.text = a + aa + aaa
+                }
             }
             if model.type == 3 {
                 titleLabel.text = "我的评分"