服务中心模块 证件续签

UI走查bug修复

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -760,7 +760,6 @@
 		A5ACE94F2B4564F7002C94D2 /* YhOverlayView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE9112B4564F7002C94D2 /* YhOverlayView.swift */; };
 		A5ACE9502B4564F7002C94D2 /* YhCacheTool.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE9122B4564F7002C94D2 /* YhCacheTool.swift */; };
 		A5ACE9512B4564F7002C94D2 /* YhConstant.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE9132B4564F7002C94D2 /* YhConstant.swift */; };
-		A5ACE9522B4564F7002C94D2 /* YHServiceCenterMainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE9192B4564F7002C94D2 /* YHServiceCenterMainViewController.swift */; };
 		A5ACE9532B4564F7002C94D2 /* YHBaseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE9202B4564F7002C94D2 /* YHBaseViewController.swift */; };
 		A5ACE9542B4564F7002C94D2 /* YHNavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE9212B4564F7002C94D2 /* YHNavigationController.swift */; };
 		A5ACE9552B4564F7002C94D2 /* YHTabBarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE9222B4564F7002C94D2 /* YHTabBarViewController.swift */; };
@@ -1621,7 +1620,6 @@
 		A5ACE9122B4564F7002C94D2 /* YhCacheTool.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YhCacheTool.swift; sourceTree = "<group>"; };
 		A5ACE9132B4564F7002C94D2 /* YhConstant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YhConstant.swift; sourceTree = "<group>"; };
 		A5ACE9152B4564F7002C94D2 /* galaxy-Bridge-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "galaxy-Bridge-Header.h"; sourceTree = "<group>"; };
-		A5ACE9192B4564F7002C94D2 /* YHServiceCenterMainViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHServiceCenterMainViewController.swift; sourceTree = "<group>"; };
 		A5ACE9202B4564F7002C94D2 /* YHBaseViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHBaseViewController.swift; sourceTree = "<group>"; };
 		A5ACE9212B4564F7002C94D2 /* YHNavigationController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHNavigationController.swift; sourceTree = "<group>"; };
 		A5ACE9222B4564F7002C94D2 /* YHTabBarViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHTabBarViewController.swift; sourceTree = "<group>"; };
@@ -4242,7 +4240,6 @@
 		A5ACE9182B4564F7002C94D2 /* C */ = {
 			isa = PBXGroup;
 			children = (
-				A5ACE9192B4564F7002C94D2 /* YHServiceCenterMainViewController.swift */,
 				044EE2222C8FE1D000A2FE3A /* YHServiceCenterViewController.swift */,
 				044EE2242C90138000A2FE3A /* YHServerCenterHoldViewController.swift */,
 				04E41DE72BD240570077EAE3 /* YHOrderDetailViewController.swift */,
@@ -4989,7 +4986,6 @@
 				049D62C22C6F258700E811A1 /* YHFamilyInfoConfirmViewController.swift in Sources */,
 				0430E64C2C732821000511E2 /* YHNoAdopterAlertView.swift in Sources */,
 				04CE1ADE2C2AD91F001CB80A /* YHActivityTravelCell.swift in Sources */,
-				A5ACE9522B4564F7002C94D2 /* YHServiceCenterMainViewController.swift in Sources */,
 				045EEF072B9F171A0022A143 /* YHBasicInfoFillViewModel.swift in Sources */,
 				045EEF212B9F171A0022A143 /* YHMainInformationTableViewCell.swift in Sources */,
 				A5ACE9462B4564F7002C94D2 /* YHHUDSquareBaseView.swift in Sources */,

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServerCenterHoldViewController.swift

@@ -154,6 +154,7 @@ class YHServerCenterHoldViewController: UIViewController {
         let indicator = JXSegmentedIndicatorLineView()
         indicator.indicatorWidth = 16
         indicator.indicatorColor = UIColor.brandMainColor
+        indicator.indicatorHeight = 2
         indicator.indicatorCornerRadius = 0
         indicator.verticalOffset = 4
         segmentedView.indicators = [indicator]

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceCenterMainViewController.swift

-//
-//  YHServiceCenterMainViewController.swift
-//  galaxy
-//
-//  Created by EDY on 2023/12/20.
-//
-
-import UIKit
-import JXSegmentedView
-import AttributedString
-
-//服务中心
-class YHServiceCenterMainViewController: YHBaseViewController {
-    
-    private let serviceCenterMainReqVM : YHServiceCenterMainViewModel = YHServiceCenterMainViewModel()
-    
-    var titleLabel: UILabel!
-    var nameBgImageView: UIImageView!
-    var nameLabel: UILabel!
-    var orderButton: UIButton!
-    var orderId: Int = 0
-    var mobile: String = ""
-    var model: YHContactItemModel = YHContactItemModel()
-    var oldModel: YHContactItemModel = YHContactItemModel()
-    private lazy var topBkg : UIView = {
-        let imagV = UIImageView()
-        imagV.image = UIImage(named: "service_center_head_bkg4")
-        imagV.contentMode = .scaleAspectFill
-        imagV.isUserInteractionEnabled = true
-        return imagV
-        
-    }()
-    
-    lazy var navBar: UIView = {
-        let bar = UIView()
-        let backBtn = UIButton()
-        backBtn.setImage(UIImage(named: "back_icon"), for: .normal)
-        backBtn.addTarget(self, action: #selector(didBackBtnClicked), for: .touchUpInside)
-        backBtn.YH_clickEdgeInsets = UIEdgeInsets(top: 20, left: 20, bottom: 20, right: 20)
-        bar.addSubview(backBtn)
-        backBtn.snp.makeConstraints { make in
-            make.width.height.equalTo(21)
-            make.centerY.equalToSuperview()
-            make.left.equalToSuperview().offset(16)
-        }
-        return bar
-    }()
-    
-    private let noDataView : YHServiceNoOrderView = {
-        let view = YHServiceNoOrderView()
-        view.isHidden = true
-        return view
-    }()
-    var controllerOne: YHServiceOrderListView = YHServiceOrderListView()
-    var controllerTwo: YHServiceOrderListView = YHServiceOrderListView()
-    var controllerThree: YHServiceOrderListView = YHServiceOrderListView()
-    var controllerFour: YHServiceOrderListView = YHServiceOrderListView()
-    var arrItemTitles = ["全部", "进行中", "待开始", "已完成"]
-    var arrItemVCs: [YHServiceOrderListView] = []
-    var segmentedView : JXSegmentedView = JXSegmentedView(frame: CGRect(x: 0, y: k_Height_safeAreaInsetsTop(), width: KScreenWidth, height: 48))
-    lazy var segmentedDataSource: JXSegmentedDotDataSource = {
-        let dataSource = JXSegmentedDotDataSource()
-        dataSource.isTitleColorGradientEnabled = true
-        dataSource.titles = arrItemTitles
-        
-        dataSource.titleNormalFont = UIFont.PFSC_M(ofSize: 14)
-        dataSource.titleNormalColor = .labelTextColor2
-        
-        dataSource.titleSelectedFont = UIFont.PFSC_M(ofSize: 14)
-        dataSource.titleSelectedColor = .mainTextColor
-        
-        dataSource.isItemSpacingAverageEnabled = false
-        dataSource.itemWidth = JXSegmentedViewAutomaticDimension
-        dataSource.itemSpacing = 16
-        dataSource.dotStates = [false, false, false, false]
-        dataSource.dotSize = CGSize(width: 6, height: 6)
-        return dataSource
-    }()
-    
-    //分类title 所对应的VC
-    lazy var listContainerView: JXSegmentedListContainerView! = {
-        return JXSegmentedListContainerView(dataSource: self, type: .scrollView)
-    }()
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        
-        setupUI()
-        addListView()
-
-        noDataView.clickBackBtnClickBlock = {[weak self] in
-            guard self != nil else { return }
-            
-            //跳转测评页
-            let vc = YHH5WebViewVC()
-            vc.url = YHBaseUrlManager.shared.curH5URL() + "superAppBridge.html#/evaluation?channel=APP-zrll"
-            vc.isShowRightShareItemFlag = true
-            self?.navigationController?.pushViewController(vc)
-        }
-        noDataView.clickShowBtnClickBlock = {
-            YHServiceOrderAlertView.show()
-        }
-        
-        NotificationCenter.default.addObserver(self, selector: #selector(logoutSuccess), name: YhConstant.YhNotification.didLogoutSuccessNotifiction, object: nil)
-        noDataView.isHidden = false
-        nameBgImageView.isHidden = true
-        segmentedView.isHidden = true
-        listContainerView.isHidden = true
-    }
-    
-    @objc func logoutSuccess() {
-        self.model = YHContactItemModel()
-        self.oldModel = YHContactItemModel()
-    }
-    
-    override func viewWillAppear(_ animated: Bool) {
-        super.viewWillAppear(animated)
-        loadData()
-    }
-}
-
-extension YHServiceCenterMainViewController {
-    func loadData() {
-        if model.id != -1 {
-            noDataView.isHidden = true
-            nameBgImageView.isHidden = false
-            segmentedView.isHidden = false
-            listContainerView.isHidden = false
-            if self.navigationController?.viewControllers.count != 2 && self.navigationController?.viewControllers.count != 1 {
-                orderButton.isHidden = true
-            }
-            orderId = model.id
-            mobile = model.mobile
-            UserDefaults.standard.set(orderId, forKey: "orderIdForPreview")
-            UserDefaults.standard.synchronize()
-            for i in 0..<arrItemTitles.count {
-                let vc = arrItemVCs[i] as YHServiceOrderListView
-                vc.type = i
-                if i == 1 {
-                    vc.type = 2
-                }
-                if i == 2 {
-                    vc.type = 1
-                }
-                vc.orderID = orderId
-                vc.mobile = mobile
-                vc.loadData()
-            }
-            getStep()
-        } else {
-            serviceCenterMainReqVM.getContactList {[weak self] success, error in
-                guard let self = self else { return }
-                if success == true {
-                    
-                } else {
-                    YHHUD.flash(message: error?.errorMsg ?? "请求出错")
-                }
-                self.handleRightUI()
-            }
-        }
-    }
-    
-    @objc func didBackBtnClicked() {
-        self.navigationController?.popViewController(animated: true)
-    }
-    
-    func setupUI() {
-        gk_navBarAlpha = 0
-        gk_navigationBar.isHidden = true
-        view.backgroundColor = .white
-        view.addSubview(topBkg)
-        topBkg.snp.makeConstraints { make in
-            make.top.left.right.equalToSuperview()
-            make.height.equalTo(202)
-        }
-        
-        titleLabel = {
-            let label = UILabel()
-            label.text = "我的服务"
-            label.font = UIFont.PFSC_M(ofSize: 21)
-            label.textColor = UIColor.mainTextColor
-            return label
-        }()
-        view.addSubview(titleLabel)
-        titleLabel.snp.makeConstraints { make in
-            make.top.equalTo(53)
-            make.left.equalTo(20)
-            make.height.equalTo(29)
-            make.right.equalTo(-20)
-        }
-        
-        view.addSubview(navBar)
-        navBar.snp.makeConstraints { make in
-            make.left.equalToSuperview()
-//            make.top.equalToSuperview().offset(k_Height_statusBar())
-            make.height.equalTo(k_Height_NavContentBar)
-            make.width.equalTo(47)
-            make.centerY.equalTo(titleLabel.snp.centerY)
-        }
-        orderButton = {
-            let button = UIButton(type: .custom)
-            button.setTitle("我的订单", for: .normal)
-            button.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
-            button.setTitleColor(UIColor.yhGreyColor, for: .normal)
-            button.addTarget(self, action: #selector(pushOrderView), for: .touchUpInside)
-            return button
-        }()
-        view.addSubview(orderButton)
-        orderButton.snp.makeConstraints { make in
-            make.right.equalTo(-20)
-            make.centerY.equalTo(titleLabel.snp.centerY)
-            make.height.equalTo(20)
-            make.width.equalTo(56)
-        }
-        
-        if self.navigationController?.viewControllers.count != 2 && self.navigationController?.viewControllers.count != 1 {
-            titleLabel.textAlignment = .center
-            titleLabel.text = "订单详情"
-            orderButton.isHidden = true
-        } else {
-            navBar.isHidden = true
-        }
-        
-        NotificationCenter.default.addObserver(self, selector: #selector(goToServiceTabFromFileListPage), name: YhConstant.YhNotification.didClickFileListBackToServiceTabNotifiction, object: nil)
-    }
-    
-    override func viewDidLayoutSubviews() {
-        super.viewDidLayoutSubviews()
-        nameBgImageView.snp.remakeConstraints { make in
-            make.top.equalTo(92)
-            make.left.equalTo(20)
-            make.right.equalTo(-20)
-            make.bottom.equalTo(nameLabel.snp.bottom).offset(11)
-        }
-        segmentedView.snp.remakeConstraints { make in
-            make.right.equalTo(-4)
-            make.left.equalTo(4)
-            make.top.equalTo(nameBgImageView.snp.bottom).offset(14)
-            make.height.equalTo(48)
-        }
-        if self.navigationController?.viewControllers.count != 1 {
-            listContainerView.snp.remakeConstraints { make in
-                make.right.left.equalToSuperview()
-                make.top.equalTo(segmentedView.snp.bottom)
-                make.bottom.equalToSuperview()
-            }
-        } else {
-            listContainerView.snp.remakeConstraints { make in
-                make.right.left.equalToSuperview()
-                make.top.equalTo(segmentedView.snp.bottom)
-                make.bottom.equalTo(-k_Height_TabBar)
-            }
-        }
-    }
-    
-    @objc func pushOrderView() {
-        let vc = YHOrderDetailViewController()
-        vc.model = oldModel
-        vc.backDate = { [weak self] model in
-            guard let self = self else { return }
-            self.model = model
-        }
-        self.navigationController?.pushViewController(vc)
-        
-        
-        
-//        let vc = YHAddAdoptersViewController()
-//        vc.orderId = orderId
-//        navigationController?.pushViewController(vc) //for test pete
-    }
-}
-
-extension YHServiceCenterMainViewController: JXSegmentedViewDelegate {
-    func segmentedView(_ segmentedView: JXSegmentedView, didSelectedItemAt index: Int) {
-//        NotificationCenter.default.post(name:  Notification.Name(rawValue: "scrollViewDidEndDragging"), object: nil)
-    }
-
-    /// 正在滚动中的回调
-    ///
-    /// - Parameters:
-    ///   - segmentedView: JXSegmentedView
-    ///   - leftIndex: 正在滚动中，相对位置处于左边的index
-    ///   - rightIndex: 正在滚动中，相对位置处于右边的index
-    ///   - percent: 从左往右计算的百分比
-    func segmentedView(_ segmentedView: JXSegmentedView, scrollingFrom leftIndex: Int, to rightIndex: Int, percent: CGFloat) {
-//        NotificationCenter.default.post(name:  Notification.Name(rawValue: "scrollViewWillBeginDragging"), object: nil)
-    }
-}
-
-extension YHServiceCenterMainViewController: JXSegmentedListContainerViewDataSource {
-    func numberOfLists(in listContainerView: JXSegmentedListContainerView) -> Int {
-        if let titleDataSource = segmentedView.dataSource as? JXSegmentedBaseDataSource {
-            return titleDataSource.dataSource.count
-        }
-        return 0
-    }
-
-    func listContainerView(_ listContainerView: JXSegmentedListContainerView, initListAt index: Int) -> JXSegmentedListContainerViewListDelegate {
-        return arrItemVCs[index]
-    }
-}
-
-
-extension YHServiceCenterMainViewController {
-    private func handleRightUI() {
-        if serviceCenterMainReqVM.arrContactList.isEmpty {
-            noDataView.isHidden = false
-            nameBgImageView.isHidden = true
-            segmentedView.isHidden = true
-            listContainerView.isHidden = true
-        } else {
-            guard let model = serviceCenterMainReqVM.arrContactList.first else {
-                return
-            }
-            noDataView.isHidden = true
-            nameBgImageView.isHidden = false
-            segmentedView.isHidden = false
-            listContainerView.isHidden = false
-            if self.navigationController?.viewControllers.count != 2 && self.navigationController?.viewControllers.count != 1 {
-                orderButton.isHidden = true
-            }
-            orderId = model.id
-            mobile = model.mobile
-            self.model = model
-            self.oldModel = model
-            UserDefaults.standard.set(orderId, forKey: "orderIdForPreview")
-            UserDefaults.standard.synchronize()
-            for i in 0..<arrItemTitles.count {
-                let vc = arrItemVCs[i] as YHServiceOrderListView
-                vc.type = i
-                if i == 1 {
-                    vc.type = 2
-                }
-                if i == 2 {
-                    vc.type = 1
-                }
-                vc.orderID = orderId
-                vc.mobile = mobile
-                vc.loadData()
-            }
-            getStep()
-        }
-    }
-    
-    func getStep() {
-        serviceCenterMainReqVM.getStageInformation(params: ["orderId":orderId]) {[weak self] success, error in
-            guard let self = self else { return }
-            var name = ""
-            let applicant = serviceCenterMainReqVM.personInfoModel
-            if applicant.user_name.isEmpty {
-                name = "尊敬的客户"
-            } else {
-                name = applicant.user_name
-                if applicant.sex == 1 {
-                    name = "尊敬的" + name + "先生"
-                } else if applicant.sex == 2 {
-                    name = "尊敬的" + name + "女士"
-                } else {
-                    
-                }
-            }
-            
-            let a: ASAttributedString = .init("您好，\(name)，您现处于", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.mainTextColor))
-            let aa: ASAttributedString = .init(NSAttributedString(string: applicant.stage_name), .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.brandMainColor))
-            let aaa: ASAttributedString = .init("阶段，让我们一起共同完成您的身份申请之旅吧~", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.mainTextColor))
-            
-            let b: ASAttributedString = .init("阶段。为使您的身份能够顺利激活并助力后续永居规划，请依据", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.mainTextColor))
-            let c: ASAttributedString = .init("《", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.brandMainColor))
-            let bb: ASAttributedString = .init("香港身份获批操作指引", .font(UIFont.PFSC_B(ofSize: 13)),.foreground(UIColor.brandMainColor), .underline(.single), .action {
-                //点击出现操作指引
-                let view = YHOffivialApprovalGuildLineCheckView.sheetView()
-                view.show()
-            })
-            let cc: ASAttributedString = .init("》", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.brandMainColor))
-            let bbb: ASAttributedString = .init("完成以下事项", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.mainTextColor))
-            if applicant.type == 3 {
-                self.nameLabel.attributed.text = a + aa + b + c + bb + cc + bbb
-            } else {
-                self.nameLabel.attributed.text = a + aa + aaa
-            }
-        }
-    }
-    
-    func addListView() {
-        nameBgImageView = {
-            let view = UIImageView()
-            view.image = UIImage(named: "service_name_bg")?.resizableImage(withCapInsets: UIEdgeInsets(top: 21, left: 68, bottom: 11, right: 14), resizingMode: .stretch)
-            view.isUserInteractionEnabled = true
-            return view
-        }()
-        view.addSubview(nameBgImageView)
-        nameBgImageView.snp.makeConstraints { make in
-            make.top.equalTo(92)
-            make.left.equalTo(20)
-            make.right.equalTo(-20)
-            make.height.equalTo(68)
-        }
-        
-        nameLabel = {
-            let label = UILabel()
-            label.text = "您好，张先生，您当前处于身份申请阶段"
-            label.font = UIFont.PFSC_M(ofSize: 12)
-            label.textColor = UIColor.brandMainColor
-            label.numberOfLines = 0
-            return label
-        }()
-        nameBgImageView.addSubview(nameLabel)
-        nameLabel.snp.makeConstraints { make in
-            make.top.equalTo(21)
-            make.left.equalTo(14)
-            make.right.equalTo(-14)
-        }
-        
-        view.addSubview(noDataView)
-        noDataView.snp.makeConstraints { make in
-            make.centerX.equalToSuperview()
-            make.top.equalTo(236)
-            make.width.equalTo(KScreenWidth)
-            make.height.equalTo(265)
-        }
-        
-        controllerOne.type = 0
-        controllerOne.orderID = orderId
-        controllerOne.block = {[weak self] type, count, flag in
-            guard let self = self else { return }
-            arrItemTitles[0] = "全部(\(count))"
-            self.updata(flag: flag, type: 0)
-        }
-        controllerTwo.type = 2
-        controllerTwo.orderID = orderId
-        controllerTwo.block = {[weak self] type, count, flag in
-            guard let self = self else { return }
-            arrItemTitles[1] = "进行中(\(count))"
-            self.updata(flag: flag, type: 2)
-        }
-        controllerThree.type = 1
-        controllerThree.orderID = orderId
-        controllerThree.block = {[weak self] type, count, flag in
-            guard let self = self else { return }
-            arrItemTitles[2] = "待开始(\(count))"
-            self.updata(flag: flag, type: 1)
-        }
-        controllerFour.type = 3
-        controllerFour.orderID = orderId
-        controllerFour.block = {[weak self] type, count, flag in
-            guard let self = self else { return }
-            arrItemTitles[3] = "已完成(\(count))"
-            self.updata(flag: flag, type: 3)
-            self.getStep()
-        }
-        arrItemVCs.append(controllerOne)
-        arrItemVCs.append(controllerTwo)
-        arrItemVCs.append(controllerThree)
-        arrItemVCs.append(controllerFour)
-        
-        //segmentedViewDataSource一定要通过属性强持有！！！！！！！！！
-        segmentedView.collectionView.backgroundColor = .white
-        view.addSubview(segmentedView)
-
-        segmentedView.listContainer = listContainerView
-        view.addSubview(listContainerView)
-        
-        
-        //分类Title
-        segmentedView.dataSource = segmentedDataSource
-        segmentedView.delegate = self
-        
-        //配置指示器
-        let indicator = JXSegmentedIndicatorLineView()
-        indicator.indicatorWidth = 16
-        indicator.indicatorColor = UIColor.brandMainColor
-        indicator.indicatorCornerRadius = 0
-        segmentedView.indicators = [indicator]
-        segmentedView.backgroundColor = UIColor(red: 0.95, green: 0.95, blue: 0.95, alpha: 1)
-        
-        segmentedView.defaultSelectedIndex = 1
-    }
-    
-    func updata(flag: Bool, type: Int){
-        DispatchQueue.main.async {
-            self.segmentedDataSource.titles = self.arrItemTitles
-            if type == 3 {
-                self.segmentedDataSource.dotStates = [false,false,false,flag]
-            }
-            self.segmentedView.reloadData()
-        }
-    }
-}
-
-extension YHServiceCenterMainViewController {
-    
-    @objc func goToServiceTabFromFileListPage() {
-        
-        // 进行中有数据则切换到进行中，进行中无数据则切换到全部
-        YHHUD.show(.progress(message: "加载中..."))
-        self.serviceCenterMainReqVM.getServiceCenterProgressList(self.orderId, 2) {
-            [weak self] success, error in
-            YHHUD.hide()
-            guard let self = self else { return }
-            var targetTabIndex = 0 // 全部
-            if self.serviceCenterMainReqVM.arrDataForSeviceCenterProgress.count > 0 {
-                // 进行中
-                targetTabIndex = 1
-            }
-            self.segmentedView.selectItemAt(index: targetTabIndex)
-            self.segmentedView.listContainer?.didClickSelectedItem(at: targetTabIndex)
-            UIViewController.current?.navigationController?.popToRootViewController(animated: true)
-            goTabBarBy(tabType: .service)
-        }
-    }
-}
-

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceOrderListViewController.swift

