续签结果页面UI

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/LookResignResult(查看续签结果)/C/YHLookResignResultViewController.swift

@@ -25,7 +25,7 @@ class YHLookResignResultViewController: YHBaseViewController {
     lazy var tableView: UITableView = {
         let tableView = UITableView(frame:.zero, style:.grouped)
         tableView.estimatedSectionHeaderHeight = 0.01
-        tableView.estimatedSectionFooterHeight = 16
+        tableView.estimatedSectionFooterHeight = 0.01
         tableView.contentInsetAdjustmentBehavior = .never
         tableView.showsVerticalScrollIndicator = false
         tableView.separatorStyle = .none
@@ -275,7 +275,10 @@ extension YHLookResignResultViewController: UITableViewDelegate, UITableViewData
     }
     
     private func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> CGFloat {
-        return 16
+        if self.viewModel.dataModel.data.data.count == 0 {
+            return 0.01
+        }
+        return UITableView.automaticDimension
     }
     
     func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
@@ -285,8 +288,28 @@ extension YHLookResignResultViewController: UITableViewDelegate, UITableViewData
     }
     
     func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
-        
+        if self.viewModel.dataModel.data.data.count == 0 {
+            let view = UIView()
+            return view
+        }
         let view = UIView()
+        let titlelabel = UITextView()
+        titlelabel.backgroundColor = .clear
+        titlelabel.textColor = UIColor.mainTextColor
+        titlelabel.font = UIFont.PFSC_M(ofSize: 16)
+        titlelabel.isScrollEnabled = false
+        titlelabel.isEditable = false
+        titlelabel.isSelectable = false
+        titlelabel.text = "    "
+        view.addSubview(titlelabel)
+        
+        titlelabel.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(20)
+            make.right.equalToSuperview().offset(-20)
+            make.top.equalToSuperview()
+            make.height.equalTo(16)
+            make.bottom.equalToSuperview()
+        }
         return view
     }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/LookResignResult(查看续签结果)/V/YHLookResignAlertView.swift

