Commit 28e460e3 authored by David黄金龙's avatar David黄金龙

一处 bug修改

parent 17d07be9
...@@ -95,7 +95,6 @@ class YHServiceOrderListView: YHBaseViewController { ...@@ -95,7 +95,6 @@ class YHServiceOrderListView: YHBaseViewController {
viewModel.getServiceMainDocUrl(orderId: orderId) {success, error in viewModel.getServiceMainDocUrl(orderId: orderId) {success, error in
let vc = YHH5WebViewVC() let vc = YHH5WebViewVC()
vc.url = viewModel.url vc.url = viewModel.url
vc.isFullScreenFlag = false
vc.isNeedRefreshDataFlag = true vc.isNeedRefreshDataFlag = true
UIViewController.current?.navigationController?.pushViewController(vc) UIViewController.current?.navigationController?.pushViewController(vc)
} }
......
...@@ -423,7 +423,10 @@ extension YHH5WebViewVC { ...@@ -423,7 +423,10 @@ extension YHH5WebViewVC {
} else if keyPath == "title" { } else if keyPath == "title" {
if let title = self.webview.title,title.isEmpty == false { if let title = self.webview.title,title.isEmpty == false {
self.navTitle = title self.navTitle = title
self.gk_navTitle = self.navTitle if !isFullScreenFlag {
self.gk_navTitle = self.navTitle
}
} }
} }
} }
......
...@@ -416,10 +416,18 @@ extension YHMessageDetailListVC: UITableViewDelegate, UITableViewDataSource { ...@@ -416,10 +416,18 @@ extension YHMessageDetailListVC: UITableViewDelegate, UITableViewDataSource {
if self.type == YHMessageType.infoSubmit.rawValue { // 资料递交 if self.type == YHMessageType.infoSubmit.rawValue { // 资料递交
if !message.url.isEmpty { if !message.url.isEmpty {
if let url = URL(string: message.url) { if let url = URL(string: message.url) {
let safariViewController = SFSafariViewController(url: url) if message.url.contains("signatureQrcode/") {
safariViewController.dismissButtonStyle = .close //特殊处理 签字确认
safariViewController.modalPresentationStyle = .fullScreen let vc = YHH5WebViewVC()
present(safariViewController, animated: true, completion: nil) vc.url = message.url
vc.isNeedRefreshDataFlag = true
UIViewController.current?.navigationController?.pushViewController(vc)
} else {
let safariViewController = SFSafariViewController(url: url)
safariViewController.dismissButtonStyle = .close
safariViewController.modalPresentationStyle = .fullScreen
present(safariViewController, animated: true, completion: nil)
}
} else { } else {
YHHUD.flash(message: "url无效") YHHUD.flash(message: "url无效")
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment