部分UIbug修复

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

@@ -442,7 +442,7 @@ extension YHResignUploadDocDetailViewController: UITableViewDelegate, UITableVie
             titlelabel.textColor = UIColor.mainTextColor
             titlelabel.textAlignment = .left
             titlelabel.font = UIFont.PFSC_M(ofSize:17)
-            titlelabel.text = "\(self.materialModel.name)示例模板"
+            titlelabel.text = "示例模板"
             titlelabel.numberOfLines = 0
             view.addSubview(titlelabel)
             
@@ -516,24 +516,25 @@ extension YHResignUploadDocDetailViewController: UITableViewDelegate, UITableVie
         let view = UIView()
         if section == 0 {
             // 证件标题和状态
-            let titlelabel = UILabel()
+            let titlelabel = UITextView()
             titlelabel.textColor = UIColor.mainTextColor
-            titlelabel.textAlignment = .left
-            titlelabel.font = UIFont.PFSC_M(ofSize:17)
-            titlelabel.text = self.materialModel.name
-            titlelabel.numberOfLines = 0
+            titlelabel.font = UIFont.PFSC_M(ofSize: 16)
+            titlelabel.isScrollEnabled = false
+            titlelabel.isEditable = false
+            titlelabel.isSelectable = false
             view.addSubview(titlelabel)
             
             let statusLabel = UILabel()
             statusLabel.textAlignment = .center
             statusLabel.font = UIFont.PFSC_M(ofSize:10)
-            statusLabel.layer.cornerRadius = kCornerRadius3
+            statusLabel.layer.cornerRadius = 2
             statusLabel.clipsToBounds = true
+            statusLabel.frame = CGRect(x: 0, y: 0, width: 38, height: 16)
             view.addSubview(statusLabel)
             
             var text = ""
-            var textColor:UIColor = .clear
-            var bgColor:UIColor = .clear
+            var textColor: UIColor = UIColor(hexString: "#0046B5")!
+            var bgColor: UIColor = UIColor(hexString: "#F0F4FB", transparency: 0.08)!
             
             
             if self.materialModel.status == 0 {
@@ -544,8 +545,8 @@ extension YHResignUploadDocDetailViewController: UITableViewDelegate, UITableVie
             } else if self.materialModel.status == 3 {
                 
                 text = "待上传".local
-                textColor = UIColor(hexString: "#2F7EF6")!
-                bgColor = UIColor(hexString: "#2F7EF6", transparency: 0.08)!
+                textColor = UIColor(hexString: "#0046B5")!
+                bgColor = UIColor(hexString: "#F0F4FB", transparency: 0.08)!
                 
             } else if self.materialModel.status == 1 {
                 text =  "已完成".local
@@ -560,7 +561,6 @@ extension YHResignUploadDocDetailViewController: UITableViewDelegate, UITableVie
             statusLabel.text = text
             statusLabel.textColor = textColor
             statusLabel.backgroundColor = bgColor
-            
             let tipsLabel = UILabel()
             tipsLabel.textColor = .labelTextColor2
             tipsLabel.font = UIFont.PFSC_R(ofSize:14)
@@ -571,7 +571,7 @@ extension YHResignUploadDocDetailViewController: UITableViewDelegate, UITableVie
             view.addSubview(tipsLabel)
             
             let noLabel = UILabel()
-            let c = ASAttributedString.init("如无法提供，请点击这里", .font(UIFont.PFSC_R(ofSize:14)),.foreground(UIColor.labelTextColor2), .underline(.single), .action {
+            let c = ASAttributedString.init("如无法提供，请点击这里", .font(UIFont.PFSC_M(ofSize:14)),.foreground(UIColor.labelTextColor2), .underline(.single), .action {
                 //说明原
                 if self.materialModel.status == 0 || self.materialModel.status == 1 {
                     
@@ -584,25 +584,24 @@ extension YHResignUploadDocDetailViewController: UITableViewDelegate, UITableVie
                 
             })
             noLabel.attributed.text = c
+            
+            var cerName: ASAttributedString = .init(string: self.materialModel.name, .font(UIFont.PFSC_M(ofSize: 17)), .foreground(UIColor.mainTextColor))
+            let template: ASAttributedString = " \(.view(statusLabel, .original(.center)))"
+            cerName = cerName + template
+            titlelabel.attributed.text = cerName
+
             view.addSubview(noLabel)
             
             titlelabel.snp.makeConstraints { make in
                 make.left.equalToSuperview().offset(20)
-                make.top.equalToSuperview()
-            }
-            
-            statusLabel.snp.makeConstraints { make in
-                make.centerY.equalTo(titlelabel)
-                make.left.equalTo(titlelabel.snp.right).offset(4)
-                make.right.lessThanOrEqualTo(view).offset(-20)
-                make.height.equalTo(16)
-                make.width.equalTo(38)
+                make.right.equalToSuperview().offset(-20)
+                make.top.equalTo(17)
             }
             
             tipsLabel.snp.remakeConstraints { make in
                 make.left.equalToSuperview().offset(20)
                 make.right.equalToSuperview().offset(-20)
-                make.top.equalTo(titlelabel.snp.bottom).offset(7)
+                make.top.equalTo(titlelabel.snp.bottom).offset(8)
                 make.bottom.equalTo(-32)
             }
             

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

@@ -24,8 +24,8 @@ class YHResignUploadDocListViewController: YHBaseViewController {
 
     lazy var tableView: UITableView = {
         let tableView = UITableView(frame:.zero, style:.grouped)
-        tableView.estimatedSectionHeaderHeight = 16.0
-        tableView.estimatedSectionFooterHeight = 0.01
+        tableView.estimatedSectionHeaderHeight = 0.01
+        tableView.estimatedSectionFooterHeight = 16.0
         tableView.contentInsetAdjustmentBehavior = .never
         tableView.showsVerticalScrollIndicator = false
         tableView.separatorStyle = .none
@@ -61,7 +61,7 @@ class YHResignUploadDocListViewController: YHBaseViewController {
             make.top.equalToSuperview().offset(10)
             make.left.equalTo(kMargin)
             make.right.equalTo(-kMargin)
-            make.height.equalTo(44)
+            make.height.equalTo(48)
         }
         view.layer.zPosition = 10
         return view
@@ -91,14 +91,14 @@ private extension YHResignUploadDocListViewController {
             guard let self = self else { return }
             if self.viewModel.mainModel.supplement_voucher_url.count == 0 {
                 self.bottomView.isHidden = true
-                let a = ASAttributedString.init("请您于", .font(UIFont.PFSC_M(ofSize:14)), .foreground(UIColor.mainTextColor50))
+                let a = ASAttributedString.init("请您于", .font(UIFont.PFSC_R(ofSize:14)), .foreground(UIColor.mainTextColor50))
                 let b = ASAttributedString.init("\(self.viewModel.mainModel.supplement_deadline)前", .font(UIFont.PFSC_M(ofSize:14)),.foreground(UIColor.brandMainColor))
-                let c = ASAttributedString.init("根据补件清单上传资料递交至港府；如无及时递交，可能导致身份失效！", .font(UIFont.PFSC_M(ofSize:14)), .foreground(UIColor.mainTextColor50))
+                let c = ASAttributedString.init("根据补件清单上传资料递交至港府；如无及时递交，可能导致身份失效！", .font(UIFont.PFSC_R(ofSize:14)), .foreground(UIColor.mainTextColor50))
                 messageLabel.attributed.text = a+b+c
             } else {
-                let a = ASAttributedString.init("您申请的【优才入境计划】续签，", .font(UIFont.PFSC_M(ofSize:17)), .foreground(UIColor.mainTextColor50))
+                let a = ASAttributedString.init("您申请的【优才入境计划】续签，", .font(UIFont.PFSC_M(ofSize:17)), .foreground(UIColor.mainTextColor))
                 let b = ASAttributedString.init("补件资料已递交至港府！", .font(UIFont.PFSC_M(ofSize:17)),.foreground(UIColor.yhOrangeColor))
-                let c = ASAttributedString.init("请耐心等待港府审批~", .font(UIFont.PFSC_M(ofSize:17)), .foreground(UIColor.mainTextColor50))
+                let c = ASAttributedString.init("请耐心等待港府审批~", .font(UIFont.PFSC_M(ofSize:17)), .foreground(UIColor.mainTextColor))
                 titleLabel.attributed.text = a+b+c
                 self.bottomView.isHidden = false
                 self.messageLabel.isHidden = true
@@ -131,7 +131,7 @@ private extension YHResignUploadDocListViewController {
         titleLabel = {
             let label = UILabel()
             label.numberOfLines = 0
-            let a = ASAttributedString.init("您申请的【优才入境计划】续签，", .font(UIFont.PFSC_M(ofSize:17)), .foreground(UIColor.mainTextColor50))
+            let a = ASAttributedString.init("您申请的【优才入境计划】续签，", .font(UIFont.PFSC_M(ofSize:17)), .foreground(UIColor.mainTextColor))
             let b = ASAttributedString.init("已获得港府补件通知！", .font(UIFont.PFSC_M(ofSize:17)),.foreground(UIColor.yhOrangeColor))
             label.attributed.text = a+b
             return label
@@ -172,7 +172,7 @@ private extension YHResignUploadDocListViewController {
         tableView.snp.makeConstraints { make in
             make.left.equalToSuperview()
             make.bottom.right.equalToSuperview()
-            make.top.equalTo(k_Height_NavigationtBarAndStatuBar + 160)
+            make.top.equalTo(k_Height_NavigationtBarAndStatuBar + 152)
         }
     }
 }
@@ -254,11 +254,11 @@ extension YHResignUploadDocListViewController: UITableViewDelegate, UITableViewD
     }
     
     private func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> CGFloat {
-        return 16.0
+        return 0.01
     }
     
     private func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> CGFloat {
-        return 0.01
+        return 16.0
     }
     
     func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {

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

@@ -82,7 +82,7 @@ class YHFileExplainReasonInputView: UIView {
     lazy var inputContentView: UIView = {
         let view = UIView()
         view.backgroundColor = .contentBkgColor
-        view.layer.cornerRadius = kCornerRadius6
+        view.layer.cornerRadius = kCornerRadius3
         view.clipsToBounds = true
         return view
     }()
@@ -129,7 +129,7 @@ class YHFileExplainReasonInputView: UIView {
         fatalError("init(coder:) has not been implemented")
     }
     
-    static func inputView(defalutText:String?,_  placeholde: String = "请输入文件名称", _ title: String = "文件重命名")-> YHFileExplainReasonInputView {
+    static func inputView(defalutText:String?,_  placeholde: String = "请输入文件名称", _ title: String = "补充说明")-> YHFileExplainReasonInputView {
         let view = YHFileExplainReasonInputView(frame:CGRect(x: 0, y: 0, width:KScreenWidth, height:Self.height))
         view.textField.text = defalutText
         view.titleLabel.text = title

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

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