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

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignDocumentManagement(续签文书管理)/C/YHResignDocumentDetailViewController.swift

@@ -247,7 +247,7 @@ extension YHResignDocumentDetailViewController {
                 return
             }
             YHHUD.show(.progress(message: "加载中..."))
-            self.viewModel.getResginDocumentUrl(docId: model.docId, isEditable: false) { [weak self] model, error in
+            self.viewModel.previewResginDocument(docId: model.docId) { [weak self] model, error in
                 guard let self = self else {
                     return
                 }
@@ -270,14 +270,6 @@ extension YHResignDocumentDetailViewController {
             guard let self = self else {
                 return
             }
-//            let vc = YHH5WebViewVC()
-//            vc.navTitle = self.name
-//            // TODO: - Alex等链接下来再赋值
-//            //vc.url = url
-//            vc.isFullScreenFlag = false
-//            self.navigationController?.pushViewController(vc)
-//            printLog("###infoConfirmationEvent")
-            
             
             printLog("跳转QMAS")
             if let param = YHLoginManager.shared.userModel?.token,param.count>5 {
@@ -292,9 +284,10 @@ extension YHResignDocumentDetailViewController {
 
                 url = url + "?param=" + token + "&doc_id=\(model.docId)"
                 let vc = YHH5WebViewVC()
-                vc.navTitle = ""
+                vc.isFullScreenFlag = false
+                vc.navTitle = "QMAS文件信息确认" //self.name
                 vc.url = url
-                UIViewController.current?.navigationController?.pushViewController(vc)
+                self.navigationController?.pushViewController(vc)
             }
         }