添加物流详情及注销账号

liushiyu
1 parent 5400af31
Showing 12 changed files with 395 additions and 36 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Main/MinePage/Controller/CNLiveInfoShowViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineShopViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineSignOutViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveTypeFeedBackViewController.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineViewModel.swift
metaCode/Classes/Main/ShopPage/Controller/CNLiveShopOrderDetailViewController.swift
metaCode/Classes/Main/ShopPage/Controller/CNLiveShopOrderExpressDetailViewController.swift
metaCode/Classes/Main/ShopPage/Controller/CNLiveShopOrderListViewController.swift
metaCode/Classes/Main/ShopPage/View/CNLiveShopBodyExpressView.swift
metaCode/Classes/Other/AppDelegate.swift
@@ -112,6 +112,7 @@
 		79BB96AA2AF2330900AEA4AC /* CNLiveShopBodyDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79BB96A92AF2330900AEA4AC /* CNLiveShopBodyDetailView.swift */; };
 		79E496E32AB9357000127BF8 /* UITableViewCell+CNLiveExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79E496E22AB9357000127BF8 /* UITableViewCell+CNLiveExtension.swift */; };
 		79E496E82AB9674300127BF8 /* NSMutableAttributedString+CNLiveExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79E496E72AB9674300127BF8 /* NSMutableAttributedString+CNLiveExtensions.swift */; };
+		79E672032AFDFA9C00F2F768 /* CNLiveMineSignOutViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79E672022AFDFA9C00F2F768 /* CNLiveMineSignOutViewController.swift */; };
 		79EABB892AB4497700F3A4E2 /* CNLiveSaveStandDB.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79EABB882AB4497700F3A4E2 /* CNLiveSaveStandDB.swift */; };
 		79F4B1162A32B96B00993C03 /* CNLiveMineInfoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79F4B1152A32B96B00993C03 /* CNLiveMineInfoViewController.swift */; };
 		79F4B11A2A32F21400993C03 /* CNLiveMineNickViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79F4B1192A32F21400993C03 /* CNLiveMineNickViewController.swift */; };
@@ -276,6 +277,7 @@
 		79BB96A92AF2330900AEA4AC /* CNLiveShopBodyDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopBodyDetailView.swift; sourceTree = "<group>"; };
 		79E496E22AB9357000127BF8 /* UITableViewCell+CNLiveExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UITableViewCell+CNLiveExtension.swift"; sourceTree = "<group>"; };
 		79E496E72AB9674300127BF8 /* NSMutableAttributedString+CNLiveExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSMutableAttributedString+CNLiveExtensions.swift"; sourceTree = "<group>"; };
+		79E672022AFDFA9C00F2F768 /* CNLiveMineSignOutViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineSignOutViewController.swift; sourceTree = "<group>"; };
 		79EABB882AB4497700F3A4E2 /* CNLiveSaveStandDB.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveSaveStandDB.swift; sourceTree = "<group>"; };
 		79F4B1152A32B96B00993C03 /* CNLiveMineInfoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineInfoViewController.swift; sourceTree = "<group>"; };
 		79F4B1192A32F21400993C03 /* CNLiveMineNickViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineNickViewController.swift; sourceTree = "<group>"; };
@@ -517,6 +519,7 @@
 				79656E372AAEBA8E00119A61 /* CNLiveMineInputViewController.swift */,
 				7905BB482AB0588B0089BC50 /* CNLiveMineAuthResultViewController.swift */,
 				79803E262AD68D3100F05F68 /* CNLiveMineShopViewController.swift */,
+				79E672022AFDFA9C00F2F768 /* CNLiveMineSignOutViewController.swift */,
 			);
 			path = Controller;
 			sourceTree = "<group>";
@@ -1147,6 +1150,7 @@
 				19D2CE632AE8B65D00691757 /* CNLiveDownSlideTool.swift in Sources */,
 				790B1FB82A41B6A60074CF00 /* CNLiveMineMessageViewController.swift in Sources */,
 				19BB202B2AF382150094D962 /* CNLiveAdaptTool.swift in Sources */,
+				79E672032AFDFA9C00F2F768 /* CNLiveMineSignOutViewController.swift in Sources */,
 				19565ECD2AF8D256007D6727 /* CNLiveShopGoodsListClassifyView.swift in Sources */,
 				798A44F22A30674200815935 /* CNLiveMineSubBodyListView.swift in Sources */,
 				799172382AF090CD00DC01A8 /* CNLiveShopBodyListView.swift in Sources */,
@@ -13,6 +13,7 @@ enum ListShowInfoType {
     case privacy
     case yinsi
     case safety
+    case cancel
 }
 class CNLiveInfoShowViewController: CNLiveBaseViewController, WKNavigationDelegate, WKUIDelegate {
@@ -68,6 +69,9 @@ class CNLiveInfoShowViewController: CNLiveBaseViewController, WKNavigationDelega
             case .safety:
                 titleName = "内容安全协议"
                 attrString = "https://wjj.ys1.cnliveimg.com/term/cnBNraqxy.html"
+            case .cancel:
+                titleName = "账号注销须知"
+                attrString = "https://wjjh5.cnlive.com/yuanmaLogout.html"
             case .none:
                 break
             }
@@ -408,7 +408,6 @@ class CNLiveMineShopViewController : CNLiveBaseViewController, UITextViewDelegat
                     self.navigationController?.pushViewController(CNLiveMineAuthResultViewController.init(StandListModel.init(), show_type: .detail_shop), animated: true)
                 }
             } else {
-                self.navigationController
             }
         })
     }
+//
+//  CNLiveMineSignOutViewController.swift
+//  metaCode
+//
+//  Created by open on 2023/11/10.
+//
+
+import Foundation
+import WebKit
+import APButton
+
+class CNLiveMineSignOutViewController: CNLiveBaseViewController, WKNavigationDelegate, WKUIDelegate, UITextViewDelegate {
+    
+    lazy var webView: WKWebView = {
+        let config = WKWebViewConfiguration.init()
+        config.preferences = WKPreferences()
+        config.preferences.javaScriptEnabled = true
+        config.preferences.javaScriptCanOpenWindowsAutomatically = false
+        config.userContentController = WKUserContentController.init()
+        
+        let userController = WKUserContentController.init()
+        let js = "var script = document.createElement('meta'); script.name = 'viewport'; script.content=\"width=device-width, initial-scale=1.0,maximum-scale=1.0, minimum-scale=1.0, user-scalable=no\"; document.getElementsByTagName('div')[0].appendChild(script);"
+        let script = WKUserScript.init(source: js, injectionTime: .atDocumentEnd, forMainFrameOnly: false)
+        
+        let javascript = NSMutableString.init()
+        javascript.append("document.documentElement.style.webkitTouchCallout='none';")
+        javascript.append("document.documentElement.style.webkitUserSelect='none';")
+        let noneSelectScript = WKUserScript.init(source: javascript as String, injectionTime: .atDocumentEnd, forMainFrameOnly: true)
+        userController.addUserScript(script)
+        userController.addUserScript(noneSelectScript)
+        config.userContentController = userController
+        
+        let webView = WKWebView.init(frame: CGRect.zero, configuration: config)
+        webView.navigationDelegate = self
+        webView.uiDelegate = self
+        webView.scrollView.bounces = false
+        webView.scrollView.showsVerticalScrollIndicator = false
+        webView.scrollView.showsHorizontalScrollIndicator = false
+        webView.load(URLRequest.init(url: URL(string: "https://wjjh5.cnlive.com/yuanmaLogoutApplication.html")!))
+        return webView
+    }()
+    
+    lazy var selectButton: HotButton = {
+        let selectButton = HotButton(type: .custom)
+        selectButton.backgroundColor = .clear
+        selectButton.setImage(UIImage(named: "Login_body_choose_btn_nomal"), for: .normal)
+        selectButton.setImage(UIImage(named: "Login_body_choose_btn_nomal"), for: .highlighted)
+        selectButton.setImage(UIImage(named: "Login_body_choose_btn_select"), for: .selected)
+        selectButton.contentMode = .scaleAspectFill
+        selectButton.addTarget(self, action: #selector(changeSelectBtnMothod), for: .touchUpInside)
+        return selectButton
+    }()
+    
+    lazy var textView: UITextView = {
+        let attributedString = NSMutableAttributedString(string: "我已阅读并同意《注销协议》",
+                                                         attributes: [.foregroundColor: HexColor("#999999") as Any, .font: regular_adapt_font(pointSize: 12)])
+        let p_Range = NSRange(attributedString.string.range(of: "《注销协议》")!, in: attributedString.string)
+        attributedString.addAttribute(.link, value: "delegate://", range: p_Range)
+        let textView: UITextView = UITextView.init()
+        textView.backgroundColor = .clear
+        textView.isEditable = false
+        textView.isScrollEnabled = false
+        textView.delegate = self
+        textView.attributedText = attributedString
+        return textView
+    }()
+    
+    lazy var doneButton: APButton = {
+        let doneButton = APButton()
+        doneButton.setTitle("确认注销", for: .normal)
+        doneButton.setTitleColor(.white, for: .normal)
+        doneButton.titleLabel?.font = BoldFont_16_Fit
+        doneButton.layer.cornerRadius = adapt_length(length: 20)
+        doneButton.activityIndicator.color = .white
+        doneButton.layer.masksToBounds = true
+        doneButton.addTarget(self, action: #selector(sendDoneActionMothod), for: .touchUpInside)
+        return doneButton
+    }()
+    
+    var is_agree: Bool!
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        navigationBarHidden = false
+        view.backgroundColor = .white
+        titleName = "审核申请"
+        
+        view.addSubview(webView)
+        webView.snp.makeConstraints { make in
+            make.top.equalToSuperview().offset(KNavigationHeight)
+            make.right.left.equalToSuperview()
+            make.bottom.equalToSuperview().offset(-adapt_length(length: 110) + get_system_tabbar_ui_offsetHeight())
+        }
+        
+        view.addSubview(doneButton)
+        doneButton.snp.makeConstraints { make in
+            make.centerX.equalToSuperview()
+            make.bottom.equalToSuperview().offset(-(get_system_tabbar_ui_offsetHeight()+adapt_length(length: 10)))
+            make.left.equalToSuperview().offset(adapt_length(length: 20))
+            make.right.equalToSuperview().offset(-adapt_length(length: 20))
+            make.height.equalTo(adapt_length(length: 40))
+        }
+        
+        view.addSubview(textView)
+        textView.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(adapt_length(length: 40))
+            make.bottom.equalTo(doneButton.snp.top).offset(-adapt_length(length: 10))
+            make.right.equalToSuperview().offset(-adapt_length(length: 20))
+        }
+        
+        view.addSubview(selectButton)
+        selectButton.snp.makeConstraints { make in
+            make.centerY.equalTo(textView)
+            make.left.equalToSuperview().offset(adapt_length(length: 20))
+            make.size.equalTo(adapt_length(length: 25))
+        }
+        
+        doneButton.setGradient(colors: [UIColor(red: 103/255.0, green: 197/255.0, blue: 255/255.0, alpha: 0.3),UIColor(red: 96/255.0, green: 154/255.0, blue: 255/255.0, alpha: 0.3)], startPoint: CGPoint(x: 0, y: 0.5), endPoint: CGPoint(x: 1, y: 0.5))
+    }
+    
+    @objc func changeSelectBtnMothod(sender : UIButton) {
+        sender.isSelected = !sender.isSelected
+        is_agree = sender.isSelected
+        if is_agree {
+            doneButton.setGradient(colors: [UIColor(red: 103/255.0, green: 197/255.0, blue: 255/255.0, alpha: 1),UIColor(red: 96/255.0, green: 154/255.0, blue: 255/255.0, alpha: 1)], startPoint: CGPoint(x: 0, y: 0.5), endPoint: CGPoint(x: 1, y: 0.5))
+        } else {
+            doneButton.setGradient(colors: [UIColor(red: 103/255.0, green: 197/255.0, blue: 255/255.0, alpha: 0.3),UIColor(red: 96/255.0, green: 154/255.0, blue: 255/255.0, alpha: 0.3)], startPoint: CGPoint(x: 0, y: 0.5), endPoint: CGPoint(x: 1, y: 0.5))
+        }
+    }
+    
+    private func setupWithSendBtnStatue(statue: Bool) {
+        var alpha = 0.3
+        if statue {
+            alpha = 1
+        }
+        doneButton.setGradient(colors: [UIColor(red: 103/255.0, green: 197/255.0, blue: 255/255.0, alpha: alpha),UIColor(red: 96/255.0, green: 154/255.0, blue: 255/255.0, alpha: alpha)], startPoint: CGPoint(x: 0, y: 0.5), endPoint: CGPoint(x: 1, y: 0.5))
+    }
+    
+    @objc func sendDoneActionMothod(sender: APButton) {
+        if !is_agree {
+            showMessage(message: "请先阅读并同意协议")
+            return
+        }
+        AlertTool.showSystemAlert(title: "注销将会清除您在元码上的个人信息和购买的所有权益，且不可恢复，确定注销吗？", message: "", actionTitles: ["确定","取消"], style: .alert) { index in
+            if index == 1 {
+                sender.startAnimating()
+                CNLiveMineViewModel.requestSignOut { [weak self] result, respStatue in
+                    sender.stopAnimating()
+                    if respStatue == .success {
+                        let message = result as! String
+                        if message == "455" {
+                            showMessage(message: "账号已经在注销中，请等待")
+                            self!.navigationController?.popViewController(animated: true)
+                        } else {
+                            UserDefaults.standard.set(false,forKey: "is_login")
+                            UserInfoManager.clearUserInfo()
+                            let window = UIApplication.shared.delegate?.window
+                            window??.rootViewController = CNLiveLoginViewController.init()
+                        }
+                    }
+                }
+            }
+        }
+    }
+    
+    func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
+        hiddenLoading()
+    }
+    
+    func webView(_ webView: WKWebView, didFail navigation: WKNavigation!, withError error: Error) {
+        loadHTMLString()
+        hiddenLoading()
+    }
+    
+    func loadHTMLString() {
+        let htmlContent = "<div style=\"padding:0 5px;\"><p style=\"font-size:1.0625em;\"><strong>我们对你注销元码账号的决定深表遗憾。如果你仍执意注销账号，你的账号需同时满足以下条件：</strong></p><hr style=\"background-color:#EEEEEE;height:1px;border:none;\"/><p style=\"font-size:1em;\">1.账号处于安全状态： 最近1个月内无绑定手机/修改手机号、无找回密码/修改密码等操作，账号为正常使用中且在1年内无任何账号被限制的记录。</p><hr style=\"background-color:#EEEEEE;height:1px;border:none;\"/><p style=\"font-size:1em;\">2.账号财产已结清，没有未完成和/或存在争议的服务： 账号中没有资产、欠款、未结清的资金和虚拟权益；本账号及通过本账号接入的第三方中没有未完成和/或存在争议的服务。</p><hr style=\"background-color:#EEEEEE;height:1px;border:none;\"/><p style=\"font-size:1em;\">3.账号权限解除： 账号已解除与其他产品、网站授权登录或绑定关系。</p><hr style=\"background-color:#EEEEEE;height:1px;border:none;\"/><p style=\"font-size:1em;\">4.账号无任何纠纷，包括投诉举报或被投诉举报。</p></div>"
+        webView.loadHTMLString(htmlContent, baseURL: URL(string: ""))
+    }
+}
+extension CNLiveMineSignOutViewController {
+    func textView(_ textView: UITextView, shouldInteractWith textAttachment: NSTextAttachment, in characterRange: NSRange, interaction: UITextItemInteraction) -> Bool {
+        return false
+    }
+    func textView(_ textView: UITextView, shouldInteractWith URL: URL, in characterRange: NSRange, interaction: UITextItemInteraction) -> Bool {
+        if URL.absoluteString == "delegate://" {
+            self.navigationController?.pushViewController(CNLiveInfoShowViewController.init(show_type: .cancel, is_login: true), animated: true)
+            return false
+        }
+        return true
+    }
+}
@@ -46,7 +46,7 @@ class CNLiveMineViewController : CNLiveBaseViewController, UITableViewDelegate, 
         dataArray.add(array03)
