幼教中国-我的课程区块没内容时不显示 , 左右滑时当前视图置为顶层 , 上滑h5和下滑h5复用的问题 , 电商h5跳转的支付页面

“张旭”
1 parent 353a13e9
Showing 20 changed files with 506 additions and 44 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Main/HomePage/Controller/AuthMainController/CNMetaCodeHomePageController.swift
metaCode/Classes/Main/HomePage/Controller/DownSlideController/CNUpSlideViewController.swift
metaCode/Classes/Main/HomePage/Controller/ShopPayController/CNLiveShopPayController.swift
metaCode/Classes/Main/HomePage/Controller/WebController/CNWebView.swift
metaCode/Classes/Main/HomePage/View/Shop/Shoph5Pay/CNLiveShopPayNeedPaymentCell.swift
metaCode/Classes/Main/HomePage/View/Shop/Shoph5Pay/CNLiveShopPayWeChatAlipayCell.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/DownSlide/CNDownSlideView.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/UpSlide/CNUpSlideView.swift
metaCode/Classes/Main/HomePage/ViewModel/CNLiveShoph5ViewModel.swift
metaCode/Supporting Files/Assets.xcassets/Shoph5/Contents.json
metaCode/Supporting Files/Assets.xcassets/Shoph5/dd_weixin.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/Shoph5/dd_weixin.imageset/dd_weixin@2x.png
metaCode/Supporting Files/Assets.xcassets/Shoph5/dd_weixin.imageset/dd_weixin@3x.png
metaCode/Supporting Files/Assets.xcassets/Shoph5/dd_zhifubao.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/Shoph5/dd_zhifubao.imageset/dd_zhifubao@2x.png
metaCode/Supporting Files/Assets.xcassets/Shoph5/dd_zhifubao.imageset/dd_zhifubao@3x.png
metaCode/Supporting Files/Assets.xcassets/Shoph5/tsq_xz.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/Shoph5/tsq_xz.imageset/tsq_xz@2x.png
metaCode/Supporting Files/Assets.xcassets/Shoph5/tsq_xz.imageset/tsq_xz@3x.png
@@ -113,6 +113,8 @@
 		19B153CB2BC3E1870018906C /* CNLiveShopPayController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19B153CA2BC3E1870018906C /* CNLiveShopPayController.swift */; };
 		19B153CD2BC3EB690018906C /* CNLiveShoph5ViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19B153CC2BC3EB690018906C /* CNLiveShoph5ViewModel.swift */; };
 		19B153CF2BC540FF0018906C /* CNLivePayOrderInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19B153CE2BC540FF0018906C /* CNLivePayOrderInfoModel.swift */; };
+		19B153D22BC623980018906C /* CNLiveShopPayNeedPaymentCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19B153D12BC623980018906C /* CNLiveShopPayNeedPaymentCell.swift */; };
+		19B153D42BC623BE0018906C /* CNLiveShopPayWeChatAlipayCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19B153D32BC623BE0018906C /* CNLiveShopPayWeChatAlipayCell.swift */; };
 		19BB1FDF2AEA3A450094D962 /* CNSlideBaseNavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19BB1FDE2AEA3A450094D962 /* CNSlideBaseNavigationController.swift */; };
 		19BB1FE12AEB5C220094D962 /* CNLiveShopConsoleController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19BB1FE02AEB5C220094D962 /* CNLiveShopConsoleController.swift */; };
 		19BB1FE32AEB8B7C0094D962 /* CNLiveShopConsoleViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19BB1FE22AEB8B7C0094D962 /* CNLiveShopConsoleViewModel.swift */; };
