Commit 474bf546 authored by pete谢兆麟's avatar pete谢兆麟

香港行程添加

parent e87e2474
...@@ -33,11 +33,17 @@ class YHHKEventWebViewController: YHBaseViewController { ...@@ -33,11 +33,17 @@ class YHHKEventWebViewController: YHBaseViewController {
extension YHHKEventWebViewController { extension YHHKEventWebViewController {
func loadData() { func loadData() {
guard let urlString = model.list.first else { return } guard let urlString = model.list.first else { return }
if let url = URL(string: urlString) { var currentUrl = urlString
if model.tag.contains("香港行程") {
if let orderID = UserDefaults.standard.value(forKey: "orderIdForPreview") as? Int {
currentUrl = urlString + "?paramO=\(orderID)" + "&param=" + YHLoginManager.shared.h5Token
}
}
if let url = URL(string: currentUrl) {
let request = URLRequest(url: url) let request = URLRequest(url: url)
webview.load(request) webview.load(request)
} else { } else {
let tmpUrl = YHURLEncodeHelper.urlEncodedString(urlString) let tmpUrl = YHURLEncodeHelper.urlEncodedString(currentUrl)
if let url = URL(string: tmpUrl) { if let url = URL(string: tmpUrl) {
let request = URLRequest(url: url) let request = URLRequest(url: url)
webview.load(request) webview.load(request)
......
...@@ -398,8 +398,12 @@ extension YHHomePageViewModel { ...@@ -398,8 +398,12 @@ extension YHHomePageViewModel {
} }
func getHKEvent(param: [String: Int] = [:], callBackBlock: @escaping (_ success: Bool, _ error: YHErrorModel?) -> Void) { func getHKEvent(param: [String: Int] = [:], callBackBlock: @escaping (_ success: Bool, _ error: YHErrorModel?) -> Void) {
var params = param
if let orderID = UserDefaults.standard.value(forKey: "orderIdForPreview") as? Int {
params = ["order_id": orderID]
}
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Common.hklistApi let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Common.hklistApi
_ = YHNetRequest.getRequest(url: strUrl, params: param) { [weak self] json, _ in _ = YHNetRequest.getRequest(url: strUrl, params: params) { [weak self] json, _ in
guard let self = self else { return } guard let self = self else { return }
// 1. json字符串 转 对象 // 1. json字符串 转 对象
if json.code == 200 { if json.code == 200 {
......
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