diff --git a/.DS_Store b/.DS_Store index cc893ca..c8f9266 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate index 9d02e90..5267413 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 43d463d..48af7a7 100644 --- a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -574,8 +574,8 @@ filePath = "OrderScheduling/Common/WebView/WebViewController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "144" - endingLineNumber = "144" + startingLineNumber = "143" + endingLineNumber = "143" landmarkName = "userContentController(_:didReceive:)" landmarkType = "7"> @@ -862,8 +862,8 @@ filePath = "OrderScheduling/Common/WebView/WebViewController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "149" - endingLineNumber = "149" + startingLineNumber = "148" + endingLineNumber = "148" landmarkName = "webView(_:didFinish:)" landmarkType = "7"> @@ -878,8 +878,8 @@ filePath = "OrderScheduling/Common/WebView/WebViewController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "156" - endingLineNumber = "156" + startingLineNumber = "155" + endingLineNumber = "155" landmarkName = "webView(_:didFail:withError:)" landmarkType = "7"> @@ -894,8 +894,8 @@ filePath = "OrderScheduling/Common/WebView/WebViewController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "164" - endingLineNumber = "164" + startingLineNumber = "163" + endingLineNumber = "163" landmarkName = "webView(_:didFailProvisionalNavigation:withError:)" landmarkType = "7"> @@ -910,8 +910,8 @@ filePath = "OrderScheduling/Common/WebView/WebViewController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "163" - endingLineNumber = "163" + startingLineNumber = "162" + endingLineNumber = "162" landmarkName = "webView(_:didFailProvisionalNavigation:withError:)" landmarkType = "7"> @@ -1348,22 +1348,6 @@ landmarkType = "7"> - - - - @@ -2478,8 +2462,8 @@ filePath = "OrderScheduling/Common/WebView/WebViewController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "129" - endingLineNumber = "129" + startingLineNumber = "128" + endingLineNumber = "128" landmarkName = "userContentController(_:didReceive:)" landmarkType = "7"> @@ -2686,8 +2670,8 @@ filePath = "OrderScheduling/Common/WebView/WebViewController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "133" - endingLineNumber = "133" + startingLineNumber = "132" + endingLineNumber = "132" landmarkName = "userContentController(_:didReceive:)" landmarkType = "7"> @@ -2702,8 +2686,8 @@ filePath = "OrderScheduling/Common/WebView/WebViewController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "140" - endingLineNumber = "140" + startingLineNumber = "139" + endingLineNumber = "139" landmarkName = "userContentController(_:didReceive:)" landmarkType = "7"> @@ -2718,6 +2702,38 @@ filePath = "OrderScheduling/Common/WebView/WebViewController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" + startingLineNumber = "133" + endingLineNumber = "133" + landmarkName = "userContentController(_:didReceive:)" + landmarkType = "7"> + + + + + + + + - - - - - - - - + + + + diff --git a/OrderScheduling/Common/WebView/WebViewController.swift b/OrderScheduling/Common/WebView/WebViewController.swift index 40cbfa9..b23334f 100644 --- a/OrderScheduling/Common/WebView/WebViewController.swift +++ b/OrderScheduling/Common/WebView/WebViewController.swift @@ -122,11 +122,10 @@ extension WebViewController : WKScriptMessageHandler { if action == "goBack" { navigationController?.popViewController(animated: true) }else if action == "goTraining" { - let params = dict?["params"] as? [String:Int] - let id = params?["id"] as? Int - let docType = params?["docType"] as? Int - if let supplierId = USER.supplierId,let userId = USER.userId, let id, let docType { - WEBTOOL.open(name: .docmentDetail, appending: "&supplierId=\(supplierId)&userId=\(userId)&id=\(id)&docType=\(docType)") + let params = dict?["params"] as? [String:String] + let id = params?["id"] as? String + if let supplierId = USER.supplierId,let userId = USER.userId, let id { + WEBTOOL.open(name: .docmentDetail, appending: "&supplierId=\(supplierId)&userId=\(userId)&id=\(id)") } }else if action == "orderPhoto" { let params = dict?["params"] as? [String:Any] diff --git a/Pods/.DS_Store b/Pods/.DS_Store index 363264a..c9419e7 100644 Binary files a/Pods/.DS_Store and b/Pods/.DS_Store differ diff --git a/Pods/AMapNavi-NO-IDFA/.DS_Store b/Pods/AMapNavi-NO-IDFA/.DS_Store new file mode 100644 index 0000000..7127add Binary files /dev/null and b/Pods/AMapNavi-NO-IDFA/.DS_Store differ diff --git a/Pods/AMapNavi-NO-IDFA/AMapNaviKit.framework/.DS_Store b/Pods/AMapNavi-NO-IDFA/AMapNaviKit.framework/.DS_Store new file mode 100644 index 0000000..66ac937 Binary files /dev/null and b/Pods/AMapNavi-NO-IDFA/AMapNaviKit.framework/.DS_Store differ diff --git a/fastlane/report.xml b/fastlane/report.xml index 44e65cc..e9feab1 100644 --- a/fastlane/report.xml +++ b/fastlane/report.xml @@ -5,17 +5,17 @@ - + - + - +