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:
  细节调控
  续签在港签证缴费bug修复

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/HongKongVisaRenewalPayment(续签在港缴费)/C/YHHKVisaRenewalPaymentVC.swift

@@ -297,7 +297,7 @@ extension YHHKVisaRenewalPaymentVC {
                         }
                         self.copyToPasteBoard(person.file_num, message: "已复制档案号")
                     }))
-                    
+                    paymentMembers.append(.subInfo("缴费金额：", "\(person.fee_hkd)港币（≈\(person.fee_rmb)人民币)", nil))
                     paymentMembers.append(.subContent("缴费电子签证：", fileName, "查看", .bottom, { [weak self] in
                         guard let self = self else {
                             return

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/LookResignResult(查看续签结果)/C/YHLookResignResultViewController.swift

@@ -24,7 +24,7 @@ class YHLookResignResultViewController: YHBaseViewController {
     
     lazy var tableView: UITableView = {
         let tableView = UITableView(frame:.zero, style:.grouped)
-        tableView.estimatedSectionHeaderHeight = 16.0
+        tableView.estimatedSectionHeaderHeight = 0.01
         tableView.estimatedSectionFooterHeight = 0.01
         tableView.contentInsetAdjustmentBehavior = .never
         tableView.showsVerticalScrollIndicator = false
@@ -266,6 +266,9 @@ extension YHLookResignResultViewController: UITableViewDelegate, UITableViewData
     }
     
     private func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> CGFloat {
+        if section == 0 {
+            return 0.01
+        }
         return 16.0
     }
     

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

@@ -603,7 +603,7 @@ extension YHServiceOrderProgressTableViewCell {
         if model.status == 4 {
             titleLabel.textColor = UIColor.mainTextColor
             buttonLabel.text = "请稍候"
-            buttonLabel.backgroundColor = UIColor.mainTextColor50
+            buttonLabel.backgroundColor = UIColor(hex: 0xb8babe,transparency: 0.5)
             progressImageView.image = UIImage(named: "service_progress_start")
             progress.changeColor(UIColor.brandMainColor)
             // 1 证件 2 信息完善 3 我的评分 4 我的方案 5 我的签字 6我的文书