续签证件管理细节修改

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

@@ -69,7 +69,7 @@ class YHResignCertificateDetailHkViewController: YHBaseViewController {
     
     override func viewDidLoad() {
         super.viewDidLoad()
-        self.gk_navTitle = "旅行证件准备"
+        self.gk_navTitle = "上传旅行证件"
         self.view.backgroundColor = .white
         self.view.addSubview(self.tableView)
         self.view.addSubview(bottomView)
@@ -224,8 +224,8 @@ extension YHResignCertificateDetailHkViewController: UITableViewDelegate, UITabl
         let cell = tableView.dequeueReusableCell(withIdentifier: YHResignCertificateHKTableViewCell.cellReuseIdentifier, for: indexPath) as! YHResignCertificateHKTableViewCell
         cell.firstImageName = "service_adopter_card_travel_front"
         cell.lastImageName = "service_adopter_card_travel_back"
-        cell.firstLabelName = "证件页1"
-        cell.lastLabelName = "证件页2"
+        cell.firstLabelName = "港澳通行证正面"
+        cell.lastLabelName = "港澳通行证倍面"
         cell.failString = failString
         cell.urls = urls
         cell.data = data

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

@@ -69,7 +69,7 @@ class YHResignCertificateDetailPassPortViewController: YHBaseViewController {
     
     override func viewDidLoad() {
         super.viewDidLoad()
-        self.gk_navTitle = "旅行证件准备"
+        self.gk_navTitle = "上传旅行证件"
         self.view.backgroundColor = .white
         self.view.addSubview(self.tableView)
         self.view.addSubview(bottomView)

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

@@ -137,6 +137,18 @@ class YHResignCertificateDetailViewController: YHBaseViewController {
         setupUI()
         loadData()
     }
+    
+    func getResultString(_ data: String) -> String {
+        let dateString = data // 原始日期时间字符串
+        let dateFormatter = DateFormatter()
+        dateFormatter.dateFormat = "yyyy-MM-dd HH:mm:ss" // 设置原始日期时间格式
+        if let date = dateFormatter.date(from: dateString) {
+            dateFormatter.dateFormat = "yyyy-MM-dd" // 设置目标日期格式
+            let convertedDateString = dateFormatter.string(from: date) // 转换日期到目标格式
+            return convertedDateString
+        }
+        return ""
+    }
 }
 
 // MARK: - 私有方法
@@ -362,8 +374,8 @@ private extension YHResignCertificateDetailViewController {
                     self.cardButton.setContent("", "")
                 }
             }
-            startDateStr = dataModel.cert_info.small_white_note_validity_start
-            endDateStr = dataModel.cert_info.small_white_note_validity_end
+            startDateStr = getResultString(dataModel.cert_info.small_white_note_validity_start)
+            endDateStr = getResultString(dataModel.cert_info.small_white_note_validity_end)
             
             startDateItem.updateDate(date: startDateStr)
             endDateItem.updateDate(date: endDateStr)

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

@@ -380,7 +380,7 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
         
         cardLabel = {
             let label = UILabel()
-            label.font = UIFont.PFSC_R(ofSize: 15)
+            label.font = UIFont.PFSC_M(ofSize: 15)
             label.textColor = UIColor.mainTextColor
             label.text = "卡片有效期"
             return label
@@ -435,7 +435,7 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
         
         signLabel = {
             let label = UILabel()
-            label.font = UIFont.PFSC_R(ofSize: 15)
+            label.font = UIFont.PFSC_M(ofSize: 15)
             label.textColor = UIColor.mainTextColor
             label.text = "签注有效期"
             return label

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

@@ -30,16 +30,16 @@ class YHResignCertificateDetailViewModel: YHBaseViewModel {
     }
     
     func getBaseDataSource(_ isShowPrompt: Bool) -> [YHItemModel] {
-        let item1 = YHItemModel(id: .id1, isNeed: true, title: "开始时间", isUserKeyBoard: false, prompts: "请选择", message: dataModel.cert_info.issue_start, type: .time, isShowPrompts: isShowPrompt, alertMessage:"请选择开始时间")
-        let item2 = YHItemModel(id: .id2, isNeed: true, title: "到期时间", isUserKeyBoard: false, prompts: "请选择", message: dataModel.cert_info.issue_end, type: .time, isShowPrompts: isShowPrompt, alertMessage:"请选择到期时间")
-        let item3 = YHItemModel(id: .id3, isNeed: true, title: "开始时间", isUserKeyBoard: false, prompts: "请选择", message: dataModel.cert_info.validate_start, type: .time, isShowPrompts: isShowPrompt, alertMessage:"请选择开始时间")
-        let item4 = YHItemModel(id: .id4, isNeed: true, title: "到期时间", isUserKeyBoard: false, prompts: "请选择", message: dataModel.cert_info.validate_end, type: .time, isShowPrompts: isShowPrompt, alertMessage:"请选择到期时间")
+        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 item3 = YHItemModel(id: .id3, isNeed: true, title: "开始时间", isUserKeyBoard: false, prompts: "请选择", message: getResultString(dataModel.cert_info.validate_start), type: .time, isShowPrompts: isShowPrompt, alertMessage:"请选择开始时间")
+        let item4 = YHItemModel(id: .id4, isNeed: true, title: "到期时间", isUserKeyBoard: false, prompts: "请选择", message: getResultString(dataModel.cert_info.validate_end), type: .time, isShowPrompts: isShowPrompt, alertMessage:"请选择到期时间")
         return [item1, item2, item3, item4]
     }
     
     func getPassPortDataSource(_ isShowPrompt: Bool) -> [YHItemModel] {
-        let item1 = YHItemModel(id: .id1, isNeed: true, title: "开始时间", isUserKeyBoard: false, prompts: "请选择", message: dataModel.cert_info.issue_start, type: .time, isShowPrompts: isShowPrompt, alertMessage:"请选择开始时间")
-        let item2 = YHItemModel(id: .id2, isNeed: true, title: "到期时间", isUserKeyBoard: false, prompts: "请选择", message: dataModel.cert_info.issue_end, type: .time, isShowPrompts: isShowPrompt, alertMessage:"请选择到期时间")
+        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:"请选择到期时间")
         return [item1, item2]
     }
     
@@ -58,4 +58,16 @@ class YHResignCertificateDetailViewModel: YHBaseViewModel {
             break
         }
     }
+    
+    func getResultString(_ data: String) -> String {
+        let dateString = data // 原始日期时间字符串
+        let dateFormatter = DateFormatter()
+        dateFormatter.dateFormat = "yyyy-MM-dd HH:mm:ss" // 设置原始日期时间格式
+        if let date = dateFormatter.date(from: dateString) {
+            dateFormatter.dateFormat = "yyyy-MM-dd" // 设置目标日期格式
+            let convertedDateString = dateFormatter.string(from: date) // 转换日期到目标格式
+            return convertedDateString
+        }
+        return ""
+    }
 }

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

@@ -211,6 +211,13 @@ class YHServiceSectionStepThreeCollectionViewCell: UICollectionViewCell {
     }
     
     func updataAllSubViews() {
-        descripeLable.text = "第\(dataSource)批续签"
+        descripeLable.text = "第" + convertNumberToChineseText(dataSource) + "批续签"
+    }
+    
+    func convertNumberToChineseText(_ number: Int) -> String {
+        let numberFormatter = NumberFormatter()
+        numberFormatter.locale = Locale(identifier: "zh_CN")
+        numberFormatter.numberStyle = .spellOut
+        return numberFormatter.string(from: NSNumber(value: number)) ?? ""
     }
 }

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