@@ -12,7 +12,7 @@ import AttributedString
 class YHLookResignAlertView: UIView {
     var dismissBlock: (() -> Void)?
     var centerView: UIView!
-    var titleLabel: UILabel!
+    var titleLabel: UIImageView!
     var messageLabel: UILabel!
     var closeButton: UIButton!
     var sureButton: UIButton!
@@ -43,16 +43,15 @@ class YHLookResignAlertView: UIView {
         }
         
         titleLabel = {
-            let label = UILabel()
-            label.text = "缴费须知"
-            label.font = UIFont.PFSC_M(ofSize: 26)
-            label.textColor = UIColor.mainTextColor
+            let label = UIImageView()
+            label.image = UIImage(named: "look_resign_title")
             return label
         }()
         centerView.addSubview(titleLabel)
         titleLabel.snp.makeConstraints { make in
-            make.top.equalTo(20)
-            make.height.equalTo(36)
+            make.top.equalTo(23)
+            make.height.equalTo(30)
+            make.width.equalTo(103)
             make.left.equalTo(20)
         }
         
@@ -93,11 +92,11 @@ class YHLookResignAlertView: UIView {
         messageLabel = {
             let label = UILabel()
             label.numberOfLines = 0
-            let a = ASAttributedString.init("根据港府政策，获批后缴费领取新电子签证时，申请人应身在香港；", .font(UIFont.PFSC_M(ofSize:14)), .foreground(UIColor.mainTextColor70))
-            let b = ASAttributedString.init("请勿在香港境外点击缴费链接", .font(UIFont.PFSC_M(ofSize:14)),.foreground(UIColor.failColor))
-            let c = ASAttributedString.init("，避免签证被锁，导致需重发签证，对您造成时间、费用成本损失，甚至身份失效\n\n建议入境香港后，远离海关，", .font(UIFont.PFSC_M(ofSize:14)), .foreground(UIColor.mainTextColor70))
-            let d = ASAttributedString.init("至少2个小时后再进行缴费", .font(UIFont.PFSC_M(ofSize:14)),.foreground(UIColor.failColor))
-            let e = ASAttributedString.init("，避免香港海关系统还未识别到入境记录!", .font(UIFont.PFSC_M(ofSize:14)), .foreground(UIColor.mainTextColor70))
+            let a = ASAttributedString.init("根据港府政策，获批后缴费领取新电子签证时，申请人应身在香港；", .font(UIFont.PFSC_R(ofSize:14)), .foreground(UIColor.mainTextColor70))
+            let b = ASAttributedString.init("请勿在香港境外点击缴费链接", .font(UIFont.PFSC_R(ofSize:14)),.foreground(UIColor.failColor))
+            let c = ASAttributedString.init("，避免签证被锁，导致需重发签证，对您造成时间、费用成本损失，甚至身份失效\n\n建议入境香港后，远离海关，", .font(UIFont.PFSC_R(ofSize:14)), .foreground(UIColor.mainTextColor70))
+            let d = ASAttributedString.init("至少2个小时后再进行缴费", .font(UIFont.PFSC_R(ofSize:14)),.foreground(UIColor.failColor))
+            let e = ASAttributedString.init("，避免香港海关系统还未识别到入境记录!", .font(UIFont.PFSC_R(ofSize:14)), .foreground(UIColor.mainTextColor70))
             label.attributed.text = a+b+c+d+e
             return label
         }()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/LookResignResult(查看续签结果)/V/YHLookResignResultFootView.swift

@@ -26,7 +26,7 @@ class YHLookResignResultFootView: UIView {
             let view = UILabel()
             view.text = "温馨提示："
             view.textColor = UIColor.mainTextColor50
-            view.font = UIFont.PFSC_M(ofSize: 14)
+            view.font = UIFont.PFSC_R(ofSize: 14)
             view.numberOfLines = 0
             return view
         }()
@@ -40,7 +40,7 @@ class YHLookResignResultFootView: UIView {
             let view = UILabel()
             view.text = "1、收到《入境处递交回执》后，建议在港等待获批结果，若有需要离港，请在签证到期前离港。\n2、获批后，所有申请人需在港缴费领取新签证"
             view.textColor = UIColor.mainTextColor50
-            view.font = UIFont.PFSC_M(ofSize: 14)
+            view.font = UIFont.PFSC_R(ofSize: 14)
             view.numberOfLines = 0
             return view
         }()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/LookResignResult(查看续签结果)/V/YHLookResignResultHeadView.swift

@@ -32,25 +32,25 @@ class YHLookResignResultHeadView: UIView {
         didSet {
             guard let dataSource = dataSource else { return }
             if state == 0 {
-                let a = ASAttributedString.init("\(dataSource.data.user)，您的【优秀人才入境计划】续签申请资料已递交至港府，且港府", .font(UIFont.PFSC_M(ofSize:14)), .foreground(UIColor.mainTextColor50))
-                let b = ASAttributedString.init("已确认递交申请", .font(UIFont.PFSC_M(ofSize:14)),.foreground(UIColor.brandMainColor))
-                let c = ASAttributedString.init("，入境处审核周期预计4-8周，请耐心等待获批结果", .font(UIFont.PFSC_M(ofSize:14)), .foreground(UIColor.mainTextColor50))
+                let a = ASAttributedString.init("\(dataSource.data.user)，您的【优秀人才入境计划】续签申请资料已递交至港府，且港府", .font(UIFont.PFSC_R(ofSize:14)), .foreground(UIColor.mainTextColor70))
+                let b = ASAttributedString.init("已确认递交申请", .font(UIFont.PFSC_R(ofSize:14)),.foreground(UIColor.brandMainColor))
+                let c = ASAttributedString.init("，入境处审核周期预计4-8周，请耐心等待获批结果", .font(UIFont.PFSC_R(ofSize:14)), .foreground(UIColor.mainTextColor70))
                 messageLabel.attributed.text = a+b+c
             } else if state == 1 {
-                let a = ASAttributedString.init("\(dataSource.data.user)，您的【优秀人才入境计划】续签申请已获得", .font(UIFont.PFSC_M(ofSize:14)), .foreground(UIColor.mainTextColor50))
-                let b = ASAttributedString.init("港府补件通知", .font(UIFont.PFSC_M(ofSize:14)),.foreground(UIColor.brandMainColor))
-                let c = ASAttributedString.init("，请您于\(dataSource.data.deadline)前根据补件信内容，补充资料递交至港府！", .font(UIFont.PFSC_M(ofSize:14)), .foreground(UIColor.mainTextColor50))
+                let a = ASAttributedString.init("\(dataSource.data.user)，您的【优秀人才入境计划】续签申请已获得", .font(UIFont.PFSC_R(ofSize:14)), .foreground(UIColor.mainTextColor70))
+                let b = ASAttributedString.init("港府补件通知", .font(UIFont.PFSC_R(ofSize:14)),.foreground(UIColor.brandMainColor))
+                let c = ASAttributedString.init("，请您于\(dataSource.data.deadline)前根据补件信内容，补充资料递交至港府！", .font(UIFont.PFSC_R(ofSize:14)), .foreground(UIColor.mainTextColor70))
                 messageLabel.attributed.text = a+b+c
             } else {
                 if dataSource.mode == 1 {
-                    let a = ASAttributedString.init("\(dataSource.data.user)，您申请的【优秀人才入境计划】续签申请在\(dataSource.data.main.pay_deadline)", .font(UIFont.PFSC_M(ofSize:14)), .foreground(UIColor.mainTextColor50))
-                    let b = ASAttributedString.init("正式获批", .font(UIFont.PFSC_M(ofSize:14)),.foreground(UIColor.brandMainColor))
-                    let c = ASAttributedString.init("！请在\(dataSource.data.main.result_date)前，赴港缴费领取新签证！", .font(UIFont.PFSC_M(ofSize:14)), .foreground(UIColor.mainTextColor50))
+                    let a = ASAttributedString.init("\(dataSource.data.user)，您申请的【优秀人才入境计划】续签申请在\(dataSource.data.main.pay_deadline)", .font(UIFont.PFSC_R(ofSize:14)), .foreground(UIColor.mainTextColor70))
+                    let b = ASAttributedString.init("正式获批", .font(UIFont.PFSC_R(ofSize:14)),.foreground(UIColor.brandMainColor))
+                    let c = ASAttributedString.init("！请在\(dataSource.data.main.result_date)前，赴港缴费领取新签证！", .font(UIFont.PFSC_R(ofSize:14)), .foreground(UIColor.mainTextColor70))
                     messageLabel.attributed.text = a+b+c
                 } else {
-                    let a = ASAttributedString.init("\(dataSource.data.user)，您与家人申请的【优秀人才入境计划】续签申请已", .font(UIFont.PFSC_M(ofSize:14)), .foreground(UIColor.mainTextColor50))
-                    let b = ASAttributedString.init("正式获批", .font(UIFont.PFSC_M(ofSize:14)),.foreground(UIColor.brandMainColor))
-                    let c = ASAttributedString.init("！请在截止时间前赴港缴费领取新签证", .font(UIFont.PFSC_M(ofSize:14)), .foreground(UIColor.mainTextColor50))
+                    let a = ASAttributedString.init("\(dataSource.data.user)，您与家人申请的【优秀人才入境计划】续签申请已", .font(UIFont.PFSC_R(ofSize:14)), .foreground(UIColor.mainTextColor70))
+                    let b = ASAttributedString.init("正式获批", .font(UIFont.PFSC_R(ofSize:14)),.foreground(UIColor.brandMainColor))
+                    let c = ASAttributedString.init("！请在截止时间前赴港缴费领取新签证", .font(UIFont.PFSC_R(ofSize:14)), .foreground(UIColor.mainTextColor70))
                     messageLabel.attributed.text = a+b+c
                 }
             }
@@ -88,8 +88,8 @@ class YHLookResignResultHeadView: UIView {
         addSubview(titleImageView)
         titleImageView.snp.makeConstraints { make in
             make.left.equalTo(20)
-            make.top.equalTo(20 + k_Height_NavigationtBarAndStatuBar)
-            make.height.equalTo(39)
+            make.top.equalTo(23 + k_Height_NavigationtBarAndStatuBar)
+            make.height.equalTo(33)
             make.width.equalTo(160)
         }
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/LookResignResult(查看续签结果)/V/YHLookResignResultPrivateView.swift

@@ -47,18 +47,18 @@ class YHLookResignResultPrivateView: UIView {
         
         messageLabel = {
             let label = UILabel()
-            let a = ASAttributedString.init("已阅读并同意", .font(UIFont.PFSC_M(ofSize:13)), .foreground(UIColor.mainTextColor50))
-            let c = ASAttributedString.init("缴费须知", .font(UIFont.PFSC_M(ofSize:13)),.foreground(UIColor.brandMainColor), .action {
+            let a = ASAttributedString.init("已阅读并同意", .font(UIFont.PFSC_R(ofSize:13)), .foreground(UIColor.mainTextColor50))
+            let c = ASAttributedString.init("缴费须知", .font(UIFont.PFSC_R(ofSize:13)),.foreground(UIColor.brandMainColor), .action {
                 // 跳转引导
                 self.alert()
             })
-            let e = ASAttributedString.init("，请勿在香港境外点击缴费链接", .font(UIFont.PFSC_M(ofSize:13)), .foreground(UIColor.mainTextColor50))
+            let e = ASAttributedString.init("，请勿在香港境外点击缴费链接", .font(UIFont.PFSC_R(ofSize:13)), .foreground(UIColor.mainTextColor50))
             label.attributed.text = a+c+e
             return label
         }()
         addSubview(messageLabel)
         messageLabel.snp.makeConstraints { make in
-            make.left.equalTo(agreeButton.snp.right).offset(10)
+            make.left.equalTo(agreeButton.snp.right).offset(6)
             make.centerY.equalToSuperview()
             make.height.equalTo(20)
         }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/LookResignResult(查看续签结果)/V/YHLookResignResultStateOneTableViewCell.swift

@@ -22,6 +22,8 @@ class YHLookResignResultStateOneTableViewCell: UITableViewCell {
     var docValueLabel: UILabel!
     var mainItemView: UIView!
     var lineView: UIView!
+    var subLineView: UIView!
+    
     var title: String = "" {
         didSet {
             titleLabel.text = title
@@ -104,7 +106,7 @@ class YHLookResignResultStateOneTableViewCell: UITableViewCell {
         
         peopleLabel = {
             let label = UILabel()
-            label.font = UIFont.PFSC_M(ofSize: 14)
+            label.font = UIFont.PFSC_R(ofSize: 14)
             label.text = "申请人："
             label.textColor = UIColor.mainTextColor50
             return label
@@ -119,7 +121,7 @@ class YHLookResignResultStateOneTableViewCell: UITableViewCell {
         
         peopleValueLabel = {
             let label = UILabel()
-            label.font = UIFont.PFSC_M(ofSize: 14)
+            label.font = UIFont.PFSC_R(ofSize: 14)
             label.text = "张三丰、章一刀"
             label.textColor = UIColor.mainTextColor
             label.textAlignment = .right
@@ -135,7 +137,7 @@ class YHLookResignResultStateOneTableViewCell: UITableViewCell {
         
         docLabel = {
             let label = UILabel()
-            label.font = UIFont.PFSC_M(ofSize: 14)
+            label.font = UIFont.PFSC_R(ofSize: 14)
             label.text = "递交回执："
             label.textColor = UIColor.mainTextColor50
             return label
@@ -151,7 +153,7 @@ class YHLookResignResultStateOneTableViewCell: UITableViewCell {
         docValueLabel = {
             let label = UILabel()
             label.textColor = UIColor.mainTextColor
-            let a = ASAttributedString.init("欧阳先生", .font(UIFont.PFSC_M(ofSize:14)), .foreground(UIColor.brandMainColor), .underline(.single), .action {
+            let a = ASAttributedString.init("欧阳先生", .font(UIFont.PFSC_R(ofSize:14)), .foreground(UIColor.brandMainColor), .underline(.single), .action {
                 // 点击预览
             })
             label.attributed.text = a
@@ -160,12 +162,23 @@ class YHLookResignResultStateOneTableViewCell: UITableViewCell {
         }()
         centerView.addSubview(docValueLabel)
         docValueLabel.snp.makeConstraints { make in
-            make.left.equalTo(18)
             make.top.equalTo(104)
             make.height.equalTo(20)
             make.right.equalTo(-18)
         }
         
+        subLineView = {
+            let view = UIView()
+            view.backgroundColor = UIColor(hex: 0xff8000)
+            view.layer.cornerRadius = 1
+            return view
+        }()
+        centerView.addSubview(subLineView)
+        subLineView.snp.makeConstraints { make in
+            make.right.equalTo(docValueLabel.snp.left).offset(-8)
+            make.centerY.equalTo(docValueLabel.snp.centerY)
+            make.width.height.equalTo(4)
+        }
     }
     
     func updateAllViews() {
@@ -190,9 +203,11 @@ class YHLookResignResultStateOneTableViewCell: UITableViewCell {
                 }
             })
             docValueLabel.attributed.text = a
+            subLineView.isHidden = true
         } else {
             let a = ASAttributedString.init("待递交", .font(UIFont.PFSC_M(ofSize:14)), .foreground(UIColor(hex: 0xff8000)))
             docValueLabel.attributed.text = a
+            subLineView.isHidden = false
         }
     }
 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/LookResignResult(查看续签结果)/V/YHLookResignResultStateThreePeopleTableViewCell.swift

@@ -110,7 +110,7 @@ class YHLookResignResultStateThreePeopleTableViewCell: UITableViewCell {
         
         peopleLabel = {
             let label = UILabel()
-            label.font = UIFont.PFSC_M(ofSize: 14)
+            label.font = UIFont.PFSC_R(ofSize: 14)
             label.text = "获批时间："
             label.textColor = UIColor.mainTextColor50
             return label
@@ -125,7 +125,7 @@ class YHLookResignResultStateThreePeopleTableViewCell: UITableViewCell {
         
         peopleValueLabel = {
             let label = UILabel()
-            label.font = UIFont.PFSC_M(ofSize: 14)
+            label.font = UIFont.PFSC_R(ofSize: 14)
             label.text = "2024年06月01日"
             label.textColor = UIColor.mainTextColor50
             label.textAlignment = .right
@@ -141,7 +141,7 @@ class YHLookResignResultStateThreePeopleTableViewCell: UITableViewCell {
         
         docLabel = {
             let label = UILabel()
-            label.font = UIFont.PFSC_M(ofSize: 14)
+            label.font = UIFont.PFSC_R(ofSize: 14)
             label.text = "缴费截止时间："
             label.textColor = UIColor.mainTextColor50
             return label
@@ -157,7 +157,7 @@ class YHLookResignResultStateThreePeopleTableViewCell: UITableViewCell {
         docValueLabel = {
             let label = UILabel()
             label.textColor = UIColor.mainTextColor50
-            label.font = UIFont.PFSC_M(ofSize: 14)
+            label.font = UIFont.PFSC_R(ofSize: 14)
             label.text = "2024年06月01日"
             label.textAlignment = .right
             return label

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/LookResignResult(查看续签结果)/V/YHLookResignResultStateThreeTableViewCell.swift

@@ -76,6 +76,7 @@ class YHLookResignResultStateThreeTableViewCell: UITableViewCell {
         
         flagLabel = {
             let label = UILabel()
+            label.textAlignment = .center
             let a = ASAttributedString.init("请查看", .font(UIFont.PFSC_M(ofSize:14)), .foreground(UIColor.mainTextColor50))
             let b = ASAttributedString.init("《", .font(UIFont.PFSC_M(ofSize:14)),.foreground(UIColor.brandMainColor))
             let c = ASAttributedString.init("领取续签签证指引", .font(UIFont.PFSC_M(ofSize:14)),.foreground(UIColor.brandMainColor), .underline(.single), .action {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/LookResignResult(查看续签结果)/V/YHLookResignResultStateTwoTableViewCell.swift

@@ -65,6 +65,7 @@ class YHLookResignResultStateTwoTableViewCell: UITableViewCell {
         flagView = {
             let view = UIView()
             view.backgroundColor = UIColor(hex: 0xfff5eb)
+            view.layer.cornerRadius = kCornerRadius3
             return view
         }()
         centerView.addSubview(flagView)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignUploadDoc(续签补件)/V/YHResignUploadSuccessDocListCell.swift

@@ -44,7 +44,7 @@ class YHResignUploadSuccessDocListCell: UITableViewCell {
     
     func setupUI() {
         backgroundColor = .clear
-        layer.cornerRadius = kCornerRadius6
+        contentView.layer.cornerRadius = kCornerRadius6
         mainItemView = {
             let view = UIView()
             view.backgroundColor = .white

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/续签/续签上传旅行证件/look_resign_title.imageset/Contents.json

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