-        dataArray.add([["name":"订单列表","icon":"mine_list_icon_help_feedback"]])
+//        dataArray.add([["name":"订单列表","icon":"mine_list_icon_help_feedback"]])
         return dataArray
@@ -45,6 +45,7 @@ class CNLiveTypeFeedBackViewController : CNLiveBaseViewController, UITableViewDe
         if _show_type == .setting {
             dataArray.add(["icon":"mine_list_sub_set_privacy","name":"隐私"])
             dataArray.add(["icon":"mine_list_sub_set_about","name":"关于我们"])
+            dataArray.add(["icon":"mine_list_sub_set_about","name":"注销账号"])
         }
         if _show_type == .privacy {
             dataArray.add(["icon":"","name":"系统权限管理"])
@@ -276,6 +277,9 @@ extension CNLiveTypeFeedBackViewController {
             if indexPath.section == 1 {
                 self.navigationController?.pushViewController(CNLiveTypeFeedBackViewController.init(show_type: .about), animated: true)
             }
+            if indexPath.section == 2 {
+                self.navigationController?.pushViewController(CNLiveMineSignOutViewController.init(), animated: true)
+            }
         }
         if _show_type == .privacy {
             if indexPath.section == 0 {
@@ -938,6 +938,43 @@ class CNLiveMineViewModel: NSObject {
         }
     }
+    /// 注销账号
+    /// - Parameter resultBlock: 返回结果
+    static func requestSignOut(resultBlock: @escaping resultNewsBlock) {
+        let param = NSMutableDictionary()
+        param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "loginSid")
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(APPId_wjj, forKey: "appId")
+        custom_param.setValue(APPKey_wjj, forKey: "appKey")
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.setupSignRequestKey(APPKey_wjj)
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
+        CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseWjjUrl+"/Daren/common/cancellationAccount.action", param: (param as! [AnyHashable : Any]), cacheType: .networkOnly) { task, result, error in
+            hiddenLoading()
+            if (error == nil) {
+                let resp = result as! NSDictionary
+                let errorCode = "\(resp["errorCode"] ?? "0")"
+                if (errorCode == "0") {
+                    resultBlock("提交成功",.success)
+                } else if (errorCode == "455") {
+                    resultBlock("455",.success)
+                } else {
+                    showMessage(message: resp["errorMessage"] as! String)
+                    resultBlock(NSNull(),.failed)
+                }
+            } else {
+                if CNLiveNetworking.isNetworking() {
+                    showMessage(message: "获取失败")
+                    resultBlock(NSNull(),.failed)
+                } else {
+                    showMessage(message: "似乎与网络断开链接")
+                    resultBlock(NSNull(),.noNetwork)
+                }
+            }
+        }
+    }
+    
     static func log(resp: Any) {
         do {
             let jsonData = try JSONSerialization.data(withJSONObject: resp, options: .prettyPrinted)
@@ -197,7 +197,7 @@ extension CNLiveShopOrderDetailViewController {
         if detailModel.send_num > 1 || detailModel.is_send == "0" {
             self.navigationController?.pushViewController(CNLiveShopOrderExpressListViewController.init(orderId: detailModel.id! as NSString), animated: true)
         } else {
-
+            self.navigationController?.pushViewController(CNLiveShopOrderExpressDetailViewController.init(orderId: "1000021749", expId: "0", express_num: "1234556789012345", show_type: .orderExpress, progress: .Zero), animated: true)
         }
     }
@@ -18,17 +18,17 @@ enum CNLiveShopOrderExpressDetailYBYProgress {
 }
 class CNLiveShopOrderExpressDetailViewController: CNLiveBaseViewController, UITableViewDelegate, UITableViewDataSource, EmptyDataSetSource, EmptyDataSetDelegate {
-
+    let kShopBodyOrderExpressDetailTableViewCellIdentifier = "kShopBodyOrderExpressDetailTableViewCellIdentifier"
     lazy var tableView : UITableView = {
         let tableView = UITableView(frame: .zero, style: .plain)
         tableView.dataSource = self
         tableView.delegate = self
         tableView.emptyDataSetSource = self
         tableView.emptyDataSetDelegate = self
-        tableView.backgroundColor = HexColor("#f1f2f6")
+        tableView.backgroundColor = .white
         tableView.tableFooterView = UIView.init()
         tableView.separatorStyle = .none
-        tableView.register(UITableViewCell.self, forCellReuseIdentifier: "UITableViewCellIdentifier")
+        tableView.register(ShopBodyOrderExpressDetailTableViewCell.self, forCellReuseIdentifier: kShopBodyOrderExpressDetailTableViewCellIdentifier)
         return tableView
     }()
@@ -37,19 +37,25 @@ class CNLiveShopOrderExpressDetailViewController: CNLiveBaseViewController, UITa
         return dataArray
     }()
+    lazy var temp_array: NSMutableArray = {
+        let temp_array = NSMutableArray.init()
+        return temp_array
+    }()
+    
     var _expId: NSString!
     var _orderId: NSString!
     var _refundId: NSString!
     var _express_num: NSString!
-    var expressModel: ShopOrderExpressDetailModel!
+    var expressModel: ShopOrderExpressModel!
     var _show_type: CNLiveShopOrderExpressDetailShowType!
     var _progress: CNLiveShopOrderExpressDetailYBYProgress!
     var network_type: CNLiveMineResponseType!
-    init(orderId: NSString, expId: NSString, show_type: CNLiveShopOrderExpressDetailShowType, progress: CNLiveShopOrderExpressDetailYBYProgress) {
+    init(orderId: NSString, expId: NSString, express_num: NSString, show_type: CNLiveShopOrderExpressDetailShowType, progress: CNLiveShopOrderExpressDetailYBYProgress) {
         _orderId = orderId
         _expId = expId
         _show_type = show_type
         _progress = progress
+        _express_num = express_num
         super.init(nibName:nil, bundle:nil)
     }
@@ -73,19 +79,20 @@ class CNLiveShopOrderExpressDetailViewController: CNLiveBaseViewController, UITa
     }
     func loadDataSourceAction() {
-        CNLiveShopViewModel.requestExpressDetail(orderId: _orderId, expId: _expId, networkType: _show_type) { [weak self] result, respStatue in
-            if respStatue == .success {
-                let expressModel = result as! ShopOrderExpressDetailModel
-                self!.dataArray.addObjects(from: expressModel.data)
-                self!.tableView.reloadData()
-            }else if (respStatue == .noNetwork) {
-                self!.network_type = .noNetwork
-                self!.tableView.reloadEmptyDataSet()
-            } else {
-                self!.network_type = .failed
-                self!.tableView.reloadEmptyDataSet()
-            }
-        }
+//        showLoading(message: "")
+//        CNLiveShopViewModel.requestExpressDetail(orderId: _orderId, expId: _expId, networkType: _show_type) { [weak self] result, respStatue in
+//            if respStatue == .success {
+//                self!.expressModel = (result as! ShopOrderExpressDetailModel).express
+//                self!.dataArray.addObjects(from: (result as! ShopOrderExpressDetailModel).data)
+//                self!.tableView.reloadData()
+//            }else if (respStatue == .noNetwork) {
+//                self!.network_type = .noNetwork
+//                self!.tableView.reloadEmptyDataSet()
+//            } else {
+//                self!.network_type = .failed
+//                self!.tableView.reloadEmptyDataSet()
+//            }
+//        }
     }
 }
@@ -94,16 +101,42 @@ extension CNLiveShopOrderExpressDetailViewController {
         return 1
     }
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return self.dataArray.count
+//        if _show_type == .orderExpress || _show_type == .refundExpress {
+//            return dataArray.count == 0 ? 0 : dataArray.count + 1
+//        } else {
+            return self.dataArray.count
+//        }
     }
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        guard let cell = tableView.dequeueReusableCell(withIdentifier: "UITableViewCellIdentifier") else {
-            return UITableViewCell()
-        }
-        return cell
+        return UITableViewCell.init()
+//        guard let cell = tableView.dequeueReusableCell(withIdentifier: kShopBodyOrderExpressDetailTableViewCellIdentifier) as? ShopBodyOrderExpressDetailTableViewCell else {
+//            return ShopBodyOrderExpressDetailTableViewCell()
+//        }
+//        var isLastRow: Bool = false
+//        var detailModel: ShopOrderExpressDetailDateModel!
+//        if _show_type == .orderExpress || _show_type == .refundExpress {
+//            if indexPath.row == 0 {
+//                detailModel = ShopOrderExpressDetailDateModel()
+//            } else {
+//                detailModel = (dataArray[indexPath.row - 1] as! ShopOrderExpressDetailDateModel)
+//            }
+//            if indexPath.row == dataArray.count {
+//                isLastRow = true
+//            }
+//        } else {
+//            detailModel = (dataArray[indexPath.row] as! ShopOrderExpressDetailDateModel)
+//            if indexPath.row == dataArray.count - 1 {
+//                isLastRow = true
+//            }
+//        }
+//        cell.setupDataSource(dataModel: detailModel, row: indexPath.row, isLastRow: isLastRow, type: _show_type, address: expressModel.address! as NSString, express_state: expressModel.state! as NSString, temp_array: temp_array)
+//        return cell
     }
