diff --git a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate index 753853a..2b822e2 100644 Binary files a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate and b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/OrderScheduling/Common/WebView/WebViewController.swift b/OrderScheduling/Common/WebView/WebViewController.swift index 10d1e3a..5055602 100644 --- a/OrderScheduling/Common/WebView/WebViewController.swift +++ b/OrderScheduling/Common/WebView/WebViewController.swift @@ -16,12 +16,12 @@ class WebViewController : ZDViewController { lazy var webView = WKWebView.init() lazy var statusBarBackgroundView = DDView.init() var showNavBar : Bool - var vcTitle : String + var vcTitle : String? var url : String? var screenEdgePanGestureRecognizerEnable : Bool public var disappearHandler: (() -> Void)? - public init(showNavBar:Bool = true,title:String,url:String,screenEdgePanGestureRecognizerEnable:Bool = true) { + public init(showNavBar:Bool = true,title:String?,url:String,screenEdgePanGestureRecognizerEnable:Bool = true) { self.showNavBar = showNavBar self.vcTitle = title self.url = url diff --git a/OrderScheduling/Common/WebView/WebViewTool.swift b/OrderScheduling/Common/WebView/WebViewTool.swift index 64a41b4..52c479d 100644 --- a/OrderScheduling/Common/WebView/WebViewTool.swift +++ b/OrderScheduling/Common/WebView/WebViewTool.swift @@ -126,7 +126,7 @@ open class WebViewTool : NSObject { vc = WebViewController(showNavBar:false, title: WebViewNameEnum.newTrainingList.rawValue, url: "\((h5Models?.newTrainingList)!)?token=\((USER.token)!)"+(appending ?? ""),screenEdgePanGestureRecognizerEnable: false) break case .kpiIndex: - vc = WebViewController(showNavBar:true, title: WebViewNameEnum.kpiIndex.rawValue, url: "\((h5Models?.kpiIndex)!)?token=\((USER.token)!)"+(appending ?? "")) + vc = WebViewController(showNavBar:true, title: nil, url: "\((h5Models?.kpiIndex)!)?token=\((USER.token)!)"+(appending ?? "")) break } diff --git a/fastlane/report.xml b/fastlane/report.xml index 6726242..c774691 100644 --- a/fastlane/report.xml +++ b/fastlane/report.xml @@ -5,17 +5,17 @@ - + - + - +