@@ -163,12 +163,12 @@ extension YHServiceOrderProgressTableViewCell {
             
             if model.type == 31 {
                 titleLabel.text = "续签资料管理"
-                messageLabel.text = "请确认您的续签文书内容并完成签字~"
+                messageLabel.text = "请根据资料清单上传您的续签证明文件~"
             }
             
             if model.type == 32 {
                 titleLabel.text = "续签文书管理"
-                messageLabel.text = "点击保存入境小白条及香港身份证（后续身份续期、永居均涉及）"
+                messageLabel.text = "请确认您的续签文书内容并完成签字~"
             }
         }
         if model.status == 2 {
@@ -375,14 +375,16 @@ extension YHServiceOrderProgressTableViewCell {
             }
             if model.type == 31 {
                 titleLabel.text = "续签资料管理"
-                messageLabel.text = "请确认您的续签文书内容并完成签字~"
+                messageLabel.text = "请根据资料清单上传您的续签证明文件~"
                 buttonLabel.text = "去上传"
+                messageLabel.textColor = UIColor.yhGreyColor50
             }
             
             if model.type == 32 {
                 titleLabel.text = "续签文书管理"
-                messageLabel.text = "点击保存入境小白条及香港身份证（后续身份续期、永居均涉及）"
+                messageLabel.text = "请确认您的续签文书内容并完成签字~"
                 buttonLabel.text = "去确认"
+                messageLabel.textColor = UIColor.yhGreyColor50
             }
         }
         if model.status == 3 {
@@ -456,13 +458,13 @@ extension YHServiceOrderProgressTableViewCell {
             
             if model.type == 31 {
                 titleLabel.text = "续签资料管理"
-                messageLabel.text = "请确认您的续签文书内容并完成签字~"
+                messageLabel.text = "请根据资料清单上传您的续签证明文件~"
                 buttonLabel.text = "已完成"
             }
             
             if model.type == 32 {
                 titleLabel.text = "续签文书管理"
-                messageLabel.text = "点击保存入境小白条及香港身份证（后续身份续期、永居均涉及）"
+                messageLabel.text = "请确认您的续签文书内容并完成签字~"
                 buttonLabel.text = "已完成"
             }
             let b: ASAttributedString = .init(NSAttributedString(string: "\(model.percentage)"), .font(UIFont(name: "DINAlternate-Bold", size: 24)!),.foreground(UIColor.mainTextColor))