// 在港递交预约

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -462,6 +462,9 @@
 		04912F622CB66E6300CC3105 /* YHResignInfoConfirmViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04912F612CB66E6300CC3105 /* YHResignInfoConfirmViewController.swift */; };
 		04912F642CB6885D00CC3105 /* YHResignFamilyMemberInfoCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04912F632CB6885D00CC3105 /* YHResignFamilyMemberInfoCell.swift */; };
 		04912F6E2CB6A64700CC3105 /* YHResignAppointTipsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04912F6D2CB6A64700CC3105 /* YHResignAppointTipsView.swift */; };
+		04912F702CB765FE00CC3105 /* YHResignAppointTimeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04912F6F2CB765FE00CC3105 /* YHResignAppointTimeViewController.swift */; };
+		04912F722CB7714300CC3105 /* YHResignAppointTimeCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04912F712CB7714300CC3105 /* YHResignAppointTimeCell.swift */; };
+		04912F742CB7743900CC3105 /* YHResignAppointTimeItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04912F732CB7743900CC3105 /* YHResignAppointTimeItemView.swift */; };
 		0493B3DC2BA7EFE600AF9393 /* YHCertificateSearchViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0493B3DB2BA7EFE600AF9393 /* YHCertificateSearchViewController.swift */; };
 		0493B3DE2BA80C2300AF9393 /* YHCertificateFilterButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0493B3DD2BA80C2300AF9393 /* YHCertificateFilterButton.swift */; };
 		049537852BA9B28500AF7E59 /* YHCertificateTemplateCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049537842BA9B28500AF7E59 /* YHCertificateTemplateCell.swift */; };
@@ -1325,6 +1328,9 @@
 		04912F612CB66E6300CC3105 /* YHResignInfoConfirmViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignInfoConfirmViewController.swift; sourceTree = "<group>"; };
 		04912F632CB6885D00CC3105 /* YHResignFamilyMemberInfoCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignFamilyMemberInfoCell.swift; sourceTree = "<group>"; };
 		04912F6D2CB6A64700CC3105 /* YHResignAppointTipsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignAppointTipsView.swift; sourceTree = "<group>"; };
+		04912F6F2CB765FE00CC3105 /* YHResignAppointTimeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignAppointTimeViewController.swift; sourceTree = "<group>"; };
+		04912F712CB7714300CC3105 /* YHResignAppointTimeCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignAppointTimeCell.swift; sourceTree = "<group>"; };
+		04912F732CB7743900CC3105 /* YHResignAppointTimeItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignAppointTimeItemView.swift; sourceTree = "<group>"; };
 		0493B3DB2BA7EFE600AF9393 /* YHCertificateSearchViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateSearchViewController.swift; sourceTree = "<group>"; };
 		0493B3DD2BA80C2300AF9393 /* YHCertificateFilterButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateFilterButton.swift; sourceTree = "<group>"; };
 		049537842BA9B28500AF7E59 /* YHCertificateTemplateCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateTemplateCell.swift; sourceTree = "<group>"; };
@@ -3370,6 +3376,7 @@
 		04912F662CB6A59500CC3105 /* C */ = {
 			isa = PBXGroup;
 			children = (
+				04912F6F2CB765FE00CC3105 /* YHResignAppointTimeViewController.swift */,
 			);
 			path = C;
 			sourceTree = "<group>";
@@ -3378,6 +3385,8 @@
 			isa = PBXGroup;
 			children = (
 				04912F6D2CB6A64700CC3105 /* YHResignAppointTipsView.swift */,
+				04912F732CB7743900CC3105 /* YHResignAppointTimeItemView.swift */,
+				04912F712CB7714300CC3105 /* YHResignAppointTimeCell.swift */,
 			);
 			path = V;
 			sourceTree = "<group>";
@@ -5031,6 +5040,7 @@
 				0472CBA82C5A11640096F48F /* YHPrincipleUploadListVC.swift in Sources */,
 				A5EF21352BA6E05E005027E6 /* YHQuestionAndAnswerViewController.swift in Sources */,
 				A5EF213B2BA6EC98005027E6 /* YHQuestionAndAnswerCell.swift in Sources */,
+				04912F702CB765FE00CC3105 /* YHResignAppointTimeViewController.swift in Sources */,
 				045EEEA82B9F171A0022A143 /* YHWorkIntroductionViewController.swift in Sources */,
 				044D0BFC2C21635B00C5CF5E /* YHInformationAuthorizationStepOneViewController.swift in Sources */,
 				045EEEBF2B9F171A0022A143 /* YHWorkFileItemView.swift in Sources */,
@@ -5348,6 +5358,7 @@
 				04F2433F2C9ACF5C00DF2C74 /* YHHKRecordsEditContentVC.swift in Sources */,
 				045EEEC12B9F171A0022A143 /* YHOtherInfoFillModel.swift in Sources */,
 				047A3DF52C295AFF0048937B /* YHFriendListModel.swift in Sources */,
+				04912F722CB7714300CC3105 /* YHResignAppointTimeCell.swift in Sources */,
 				0468D43A2B579EAC00CFB916 /* YHLoginViewModel.swift in Sources */,
 				04CE1AD72C2AD91F001CB80A /* YHActivityDetailViewController.swift in Sources */,
 				045EEE9E2B9F171A0022A143 /* YHWorkExampleModel.swift in Sources */,
@@ -5406,6 +5417,7 @@
 				A567E5AF2BD7643D00D5D5A0 /* YHHomeWebViewBottomForSavePicView.swift in Sources */,
 				045A7E672C2ACB1A008F995B /* YHLoginOneLeadView.swift in Sources */,
 				048787D72BCE96F50036E221 /* YHServiceOrderProgressTableViewCell.swift in Sources */,
+				04912F742CB7743900CC3105 /* YHResignAppointTimeItemView.swift in Sources */,
 				047AA3F82C5CC7B0009C4554 /* YHShareStepView.swift in Sources */,
 				04AD31792C23FFC700DF5655 /* YHInterestModel.swift in Sources */,
 				04256DD22C704A3000A37BA4 /* YHIFamilyInfoListCell.swift in Sources */,

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignHKAppoint(在港递交预约)/C/YHResignAppointTimeViewController.swift

+//
+//  YHResignAppointTimeViewController.swift
+//  galaxy
+//
+//  Created by edy on 2024/10/10.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+import AttributedString
+import SwifterSwift
+
+class YHResignAppointTimeViewController: YHBaseViewController {
+
+    var familyArr: [String] = ["", "", "", ""]
+
+    lazy var tableView: UITableView = {
+        let tableView = UITableView(frame: CGRect.zero, style:.grouped)
+        if #available(iOS 15.0, *) {
+           tableView.sectionHeaderTopPadding = 0.0
+        }
+        tableView.estimatedSectionHeaderHeight = 0.1
+        tableView.estimatedSectionFooterHeight = 16.0
+        tableView.contentInsetAdjustmentBehavior = .never
+        tableView.showsVerticalScrollIndicator = false
+        tableView.backgroundColor = .clear
+        tableView.separatorStyle = .none
+        tableView.bounces = false
+        tableView.register(YHResignAppointTimeCell.self, forCellReuseIdentifier: YHResignAppointTimeCell.cellReuseIdentifier)
+        tableView.delegate = self
+        tableView.dataSource = self
+        return tableView
+    }()
+    
+    lazy var tipsBtn: UIButton = {
+        let button = UIButton()
+        button.setTitle("递交提示", for: .normal)
+        button.titleLabel?.font = .PFSC_R(ofSize: 11)
+        button.setTitleColor(UIColor.mainTextColor, for: .normal)
+        button.setImage(UIImage(named: "resign_appoint_tips_btn"), for: .normal)
+        button.centerTextAndImage(imageAboveText: true, spacing: 0.0)
+        return button
+    }()
+    
+    lazy var submitBtn: UIButton = {
+        let btn = UIButton()
+        btn.backgroundColor = .brandMainColor
+        btn.setTitle("确认提交", for: .normal)
+        btn.setTitleColor(.white, for: .normal)
+        btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 15)
+        btn.addTarget(self, action: #selector(didSubmitBtnClicked), for: .touchUpInside)
+        btn.layer.cornerRadius = kCornerRadius3
+        return btn
+    }()
+    
+    lazy var bottomView: UIView = {
+        let view = UIView()
+        view.backgroundColor = .white
+        view.addSubview(tipsBtn)
+        view.addSubview(submitBtn)
+        tipsBtn.snp.makeConstraints { make in
+            make.left.equalTo(22)
+            make.width.equalTo(44)
+            make.height.equalTo(48)
+            make.centerY.equalTo(submitBtn)
+        }
+        submitBtn.snp.makeConstraints { make in
+            make.left.equalTo(tipsBtn.snp.right).offset(22)
+            make.right.equalTo(-20)
+            make.top.equalTo(8)
+            make.height.equalTo(48)
+        }
+        return view
+    }()
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        self.gk_navTitle = "预约在港递交时间"
+        self.gk_navigationBar.backgroundColor = .white
+        self.view.backgroundColor = .init(hex: 0xF8F9FB)
+        self.view.addSubview(tableView)
+        self.view.addSubview(bottomView)
+        self.tableView.snp.makeConstraints { make in
+            make.left.equalTo(16)
+            make.right.equalTo(-16)
+            make.top.equalTo(k_Height_NavigationtBarAndStatuBar+16)
+            make.bottom.equalTo(bottomView.snp.top)
+        }
+        self.bottomView.snp.makeConstraints { make in
+            make.left.right.bottom.equalToSuperview()
+            make.height.equalTo(98)
+        }
+
+    }
+    
+    @objc func didSubmitBtnClicked() {
+        
+    }
+}
+
+extension YHResignAppointTimeViewController: UITableViewDelegate, UITableViewDataSource {
+    
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return familyArr.count
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        
+        let cell = tableView.dequeueReusableCell(withIdentifier: YHResignAppointTimeCell.cellReuseIdentifier, for: indexPath) as! YHResignAppointTimeCell
+        
+        if 0 <= indexPath.row && indexPath.row < familyArr.count {
+            
+        }
+        return cell
+    }
+    
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        return UITableView.automaticDimension
+    }
+    
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        
+        if 0 <= indexPath.row && indexPath.row < familyArr.count {
+            let model = familyArr[indexPath.row]
+            
+        }
+    }
+    
+    private func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> CGFloat {
+        return 0.1
+    }
+    
+    private func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> CGFloat {
+        return 16
+    }
+    
+    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
+        let view = UIView()
+        return view
+    }
+    
+    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+        let view = UIView()
+        return view
+    }
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignHKAppoint(在港递交预约)/V/YHResignAppointTimeCell.swift

