已知bug修复

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

@@ -175,7 +175,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)
@@ -229,7 +229,7 @@ extension YHServiceCenterViewController {
                 make.top.equalTo(53)
                 make.left.equalTo(47)
                 make.height.equalTo(29)
-                make.width.equalTo(102)
+                make.width.equalTo(18 + 126)
             }
         } else {
             navBar.isHidden = true
@@ -353,6 +353,7 @@ extension YHServiceCenterViewController {
     func getStep() {
         serviceCenterMainReqVM.getServiceMainData(orderId: orderId) {[weak self] success, error in
             guard let self = self else { return }
+            self.model.product_type = self.serviceCenterMainReqVM.mainModel.category_type
             if self.serviceCenterMainReqVM.mainModel.stage == 3 {
                 self.isCanSelectStep = true
             }

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

@@ -55,4 +55,5 @@ struct YHServiceCenterMainModel: SmartCodable {
     var stage: Int = 0 // 1 申请阶段 2办证阶段 3续期阶段
     var master_id: Int = 0 // 批次
     var status: Int = 0
+    var category_type: Int = 0 // 1.优才 2.高才
 }

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

@@ -93,7 +93,7 @@ class YHServiceMoreAlertView: UIView {
         guideButton = {
             let button = UIButton(type: .custom)
             button.setImage(UIImage(named: "service_more_guide"), for: .normal)
-            button.setTitle("获批操作指引", for: .normal)
+            button.setTitle("申请操作指引", for: .normal)
             button.setTitleColor(UIColor.mainTextColor, for: .normal)
             button.titleLabel?.font = UIFont.PFSC_R(ofSize: 16)
             button.addTarget(self, action: #selector(guideButtonClick), for: .touchUpInside)

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

@@ -14,7 +14,8 @@ class YHServiceOrderGuideTipsView: UIView {
     var block: Block?
     var isShow: Bool = true
     var type: Int = 0
-    
+    var tableView: UITableView!
+    var image: String = "service_order_guideline_one"
     lazy var blackMaskView: UIView = {
         let view = UIView()
         view.backgroundColor = UIColor(hex: 0x0F1214, alpha: 0.5)
@@ -95,15 +96,6 @@ class YHServiceOrderGuideTipsView: UIView {
         return button
     }()
     
-    lazy var myScrollView: UIScrollView = {
-        let view = UIScrollView()
-        view.backgroundColor = .clear
-        view.showsVerticalScrollIndicator = false
-        view.delegate = self
-        return view
-    }()
-    
-    
     lazy var bkgImageV: UIImageView = {
         let imageV  = UIImageView()
         imageV.image = UIImage(named: "service_order_guideline_one")
@@ -150,14 +142,14 @@ class YHServiceOrderGuideTipsView: UIView {
     func isShow(flag: Bool) {
         buttonContentView.isHidden = !flag
         if flag {
-            myScrollView.snp.remakeConstraints { make in
+            tableView.snp.remakeConstraints { make in
                 make.top.equalToSuperview().offset(120)
                 make.left.right.equalToSuperview()
                 make.width.equalTo(KScreenWidth)
                 make.height.equalTo(KScreenHeight - k_Height_NavigationtBarAndStatuBar - 98 - 120)
             }
         } else {
-            myScrollView.snp.remakeConstraints { make in
+            tableView.snp.remakeConstraints { make in
                 make.top.equalToSuperview().offset(68)
                 make.left.right.equalToSuperview()
                 make.height.equalTo(KScreenHeight - k_Height_NavigationtBarAndStatuBar - 98 - 68)
@@ -201,37 +193,15 @@ extension YHServiceOrderGuideTipsView  {
     @objc func clickLeftBtn() {
         leftBtn.isSelected = true
         rightBtn.isSelected = false
-        if let tmpImage = UIImage(named:"service_order_guideline_one") {
-            let scale = Double(tmpImage.size.height / tmpImage.size.width)
-            let imageH = scale * (KScreenWidth - 40)
-            
-            bkgImageV.snp.remakeConstraints { make in
-                make.top.equalToSuperview()
-                make.left.equalTo(20)
-                make.right.equalTo(-20)
-                make.height.equalTo(imageH)
-            }
-            bkgImageV.image = tmpImage
-            myScrollView.contentSize = CGSize(width: KScreenWidth, height: imageH)
-        }
+        image = "service_order_guideline_one"
+        tableView.reloadData()
     }
     
     @objc func clickRightBtn() {
         leftBtn.isSelected = false
         rightBtn.isSelected = true
-        if let tmpImage = UIImage(named:"service_order_guideline_two") {
-            let scale = Double(tmpImage.size.height / tmpImage.size.width)
-            let imageH = scale * (KScreenWidth - 40)
-            
-            bkgImageV.snp.remakeConstraints { make in
-                make.top.equalToSuperview()
-                make.left.equalTo(20)
-                make.right.equalTo(-20)
-                make.height.equalTo(imageH)
-            }
-            bkgImageV.image = tmpImage
-            myScrollView.contentSize = CGSize(width: KScreenWidth, height: imageH)
-        }
+        image = "service_order_guideline_two"
+        tableView.reloadData()
     }
 }
 
@@ -291,16 +261,13 @@ private extension YHServiceOrderGuideTipsView {
         }
         
         let whiteHeight = KScreenHeight - k_Height_NavigationtBarAndStatuBar
-//        whiteContentView.snp.makeConstraints { make in
-//            make.left.right.bottom.equalToSuperview()
-//            make.height.equalTo(whiteHeight)
-//        }
+
         whiteContentView.frame = CGRect(x: 0, y: KScreenHeight, width: KScreenWidth, height: whiteHeight)
         
         whiteContentView.addSubview(bkgImageV2)
         bkgImageV2.snp.makeConstraints { make in
             make.top.left.right.equalToSuperview()
-            make.height.equalTo(68)
+            make.height.equalTo(68.fix)
         }
         
         whiteContentView.addSubview(bottomView)
@@ -333,46 +300,116 @@ private extension YHServiceOrderGuideTipsView {
             make.width.equalTo(108)
         }
         
-        whiteContentView.addSubview(myScrollView)
-        myScrollView.snp.makeConstraints { make in
+        tableView = {
+            let tableView = UITableView(frame: .zero, style: .grouped)
+            tableView.contentInsetAdjustmentBehavior = .never
+            tableView.backgroundColor = .clear
+            tableView.separatorStyle = .none
+            tableView.showsHorizontalScrollIndicator = false
+            tableView.showsVerticalScrollIndicator = false
+            tableView.dataSource = self
+            tableView.delegate = self
+            tableView.register(cellWithClass: YHServiceOrderGuideTableViewCell.self)
+            return tableView
+        }()
+        
+        whiteContentView.addSubview(tableView)
+        tableView.snp.makeConstraints { make in
             make.top.equalToSuperview().offset(120)
             make.right.left.equalToSuperview()
             make.height.equalTo(whiteHeight - 98 - 120)
         }
         
-        if let tmpImage = UIImage(named:"service_order_guideline_one") {
-            let scale = Double(tmpImage.size.height / tmpImage.size.width)
-            let imageH = scale * (KScreenWidth - 40)
-            
-            myScrollView.addSubview(bkgImageV)
-            bkgImageV.snp.makeConstraints { make in
-                make.top.equalToSuperview()
-                make.left.equalTo(20)
-                make.right.equalTo(-20)
-                make.height.equalTo(imageH)
-            }
-            myScrollView.contentSize = CGSize(width: KScreenWidth, height: imageH)
-        }
     }
 }
 
-extension YHServiceOrderGuideTipsView : UIScrollViewDelegate {
-    func scrollViewDidScroll(_ scrollView: UIScrollView) {
+extension YHServiceOrderGuideTipsView: UITableViewDelegate, UITableViewDataSource {
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return 1
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        let cell = tableView.dequeueReusableCell(withClass: YHServiceOrderGuideTableViewCell.self)
+        cell.dataSource = image
+        return cell
+    }
+    
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        return 1024.fix
+    }
+    
+    func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
+        return 6
+    }
+
+    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+        return UIView()
+    }
+
+    func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
+        return 0.01
+    }
+
+    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
+        return UIView()
+    }
+    
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+       
+    }
+}
+
+class YHServiceOrderGuideTableViewCell: UITableViewCell {
+    var centerImageView: UIImageView!
+
+    var dataSource: String? {
+        didSet {
+            centerImageView.image = UIImage(named: dataSource ?? "")
+        }
+    }
+    
+    var imageUrl: String? {
+        didSet {
+            guard let url = URL(string: imageUrl) else { return }
+            centerImageView.kf.setImage(with: url)
+        }
+    }
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        // Initialization code
+    }
+    
+    override func setSelected(_ selected: Bool, animated: Bool) {
+        super.setSelected(selected, animated: animated)
         
-        if !ischeckBeforeFlag {
-            let scrollViewContentHeight = scrollView.contentSize.height
-            let scrollOffsetThreshold = scrollViewContentHeight - scrollView.bounds.size.height
-            
-           // 当前滚动位置
-           let currentOffset = scrollView.contentOffset.y
-           if currentOffset > scrollOffsetThreshold { // 接近底部
-               // 滚动到了底部
-               ischeckBeforeFlag = true
-               stopTimer()
-               setButtonEnable(true)
-           } else {
-               // 没有滚动到底部
-           }
+        // Configure the view for the selected state
+    }
+    
+    required init?(coder: NSCoder) {
+        super.init(coder: coder)
+    }
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        selectionStyle = .none
+        setupUI()
+    }
+    
+    func setupUI() {
+        self.backgroundColor = .white
+        centerImageView = {
+            let imageView = UIImageView()
+            imageView.isUserInteractionEnabled = true
+            imageView.image = UIImage(named: "invitation_with_gifts_first")
+            imageView.contentMode = .scaleAspectFill
+            return imageView
+        }()
+        contentView.addSubview(centerImageView)
+        centerImageView.snp.makeConstraints { make in
+            make.top.equalTo(10)
+            make.left.equalTo(20)
+            make.right.equalTo(-20)
+            make.bottom.equalTo(-10)
         }
     }
 }

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

@@ -80,10 +80,6 @@ class YHGCWorkExperienceListViewController: YHBaseViewController {
             bottom.nextblock = { [weak self] in
                 guard let self = self else { return }
                 guard let dataSource = dataSource else { return }
-                if dataSource.count == 0 {
-                    YHHUD.flash(message: "至少需要有一条工作经验")
-                    return
-                }
                 for item in dataSource {
                     if item.vacant_num ?? 0 > 0 {
                         showPrompt = true

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

@@ -26,6 +26,10 @@ class YHGCWorkListHasDocTableViewCell: UITableViewCell {
         }
     }
     var selectDataSource: [ASAttributedString]?
+    lazy var previewFileTool:YHFilePreviewTool = {
+       let tool = YHFilePreviewTool(targetVC: UIViewController.current)
+       return tool
+    }()
     override func awakeFromNib() {
         super.awakeFromNib()
         // Initialization code
@@ -93,6 +97,12 @@ class YHGCWorkListHasDocTableViewCell: UITableViewCell {
             let a: ASAttributedString = .init("备注：赴港同意书为目前在职公司盖章提供，若目前未就职于任何公司，则由档案所在地人才中心盖章提供，", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor(hex: 0x8893a2)))
             let b: ASAttributedString = .init("查看示例模板", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.brandMainColor),.underline(.single),.action {
                 //跳转模版
+                let viewModel = YHBaseViewModel()
+                viewModel.getPublicImageUrl(self.url) { success, error in
+                    if let success = success {
+                        self.previewFileTool.openXLSXRemoteFile(urlString: success, fileName:"")
+                    }
+                }
             })
             label.attributed.text = a + b
             return label

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/主入口/service_center_In_section.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "service_center_In_section@2x.png",
+      "filename" : "Group 2033196223@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "service_center_In_section@3x.png",
+      "filename" : "Group 2033196223@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/主入口/service_order_guideline_one.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "service_order_guideline_one@2x.png",
+      "filename" : "Frame 2033196309@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "service_order_guideline_one@3x.png",
+      "filename" : "Frame 2033196309@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/主入口/service_order_guideline_two.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "3@2x.png",
+      "filename" : "Frame 2033196309@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "3@3x.png",
+      "filename" : "Frame 2033196309@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }