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

7b196ec3 · lujunye · d02a9258 · 7b196ec3 · 7b196ec3 · 7b196ec3
Commit 7b196ec3 authored Apr 16, 2021 by lujunye
5 changed files
--- a/GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
+++ b/GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
--- a/GeliBusinessPlatform/Other/Web/WebViewController.swift
+++ b/GeliBusinessPlatform/Other/Web/WebViewController.swift
@@ -108,7 +108,13 @@ extension WebViewController: WKNavigationDelegate
            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){
        //        Log4jMessage(message: "页面加载失败...")

--- a/GeliBusinessPlatform/ViewController/个人中心/PersonCenterViewController.swift
+++ b/GeliBusinessPlatform/ViewController/个人中心/PersonCenterViewController.swift
@@ -175,6 +175,7 @@ class PersonCenterViewController: BaseViewController,UITableViewDelegate,UITable
 //            let goodsDescHmtl = "<html>" + (self.dataModel?.data?.about)! + "</html>"
            let vc = WebViewController()
            vc.urlStr = (self.dataModel?.data?.help)!
+            print("url == ",vc.urlStr)
            self.navigationController?.pushViewController(vc, animated: true)

        }

--- a/GeliBusinessPlatform/ViewController/代客下单（货运）/下运单/XiaYunDanViewController.swift
+++ b/GeliBusinessPlatform/ViewController/代客下单（货运）/下运单/XiaYunDanViewController.swift
@@ -48,7 +48,10 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
    var res = -1
    var pph_wb_no = ""
    @IBAction func PPH_PayAction(_ sender: Any) {
-        
+        if apply_btn.isSelected == false {
+            HUD.flash(.label("您好，请同意《电子运单契约条款》，方可下单。谢谢"), delay: 1.2)
+            return
+        }
        if totalPrice.count > 0 {
            switch res {
            case 1://未开通格利支付
@@ -214,14 +217,17 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
    func P_P_H_Time_Select_View_Time_Select(time:Double) {
        timeStamp = Int(time)
        pph_time = timeStampToString(timeStamp: Double(timeStamp), outputFormatter: "yyyy-MM-dd HH:mm:ss")
-        print("abc = ",timeStamp,pph_time)
        pph_listView.reloadData()
    }
    @IBAction func check_contract_action(_ sender: Any) {
        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) {
        apply_btn.isSelected = !apply_btn.isSelected
+        
    }
    @IBOutlet weak var apply_btn: UIButton!
    @IBOutlet weak var p_p_view: UIView!

--- a/GeliBusinessPlatform/ViewController/商品详情/EPViewController.swift
+++ b/GeliBusinessPlatform/ViewController/商品详情/EPViewController.swift
@@ -197,7 +197,6 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
                    need_check = 1
                }
            }else{
-                //                faHuoTime = ""
                dj_time_start = 0
                dj_time_end = 0
                wk_time_start = 0