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走查
  // UI走查

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

@@ -120,10 +120,12 @@ class YHCertificateUploadContentListVC: YHBaseViewController {
     
     @objc func didClickUploadBtn() {
         
-        if items.count >= 99 {
-            YHHUD.flash(message: "已达上限，最多上传99张图片或文件")
+//        if items.count >= 99 {
+        if true {
+            YHHUD.flash(message: "已达上限\n最多上传99张图片或文件")
             return
         }
+        
         let sheetView = YHCertificateUploadSheetView.sheetView()
         sheetView.templateInfo = supplementInfo.templateInfo
         sheetView.uploadFilesBlock = {
@@ -301,7 +303,7 @@ extension YHCertificateUploadContentListVC: UITableViewDelegate, UITableViewData
             tipsLabel.font = UIFont.PFSC_R(ofSize:14)
             tipsLabel.numberOfLines = 0
             if !supplementInfo.templateInfo.description.isEmpty {
-                tipsLabel.text = supplementInfo.templateInfo.description
+                tipsLabel.text = "注意事项:\n\(supplementInfo.templateInfo.description)"
             }
             view.addSubview(tipsLabel)
             
@@ -361,7 +363,11 @@ extension YHCertificateUploadContentListVC: UITableViewDelegate, UITableViewData
         tipsLabel.font = UIFont.PFSC_R(ofSize:12)
         tipsLabel.textAlignment = .left
         tipsLabel.numberOfLines = 0
-        tipsLabel.text = supplementInfo.auditContent
+        if !supplementInfo.auditContent.isEmpty {
+            tipsLabel.text = "被驳回原因: \(supplementInfo.auditContent)"
+        } else {
+            tipsLabel.text = ""
+        }
         view.addSubview(tipsLabel)
         
         titlelabel.snp.makeConstraints { make in

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

@@ -34,7 +34,7 @@ class YHCertificateSearchBar: UIView {
     lazy var textField:UITextField = {
         let textField = UITextField()
         textField.backgroundColor = .clear
-        textField.attributedPlaceholder = NSAttributedString(string: "请输入", attributes: [NSAttributedString.Key.foregroundColor : UIColor.placeHolderColor])
+        textField.attributedPlaceholder = NSAttributedString(string: "输入关键词搜索资料", attributes: [NSAttributedString.Key.foregroundColor : UIColor.placeHolderColor])
         textField.font = UIFont.PFSC_M(ofSize: 12)
         textField.tintColor = UIColor(hexString: "#3D88F8")
         textField.textColor = UIColor.mainTextColor

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

@@ -267,7 +267,7 @@ extension YHCertificateTemplateSheetView: UITableViewDelegate, UITableViewDataSo
             label.textAlignment = .left
             label.font = UIFont.PFSC_R(ofSize:14)
             label.numberOfLines = 0
-            label.text = desc
+            label.text = "注意事项:\n\(desc)"
             view.addSubview(label)
             
             label.snp.makeConstraints { make in

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

@@ -347,7 +347,7 @@ extension YHCertificateUploadSheetView: UITableViewDelegate, UITableViewDataSour
             label.textAlignment = .left
             label.font = UIFont.PFSC_R(ofSize:14)
             label.numberOfLines = 0
-            label.text = desc
+            label.text = "注意事项:\n\(desc)"
             view.addSubview(label)
             
             label.snp.makeConstraints { make in

galaxy/galaxy/Classes/Tools/Helper/YHHUD/YHHUD.swift

@@ -103,6 +103,7 @@ extension YHHUD{
 extension YHHUD{
     static let flashMessageTag = 61535
     static func flash(message: String,
+                      textAligment:NSTextAlignment = .center,
                       dismissAfter: TimeInterval = 1.5,
                       duration:TimeInterval = 0.5,
                       isRemoveBefore: Bool = true,
@@ -123,6 +124,7 @@ extension YHHUD{
         containerView.tag = flashMessageTag
         let label = UILabel()
         label.text = message
+        label.textAlignment = textAligment
         label.numberOfLines = 5
         label.textColor = UIColor.white
         label.font = UIFont.systemFont(ofSize: 14)