源码相关界面实现

liushiyu
1 parent 44b78735
Showing 36 changed files with 1710 additions and 83 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Config/CNLiveConfigManager.swift
metaCode/Classes/Config/CNLiveConfigUserInfo.swift
metaCode/Classes/Extensions/NSString+CNLiveExtensions.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineViewController.swift
metaCode/Classes/Main/MinePage/View/CNLiveMineInfoAlertView.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineViewModel.swift
metaCode/Classes/Main/ShopPage/Controller/CNLiveShopOrderDetailViewController.swift
metaCode/Classes/Main/ShopPage/Controller/CNLiveShopOrderExpressFirmViewController.swift
metaCode/Classes/Main/ShopPage/Controller/CNLiveShopOrderExpressListViewController.swift
metaCode/Classes/Main/ShopPage/Controller/CNLiveShopOrderExpressViewController.swift
metaCode/Classes/Main/ShopPage/Controller/CNLiveShopOrderListViewController.swift
metaCode/Classes/Main/ShopPage/Controller/CNLiveShopOrderSendViewController.swift
metaCode/Classes/Main/ShopPage/Model/CNLiveShopBaseModel.swift
metaCode/Classes/Main/ShopPage/View/CNLiveShopBodyCustomView.swift
metaCode/Classes/Main/ShopPage/View/CNLiveShopBodyExpressView.swift
metaCode/Classes/Main/ShopPage/View/CNLiveShopBodyListView.swift
metaCode/Classes/Main/ShopPage/ViewModel/CNLiveShopViewModel.swift
metaCode/Supporting Files/Assets.xcassets/Shop/DS_goods_add_no.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/Shop/DS_goods_add_no.imageset/加@2x.png
@@ -59,6 +59,10 @@
 		790D01A32A2DDBA300C5978D /* CNLiveConfigManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 790D01A22A2DDBA300C5978D /* CNLiveConfigManager.swift */; };
 		790D01A52A2DF65E00C5978D /* CNLiveLoginPickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 790D01A42A2DF65E00C5978D /* CNLiveLoginPickerView.swift */; };
 		790D01A72A2DF84C00C5978D /* countries.plist in Resources */ = {isa = PBXBuildFile; fileRef = 790D01A62A2DF84C00C5978D /* countries.plist */; };
+		791C1C862AFB2EB4003E6362 /* CNLiveShopOrderExpressViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 791C1C852AFB2EB4003E6362 /* CNLiveShopOrderExpressViewController.swift */; };
+		791C1C882AFB6FD7003E6362 /* CNLiveShopOrderExpressFirmViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 791C1C872AFB6FD7003E6362 /* CNLiveShopOrderExpressFirmViewController.swift */; };
+		791C1C8A2AFB84EE003E6362 /* CNLiveShopOrderExpressListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 791C1C892AFB84EE003E6362 /* CNLiveShopOrderExpressListViewController.swift */; };
+		791C1C8C2AFB85F8003E6362 /* CNLiveShopBodyExpressView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 791C1C8B2AFB85F8003E6362 /* CNLiveShopBodyExpressView.swift */; };
 		79282A3C2A2EDC2500B5F8CF /* NSString+CNLiveExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79282A3B2A2EDC2500B5F8CF /* NSString+CNLiveExtensions.swift */; };
 		79282A402A2F055100B5F8CF /* CNLiveConfigUserInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79282A3F2A2F055100B5F8CF /* CNLiveConfigUserInfo.swift */; };
 		79282A442A2F1C1E00B5F8CF /* CNLiveLoginAuthView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79282A432A2F1C1E00B5F8CF /* CNLiveLoginAuthView.swift */; };
@@ -216,6 +220,10 @@
 		790D01A22A2DDBA300C5978D /* CNLiveConfigManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveConfigManager.swift; sourceTree = "<group>"; };
 		790D01A42A2DF65E00C5978D /* CNLiveLoginPickerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveLoginPickerView.swift; sourceTree = "<group>"; };
 		790D01A62A2DF84C00C5978D /* countries.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = countries.plist; sourceTree = "<group>"; };
+		791C1C852AFB2EB4003E6362 /* CNLiveShopOrderExpressViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopOrderExpressViewController.swift; sourceTree = "<group>"; };
+		791C1C872AFB6FD7003E6362 /* CNLiveShopOrderExpressFirmViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopOrderExpressFirmViewController.swift; sourceTree = "<group>"; };
+		791C1C892AFB84EE003E6362 /* CNLiveShopOrderExpressListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopOrderExpressListViewController.swift; sourceTree = "<group>"; };
+		791C1C8B2AFB85F8003E6362 /* CNLiveShopBodyExpressView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopBodyExpressView.swift; sourceTree = "<group>"; };
 		79282A3B2A2EDC2500B5F8CF /* NSString+CNLiveExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSString+CNLiveExtensions.swift"; sourceTree = "<group>"; };
 		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>"; };
@@ -683,6 +691,9 @@
 				799172392AF091E100DC01A8 /* CNLiveShopOrderListViewController.swift */,
 				79BB96A52AF21E2800AEA4AC /* CNLiveShopOrderDetailViewController.swift */,
 				794BC1642AF9E70D00A68C74 /* CNLiveShopOrderSendViewController.swift */,
+				791C1C852AFB2EB4003E6362 /* CNLiveShopOrderExpressViewController.swift */,
+				791C1C872AFB6FD7003E6362 /* CNLiveShopOrderExpressFirmViewController.swift */,
+				791C1C892AFB84EE003E6362 /* CNLiveShopOrderExpressListViewController.swift */,
 			);
 			path = Controller;
 			sourceTree = "<group>";
@@ -701,6 +712,7 @@
 				799172372AF090CD00DC01A8 /* CNLiveShopBodyListView.swift */,
 				79BB96A92AF2330900AEA4AC /* CNLiveShopBodyDetailView.swift */,
 				79A267822AF8D7BC0088D9F6 /* CNLiveShopBodyCustomView.swift */,
+				791C1C8B2AFB85F8003E6362 /* CNLiveShopBodyExpressView.swift */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -1167,6 +1179,7 @@
 				7CD675402A2740B0008354C1 /* CNDownSlideView.swift in Sources */,
 				19BB1FE32AEB8B7C0094D962 /* CNLiveShopConsoleViewModel.swift in Sources */,
 				792E57D92A3AA2F2005834DB /* CNLiveCommonBaseModel.swift in Sources */,
+				791C1C862AFB2EB4003E6362 /* CNLiveShopOrderExpressViewController.swift in Sources */,
 				7CD6753E2A2740B0008354C1 /* CNUpSlideView.swift in Sources */,
 				7CD675402A2740B0008354C1 /* CNDownSlideView.swift in Sources */,
 				79B2E3602AF39191002A8524 /* NSObject+CNLiveConfigModuleInline.swift in Sources */,
@@ -1204,6 +1217,7 @@
 				7905BB492AB0588B0089BC50 /* CNLiveMineAuthResultViewController.swift in Sources */,
 				19565EC22AF616CA007D6727 /* CNLiveShopDetailOrderAssetCell.swift in Sources */,
 				798A44EC2A302DBE00815935 /* CNLiveMineAddInfoViewController.swift in Sources */,
+				791C1C882AFB6FD7003E6362 /* CNLiveShopOrderExpressFirmViewController.swift in Sources */,
 				7CD675422A2740F8008354C1 /* CNCustomIndexView.swift in Sources */,
 				794BC1652AF9E70D00A68C74 /* CNLiveShopOrderSendViewController.swift in Sources */,
 				79BB96AA2AF2330900AEA4AC /* CNLiveShopBodyDetailView.swift in Sources */,
@@ -1216,6 +1230,7 @@
 				7CD675422A2740F8008354C1 /* CNCustomIndexView.swift in Sources */,
 				7C4931292A2D8BA8000E44B4 /* CNLiveBaseTabBarViewController.swift in Sources */,
 				79F4B1162A32B96B00993C03 /* CNLiveMineInfoViewController.swift in Sources */,
+				791C1C8A2AFB84EE003E6362 /* CNLiveShopOrderExpressListViewController.swift in Sources */,
 				7CD6753F2A2740B0008354C1 /* CNDownSlideViewRemindView.swift in Sources */,
 				19565ECF2AF8D8F6007D6727 /* CNLiveShopGoodsListCell.swift in Sources */,
 				7CD6753C2A2740B0008354C1 /* CNUpSlideViewRemindView.swift in Sources */,
@@ -1223,6 +1238,7 @@
 				798A44E82A30134400815935 /* CNLiveMineHeaderView.swift in Sources */,
 				7C49312D2A2DB9FA000E44B4 /* UITabBar+CNLiveExtensions.swift in Sources */,
 				79A267832AF8D7BC0088D9F6 /* CNLiveShopBodyCustomView.swift in Sources */,
+				791C1C8C2AFB85F8003E6362 /* CNLiveShopBodyExpressView.swift in Sources */,
 				790D019A2A2DCAE400C5978D /* CNLiveViewController.swift in Sources */,
 				79803E272AD68D3100F05F68 /* CNLiveMineShopViewController.swift in Sources */,
 				79A68C4C2A26EA6000DC3B43 /* (null) in Sources */,
@@ -67,4 +67,10 @@ extension Notification.Name {
         //WIFI状态通知
         public static let CNLiveNetworkStatusNotificationReachableViaWiFi = Notification.Name("CNLiveNetworkStatusNotificationReachableViaWiFi")
     }
