From 858bd6df13a6a6415d12d8e60141575574646f58 Mon Sep 17 00:00:00 2001 From: younger_times <841720330@qq.com> Date: 星期一, 24 七月 2023 18:23:48 +0800 Subject: [PATCH] 新增 --- WanPai/Common/View/AgreentView.swift | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/WanPai/Common/View/AgreentView.swift b/WanPai/Common/View/AgreentView.swift index 9b9e56d..34e1389 100644 --- a/WanPai/Common/View/AgreentView.swift +++ b/WanPai/Common/View/AgreentView.swift @@ -17,6 +17,7 @@ @IBOutlet weak var webView: WKWebView! @IBOutlet weak var bottom_cons: NSLayoutConstraint! private var type:AgreentType! + private var content:String? private let disposeBag = DisposeBag() override func awakeFromNib() { @@ -27,11 +28,12 @@ } - static func show(type:AgreentType){ + static func show(type:AgreentType,content:String? = nil){ let alertView = AgreentView.jq_loadNibView() alertView.frame = screnDelegate?.window?.frame ?? .zero alertView.type = type alertView.label_title.text = type.titleStr + alertView.content = content screnDelegate?.window?.addSubview(alertView) alertView.bottom_cons.constant = 0 @@ -39,11 +41,15 @@ alertView.layoutIfNeeded() } - Services.queryProtocol(type,progress: false).subscribe(onNext: { result in - if let text = result.data?.jq_wrapHtml(){ - alertView.webView.loadHTMLString(text, baseURL: nil) - } - }).disposed(by: alertView.disposeBag) + if type != .other{ + Services.queryProtocol(type,progress: false).subscribe(onNext: { result in + if let text = result.data?.jq_wrapHtml(){ + alertView.webView.loadHTMLString(text, baseURL: nil) + } + }).disposed(by: alertView.disposeBag) + }else{ + alertView.webView.loadHTMLString(content?.jq_wrapHtml() ?? "", baseURL: nil) + } } -- Gitblit v1.7.1