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

galaxy/galaxy/Classes/Modules/Home(首页)/Life(生活)/C/YHLifeViewController.swift

@@ -52,6 +52,7 @@ class YHLifeViewController: YHBaseViewController {
     
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
+        loadData()
     }
 }
 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/V/YHWorkExperienceItemView.swift

@@ -560,6 +560,10 @@ class YHWorkExperienceItemView: UIView {
                 let model = YHOtherPickerViewItemData(title: item.company_name ?? "", subTitle: "", index: "\(item.id ?? 0)")
                 arrData.append(model)
             }
+            if arrData.count == 0 {
+                YHHUD.flash(message: "请确认工作经验中您是否已填写在职公司")
+                return
+            }
             YHOtherPickerView.show(type: .myCompany, selectTitle: self.dataSource?.message ?? "", arrData) {[weak self] data in
                 guard let self = self else { return }
                 self.dataSource?.message = data.title

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/MySignature(我的签字)/C/YHGCMySignatureDetailViewController.swift

@@ -313,7 +313,7 @@ extension YHGCMySignatureDetailViewController: UITableViewDelegate, UITableViewD
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         if indexPath.row == 0 {
             let cell = tableView.dequeueReusableCell(withClass: YHGCDocumentPromptTableViewCell.self)
-            cell.type = self.viewModel.mainModel?.doc_type ?? 0
+            cell.type = self.viewModel.mainModel
             cell.backgroundColor = .clear
             cell.contentView.backgroundColor = .clear
             return cell

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/MySignature(我的签字)/V/YHGCDocumentPromptTableViewCell.swift

@@ -16,7 +16,7 @@ class YHGCDocumentPromptTableViewCell: UITableViewCell {
     var titleLabel: UILabel!
     var subTitleLabel: UILabel!
     var link: String = ""
-    var type: Int = 0 {
+    var type: YHMySignatureDetailModel? {
         didSet {
             updatePrompt()
         }
@@ -92,8 +92,8 @@ class YHGCDocumentPromptTableViewCell: UITableViewCell {
             label.font = UIFont.PFSC_R(ofSize: 12)
             label.textColor = UIColor.labelTextColor2
             label.numberOfLines = 0
-            let a: ASAttributedString = .init("请如实填写，以下补充信息将使用于生成赴港同意书\n工作单位名称", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.subTextColor2))
-            let aa: ASAttributedString = .init("需要与盖章公司名称一致", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.brandMainColor))
+            let a: ASAttributedString = .init("请如实填写，以下补充信息将使用于生成赴港同意书\n单位名称", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.subTextColor2))
+            let aa: ASAttributedString = .init("需要与盖章单位名称一致", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.brandMainColor))
             label.attributed.text = a + aa
             return label
         }()
@@ -108,19 +108,51 @@ class YHGCDocumentPromptTableViewCell: UITableViewCell {
     
     func updatePrompt() {
         // 1000-代理委托书，1001-同意书，1002-声明书
-        
+        guard let dataSource = type else { return }
+        let type = dataSource.docType // 1000-代理委托书; 1001-赴港同意书; 1002-声明书
+        let state = dataSource.docStatus // 1003-待签署; 1004-已签署; 1005-待审核; 1006-已驳回; 1007-已完成
         if type == 1000 {
+            if state == 1000 || state == 1001 || state == 1002 || state == 1003 {
                 let a: ASAttributedString = .init("请主申请人", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.subTextColor2))
-            let aa: ASAttributedString = .init("点击签署或上传已签章文件", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.brandMainColor))
+                let aa: ASAttributedString = .init("点击签署或上传已签署文件", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.brandMainColor))
                 subTitleLabel.attributed.text = a + aa
+            } else if state == 1004 || state == 1005 || state == 1006 {
+                let a: ASAttributedString = .init("审核中，请您耐心等待~", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.subTextColor2))
+                subTitleLabel.attributed.text = a
+            } else {
+                let a: ASAttributedString = .init("您已完成签署，预祝您早日获批！", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.subTextColor2))
+                subTitleLabel.attributed.text = a
+            }
         } else if type == 1001 {
+            if state == 1000 || state == 1001 || state == 1002 {
+                let a: ASAttributedString = .init("请主申请人", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.subTextColor2))
+                let aa: ASAttributedString = .init("补充", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.brandMainColor))
+                let aaa: ASAttributedString = .init("信息以便进行后续签章", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.subTextColor2))
+                subTitleLabel.attributed.text = a + aa + aaa
+            } else if state == 1003 {
                 let a: ASAttributedString = .init("请主申请人", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.subTextColor2))
