120部分需求开发

galaxy/galaxy/Classes/Modules/Home(首页)/V/YHHomeKingKongBlockView.swift

@@ -93,6 +93,19 @@ private extension YHHomeKingKongBlockView {
                 YHAnalytics.track("APP_Home_KingKong_5")
                 let vc = YHHKEventCenterViewController()
                 self.parentViewController?.navigationController?.pushViewController(vc)
+            case 6:
+                YHAnalytics.track("APP_Home_KingKong_6")
+                let vc = YHHomeWebViewController()
+#if DEBUG
+                vc.url = "https://test-hklife-business-uni.galaxy-immi.com/"
+#elseif TESTENV
+                vc.url = "https://test-hklife-business-uni.galaxy-immi.com/"
+#elseif UATENV
+                vc.url = "https://hklife-business-uni.galaxy-immi.com/"
+#else
+                vc.url = "https://hklife-business-uni.galaxy-immi.com/"
+#endif
+                self.parentViewController?.navigationController?.pushViewController(vc)
             default:
                 break
             }

galaxy/galaxy/Classes/Modules/Home(首页)/V/YHServiceOrderAlertView.swift

@@ -53,7 +53,7 @@ class YHServiceOrderAlertView: UIView {
         
         titleLabel = {
             let label = UILabel()
-            label.text = "原因说明"
+            label.text = "温馨提示"
             label.font = UIFont.PFSC_M(ofSize: 17)
             label.textColor = UIColor.mainTextColor
             label.textAlignment = .center
@@ -139,20 +139,14 @@ class YHServiceOrderAlertView: UIView {
             make.top.equalTo(157)
         }
         
-        let a: ASAttributedString = .init("1.当前仅支持查看", .font(UIFont.PFSC_R(ofSize: 15)),.foreground(UIColor.mainTextColor.withAlphaComponent(0.7)))
+        let a: ASAttributedString = .init("尊敬的银河用户，为了您的信息安全，银河港生活APP服务订单默认仅关联", .font(UIFont.PFSC_R(ofSize: 15)),.foreground(UIColor.mainTextColor.withAlphaComponent(0.7)))
         
-        let aa: ASAttributedString = .init(NSAttributedString(string: "优才与高才订单"), .font(UIFont.PFSC_R(ofSize: 15)),.foreground(UIColor.brandMainColor))
+        let aa: ASAttributedString = .init(NSAttributedString(string: "【签约手机号】"), .font(UIFont.PFSC_R(ofSize: 15)),.foreground(UIColor.brandMainColor))
         
-        
-        let aaa: ASAttributedString = .init("，如果是签约了其他高才、专才、留学等订单，请与您的服务管家或销售顾问企微沟通联系哦", .font(UIFont.PFSC_R(ofSize: 15)),.foreground(UIColor.mainTextColor.withAlphaComponent(0.7)))
-        
-        let b: ASAttributedString = .init(NSAttributedString(string: "2.使用其他手机号签约合同/订单，请退出登录"), .font(UIFont.PFSC_R(ofSize: 15)),.foreground(UIColor.mainTextColor.withAlphaComponent(0.7)))
-        
-        let bb: ASAttributedString = .init("切换账号", .font(UIFont.PFSC_R(ofSize: 15)),.foreground(UIColor.brandMainColor))
-        let bbb: ASAttributedString = .init("查看", .font(UIFont.PFSC_R(ofSize: 15)),.foreground(UIColor.mainTextColor.withAlphaComponent(0.7)))
+        let bb: ASAttributedString = .init("如您已签约银河服务，请改用签约手机号重新登录", .font(UIFont.PFSC_R(ofSize: 15)),.foreground(UIColor.brandMainColor))
 
-        measageLabel.attributed.text = a + aa + aaa
-        subMeasageLabel.attributed.text = b + bb + bbb
+        measageLabel.attributed.text = a + aa
+        subMeasageLabel.attributed.text = bb
         
         knowButton.backgroundColor = .brandMainColor
         knowButton.addYinHeGradualLayer()

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

@@ -197,7 +197,7 @@ extension YHServiceCenterViewController {
         
         titleLabel = {
             let button = UIButton(type: .custom)
-            button.setTitle("我的我的服务", for: .normal)
+            button.setTitle("我的服务    ", for: .normal)
             button.titleLabel?.font = UIFont.PFSC_M(ofSize: 21)
             button.setTitleColor(UIColor.mainTextColor, for: .normal)
             button.setImage(UIImage(named: "service_center_select_step"), for: .normal)

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

@@ -31,7 +31,7 @@ class YHServiceNoOrderView: UIView {
     
     private lazy var noFindLab : UILabel = {
         let lable = UILabel()
-        lable.textColor = UIColor.yhGreyColor
+        lable.textColor = UIColor.brandMainColor
         lable.font = UIFont.PFSC_R(ofSize: 12)
         lable.textAlignment = .center
         lable.text = "找不到订单"

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

@@ -86,7 +86,7 @@ class YHWorkExperienceListViewController: YHBaseViewController {
                         return
                     }
                 }
-                if (self.viewModel?.mainModel.has_work_time_empty == 1 && self.viewModel?.mainModel.work_time_empty_remark.count == 0) || (self.viewModel?.mainModel.has_work_time_overlap == 1 && self.viewModel?.mainModel.work_time_overlap_remark.count == 0){
+                if self.viewModel?.mainModel.has_work_time_overlap == 1 && self.viewModel?.mainModel.work_time_overlap_remark.count == 0 {
                     YHHUD.flash(message: "您的工作经验未全部填写完成，请先填写完成再提交")
                     return
                 }
@@ -190,11 +190,7 @@ extension YHWorkExperienceListViewController: UITableViewDelegate, UITableViewDa
             cell.model = viewModel?.mainModel
             cell.clickBlock = { [weak self] value, index in
                 guard let self = self else { return }
-                if index == 0 {
-                    self.viewModel?.mainModel.work_time_overlap_remark = value
-                } else {
-                    self.viewModel?.mainModel.work_time_empty_remark = value
-                }
+                self.viewModel?.mainModel.work_time_overlap_remark = value
             }
             cell.backgroundColor = .clear
             cell.contentView.backgroundColor = .clear

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

@@ -42,7 +42,11 @@ class YHWorkExperiencePositionViewViewController: YHBaseViewController {
         viewModel.requestWorkPositionDetail(workID, positionId) {[weak self] success, error in
             guard let self = self else { return }
             if success ?? false {
-                self.selectReasonIndex = self.viewModel.position.provide_certificate_type - 1
+                if self.viewModel.position.provide_certificate_type == 1 {
+                    self.selectReasonIndex = 0
+                } else if self.viewModel.position.provide_certificate_type == 4 {
+                    self.selectReasonIndex = 1
+                }
                 updateDataSource()
             } else {
                 self.viewModel.position.work_id = workID
@@ -58,16 +62,6 @@ class YHWorkExperiencePositionViewViewController: YHBaseViewController {
            return .init("海外工作签证", .font(UIFont.PFSC_R(ofSize:14)),.foreground(UIColor.mainTextColor))
         }
         if type ==  1 {
-            let a:ASAttributedString = .init("护照出入境盖章记录\n", .font(UIFont.PFSC_R(ofSize:14)),.foreground(UIColor.mainTextColor))
-            let b: ASAttributedString = .init("(此类文件加分以港府审批为准)", .font(UIFont.PFSC_R(ofSize:14)),.foreground(UIColor(hex: 0x8993a2)))
-           return a + b
-        }
-        if type ==  2 {
-            let a:ASAttributedString = .init("出入境打印记录\n", .font(UIFont.PFSC_R(ofSize:14)),.foreground(UIColor.mainTextColor))
-            let b: ASAttributedString = .init("(此类文件加分以港府审批为准)", .font(UIFont.PFSC_R(ofSize:14)),.foreground(UIColor(hex: 0x8993a2)))
-           return a + b
-        }
-        if type ==  3 {
             let a:ASAttributedString = .init("以上均不能提供\n", .font(UIFont.PFSC_R(ofSize:14)),.foreground(UIColor.mainTextColor))
             let b: ASAttributedString = .init("(或将导致您的该段工作经验", .font(UIFont.PFSC_R(ofSize:14)),.foreground(UIColor(hex: 0x8993a2)))
             let c: ASAttributedString = .init("不被认可不予加分", .font(UIFont.PFSC_R(ofSize:14)),.foreground(UIColor.failColor))
@@ -79,9 +73,7 @@ class YHWorkExperiencePositionViewViewController: YHBaseViewController {
     
     func getTipsWithType() -> [ASAttributedString] {
         return [self.getTextWithType(type: 0),
-                self.getTextWithType(type: 1),
-                self.getTextWithType(type: 2),
-                self.getTextWithType(type: 3)]
+                self.getTextWithType(type: 1)]
     }
     
     
@@ -203,7 +195,11 @@ extension YHWorkExperiencePositionViewViewController: UITableViewDelegate, UITab
             cell.selectBlock = {[weak self] index in
                 guard let self = self else { return }
                 self.selectReasonIndex = index.first ?? 5
-                self.viewModel.position.provide_certificate_type = self.selectReasonIndex + 1
+                if self.selectReasonIndex == 0 {
+                    self.viewModel.position.provide_certificate_type = 1
+                } else {
+                    self.viewModel.position.provide_certificate_type = 4
+                }
             }
             cell.backgroundColor = .clear
             cell.contentView.backgroundColor = .clear

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

@@ -23,7 +23,7 @@ class YHWorkExperienceViewController: YHBaseViewController {
     var isShowPrompt: Bool = false
     var isKeyboardShow: Bool = false
     var selectEditItem = YHWorkExperienceFileModel()
-    var fileMessageArray: [String] = ["签字盖章的推荐信", "盖章的工作证明+签字的推荐信", "其他证明(退工单或合同+社保等证明)", "以上均不能提供"]
+    var fileMessageArray: [String] = ["签字盖章的推荐信", "盖章的工作证明+签字的推荐信", "仅工作证明", "其他证明(退工单或合同+社保等证明)", "以上均不能提供"]
     var renameInputView: YHFileRenameInputView = {
         let view = YHFileRenameInputView.inputView(defalutText: "请输入名称")
         return view
@@ -170,15 +170,19 @@ class YHWorkExperienceViewController: YHBaseViewController {
            return .init("签字盖章的推荐信", .font(UIFont.PFSC_R(ofSize:14)),.foreground(UIColor.mainTextColor))
         }
         if type ==  1 {
-            let a:ASAttributedString = .init("盖章的工作证明+签字的推荐信", .font(UIFont.PFSC_R(ofSize:14)),.foreground(UIColor.mainTextColor))
+           let a:ASAttributedString = .init("盖章的工作证明+签字的推荐信", .font(UIFont.PFSC_R(ofSize:14)),.foreground(UIColor.mainTextColor))
            return a
         }
         if type ==  2 {
+           let a:ASAttributedString = .init("仅工作证明", .font(UIFont.PFSC_R(ofSize:14)),.foreground(UIColor.mainTextColor))
+           return a
+        }
+        if type ==  3 {
             let a:ASAttributedString = .init("其他证明(退工单或合同+社保等证明) \n", .font(UIFont.PFSC_R(ofSize:14)),.foreground(UIColor.mainTextColor))
             let b: ASAttributedString = .init("(此类文件加分以港府审批为准)", .font(UIFont.PFSC_R(ofSize:14)),.foreground(UIColor(hex: 0x8993a2)))
            return a + b
         }
-        if type ==  3 {
+        if type ==  4 {
             let a:ASAttributedString = .init("以上均不能提供\n", .font(UIFont.PFSC_R(ofSize:14)),.foreground(UIColor.mainTextColor))
             let b: ASAttributedString = .init("(或将导致您的该段工作经验", .font(UIFont.PFSC_R(ofSize:14)),.foreground(UIColor(hex: 0x8993a2)))
             let c: ASAttributedString = .init("不被认可不予加分", .font(UIFont.PFSC_R(ofSize:14)),.foreground(UIColor.failColor))
@@ -192,7 +196,8 @@ class YHWorkExperienceViewController: YHBaseViewController {
         return [self.getTextWithType(type: 0),
                 self.getTextWithType(type: 1),
                 self.getTextWithType(type: 2),
-                self.getTextWithType(type: 3)]
+                self.getTextWithType(type: 3),
+                self.getTextWithType(type: 4)]
     }
     
     func getSelectCompany() -> Int {
@@ -881,7 +886,7 @@ extension YHWorkExperienceViewController: UITableViewDelegate, UITableViewDataSo
                         h = h + 20
                     }
                 }
-                return CGFloat(h + 52 + 14 + 386)
+                return CGFloat(h + 52 + 14 + 451)
             } else {
                 var height = 23 + 154
                 for item in viewModel.positionList {

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

@@ -14,7 +14,7 @@ class YHWorkActionView: UIView {
     var exampleBlock: ExampleBlock?
     var photoBlock: PhotoBlock?
     var photoButton: UIButton!
-//    var wxButton: UIButton!
+    var wxButton: UIButton!
     var exampleButton: UIButton!
     
     override init(frame: CGRect) {
@@ -39,21 +39,24 @@ class YHWorkActionView: UIView {
         photoButton.snp.makeConstraints { make in
             make.centerY.equalToSuperview()
             make.left.equalTo(16)
-            make.height.width.equalTo(21)
+            make.height.width.equalTo(31)
         }
         
-//        wxButton = {
-//            let button = UIButton(type: .custom)
-//            button.setBackgroundImage(UIImage(named: "work_experience_wx"), for: .normal)
-//            button.addTarget(self, action: #selector(wxClick), for: .touchUpInside)
-//            return button
-//        }()
-//        addSubview(wxButton)
-//        wxButton.snp.makeConstraints { make in
-//            make.centerY.equalToSuperview()
-//            make.left.equalTo(49)
-//            make.height.width.equalTo(21)
-//        }
+        wxButton = {
+            let button = UIButton(type: .custom)
+            button.setTitle("扫描快捷录入", for: .normal)
+            button.setTitleColor(UIColor.brandMainColor, for: .normal)
+            button.titleLabel?.font = UIFont.PFSC_M(ofSize: 15)
+            button.addTarget(self, action: #selector(photoClick), for: .touchUpInside)
+            return button
+        }()
+        addSubview(wxButton)
+        wxButton.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.left.equalTo(photoButton.snp.right)
+            make.height.equalTo(31)
+            make.width.equalTo(100)
+        }
         
         exampleButton = {
             let button = UIButton(type: .custom)

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

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import AttributedString
 
 class YHWorkExperiencePositionTableViewCell: UITableViewCell {
     typealias ExperienceListBlock = (_ model: YHWorkExperiencePositionModel) -> ()
@@ -68,9 +69,9 @@ class YHWorkExperiencePositionTableViewCell: UITableViewCell {
         
         titleLabel = {
             let label = UILabel()
-            label.font = UIFont.PFSC_M(ofSize: 17)
-            label.text = "职位信息"
-            label.textColor = UIColor.mainTextColor
+            let a:ASAttributedString = .init("*", .font(UIFont.PFSC_R(ofSize:17)),.foreground(UIColor.failColor))
+            let b: ASAttributedString = .init("职位信息", .font(UIFont.PFSC_R(ofSize:17)),.foreground(UIColor.mainTextColor))
+            label.attributed.text = a + b
             return label
         }()
         centerView.addSubview(titleLabel)

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

@@ -143,7 +143,7 @@ class YHWorkExperienceTableViewCell: UITableViewCell {
                     }
                 }
                 mainItemView.addSubview(view)
-                y = y + 386
+                y = y + 451
             }
         }
     }

galaxy/galaxy/Classes/Tools/Helper/YHConstantArrayData.swift

@@ -277,21 +277,18 @@ class YHConstantArrayData {
     ]
     
     static let arrLevel : [[String : String]] = [
-        ["title": "高级经理人",
+        ["title": "高级经理人（企业拥有者）",
          "id": "1"
         ],
-        ["title": "中级经理人",
+        ["title": "中级经理人（中级管理岗）",
          "id": "2"
         ],
-        ["title": "初级经理人",
+        ["title": "初级经理人（初级管理岗）",
          "id": "3"
         ],
-        ["title": "专业人士",
+        ["title": "专业人士（普通职员）",
          "id": "4"
         ],
-        ["title": "半专业人士",
-         "id": "5"
-        ],
         ["title": "其他",
          "id": "6"
         ]