Merge commit '86670608' into davidhuang

* commit '86670608':
  // 旅行

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

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import AttributedString
 
 class YHTravelCertificateItemView: UIView {
     
@@ -14,9 +15,9 @@ class YHTravelCertificateItemView: UIView {
     
     var clickBlock: (()->())?
     
-    var title: String = "" {
+    var title: ASAttributedString = "" {
         didSet {
-            titleLabel.text = title
+            titleLabel.attributed.text = title
         }
     }
     

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

@@ -28,6 +28,7 @@ class YHCertificateDateItem {
     init(id: YHCertificateID, isMust:Bool, title: String, value: String, placeHolder: String, errorTips: String, isShowErrorTips: Bool = false) {
         
         self.id = id
+        self.isMust = isMust
         self.title = title
         self.value = value
         self.placeHolder = placeHolder
@@ -208,7 +209,15 @@ class YHTravelCertificateUploadCell: UITableViewCell {
         for (index, item) in arr.enumerated() {
            
             let itemView = YHTravelCertificateItemView(frame: .zero)
-            itemView.title = item.title
+            // 标题
+            var titleStr: ASAttributedString = .init("\(item.title)", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor))
+            // 是否必填
+            if item.isMust {
+                let mustTag: ASAttributedString = .init("*", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.failColor))
+                titleStr = mustTag + titleStr
+            }
+            
+            itemView.title =  titleStr
             itemView.placeHolder = item.placeHolder
             itemView.isNeedShowErrorTips = item.isShowErrorTips
             itemView.errorTips = item.errorTips