+//
+//  YHResignAppointTimeCell.swift
+//  galaxy
+//
+//  Created by edy on 2024/10/10.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+import AttributedString
+
+class YHResignAppointTimeCell: UITableViewCell {
+
+    static let cellReuseIdentifier = "YHResignFamilyMemberInfoCell"
+    
+    lazy var whiteContentView: UIView = {
+        let view = UIView()
+        view.backgroundColor = .white
+        view.layer.cornerRadius = kCornerRadius6
+        return view
+    }()
+    
+    lazy var titleLabel: UILabel = {
+        let titleLabel = UILabel(frame: CGRect(x: 18, y: 16, width: KScreenWidth, height: 24.0))
+        let mustTag: ASAttributedString = .init("* ", .font(UIFont.PFSC_M(ofSize: 17)),.foreground(UIColor.failColor))
+        var title: ASAttributedString = .init("请您确认以下信息", .font(UIFont.PFSC_M(ofSize: 17)),.foreground(UIColor.mainTextColor))
+        title = mustTag + title
+        titleLabel.attributed.text = title
+        return titleLabel
+    }()
+    
+    lazy var submitTimeItemView: YHResignAppointTimeItemView = {
+        let view = YHResignAppointTimeItemView(frame: .zero)
+        view.title = "预约在港递交时间"
+        view.placeHolder = "请选择"
+        view.isNeedShowErrorTips = false
+        view.errorTips = "请选择在港递交时间"
+        view.detail = ""
+        view.updateLineMargin(-18.0)
+        view.clickBlock = {
+            [weak self] in
+            guard let self = self else { return }
+        }
+        return view
+    }()
+    
+    lazy var leaveTimeItemView: YHResignAppointTimeItemView = {
+        let view = YHResignAppointTimeItemView(frame: .zero)
+        view.title = "预计离港时间"
+        view.placeHolder = "请选择"
+        view.errorTips = "请选择离港时间"
+        view.isNeedShowErrorTips = false
+        view.detail = ""
+        view.clickBlock = {
+            [weak self] in
+            guard let self = self else { return }
+        }
+        return view
+    }()
+    
+    required init?(coder: NSCoder) {
+        super.init(coder: coder)
+    }
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        setupUI()
+    }
+    
+    func setupUI() {
+        
+        self.selectionStyle = .none
+        self.backgroundColor = .clear
+        self.contentView.backgroundColor = .clear
+        
+        self.contentView.addSubview(whiteContentView)
+        whiteContentView.addSubview(titleLabel)
+        whiteContentView.addSubview(submitTimeItemView)
+        whiteContentView.addSubview(leaveTimeItemView)
+        
+        whiteContentView.snp.makeConstraints { make in
+            make.left.right.top.equalToSuperview()
+            make.bottom.equalTo(-16)
+        }
+        
+        titleLabel.snp.makeConstraints { make in
+            make.left.equalTo(18)
+            make.right.equalTo(-18)
+            make.top.equalTo(16)
+            make.height.equalTo(24)
+        }
+        
+        submitTimeItemView.snp.makeConstraints { make in
+            make.left.equalTo(18)
+            make.right.equalTo(-18)
+            make.top.equalTo(titleLabel.snp.bottom).offset(12)
+        }
+        
+        leaveTimeItemView.snp.makeConstraints { make in
+            make.left.equalTo(18)
+            make.right.equalTo(-18)
+            make.top.equalTo(submitTimeItemView.snp.bottom)
+            make.bottom.equalToSuperview()
+        }
+    }
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignHKAppoint(在港递交预约)/V/YHResignAppointTimeItemView.swift