-            let aa: ASAttributedString = .init("点击签署或上传已签章文件", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.brandMainColor))
+                let aa: ASAttributedString = .init("上传已签章文件", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.brandMainColor))
                 subTitleLabel.attributed.text = a + aa
+            } else if state == 1004 || state == 1005 || state == 1006 {
+                let a: ASAttributedString = .init("审核中，请您耐心等待~", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.subTextColor2))
+                subTitleLabel.attributed.text = a
             } else {
+                let a: ASAttributedString = .init("您已完成签章，预祝您早日获批！", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.subTextColor2))
+                subTitleLabel.attributed.text = a
+            }
+        } else {
+            if state == 1000 || state == 1001 || state == 1002 || state == 1003{
                 let a: ASAttributedString = .init("请您尽快核对文本内容，如需修改，可进行在线编辑\n如内容无误，请主申请人", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.subTextColor2))
                 let aa: ASAttributedString = .init("点击签署或上传已签署文件", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.brandMainColor))
                 subTitleLabel.attributed.text = a + aa
+            } else if state == 1004 || state == 1005 || state == 1006 {
+                let a: ASAttributedString = .init("审核中，请您耐心等待~", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.subTextColor2))
+                subTitleLabel.attributed.text = a
+            } else {
+                let a: ASAttributedString = .init("您已完成签署，预祝您早日获批！", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.subTextColor2))
+                subTitleLabel.attributed.text = a
+            }
+            
         }
     }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/MySignature(我的签字)/VM/YHGCSignatureAddViewModel.swift

@@ -17,8 +17,8 @@ class YHGCSignatureAddViewModel: YHBaseViewModel {
     
     func getBaseDataSource(_ isShowPrompt: Bool) -> [YHSectionWorkExperienceModel] {
         let item = YHWorkExperienceModel(id: .id1, isNeed: true, title: "档案所在单位", isUserKeyBoard: true, prompts: "请输入", message: position.archives_location, isShowPrompts: isShowPrompt, alertMessage:"请输入")
-        let item1 = YHWorkExperienceModel(id: .id2, isNeed: true, title: "工作单位名称", isUserKeyBoard: true, prompts: "请选择", message: position.unit_name, isShowPrompts: isShowPrompt, alertMessage:"请选择")
-        let item2 = YHWorkExperienceModel(id: .id3, isNeed: true, title: "工作单位地址", isUserKeyBoard: true, prompts: "请选择", message: position.unit_address, isShowPrompts: isShowPrompt, alertMessage:"请输入")
+        let item1 = YHWorkExperienceModel(id: .id2, isNeed: true, title: "单位名称", isUserKeyBoard: true, prompts: "请选择", message: position.unit_name, isShowPrompts: isShowPrompt, alertMessage:"请选择")
+        let item2 = YHWorkExperienceModel(id: .id3, isNeed: true, title: "单位地址", isUserKeyBoard: true, prompts: "请选择", message: position.unit_address, isShowPrompts: isShowPrompt, alertMessage:"请输入")
         let item3 = YHWorkExperienceModel(id: .id4, isNeed: true, title: "负责人电话", isUserKeyBoard: true, prompts: "请输入", message: position.phone, isShowPrompts: isShowPrompt, alertMessage:"请输入")
         let item4 = YHWorkExperienceModel(id: .id5, isNeed: false, title: "公司邮箱", isUserKeyBoard: true, prompts: "请输入", message: position.email, isShowPrompts: isShowPrompt, alertMessage:"请输入")
        

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/IncomeRecord(收入记录)/C/YHGCIncomeRecordViewController.swift

@@ -498,7 +498,7 @@ extension YHGCIncomeRecordViewController: UITableViewDelegate, UITableViewDataSo
                 $0.departure_time == "至今"
             }
             if employments.count == 0 {
-                YHHUD.flash(message: "没有在职公司！")
+                YHHUD.flash(message: "请确认工作经验中您是否已填写在职公司")
                 return
             }
             let selectedId = viewModel.mainModel.consent_work_id > 0 ? viewModel.mainModel.consent_work_id : nil