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/YHCertificateListContainerVC.swift

@@ -43,6 +43,7 @@ class YHCertificateListContainerVC: YHBaseViewController {
     var categoryInfo: YHCategoryData = YHCategoryData()
     lazy var navBar: YHCustomNavigationBar = {
         let bar = YHCustomNavigationBar.navBar()
+        bar.backgroundColor = .white
         bar.showLeftSecondButtonType(.search)
         bar.backBlock = {
             [weak self] in
@@ -78,6 +79,7 @@ class YHCertificateListContainerVC: YHBaseViewController {
         segview.indicators = [indicator]
         segview.backgroundColor = .clear
         segview.listContainer = listContainerView
+        segview.backgroundColor = .white
         return segview
     }()
     
@@ -137,6 +139,7 @@ class YHCertificateListContainerVC: YHBaseViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         self.gk_navigationBar.isHidden = true
+        self.view.backgroundColor = .white
         
         self.navBar.title = "资料".local
         if categoryInfo.categoryId == YHCertificateCategoryId.mainApplicant.rawValue {

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

@@ -62,8 +62,6 @@ class YHCertificateUploadContentListVC: YHBaseViewController {
             tableView.contentInsetAdjustmentBehavior = .never
         }
         tableView.showsVerticalScrollIndicator = false
-        tableView.estimatedSectionHeaderHeight = 1.0
-        tableView.estimatedSectionFooterHeight = 1.0
         tableView.backgroundColor = .white
         tableView.separatorStyle = .none
         tableView.delegate = self
@@ -233,7 +231,7 @@ extension YHCertificateUploadContentListVC: UITableViewDelegate, UITableViewData
         if indexPath.section == 0 {
             
             let cell = tableView.dequeueReusableCell(withIdentifier: YHCertificateTemplateCell.cellReuseIdentifier, for: indexPath) as! YHCertificateTemplateCell
-            cell.update(bottomMargin: 20)
+            cell.update(bottomMargin: 15)
             if 0 <= indexPath.row && indexPath.row < templateArr.count {
                 cell.templatePath = templateArr[indexPath.row]
             }
@@ -366,7 +364,7 @@ extension YHCertificateUploadContentListVC: UITableViewDelegate, UITableViewData
                 make.top.equalTo(titlelabel.snp.bottom).offset(5)
                 make.left.equalToSuperview().offset(20)
                 make.right.equalToSuperview().offset(-20)
-                make.bottom.equalToSuperview().offset(-20)
+                make.bottom.equalToSuperview().offset(-15)
            }
            return view
         }
@@ -442,14 +440,14 @@ extension YHCertificateUploadContentListVC: UITableViewDelegate, UITableViewData
             make.left.equalToSuperview().offset(20)
             make.right.equalToSuperview().offset(-20)
             make.top.equalTo(titlelabel.snp.bottom).offset(3)
-            make.bottom.equalToSuperview().offset(-15)
+            make.bottom.equalToSuperview()
         }
         return view
     }
     
     private func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> CGFloat {
         if section == 0 {
-            return 1.0
+            return 20.0
         }
         return 60.0
     }

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

@@ -144,7 +144,7 @@ class YHCertificateFilterView: UIView {
     lazy var confirmBtn:UIButton = {
         let btn = UIButton()
         btn.setTitle("确定".local, for: .normal)
-        btn.titleLabel?.font = UIFont.PFSC_R(ofSize: 14)
+        btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
         btn.setTitleColor(.white, for: .normal)
         btn.backgroundColor = UIColor(hexString:"#4388FF")
         btn.layer.cornerRadius = 8.0
@@ -155,7 +155,7 @@ class YHCertificateFilterView: UIView {
     lazy var resetBtn:UIButton = {
         let btn = UIButton()
         btn.setTitle("重置", for: .normal)
-        btn.titleLabel?.font = UIFont.PFSC_R(ofSize: 14)
+        btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
         btn.setTitleColor(UIColor.mainTextColor, for: .normal)
         btn.backgroundColor = UIColor(hexString:"#F8F9FB")
         btn.layer.cornerRadius = 8.0

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

@@ -71,7 +71,7 @@ class YHCertificateInfoCell: UITableViewCell {
         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))
         let cerName: ASAttributedString = .init(string:model.name , .font(UIFont.PFSC_M(ofSize: 16)), .foreground(UIColor.mainTextColor))
-        var template: ASAttributedString = "\(.view(templateButton, .original(.center)))"
+        var template: ASAttributedString = "   \(.view(templateButton, .original(.center)))"
         
         // 是否展示右边的模版按钮
         var showTemplateBtn = true