@@ -385,6 +387,8 @@
 		19B153CA2BC3E1870018906C /* CNLiveShopPayController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopPayController.swift; sourceTree = "<group>"; };
 		19B153CC2BC3EB690018906C /* CNLiveShoph5ViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShoph5ViewModel.swift; sourceTree = "<group>"; };
 		19B153CE2BC540FF0018906C /* CNLivePayOrderInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLivePayOrderInfoModel.swift; sourceTree = "<group>"; };
+		19B153D12BC623980018906C /* CNLiveShopPayNeedPaymentCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopPayNeedPaymentCell.swift; sourceTree = "<group>"; };
+		19B153D32BC623BE0018906C /* CNLiveShopPayWeChatAlipayCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopPayWeChatAlipayCell.swift; sourceTree = "<group>"; };
 		19BB1FDE2AEA3A450094D962 /* CNSlideBaseNavigationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNSlideBaseNavigationController.swift; sourceTree = "<group>"; };
 		19BB1FE02AEB5C220094D962 /* CNLiveShopConsoleController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopConsoleController.swift; sourceTree = "<group>"; };
 		19BB1FE22AEB8B7C0094D962 /* CNLiveShopConsoleViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopConsoleViewModel.swift; sourceTree = "<group>"; };
@@ -857,6 +861,7 @@
 				191733402B284D4A007BCC04 /* ShopCoupon */,
 				19565ED02AF8D904007D6727 /* GoodsManager */,
 				1938BD4D2B512F4600390A34 /* ShopDetail */,
+				19B153D02BC623780018906C /* Shoph5Pay */,
 			);
 			path = Shop;
 			sourceTree = "<group>";
@@ -975,6 +980,15 @@
 			path = ShopPayController;
 			sourceTree = "<group>";
 		};
+		19B153D02BC623780018906C /* Shoph5Pay */ = {
+			isa = PBXGroup;
+			children = (
+				19B153D12BC623980018906C /* CNLiveShopPayNeedPaymentCell.swift */,
+				19B153D32BC623BE0018906C /* CNLiveShopPayWeChatAlipayCell.swift */,
+			);
+			path = Shoph5Pay;
+			sourceTree = "<group>";
+		};
 		19BB1FE42AEB93850094D962 /* Model */ = {
 			isa = PBXGroup;
 			children = (
@@ -1805,6 +1819,7 @@
 				79BB1C162B05C62900C5720C /* CNLiveShopBodyCouponView.swift in Sources */,
 				798916E92B04532D00D08302 /* CNLiveSavePointDB.swift in Sources */,
 				1938BD242B468AC900390A34 /* CNLivePlayletHomePageHeaderCell.swift in Sources */,
+				19B153D42BC623BE0018906C /* CNLiveShopPayWeChatAlipayCell.swift in Sources */,
 				19FA20172AE22D3C001F7186 /* CNLiveDownSlideRecommendCell.swift in Sources */,
 				19123FC12ABC11170075C883 /* CNWebViewController.swift in Sources */,
 				1926C28F2AE0D76C00C71DC3 /* CNLiveDownSlideViewModel.swift in Sources */,
@@ -1880,6 +1895,7 @@
 				1938BD222B467C1700390A34 /* CNLivePlayletHomePageCell.swift in Sources */,
 				1938BD3F2B4BE7C500390A34 /* CNLiveAlbumMsgModel.swift in Sources */,
 				798A44FF2A30A0A800815935 /* CNLiveInputFeedBackViewController.swift in Sources */,
+				19B153D22BC623980018906C /* CNLiveShopPayNeedPaymentCell.swift in Sources */,
 				79282A442A2F1C1E00B5F8CF /* CNLiveLoginAuthView.swift in Sources */,
 				19B153CD2BC3EB690018906C /* CNLiveShoph5ViewModel.swift in Sources */,
 				79BB96A62AF21E2800AEA4AC /* CNLiveShopOrderDetailViewController.swift in Sources */,
@@ -505,6 +505,7 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
         let identityModel = dataArray[toIndex] as! StandListModel
         if let toBannerView =  self.pageFlowView.cells[toIndex] as? CNCustomIndexView{
+            self.pageFlowView.scrollView.bringSubviewToFront(toBannerView)
             UIView.animate(withDuration: 0.2) {
                 toBannerView.downSlideView.frame = CGRectMake(-LeftGap, 0, KSreenWidth, KSreenHeight)
                 toBannerView.downSlideView.upSlideVC.view.height = KSreenHeight-DownSlideBottomViewHeight
@@ -515,32 +516,22 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
             }
         }
-        if let toBannerViewLeftView =  self.pageFlowView.cells[toIndex-1] as? CNCustomIndexView{
-            UIView.animate(withDuration: 0.2) {
-                toBannerViewLeftView.downSlideView.frame = CGRectMake(-LeftGap, 0, 0, 0)
-                toBannerViewLeftView.upSlideView.frame = CGRectMake(-LeftGap, KSreenHeight*2,0, 0)
+        if toIndex-1 >= 0{
+            if let toBannerViewLeftView =  self.pageFlowView.cells[toIndex-1] as? CNCustomIndexView{
+                UIView.animate(withDuration: 0.2) {
+                    toBannerViewLeftView.downSlideView.frame = CGRectMake(-LeftGap, 0, 0, 0)
+                    toBannerViewLeftView.upSlideView.frame = CGRectMake(-LeftGap, KSreenHeight*2,0, 0)
+                }
             }
         }
-        if let toBannerViewRightView =  self.pageFlowView.cells[toIndex+1] as? CNCustomIndexView{
-            UIView.animate(withDuration: 0.2) {
-                toBannerViewRightView.downSlideView.frame = CGRectMake(-LeftGap, 0, 0, 0)
-                toBannerViewRightView.upSlideView.frame = CGRectMake(-LeftGap, KSreenHeight*2,0, 0)
+        if toIndex+1 < self.pageFlowView.cells.count{
+            if let toBannerViewRightView =  self.pageFlowView.cells[toIndex+1] as? CNCustomIndexView{
+                UIView.animate(withDuration: 0.2) {
+                    toBannerViewRightView.downSlideView.frame = CGRectMake(-LeftGap, 0, 0, 0)
+                    toBannerViewRightView.upSlideView.frame = CGRectMake(-LeftGap, KSreenHeight*2,0, 0)
+                }
             }
         }
-        
-//        for (idx,obj) in self.pageFlowView.cells.enumerated(){
-//            let bannerView = obj as? CNCustomIndexView
-//            if idx == toIndex{
-//                bannerView?.downSlideView.frame = CGRectMake(-LeftGap, 0, KSreenWidth, KSreenHeight)
-//                bannerView?.downSlideView.upSlideVC.view.height = KSreenHeight-DownSlideBottomViewHeight
-//                bannerView?.downSlideView.shopConsoleVC.view.height = KSreenHeight-DownSlideBottomViewHeight
-//                
-//                bannerView?.upSlideView.frame = CGRectMake(-LeftGap, KSreenHeight*2,KSreenWidth, KSreenHeight)
-//            }else{
-//                bannerView?.downSlideView.frame = CGRectMake(-LeftGap, 0, 0, 0)
-//                bannerView?.upSlideView.frame = CGRectMake(-LeftGap, KSreenHeight*2,0, 0)
-//            }
-//        }
     }
@@ -397,7 +397,9 @@ class CNUpSlideViewController: CNLiveBaseViewController,UITableViewDelegate,UITa
                     //没有我的课程
                     self.myCurriculumIndex = -1
                 }
-                self.dataArray.insert(albumBaseModel, at: self.myCurriculumIndex)
+                if self.myCurriculumIndex > -1{
+                    self.dataArray.insert(albumBaseModel, at: self.myCurriculumIndex)
+                }
                 self.tableView.reloadData()
             }else if (status == .failed){
 //                self.NetApiStatus = .apiError
@@ -6,14 +6,61 @@
 //  支付页面
 import Foundation
+import CNLivePayCostModule
+
+///支付类型
+enum CNLivePayType {
+    //支付宝
+    case alipay
+    //微信
+    case weChat
+}
+//支付状态
+enum CNLivePayResult {
+    //成功
+    case success
+    //失败
+    case failure
+    //取消支付
+    case cancel
+}
 //支付完成回调
-typealias FinishPayCallBack = (_ testStr:String)->Void//_ orderInfoModel:CNLivePayOrderInfoModel
+typealias FinishPayCallBack = (_ orderInfoModel:CNLivePayOrderInfoModel,_ payType:CNLivePayType,_ payResult:CNLivePayResult)->Void
-class CNLiveShopPayController:CNLiveBaseViewController{
+class CNLiveShopPayController:CNLiveBaseViewController,UITableViewDelegate,UITableViewDataSource{
     var finishPayCallBack:FinishPayCallBack?
     var orderNumber:String
+    var orderInfoModel:CNLivePayOrderInfoModel?
+    var currentSeleWechat = true
+    var payType:CNLivePayType?
+    
+    let kCNLiveShopPayNeedPaymentCellIdentifier = "kCNLiveShopPayNeedPaymentCellIdentifier"
+    let kCNLiveShopPayWeChatAlipayCellIdentifier = "kCNLiveShopPayWeChatAlipayCellIdentifier"
+    
+    // MARK: - 懒加载
+    lazy var tableView : UITableView = {
+        let tableView = UITableView(frame: CGRect(x: 0, y: KNavigationHeight, width: KSreenWidth, height: KSreenHeight-KNavigationHeight-KTabBarHeight), style: .plain)
+        tableView.dataSource = self
+        tableView.delegate = self
+        tableView.separatorStyle = .singleLine
+        tableView.tableFooterView = UIView.init()
+        tableView.register(CNLiveShopPayNeedPaymentCell.self, forCellReuseIdentifier: kCNLiveShopPayNeedPaymentCellIdentifier)
+        tableView.register(CNLiveShopPayWeChatAlipayCell.self, forCellReuseIdentifier: kCNLiveShopPayWeChatAlipayCellIdentifier)
+        return tableView
+    }()
+    
+    lazy var payBtn: UIButton = {
+        let  payBtn = UIButton(type: .custom)
+        payBtn.frame = CGRect(x: 0, y: self.tableView.bottom, width: KSreenWidth, height: KTabBarHeight)
+        payBtn.backgroundColor = UIColor(red:0.29, green:0.64, blue:0.25, alpha:1.00)
+        payBtn.setTitleColor(.white, for: .normal)
+        payBtn.setTitle("支付", for: .normal)
+        payBtn.addTarget(self, action: #selector(payBtnAction), for: .touchUpInside)
+        return payBtn
+    }()
+
     init(orderNumber:String) {
         self.orderNumber = orderNumber
@@ -24,6 +71,10 @@ class CNLiveShopPayController:CNLiveBaseViewController{
         fatalError("init(coder:) has not been implemented")
     }
+    deinit {
+        NotificationCenter.default.removeObserver(self, name: UIApplication.didBecomeActiveNotification, object: nil)
+    }
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         navigationBarHidden = false
@@ -31,6 +82,26 @@ class CNLiveShopPayController:CNLiveBaseViewController{
         self.view.backgroundColor = .white
         NotificationCenter.default.addObserver(self, selector: #selector(didBecomeActiveNotification(_:)), name: UIApplication.didBecomeActiveNotification, object: nil)
         self.getOrderInfoMessage()
+        self.initUI()
+        if WXApi.isWXAppInstalled(){
+            print("wx已安装")
+        }else{
+            print("wx未安装")
+        }
+        let urlScheme = "alipay"
+        if UIApplication.shared.canOpenURL(URL(string: urlScheme)!) {
+            print("已安装")
+        } else {
+            print("未安装")
+        }
+        let wxUrlScheme = "weixin://"
+        if UIApplication.shared.canOpenURL(URL(string: urlScheme)!) {
+            print("已安装")
+        } else {
+            print("未安装")
+        }
+        
+        
     }
     // MARK: - 获取订单信息 并且进行检测
     func getOrderInfoMessage(){
@@ -39,8 +110,65 @@ class CNLiveShopPayController:CNLiveBaseViewController{
         }
         showLoading(message: "")
         CNLiveShoph5ViewModel.postOrderPayWithParams(orderId: self.orderNumber) { result, status in
+            hiddenLoading()
             if status == .success{
-                
+                let orderInfoModel = result as! CNLivePayOrderInfoModel
+                self.orderInfoModel = orderInfoModel
+                self.tableView.reloadData()
+            }else{
+            }
+        }
+        
+    }
+    
+    func initUI(){
+        self.view.addSubview(self.tableView)
+        self.view.addSubview(self.payBtn)
+    }
+    
+    @objc func payBtnAction(){
+        showLoading(message: "")
+        
+        let orderId = self.orderInfoModel?.orderId
+        var userId = self.orderInfoModel?.user_id
+        if userId?.count == 0{
+            userId = UserInfoManager.shared.userInfo.uid
+        }
+        let descStr = self.orderInfoModel?.body
+        let price = self.orderInfoModel?.totalMoney
+        let body = self.orderInfoModel?.body
+        let coupon_fee = self.orderInfoModel?.couponMoney
+        let notifyUrl = self.orderInfoModel?.notify_url
+        
+        let paramDict = NSMutableDictionary()
+        paramDict.setValue(orderId, forKey: "orderId")
+        paramDict.setValue(userId, forKey: "userId")
+        paramDict.setValue(descStr, forKey: "descStr")
+        paramDict.setValue(price, forKey: "price")
+        paramDict.setValue("1", forKey: "orderType")
+        paramDict.setValue("1", forKey: "type")
+        paramDict.setValue(body, forKey: "body")
+        paramDict.setValue(coupon_fee, forKey: "coupon_fee")
+        paramDict.setValue(notifyUrl, forKey: "notifyUrl")
+        paramDict.setValue("", forKey: "password")
+        
+        var payCostType:CNLivePayCostPayType?
+        if self.currentSeleWechat == true{
+            self.payType = .weChat
+            payCostType = CNLivePayCostPayTypeWeChatPay
+        }else{
+            self.payType = .alipay
+            payCostType = CNLivePayCostPayTypeAliPay
+        }
+        
+        CNLivePayCostModule.showShopPayViw(withParamDict: paramDict as! [String : Any], payType: payCostType!) { resultCode in
+            hiddenLoading()
+            if resultCode == 0{
+                self.checkPayIsSuccessful(lastCount: 5)
+            }else if resultCode == 3{
+                showMessage(message: "取消支付")
+            }else {
+                showMessage(message: "支付失败")
             }
         }
@@ -48,8 +176,107 @@ class CNLiveShopPayController:CNLiveBaseViewController{
     @objc func didBecomeActiveNotification(_ notification: Notification) {
         // 处理应用变得活跃的逻辑
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
+            // 这里写你想要在 0.5 秒后执行的代码
+            self.checkPayIsSuccessful(lastCount: 0)
+        }
+        
+    }
+    
+    // MARK: - 检测是否支付成功
+    /// 检测是否支付成功
+    /// @param lastCount 剩余检测次数
+    func checkPayIsSuccessful(lastCount:NSInteger){
+        showLoading(message: "")
+        CNLiveShoph5ViewModel.postIsOrderPayWithOrderId(orderId: self.orderNumber) { result, status in
+            hiddenLoading()
+            if status == .success{
+                self.finishPayCallBack?(self.orderInfoModel!, self.payType!, .success)
+//                NotificationCenter.default.post(name: <#T##NSNotification.Name#>, object: <#T##Any?#>)//kDSSuccessPayOrderNotification
+            }else{
+                if lastCount > 0{
+                    DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
+                        // 这里写你想要在 0.5 秒后执行的代码
+                        self.checkPayIsSuccessful(lastCount: lastCount-1)
+                    }
+                }
+            }
+        }
     }
+    // MARK: - UITableViewDelegate
+    func numberOfSections(in tableView: UITableView) -> Int {
+        2
+    }
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        if section == 0{
+            return 1
+        }else{
+            return 2
+        }
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        if indexPath.section == 0{
+            guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveShopPayNeedPaymentCellIdentifier) as? CNLiveShopPayNeedPaymentCell
+            else {
+                let cell = CNLiveShopPayNeedPaymentCell()
+                return cell
+            }
+            let monStr = String(format: "需要付款: ¥%.2f", (Double(self.orderInfoModel?.totalMoney ?? "0.00") ?? 0.00) / 100)
+            let attribute = NSMutableAttributedString.init(string:monStr)
+            let attIndex = 6
+            attribute.addAttributes([NSAttributedString.Key.foregroundColor: HexColor("#222222")!], range: NSRange.init(location: 0, length: attIndex))
+            attribute.addAttributes([NSAttributedString.Key.foregroundColor: UIColor(red:0.29, green:0.64, blue:0.25, alpha:1.00)], range: NSRange.init(location: attIndex, length: monStr.count-attIndex))
+            cell.titleLabel.attributedText = attribute
+            return cell
+        }else{
+            guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveShopPayWeChatAlipayCellIdentifier) as? CNLiveShopPayWeChatAlipayCell
+            else {
+                let cell = CNLiveShopPayWeChatAlipayCell()
+                return cell
+            }
+            if indexPath.row == 0{
+                //微信支付
+                cell.titleLabel.text = "微信支付"
+                cell.iconImgView.image = UIImage(named: "dd_weixin")
+                if self.currentSeleWechat == true{
+                    cell.selectImgView.isHidden = false
+                }else{
+                    cell.selectImgView.isHidden = true
+                }
+            }else{
+                //支付宝支付
+                cell.titleLabel.text = "支付宝支付"
+                cell.iconImgView.image = UIImage(named: "dd_zhifubao")
+                if self.currentSeleWechat == true{
+                    cell.selectImgView.isHidden = true
+                }else{
+                    cell.selectImgView.isHidden = false
+                }
+            }
+            return cell
+        }
+    }
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        if indexPath.section == 1{
+            if indexPath.row == 0{
+                if self.currentSeleWechat == true{
+                    return
+                }
+                self.currentSeleWechat = true
+            }else{
+                if self.currentSeleWechat == false{
+                    return
+                }
+                self.currentSeleWechat = false
+            }
+            self.tableView.reloadData()
+        }
+    }
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        return 60
+    }
 }
@@ -31,9 +31,18 @@ class CNWebView:UIView,WKNavigationDelegate, WKScriptMessageHandler{
         return cnWebView
     }()
-    var webUrl:URL?//初始URL
+    var _webUrl:URL?//初始URL
+    var webUrl:URL?{
+        get{
+            _webUrl
+        }set{
+            _webUrl = newValue!
+        }
+    }
+    
     var currentUrl:String = ""//当前网页的url
     var bridge:WKWebViewJavascriptBridge?
+    var customUserAgent:String = ""
     //CNWebController
     var isCNWebController:Bool = false//是否网页控制器
@@ -46,6 +55,12 @@ class CNWebView:UIView,WKNavigationDelegate, WKScriptMessageHandler{
         fatalError("init(coder:) has not been implemented")
     }
+    func loadUrl(url:String){
+        let urlStr = self.checkURLWithStr(urlStr: url)
+        self.currentUrl = urlStr
+        self.cnWebView.load(URLRequest.init(url:URL(string: urlStr)!))
+    }
+    
     init(frame: CGRect, configuration: WKWebViewConfiguration ,url:URL?) {
         super.init(frame: frame)
         self.configuration = configuration
@@ -57,6 +72,7 @@ class CNWebView:UIView,WKNavigationDelegate, WKScriptMessageHandler{
                 if !userAgent.contains(CNLiveMCEnvironmentManager.shared.base_web_UA) {
                     let newUserAgent = userAgent + CNLiveMCEnvironmentManager.shared.base_web_UA
                     self.cnWebView.customUserAgent = newUserAgent
+                    self.customUserAgent = newUserAgent
                     if (self.webUrl != nil){
                         let urlStr = self.checkURLWithStr(urlStr: self.webUrl!.absoluteString)
@@ -66,12 +82,6 @@ class CNWebView:UIView,WKNavigationDelegate, WKScriptMessageHandler{
                         self.configBridge()
                         self.configBridgeRegister()
                         self.webViewAddScriptMessageHandler()
-//                        if URL(string: urlStr)?.host == WjjH5 {
-//                            self.configBridgeRegister()
-//                            
-//                        }else if URL(string: urlStr)?.host == ManageshopH5 || URL(string: urlStr)?.host == ManagemallshopH5{
-//                            self.webViewAddScriptMessageHandler()
-//                        }
                     }
                 }
             }
@@ -120,12 +130,18 @@ class CNWebView:UIView,WKNavigationDelegate, WKScriptMessageHandler{
                 // 获取 payModel，如果不存在或者不是字符串类型，则使用默认值 "2"
 //                let payModel = (json["payModel"] as? String) ?? "2"
                 // 现在你可以使用 orderNumber 和 payModel 进行后续操作
-                print("orderNumber: \(orderNumber)")
                 let vc = CNLiveShopPayController(orderNumber: orderNumber)
-                vc.finishPayCallBack = { [weak self] testStr in
-                    print(testStr)
-                    self?.cnWebView.evaluateJavaScript(String(format: "appPaymentCallback('%@')", <#T##arguments: CVarArg...##CVarArg#>), completionHandler: { result, error in
-                        
+                vc.finishPayCallBack = { [weak self]  orderInfoModel ,payType ,payResult in
+                    let params = NSDictionary()
+                    params.setValue(orderInfoModel.toJSONString() ?? "", forKey: "orderInfo")
+                    params.setValue(payType.hashValue, forKey: "payType")
+                    params.setValue(payResult.hashValue, forKey: "payResult")
+                    
+                    let sparams = params.jsonString()
+                    let appPaymentCallbackJS = String(format: "appPaymentCallback('%@')", sparams ?? "")
+
+                    self?.cnWebView.evaluateJavaScript(appPaymentCallbackJS, completionHandler: { result, error in
+                        print("22222222appPaymentCallbackJS:\(result)")
                     })
                 }
                 // 跳转支付页面
+//
+//  CNLiveShopPayNeedPaymentCell.swift
+//  metaCode
+//
+//  Created by zx on 2024/4/10.
+//  电商h5支付 需要付款cell
+
+import Foundation
+
+class CNLiveShopPayNeedPaymentCell:UITableViewCell{
+    
+    lazy var titleLabel: UILabel = {
+        let titleLabel = UILabel.init(frame: CGRectMake(10, 0, KSreenWidth-20, 60))
+        titleLabel.textColor = UIColor(red:0.25, green:0.23, blue:0.28, alpha:1.00)
+        titleLabel.textAlignment = .left
+        titleLabel.font = Font_16
+        titleLabel.adjustsFontSizeToFitWidth=true
+        return titleLabel
+    }()
+
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        self.selectionStyle = .none
+        self.initUI()
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    // MARK: - initUI
+    func initUI(){
+        self.contentView.addSubview(self.titleLabel)
+    }
+}
+
+//
+//  CNLiveShopPayWeChatAlipayCell.swift
+//  metaCode
+//
+//  Created by zx on 2024/4/10.
+//  电商h5支付 微信支付宝cell
+
+import Foundation
+import SnapKit
+
+class CNLiveShopPayWeChatAlipayCell:UITableViewCell{
+    
+    lazy var selectImgView :UIImageView = {
+        let selectImgView = UIImageView(image: UIImage(named: "tsq_xz"))
+        return selectImgView
+    }()
+    
+    lazy var iconImgView :UIImageView = {
+        let iconImgView = UIImageView()
+        return iconImgView
+    }()
+
+    lazy var titleLabel: UILabel = {
+        let titleLabel = UILabel.init(frame: CGRectZero)
+        titleLabel.textColor = UIColor(red:0.04, green:0.02, blue:0.07, alpha:1.00)
+        titleLabel.textAlignment = .left
+        titleLabel.font = BoldFont_16
+        titleLabel.adjustsFontSizeToFitWidth=true
+        return titleLabel
+    }()
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        self.selectionStyle = .none
+        self.initUI()
+        self.layout()
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    // MARK: - initUI
+    func initUI(){
+        self.contentView.addSubview(self.titleLabel)
+        self.contentView.addSubview(self.iconImgView)
+        self.contentView.addSubview(self.selectImgView)
+        self.selectImgView.isHidden = true
+    }
+    func layout(){
+        self.iconImgView.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(10)
+            make.centerY.equalToSuperview()
+        }
+        self.titleLabel.snp.makeConstraints { make in
+            make.left.equalTo(self.iconImgView.snp.right).offset(20)
+            make.centerY.equalToSuperview()
+        }
+        self.selectImgView.snp.makeConstraints { make in
+            make.right.equalToSuperview().offset(-30)
+            make.centerY.equalToSuperview()
+        }
+    }
+}
@@ -96,6 +96,9 @@ class CNDownSlideView:UIView{
             if(type == UpDownTypeH5){
                 if _downPath?.count ?? 0 > 0{
                     self.addSubview(self.webView)
+                    if self.webView.cnWebView.url?.absoluteString.contains(_downPath) == false && self.webView.cnWebView.url != nil{
+                        self.webView.loadUrl(url: _downPath!)
+                    }
                 }
             }else if(type == UpDownTypePage){
                 self.addSubview(self.upSlideVC.view)
@@ -29,13 +29,13 @@ class CNUpSlideView:UIView{
         configuration.userContentController = WKUserContentController()
         var url:URL?
-        if (_downPath != ""){
-            url = URL.init(string: "https://managemall.cnlive.com/html/mall/1/#/pages/main/goodsList/goodsList?scene=app")//_downPath!)//
+        if (self.downPath != ""){
+            url = URL.init(string: _downPath!)//"https://managemall.cnlive.com/html/mall/1/#/pages/main/goodsList/goodsList?scene=app")//
         }else{
             url = nil
         }
-        let webView = CNWebView(frame: CGRectMake(10, KNavigationHeight+KStatusBarHeight+10, self.width - 20, self.height-KNavigationHeight-KStatusBarHeight-10), configuration: configuration,url: url)
+        let webView = CNWebView(frame: CGRectMake(10, KNavigationHeight+KStatusBarHeight+10, KSreenWidth - 20, KSreenHeight-KNavigationHeight-KStatusBarHeight-10), configuration: configuration,url: url)
         webView.cnWebView.scrollView.showsVerticalScrollIndicator = false
         webView.cnWebView.scrollView.showsHorizontalScrollIndicator = false
         webView.cnWebView.backgroundColor = .clear
@@ -78,9 +78,14 @@ class CNUpSlideView:UIView{
                 view.removeFromSuperview()
             }
             if(type == UpDownTypeH5){
-                self.addSubview(self.webView)
-            }
-            else if(type == UpDownTypePage){
+//                _downPath = "https://manageshop.cnlive.com/html/mall/1/#/pages/main/detail/detail?id=9526907&share_mold=shop&share_uid=c7KtcyWyXy7yMGCUPWuaUQ%3D%3D&shop_type=f8Ug%2BT1YxNKjy5QcYX4XlQ%3D%3D&shop_to=HNWMXVEMCtRetyucYELQtqg80ZoCVAAx%2B2jJIJuozJLTuJhb2vXeootObdZsz43yjHZNxKqF0WsT9mICYb0zHjo4STMRuQrSWYMkFzT4EQlgQS1%2BX%2FeCQ0jmkT2n4aZ9bShTP%2BB3nLDm%2BfHeBnfRpIEuEl3l9sXHnXc4p%2BcxciI%3D&shop_shop_type=f8Ug%2BT1YxNKjy5QcYX4XlQ%3D%3D&mall_share_type=2&price=0.01&originalPrice=0.00&shopShareType=1&wjjshopType=cnliveShopCar"
+                if _downPath?.count ?? 0 > 0{
+                    self.addSubview(self.webView)
+                    if self.webView.cnWebView.url?.absoluteString.contains(_downPath) == false && self.webView.cnWebView.url != nil{
+                        self.webView.loadUrl(url: _downPath!)
+                    }
+                }
+            }else if(type == UpDownTypePage){
             }else if(type == UpDownTypeShopDetail){
                 currentViewController()?.addChild(self.upSlideVC)//看行不行
@@ -68,4 +68,34 @@ class CNLiveShoph5ViewModel:NSObject{
         }
     }
+    /**
+     请求订单是否支付成功
+     
+     @param orderId 订单号
+     @param result 结果 //dic: NSString * score, NSString * desc
+     */
+    static func postIsOrderPayWithOrderId(orderId:String,resultBlock: @escaping downSlideResultBlock) {
+        
+        let param = NSMutableDictionary()
+        param.setValue(orderId, forKey: "orderId")
+        
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.setupDSRequest(true)
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(CNLiveMCEnvironmentManager.shared.appId_wjj, forKey: "appId")
+        custom_param.setValue(CNLiveMCEnvironmentManager.shared.appKey_wjj, forKey: "appKey")
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
+        CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseWjjShopUrl+"/Api/Index3/isOrderPay", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
+            hiddenLoading()
+            let resp = result as! NSDictionary
+            let dataDic = resp["data"] as! NSDictionary
+            let code = resp["code"] as? String
+            if (code == "200") {
+                resultBlock(dataDic,.success)
+            }else{
+                resultBlock(NSNull(),.failed)
+            }
+        }
+    }
 }
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "dd_weixin@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "dd_weixin@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "dd_zhifubao@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "dd_zhifubao@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "tsq_xz@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "tsq_xz@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}