From 586eb879891e852e50302206470149766c35ee08 Mon Sep 17 00:00:00 2001
From: 杨锴 <841720330@qq.com>
Date: 星期四, 05 九月 2024 15:07:57 +0800
Subject: [PATCH] fix API Login
---
XQMuse/Root/Other/WebVC.swift | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/XQMuse/Root/Other/WebVC.swift b/XQMuse/Root/Other/WebVC.swift
index 16a69a8..f463d3d 100644
--- a/XQMuse/Root/Other/WebVC.swift
+++ b/XQMuse/Root/Other/WebVC.swift
@@ -7,12 +7,14 @@
import UIKit
import WebKit
+import JQTools
class WebVC: BaseVC {
private var webView:WKWebView?
- private(set) var url = ""
- private(set) var htmlText = ""
+ private var type:AgreementType?
+ private(set) var url:String?
+ private(set) var htmlText:String?
private(set) var baseUrl:URL?
private var progressView = UIProgressView()
private let jsCode = """
@@ -27,6 +29,11 @@
public convenience init(url:String) {
self.init()
self.url = url
+ }
+
+ public convenience init(type:AgreementType){
+ self.init()
+ self.type = type
}
public convenience init(htmlText:String,baseURL:URL? = nil) {
@@ -65,12 +72,22 @@
make.height.equalTo(2)
}
+ if type != nil{
+ Services.agreementBy(type!).subscribe(onNext: {data in
+ if let model = data.data{
+ self.webView?.loadHTMLString(model.content.jq_wrapHtml(), baseURL: nil)
+ }
+ }).disposed(by: disposeBag)
+ }
- if !url.isEmpty {
- let urlRequest = URLRequest(url: URL(string: url)!)
+ if url != nil {
+ let urlRequest = URLRequest(url: URL(string: url!)!)
webView?.load(urlRequest)
- }else{
- webView?.loadHTMLString(htmlText, baseURL: baseUrl)
+ return
+ }
+
+ if htmlText != nil{
+ webView?.loadHTMLString(htmlText!, baseURL: baseUrl)
}
}
--
Gitblit v1.7.1