Merge branch 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop

* 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  续签文书与在港记录ui问题修复
  // 板你个der
  // UI
  // UI
  // 续签UI

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService(客服段)/Certificate(办证段)/AddAdopters(2新增受养人)/C/YHAdopterBirthViewController.swift

@@ -108,7 +108,7 @@ extension YHAdopterBirthViewController: UITableViewDelegate, UITableViewDataSour
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         if indexPath.row == 0 {
             let cell = tableView.dequeueReusableCell(withClass: YHAdopterExampleTableViewCell.self)
-            cell.titleLabel.text = "出生医学证明示例模版"
+            cell.titleLabel.text = "出生医学证明示例模板"
             cell.exampleBlock = {[weak self] in
                 let view = YHAdopterCardExampleView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: KScreenHeight))
                 view.type = .birth

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService(客服段)/Certificate(办证段)/AddAdopters(2新增受养人)/C/YHAdopterMarryViewController.swift

@@ -107,7 +107,7 @@ extension YHAdopterMarryViewController: UITableViewDelegate, UITableViewDataSour
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         if indexPath.row == 0 {
             let cell = tableView.dequeueReusableCell(withClass: YHAdopterExampleTableViewCell.self)
-            cell.titleLabel.text = "结婚证示例模版"
+            cell.titleLabel.text = "结婚证示例模板"
             cell.exampleBlock = {[weak self] in
                 let view = YHAdopterCardExampleView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: KScreenHeight))
                 view.type = .marry

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService(客服段)/Certificate(办证段)/AddAdopters(2新增受养人)/C/YHAdopterResidentViewController.swift

@@ -107,7 +107,7 @@ extension YHAdopterResidentViewController: UITableViewDelegate, UITableViewDataS
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         if indexPath.row == 0 {
             let cell = tableView.dequeueReusableCell(withClass: YHAdopterExampleTableViewCell.self)
-            cell.titleLabel.text = "户口信息页示例模版"
+            cell.titleLabel.text = "户口信息页示例模板"
             cell.exampleBlock = {[weak self] in
                 let view = YHAdopterCardExampleView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: KScreenHeight))
                 view.type = .resident

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService(客服段)/Certificate(办证段)/AddAdopters(2新增受养人)/V/YHAdopterCardExampleView.swift

