Merge branch 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop

galaxy/galaxy/Classes/Modules/Home(首页)/YHSelect/C/YHSelectViewController.swift

@@ -141,7 +141,7 @@ extension YHSelectViewController {
             tableView.dataSource = self
             tableView.delegate = self
             tableView.tableHeaderView = sectionView
-            tableView.tableFooterView = UIView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: KScreenHeight/3))
+            tableView.tableFooterView = UIView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: 250))
             tableView.register(cellWithClass: YHSelectLookTableViewCell.self)
             return tableView
         }()
@@ -169,7 +169,7 @@ extension YHSelectViewController {
         }
         
         if #available(iOS 15.0, *) {
-            tableView.sectionHeaderTopPadding = 0;
+            tableView.sectionHeaderTopPadding = 0
         }
     }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/OrderList(服务订单)/C/YHOrderDetailViewController.swift

@@ -149,7 +149,7 @@ extension YHOrderDetailViewController: UITableViewDelegate, UITableViewDataSourc
     }
     
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        return 295
+        return 305
     }
     
     func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
@@ -279,7 +279,7 @@ class YHOrderDetailTableViewCell: UITableViewCell {
             make.top.equalTo(54.5)
             make.left.equalTo(16)
             make.right.equalTo(-16)
-            make.height.equalTo(1)
+            make.height.equalTo(0.5)
         }
         orderTitleLabel = {
             let label = UILabel()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MySignature(我的签字)/Model/YHMySignatureDetailModel.swift

@@ -27,6 +27,7 @@ class YHMySignatureDetailModel: SmartCodable {
     var docType: Int = 0
     var signedDocument: [YHMySignedDocumentModel] = []
     var templateUrl: String = ""
+    var commonFile: String = ""
     required init() {
     }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/MySignature(我的签字)/C/YHGCMySignatureDetailViewController.swift

@@ -348,20 +348,9 @@ extension YHGCMySignatureDetailViewController: UITableViewDelegate, UITableViewD
                         YHCommonAlertView.show("", "文书编写中，请稍候查看", "", "我知道了") {
                             
                         }  
-                    } else if self.viewModel.mainModel?.docStatus == 1007 {
-                        if self.viewModel.mainModel?.signFile.count != 0 {
-                            let url = URL(string: self.viewModel.mainModel?.signFile) ?? URL(fileURLWithPath: "")
-                            let safariViewController = SFSafariViewController(url: url)
-                            safariViewController.dismissButtonStyle = .close
-                            safariViewController.delegate = self
-                            safariViewController.modalPresentationStyle = .fullScreen
-                            present(safariViewController, animated: true, completion: nil)
-                        } else {
-                            
-                        }
                     } else {
-                        if self.viewModel.mainModel?.signFile.count != 0 {
-                            let url = URL(string: self.viewModel.mainModel?.signFileOrigin) ?? URL(fileURLWithPath: "")
+                        if self.viewModel.mainModel?.commonFile.count != 0 {
+                            let url = URL(string: self.viewModel.mainModel?.commonFile) ?? URL(fileURLWithPath: "")
                             let safariViewController = SFSafariViewController(url: url)
                             safariViewController.dismissButtonStyle = .close
                             safariViewController.delegate = self