+    struct ShopOrderStatue {
+        //修改发货成功通知
+        public static let CNLiveShopOrderEditExpressNotification = Notification.Name("CNLiveShopOrderEditExpressNotification")
+        //发货成功通知
+        public static let CNLiveShopOrderSendExpressNotification = Notification.Name("CNLiveShopOrderSendExpressNotification")
+    }
 }
@@ -242,8 +242,11 @@ class StandSortManager: NSObject {
         let no_auths = NSMutableArray()
         for item in stands {
             let listModel = item as! StandListModel
-            //这里需要及时去刷新认证状态  如果没有及时刷新这里回出现已经认证的状态不会进行排序
-            listModel.auth && have_id_auths.contains(listModel.id)  ? have_auths.add(listModel) : no_auths.add(listModel)
+//            print("listModel.auth==>\(listModel.auth)")
+//            print("listModel.id==>\(listModel.id)")
+//            print("have_id_auths==>\(have_id_auths)")
+            //这里需要及时去刷新认证状态  如果没有及时刷新这里回出现已经认证的状态不会进行排序  listModel.auth &&
+            have_id_auths.contains(listModel.id)  ? have_auths.add(listModel) : no_auths.add(listModel)
         }
         let tempArray = NSMutableArray()
         for item in have_auths {
@@ -80,4 +80,14 @@ extension NSString {
         }
         return mSelf.copy() as! String
     }
+    
+    ///  查看允不允许输入 例如 允许输入1、2时传入12
+    /// - Parameter string: 输入字符串
+    /// - Returns: 返回
+    func allowWriteString(string: String) -> Bool {
+        let cs = NSCharacterSet.init(charactersIn: string)
+        let filtered_array = components(separatedBy: cs as CharacterSet) as NSArray
+        let filtered = filtered_array.componentsJoined(by: "")
+        return self as String == filtered
+    }
 }
@@ -151,8 +151,7 @@ extension CNLiveMineViewController {
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         if indexPath.section == 0 {
-//            self.navigationController?.pushViewController(CNLiveMineQuestViewController.init(checkModel: checkModel), animated: true)
-            self.navigationController?.pushViewController(CNLiveShopOrderViewController.init(), animated: true)
+            self.navigationController?.pushViewController(CNLiveMineQuestViewController.init(checkModel: checkModel), animated: true)
         }
         if indexPath.section == 1 {
             self.navigationController?.pushViewController(CNLiveMineAddInfoViewController.init(show_type: .info), animated: true)
@@ -546,6 +546,7 @@ enum CNLiveStandListAlertShowType {
     case custom
     case text
     case date
+    case string
 }
 class MineStandListAlertView: UIView, UIPickerViewDelegate, UIPickerViewDataSource {
@@ -648,6 +649,8 @@ class MineStandListAlertView: UIView, UIPickerViewDelegate, UIPickerViewDataSour
             text = (infos.firstObject as! MineStandInfoModel).name
         } else if _show_type == .text {
             text = infos.firstObject as? Dictionary<String, String>
+        } else if _show_type == .string {
+            text = infos.firstObject as? String
         }else{
             let formatter = DateFormatter()
             formatter.dateFormat = "yyyy-MM-dd"
@@ -748,6 +751,9 @@ class MineStandListAlertView: UIView, UIPickerViewDelegate, UIPickerViewDataSour
             let dict = _infos![row] as? Dictionary<String, String>
             return dict?["title"] ?? ""
         }
+        if _show_type == .string {
+            return _infos![row] as? String
+        }
         return ""
     }
@@ -267,40 +267,40 @@ class CNLiveMineViewModel: NSObject {
                 if (errorCode == "0") {
                     let listModel = dictionaryToModel(resp as! [String : Any], StandListBaseModel.self,"data") as! StandListBaseModel
                     if page == 1 && listModel.list.count > 0 {
-//                        CNLiveSaveStandDB.shared.insertObjects(objects: listModel.list)
+                        CNLiveSaveStandDB.shared.insertObjects(objects: listModel.list)
                     }
                     listModel.list = StandSortManager.sortAllListData(stands: listModel.list as NSArray) as! [StandListModel]
                     resultBlock(listModel,.success)
                 } else {
-//                    let tempArray = CNLiveSaveStandDB.shared.searchAllObject()
-//                    if tempArray.count > 0 {
-//                        let listModel = StandListBaseModel.init()
-//                        listModel.pageNum = page
-//                        listModel.total = page
-//                        listModel.list = StandSortManager.sortAllListData(stands: tempArray as NSArray) as! [StandListModel]
-//                        resultBlock(listModel,.success)
-//                    }else{
-//                        showMessage(message: resp["errorMessage"] as! String)
-//                        resultBlock(NSNull(),.failed)
-//                    }
+                    let tempArray = CNLiveSaveStandDB.shared.searchAllObject()
+                    if tempArray.count > 0 {
+                        let listModel = StandListBaseModel.init()
+                        listModel.pageNum = page
+                        listModel.total = page
+                        listModel.list = StandSortManager.sortAllListData(stands: tempArray as NSArray) as! [StandListModel]
+                        resultBlock(listModel,.success)
+                    }else{
+                        showMessage(message: resp["errorMessage"] as! String)
+                        resultBlock(NSNull(),.failed)
+                    }
                 }
             } else {
-//                let tempArray = CNLiveSaveStandDB.shared.searchAllObject()
-//                if tempArray.count > 0 {
-//                    let listModel = StandListBaseModel.init()
-//                    listModel.pageNum = page
-//                    listModel.total = page
-//                    listModel.list = StandSortManager.sortAllListData(stands: tempArray as NSArray) as! [StandListModel]
-//                    resultBlock(listModel,.success)
-//                }else{
-//                    if CNLiveNetworking.isNetworking() {
-//                        showMessage(message: "获取失败")
-//                        resultBlock(NSNull(),.failed)
-//                    } else {
-//                        showMessage(message: "似乎与网络断开链接")
-//                        resultBlock(NSNull(),.noNetwork)
-//                    }
-//                }
+                let tempArray = CNLiveSaveStandDB.shared.searchAllObject()
+                if tempArray.count > 0 {
+                    let listModel = StandListBaseModel.init()
+                    listModel.pageNum = page
+                    listModel.total = page
+                    listModel.list = StandSortManager.sortAllListData(stands: tempArray as NSArray) as! [StandListModel]
+                    resultBlock(listModel,.success)
+                }else{
+                    if CNLiveNetworking.isNetworking() {
+                        showMessage(message: "获取失败")
+                        resultBlock(NSNull(),.failed)
+                    } else {
+                        showMessage(message: "似乎与网络断开链接")
+                        resultBlock(NSNull(),.noNetwork)
+                    }
+                }
             }
         }
     }
@@ -325,40 +325,40 @@ class CNLiveMineViewModel: NSObject {
                 if (errorCode == "0" && !(resp["data"] is NSNull)) {
                     let listModel = dictionaryToModel(resp as! [String : Any], MineAuthListBaseModel.self,"data") as! MineAuthListBaseModel
                     if page == 1 && listModel.list.count > 0 {
-//                        CNLiveSaveAuthDB.shared.insertObjects(objects: listModel.list)
+                        CNLiveSaveAuthDB.shared.insertObjects(objects: listModel.list)
                     }
                     listModel.list = StandSortManager.sortMyListData(auths: listModel.list as NSArray) as! [MineAuthListModel]
                     resultBlock(listModel,.success)
                 } else {
-//                    let tempArray = CNLiveSaveAuthDB.shared.searchAllObject()
-//                    if tempArray.count > 0 {
-//                        let listModel = MineAuthListBaseModel.init()
-//                        listModel.pageNum = page
-//                        listModel.total = page
-//                        listModel.list = StandSortManager.sortMyListData(auths: tempArray as NSArray) as! [MineAuthListModel]
-//                        resultBlock(listModel,.success)
-//                    }else{
-//                        showMessage(message: resp["errorMessage"] as! String)
-//                        resultBlock(NSNull(),.failed)
-//                    }
+                    let tempArray = CNLiveSaveAuthDB.shared.searchAllObject()
+                    if tempArray.count > 0 {
+                        let listModel = MineAuthListBaseModel.init()
+                        listModel.pageNum = page
+                        listModel.total = page
+                        listModel.list = StandSortManager.sortMyListData(auths: tempArray as NSArray) as! [MineAuthListModel]
+                        resultBlock(listModel,.success)
+                    }else{
+                        showMessage(message: resp["errorMessage"] as! String)
+                        resultBlock(NSNull(),.failed)
+                    }
                 }
             } else {
-//                let tempArray = CNLiveSaveAuthDB.shared.searchAllObject()
-//                if tempArray.count > 0 {
-//                    let listModel = MineAuthListBaseModel.init()
-//                    listModel.pageNum = page
-//                    listModel.total = page
-//                    listModel.list = StandSortManager.sortMyListData(auths: tempArray as NSArray) as! [MineAuthListModel]
-//                    resultBlock(listModel,.success)
-//                }else{
-//                    if CNLiveNetworking.isNetworking() {
-//                        showMessage(message: "获取失败")
-//                        resultBlock(NSNull(),.failed)
-//                    } else {
-//                        showMessage(message: "似乎与网络断开链接")
-//                        resultBlock(NSNull(),.noNetwork)
-//                    }
-//                }
+                let tempArray = CNLiveSaveAuthDB.shared.searchAllObject()
+                if tempArray.count > 0 {
+                    let listModel = MineAuthListBaseModel.init()
+                    listModel.pageNum = page
+                    listModel.total = page
+                    listModel.list = StandSortManager.sortMyListData(auths: tempArray as NSArray) as! [MineAuthListModel]
+                    resultBlock(listModel,.success)
+                }else{
+                    if CNLiveNetworking.isNetworking() {
+                        showMessage(message: "获取失败")
+                        resultBlock(NSNull(),.failed)
+                    } else {
+                        showMessage(message: "似乎与网络断开链接")
+                        resultBlock(NSNull(),.noNetwork)
+                    }
+                }
             }
         }
     }
