物流详情提交

liushiyu
1 parent e9ea7bd9
Showing 13 changed files with 306 additions and 31 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Main/LoginPage/ViewModel/CNLiveLoginViewModel.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineViewController.swift
metaCode/Classes/Main/MinePage/View/CNLiveMineInfoAlertView.swift
metaCode/Classes/Main/MinePage/View/CNLiveMineInputMessageView.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/CNLiveShopOrderExpressListViewController.swift
metaCode/Classes/Main/ShopPage/Controller/CNLiveShopOrderListViewController.swift
metaCode/Classes/Main/ShopPage/Model/CNLiveShopBaseModel.swift
metaCode/Classes/Main/ShopPage/View/CNLiveShopBodyExpressView.swift
metaCode/Classes/Main/ShopPage/ViewModel/CNLiveShopViewModel.swift
@@ -70,6 +70,7 @@
 		79282A402A2F055100B5F8CF /* CNLiveConfigUserInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79282A3F2A2F055100B5F8CF /* CNLiveConfigUserInfo.swift */; };
 		79282A442A2F1C1E00B5F8CF /* CNLiveLoginAuthView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79282A432A2F1C1E00B5F8CF /* CNLiveLoginAuthView.swift */; };
 		79282A462A2F457D00B5F8CF /* CNLiveMineViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79282A452A2F457D00B5F8CF /* CNLiveMineViewController.swift */; };
+		792B53282AFCD7640009AB49 /* CNLiveShopOrderExpressDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 792B53272AFCD7640009AB49 /* CNLiveShopOrderExpressDetailViewController.swift */; };
 		792E57D92A3AA2F2005834DB /* CNLiveCommonBaseModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 792E57D82A3AA2F2005834DB /* CNLiveCommonBaseModel.swift */; };
 		792E57DB2A3AE9F4005834DB /* CNLiveCommonQiniuTool.swift in Sources */ = {isa = PBXBuildFile; fileRef = 792E57DA2A3AE9F4005834DB /* CNLiveCommonQiniuTool.swift */; };
 		79396EED2A319F220053E1AF /* NSObject+CNLiveExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79396EEC2A319F220053E1AF /* NSObject+CNLiveExtensions.swift */; };
@@ -234,6 +235,7 @@
 		79282A3F2A2F055100B5F8CF /* CNLiveConfigUserInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveConfigUserInfo.swift; sourceTree = "<group>"; };
 		79282A432A2F1C1E00B5F8CF /* CNLiveLoginAuthView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveLoginAuthView.swift; sourceTree = "<group>"; };
 		79282A452A2F457D00B5F8CF /* CNLiveMineViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineViewController.swift; sourceTree = "<group>"; };
+		792B53272AFCD7640009AB49 /* CNLiveShopOrderExpressDetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopOrderExpressDetailViewController.swift; sourceTree = "<group>"; };
 		792E57D82A3AA2F2005834DB /* CNLiveCommonBaseModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveCommonBaseModel.swift; sourceTree = "<group>"; };
 		792E57DA2A3AE9F4005834DB /* CNLiveCommonQiniuTool.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveCommonQiniuTool.swift; sourceTree = "<group>"; };
 		79396EEC2A319F220053E1AF /* NSObject+CNLiveExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSObject+CNLiveExtensions.swift"; sourceTree = "<group>"; };
@@ -703,6 +705,7 @@
 				791C1C852AFB2EB4003E6362 /* CNLiveShopOrderExpressViewController.swift */,
 				791C1C872AFB6FD7003E6362 /* CNLiveShopOrderExpressFirmViewController.swift */,
 				791C1C892AFB84EE003E6362 /* CNLiveShopOrderExpressListViewController.swift */,
+				792B53272AFCD7640009AB49 /* CNLiveShopOrderExpressDetailViewController.swift */,
 			);
 			path = Controller;
 			sourceTree = "<group>";
@@ -1131,6 +1134,7 @@
 				19BB1FF02AF0E5B30094D962 /* CNLiveShopDetailModel.swift in Sources */,
 				796398942A260C0100D045EB /* AppDelegate.swift in Sources */,
 				7989B5C72A4BDC7200A19B10 /* CNLiveMineEarnListViewController.swift in Sources */,
