Skip to content

G
GeliBusinessPlatform
Commit 7b196ec3 authored by lujunye's avatar lujunye
Browse files
Options

阿士大夫撒旦飞洒发斯蒂芬

parent d02a9258
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 4 deletions
GeliBusinessPlatform/Other/Web/WebViewController.swift
View file @ 7b196ec3
...@@ -108,7 +108,13 @@ extension WebViewController: WKNavigationDelegate ...@@ -108,7 +108,13 @@ extension WebViewController: WKNavigationDelegate
self.progressView.isHidden = true self.progressView.isHidden = true
} }
} }
func webView(_ webView: WKWebView, didReceive challenge: URLAuthenticationChallenge, completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void) {
        if challenge.protectionSpace.authenticationMethod == NSURLAuthenticationMethodServerTrust {
            let card = URLCredential.init(trust: challenge.protectionSpace.serverTrust!)
            completionHandler(URLSession.AuthChallengeDisposition.useCredential,card)
        }
    }
// 页面加载失败时调用 // 页面加载失败时调用
func webView(_ webView: WKWebView, didFail navigation: WKNavigation!, withError error: Error){ func webView(_ webView: WKWebView, didFail navigation: WKNavigation!, withError error: Error){
// Log4jMessage(message: "页面加载失败...") // Log4jMessage(message: "页面加载失败...")
......
GeliBusinessPlatform/ViewController/个人中心/PersonCenterViewController.swift
View file @ 7b196ec3
...@@ -175,6 +175,7 @@ class PersonCenterViewController: BaseViewController,UITableViewDelegate,UITable ...@@ -175,6 +175,7 @@ class PersonCenterViewController: BaseViewController,UITableViewDelegate,UITable
// let goodsDescHmtl = "<html>" + (self.dataModel?.data?.about)! + "</html>" // let goodsDescHmtl = "<html>" + (self.dataModel?.data?.about)! + "</html>"
let vc = WebViewController() let vc = WebViewController()
vc.urlStr = (self.dataModel?.data?.help)! vc.urlStr = (self.dataModel?.data?.help)!
print("url == ",vc.urlStr)
self.navigationController?.pushViewController(vc, animated: true) self.navigationController?.pushViewController(vc, animated: true)
} }
......
GeliBusinessPlatform/ViewController/代客下单（货运）/下运单/XiaYunDanViewController.swift
View file @ 7b196ec3
...@@ -48,7 +48,10 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie ...@@ -48,7 +48,10 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
var res = -1 var res = -1
var pph_wb_no = "" var pph_wb_no = ""
@IBAction func PPH_PayAction(_ sender: Any) { @IBAction func PPH_PayAction(_ sender: Any) {
if apply_btn.isSelected == false {
HUD.flash(.label("您好，请同意《电子运单契约条款》，方可下单。谢谢"), delay: 1.2)
return
}
if totalPrice.count > 0 { if totalPrice.count > 0 {
switch res { switch res {
case 1://未开通格利支付 case 1://未开通格利支付
...@@ -214,14 +217,17 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie ...@@ -214,14 +217,17 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
func P_P_H_Time_Select_View_Time_Select(time:Double) { func P_P_H_Time_Select_View_Time_Select(time:Double) {
timeStamp = Int(time) timeStamp = Int(time)
pph_time = timeStampToString(timeStamp: Double(timeStamp), outputFormatter: "yyyy-MM-dd HH:mm:ss") pph_time = timeStampToString(timeStamp: Double(timeStamp), outputFormatter: "yyyy-MM-dd HH:mm:ss")
print("abc = ",timeStamp,pph_time)
pph_listView.reloadData() pph_listView.reloadData()
} }
@IBAction func check_contract_action(_ sender: Any) { @IBAction func check_contract_action(_ sender: Any) {
print("查看条款") print("查看条款")
let vc = WebViewController()
vc.urlStr = "https://z.gelifood.com/static/url/pinpinhuo.html"
self.navigationController?.pushViewController(vc, animated: true)
} }
@IBAction func click_action(_ sender: Any) { @IBAction func click_action(_ sender: Any) {
apply_btn.isSelected = !apply_btn.isSelected apply_btn.isSelected = !apply_btn.isSelected
} }
@IBOutlet weak var apply_btn: UIButton! @IBOutlet weak var apply_btn: UIButton!
@IBOutlet weak var p_p_view: UIView! @IBOutlet weak var p_p_view: UIView!
......
GeliBusinessPlatform/ViewController/商品详情/EPViewController.swift
View file @ 7b196ec3
...@@ -197,7 +197,6 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo ...@@ -197,7 +197,6 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
need_check = 1 need_check = 1
} }
}else{ }else{
// faHuoTime = ""
dj_time_start = 0 dj_time_start = 0
dj_time_end = 0 dj_time_end = 0
wk_time_start = 0 wk_time_start = 0
......
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