+//
+//  YHResignAppointTimeItemView.swift
+//  galaxy
+//
+//  Created by edy on 2024/10/10.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHResignAppointTimeItemView: UIView {
+    
+    var titleMaxWidth = 112.0
+    
+    var clickBlock: (()->())?
+    
+    var title: String = "" {
+        didSet {
+            titleLabel.text = title
+        }
+    }
+    
+    var placeHolder: String = ""
+    
+    var errorTips: String = "" {
+        didSet {
+            errorLabel.text = errorTips
+        }
+    }
+    
+    var isNeedShowErrorTips: Bool = false {
+        didSet {
+            errorLabel.isHidden = !isNeedShowErrorTips
+            errorLabel.snp.remakeConstraints { make in
+                make.top.equalTo(detailLabel.snp.bottom).offset(isNeedShowErrorTips ? 5 : 0)
+                make.left.equalTo(titleLabel)
+                make.right.equalTo(0)
+                make.bottom.equalTo(-16)
+                if !isNeedShowErrorTips {
+                    make.height.equalTo(0)
+                }
+            }
+            self.setNeedsLayout()
+            self.layoutIfNeeded()
+        }
+    }
+    
+    func updateLineMargin(_ margin: CGFloat) {
+        lineView.snp.updateConstraints { make in
+            make.left.equalTo(margin)
+            make.right.equalTo(-margin)
+        }
+        self.setNeedsLayout()
+        self.layoutIfNeeded()
+    }
+    
+    var detail: String = "" {
+        didSet {
+            
+            if detail.isEmpty {
+                // 显示placeHolder
+                detailLabel.text = self.placeHolder
+                detailLabel.textColor = .placeHolderColor
+                detailLabel.textAlignment = .left
+                return
+            }
+            detailLabel.text = detail
+            detailLabel.textColor = .mainTextColor
+            detailLabel.textAlignment = .left
+        }
+    }
+    
+    
+//    var isShowDetailOneline:Bool = false {
+//        didSet {
+//            detailLabel.textAlignment = .left
+//            detailLabel.numberOfLines = isShowDetailOneline ? 1 : 0
+//            detailLabel.snp.remakeConstraints { make in
+//                make.top.equalTo(16)
+//                make.left.equalTo(titleLabel.snp.right).offset(0)
+//                make.right.equalTo(arrowImgView.snp.left)
+//                if isShowDetailOneline {
+//                    make.height.equalTo(20)
+//                }
+//            }
+//
+//            errorLabel.snp.remakeConstraints { make in
+//                make.top.equalTo(detailLabel.snp.bottom).offset(0)
+//                make.left.equalTo(titleLabel)
+//                make.right.equalTo(0)
+//                make.bottom.equalTo(-16)
+//            }
+//
+//            self.setNeedsLayout()
+//            self.layoutIfNeeded()
+//        }
+//    }
+    
+    lazy var lineView: UIView = {
+        let view = UIView()
+        view.backgroundColor = .separatorColor
+        return view
+    }()
+    
+    lazy var titleLabel: UILabel = {
+        let label = UILabel()
+        label.numberOfLines = 0
+        label.font = UIFont.PFSC_R(ofSize: 14)
+        label.textColor = .mainTextColor
+        return label
+    }()
+    
+    private lazy var detailLabel: UILabel = {
+        let label = UILabel()
+        label.numberOfLines = 0
+        label.font = UIFont.PFSC_M(ofSize: 14)
+        label.textColor = .mainTextColor
+        return label
+    }()
+    
+    private lazy var errorLabel: UILabel = {
+        let label = UILabel()
+        label.numberOfLines = 0
+        label.font = UIFont.PFSC_R(ofSize: 12)
+        label.textColor = .failColor
+        return label
+    }()
+    
+    lazy var arrowImgView: UIImageView = {
+        let view = UIImageView(image: UIImage(named: "family_info_arrow"))
+        return view
+    }()
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        createUI()
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+     
+    @objc func didSelectView() {
+        clickBlock?()
+    }
+    
+    func createUI() {
+        self.addSubview(titleLabel)
+        self.addSubview(detailLabel)
+        self.addSubview(arrowImgView)
+        self.addSubview(lineView)
+        self.addSubview(errorLabel)
+        
+        let tap = UITapGestureRecognizer(target: self, action: #selector(didSelectView))
+        self.addGestureRecognizer(tap)
+
+        lineView.snp.makeConstraints { make in
+            make.left.equalTo(0)
+            make.right.equalTo(0)
+            make.top.equalTo(0)
+            make.height.equalTo(0.5)
+        }
+        
+        titleLabel.snp.makeConstraints { make in
+            make.left.equalTo(0)
+            make.top.equalTo(16)
+            make.width.equalTo(titleMaxWidth)
+        }
+        
+        detailLabel.snp.makeConstraints { make in
+            make.top.equalTo(16)
+            make.left.equalTo(titleLabel.snp.right).offset(28.0)
+            make.right.equalTo(arrowImgView.snp.left)
+        }
+        
+        errorLabel.snp.makeConstraints { make in
+            make.top.equalTo(detailLabel.snp.bottom).offset(0)
+            make.left.equalTo(titleLabel)
+            make.right.equalTo(0)
+            make.bottom.equalTo(-16)
+        }
+        
+        arrowImgView.snp.makeConstraints { make in
+            make.width.height.equalTo(22)
+            make.top.equalTo(15)
+            make.right.equalTo(0)
+        }
+    }
+
+}
+

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignHKAppoint(在港递交预约)/V/YHResignAppointTipsView.swift

@@ -111,7 +111,7 @@ class YHResignAppointTipsView: UIView {
         
         lineView.snp.makeConstraints { make in
             make.left.right.equalTo(0)
-            make.height.equalTo(1)
+            make.height.equalTo(0.5)
             make.top.equalTo(titleLabel.snp.bottom).offset(12)
 
         }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignInfoConfirm(续签信息确认)/C/YHResignInfoConfirmViewController.swift

@@ -28,7 +28,6 @@ class YHResignInfoConfirmViewController: YHBaseViewController {
         tableView.register(YHResignFamilyMemberInfoCell.self, forCellReuseIdentifier: YHResignFamilyMemberInfoCell.cellReuseIdentifier)
         tableView.delegate = self
         tableView.dataSource = self
-        tableView.isScrollEnabled = false
         tableView.tableHeaderView = headerView
         return tableView
     }()

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/续签/在港递交预约/resign_appoint_tips_btn.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Frame@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Frame@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}