+//    func tableView(_ tableView: UITableView, estimatedHeightForRowAt indexPath: IndexPath) -> CGFloat {
+//        return adapt_length(length: 80)
+//    }
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        return adapt_length(length: 0.01)
+        return 0.01
     }
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
     }
@@ -280,10 +280,10 @@ extension CNLiveShopOrderListViewController {
     /// - Parameter detailModel: 数据源
     private func pushExpressVC(listModel: ShopOrderListModel) {
         if listModel.send_num > 1 || listModel.is_send == "0" {
-//            self.navigationController?.pushViewController(CNLiveShopOrderExpressListViewController.init(orderId: listModel.id! as NSString), animated: true)
-            self.navigationController?.pushViewController(CNLiveShopOrderExpressListViewController.init(orderId: "1000073435"), animated: true)
+            self.navigationController?.pushViewController(CNLiveShopOrderExpressListViewController.init(orderId: listModel.id! as NSString), animated: true)
+//            self.navigationController?.pushViewController(CNLiveShopOrderExpressListViewController.init(orderId: "1000073435"), animated: true)
         } else {
-//            self.navigationController?.pushViewController(CNLiveShopOrderExpressDetailViewController.init(), animated: true)
+            self.navigationController?.pushViewController(CNLiveShopOrderExpressDetailViewController.init(orderId: "1000021749", expId: "0", express_num: "1234556789012345", show_type: .orderExpress, progress: .Zero), animated: true)
         }
     }
@@ -168,7 +168,7 @@ class ShopBodyOrderExpressListTableViewCell: UITableViewCell, UICollectionViewDa
     }
     @objc func pushExpressDetail() {
-        currentViewController()?.navigationController?.pushViewController(CNLiveShopOrderExpressDetailViewController.init(orderId: _listModel.id! as NSString, expId: _listModel.express_num! as NSString, show_type: .orderExpress, progress: .Zero), animated: true)
+        currentViewController()?.navigationController?.pushViewController(CNLiveShopOrderExpressDetailViewController.init(orderId: _listModel.id! as NSString, expId: _listModel.express_num! as NSString, express_num: _listModel.express_num! as NSString, show_type: .orderExpress, progress: .Zero), animated: true)
     }
     @objc func actionClick(sender: UIButton) {
@@ -256,7 +256,7 @@ class ShopBodyOrderExpressDetailHeaderView: UIView {
 }
-class ShopBodyOrderExpressDetailTableView: UITableViewCell, UITextViewDelegate {
+class ShopBodyOrderExpressDetailTableViewCell: UITableViewCell, UITextViewDelegate {
     lazy var lineLabel: UILabel = {
         let lineLabel = UILabel.init()
@@ -295,12 +295,15 @@ class ShopBodyOrderExpressDetailTableView: UITableViewCell, UITextViewDelegate {
         super.init(style: style, reuseIdentifier: reuseIdentifier)
         contentView.backgroundColor = .white
         selectionStyle = .none
+        _have_layout = false
         addSubview(lineLabel)
         addSubview(pointImageView)
         addSubview(titleTextView)
         addSubview(timeLabel)
         addSubview(bottomLine)
+        
+        initLayout()
     }
     func textView(_ textView: UITextView, shouldInteractWith URL: URL, in characterRange: NSRange, interaction: UITextItemInteraction) -> Bool {
@@ -319,14 +322,14 @@ class ShopBodyOrderExpressDetailTableView: UITableViewCell, UITextViewDelegate {
         return false
     }
-     
+    var _have_layout: Bool!
     var _dataModel: ShopOrderExpressDetailDateModel!
     var _row: NSInteger!
     var _isLastRow: Bool!
     var _type: CNLiveShopOrderExpressDetailShowType!
     var _address: NSString!
     var _express_state: NSString!
-    func setupDataSource(dataModel: ShopOrderExpressDetailDateModel, row: NSInteger, isLastRow: Bool, type: CNLiveShopOrderExpressDetailShowType, address: NSString, express_state: NSString) {
+    func setupDataSource(dataModel: ShopOrderExpressDetailDateModel, row: NSInteger, isLastRow: Bool, type: CNLiveShopOrderExpressDetailShowType, address: NSString, express_state: NSString, temp_array: NSMutableArray) {
         _dataModel = dataModel
         _row = row
         _isLastRow = isLastRow
@@ -362,6 +365,18 @@ class ShopBodyOrderExpressDetailTableView: UITableViewCell, UITextViewDelegate {
                 pointImageView.size = CGSizeMake(adapt_length(length: 15), adapt_length(length: 15))
                 pointImageView.layer.cornerRadius = 0
                 pointImageView.layer.masksToBounds = false
+            } else {
+                let title = NSMutableAttributedString.init(string: dataModel.AcceptStation!, attributes: [.font:medium_adapt_font(pointSize: 12),.foregroundColor:HexColor("#b4b4b4")!,.paragraphStyle:para.copy()])
+                titleTextView.attributedText = setHyperlinksAttrStr(attrStr: title)
+                timeLabel.text = dataModel.AcceptTime
+                
+                pointImageView.image = nil
+                pointImageView.backgroundColor = backgroundColor
+                pointImageView.size = CGSize(width: adapt_length(length: 5), height: adapt_length(length: 5))
+                pointImageView.layer.cornerRadius = pointImageView.height/2
+                pointImageView.layer.masksToBounds = true
+                pointImageView.layer.borderColor = HexColor("#d2d2d2")?.cgColor
+                pointImageView.layer.borderWidth = adapt_length(length: 1)
             }
         } else {
             titleTextView.font = medium_adapt_font(pointSize: 14)
@@ -389,7 +404,80 @@ class ShopBodyOrderExpressDetailTableView: UITableViewCell, UITextViewDelegate {
         }
         titleTextView.sizeToFit()
-        
+//        if !temp_array.contains(dataModel.AcceptTime!) {
+            
+//            temp_array.add(dataModel.AcceptTime!)
+//        }
+    }
+    
+    func initLayout() {
+        lineLabel.snp.makeConstraints { make in
+            make.centerX.equalTo(pointImageView)
+            make.top.bottom.equalToSuperview()
+            make.width.equalTo(adapt_length(length: 1))
+        }
+        pointImageView.snp.makeConstraints { make in
+            make.top.equalToSuperview().offset(adapt_length(length: 16))
+            make.left.equalTo(adapt_length(length: 20))
+            make.size.equalTo(pointImageView.size)
+        }
+    }
+    
+    func setupLayout() {
+        if _row == 0 {
+            lineLabel.snp.updateConstraints { make in
+//                make.centerX.equalTo(pointImageView)
+                make.top.equalTo(pointImageView.snp.bottom)
+//                make.bottom.equalToSuperview()
+//                make.width.equalTo(adapt_length(length: 1))
+            }
+        } else if _isLastRow {
+            lineLabel.snp.updateConstraints { make in
+//                make.centerX.equalTo(pointImageView)
+//                make.top.equalToSuperview()
+                make.bottom.equalTo(pointImageView.snp.top)
+//                make.width.equalTo(adapt_length(length: 1))
+            }
+        }
+//        else {
+//            lineLabel.snp.makeConstraints { make in
+//                make.centerX.equalTo(pointImageView)
+//                make.top.bottom.equalToSuperview()
+//                make.width.equalTo(adapt_length(length: 1))
+//            }
+//        }
+        if ((_type == .orderExpress || _type == .refundExpress) && _row == 1) || (_type == .byYourself && _row == 0) {
+            pointImageView.snp.makeConstraints { make in
+                make.top.equalToSuperview().offset(adapt_length(length: 16))
+                make.left.equalTo(adapt_length(length: 20))
+                make.size.equalTo(pointImageView.size)
+            }
+        } else {
+            pointImageView.snp.makeConstraints { make in
+                make.top.equalToSuperview().offset(adapt_length(length: 21))
+                make.left.equalTo(adapt_length(length: 25))
+                make.size.equalTo(pointImageView.size)
+            }
+        }
+        titleTextView.snp.makeConstraints { make in
+            make.top.equalToSuperview().offset(adapt_length(length: 15))
+            make.left.equalToSuperview().offset(adapt_length(length: 48))
+            make.right.equalToSuperview().offset(-adapt_length(length: 20))
+            make.height.equalTo(titleTextView.height)
+        }
+        let top = timeLabel.text!.isNotBlank() ? adapt_length(length: 15) : 0
+        timeLabel.snp.makeConstraints { make in
+            make.top.equalTo(titleTextView.snp.bottom).offset(adapt_length(length: top))
+            make.left.equalTo(titleTextView.snp.left)
+            make.right.equalToSuperview().offset(-adapt_length(length: 20))
+            make.bottom.equalToSuperview().offset(-adapt_length(length: 15))
+        }
+        bottomLine.snp.makeConstraints { make in
+            make.left.equalTo(titleTextView.snp.left)
+            make.right.equalToSuperview().offset(-adapt_length(length: 20))
+            make.bottom.equalToSuperview()
+            make.height.equalTo(adapt_length(length: 1))
+        }
     }
     func setHyperlinksAttrStr(attrStr: NSMutableAttributedString) -> NSAttributedString {
@@ -71,7 +71,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         let shop_dic : Dictionary = ["Phone-Model":"iPhone","Uid":UserInfoManager.shared.userInfo.uid ,"CFBundleShortVersionString":ver,"Shop-Version":"0.6.2"]
         CNLiveNetworking.setupDSShopParam(shop_dic)
-        CNLiveNetworking.setRequestTimeoutInterval(10)
+        CNLiveNetworking.setRequestTimeoutInterval(20)
         CNLiveNetworking.setupShowDataResult(false)
         CNLiveNetworking.setupSignKey(APPKey)
         CNLiveNetworking.setAllowRequestDefaultArgument(true)