@@ -243,6 +243,7 @@ extension YHServiceOrderListView {
     func setupUI() {
         gk_navBarAlpha = 0
         gk_navigationBar.isHidden = true
+        view.backgroundColor = UIColor(hex: 0xf4f6fa)
         homeTableView = {
             let tableView = YHGestureTableView(frame: .zero, style: .grouped)
             tableView.backgroundColor = .clear

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MySignature(我的签字)/V/YHCommonAlertView.swift

@@ -103,7 +103,6 @@ class YHCommonAlertView: UIView {
             
             
             agreeButton.snp.remakeConstraints { make in
-                make.top.equalTo(messageLabel.snp.bottom).offset(36)
                 make.height.equalTo(45)
                 make.right.equalToSuperview().offset(-kMargin)
                 make.left.equalToSuperview().offset(kMargin)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignCertificateManage(续期证件管理)/C/YHResignCertificateDetailViewController.swift

@@ -477,7 +477,7 @@ private extension YHResignCertificateDetailViewController {
         lineView.snp.makeConstraints { make in
             make.left.equalToSuperview().offset(18)
             make.right.equalToSuperview().offset(-18)
-            make.top.equalTo(titleTextView.snp.bottom).offset(12)
+            make.top.equalTo(titleTextView.snp.bottom).offset(4)
             make.height.equalTo(1)
         }
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignCertificateManage(续期证件管理)/V/YHResignCertificateHKTableViewCell.swift

@@ -346,7 +346,7 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
         }()
         centerView.addSubview(backSurfaceImageButton)
         backSurfaceImageButton.snp.makeConstraints { make in
-            make.right.equalTo(-8)
+            make.right.equalTo(-18)
             make.top.equalTo(96)
             make.height.equalTo(102)
             make.width.equalTo(CGFloat(147).fix)
@@ -410,6 +410,13 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
         }
         cardBeginView = {
             let view = YHItemView()
+            let line = UIView()
+            line.backgroundColor = UIColor.separatorColor
+            view.addSubview(line)
+            line.snp.makeConstraints { make in
+                make.left.right.bottom.equalToSuperview()
+                make.height.equalTo(0.5)
+            }
             return view
         }()
         cardBeginView.block = {[weak self] model in
@@ -428,6 +435,13 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
         
         cardEndView = {
             let view = YHItemView()
+            let line = UIView()
+            line.backgroundColor = UIColor.separatorColor
+            view.addSubview(line)
+            line.snp.makeConstraints { make in
+                make.left.right.bottom.equalToSuperview()
+                make.height.equalTo(0.5)
+            }
             return view
         }()
         cardEndView.block = {[weak self] model in
@@ -468,6 +482,13 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
         
         signBeginView = {
             let view = YHItemView()
+            let line = UIView()
+            line.backgroundColor = UIColor.separatorColor
+            view.addSubview(line)
+            line.snp.makeConstraints { make in
+                make.left.right.bottom.equalToSuperview()
+                make.height.equalTo(0.5)
+            }
             return view
         }()
         signBeginView.block = {[weak self] model in

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignCertificateManage(续期证件管理)/V/YHResignCertificateListTableViewCell.swift

@@ -168,7 +168,7 @@ class YHResignCertificateView: UIView {
         
         subTitleLabel = {
             let label = UILabel()
-            label.font = UIFont.PFSC_B(ofSize: 12)
+            label.font = UIFont.PFSC_R(ofSize: 12)
             label.textAlignment = .left
             label.numberOfLines = 2
             label.textColor = UIColor.mainTextColor50
@@ -189,7 +189,7 @@ class YHResignCertificateView: UIView {
         }()
         addSubview(explainLabel)
         explainLabel.snp.makeConstraints { make in
-            make.right.equalTo(-24)
+            make.right.equalTo(-20)
             make.left.equalToSuperview()
             make.height.equalTo(20)
             make.centerY.equalToSuperview()
@@ -255,7 +255,7 @@ class YHResignCertificateView: UIView {
         } else {
             nextStepImageView.isHidden = false
             explainLabel.snp.remakeConstraints { make in
-                make.right.equalTo(-24)
+                make.right.equalTo(-20)
                 make.left.equalToSuperview()
                 make.height.equalTo(20)
                 make.centerY.equalToSuperview()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignCertificateManage(续期证件管理)/V/YHResignCertificatePassportTableViewCell.swift

@@ -275,6 +275,13 @@ class YHResignCertificatePassportTableViewCell: UITableViewCell {
         
         cardBeginView = {
             let view = YHItemView()
+            let line = UIView()
+            line.backgroundColor = UIColor.separatorColor
+            view.addSubview(line)
+            line.snp.makeConstraints { make in
+                make.left.right.bottom.equalToSuperview()
+                make.height.equalTo(0.5)
+            }
             return view
         }()
         cardBeginView.block = {[weak self] model in

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignCertificateManage(续期证件管理)/VM/YHResignCertificateDetailViewModel.swift

@@ -38,8 +38,8 @@ class YHResignCertificateDetailViewModel: YHBaseViewModel {
     }
     
     func getPassPortDataSource(_ isShowPrompt: Bool) -> [YHItemModel] {
-        let item1 = YHItemModel(id: .id1, isNeed: true, title: "签发日期", isUserKeyBoard: false, prompts: "请选择", message: getResultString(dataModel.cert_info.issue_start), type: .time, isShowPrompts: isShowPrompt, alertMessage:"请选择开始时间")
-        let item2 = YHItemModel(id: .id2, isNeed: true, title: "届满日期", isUserKeyBoard: false, prompts: "请选择", message: getResultString(dataModel.cert_info.issue_end), type: .time, isShowPrompts: isShowPrompt, alertMessage:"请选择到期时间")
+        let item1 = YHItemModel(id: .id5, isNeed: true, title: "签发日期", isUserKeyBoard: false, prompts: "请选择", message: getResultString(dataModel.cert_info.issue_start), type: .time, isShowPrompts: isShowPrompt, alertMessage:"请选择开始时间")
+        let item2 = YHItemModel(id: .id6, isNeed: true, title: "届满日期", isUserKeyBoard: false, prompts: "请选择", message: getResultString(dataModel.cert_info.issue_end), type: .time, isShowPrompts: isShowPrompt, alertMessage:"请选择到期时间")
         return [item1, item2]
     }
     
@@ -54,6 +54,10 @@ class YHResignCertificateDetailViewModel: YHBaseViewModel {
             dataModel.cert_info.validate_start = item.message ?? ""
         case .id4:
             dataModel.cert_info.validate_end = item.message ?? ""
+        case .id5:
+            dataModel.cert_info.issue_start = item.message ?? ""
+        case .id6:
+            dataModel.cert_info.issue_end = item.message ?? ""
         default:
             break
         }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/V/YHItemView.swift

@@ -462,14 +462,22 @@ class YHItemView: UIView {
         case .time:
             var title = ""
             var isLastDay = false
-            if dataSource?.id == .id10 || dataSource?.id == .id14 || dataSource?.id == .id19 {
+            if dataSource?.id == .id5 || dataSource?.id == .id10 || dataSource?.id == .id14 || dataSource?.id == .id19 {
                 title = "请选择签发日期"
                 isLastDay = true
             }
-            if dataSource?.id == .id11 || dataSource?.id == .id15 || dataSource?.id == .id20 {
+            if dataSource?.id == .id6 || dataSource?.id == .id11 || dataSource?.id == .id15 || dataSource?.id == .id20 {
                 title = "请选择届满日期"
                 isLastDay = false
             }
+            if dataSource?.id == .id1 || dataSource?.id == .id3 {
+                title = "请选择开始时间"
+                isLastDay = false
+            }
+            if dataSource?.id == .id2 || dataSource?.id == .id4 {
+                title = "请选择到期时间"
+                isLastDay = false
+            }
             if dataSource?.id == .id24 {
                 title = "请选择出生日期"
                 isLastDay = true

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

@@ -72,7 +72,7 @@ class YHServiceCenterStepThreeTableHeadView: UIView {
         
         bgView = {
             let view = UIView()
-            view.backgroundColor = UIColor.pageBkgColor
+            view.backgroundColor = UIColor.contentBkgColor
             return view
         }()
         addSubview(bgView)
@@ -87,7 +87,7 @@ class YHServiceCenterStepThreeTableHeadView: UIView {
             let label = UILabel()
             label.textColor = UIColor.mainTextColor70
             label.text = ""
-            label.font = UIFont.PFSC_M(ofSize: 13)
+            label.font = UIFont.PFSC_R(ofSize: 13)
             return label
         }()
         bgView.addSubview(explainLabel)
@@ -170,11 +170,13 @@ class YHServiceSectionStepThreeCollectionViewCell: UICollectionViewCell {
     func setSelectedStyle() {
         descripeLable.textColor = UIColor.mainTextColor
         descripeLable.layer.borderColor = UIColor.mainTextColor.cgColor
+        descripeLable.font = UIFont.PFSC_M(ofSize: 13)
     }
  
     func setDeSelectedStyle() {
         descripeLable.textColor = UIColor.mainTextColor50
         descripeLable.layer.borderColor = UIColor.mainTextColor18.cgColor
+        descripeLable.font = UIFont.PFSC_R(ofSize: 13)
     }
     
     var dataSource: Int = 0 {

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

@@ -62,7 +62,7 @@ class YHServiceMoreAlertView: UIView {
         centerView = {
             let view = UIView()
             view.backgroundColor = .white
-            view.layer.cornerRadius = kCornerRadius8
+            view.layer.cornerRadius = kCornerRadius3
             return view
         }()
         addSubview(centerView)

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

@@ -80,7 +80,7 @@ extension YHServiceOrderProgressTableViewCell {
         // 0未知 1待开始 2进行中 3 已完成
         if model.status == 1 {
             titleLabel.textColor = UIColor.mainTextColor50
-            messageLabel.textColor = UIColor.yhGreyColor50
+            messageLabel.textColor = UIColor.mainTextColor50
             buttonLabel.text = "待开始"
             buttonLabel.backgroundColor = UIColor(hex: 0xb8babe,transparency: 0.5)
             progressImageView.image = UIImage(named: "service_progress_normal")
@@ -228,7 +228,7 @@ extension YHServiceOrderProgressTableViewCell {
                     let aaa: ASAttributedString = .init("哦~", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.yhGreyColor))
                     messageLabel.attributed.text = a + aa + aaa
                     buttonLabel.text = "请稍候"
-                    buttonLabel.backgroundColor = UIColor.yhGreyColor50
+                    buttonLabel.backgroundColor = UIColor.mainTextColor50
                 } else {
                     let a: ASAttributedString = .init("您还有", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.yhGreyColor))
                     let aa: ASAttributedString = .init(NSAttributedString(string: "\(model.num)份"), .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.brandMainColor))
@@ -246,7 +246,7 @@ extension YHServiceOrderProgressTableViewCell {
                 messageLabel.text = "正在等待原则批结果~"
                 buttonLabel.text = "去查看"
                 buttonLabel.backgroundColor = UIColor.brandMainColor
-                messageLabel.textColor = UIColor.yhGreyColor50
+                messageLabel.textColor = UIColor.mainTextColor50
                 progress.changeColor(UIColor.brandMainColor)
                 progressImageView.image = UIImage(named: "service_progress_normal")
                 let b: ASAttributedString = .init(NSAttributedString(string: "\(model.percentage)"), .font(UIFont(name: "DINAlternate-Bold", size: 24)!),.foreground(UIColor.mainTextColor.withAlphaComponent(0.3)))
@@ -259,7 +259,7 @@ extension YHServiceOrderProgressTableViewCell {
                 messageLabel.text = "正在进行原则批补件~"
                 buttonLabel.text = "去查看"
                 buttonLabel.backgroundColor = UIColor.brandMainColor
-                messageLabel.textColor = UIColor.yhGreyColor50
+                messageLabel.textColor = UIColor.mainTextColor50
                 progress.changeColor(UIColor.brandMainColor)
                 progressImageView.image = UIImage(named: "service_progress_normal")
                 let b: ASAttributedString = .init(NSAttributedString(string: "\(model.percentage)"), .font(UIFont(name: "DINAlternate-Bold", size: 24)!),.foreground(UIColor.mainTextColor.withAlphaComponent(0.3)))
@@ -272,7 +272,7 @@ extension YHServiceOrderProgressTableViewCell {
                 messageLabel.text = "恭喜您，原则批已获批~"
                 buttonLabel.text = "去查看"
                 buttonLabel.backgroundColor = UIColor.brandMainColor
-                messageLabel.textColor = UIColor.yhGreyColor50
+                messageLabel.textColor = UIColor.mainTextColor50
                 progress.changeColor(UIColor.brandMainColor)
                 progressImageView.image = UIImage(named: "service_progress_start")
                 let b: ASAttributedString = .init(NSAttributedString(string: "\(model.percentage)"), .font(UIFont(name: "DINAlternate-Bold", size: 24)!),.foreground(UIColor.mainTextColor))
@@ -285,7 +285,7 @@ extension YHServiceOrderProgressTableViewCell {
                 messageLabel.text = "很遗憾，您未获批准~"
                 buttonLabel.text = "去查看"
                 buttonLabel.backgroundColor = UIColor(hex: 0x55cba0)
-                messageLabel.textColor = UIColor.yhGreyColor50
+                messageLabel.textColor = UIColor.mainTextColor50
                 progress.changeColor(UIColor(hex: 0x55cba0))
                 progressImageView.image = UIImage(named: "service_progress_end")
                 let b: ASAttributedString = .init(NSAttributedString(string: "\(model.percentage)"), .font(UIFont(name: "DINAlternate-Bold", size: 24)!),.foreground(UIColor.mainTextColor))
@@ -298,7 +298,7 @@ extension YHServiceOrderProgressTableViewCell {
                 messageLabel.text = "恭喜您，正式批已获批~"
                 buttonLabel.text = "去查看"
                 buttonLabel.backgroundColor = UIColor(hex: 0x55cba0)
-                messageLabel.textColor = UIColor.yhGreyColor50
+                messageLabel.textColor = UIColor.mainTextColor50
                 progress.changeColor(UIColor(hex: 0x55cba0))
                 progressImageView.image = UIImage(named: "service_progress_end")
                 let b: ASAttributedString = .init(NSAttributedString(string: "\(model.percentage)"), .font(UIFont(name: "DINAlternate-Bold", size: 24)!),.foreground(UIColor.mainTextColor))
@@ -310,7 +310,7 @@ extension YHServiceOrderProgressTableViewCell {
                 titleLabel.text = "家庭信息确认"
                 messageLabel.text = "请确认现阶段信息是否存在变更～"
                 buttonLabel.text = "待确认"
-                messageLabel.textColor = UIColor.yhGreyColor50
+                messageLabel.textColor = UIColor.mainTextColor50
             }
             
             if model.type == 21 {
@@ -320,7 +320,7 @@ extension YHServiceOrderProgressTableViewCell {
                 progress.isHidden = true
                 progressImageView.isHidden = true
                 progressLabel.isHidden = true
-                messageLabel.textColor = UIColor.yhGreyColor50
+                messageLabel.textColor = UIColor.mainTextColor50
                 messageLabel.snp.remakeConstraints { make in
                     make.top.equalTo(49)
                     make.left.equalTo(21)
@@ -336,21 +336,21 @@ extension YHServiceOrderProgressTableViewCell {
                     messageLabel.text = "请填写意向办证时间，银河代预约～"
                 }
                 buttonLabel.text = "去查看"
-                messageLabel.textColor = UIColor.yhGreyColor50
+                messageLabel.textColor = UIColor.mainTextColor50
             }
             
             if model.type == 23 {
                 titleLabel.text = "电子签证缴费"
                 messageLabel.text = "请根据指引缴费领取电子签证～"
                 buttonLabel.text = "待缴费"
-                messageLabel.textColor = UIColor.yhGreyColor50
+                messageLabel.textColor = UIColor.mainTextColor50
             }
             
             if model.type == 25 {
                 titleLabel.text = "赴港行程指引"
                 messageLabel.text = "请根据指引清单提前规划赴港行程"
                 buttonLabel.text = "去查看"
-                messageLabel.textColor = UIColor.yhGreyColor50
+                messageLabel.textColor = UIColor.mainTextColor50
                 progressImageView.isHidden = true
                 progressLabel.isHidden = true
                 messageLabel.snp.remakeConstraints { make in
@@ -364,27 +364,27 @@ extension YHServiceOrderProgressTableViewCell {
                 titleLabel.text = "旅行证件准备"
                 messageLabel.text = "请更新所有赴港人员的旅行证件"
                 buttonLabel.text = "去上传"
-                messageLabel.textColor = UIColor.yhGreyColor50
+                messageLabel.textColor = UIColor.mainTextColor50
             }
             
             if model.type == 27 {
                 titleLabel.text = "上传过关证件"
                 messageLabel.text = "点击保存入境小白条及香港身份证（后续身份续期、永居均涉及）"
                 buttonLabel.text = "去上传"
-                messageLabel.textColor = UIColor.yhGreyColor50
+                messageLabel.textColor = UIColor.mainTextColor50
             }
             if model.type == 31 {
                 titleLabel.text = "续签资料管理"
                 messageLabel.text = "请根据资料清单上传您的续签证明文件~"
                 buttonLabel.text = "去上传"
-                messageLabel.textColor = UIColor.yhGreyColor50
+                messageLabel.textColor = UIColor.mainTextColor50
             }
             
             if model.type == 32 {
                 titleLabel.text = "续签文书管理"
                 messageLabel.text = "请确认您的续签文书内容并完成签字~"
                 buttonLabel.text = "去确认"
-                messageLabel.textColor = UIColor.yhGreyColor50
+                messageLabel.textColor = UIColor.mainTextColor50
             }
         }
         if model.status == 3 {
@@ -475,7 +475,7 @@ extension YHServiceOrderProgressTableViewCell {
         if model.status == 4 {
             titleLabel.textColor = UIColor.mainTextColor
             buttonLabel.text = "请稍候"
-            buttonLabel.backgroundColor = UIColor.yhGreyColor50
+            buttonLabel.backgroundColor = UIColor.mainTextColor50
             progressImageView.image = UIImage(named: "service_progress_start")
             progress.changeColor(UIColor.brandMainColor)
             // 1 证件 2 信息完善 3 我的评分 4 我的方案 5 我的签字 6我的文书

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

@@ -19,9 +19,14 @@ class YHServiceStepAlertView: UIView {
             if isStepOne {
                 orderButton.isSelected = false
                 guideButton.isSelected = true
+                orderButton.titleLabel?.font = UIFont.PFSC_R(ofSize: 14)
+                guideButton.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
             } else {
                 orderButton.isSelected = true
                 guideButton.isSelected = false
+                orderButton.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
+                guideButton.titleLabel?.font = UIFont.PFSC_R(ofSize: 14)
+                
             }
         }
     }
@@ -52,7 +57,7 @@ class YHServiceStepAlertView: UIView {
         centerView = {
             let view = UIView()
             view.backgroundColor = .white
-            view.layer.cornerRadius = kCornerRadius8
+            view.layer.cornerRadius = kCornerRadius3
             return view
         }()
         addSubview(centerView)