// 旅行

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

@@ -511,8 +511,12 @@ extension YHTravelCertificateUploadCell {
                     YHHUD.hide()
                     if success, let result = result {
                         self.dataModel.isOCR_failed = false
-                        self.dataModel.issue_start = result.term_begins
-                        self.dataModel.issue_end = result.end_of_term
+                        if !result.term_begins.isEmpty {
+                            self.dataModel.issue_start = result.term_begins
+                        }
+                        if !result.end_of_term.isEmpty {
+                            self.dataModel.issue_end = result.end_of_term
+                        }
                         self.updateBlock?(true)
                     } else {
                         // OCR 无法识别
@@ -526,8 +530,12 @@ extension YHTravelCertificateUploadCell {
                 self.viewModel.getHKCardInfoByOcr(url, isBack: isBack) { success, result in
                     YHHUD.hide()
                     if success, let result = result {
-                        self.dataModel.issue_start = result.term_begins
-                        self.dataModel.issue_end = result.end_of_term
+                        if !result.term_begins.isEmpty {
+                            self.dataModel.issue_start = result.term_begins
+                        }
+                        if !result.end_of_term.isEmpty {
+                            self.dataModel.issue_end = result.end_of_term
+                        }
                         self.updateBlock?(true)
                     } else {
                         // OCR 无法识别

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

@@ -122,13 +122,15 @@ extension YHTravelDocsPreparationViewModel {
         
         if type == 1 {
             let a = ASAttributedString.init("办理逗留D签注", .font(UIFont.PFSC_R(ofSize:14)), .foreground(UIColor.mainTextColor(alpha: 0.5)))
-            let b = ASAttributedString.init("《港澳通行证逗留 (D) -办理操作指引》", .font(UIFont.PFSC_R(ofSize:14)), 
-                .underline([.single]),
+            let b = ASAttributedString.init("《", .font(UIFont.PFSC_R(ofSize:14)),.foreground(UIColor.brandMainColor))
+            let c = ASAttributedString.init("港澳通行证逗留 (D) -办理操作指引", .font(UIFont.PFSC_R(ofSize:14)),
+                .underline([.byWord]),
                 .foreground(UIColor.brandMainColor),
                 .action {
                     YHTravelHKDLGuideSheetView.sheetView().show()
             })
-            let c = ASAttributedString.init("点击查看", .font(UIFont.PFSC_R(ofSize:14)),.foreground(UIColor.mainTextColor(alpha: 0.5)))
+            let d = ASAttributedString.init("》", .font(UIFont.PFSC_R(ofSize:14)),.foreground(UIColor.brandMainColor))
+            let e = ASAttributedString.init("点击查看", .font(UIFont.PFSC_R(ofSize:14)),.foreground(UIColor.mainTextColor(alpha: 0.5)))
             return a+b+c
         }