@@ -44,7 +44,7 @@ class YHAdopterCardExampleView: UIView {
                 }
             }
             if type == .marry {
-                titleLabel.text = "结婚证示例模版"
+                titleLabel.text = "结婚证示例模板"
                 data = ["service_adopter_example_marry"]
                 centerView.snp.remakeConstraints { make in
                     make.left.right.bottom.equalToSuperview()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService(客服段)/Certificate(办证段)/AddAdopters(2新增受养人)/V/YHAdopterExampleTableViewCell.swift

@@ -43,7 +43,7 @@ class YHAdopterExampleTableViewCell: UITableViewCell {
             let label = UILabel()
             label.font = UIFont.PFSC_M(ofSize: 17)
             label.textColor = UIColor.mainTextColor
-            label.text = "中国身份证示例模版"
+            label.text = "中国身份证示例模板"
             return label
         }()
         contentView.addSubview(titleLabel)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService(客服段)/Certificate(办证段)/TravelDocumentsPreparation(6 旅行证件准备)/V/YHTravelCertificateUploadCell.swift

@@ -69,7 +69,7 @@ class YHTravelCertificateUploadCell: UITableViewCell {
     lazy var templateButton: UIButton = {
         let btn = UIButton()
         btn.frame = CGRect(x: 0, y: 0, width: 48, height: 16)
-        btn.setTitle("示例模版", for: .normal)
+        btn.setTitle("示例模板", for: .normal)
         btn.titleLabel?.font = .PFSC_M(ofSize: 10)
         btn.setTitleColor(.brandMainColor, for: .normal)
         btn.layer.cornerRadius = kCornerRadius3

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService(客服段)/PrincipleBatch(原则批)/C/YHPrincipleUploadListVC.swift

@@ -429,7 +429,7 @@ extension YHPrincipleUploadListVC: UITableViewDelegate, UITableViewDataSource {
                     }
                     self.showSelectImageAndFileView(model)
                 }
-                // 点击模版
+                // 点击模板
                 cell.templateBtnClick = {
                     [weak self] selectModel in
                     guard let self = self else { return }
@@ -560,7 +560,7 @@ extension YHPrincipleUploadListVC: UITableViewDelegate, UITableViewDataSource {
                        }
                        
                    } else {
-                       YHHUD.flash(message: "模版链接为空")
+                       YHHUD.flash(message: "模板链接为空")
                    }
                }
                mailView.show()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService(客服段)/PrincipleBatch(原则批)/V/YHPrincipleUploadStatusCell.swift

@@ -68,7 +68,7 @@ class YHPrincipleUploadStatusCell: UITableViewCell {
     lazy var templateButton: UIButton = {
         let btn = UIButton()
         btn.frame = CGRect(x: 0, y: 0, width: 66, height: 27)
-        btn.setTitle("获取模版", for: .normal)
+        btn.setTitle("获取模板", for: .normal)
         btn.titleLabel?.font = .PFSC_M(ofSize: 12)
         btn.setTitleColor(.brandMainColor, for: .normal)
         btn.layer.cornerRadius = kCornerRadius3
@@ -217,7 +217,7 @@ class YHPrincipleUploadStatusCell: UITableViewCell {
         }
         titleLabel.attributed.text = titleStr
         
-        // 模版显示
+        // 模板显示
         templateButton.isHidden = !model.isNeedTemplate
         
         // 红色已驳回原因

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/C/YHCertificateUploadContentListVC.swift

@@ -316,7 +316,7 @@ extension YHCertificateUploadContentListVC: UITableViewDelegate, UITableViewData
     func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
         
         let view = UIView()
-        if section == 0 { // 证件示例模版
+        if section == 0 { // 证件示例模板
             
             if !supplementInfo.templateInfo.isNeedShowTemplate() {
                 return view
@@ -326,7 +326,7 @@ extension YHCertificateUploadContentListVC: UITableViewDelegate, UITableViewData
             titlelabel.textColor = UIColor.mainTextColor
             titlelabel.textAlignment = .left
             titlelabel.font = UIFont.PFSC_M(ofSize:17)
-            titlelabel.text = "\(supplementInfo.name)示例模版"
+            titlelabel.text = "\(supplementInfo.name)示例模板"
             titlelabel.numberOfLines = 0
             view.addSubview(titlelabel)
             
@@ -523,7 +523,7 @@ extension YHCertificateUploadContentListVC: UITableViewDelegate, UITableViewData
     }
     
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        if indexPath.section == 0 { // 模版列表
+        if indexPath.section == 0 { // 模板列表
             if 0 <= indexPath.row && indexPath.row < templateArr.count {
                 let path = templateArr[indexPath.row]
                 print(path.url)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/M/YHCertificateModel.swift

@@ -252,7 +252,7 @@ class YHTemplateInfo: SmartCodable {
 class YHMaterialPath: SmartCodable {
     var name: String = ""
     var url: String = ""
-    // 自定义类型 0：模版 1：指引
+    // 自定义类型 0：模板 1：指引
     var type: Int = 0
 
     enum CodingKeys: String, CodingKey {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/V/YHCertificateInfoCell.swift

@@ -24,7 +24,7 @@ class YHCertificateInfoCell: UITableViewCell {
     lazy var templateButton: UIButton = {
         let btn = UIButton()
         btn.frame = CGRect(x: 0, y: 0, width: 48, height: 16)
-        btn.setTitle("资料模版", for: .normal)
+        btn.setTitle("资料模板", for: .normal)
         btn.titleLabel?.font = .PFSC_M(ofSize: 10)
         btn.setTitleColor(.brandMainColor, for: .normal)
         btn.layer.cornerRadius = kCornerRadius3
@@ -102,13 +102,13 @@ class YHCertificateInfoCell: UITableViewCell {
         let cerName: ASAttributedString = .init(string:name , .font(UIFont.PFSC_M(ofSize: 16)), .foreground(UIColor.mainTextColor))
         var template: ASAttributedString = " \(.view(templateButton, .original(.center)))"
         
-        // 是否展示右边的模版按钮
+        // 是否展示右边的模板按钮
         var showTemplateBtn = true
         if model.isNeedDealt {
             templateButton.setTitle("银河代办", for: .normal)
             template = " \(.view(templateButton, .original(.center)))"
         } else {
-            templateButton.setTitle("资料模版", for: .normal)
+            templateButton.setTitle("资料模板", for: .normal)
             template = " \(.view(templateButton, .original(.center)))"
 
             if model.templateInfo.materialPath.isEmpty && model.templateInfo.guideFilePath.isEmpty && model.templateInfo.description.isEmpty {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/V/YHCertificateTemplateCell.swift

@@ -22,7 +22,7 @@ class YHCertificateSampleTemplateView: UIView {
     
     lazy var titleLabel: UILabel = {
         let label = UILabel()
-        label.text = "查看证件示例模版".local
+        label.text = "查看证件示例模板".local
         label.textColor = UIColor.mainTextColor
         label.textAlignment = .left
         label.font = UIFont.PFSC_B(ofSize:14)
@@ -76,7 +76,7 @@ class YHCertificateTemplateCell: UITableViewCell {
         didSet {
             if let path = templatePath {
                 
-                var title = "查看证件示例模版"
+                var title = "查看证件示例模板"
                 if path.type == 1 { // 指引
                     title = "查看证件操作指引"
                 }
@@ -92,10 +92,10 @@ class YHCertificateTemplateCell: UITableViewCell {
                     templateView.titleLabel.text = model.name
 
                 } else {
-                    templateView.titleLabel.text = "查看资料示例模版"
+                    templateView.titleLabel.text = "查看资料示例模板"
                 }
             } else {
-                templateView.titleLabel.text = "查看资料示例模版"
+                templateView.titleLabel.text = "查看资料示例模板"
             }
         }
     }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/V/YHCertificateTemplateSheetView.swift

@@ -100,7 +100,7 @@ class YHCertificateTemplateSheetView: UIView {
         label.textAlignment = .center
         label.font = UIFont.PFSC_B(ofSize:17)
         label.numberOfLines = 0
-        label.text = "示例模版"
+        label.text = "示例模板"
         return label
     }()
     
@@ -136,7 +136,7 @@ class YHCertificateTemplateSheetView: UIView {
         
         templateInfo = model
         if !model.name.isEmpty {
-            titleLabel.text = "\(model.name)示例模版"
+            titleLabel.text = "\(model.name)示例模板"
         }
         
         templateArr.removeAll()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/V/YHCertificateUploadSheetView.swift

@@ -355,7 +355,7 @@ extension YHCertificateUploadSheetView: UITableViewDelegate, UITableViewDataSour
                 make.top.equalToSuperview().offset(21)
                 make.left.equalToSuperview().offset(20)
                 make.right.equalToSuperview().offset(-20)
-                make.bottom.equalToSuperview().offset(-34)
+                make.bottom.equalToSuperview().offset(-21)
             }
         }
         return view

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/V/YHDocumentUploadView.swift

@@ -35,7 +35,7 @@ class YHDocumentUploadView: UIView {
     var uploadFilesBlock:((URL)->())?
     // 上传图片
     var uploadImageBlock:(([YHSelectImageItem])->())?
-    // 点击模版
+    // 点击模板
     var clickTemplateBlock:((YHMaterialPath?)->())?
     
     lazy var blackMaskView: UIView = {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/HongKongImmigrationRecords(在港记录管理)/V/YHHKRecordsCustomerItemCell.swift

@@ -63,7 +63,7 @@ extension YHHKRecordsCustomerItemCell {
             make.bottom.equalToSuperview()
             make.left.equalToSuperview().offset(18)
             make.right.equalToSuperview().offset(-18)
-            make.height.equalTo(1)
+            make.height.equalTo(0.5)
         }
         
         infoTitleLabel.snp.makeConstraints { make in

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/HongKongImmigrationRecords(在港记录管理)/V/YHHKRecordsEditButtonCell.swift

@@ -51,7 +51,7 @@ extension YHHKRecordsEditButtonCell {
             make.top.equalToSuperview()
             make.left.equalToSuperview()
             make.right.equalToSuperview()
-            make.height.equalTo(1)
+            make.height.equalTo(0.5)
         }
         
         centerLabel.snp.makeConstraints { make in

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/HongKongImmigrationRecords(在港记录管理)/V/YHHKRecordsExpandedCell.swift

@@ -112,7 +112,7 @@ extension YHHKRecordsExpandedCell {
             make.bottom.equalToSuperview()
             make.left.equalToSuperview().offset(18)
             make.right.equalToSuperview().offset(-18)
-            make.height.equalTo(1)
+            make.height.equalTo(0.5)
         }
         
         tagView.snp.makeConstraints { make in

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/HongKongImmigrationRecords(在港记录管理)/V/YHHKRecordsHeaderCell.swift

@@ -59,7 +59,7 @@ extension YHHKRecordsHeaderCell {
         
         bottomLineView.snp.makeConstraints { make in
             make.left.right.bottom.equalToSuperview()
-            make.height.equalTo(1)
+            make.height.equalTo(0.5)
         }
         
         infoTitleLabel.snp.makeConstraints { make in

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/HongKongImmigrationRecords(在港记录管理)/V/YHHKRecordsOccupyingSpaceCell.swift

@@ -56,7 +56,7 @@ extension YHHKRecordsOccupyingSpaceCell {
             make.bottom.equalToSuperview()
             make.left.equalToSuperview().offset(18)
             make.right.equalToSuperview().offset(-18)
-            make.height.equalTo(1)
+            make.height.equalTo(0.5)
         }
     }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/HongKongImmigrationRecords(在港记录管理)/V/YHHKRecordsRemarkCell.swift

@@ -58,6 +58,7 @@ class YHHKRecordsRemarkCell: YHResignDocumentCell {
     func setupCellInfo(title: String? = "备注：", titleColor: UIColor = .mainTextColor50,  detail: String?, isEditable: Bool = false, cellType: YHResignRoundCellType = .mid) {
         updateCellCorner(cellType)
         infoTitleLabel.text = title
+        infoTitleLabel.textColor = titleColor
         remarkTextView.isEditable = isEditable
         remarkTextView.text = detail
         editTipsLabel.isHidden = !isEditable || (detail?.count ?? 0) > 0

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/HongKongImmigrationRecords(在港记录管理)/V/YHHKRecordsSectionHeaderCell.swift

@@ -51,7 +51,7 @@ extension YHHKRecordsSectionHeaderCell {
             make.bottom.equalToSuperview()
             make.left.equalToSuperview().offset(14)
             make.right.equalToSuperview().offset(-14)
-            make.height.equalTo(1)
+            make.height.equalTo(0.5)
         }
         
         infoTitleLabel.snp.makeConstraints { make in

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/HongKongImmigrationRecords(在港记录管理)/V/YHHKRecordsStayingPersonnelCell.swift

@@ -155,7 +155,7 @@ extension YHHKRecordsStayingPersonnelCell {
         bottomLineView.snp.makeConstraints { make in
             make.left.equalToSuperview().offset(18)
             make.right.equalToSuperview().offset(-18)
-            make.height.equalTo(1)
+            make.height.equalTo(0.5)
         }
         infoCollectionView.snp.makeConstraints { make in
             make.top.equalTo(infoTitleLabel.snp.bottom)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/HongKongImmigrationRecords(在港记录管理)/V/YHHKRecordsTimeSelectCell.swift

@@ -111,7 +111,7 @@ extension YHHKRecordsTimeSelectCell {
             make.bottom.equalToSuperview()
             make.left.equalToSuperview().offset(18)
             make.right.equalToSuperview().offset(-18)
-            make.height.equalTo(1)
+            make.height.equalTo(0.5)
         }
     }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/HongKongImmigrationRecords(在港记录管理)/V/YHHKRecordsTitleCell.swift

@@ -48,7 +48,7 @@ extension YHHKRecordsTitleCell {
         subContainerView.addSubview(bottomLineView)
         bottomLineView.snp.makeConstraints { make in
             make.left.right.bottom.equalToSuperview()
-            make.height.equalTo(1)
+            make.height.equalTo(0.5)
         }
         
         infoTitleLabel.snp.makeConstraints { make in

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignDocumentManagement(续签文书管理)/C/YHResignDocumentDetailViewController.swift

@@ -384,7 +384,7 @@ private extension YHResignDocumentType {
         case .powerOfAttorney:
             let firstLine: ASAttributedString = .init(string: "请您尽快核对信息，如信息有误，可进行在线编辑\n", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.mainTextColor70))
             let secondLineL: ASAttributedString = .init(string: "如信息无误，请主申请人在", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.mainTextColor70))
-            let secondLineR: ASAttributedString = .init(string: "右下角的位置完成电子签字", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.brandMainColor))
+            let secondLineR: ASAttributedString = .init(string: "右下角的位置完成电子签字", .font(UIFont.PFSC_B(ofSize: 12)), .foreground(UIColor.brandMainColor))
             let secondLine = (secondLineL + secondLineR)
             return (indentStr + firstLine + indentStr + secondLine).add(attributes: .paragraph(.lineSpacing(8), .firstLineHeadIndent(0), .headIndent(11)))
         case .qmasDoc:
@@ -392,21 +392,21 @@ private extension YHResignDocumentType {
             let firstLine2: ASAttributedString = .init(string: "（内地电话号码或香港电话号码）", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.mainTextColor50))
             let firstLine3: ASAttributedString = .init(string: "、日期", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.mainTextColor))
             let firstLine4: ASAttributedString = .init(string: "（填写当下日期即可）\n", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.mainTextColor50))
-            let secondLine: ASAttributedString = .init(string: "请主申请人勾选信息并完成电子签字", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.brandMainColor))
+            let secondLine: ASAttributedString = .init(string: "请主申请人勾选信息并完成电子签字", .font(UIFont.PFSC_B(ofSize: 12)), .foreground(UIColor.brandMainColor))
             return (indentStr + firstLine1 + firstLine2 + firstLine3 + firstLine4 + indentStr + secondLine).add(attributes: .paragraph(.lineSpacing(8), .firstLineHeadIndent(0), .headIndent(11)))
         case .settlementPlan:
             let firstLine: ASAttributedString = .init(string: "如需调整和补充内容，请在文档中进行编辑\n", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.mainTextColor70))
             let secondLine: ASAttributedString = .init(string: "编辑完成后，点击“完成编辑，提交”\n", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.mainTextColor70))
             let third: ASAttributedString = .init(string: "我们将根据您的修改调整文书\n", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.mainTextColor70))
             let fourth1: ASAttributedString = .init(string: "如您对《定居计划书》无其他补充建议，", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.mainTextColor70))
-            let fourth2: ASAttributedString = .init(string: "请您在文书尾部进行电子签字", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.brandMainColor))
+            let fourth2: ASAttributedString = .init(string: "请您在文书尾部进行电子签字", .font(UIFont.PFSC_B(ofSize: 12)), .foreground(UIColor.brandMainColor))
             return (indentStr + firstLine + indentStr + secondLine + indentStr + third + indentStr + fourth1 + fourth2).add(attributes: .paragraph(.lineSpacing(8), .firstLineHeadIndent(0), .headIndent(11)))
         case .explanatoryStatement:
             let firstLine: ASAttributedString = .init(string: "如需调整和补充内容，请在文档中进行编辑\n", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.mainTextColor70))
             let secondLine: ASAttributedString = .init(string: "编辑完成后，点击“完成编辑，提交”\n", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.mainTextColor70))
             let third: ASAttributedString = .init(string: "我们将根据您的修改调整文书\n", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.mainTextColor70))
             let fourth1: ASAttributedString = .init(string: "如您对《解释说明书》无其他补充建议，", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.mainTextColor70))
-            let fourth2: ASAttributedString = .init(string: "请您在文书尾部进行电子签字", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.brandMainColor))
+            let fourth2: ASAttributedString = .init(string: "请您在文书尾部进行电子签字", .font(UIFont.PFSC_B(ofSize: 12)), .foreground(UIColor.brandMainColor))
             return (indentStr + firstLine + indentStr + secondLine + indentStr + third + indentStr + fourth1 + fourth2).add(attributes: .paragraph(.lineSpacing(8), .firstLineHeadIndent(0), .headIndent(11)))
         }
     }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignDocumentManagement(续签文书管理)/V/YHResignDocumentContentCell.swift

@@ -71,7 +71,7 @@ extension YHResignDocumentContentCell {
             make.left.equalToSuperview().offset(18)
             make.right.equalToSuperview().offset(-18)
             make.bottom.equalToSuperview()
-            make.height.equalTo(1)
+            make.height.equalTo(0.5)
         }
         
         infoTitleLabel.snp.makeConstraints { make in

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignDocumentManagement(续签文书管理)/V/YHResignDocumentHeaderCell.swift

@@ -61,7 +61,7 @@ extension YHResignDocumentHeaderCell {
             make.left.equalToSuperview().offset(18)
             make.right.equalToSuperview().offset(-18)
             make.bottom.equalToSuperview()
-            make.height.equalTo(1)
+            make.height.equalTo(0.5)
         }
         
         infoTitleLabel.snp.makeConstraints { make in

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignDocumentManagement(续签文书管理)/V/YHResignDocumentStatusCell.swift

@@ -232,7 +232,7 @@ extension YHResignDocumentStatusCell {
             leftLineView.snp.remakeConstraints { make in
                 make.left.equalTo(leftButton.snp.right)
                 make.height.equalTo(16)
-                make.width.equalTo(1)
+                make.width.equalTo(0.5)
                 make.centerY.equalToSuperview()
             }
             midButton.snp.remakeConstraints { make in
@@ -272,7 +272,7 @@ extension YHResignDocumentStatusCell {
             leftLineView.snp.remakeConstraints { make in
                 make.left.equalTo(leftButton.snp.right)
                 make.height.equalTo(16)
-                make.width.equalTo(1)
+                make.width.equalTo(0.5)
                 make.centerY.equalToSuperview()
             }
             
@@ -285,7 +285,7 @@ extension YHResignDocumentStatusCell {
             rightLineView.snp.remakeConstraints { make in
                 make.left.equalTo(midButton.snp.right)
                 make.height.equalTo(16)
-                make.width.equalTo(1)
+                make.width.equalTo(0.5)
                 make.centerY.equalToSuperview()
             }
             
@@ -323,7 +323,7 @@ extension YHResignDocumentStatusCell {
             make.left.equalTo(infoTitleLabel.snp.left)
             make.top.equalTo(infoTitleLabel.snp.bottom).offset(12)
             make.right.equalToSuperview().offset(-18)
-            make.height.equalTo(1)
+            make.height.equalTo(0.5)
         }
         
         fileCoverView.snp.makeConstraints { make in
@@ -351,7 +351,7 @@ extension YHResignDocumentStatusCell {
             make.left.equalTo(infoTitleLabel.snp.left)
             make.top.equalTo(fileCoverView.snp.bottom)
             make.right.equalToSuperview().offset(-18)
-            make.height.equalTo(1)
+            make.height.equalTo(0.5)
         }
         
         buttonsCoverView.snp.makeConstraints { make in
@@ -368,7 +368,7 @@ extension YHResignDocumentStatusCell {
         leftLineView.snp.makeConstraints { make in
             make.left.equalTo(leftButton.snp.right)
             make.height.equalTo(16)
-            make.width.equalTo(1)
+            make.width.equalTo(0.5)
             make.centerY.equalToSuperview()
         }
         
@@ -381,7 +381,7 @@ extension YHResignDocumentStatusCell {
         rightLineView.snp.makeConstraints { make in
             make.left.equalTo(midButton.snp.right)
             make.height.equalTo(16)
-            make.width.equalTo(1)
+            make.width.equalTo(0.5)
             make.centerY.equalToSuperview()
         }
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignMaterialManage(续期资料管理)/C/YHResignMaterialListVC.swift

@@ -40,8 +40,8 @@ class YHResignMaterialListVC: YHBaseViewController {
     }()
     
     lazy var emptyDataTipsView: YHEmptyDataView = {
-        let view = YHEmptyDataView.createView("没有找到相关资料哦~", kEmptyCommonBgName)
-        view.topMargin = 130
+        let view = YHEmptyDataView.createView("暂无数据", kEmptyCommonBgName)
+        view.topMargin = 168
         view.isHidden = true
         return view
     }()
@@ -108,7 +108,7 @@ extension YHResignMaterialListVC: UITableViewDelegate, UITableViewDataSource {
                         YHHUD.hide()
                         guard let self = self else { return }
                         if !success {
-                            YHHUD.flash(message: "获取模版失败")
+                            YHHUD.flash(message: "获取模板失败")
                             return
                         }
                         let view = YHResignTemplateSheetView.templateView(self.viewModel.templateDeail)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignMaterialManage(续期资料管理)/C/YHResignMaterialUploadVC.swift

@@ -316,13 +316,13 @@ extension YHResignMaterialUploadVC: UITableViewDelegate, UITableViewDataSource {
     func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
         
         let view = UIView()
-        if section == 0 { // 证件示例模版
+        if section == 0 { // 证件示例模板
         
             let titlelabel = UILabel()
             titlelabel.textColor = UIColor.mainTextColor
             titlelabel.textAlignment = .left
             titlelabel.font = UIFont.PFSC_M(ofSize:17)
-            titlelabel.text = "\(self.materialModel.getName())示例模版"
+            titlelabel.text = "\(self.materialModel.getName())示例模板"
             titlelabel.numberOfLines = 0
             view.addSubview(titlelabel)
             
@@ -524,7 +524,7 @@ extension YHResignMaterialUploadVC: UITableViewDelegate, UITableViewDataSource {
     }
     
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        if indexPath.section == 0 { // 模版列表
+        if indexPath.section == 0 { // 模板列表
             if 0 <= indexPath.row && indexPath.row < templateArr.count {
                 let path = templateArr[indexPath.row]
                 print(path.fileUrl)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignMaterialManage(续期资料管理)/V/YHResignMaterialCell.swift

@@ -40,7 +40,7 @@ class YHResignMaterialCell: UITableViewCell {
     lazy var templateButton: UIButton = {
         let btn = UIButton()
         btn.frame = CGRect(x: 0, y: 0, width: 48, height: 16)
-        btn.setTitle("资料模版", for: .normal)
+        btn.setTitle("资料模板", for: .normal)
         btn.titleLabel?.font = .PFSC_M(ofSize: 10)
         btn.setTitleColor(.brandMainColor, for: .normal)
         btn.layer.cornerRadius = kCornerRadius3
@@ -102,8 +102,8 @@ class YHResignMaterialCell: UITableViewCell {
         self.rightArrowImgV.tintColor = titleColor
             
         var result:ASAttributedString = .init(string:"", .font(UIFont.PFSC_M(ofSize: 16)), .foreground(UIColor.mainTextColor))
-        let mustTag: ASAttributedString = .init("*", .font(UIFont.PFSC_M(ofSize: 16)),.foreground(UIColor.failColor))
-        var name = model.getName()
+        let mustTag: ASAttributedString = .init("*", .font(UIFont.PFSC_M(ofSize: 16)),.foreground(UIColor.failColor), .baselineOffset(-2))
+        let name = model.getName()
         let cerName: ASAttributedString = .init(string:name , .font(UIFont.PFSC_M(ofSize: 16)), .foreground(UIColor.mainTextColor))
         let template: ASAttributedString = " \(.view(templateButton, .original(.center)))"
         
@@ -113,7 +113,7 @@ class YHResignMaterialCell: UITableViewCell {
         }
         result += cerName
         
-        // 是否展示右边的模版按钮
+        // 是否展示右边的模板按钮
         let showTemplateBtn = true
         if showTemplateBtn {
             result += template
@@ -161,7 +161,7 @@ class YHResignMaterialCell: UITableViewCell {
         }
         
         nameTextView.snp.makeConstraints { make in
-            make.left.equalToSuperview().offset(20)
+            make.left.equalToSuperview().offset(16)
             make.top.equalToSuperview().offset(12)
             make.right.equalTo(statusLabel.snp.left).offset(-4)
             make.bottom.equalTo(-12)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignMaterialManage(续期资料管理)/V/YHResignTemplateSheetView.swift

@@ -91,7 +91,7 @@ class YHResignTemplateSheetView: UIView {
         label.textAlignment = .center
         label.font = UIFont.PFSC_B(ofSize:17)
         label.numberOfLines = 0
-        label.text = "示例模版"
+        label.text = "示例模板"
         return label
     }()
     
@@ -127,7 +127,7 @@ class YHResignTemplateSheetView: UIView {
         
         templateInfo = model
         if !model.getName().isEmpty {
-            titleLabel.text = "\(model.getName())示例模版"
+            titleLabel.text = "\(model.getName())示例模板"
         }
         
         templateArr.removeAll()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignMaterialManage(续期资料管理)/VM/YHResignMaterialViewModel.swift

@@ -74,7 +74,7 @@ class YHResignMaterialViewModel: YHBaseViewModel {
     // 某个具体资料详情
     var materialDeal: YHMaterialModel = YHMaterialModel()
     
-    // 某个具体资料模版
+    // 某个具体资料模板
     var templateDeail: YHResignTemplateDetail = YHResignTemplateDetail()
     
     func clear() {

galaxy/galaxy/Classes/Tools/NetWork/YHAllApiName.swift

@@ -235,7 +235,7 @@ class YHAllApiName {
         static let company = "infoflow/company/search"
         //工作经历删除
         static let del = "infoflow/work/del"
-        //工作经历参考模版
+        //工作经历参考模板
         static let example = "infoflow/work/getWorkExampleList"
         static let projectExample = "infoflow/work/getWorkProjectExampleList"
         //工作经验项目保存
@@ -520,7 +520,7 @@ class YHAllApiName {
     struct ResignMaterial {
         // 资料列表
         static let resignMaterialList = "super-app/identity-renewal/renewal-batch-list"
-        // 资料模版详情
+        // 资料模板详情
         static let resginTemplateDetail = "super-app/identity-renewal/template-detail"
         // 文件上传
         static let uploadMaterials = "super-app/identity-renewal/renewal-upload"