+				792B53282AFCD7640009AB49 /* CNLiveShopOrderExpressDetailViewController.swift in Sources */,
 				79396EF12A31C21B0053E1AF /* CNLiveInfoShowViewController.swift in Sources */,
 				192336EB2AD9224300D47CD4 /* CNUpSlideViewController.swift in Sources */,
 				19565ECB2AF8C59C007D6727 /* CNLiveShopGoodsListModel.swift in Sources */,
@@ -1435,7 +1439,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.0.1.23.11.09.13;
+				CURRENT_PROJECT_VERSION = 1.0.1.23.11.09.17;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				EXCLUDED_ARCHS = "";
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1480,7 +1484,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.0.1.23.11.09.13;
+				CURRENT_PROJECT_VERSION = 1.0.1.23.11.09.17;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				EXCLUDED_ARCHS = "";
 				GENERATE_INFOPLIST_FILE = YES;
@@ -37,9 +37,13 @@ class CNLiveLoginViewModel : NSObject {
         }
         showLoading(message: "")
         let param = ["mobile":phone,"countryCode":code]
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(APPId, forKey: "appId")
+        custom_param.setValue(APPKey, forKey: "appKey")
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
-        CNLiveNetworking.requestNetwork(with: .POST, urlString: "/open/api2/user/sendVerifyCode", param: param, cacheType: .networkOnly) { task, result, error in
+        CNLiveNetworking.requestNetwork(with: .POST, urlString: APPLoginHost+"/open/api2/user/sendVerifyCode", param: param, cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
             if (error == nil) {
                 let resp = result as! NSDictionary
@@ -90,9 +94,13 @@ class CNLiveLoginViewModel : NSObject {
         showLoading(message: "")
         let param = ["userName":userName,"countryCode":countryCode,"verificationCode":verCode,"inviterId":""]
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(APPId, forKey: "appId")
+        custom_param.setValue(APPKey, forKey: "appKey")
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
-        CNLiveNetworking.requestNetwork(with: .POST, urlString: "/open/api2/user/loginInMetaCode", param: param, cacheType: .networkOnly) { task, result, error in
+        CNLiveNetworking.requestNetwork(with: .POST, urlString: APPLoginHost+"/open/api2/user/loginInMetaCode", param: param, cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
             if (error == nil) {
                 let resp = result as! NSDictionary
@@ -46,8 +46,9 @@ class CNLiveMineViewController : CNLiveBaseViewController, UITableViewDelegate, 
         dataArray.add(array03)
-//        let array04 : [Dictionary] = [["name":"订单列表","icon":"mine_list_icon_help_feedback"]]
-//        dataArray.add(array04)
+//        dataArray.add([["name":"订单列表","icon":"mine_list_icon_help_feedback"]])
+        
+        
         return dataArray
     }()
@@ -170,9 +171,9 @@ extension CNLiveMineViewController {
             self.navigationController?.pushViewController(CNLiveTypeFeedBackViewController.init(show_type: .setting), animated: true)
         }
-//        if indexPath.section == 4 {
-//            self.navigationController?.pushViewController(CNLiveShopOrderViewController.init(), animated: true)
-//        }
+        if indexPath.section == 4 {
+            self.navigationController?.pushViewController(CNLiveShopOrderViewController.init(), animated: true)
+        }
     }
@@ -715,12 +715,13 @@ class MineStandListAlertView: UIView, UIPickerViewDelegate, UIPickerViewDataSour
         let pickerView = MineStandListAlertView.init(frame: .zero, infos: infos, show_type: show_type)
         pickerView.result = result
         pickerView.nameLable.text = name
-        let window = UIApplication.shared.windows.last
-        window?.addSubview(pickerView)
+        let delegate = UIApplication.shared.delegate as! AppDelegate
+//        let window = UIApplication.shared.windows.last
+        delegate.window?.addSubview(pickerView)
         pickerView.snp.makeConstraints { make in
             make.edges.equalToSuperview()
         }
-        window?.layoutIfNeeded()
+        delegate.window?.layoutIfNeeded()
         pickerView.alpha = 0
         UIView.animate(withDuration: 0.1) {
             pickerView.alpha = 1
@@ -210,7 +210,7 @@ class MineInputTextShopCustomView: UIView, UITextViewDelegate, UITextFieldDelega
                 make.centerY.equalToSuperview()
             }
             make.left.equalToSuperview().offset(10)
-            make.width.lessThanOrEqualTo(adapt_length(length: 150))
+            make.width.lessThanOrEqualTo(adapt_length(length: 160))
         }
         addSubview(contentTextField)
         contentTextField.snp.makeConstraints { make in
@@ -67,7 +67,7 @@ class CNLiveMineViewModel: NSObject {
         showLoading(message: "")
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
-        CNLiveNetworking.requestNetwork(with: .POST, urlString: "/open/api2/user/updateUserById", param: param as! [String : Any], cacheType: .networkOnly) { task, result, error in
+        CNLiveNetworking.requestNetwork(with: .POST, urlString: APPLoginHost+"/open/api2/user/updateUserById", param: param as! [String : Any], cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
             if (error == nil) {
                 let resp = result as! NSDictionary
@@ -103,7 +103,7 @@ class CNLiveMineViewModel: NSObject {
                 CNLiveNetworking.setAllowRequestDefaultArgument(true)
                 CNLiveNetworking.setupShowDataResult(false)
                 CNLiveNetworking.setupShowResult(true)
-                CNLiveNetworking.uploadNetwork(withURLString: "/open/api2/user/updateUserFaceById", param: param as? [AnyHashable : Any]) { formData in
+                CNLiveNetworking.uploadNetwork(withURLString: APPLoginHost+"/open/api2/user/updateUserFaceById", param: param as? [AnyHashable : Any]) { formData in
                     let imageData = image.imageWithZip()
                     formData?.appendPart(withFileData: imageData as Data, name: "face", fileName: ".jpg", mimeType: "image/jpg")
                 } progressBlock: { progress in
@@ -146,7 +146,7 @@ class CNLiveMineViewModel: NSObject {
         showLoading(message: "")
         CNLiveNetworking.setAllowRequestDefaultArgument(false)
         CNLiveNetworking.setupShowDataResult(false)
-        CNLiveNetworking.requestNetwork(with: .POST, urlString: "/open/api2/token", param: (param as! [AnyHashable : Any]), cacheType: .networkOnly) { task, result, error in
+        CNLiveNetworking.requestNetwork(with: .POST, urlString: APPLoginHost+"/open/api2/token", param: (param as! [AnyHashable : Any]), cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
             if (error == nil) {
                 let resp = result as! NSDictionary
@@ -198,6 +198,10 @@ class CNLiveMineViewModel: NSObject {
         param.setValue(Bundle.main.infoDictionary?["CFBundleVersion"] as! String, forKey: "version")
         param.setValue(UIDevice.current.identifierForVendor?.uuidString.replacingOccurrences(of: "-", with: "") ?? "", forKey: "deviceId")
         showLoading(message: "")
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(APPId, forKey: "appId")
+        custom_param.setValue(APPKey, forKey: "appKey")
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
         CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseMCUrl+"/commonApi/collectFeedback", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
@@ -222,6 +226,10 @@ class CNLiveMineViewModel: NSObject {
     /// - Parameter resultBlock: 结果返回
     static func requestMessage(resultBlock: @escaping resultNewsBlock) {
         showLoading(message: "")
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(APPId, forKey: "appId")
+        custom_param.setValue(APPKey, forKey: "appKey")
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
         CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseMCUrl+"/newsApi/getNews", param: ["sid":UserInfoManager.shared.userInfo.uid], cacheType: .networkOnly) { task, result, error in
@@ -257,6 +265,10 @@ class CNLiveMineViewModel: NSObject {
         param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")
         param.setValue("30", forKey: "pageSize")
         param.setValue("\(page)", forKey: "page")
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(APPId, forKey: "appId")
+        custom_param.setValue(APPKey, forKey: "appKey")
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
         CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseMCUrl+"/identityApi/allList", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
@@ -315,6 +327,10 @@ class CNLiveMineViewModel: NSObject {
         param.setValue("1", forKey: "type") //0正在审核  1已认证  -1审核失败
         param.setValue("\(page)", forKey: "page")
         param.setValue("30", forKey: "pageSize")
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(APPId, forKey: "appId")
+        custom_param.setValue(APPKey, forKey: "appKey")
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
         CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseMCUrl+"/identityApi/myList", param: param as! [String: String], cacheType: .networkOnly) { task, result, error in
@@ -399,6 +415,10 @@ class CNLiveMineViewModel: NSObject {
             let data = try JSONSerialization.data(withJSONObject: values, options: .prettyPrinted)
             request.httpBody = data
             showLoading(message: "")
+            let custom_param = NSMutableDictionary()
+            custom_param.setValue(APPId, forKey: "appId")
+            custom_param.setValue(APPKey, forKey: "appKey")
+            CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
             CNLiveNetworking.setAllowRequestDefaultArgument(false)
             CNLiveNetworking.setupShowDataResult(false)
             CNLiveNetworking.setBuildCustomUrlRequest(request as URLRequest) { task, result, error in
@@ -436,6 +456,10 @@ class CNLiveMineViewModel: NSObject {
         let param = NSMutableDictionary()
         param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")
         param.setValue(identityId, forKey: "identityId")
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(APPId, forKey: "appId")
+        custom_param.setValue(APPKey, forKey: "appKey")
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
         CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseMCUrl+"/identityApi/getIdentity", param: param as! [String: String], cacheType: .networkOnly) { task, result, error in
@@ -484,6 +508,10 @@ class CNLiveMineViewModel: NSObject {
     static func requestSystemNews(resultBlock: @escaping resultNewsBlock) {
         let param = NSMutableDictionary()
         param.setValue("2", forKey: "appType")
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(APPId, forKey: "appId")
+        custom_param.setValue(APPKey, forKey: "appKey")
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
         CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseMCUrl+"/commonApi/getVersion", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
@@ -527,6 +555,10 @@ class CNLiveMineViewModel: NSObject {
         param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")
         param.setValue("\(page)", forKey: "page")
         param.setValue("10", forKey: "pageSize")
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(APPId, forKey: "appId")
+        custom_param.setValue(APPKey, forKey: "appKey")
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
         CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseMCUrl+"/identityApi/list", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
@@ -195,9 +195,9 @@ extension CNLiveShopOrderDetailViewController {
     /// - Parameter detailModel: 数据源
     private func pushExpressVC(detailModel: ShopOrderDetailModel) {
         if detailModel.send_num > 1 || detailModel.is_send == "0" {
-            self.navigationController?.pushViewController(CNLiveShopOrderExpressListViewController.init(orderId: detailModel.orderid! as NSString), animated: true)
+            self.navigationController?.pushViewController(CNLiveShopOrderExpressListViewController.init(orderId: detailModel.id! as NSString), animated: true)
         } else {
-            
+            self.navigationController?.pushViewController(CNLiveShopOrderExpressDetailViewController.init(), animated: true)
         }
     }
+//
+//  CNLiveShopOrderExpressDetailViewController.swift
+//  metaCode
+//
+//  Created by open on 2023/11/9.
+//
+
+import Foundation
+import EmptyDataSet_Swift
+enum CNLiveShopOrderExpressDetailShowType {
+    case orderExpress //订单详情快递
+    case byYourself //自提
+    case refundExpress //退款详情快递
+}
+class CNLiveShopOrderExpressDetailViewController: CNLiveBaseViewController, UITableViewDelegate, UITableViewDataSource, EmptyDataSetSource, EmptyDataSetDelegate {
+    
+
+    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.tableFooterView = UIView.init()
+        tableView.separatorStyle = .none
+        tableView.register(UITableViewCell.self, forCellReuseIdentifier: "UITableViewCellIdentifier")
+        return tableView
+    }()
+    
+    lazy var dataArray: NSMutableArray = {
+        let dataArray = NSMutableArray.init()
+        return dataArray
+    }()
+    
+    var network_type: CNLiveMineResponseType!
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        navigationBarHidden = false
+        titleName = "物流详情"
+        
+        loadDataSourceAction()
+        
+        view.addSubview(tableView)
+        tableView.snp.makeConstraints { make in
+            make.top.equalTo(KNavigationHeight)
+            make.left.right.equalToSuperview()
+            make.bottom.equalToSuperview().offset(get_system_tabbar_height() - get_system_tabbar_ui_height())
+        }
+    }
+    
+    func loadDataSourceAction() {
+        
+    }
+}
+
+extension CNLiveShopOrderExpressDetailViewController {
+    func numberOfSections(in tableView: UITableView) -> Int {
+        return 1
+    }
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return self.dataArray.count
+    }
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        guard let cell = tableView.dequeueReusableCell(withIdentifier: "UITableViewCellIdentifier") else {
+            return UITableViewCell()
+        }
+        return cell
+    }
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        return adapt_length(length: 0.01)
+    }
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+    }
+}
+
+extension CNLiveShopOrderExpressDetailViewController {
+    
+    func image(forEmptyDataSet scrollView: UIScrollView) -> UIImage? {
+        if network_type == .failed  || network_type == .unkonw {
+            return UIImage(named: "mine_list_source_unusual_failed")
+        }
+        if dataArray.count == 0 {
+            return UIImage(named: "mine_list_source_unusual_empty")
+        }
+        if network_type == .noNetwork {
+            return UIImage(named: "mine_list_source_unusual_noNet")
+        }
+        return UIImage(named: "mine_list_source_unusual_empty")
+    }
+    
+    func title(forEmptyDataSet scrollView: UIScrollView) -> NSAttributedString? {
+        var defult_string = ""
+        if network_type == .failed  || network_type == .unkonw {
+            defult_string = "接口请求错误,刷新试试～"
+        }
+        if network_type == .noNetwork {
+            defult_string = "网络开小差了,刷新试试～"
+        }
+        if dataArray.count == 0 {
+            defult_string = "暂时没有数据～"
+        }
+        return NSAttributedString(string: defult_string, attributes: [.font: Font_17,.foregroundColor: HexColor("#666666")!])
+    }
+    
+    func buttonTitle(forEmptyDataSet scrollView: UIScrollView, for state: UIControl.State) -> NSAttributedString? {
+        if network_type == .failed || network_type == .noNetwork {
+            let attributes = [NSAttributedString.Key.font:Font_16_Fit,
+                              NSAttributedString.Key.foregroundColor: HexColor("#609BFF")]
+            return NSAttributedString(string: "刷一刷", attributes: attributes as [NSAttributedString.Key : Any])
+        }
+        return nil
+    }
+    
+    func emptyDataSet(_ scrollView: UIScrollView, didTapView view: UIView) {
+        if network_type == .failed || network_type == .noNetwork  {
+            loadDataSourceAction()
+        }
+    }
+}
+
@@ -80,13 +80,16 @@ extension CNLiveShopOrderExpressListViewController {
         return self.dataArray.count
     }
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        guard let cell = tableView.dequeueReusableCell(withIdentifier: kShopBodyOrderExpressListTableViewCellIdentifier) as? ShopBodyOrderExpressFirmTableViewCell else {
-            return ShopBodyOrderExpressFirmTableViewCell()
+        guard let cell = tableView.dequeueReusableCell(withIdentifier: kShopBodyOrderExpressListTableViewCellIdentifier) as? ShopBodyOrderExpressListTableViewCell else {
+            return ShopBodyOrderExpressListTableViewCell()
         }
+        cell.setupDataSource(listModel: dataArray[indexPath.row] as! ShopOrderExpressListModel)
         return cell
     }
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        return adapt_length(length: 0.01)//130)
+        let listModel = dataArray[indexPath.row] as! ShopOrderExpressListModel
+        let height = listModel.expressNew.AcceptStation?.calculateHeightWith(width: KSreenWidth - adapt_length(length: 30), font: regular_adapt_font(pointSize: 12))
+        return CGFloat(adapt_length(length: 213) + (listModel.expressNew.AcceptStation!.isNotBlank() ? height! : 0))
     }
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
@@ -71,7 +71,6 @@ class CNLiveShopOrderListViewController: CNLiveBaseViewController, UITableViewDe
             make.top.equalToSuperview()
             make.bottom.left.right.equalToSuperview()
         }
-        addRefreshView()
     }
     func loadDataSourceAction(page: NSInteger) {
@@ -91,6 +90,9 @@ class CNLiveShopOrderListViewController: CNLiveBaseViewController, UITableViewDe
                 if self!.pageNum == 1 {
                     self!.dataArray.removeAllObjects()
                     self!.dataArray.addObjects(from: result as! [ShopOrderListModel])
+                    if self!.dataArray.count > 0 {
+                        self!.addRefreshView()
+                    }
                 }
                 if self!.pageNum > 1 {
                     self!.dataArray.addObjects(from: result as! [ShopOrderListModel])
@@ -278,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)
         }
     }
@@ -237,3 +237,5 @@ class ShopOrderExpressDetailDateModel: BaseModel {
     var AcceptStation: String? = ""// 内容
     var accept_time: String? = ""//   时间戳
 }
+
+
@@ -6,12 +6,15 @@
 //
 import Foundation
+import EmptyDataSet_Swift
 class ShopBodyOrderExpressListTableViewCell: UITableViewCell, UICollectionViewDataSource, UICollectionViewDelegate{
     lazy var logoImageView: UIImageView = {
         let logoImageView = UIImageView.init()
         logoImageView.backgroundColor = .white
+        logoImageView.layer.cornerRadius = 4
+        logoImageView.layer.masksToBounds = true
         return logoImageView
     }()
@@ -69,6 +72,8 @@ class ShopBodyOrderExpressListTableViewCell: UITableViewCell, UICollectionViewDa
         collectionView.delegate = self
         collectionView.backgroundColor = .white
         collectionView.register(ShopBodyOrderExpressListCollectionViewCell.self, forCellWithReuseIdentifier: kShopBodyOrderExpressListCollectionViewCellIdentifier)
+        let tap = UITapGestureRecognizer.init(target: self, action: #selector(pushExpressDetail))
+        collectionView.addGestureRecognizer(tap)
         return collectionView
     }()
@@ -132,11 +137,39 @@ class ShopBodyOrderExpressListTableViewCell: UITableViewCell, UICollectionViewDa
         }
     }
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
     var _listModel: ShopOrderExpressListModel!
     func setupDataSource(listModel: ShopOrderExpressListModel) {
         _listModel = listModel
+        logoImageView.kf.setImage(with: URL(string: listModel.simg!))
+        expressName.text = listModel.express
+        expressName.sizeToFit()
+        expressNo.text = "快递编号：\(listModel.express_num ?? "0")"
+        totleExpress.text = "共\(listModel.detail_goods.count)件商品"
+        totleExpress.sizeToFit()
+        
+        expressTime.text = listModel.expressNew.AcceptTime
+        expressTime.sizeToFit()
+        
+        var address : String = ""
+        if listModel.expressNew.AcceptStation!.isNotBlank() {
+            address = listModel.expressNew.AcceptStation!
+        } else {
+            address = "包裹正在等待揽收"
+        }
+        expressAddress.text = address
+        expressAddress.sizeToFit()
+        collectionView.reloadData()
+        setNeedsLayout()
+    }
+    
+    @objc func pushExpressDetail() {
+        currentViewController()?.navigationController?.pushViewController(CNLiveShopOrderExpressDetailViewController.init(), animated: true)
     }
     @objc func actionClick(sender: UIButton) {
@@ -156,17 +189,19 @@ class ShopBodyOrderExpressListTableViewCell: UITableViewCell, UICollectionViewDa
         return _listModel.detail_goods.count
     }
     func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
-        return UICollectionViewCell.init()
+        guard let cell = collectionView.dequeueReusableCell(withReuseIdentifier: kShopBodyOrderExpressListCollectionViewCellIdentifier, for: indexPath) as? ShopBodyOrderExpressListCollectionViewCell else {
+            return ShopBodyOrderExpressListCollectionViewCell()
+        }
+        let goodsModel = _listModel.detail_goods[indexPath.row]
+        cell.goodsImage.kf.setImage(with: URL(string: goodsModel.simg!))
+        cell.expressNum.text = "\(goodsModel.num ?? 0)件"
+        return cell
     }
     func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
     }
-    required init?(coder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-    
 }
 class ShopBodyOrderExpressListCollectionViewCell: UICollectionViewCell {
@@ -175,6 +210,7 @@ class ShopBodyOrderExpressListCollectionViewCell: UICollectionViewCell {
         let goodsImage = UIImageView.init()
         goodsImage.contentMode = .scaleAspectFill
         goodsImage.layer.cornerRadius = 6
+        goodsImage.layer.masksToBounds = true
         return goodsImage
     }()
@@ -183,7 +219,9 @@ class ShopBodyOrderExpressListCollectionViewCell: UICollectionViewCell {
         expressNum.font = regular_adapt_font(pointSize: 9)
         expressNum.textColor = HexColor("#ffffff")
         expressNum.backgroundColor = HexColor("#000000")
-        expressNum.textAlignment  
+        expressNum.textAlignment = .center
+        expressNum.alpha = 0.5
+        expressNum.layer.cornerRadius = 6
         return expressNum
     }()
@@ -191,6 +229,15 @@ class ShopBodyOrderExpressListCollectionViewCell: UICollectionViewCell {
         super.init(frame: frame)
         contentView.backgroundColor = .white
+        contentView.addSubview(goodsImage)
+        goodsImage.snp.makeConstraints { make in
+            make.edges.equalToSuperview()
+        }
+        contentView.addSubview(expressNum)
+        expressNum.snp.makeConstraints { make in
+            make.left.bottom.right.equalToSuperview()
+            make.height.equalTo(adapt_length(length: 15))
+        }
     }
     required init?(coder: NSCoder) {
@@ -8,6 +8,12 @@
 import Foundation
 import CNLiveRequestBastKit
+enum CNLiveShopOrderExpressDetailNetworkType {
+    case express // 订单详情查快递
+    case step    // 订单详情查进度
+    case refundId// 查询快递(退款详情)
+}
+
 typealias resultShopBlock = (_ result: Any,_ respStatue :CNLiveMineResponseType) -> Void
 class CNLiveShopViewModel: NSObject {
@@ -519,4 +525,52 @@ class CNLiveShopViewModel: NSObject {
         }
     }
+    ///  订单详情查快递
+    /// - Parameters:
+    ///   - orderId: 订单id
+    ///   - expId: 物流id
+    ///   - resultBlock: 返回
+    static func requestExpressDetail(orderId: NSString, expId: NSString, resultBlock: @escaping resultShopBlock) {
+        let param = NSMutableDictionary()
+        param.setValue(orderId, forKey: "id")
+        param.setValue(expId, forKey: "exp_id")
+        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.setupDSRequest(true)
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
+        CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseWjjBUrl+"/api/v1/express", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
+            hiddenLoading()
+            if (error == nil) {
+                let resp = result as! NSDictionary
+                let errorCode = "\(resp["code"] ?? "0")"
+                if (errorCode == "200") {
+                    if resp["data"] is NSNull {
+                        resultBlock(NSNull(),.failed)
+                    } else {
+                        let array = resp["data"] as! NSArray
+                        let tempArray = NSMutableArray()
+                        for item in array {
+                            let listModel = dictionaryToModel(item as! [String : Any], ShopOrderExpressDetailModel.self,"") as! ShopOrderExpressDetailModel
+                        }
+                        resultBlock(tempArray, .success)
+                    }
+                } else {
+                    showMessage(message: resp["message"] as! String)
+                    resultBlock(NSNull(),.failed)
+                }
+            } else {
+                if CNLiveNetworking.isNetworking() {
+                    showMessage(message: "请求失败")
+                    resultBlock(NSNull(),.failed)
+                } else {
+                    showMessage(message: "似乎与网络断开链接")
+                    resultBlock(NSNull(),.noNetwork)
+                }
+            }
+        }
+    }
+    
 }