diff --git a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate index 7b9ea58..28ac8e5 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.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index 724e9f3..52cf8a4 100644 --- a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -4797,5 +4797,21 @@ landmarkType = "7"> + + + + diff --git a/OrderScheduling/Common/WebView/WebViewTool.swift b/OrderScheduling/Common/WebView/WebViewTool.swift index 7b4b18b..6615445 100644 --- a/OrderScheduling/Common/WebView/WebViewTool.swift +++ b/OrderScheduling/Common/WebView/WebViewTool.swift @@ -61,9 +61,13 @@ open class WebViewTool : NSObject { let tabBarVc = UIApplication.shared.dd_keyWindow.rootViewController as? UITabBarController let nav = tabBarVc?.selectedViewController as? UINavigationController nav?.topViewController?.view.dd_hideHUD() - - self?.h5Models = response?.data - self?.openWebView(name: name,appending: appending) + // 仅当有数据才会打开webview,不然提示加载失败 + if response?.success == true, let data = response?.data { + self?.h5Models = data + self?.openWebView(name: name,appending: appending) + }else{ + nav?.topViewController?.view.dd_makeToast(webViewLoadFailed) + } }) .disposed(by: disposeBag)