@@ -603,8 +603,9 @@ class CNLiveMineViewModel: NSObject {
         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: .POST, urlString: APPBaseWjjBUrl+"/Api/Index3/myOrderCount", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
+        CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseWjjShopUrl+"/Api/Index3/myOrderCount", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
             if (error == nil) {
                 let resp = result as! NSDictionary
@@ -154,17 +154,18 @@ extension CNLiveShopOrderDetailViewController {
         case "通知自提":
             notifyOrder(detailModel: detailModel)
         case "快递发货":
-            self.navigationController?.pushViewController(CNLiveShopOrderSendViewController.init(orderId: detailModel.orderid! as NSString, show_type: .splite), animated: true)
+            self.navigationController?.pushViewController(CNLiveShopOrderSendViewController.init(orderId: detailModel.id! as NSString, show_type: .splite), animated: true)
         case "查看进度":
             print("查看进度")
         case "物流详情":
             print("物流详情")
+            pushExpressVC(detailModel: detailModel)
         case "退款详情":
             print("退款详情")
             let vc = CNLiveShopOrderDetailViewController(orderId: detailModel.id!, show_type: .sale, form_type: .order)
             self.navigationController?.pushViewController(vc, animated: true)
         case "订单详情":
-            self.navigationController?.pushViewController(CNLiveShopOrderDetailViewController(orderId: refuundModel.orderid!, show_type: .order, form_type: .afterSale), animated: true)
+            self.navigationController?.pushViewController(CNLiveShopOrderDetailViewController(orderId: refuundModel.id!, show_type: .order, form_type: .afterSale), animated: true)
         case "确认退款":
             ConfigAlertManager.shared.presentAlert(title: "提示", message: "确认给用户退款?", actionTitles: ["取消","确认"]) { [weak self] index in
                 if index == 1 {
@@ -190,12 +191,22 @@ 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)
+        } else {
+            
+        }
+    }
+    
     /// 通知用户自提
     /// - Parameter listModel: 数据源
     private func notifyOrder(detailModel: ShopOrderDetailModel) {
         ConfigAlertManager.shared.presentAlert(title: "提示", message: "确认通知用户自提?", actionTitles: ["取消","确认"]) { index in
             if index == 1 {
-                CNLiveShopViewModel.requestNotifyOrder(orderId: detailModel.orderid!) { result, respStatue in
+                CNLiveShopViewModel.requestNotifyOrder(orderId: detailModel.id!) { result, respStatue in
                     if respStatue == .success {
                         showMessage(message: "通知成功")
                     }
+//
+//  CNLiveShopOrderExpressListViewController.swift
+//  metaCode
+//
+//  Created by open on 2023/11/8.
+//
+
+import Foundation
+import EmptyDataSet_Swift
+
+typealias CNLiveShopOrderExpressFirmCompleterBlock = (_ model: ShopOrderExpressModel) -> Void
+class CNLiveShopOrderExpressFirmViewController: CNLiveBaseViewController, UITableViewDelegate, UITableViewDataSource, EmptyDataSetSource, EmptyDataSetDelegate {
+    
+    let kShopBodyOrderExpressListTableViewCellIdentifier = "kShopBodyOrderExpressListTableViewCellIdentifier"
+    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(ShopBodyOrderExpressFirmTableViewCell.self, forCellReuseIdentifier: kShopBodyOrderExpressListTableViewCellIdentifier)
+        return tableView
+    }()
+    
+    lazy var dataArray: NSMutableArray = {
+        let dataArray = NSMutableArray.init()
+        return dataArray
+    }()
+    
+
+    var network_type: CNLiveMineResponseType!
+    var completerBlock: CNLiveShopOrderExpressFirmCompleterBlock!
+    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() {
+        showLoading(message: "")
+        CNLiveShopViewModel.requestExpressList { [weak self] result, respStatue in
+            if respStatue == .success {
+                self!.dataArray.addObjects(from: (result as! NSMutableArray) as! [Any])
+                self!.tableView.reloadData()
+            }else if (respStatue == .noNetwork) {
+                self!.network_type = .noNetwork
+                self!.tableView.reloadEmptyDataSet()
+            } else {
+                self!.network_type = .failed
+                self!.tableView.reloadEmptyDataSet()
+            }
+        }
+    }
+    
+}
+extension CNLiveShopOrderExpressFirmViewController {
+    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: kShopBodyOrderExpressListTableViewCellIdentifier) as? ShopBodyOrderExpressFirmTableViewCell else {
+            return ShopBodyOrderExpressFirmTableViewCell()
+        }
+        cell.lineLabel.isHidden = (indexPath.row == dataArray.count-1)
+        cell.setupDataSource(model: dataArray[indexPath.row] as! ShopOrderExpressModel)
+        return cell
+    }
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        return adapt_length(length: 70)
+    }
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        let expressModel = self.dataArray[indexPath.row] as! ShopOrderExpressModel
+        if (completerBlock != nil) {
+            completerBlock(expressModel)
+        }
+        self.navigationController?.popViewController(animated: true)
+    }
+}
+
+extension CNLiveShopOrderExpressFirmViewController {
+    
+    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()
+        }
+    }
+}
+//
+//  CNLiveShopOrderExpressListViewController.swift
+//  metaCode
+//
+//  Created by open on 2023/11/8.
+//
+
+import Foundation
+import EmptyDataSet_Swift
+
+class CNLiveShopOrderExpressListViewController: CNLiveBaseViewController, UITableViewDelegate, UITableViewDataSource, EmptyDataSetSource, EmptyDataSetDelegate{
+    
+    let kShopBodyOrderExpressListTableViewCellIdentifier = "kShopBodyOrderExpressListTableViewCellIdentifier"
+    lazy var tableView: UITableView = {
+        let tableView = UITableView.init(frame: CGRect.zero, style: .plain)
+        tableView.dataSource = self
+        tableView.delegate = self
+        tableView.emptyDataSetSource = self
+        tableView.emptyDataSetDelegate = self
+        tableView.backgroundColor = .clear
+        tableView.tableFooterView = UIView.init()
+        tableView.separatorStyle = .none
+        tableView.register(ShopBodyOrderExpressListTableViewCell.self, forCellReuseIdentifier: kShopBodyOrderExpressListTableViewCellIdentifier)
+        return tableView
+    }()
+    
+    lazy var dataArray: NSMutableArray = {
+        let dataArray = NSMutableArray.init()
+        return dataArray
+    }()
+    
+    var _orderId: NSString!
+    var network_type: CNLiveMineResponseType!
+    init(orderId: NSString) {
+        _orderId = orderId
+        super.init(nibName:nil, bundle:nil)
+    }
+    
+    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() {
+        showLoading(message: "")
+        CNLiveShopViewModel.requestExpressList(orderId: _orderId) { [weak self] result, respStatue in
+            if respStatue == .success {
+                self!.dataArray.addObjects(from: result as! [ShopOrderExpressListModel])
+                self!.tableView.reloadData()
+            }else if (respStatue == .noNetwork) {
+                self!.network_type = .noNetwork
+                self!.tableView.reloadEmptyDataSet()
+            } else {
+                self!.network_type = .failed
+                self!.tableView.reloadEmptyDataSet()
+            }
+        }
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+}
+extension CNLiveShopOrderExpressListViewController {
+    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: kShopBodyOrderExpressListTableViewCellIdentifier) as? ShopBodyOrderExpressFirmTableViewCell else {
+            return ShopBodyOrderExpressFirmTableViewCell()
+        }
+        return cell
+    }
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        return adapt_length(length: 0.01)//130)
+    }
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        
+    }
+}
+
+extension CNLiveShopOrderExpressListViewController {
+    
+    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()
+        }
+    }
+}
+//
+//  CNLiveShopOrderExpressViewController.swift
+//  metaCode
+//
+//  Created by open on 2023/11/8.
+//
+
+import Foundation
+
+typealias CNLiveShopOrderExpressCompleterBlock = () -> Void
+class CNLiveShopOrderExpressViewController: CNLiveBaseViewController, UITableViewDelegate, UITableViewDataSource {
+    
+    let kShopBodyOrderExpressTableViewCellIdentifier = "kShopBodyOrderExpressTableViewCellIdentifier"
+    lazy var tableView: UITableView = {
+        let tableView = UITableView.init(frame: CGRect.zero, style: .plain)
+        tableView.dataSource = self
+        tableView.delegate = self
+        tableView.backgroundColor = HexColor("f1f2f6")
+        tableView.tableFooterView = UIView.init()
+        tableView.separatorStyle = .none
+        tableView.rowHeight = adapt_length(length: 50)
+        tableView.register(ShopBodyOrderExpressTableViewCell.self, forCellReuseIdentifier: kShopBodyOrderExpressTableViewCellIdentifier)
+        return tableView
+    }()
+    
+    lazy var footerView: UIView = {
+        let footerView = UIView.init(frame: CGRect(x: 0, y: KSreenHeight - get_system_tabbar_height(), width: KSreenWidth, height: get_system_tabbar_height()))
+        footerView.backgroundColor = .white
+        footerView.addSubview(cancelBtn)
+        cancelBtn.snp.makeConstraints { make in
+            make.width.equalTo(adapt_length(length: 130))
+            make.height.equalTo(get_system_tabbar_ui_height())
+            make.left.equalToSuperview()
+            make.top.equalToSuperview()
+        }
+        footerView.addSubview(deliveryBtn)
+        deliveryBtn.snp.makeConstraints { make in
+            make.width.equalTo(KSreenWidth - adapt_length(length: 130))
+            make.height.equalTo(get_system_tabbar_ui_height())
+            make.right.equalToSuperview()
+            make.top.equalToSuperview()
+        }
+        return footerView
+    }()
+    
+    lazy var cancelBtn: UIButton = {
+        let cancelBtn = UIButton.init(type: .custom)
+        cancelBtn.backgroundColor = .white
+        cancelBtn.setTitle("取消", for: .normal)
+        cancelBtn.setTitleColor(HexColor("#3A3A3A"), for: .normal)
+        cancelBtn.titleLabel?.font = medium_adapt_font(pointSize: 14)
+        cancelBtn.addTarget(self, action: #selector(cancelBtnClick), for: .touchUpInside)
+        return cancelBtn
+    }()
+    
+    lazy var deliveryBtn: UIButton = {
+        let deliveryBtn = UIButton.init()
+        deliveryBtn.backgroundColor = HexColor("#65C368")
+        deliveryBtn.setTitle(hiddenShop ? "确认修改" : "确认发货", for: .normal)
+        deliveryBtn.titleLabel?.font = regular_adapt_font(pointSize: 15)
+        deliveryBtn.setTitleColor(HexColor("#FFFFFF"), for: .normal)
+        deliveryBtn.addTarget(self, action: #selector(sendBtnClick), for: .touchUpInside)
+        return deliveryBtn
+    }()
+    
+    lazy var dataArray: NSMutableArray = {
+        let dataArray = NSMutableArray.init()
+        return dataArray
+    }()
+    
+    lazy var textArray: NSMutableArray = {
+        let textArray = NSMutableArray.init()
+        return textArray
+    }()
+    
+    var selectStoreModel: ShopOrderStoreModel!
+    var selectExpressModel: ShopOrderExpressModel!
+    var hiddenShop: Bool! = false//是否隐藏店铺名称
+    var _isExp: Bool! = false
+    var expId: String! = ""// 发货单id (多物流快递有用)
+    var expressModel: ShopOrderExpressModel!// 快递model
+    var express_num: String! = ""
+    var _goods_arr: NSArray!
+    var _orderId: String!
+    init(orderId: NSString,isExp: Bool,goods_arr: NSArray) {
+        super.init(nibName:nil, bundle:nil)
+        _orderId = orderId as String
+        _isExp = isExp
+        _goods_arr = goods_arr
+    }
+    
+    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())
+        }
+        
+        view.addSubview(footerView)
+    }
+    
+    func loadDataSourceAction(completerBlock: @escaping CNLiveShopOrderExpressCompleterBlock) {
+        showMessage(message: "")
+        CNLiveShopViewModel.requestSellerStore { [weak self] result, respStatue in
+            if respStatue == .success {
+                self!.dataArray.addObjects(from: (result as! [NSMutableArray]).first! as! [ShopOrderStoreModel])
+                self!.textArray.addObjects(from: (result as! [NSMutableArray]).last as! [String])
+                self!.tableView.reloadData()
+                completerBlock()
+            }
+        }
+    }
+    
+    @objc func sendBtnClick() {
+        if !hiddenShop && (selectStoreModel == nil) {
+            showMessage(message: "请选择店铺")
+            return
+        } else if (selectExpressModel == nil) {
+            showMessage(message: "请选择快递公司")
+            return
+        } else if (!selectExpressModel.no!.isNotBlank()) {
+            showMessage(message: "请输入快递单号")
+            return
+        } else if (!selectExpressModel.no!.allowWriteString(string: "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHRJKLMNOPQRSTUVWXYZ")) {
+            showMessage(message: "请输入正确快递单号")
+            return
+        }
+        showLoading(message: "")
+        CNLiveShopViewModel.requestExpress(orderId: _orderId, expressId: selectExpressModel.id!, expressNum: selectExpressModel.no!, hiddenSop: hiddenShop, expId: expId, goodsList: _goods_arr, storeId: selectStoreModel.id!) { [weak self] result, respStatue in
+            if respStatue == .success {
+                showMessage(message: result as! String)
+                if !self!.hiddenShop {
+                    var dic: NSDictionary = [:]
+                    if self!._isExp {
+                        dic = ["selectNum":NSNumber(integerLiteral: 1)]
+                    }
+                    if self!.hiddenShop {
+                        NotificationCenter.default.post(name: Notification.Name.ShopOrderStatue.CNLiveShopOrderEditExpressNotification, object: nil)
+                    } else {
+                        NotificationCenter.default.post(name: Notification.Name.ShopOrderStatue.CNLiveShopOrderSendExpressNotification, object: dic)
+                    }
+                }
+            }
+        }
+    }
+    
+    @objc func cancelBtnClick() {
+        self.navigationController?.popViewController(animated: true)
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+}
+
+extension CNLiveShopOrderExpressViewController {
+    func numberOfSections(in tableView: UITableView) -> Int {
+        return 1
+    }
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return hiddenShop ? 2 : 3
+    }
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        guard let cell = tableView.dequeueReusableCell(withIdentifier: kShopBodyOrderExpressTableViewCellIdentifier) as? ShopBodyOrderExpressTableViewCell else {
+            return ShopBodyOrderExpressTableViewCell()
+        }
+        var title: String = ""
+        var content: String = ""
+        var placeHolder: String = ""
+        var contentIsEdit: Bool = false
+        var isShowArrowImage: Bool = false
+        var isShowLine: Bool = false
+        if !hiddenShop && indexPath.row == 0 {
+            title = "店铺名称"
+            if selectStoreModel != nil {
+                content = selectStoreModel.title!.isNotBlank() ? selectStoreModel.title! as String : "" as String
+            }
+            placeHolder = "请选择店铺"
+            isShowArrowImage = true
+            isShowLine = true
+        } else if (indexPath.row == (hiddenShop ? 0 : 1)) {
+            title = "快递公司"
+            if selectExpressModel != nil {
+                content = selectExpressModel.com!.isNotBlank() ? selectExpressModel.com! as String : "" as String
+            }
+            placeHolder = "请选择快递公司"
+            isShowArrowImage = true
+            isShowLine = true
+        } else {
+            title = "快递单号"
+            if express_num.isNotBlank() {
+                content = express_num! as String
+                selectExpressModel.no = express_num as String
+            } else {
+                if selectExpressModel != nil {
+                    content = (selectExpressModel.no != nil) ? selectExpressModel.no! : ""
+                }
+            }
+            placeHolder = "请输入单号"
+            contentIsEdit = true
+        }
+        cell.row = indexPath.row
+        cell.setup(title: title, content: content, placeHolder: placeHolder, contentIsEdit: contentIsEdit, isShowArrowImage: isShowArrowImage, isShowLine: isShowLine)
+        cell.clickBlock = {[weak self] content, row in
+            if row == (self!.hiddenShop ? 1 : 2) {
+                self!.selectExpressModel.no = content
+            }
+        }
+        return cell
+    }
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        return adapt_length(length: 50)
+    }
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        if !hiddenShop && indexPath.row == 0 {
+            if dataArray.count > 0 {
+                MineStandListAlertView.showStandListView(infos: textArray, name: "请选择店铺", show_type: .string) { [weak self] text in
+                    let index = self!.textArray.index(of: text)
+                    self!.selectStoreModel = (self!.dataArray[index] as! ShopOrderStoreModel)
+                    self!.tableView.reloadData()
+                }
+            } else {
+                loadDataSourceAction { [weak self] in
+                    MineStandListAlertView.showStandListView(infos: self!.textArray, name: "请选择店铺", show_type: .string) { text in
+                        let index = self!.textArray.index(of: text)
+                        self!.selectStoreModel = (self!.dataArray[index] as! ShopOrderStoreModel)
+                        self!.tableView.reloadData()
+                    }
+                }
+            }
+        } else if (indexPath.row == (self.hiddenShop ? 0 : 1)) {
+            let vc = CNLiveShopOrderExpressFirmViewController.init()
+            vc.completerBlock = {[weak self] model in
+                self!.selectExpressModel = model
+                self!.tableView.reloadData()
+            }
+            self.navigationController?.pushViewController(vc, animated: true)
+        }
+    }
+}
+
@@ -178,8 +178,8 @@ extension CNLiveShopOrderListViewController {
         let footerView = tableView.dequeueReusableHeaderFooterView(withIdentifier: kShopBodyOrderFooterViewCellIdentifier) as! ShopBodyOrderFooterViewCell
         let listModel = (dataArray[section] as! ShopOrderListModel)
         footerView.setupDataSource(listModel: listModel)
-        footerView.clickRightBtnCallBack = { [weak self] clickEvent, listModel in
-            self?.orderOperation(clickEvent: clickEvent, listModel: listModel)
+        footerView.clickRightBtnCallBack = { [weak self] title, clickEvent, listModel in
+            self?.orderOperation(title: title, event: clickEvent, listModel: listModel)
         }
         return footerView
     }
@@ -241,10 +241,14 @@ extension CNLiveShopOrderListViewController {
     /// - Parameters:
     ///   - clickEvent: 按钮类型
     ///   - listModel: 数据源
-    private func orderOperation(clickEvent: CNDSOrderListSectionFooterBtnClickEvent, listModel: ShopOrderListModel) {
-        switch clickEvent {
+    private func orderOperation(title: String, event: CNDSOrderListSectionFooterBtnClickEvent, listModel: ShopOrderListModel) {
+        switch event {
         case .delivery:
-            self.navigationController?.pushViewController(CNLiveShopOrderSendViewController.init(orderId: listModel.id! as NSString, show_type: .splite), animated: true)
+            if listModel.is_tui == "2" {
+                showMessage(message: "此为退款订单")
+                return
+            }
+            delivery(listModel: listModel)
             break
         case .notifyOrder:
             if listModel.is_tui == "2" {
@@ -256,11 +260,41 @@ extension CNLiveShopOrderListViewController {
         case .connection:
             pushOrderDetail(listModel: listModel)
             break
+        case .expDetail:
+            delivery(listModel: listModel)
+            break
+        case .checkExpress:
+            pushExpressVC(listModel: listModel)
+            break
+        case .express:
+            pushExpressVC(listModel: listModel)
+            break
         default:
             break
         }
     }
+    /// 跳转物流相关界面
+    /// - 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)
+        } else {
+            
+        }
+    }
+    
+    /// 选取商品及拆单
+    /// - Parameter listModel: 数据源
+    private func delivery(listModel: ShopOrderListModel) {
+        var type: CNLiveShopOrderSpliteSendViewType = .splite
+        if listModel.is_send == "0" {
+            type = .select
+        }
+        self.navigationController?.pushViewController(CNLiveShopOrderSendViewController.init(orderId: listModel.id! as NSString, show_type: type), animated: true)
+    }
+    
     /// 通知用户自提
     /// - Parameter listModel: 数据源
     private func notifyOrder(listModel: ShopOrderListModel) {
@@ -34,16 +34,66 @@ class CNLiveShopOrderSendViewController: CNLiveBaseViewController, UITableViewDe
     lazy var saveButton: UIButton = {
         let saveButton = UIButton.init(type: .custom)
         saveButton.frame = CGRect(x: KSreenWidth - 70, y: (get_system_nav_height() - (get_system_statusBar_height() + 25))/2 + get_system_statusBar_height(), width: 60, height: 25)
-        saveButton.setTitle("拆单", for: .normal)
+        saveButton.setTitle("拆 单", for: .normal)
         saveButton.titleLabel?.font = semibold_adapt_font(pointSize: 15)
         saveButton.setTitleColor(HexColor("#F5A623"), for: .normal)
         saveButton.backgroundColor = .clear
         saveButton.layer.masksToBounds  = true
         saveButton.layer.cornerRadius = 5
-        saveButton.addTarget(self, action: #selector(spliteBtnClick), for: .touchUpInside)
+        saveButton.addTarget(self, action: #selector(bottomBtnClick), for: .touchUpInside)
+        saveButton.tag = 1000
         return saveButton
     }()
+    lazy var footerView: UIView = {
+        let footerView = UIView.init(frame: CGRect(x: 0, y: KSreenHeight - get_system_tabbar_height(), width: KSreenWidth, height: get_system_tabbar_height()))
+        footerView.backgroundColor = .white
+        footerView.addSubview(allSelectBtn)
+        allSelectBtn.snp.makeConstraints { make in
+            make.width.equalTo(65)
+            make.height.equalTo(30)
+            make.left.equalToSuperview().offset(adapt_length(length: 20))
+            make.top.equalToSuperview().offset(adapt_length(length: 9.5))
+        }
+        footerView.addSubview(deliveryBtn)
+        deliveryBtn.snp.makeConstraints { make in
+            make.width.equalTo(77)
+            make.height.equalTo(30)
+            make.right.equalToSuperview().offset(-adapt_length(length: 20))
+            make.top.equalToSuperview().offset(adapt_length(length: 9.5))
+        }
+        return footerView
+    }()
+    
+    lazy var allSelectBtn: UIButton = {
+        let allSelectBtn = UIButton.init(type: .custom)
+        allSelectBtn.backgroundColor = .white
+        allSelectBtn.setImage(UIImage(named: "DS_goods_select_no"), for: .normal)
+        allSelectBtn.setImage(UIImage(named: "DS_goods_select_yes"), for: .selected)
+        allSelectBtn.setTitle("  全选", for: .normal)
+        allSelectBtn.setTitleColor(HexColor("#3A3A3A"), for: .normal)
+        allSelectBtn.setTitle("  全选", for: .selected)
+        allSelectBtn.setTitleColor(HexColor("#3A3A3A"), for: .selected)
+        allSelectBtn.titleLabel?.font = medium_adapt_font(pointSize: 14)
+        allSelectBtn.addTarget(self, action: #selector(bottomBtnClick), for: .touchUpInside)
+        allSelectBtn.isHidden = _show_type == .splite
+        allSelectBtn.tag = 1001
+        return allSelectBtn
+    }()
+    
+    lazy var deliveryBtn: UIButton = {
+        let deliveryBtn = UIButton.init()
+        deliveryBtn.backgroundColor = HexColor("#65C368")
+        deliveryBtn.layer.cornerRadius = 4
+        deliveryBtn.layer.masksToBounds = true
+        deliveryBtn.setTitle("快递发货", for: .normal)
+        deliveryBtn.titleLabel?.font = regular_adapt_font(pointSize: 14)
+        deliveryBtn.setTitleColor(HexColor("#FFFFFF"), for: .normal)
+        deliveryBtn.addTarget(self, action: #selector(bottomBtnClick), for: .touchUpInside)
+        deliveryBtn.tag = 1002
+        return deliveryBtn
+    }()
+    
     lazy var dataArray: NSMutableArray = {
         let dataArray = NSMutableArray.init()
         return dataArray
@@ -71,14 +121,16 @@ class CNLiveShopOrderSendViewController: CNLiveBaseViewController, UITableViewDe
             topNavView.addSubview(saveButton)
         }
-        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())
         }
+        
+        loadDataSourceAction()
+        
+        view.addSubview(footerView)
     }
     func loadDataSourceAction() {
@@ -112,8 +164,44 @@ class CNLiveShopOrderSendViewController: CNLiveBaseViewController, UITableViewDe
         }
     }
-    @objc func spliteBtnClick() {
-        
+    @objc func bottomBtnClick(button: UIButton) {
+        //拆单
+        if button.tag == 1000 {
+            self.navigationController?.pushViewController(CNLiveShopOrderSendViewController.init(orderId: _orderId, show_type: .select), animated: true)
+        }
+        //全选
+        if button.tag == 1001 {
+            button.isSelected = !button.isSelected
+            for model in self.dataArray {
+                (model as! ShopOrderListGoodsModel).select = button.isSelected
+            }
+            tableView.reloadData()
+        }
+        //快递发货
+        if button.tag == 1002 {
+            var goods_array: NSArray = []
+            var isExp: Bool = false
+            if _show_type == .select {
+                let array = NSMutableArray.init()
+                for item in dataArray {
+                    let model = item as! ShopOrderListGoodsModel
+                    if (model.select == false || (model.selectNum! < ((model.send_num != 0 ? model.send_num : model.num)!))) {
+                        isExp = true
+                    }
+                    if model.select == true {
+                        let dic = ["id":model.goods_id,"num":"\(model.selectNum ?? 0)"]
+                        array.add(dic)
+                    }
+                }
+                goods_array = array.copy() as! NSArray
+                if goods_array.count <= 0 {
+                    showMessage(message: "请选择发货商品")
+                    return
+                }
+            }
+            let vc = CNLiveShopOrderExpressViewController.init(orderId: _orderId,isExp: isExp, goods_arr: goods_array)
+            self.navigationController?.pushViewController(vc, animated: true)
+        }
     }
 }
 extension CNLiveShopOrderSendViewController {
@@ -128,13 +216,28 @@ extension CNLiveShopOrderSendViewController {
             guard let cell = tableView.dequeueReusableCell(withIdentifier: kShopBodyOrderSelectTableViewCellIdentifier) as? ShopBodyOrderSelectTableViewCell else {
                 return ShopBodyOrderSelectTableViewCell()
             }
-
+            cell.setupDataSource(goodsModel: self.dataArray[indexPath.row] as! ShopOrderListGoodsModel)
+            cell.clickCallBack = { [self] isSelected in
+                if isSelected {
+                    var select :Bool = true
+                    for model in dataArray {
+                        if !(model as! ShopOrderListGoodsModel).select {
+                            select = false
+                        }
+                    }
+                    allSelectBtn.isSelected = select
+                } else {
+                    allSelectBtn.isSelected = false
+                }
+            }
+            cell.lineLabel.isHidden = (indexPath.row == dataArray.count-1)
             return cell
         } else {
             guard let cell = tableView.dequeueReusableCell(withIdentifier: kShopBodyOrderSpliteTableViewCellIdentifier) as? ShopBodyOrderSpliteTableViewCell else {
                 return ShopBodyOrderSpliteTableViewCell()
             }
             cell.setupDataSource(goodsModel: self.dataArray[indexPath.row] as! ShopOrderListGoodsModel)
+            cell.lineLabel.isHidden = (indexPath.row == dataArray.count-1)
             return cell
         }
     }
@@ -142,7 +245,22 @@ extension CNLiveShopOrderSendViewController {
         return adapt_length(length: 130)
     }
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        
+        if _show_type == .select {
+            let goodsModel = dataArray[indexPath.row] as! ShopOrderListGoodsModel
+            goodsModel.select = !goodsModel.select
+            if goodsModel.select {
+                var select: Bool = true
+                for model in dataArray {
+                    if !(model as! ShopOrderListGoodsModel).select {
+                        select = false
+                    }
+                }
+                allSelectBtn.isSelected = select
+            } else {
+                allSelectBtn.isSelected = false
+            }
+            tableView.reloadRows(at: [indexPath], with: .none)
+        }
     }
 }
@@ -36,7 +36,7 @@ class ShopOrderListModel: BaseModel {
     var express_state: String? = "" //   2在途 3签收
     var order_detail = [ShopOrderListGoodsModel]() //   商品
     var is_send: String? = "" //   state为3时 is_send为 0时为部分发货 1已发货
-    var send_num: String? = "" //   发货数量
+    var send_num: Int = 0 //   发货数量
     override func mapping(mapper: HelpingMapper) {
         mapper <<<
@@ -86,7 +86,7 @@ class ShopOrderDetailModel: BaseModel {
     var order_detail = [ShopOrderListGoodsModel]() //   商品
     var username: String? = "" //  用户名
     var is_send: String? = "" //   是否拆单，state = 3时判断
-    var send_num: String? = "" //   物流数量
+    var send_num: Int = 0 //   物流数量
     var refund_num: String? = "" //   已经退款数量
     var is_send_all: Bool = true //  是否是全部发货,这是自己设置的属性
@@ -192,3 +192,48 @@ class ShopOrderListGoodsModel: BaseModel {
     var select: Bool = false // 商品是否被选中
 }
+
+//!!!: 快递公司model
+class ShopOrderExpressModel: BaseModel {
+    var id: String? = ""// 快递公司id
+    var com: String? = ""// 名称
+    var no: String? = ""// 编号
+    var tel: String? = ""// 电话
+    var simg: String? = ""// logo
+    var address: String? = ""// 收货地址
+    var state: String? = ""// 3为已完成 其他为运输中
+}
+
+//!!!: 店铺model
+class ShopOrderStoreModel: BaseModel {
+    var id: String? = ""//  店铺id
+    var title: String? = ""// 名称
+    var address: String? = ""// 地址
+    var phone: String? = ""// 电话
+    var longitude: String? = ""// 经度
+    var latitude: String? = ""// 维度
+    var state: String? = ""// 状态
+}
+
+//!!!: 多物流数据源
+class ShopOrderExpressListModel: BaseModel {
+    var id: String? = ""//  发货单id
+    var order_id: String? = ""//  订单id
+    var express: String? = ""// 快递名称
+    var express_num: String? = ""//  快递单号
+    var simg: String? = ""//  快递logo
+    var detail_goods = [ShopOrderListGoodsModel]()//  发货单内商品
+    var expressNew = ShopOrderExpressDetailDateModel()// 快递信息
+}
+//!!!: 物流详情数据
+class ShopOrderExpressDetailModel: BaseModel {
+    var express = ShopOrderExpressModel()// 快递公司信息
+    var data = [ShopOrderExpressDetailDateModel]()// 数据
+}
+
+//!!!: 物流详情数据
+class ShopOrderExpressDetailDateModel: BaseModel {
+    var AcceptTime: String? = ""//  时间
+    var AcceptStation: String? = ""// 内容
+    var accept_time: String? = ""//   时间戳
+}
@@ -10,6 +10,8 @@ import SnapKit
 import Kingfisher
 typealias clickAgreeCallBack = (_ refundView: ShopBodyOrderRefundView,_ desc: String) -> Void
+typealias clickButtonCallBack = (_ isSelected: Bool) -> Void
+typealias clickInputCallBack = (_ content: String, _ row: NSInteger) -> Void
 class ShopBodyOrderRefundView: UIView, UITextViewDelegate {
     var clickBlock: clickAgreeCallBack!
@@ -235,7 +237,6 @@ class ShopBodyOrderSpliteTableViewCell: UITableViewCell {
         contentView.backgroundColor = .clear
         selectionStyle = .none
-        
         addSubview(goodsImageView)
         goodsImageView.snp.makeConstraints { make in
             make.left.top.equalToSuperview().offset(adapt_length(length: 15))
@@ -284,10 +285,400 @@ class ShopBodyOrderSpliteTableViewCell: UITableViewCell {
 class ShopBodyOrderSelectTableViewCell: UITableViewCell {
+    lazy var goodsImageView: UIImageView = {
+        let goodsImageView = UIImageView.init()
+        goodsImageView.backgroundColor = .white
+        goodsImageView.contentMode = .scaleAspectFill
+        goodsImageView.layer.masksToBounds = true
+        return goodsImageView
+    }()
+    
+    lazy var goodsTitle: UILabel = {
+        let goodsTitle = UILabel.init()
+        goodsTitle.lineBreakMode = .byClipping
+        goodsTitle.numberOfLines = 2
+        goodsTitle.textColor = HexColor("#333333")
+        goodsTitle.font = regular_adapt_font(pointSize: 14)
+        return goodsTitle
+    }()
+    
+    lazy var priceLabel: UILabel = {
+        let priceLabel = UILabel.init()
+        priceLabel.textColor = HexColor("#FC1541")
+        priceLabel.font = medium_adapt_font(pointSize: 21)
+        return priceLabel
+    }()
+    
+    lazy var numberLabel: UILabel = {
+        let numberLabel = UILabel.init()
+        numberLabel.textAlignment = .right
+        numberLabel.textColor = HexColor("#222833")
+        numberLabel.font = regular_adapt_font(pointSize: 15)
+        return numberLabel
+    }()
+    
+    lazy var unNumberLabel: UILabel = {
+        let unNumberLabel = UILabel.init()
+        unNumberLabel.textAlignment = .right
+        unNumberLabel.textColor = HexColor("#222833")
+        unNumberLabel.font = regular_adapt_font(pointSize: 15)
+        return unNumberLabel
+    }()
+    
+    lazy var lineLabel: UILabel = {
+        let lineLabel = UILabel.init()
+        lineLabel.backgroundColor = HexColor("#EAEAEA")
+        return lineLabel
+    }()
+    
+    lazy var selectButton: UIButton = {
+        let selectButton = UIButton.init(type: .custom)
+        selectButton.setImage(UIImage(named: "DS_goods_select_no"), for: .normal)
+        selectButton.setImage(UIImage(named: "DS_goods_select_yes"), for: .selected)
+        selectButton.addTarget(self, action: #selector(buttonClick), for: .touchUpInside)
+        selectButton.tag = 1001
+        return selectButton
+    }()
+    
+    lazy var addButton: UIButton = {
+        let addButton = UIButton.init(type: .custom)
+        addButton.setImage(UIImage(named: "DS_goods_add_yes"), for: .normal)
+        addButton.setImage(UIImage(named: "DS_goods_add_no"), for: .selected)
+        addButton.addTarget(self, action: #selector(buttonClick), for: .touchUpInside)
+        addButton.tag = 1002
+        return addButton
+    }()
+    
+    lazy var minusButton: UIButton = {
+        let minusButton = UIButton(type: .custom)
+        minusButton.setImage(UIImage(named: "DS_goods_sub_yes"), for: .normal)
+        minusButton.setImage(UIImage(named: "DS_goods_sub_no"), for: .selected)
+        minusButton.addTarget(self, action: #selector(buttonClick), for: .touchUpInside)
+        minusButton.tag = 1003
+        return minusButton
+    }()
+    
+    var clickCallBack: clickButtonCallBack!
+    var _goodsModel: ShopOrderListGoodsModel!
     override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
         super.init(style: style, reuseIdentifier: reuseIdentifier)
+        contentView.backgroundColor = .clear
+        selectionStyle = .none
+        addSubview(selectButton)
+        selectButton.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.left.equalToSuperview().offset(adapt_length(length: 15))
+            make.size.equalTo(adapt_length(length: 17))
+        }
+        addSubview(goodsImageView)
+        goodsImageView.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.left.equalTo(selectButton.snp.right).offset(adapt_length(length: 15))
+            make.size.equalTo(adapt_length(length: 100))
+        }
+        addSubview(goodsTitle)
+        goodsTitle.snp.makeConstraints { make in
+            make.top.equalTo(goodsImageView)
+            make.left.equalTo(goodsImageView.snp.right).offset(adapt_length(length: 15))
+            make.right.equalToSuperview().offset(-adapt_length(length: 15))
+        }
+        addSubview(unNumberLabel)
+        unNumberLabel.snp.makeConstraints { make in
+            make.left.equalTo(goodsTitle)
+            make.top.equalTo(goodsTitle.snp.bottom).offset(adapt_length(length: 5))
+        }
+        addSubview(addButton)
+        addButton.snp.makeConstraints { make in
+            make.right.bottom.equalToSuperview().offset(-adapt_length(length: 15))
+            make.size.equalTo(adapt_length(length: 29))
+        }
+        addSubview(numberLabel)
+        numberLabel.snp.makeConstraints { make in
+            make.right.equalTo(addButton.snp.left).offset(-adapt_length(length: 6))
+            make.centerY.equalTo(addButton)
+        }
+        addSubview(minusButton)
+        minusButton.snp.makeConstraints { make in
+            make.right.equalTo(numberLabel.snp.left).offset(-adapt_length(length: 6))
+            make.centerY.equalTo(addButton)
+        }
+        addSubview(priceLabel)
+        priceLabel.snp.makeConstraints { make in
+            make.left.equalTo(goodsTitle)
+            make.bottom.equalTo(goodsImageView)
+        }
+        addSubview(lineLabel)
+        lineLabel.snp.makeConstraints { make in
+            make.left.equalTo(goodsImageView)
+            make.right.equalTo(numberLabel)
+            make.bottom.equalToSuperview().offset(-adapt_length(length: 0.5))
+            make.height.equalTo(adapt_length(length: 0.5))
+        }
+    }
+    
+    @objc func buttonClick(sender: UIButton) {
+        if sender.tag - 1000 != 1 {
+            if sender.isSelected {
+                return
+            }
+            var selectNum = _goodsModel.selectNum
+            switch sender.tag - 1001 {
+            case 1:
+                selectNum! += 1
+                break
+            case 2:
+                selectNum! -= 1
+            default:
+                break
+            }
+            _goodsModel.selectNum = selectNum
+            numberLabel.text = "\(_goodsModel.selectNum ?? 0)"
+            numberLabel.sizeToFit()
+            setNeedsLayout()
+            if unNumberLabel.isHidden {
+                if _goodsModel.num! <= _goodsModel.selectNum! {
+                    addButton.isSelected = true
+                } else {
+                    addButton.isSelected = false
+                }
+            } else {
+                if _goodsModel.send_num! - _goodsModel.refund_num! <= _goodsModel.selectNum! {
+                    addButton.isSelected = true
+                } else {
+                    addButton.isSelected = false
+                }
+            }
+            if _goodsModel.selectNum! > 1 {
+                minusButton.isSelected = false
+            } else {
+                minusButton.isSelected = true
+            }
+        } else {
+            sender.isSelected = !sender.isSelected
+            _goodsModel.select = sender.isSelected
+            if (clickCallBack != nil) {
+                self.clickCallBack(sender.isSelected)
+            }
+        }
+    }
+    
+    func setupDataSource(goodsModel: ShopOrderListGoodsModel) {
+        _goodsModel = goodsModel
+        goodsImageView.kf.setImage(with: URL(string: goodsModel.simg!))
+        goodsTitle.text = goodsModel.title
+        unNumberLabel.text = "剩余发货数量：\(Int(goodsModel.send_num!)-Int(goodsModel.refund_num!))"
+        unNumberLabel.isHidden = (Int(goodsModel.send_num!)-Int(goodsModel.refund_num!) == 0)
+        unNumberLabel.sizeToFit()
+        priceLabel.text = "¥ \(goodsModel.price!)"
+        priceLabel.sizeToFit()
+        numberLabel.text = "\(goodsModel.selectNum ?? 0)"
+        numberLabel.sizeToFit()
+        
+        setNeedsLayout()
+        if unNumberLabel.isHidden {
+            if goodsModel.num! > goodsModel.selectNum! {
+                addButton.isSelected = false
+            } else {
+                addButton.isSelected = true
+            }
+        } else {
+            if (goodsModel.send_num! - goodsModel.refund_num! > goodsModel.selectNum!) {
+                addButton.isSelected = false
+            } else {
+                addButton.isSelected = true
+            }
+        }
+        if goodsModel.selectNum! > 1 {
+            minusButton.isSelected = false
+        } else {
+            minusButton.isSelected = true
+        }
+        selectButton.isSelected = goodsModel.select
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+}
+
+class ShopBodyOrderExpressTableViewCell: UITableViewCell, UITextFieldDelegate {
+    
+    lazy var titleLab: UILabel = {
+        let titleLab = UILabel.init()
+        titleLab.textColor = HexColor("#3a3a3a")
+        titleLab.font = medium_adapt_font(pointSize: 14)
+        return titleLab
+    }()
+    
+    lazy var contentTextField: UITextField = {
+        let contentTextField = UITextField.init()
+        contentTextField.textColor = HexColor("#3a3a3a")
+        contentTextField.font = medium_adapt_font(pointSize: 14)
+        contentTextField.textAlignment = .left
+        contentTextField.clipsToBounds = true
+        contentTextField.keyboardType = .default
+        contentTextField.delegate = self
+        contentTextField.returnKeyType = .done
+        return contentTextField
+    }()
+    
+    lazy var rightArrowImageView: UIImageView = {
+        let rightArrowImageView = UIImageView.init()
+        rightArrowImageView.image = UIImage(named: "mine_header_message_gray_more")
+        return rightArrowImageView
+    }()
+    
+    lazy var lineLabel: UILabel = {
+        let lineLabel = UILabel.init()
+        lineLabel.backgroundColor = HexColor("#EAEAEA")
+        return lineLabel
+    }()
+    
+    var row: NSInteger!
+    var clickBlock: clickInputCallBack!
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        contentView.backgroundColor = .clear
+        selectionStyle = .none
+        
+        addSubview(titleLab)
+        titleLab.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.width.equalTo(adapt_length(length: 100))
+            make.left.equalToSuperview().offset(adapt_length(length: 15))
+        }
+        addSubview(rightArrowImageView)
+        rightArrowImageView.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.right.equalToSuperview().offset(-adapt_length(length: 15))
+            make.size.equalTo(adapt_length(length: 12))
+        }
+        addSubview(contentTextField)
+        contentTextField.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.left.equalTo(titleLab.snp.right).offset(adapt_length(length: 15))
+            make.right.equalTo(rightArrowImageView.snp.left).offset(-adapt_length(length: 10))
+        }
+        addSubview(lineLabel)
+        lineLabel.snp.makeConstraints { make in
+            make.left.equalTo(adapt_length(length: 10))
+            make.right.equalTo(-adapt_length(length: 10))
+            make.bottom.equalToSuperview().offset(-adapt_length(length: 0.5))
+            make.height.equalTo(adapt_length(length: 0.5))
+        }
+    }
+    
+    func setup(title: String, content: String, placeHolder: String, contentIsEdit: Bool, isShowArrowImage: Bool, isShowLine: Bool) {
+        titleLab.text = title
+        contentTextField.text = content
+        contentTextField.placeholder = placeHolder
+        contentTextField.isUserInteractionEnabled = contentIsEdit
+        rightArrowImageView.isHidden = !isShowArrowImage
+        lineLabel.isHidden = !isShowLine
+        
+        let size = contentTextField.sizeThatFits(CGSize(width: KSreenWidth - adapt_length(length: 145), height: CGFLOAT_MAX))
+        
+        contentTextField.snp.remakeConstraints { make in
+            make.left.equalTo(titleLab.snp.right).offset(adapt_length(length: 15))
+            make.top.equalToSuperview().offset(adapt_length(length: 15))
+            if rightArrowImageView.isHidden {
+                make.right.equalToSuperview().offset(-adapt_length(length: 15))
+                make.height.equalTo(size.height > adapt_length(length: 20) ? size.height : adapt_length(length: 20))
+            } else {
+                make.bottom.equalToSuperview().offset(-adapt_length(length: 15))
+                make.right.equalTo(rightArrowImageView.snp.left).offset(-adapt_length(length: 5))
+            }
+        }
+    }
+    
+    func textFieldDidEndEditing(_ textField: UITextField) {
+        if textField == contentTextField {
+            if (clickBlock != nil) {
+                clickBlock(contentTextField.text!,row)
+            }
+        }
+    }
+    func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool {
+        if string == "\n" || contentTextField.text!.count > 20 {
+            return false
+        } else {
+            return true
+        }
+    }
+    
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+}
+
+
+class ShopBodyOrderExpressFirmTableViewCell: UITableViewCell {
+    
+    lazy var headerImageView: UIImageView = {
+        let headerImageView = UIImageView.init()
+        headerImageView.backgroundColor = .white
+        headerImageView.contentMode = .scaleAspectFill
+        headerImageView.layer.masksToBounds = true
+        return headerImageView
+    }()
+    
+    lazy var titleLabel: UILabel = {
+        let titleLabel = UILabel.init()
+        titleLabel.textColor = HexColor("#383838")
+        titleLabel.font = regular_adapt_font(pointSize: 15)
+        return titleLabel
+    }()
+    
+    lazy var descLabel: UILabel = {
+        let descLabel = UILabel.init()
+        descLabel.textColor = HexColor("#a5a5a5")
+        descLabel.font = light_adapt_font(pointSize: 14)
+        return descLabel
+    }()
+    
+    lazy var lineLabel: UILabel = {
+        let lineLabel = UILabel.init()
+        lineLabel.backgroundColor = HexColor("#EAEAEA")
+        return lineLabel
+    }()
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        contentView.backgroundColor = .clear
+        selectionStyle = .none
+        
+        addSubview(headerImageView)
+        headerImageView.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.left.equalToSuperview().offset(adapt_length(length: 15))
+            make.size.equalTo(adapt_length(length: 36))
+        }
+        addSubview(titleLabel)
+        titleLabel.snp.makeConstraints { make in
+            make.top.equalTo(headerImageView.snp.top)
+            make.left.equalTo(headerImageView.snp.right).offset(adapt_length(length: 10))
+        }
+        addSubview(descLabel)
+        descLabel.snp.makeConstraints { make in
+            make.bottom.equalTo(headerImageView.snp.bottom)
+            make.left.equalTo(headerImageView.snp.right).offset(adapt_length(length: 10))
+        }
+        addSubview(lineLabel)
+        lineLabel.snp.makeConstraints { make in
+            make.left.equalTo(adapt_length(length: 10))
+            make.right.equalTo(-adapt_length(length: 10))
+            make.bottom.equalToSuperview().offset(-adapt_length(length: 0.5))
+            make.height.equalTo(adapt_length(length: 0.5))
+        }
+    }
+    
+    func setupDataSource(model: ShopOrderExpressModel) {
+        headerImageView.kf.setImage(with: URL(string: model.simg!))
+        titleLabel.text = model.com
+        descLabel.text = model.tel
     }
     required init?(coder: NSCoder) {
+//
+//  CNLiveShopBodyExpressView.swift
+//  metaCode
+//
+//  Created by open on 2023/11/8.
+//
+
+import Foundation
+
+class ShopBodyOrderExpressListTableViewCell: UITableViewCell {
+    
+    lazy var logoImageView: UIImageView = {
+        let logoImageView = UIImageView.init()
+        logoImageView.backgroundColor = .white
+        return logoImageView
+    }()
+    
+    lazy var expressName: UILabel = {
+        let expressName = UILabel.init()
+        expressName.textColor = HexColor("#333333")
+        expressName.font = medium_font(pointSize: 14)
+        return expressName
+    }()
+    
+    lazy var expressNo: UILabel = {
+        let expressNo = UILabel.init()
+        expressNo.textColor = HexColor("#b4b4b4")
+        expressNo.font = regular_font(pointSize: 12)
+        return expressNo
+    }()
+    
+    lazy var expressCopy: UIButton = {
+        let expressCopy = UIButton.init(type: .custom)
+        expressCopy.backgroundColor = .white
+        expressCopy.setTitle("复制单号", for: .normal)
+        expressCopy.layer.cornerRadius = 4
+        expressCopy.titleLabel?.font = medium_font(pointSize: 14)
+        expressCopy.setTitleColor(HexColor("#28c1c6"), for: .normal)
+        expressCopy.contentHorizontalAlignment = .center
+        expressCopy.layer.borderWidth = 1
+        expressCopy.layer.borderColor = HexColor("#28c1c6")?.cgColor
+        expressCopy.addTarget(self, action: #selector(actionClick), for: .touchUpInside)
+        return expressCopy
+    }()
+    
+    lazy var expressTime: UILabel = {
+        let expressTime = UILabel.init()
+        expressTime.font = regular_font(pointSize: 12)
+        expressTime.textColor = HexColor("#333333")
+        return expressTime
+    }()
+    
+    lazy var expressAddress: UILabel = {
+        let expressAddress = UILabel.init()
+        expressAddress.font = regular_font(pointSize: 12)
+        expressAddress.textColor = HexColor("#333333")
+        expressAddress.numberOfLines = 0
+        return expressAddress
+    }()
+    
+    lazy var totleExpress: UILabel = {
+        let totleExpress = UILabel.init()
+        totleExpress.textColor = HexColor("#9b9b9b")
+        totleExpress.font = regular_font(pointSize: 12)
+        return totleExpress
+    }()
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        contentView.backgroundColor = .clear
+        selectionStyle = .none
+        
+        addSubview(logoImageView)
+        logoImageView.snp.makeConstraints { make in
+            make.left.top.equalToSuperview().offset(adapt_length(length: 15))
+            make.size.equalTo(adapt_length(length: 39.68))
+        }
+        addSubview(expressName)
+        expressName.snp.makeConstraints { make in
+            make.top.equalTo(logoImageView.snp.top).offset(adapt_length(length: 0.5))
+            
+        }
+    }
+    
+    var _listModel: ShopOrderExpressListModel!
+    func setupDataSource(listModel: ShopOrderExpressListModel) {
+        _listModel = listModel
+        
+    }
+    
+    @objc func actionClick() {
+        
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    
+}
@@ -19,7 +19,7 @@ enum CNDSOrderListSectionFooterBtnClickEvent {
     case expDetail    //物流详情
     case none
 }
-typealias clickRightBtnCallBack = (_ event: CNDSOrderListSectionFooterBtnClickEvent,_ listModel :ShopOrderListModel) -> Void
+typealias clickRightBtnCallBack = (_ title: String,_ event: CNDSOrderListSectionFooterBtnClickEvent,_ listModel :ShopOrderListModel) -> Void
 class ShopBodyOrderFooterViewCell: UITableViewHeaderFooterView {
     lazy var addressLabel: UILabel = {
@@ -118,7 +118,7 @@ class ShopBodyOrderFooterViewCell: UITableViewHeaderFooterView {
     @objc func rightBtnClick(button: UIButton) {
         var clickEvent: CNDSOrderListSectionFooterBtnClickEvent! = CNDSOrderListSectionFooterBtnClickEvent.none
-        
+
         if button.titleLabel?.text == "快递发货" {
             if _listModel.state == "2" {
                 if _listModel.order_detail.count > 1 {
@@ -159,7 +159,7 @@ class ShopBodyOrderFooterViewCell: UITableViewHeaderFooterView {
         }
         if (_listModel != nil) && (clickRightBtnCallBack != nil) {
-            self.clickRightBtnCallBack(clickEvent, _listModel)
+            self.clickRightBtnCallBack((button.titleLabel?.text)!, clickEvent, _listModel)
         }
     }
@@ -288,5 +288,235 @@ class CNLiveShopViewModel: NSObject {
         }
     }
+    ///  获取商家店铺列表
+    /// - Parameter resultBlock: 返回
+    static func requestSellerStore(resultBlock: @escaping resultShopBlock) {
+        let param = NSMutableDictionary()
+        param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "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/sellerStore", 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 resp_dict = resp["data"] as! NSDictionary
+                        let array = resp_dict["data"] as! NSArray
+                        let tempArray = NSMutableArray()
+                        let textArray = NSMutableArray()
+                        for item in array {
+                            let listModel = dictionaryToModel(item as! [String : Any], ShopOrderStoreModel.self,"") as! ShopOrderStoreModel
+                            tempArray.add(listModel)
+                            textArray.add(listModel.title! as String)
+                        }
+                        resultBlock([tempArray,textArray], .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)
+                }
+            }
+        }
+    }
+    
+    /// 发快递 && 编辑快递
+    /// - Parameters:
+    ///   - orderId: 订单号
+    ///   - expressId: 快递id
+    ///   - expressNum: 快递数量
+    ///   - hiddenSop: true为修改快递 false为发快递
+    ///   - expId: 扩展id (hiddenSop为true时必传)
+    ///   - goodsList: 商品列表 (hiddenSop为false时必传)
+    ///   - storeId: 店铺id (hiddenSop为false时必传)
+    ///   - resultBlock: 返回
+    static func requestExpress(orderId: String, expressId: String, expressNum: String, hiddenSop: Bool, expId: String, goodsList: NSArray, storeId: String, resultBlock: @escaping resultShopBlock) {
+        if hiddenSop {
+            let param = NSMutableDictionary()
+            param.setValue(orderId, forKey: "id")
+            param.setValue(expId, forKey: "exp_id")
+            param.setValue(expressId, forKey: "express_id")
+            param.setValue(expressNum, forKey: "express_num")
+            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: .POST, urlString: APPBaseWjjBUrl+"/api/v1/editExpress", 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") {
+                        resultBlock("修改成功", .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)
+                    }
+                }
+            }
+        } else {
+            let param = NSMutableDictionary()
+            param.setValue(orderId, forKey: "id")
+            param.setValue(storeId, forKey: "store_id")
+            param.setValue(expressId, forKey: "express_id")
+            param.setValue(expressNum, forKey: "express_num")
+            param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "id")
+            if goodsList.count > 0 {
+                do {
+                    let jsonData = try JSONSerialization.data(withJSONObject: goodsList, options: .prettyPrinted)
+                    let jsonString = NSString.init(data: jsonData, encoding: NSUTF8StringEncoding)
+                    param.setValue(jsonString, forKey: "goods_arr")
+                } catch _ {}
+            }
+            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: .POST, 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") {
+                        resultBlock("发货成功", .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)
+                    }
+                }
+            }
+        }
+    }
+    
+    ///  快递公司列表
+    ///   - resultBlock: 返回
+    static func requestExpressList(resultBlock: @escaping resultShopBlock) {
+        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/expressList", param: [ : ], 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 resp_dict = resp["data"] as! NSDictionary
+                        let array = resp_dict["data"] as! NSArray
+                        let tempArray = NSMutableArray()
+                        for item in array {
+                            let listModel = dictionaryToModel(item as! [String : Any], ShopOrderExpressModel.self,"") as! ShopOrderExpressModel
+                            tempArray.add(listModel)
+                        }
+                        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)
+                }
+            }
+        }
+    }
+    
+    /// 获取部分发货物流详情
+    /// - Parameters:
+    ///   - orderId: 订单id
+    ///   - resultBlock: 返回
+    static func requestExpressList(orderId: NSString, resultBlock: @escaping resultShopBlock) {
+        let param = NSMutableDictionary()
+        param.setValue(orderId, forKey: "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/orderMoreExp", 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], ShopOrderExpressListModel.self,"") as! ShopOrderExpressListModel
+                            if listModel.id != "0" {
+                                tempArray.add(listModel)
+                            }
+                        }
+                        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)
+                }
+            }
+        }
+    }
 }
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "加@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "加@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "加@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "加@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "未选中@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "未选中@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "选中@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "选中@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "减@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "减@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "减@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "减@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}