添加更改存储方式，订单搜索功能

liushiyu
1 parent af1882da
Showing 20 changed files with 1523 additions and 577 deletions
Podfile
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Common/Util/CNLiveCommonBaseModel.swift
metaCode/Classes/Config/Database/CNLiveFileManager.swift
metaCode/Classes/Config/Database/CNLiveIdentityDB.swift
metaCode/Classes/Config/Database/CNLiveSaveAuthDB.swift
metaCode/Classes/Config/Database/CNLiveSaveStandDB.swift
metaCode/Classes/Main/HomePage/ViewModel/CNHomePageViewModel.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineViewController.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineBaseModel.swift
metaCode/Classes/Main/ShopPage/Controller/CNLiveShopOrderDetailViewController.swift
metaCode/Classes/Main/ShopPage/Controller/CNLiveShopOrderExpressDetailViewController.swift
metaCode/Classes/Main/ShopPage/Controller/CNLiveShopOrderExpressViewController.swift
metaCode/Classes/Main/ShopPage/Controller/CNLiveShopOrderListViewController.swift
metaCode/Classes/Main/ShopPage/Controller/CNLiveShopOrderSearchListViewController.swift
metaCode/Classes/Main/ShopPage/Controller/CNLiveShopOrderSearchViewController.swift
metaCode/Classes/Main/ShopPage/Controller/CNLiveShopOrderViewController.swift
metaCode/Classes/Main/ShopPage/View/CNLiveShopBodyCustomView.swift
metaCode/Classes/Main/ShopPage/View/CNLiveShopBodyExpressView.swift
metaCode/Classes/Main/ShopPage/ViewModel/CNLiveShopViewModel.swift
@@ -36,7 +36,7 @@ target &#39;metaCode&#39; do
   #加载GIF
   pod 'SwiftGifOrigin', '~> 1.7.0'
   #数据库存储
-  pod 'WCDB.swift'
+  #pod 'WCDB.swift'
   #占位按钮
   pod 'APButton'
   #分类滚动切换视图
@@ -44,7 +44,7 @@ target &#39;metaCode&#39; do
   pod 'JXPagingView/Paging'
   #轮播图
   pod 'FSPagerView', '0.8.3'
-#  pod 'SDCycleScrollView', '~> 1.82'
+  #pod 'SDCycleScrollView', '~> 1.82'
   target 'metaCodeTests' do
     inherit! :search_paths
@@ -77,6 +77,9 @@
 		79396EF12A31C21B0053E1AF /* CNLiveInfoShowViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79396EF02A31C21B0053E1AF /* CNLiveInfoShowViewController.swift */; };
 		793CAF522A58FCA200882EF4 /* CNLiveMineExchangeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 793CAF512A58FCA200882EF4 /* CNLiveMineExchangeViewController.swift */; };
 		794BC1652AF9E70D00A68C74 /* CNLiveShopOrderSendViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 794BC1642AF9E70D00A68C74 /* CNLiveShopOrderSendViewController.swift */; };
+		794FF1052B01FC8800385E85 /* CNLiveShopOrderSearchViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 794FF1042B01FC8800385E85 /* CNLiveShopOrderSearchViewController.swift */; };
+		794FF1072B01FC9800385E85 /* CNLiveShopOrderSearchListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 794FF1062B01FC9800385E85 /* CNLiveShopOrderSearchListViewController.swift */; };
+		794FF1092B02131300385E85 /* CNLiveFileManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 794FF1082B02131300385E85 /* CNLiveFileManager.swift */; };
 		796398942A260C0100D045EB /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7963988D2A260C0100D045EB /* AppDelegate.swift */; };
 		7963989D2A260E6200D045EB /* CNLiveBaseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7963989C2A260E6200D045EB /* CNLiveBaseViewController.swift */; };
 		79656E382AAEBA8E00119A61 /* CNLiveMineInputViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79656E372AAEBA8E00119A61 /* CNLiveMineInputViewController.swift */; };
@@ -127,7 +130,6 @@
 		7C4931362A307B60000E44B4 /* slide_up.gif in Resources */ = {isa = PBXBuildFile; fileRef = 7C4931352A307B60000E44B4 /* slide_up.gif */; };
 		7C4931382A307BDB000E44B4 /* CNHomePageGuideView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C4931372A307BDB000E44B4 /* CNHomePageGuideView.swift */; };
 		7C7C62F62A4D72E9007A912E /* CNLiveIdentityDB.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C7C62F52A4D72E9007A912E /* CNLiveIdentityDB.swift */; };
-		7C83B43E2A52B8BA004BF4A4 /* CNHomePageViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C83B43D2A52B8BA004BF4A4 /* CNHomePageViewModel.swift */; };
 		7C83B4402A52BB2B004BF4A4 /* CNGlobalEnum.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C83B43F2A52BB2B004BF4A4 /* CNGlobalEnum.swift */; };
 		7C83B4422A541EBF004BF4A4 /* CALayer+CNLiveExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C83B4412A541EBF004BF4A4 /* CALayer+CNLiveExtensions.swift */; };
 		7C83B4442A541F36004BF4A4 /* NSDate+CNLiveExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C83B4432A541F36004BF4A4 /* NSDate+CNLiveExtensions.swift */; };
@@ -243,6 +245,9 @@
 		79396EF02A31C21B0053E1AF /* CNLiveInfoShowViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveInfoShowViewController.swift; sourceTree = "<group>"; };
 		793CAF512A58FCA200882EF4 /* CNLiveMineExchangeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineExchangeViewController.swift; sourceTree = "<group>"; };
 		794BC1642AF9E70D00A68C74 /* CNLiveShopOrderSendViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopOrderSendViewController.swift; sourceTree = "<group>"; };
+		794FF1042B01FC8800385E85 /* CNLiveShopOrderSearchViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopOrderSearchViewController.swift; sourceTree = "<group>"; };
+		794FF1062B01FC9800385E85 /* CNLiveShopOrderSearchListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopOrderSearchListViewController.swift; sourceTree = "<group>"; };
+		794FF1082B02131300385E85 /* CNLiveFileManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveFileManager.swift; sourceTree = "<group>"; };
 		7963988D2A260C0100D045EB /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		7963989C2A260E6200D045EB /* CNLiveBaseViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CNLiveBaseViewController.swift; sourceTree = "<group>"; };
 		79656E372AAEBA8E00119A61 /* CNLiveMineInputViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineInputViewController.swift; sourceTree = "<group>"; };
@@ -292,7 +297,6 @@
 		7C4931352A307B60000E44B4 /* slide_up.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = slide_up.gif; sourceTree = "<group>"; };
 		7C4931372A307BDB000E44B4 /* CNHomePageGuideView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNHomePageGuideView.swift; sourceTree = "<group>"; };
 		7C7C62F52A4D72E9007A912E /* CNLiveIdentityDB.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveIdentityDB.swift; sourceTree = "<group>"; };
-		7C83B43D2A52B8BA004BF4A4 /* CNHomePageViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNHomePageViewModel.swift; sourceTree = "<group>"; };
 		7C83B43F2A52BB2B004BF4A4 /* CNGlobalEnum.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNGlobalEnum.swift; sourceTree = "<group>"; };
 		7C83B4412A541EBF004BF4A4 /* CALayer+CNLiveExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CALayer+CNLiveExtensions.swift"; sourceTree = "<group>"; };
 		7C83B4432A541F36004BF4A4 /* NSDate+CNLiveExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSDate+CNLiveExtensions.swift"; sourceTree = "<group>"; };
@@ -539,6 +543,7 @@
 				7C7C62F52A4D72E9007A912E /* CNLiveIdentityDB.swift */,
 				79BA085C2AB18E8300D01875 /* CNLiveSaveAuthDB.swift */,
 				79EABB882AB4497700F3A4E2 /* CNLiveSaveStandDB.swift */,
+				794FF1082B02131300385E85 /* CNLiveFileManager.swift */,
 			);
 			path = Database;
 			sourceTree = "<group>";
@@ -709,6 +714,8 @@
 				791C1C872AFB6FD7003E6362 /* CNLiveShopOrderExpressFirmViewController.swift */,
 				791C1C892AFB84EE003E6362 /* CNLiveShopOrderExpressListViewController.swift */,
 				792B53272AFCD7640009AB49 /* CNLiveShopOrderExpressDetailViewController.swift */,
+				794FF1042B01FC8800385E85 /* CNLiveShopOrderSearchViewController.swift */,
+				794FF1062B01FC9800385E85 /* CNLiveShopOrderSearchListViewController.swift */,
 			);
 			path = Controller;
 			sourceTree = "<group>";
@@ -760,7 +767,6 @@
 			isa = PBXGroup;
 			children = (
 				19565ED12AF9FE56007D6727 /* GoodsManager */,
-				7C83B43D2A52B8BA004BF4A4 /* CNHomePageViewModel.swift */,
 				1926C28E2AE0D76C00C71DC3 /* CNLiveDownSlideViewModel.swift */,
 				19BB1FE22AEB8B7C0094D962 /* CNLiveShopConsoleViewModel.swift */,
 				19BB1FED2AF0E1EC0094D962 /* CNLiveShopDetailViewModel.swift */,
@@ -1189,7 +1195,6 @@
 				7CD675522A29C04B008354C1 /* CNLiveConfigstant.swift in Sources */,
 				79282A402A2F055100B5F8CF /* CNLiveConfigUserInfo.swift in Sources */,
 				1965FA402AFB38AA00F0F435 /* CNLiveAddGoodsSelectUploadImageView.swift in Sources */,
-				7C83B43E2A52B8BA004BF4A4 /* CNHomePageViewModel.swift in Sources */,
 				19BB1FDF2AEA3A450094D962 /* CNSlideBaseNavigationController.swift in Sources */,
 				19BB1FE12AEB5C220094D962 /* CNLiveShopConsoleController.swift in Sources */,
 				7C4931382A307BDB000E44B4 /* CNHomePageGuideView.swift in Sources */,
@@ -1227,6 +1232,7 @@
 				798A44F92A30835400815935 /* CNLiveHelpFeedBackViewController.swift in Sources */,
 				79A68C4A2A26E6CE00DC3B43 /* (null) in Sources */,
 				790D01852A2D89E100C5978D /* UIColor+CNLiveExtensions.swift in Sources */,
+				794FF1092B02131300385E85 /* CNLiveFileManager.swift in Sources */,
 				79396EED2A319F220053E1AF /* NSObject+CNLiveExtensions.swift in Sources */,
 				19FA201B2AE60423001F7186 /* CNLiveDownSlideModelLayout.swift in Sources */,
 				7C4931312A2F142F000E44B4 /* CNHomePageBackgroupView.swift in Sources */,
@@ -1235,6 +1241,7 @@
 				19CC4D562ADD19C200308E2A /* String+Extension.swift in Sources */,
 				7905BB492AB0588B0089BC50 /* CNLiveMineAuthResultViewController.swift in Sources */,
 				19565EC22AF616CA007D6727 /* CNLiveShopDetailOrderAssetCell.swift in Sources */,
+				794FF1052B01FC8800385E85 /* CNLiveShopOrderSearchViewController.swift in Sources */,
 				798A44EC2A302DBE00815935 /* CNLiveMineAddInfoViewController.swift in Sources */,
 				791C1C882AFB6FD7003E6362 /* CNLiveShopOrderExpressFirmViewController.swift in Sources */,
 				7CD675422A2740F8008354C1 /* CNCustomIndexView.swift in Sources */,
@@ -1255,6 +1262,7 @@
 				1965FA3E2AFB176E00F0F435 /* CNLiveShopAddGoodsSingleView.swift in Sources */,
 				7CD6753C2A2740B0008354C1 /* CNUpSlideViewRemindView.swift in Sources */,
 				19BB1FEC2AF0AB8E0094D962 /* CNLiveDownShopDetailController.swift in Sources */,
+				794FF1072B01FC9800385E85 /* CNLiveShopOrderSearchListViewController.swift in Sources */,
 				798A44E82A30134400815935 /* CNLiveMineHeaderView.swift in Sources */,
 				7C49312D2A2DB9FA000E44B4 /* UITabBar+CNLiveExtensions.swift in Sources */,
 				79A267832AF8D7BC0088D9F6 /* CNLiveShopBodyCustomView.swift in Sources */,
@@ -1443,7 +1451,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.0.1.23.11.10.17;
+				CURRENT_PROJECT_VERSION = 1.0.1.23.11.13.10;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				EXCLUDED_ARCHS = "";
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1488,7 +1496,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.0.1.23.11.10.17;
+				CURRENT_PROJECT_VERSION = 1.0.1.23.11.13.10;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				EXCLUDED_ARCHS = "";
 				GENERATE_INFOPLIST_FILE = YES;
@@ -8,21 +8,10 @@
 import Foundation
 import UIKit
 import HandyJSON
-import WCDBSwift
 class BaseModel: HandyJSON {
-//    var database:Database
-    
-    required init() {
-        //数据库地址
-//        let filePath = NSHomeDirectory() + "/Documents/DB/CNLiveBaseModel.db"
-//        database = Database(at: filePath)
-        
-//        super.init()
-        
-//        try database.create(table: NSStringFromClass(self), of: BaseModel.self)
-    }
+    required init() {}
     func mapping(mapper: HelpingMapper) {
+//
+//  CNLiveFileManager.swift
+//  metaCode
+//
+//  Created by open on 2023/11/13.
+//
+
+import Foundation
+
+class CNLiveFileManager: NSObject {
+    
+    static let shared = CNLiveFileManager.init()
+    
+    open func save(object: Any, key: String) {
+        var temp_dic = NSMutableDictionary.init(contentsOfFile: userFileDir+"storage.plist")
+        if (temp_dic == nil) {
+            temp_dic = NSMutableDictionary.init()
+        }
+        temp_dic?.setObject(object, forKey: key as NSCopying)
+        temp_dic?.write(toFile: userFileDir+"storage.plist", atomically: true)
+    }
+    
+    open func take(key: String) -> Any {
+        let temp_dic = NSMutableDictionary.init(contentsOfFile: userFileDir+"storage.plist")
+        if (temp_dic == nil) {
+            return NSMutableDictionary()
+        }
+        return temp_dic?.object(forKey: key) as Any
+    }
+    
+    open func takeAll() -> NSDictionary {
+        let temp_dic = NSMutableDictionary.init(contentsOfFile: userFileDir+"storage.plist")
+        if (temp_dic == nil) {
+            return NSMutableDictionary()
+        }
+        return temp_dic ?? NSDictionary()
+    }
+    
+    open func resetAllSave() {
+        let temp_dic = NSMutableDictionary.init(contentsOfFile: userFileDir+"storage.plist")
+        if temp_dic != nil {
+            temp_dic?.removeAllObjects()
+            temp_dic?.write(toFile: userFileDir+"storage.plist", atomically: true)
+        }
+    }
+    
+    open func delete(key: String) {
+        let temp_dic = NSMutableDictionary.init(contentsOfFile: userFileDir+"storage.plist")
+        if temp_dic != nil {
+            temp_dic?.removeObject(forKey: key)
+            temp_dic?.write(toFile: userFileDir+"storage.plist", atomically: true)
+        }
+    }
+        
+    private lazy var userFileDir: String = {
+        let userFileDir = NSString()
+        var path: String = ""
+        path = "\(fileDir)/userId_\(UserInfoManager.shared.userInfo.uid)/"
+        let fileManager = FileManager.default
+        var isDir: ObjCBool = false
+        let exist: Bool = fileManager.fileExists(atPath: path, isDirectory: &isDir)
+        if !(isDir.boolValue && exist) {
+            do {
+                try fileManager.createDirectory(atPath: path, withIntermediateDirectories: true)
+            } catch {
+                debugPrint("文件目录创建失败")
+                return ""
+            }
+        }
+        return path as String
+    }()
+    
+    private lazy var fileDir: String = {
+        let path = "\(NSHomeDirectory())/Documents/metaCode"
+        let fileManager = FileManager.default
+        var isDir: ObjCBool = false
+        let exist: Bool = fileManager.fileExists(atPath: path, isDirectory: &isDir)
+        if !(isDir.boolValue && exist) {
+            do {
+                try fileManager.createDirectory(atPath: path, withIntermediateDirectories: true)
+            } catch {
+                debugPrint("文件目录创建失败")
+                return ""
+            }
+        }
+        return path as String
+    }()
+    
+}
@@ -6,131 +6,131 @@
 //
 import Foundation
-import WCDBSwift
-
-///身份认证表名
-let CNLiveIdentityTableName = "CNLiveIdentityTable"
-
-///身份model
-final class CNLiveIdentityModel: BaseModel,TableCodable {
-    var id: String = ""//ID号
-    var name: String? = ""//名称
-    var icon: String? = ""//小圆图标
-    var createTime: String? = ""//注册时间
-    var enable: Bool?//没用
-    var backgroundImg:String? = ""//首页背景图
-    var backgroundColor:String? = ""//添加身份按钮背景色
-    var description:String? = ""//首页身份说明描述
-    var auth: Bool?//身份是否验证
-    
-    enum CodingKeys: String, CodingTableKey {
-        typealias Root = CNLiveIdentityModel
-        static let objectRelationalMapping = TableBinding(CodingKeys.self){
-            //设置表的主键key为id,用来区分数据唯一性, 如果id为int类型,可以按实现按顺序递增
-            BindColumnConstraint(id, isPrimary: true)
-        }
-        case id         //不修改数据库字段名,和属性名保持一直
-        case name       //不修改数据库字段名,和属性名保持一直
-        case icon
-        case createTime
-        case enable
-        case backgroundImg
-        case backgroundColor
-        case description
-        case auth
-    }
-    
-}
-
-///身份列表数据库
-class CNLiveIdentityDB :NSObject{
-    
-    ///数据库
-    var database:Database
-    
-    //重新init方法为私有,不让外部调用
-    override init() {
-        
-        //数据库地址
-        let filePath = NSHomeDirectory() + "/Documents/DB/CNLiveIdentity.db"
-        database = Database(at: filePath)
-        
-        super.init()
-        self.createTable(name: CNLiveIdentityTableName, classType: CNLiveIdentityModel.self)
-    }
-    
-    /// 创建表
-    /// - Parameters:
-    ///   - name: 表名
-    ///   - classType: class类型,当前class需要实现 TableCodable
-    private func createTable<Root:TableDecodable>(name:String, classType: Root.Type){
-        do{
-            try  database.create(table: name, of: classType)
-        }catch{
-            print("创建失败")
-        }
-                
-    }
-    
-    /// 新增一条数据
-    /// - Parameter object: 数据
-    func insterObject(object: CNLiveIdentityModel){
-        let array: [CNLiveIdentityModel] = [object]
-        self.insterObjects(objects: array)
-    }
-    
-    ///新增多条数据
-    func insterObjects(objects: Array<CNLiveIdentityModel>){
-        do{
-            try  database.insert(objects, intoTable: CNLiveIdentityTableName)
-        }catch{
-            print("增加一条数据失败")
-        }
-    }
-    
-    /// 删除一条数据
-    /// - Parameter delete: 被删除的数据
-    func deleteObject(delete: CNLiveIdentityModel){
-        
-        do{
-            try  database.delete(fromTable: CNLiveIdentityTableName, where: CNLiveIdentityModel.Properties.id == delete.id)
-        }
-        catch{
-            print("删除一条数据失败")
-        }
-    }
-    
-    ///更新一条数据
-    func updateObject(newObject:CNLiveIdentityModel){
-        do{
-            //需要更新的字段
-            let updateProperties = [CNLiveIdentityModel.Properties.name,
-                                    CNLiveIdentityModel.Properties.icon,
-                                    CNLiveIdentityModel.Properties.createTime,
-                                    CNLiveIdentityModel.Properties.enable]
-            
-            try database.update(table: CNLiveIdentityTableName, on:updateProperties, with: newObject,where: CNLiveIdentityModel.Properties.id == newObject.id)
-        }
-        catch{
-            print("更新一条数据失败")
-        }
-    }
-    
-    ///获取所有数据
-    func searchAllObject()-> Array<CNLiveIdentityModel>{
-        do{
-            let allData: [CNLiveIdentityModel] =  try database.getObjects(fromTable: CNLiveIdentityTableName)
-            return allData
-        }
-        catch{
-            print("获取失败")
-            return []
-        }
-        
-
-    }
-
-}
+//import WCDBSwift
+//
+/////身份认证表名
+//let CNLiveIdentityTableName = "CNLiveIdentityTable"
+//
+/////身份model
+//final class CNLiveIdentityModel: BaseModel,TableCodable {
+//    var id: String = ""//ID号
+//    var name: String? = ""//名称
+//    var icon: String? = ""//小圆图标
+//    var createTime: String? = ""//注册时间
+//    var enable: Bool?//没用
+//    var backgroundImg:String? = ""//首页背景图
+//    var backgroundColor:String? = ""//添加身份按钮背景色
+//    var description:String? = ""//首页身份说明描述
+//    var auth: Bool?//身份是否验证
+//
+//    enum CodingKeys: String, CodingTableKey {
+//        typealias Root = CNLiveIdentityModel
+//        static let objectRelationalMapping = TableBinding(CodingKeys.self){
+//            //设置表的主键key为id,用来区分数据唯一性, 如果id为int类型,可以按实现按顺序递增
+//            BindColumnConstraint(id, isPrimary: true)
+//        }
+//        case id         //不修改数据库字段名,和属性名保持一直
+//        case name       //不修改数据库字段名,和属性名保持一直
+//        case icon
+//        case createTime
+//        case enable
+//        case backgroundImg
+//        case backgroundColor
+//        case description
+//        case auth
+//    }
+//
+//}
+//
+/////身份列表数据库
+//class CNLiveIdentityDB :NSObject{
+//
+//    ///数据库
+//    var database:Database
+//
+//    //重新init方法为私有,不让外部调用
+//    override init() {
+//
+//        //数据库地址
+//        let filePath = NSHomeDirectory() + "/Documents/DB/CNLiveIdentity.db"
+//        database = Database(at: filePath)
+//
+//        super.init()
+//        self.createTable(name: CNLiveIdentityTableName, classType: CNLiveIdentityModel.self)
+//    }
+//
+//    /// 创建表
+//    /// - Parameters:
+//    ///   - name: 表名
+//    ///   - classType: class类型,当前class需要实现 TableCodable
+//    private func createTable<Root:TableDecodable>(name:String, classType: Root.Type){
+//        do{
+//            try  database.create(table: name, of: classType)
+//        }catch{
+//            print("创建失败")
+//        }
+//
+//    }
+//
+//    /// 新增一条数据
+//    /// - Parameter object: 数据
+//    func insterObject(object: CNLiveIdentityModel){
+//        let array: [CNLiveIdentityModel] = [object]
+//        self.insterObjects(objects: array)
+//    }
+//
+//    ///新增多条数据
+//    func insterObjects(objects: Array<CNLiveIdentityModel>){
+//        do{
+//            try  database.insert(objects, intoTable: CNLiveIdentityTableName)
+//        }catch{
+//            print("增加一条数据失败")
+//        }
+//    }
+//
+//    /// 删除一条数据
+//    /// - Parameter delete: 被删除的数据
+//    func deleteObject(delete: CNLiveIdentityModel){
+//
+//        do{
+//            try  database.delete(fromTable: CNLiveIdentityTableName, where: CNLiveIdentityModel.Properties.id == delete.id)
+//        }
+//        catch{
+//            print("删除一条数据失败")
+//        }
+//    }
+//
+//    ///更新一条数据
+//    func updateObject(newObject:CNLiveIdentityModel){
+//        do{
+//            //需要更新的字段
+//            let updateProperties = [CNLiveIdentityModel.Properties.name,
+//                                    CNLiveIdentityModel.Properties.icon,
+//                                    CNLiveIdentityModel.Properties.createTime,
+//                                    CNLiveIdentityModel.Properties.enable]
+//
+//            try database.update(table: CNLiveIdentityTableName, on:updateProperties, with: newObject,where: CNLiveIdentityModel.Properties.id == newObject.id)
+//        }
+//        catch{
+//            print("更新一条数据失败")
+//        }
+//    }
+//
+//    ///获取所有数据
+//    func searchAllObject()-> Array<CNLiveIdentityModel>{
+//        do{
+//            let allData: [CNLiveIdentityModel] =  try database.getObjects(fromTable: CNLiveIdentityTableName)
+//            return allData
+//        }
+//        catch{
+//            print("获取失败")
+//            return []
+//        }
+//
+//
+//    }
+//
+//}
@@ -6,7 +6,7 @@
 //
 import Foundation
-import WCDBSwift
+//import WCDBSwift
 ///身份认证表名
 let CNLiveAuthListTableName = "CNLiveAuthListTable"
@@ -14,154 +14,211 @@ let CNLiveAuthListTableName = &quot;CNLiveAuthListTable&quot;
 class CNLiveSaveAuthDB : NSObject{
     ///数据库
-    var database: Database
+//    var database: Database
     static let shared = CNLiveSaveAuthDB()
     //重新init方法为私有,不让外部调用
-    private override init() {
-        //数据库地址
-        let filePath = NSHomeDirectory() + "/Documents/DB"+UserInfoManager.shared.userInfo.uid+"/CNLiveAuthListTable.db"
-        database = Database(at: filePath)
-        
-        super.init()
-        do {
-            try database.create(table: CNLiveAuthListTableName, of: MineAuthListModel.self)
-        } catch {
-            print("创建失败")
-        }
-    }
+//    private override init() {
+//        //数据库地址
+//        let filePath = NSHomeDirectory() + "/Documents/DB"+UserInfoManager.shared.userInfo.uid+"/CNLiveAuthListTable.db"
+//        database = Database(at: filePath)
+//
+//        super.init()
+//        do {
+//            try database.create(table: CNLiveAuthListTableName, of: MineAuthListModel.self)
+//        } catch {
+//            print("创建失败")
+//        }
+//    }
     /// 新增一条数据
     /// - Parameter object: 数据
-    func insterObject(object: MineAuthListModel){
-        let array: [MineAuthListModel] = [object]
-        do{
-            try  database.insert(array, intoTable: CNLiveAuthListTableName)
-        }catch{
-            print("增加一条数据失败")
-        }
+    func insterObject(object: MineAuthListModel) {
+//        let array: [MineAuthListModel] = [object]
+//        do{
+//            try  database.insert(array, intoTable: CNLiveAuthListTableName)
+//        }catch{
+//            print("增加一条数据失败")
+//        }
     }
     /// 批量增加数据
     /// - Parameter objects: 数据组
     func insertObjects(objects: [MineAuthListModel]) {
-        if objects.count > 0 {
-            do{
-                for model in objects {
-                    let m = model
-                    print("插入时的数据结构===>\(m.identityId)")
-                }
-                try  database.insert(objects, intoTable: CNLiveAuthListTableName)
-            }catch{
-                print("增加一条数据失败")
-            }
-        }else{
-            print("数据为空")
+        
+        var temp_dic = NSMutableDictionary.init(contentsOfFile: userFileDir+"storage.plist")
+        if (temp_dic == nil) {
+            temp_dic = NSMutableDictionary.init()
         }
+        for item in objects {
+            temp_dic?.setObject((item.toJSON() ?? Dictionary()) as Dictionary, forKey: CNLiveAuthListTableName+"\(item.identityId)" as NSCopying)
+        }
+        temp_dic?.write(toFile: userFileDir+"storage.plist", atomically: true)
+        
+//        if objects.count > 0 {
+//            do{
+//                for model in objects {
+//                    let m = model
+//                    print("插入时的数据结构===>\(m.identityId)")
+//                }
+//                try  database.insert(objects, intoTable: CNLiveAuthListTableName)
+//            }catch{
+//                print("增加一条数据失败")
+//            }
+//        }else{
+//            print("数据为空")
+//        }
     }
     /// 删除一条数据
     /// - Parameter delete: 被删除的数据
     func deleteObject(delete: MineAuthListModel){
-        do{
-            try database.delete(fromTable: CNLiveAuthListTableName, where: MineAuthListModel.Properties.identityId == delete.identityId)
-        }catch{
-            print("删除一条数据失败")
-        }
+//        do{
+//            try database.delete(fromTable: CNLiveAuthListTableName, where: MineAuthListModel.Properties.identityId == delete.identityId)
+//        }catch{
+//            print("删除一条数据失败")
+//        }
     }
     /// 删除本地所有数据
     func deleteAllObjects() {
-        do {
-            try database.delete(fromTable: CNLiveAuthListTableName)
-        } catch {
-            print("数据删除失败")
-        }
+//        do {
+//            try database.delete(fromTable: CNLiveAuthListTableName)
+//        } catch {
+//            print("数据删除失败")
+//        }
     }
     /// 更新一条数据
     /// - Parameter newObject: 更新的数据源
     func updateObject(newObject: MineAuthListModel) {
-        do{
-            //需要更新的字段
-            let updateProperties = [MineAuthListModel.Properties.name,
-                                    MineAuthListModel.Properties.icon,
-                                    MineAuthListModel.Properties.cardImg,
-                                    MineAuthListModel.Properties.authTime,
-                                    MineAuthListModel.Properties.code,
-                                    MineAuthListModel.Properties.userStatus,]
-            
-            try database.update(table: CNLiveAuthListTableName, on:updateProperties, with: newObject,where: MineAuthListModel.Properties.identityId == newObject.identityId)
-        }catch{
-            print("更新一条数据失败")
-        }
+//        do{
+//            //需要更新的字段
+//            let updateProperties = [MineAuthListModel.Properties.name,
+//                                    MineAuthListModel.Properties.icon,
+//                                    MineAuthListModel.Properties.cardImg,
+//                                    MineAuthListModel.Properties.authTime,
+//                                    MineAuthListModel.Properties.code,
+//                                    MineAuthListModel.Properties.userStatus,]
+//
+//            try database.update(table: CNLiveAuthListTableName, on:updateProperties, with: newObject,where: MineAuthListModel.Properties.identityId == newObject.identityId)
+//        }catch{
+//            print("更新一条数据失败")
+//        }
     }
     /// 更新多条数据
     /// - Parameter newObjects: 新数据数组
     func updateObjects(newObjects: [MineAuthListModel]) {
-        do {
-            let tempArray = NSMutableArray()
-            for _ in newObjects {
-                //需要更新的字段
-                let updateProperties = [MineAuthListModel.Properties.name,
-                                        MineAuthListModel.Properties.icon,
-                                        MineAuthListModel.Properties.cardImg,
-                                        MineAuthListModel.Properties.authTime,
-                                        MineAuthListModel.Properties.code,
-                                        MineAuthListModel.Properties.userStatus,]
-                tempArray.add(updateProperties)
-            }
-            try database.update(table: CNLiveAuthListTableName, on: tempArray as! [PropertyConvertible], with: newObjects)
-        } catch {
-            print("更新多条数据失败")
-        }
+//        do {
+//            let tempArray = NSMutableArray()
+//            for _ in newObjects {
+//                //需要更新的字段
+//                let updateProperties = [MineAuthListModel.Properties.name,
+//                                        MineAuthListModel.Properties.icon,
+//                                        MineAuthListModel.Properties.cardImg,
+//                                        MineAuthListModel.Properties.authTime,
+//                                        MineAuthListModel.Properties.code,
+//                                        MineAuthListModel.Properties.userStatus,]
+//                tempArray.add(updateProperties)
+//            }
+//            try database.update(table: CNLiveAuthListTableName, on: tempArray as! [PropertyConvertible], with: newObjects)
+//        } catch {
+//            print("更新多条数据失败")
+//        }
     }
     /// 获取所有数据
     /// - Returns: 返回查找的所以数据
     func searchAllObject() -> Array<MineAuthListModel>{
-        do{
-            let allData: [MineAuthListModel] =  try database.getObjects(fromTable: CNLiveAuthListTableName)
-            return allData
-        }catch{
-            print("获取失败")
-            return []
+        
+        let temp_dic = NSMutableDictionary.init(contentsOfFile: userFileDir+"storage.plist")
+        if (temp_dic == nil) {
+            return Array()
         }
+        let tempArray = NSMutableArray.init()
+        temp_dic?.allValues.forEach({ value in
+            let listModel = dictionaryToModel(value as! [String : Any], MineAuthListModel.self,"")
+            tempArray.add(listModel)
+        })
+        return tempArray as! Array<MineAuthListModel>
+        
+//        do{
+//            let allData: [MineAuthListModel] =  try database.getObjects(fromTable: CNLiveAuthListTableName)
+//            return allData
+//        }catch{
+//            print("获取失败")
+//            return []
+//        }
     }
     /// 获取所有数据唯一值id
     /// - Returns: 返回查找的所以数据
-    func searchAllObjectId() -> Array<String>{
-        do{
-            let allData: [MineAuthListModel] =  try database.getObjects(fromTable: CNLiveAuthListTableName)
-            let tempArray = NSMutableArray.init()
-            for item in allData {
-                print("数据库查找之后数据==>\(item.identityId)")
-                tempArray.add(item.identityId)
-            }
-            return tempArray as! Array<String>
-        }catch{
-            print("获取失败")
-            return []
-        }
-    }
+//    func searchAllObjectId() -> Array<String>{
+//        do{
+//            let allData: [MineAuthListModel] =  try database.getObjects(fromTable: CNLiveAuthListTableName)
+//            let tempArray = NSMutableArray.init()
+//            for item in allData {
+//                print("数据库查找之后数据==>\(item.identityId)")
+//                tempArray.add(item.identityId)
+//            }
+//            return tempArray as! Array<String>
+//        }catch{
+//            print("获取失败")
+//            return []
+//        }
+//    }
     /// 通过id获取特定数据
     /// - Parameter identityId: id
     /// - Returns: 返回查找的数据
-    func searchOneObject(identityId: String) -> MineAuthListModel{
-        do {
-            let searchPropertie = [MineAuthListModel.Properties.identityId]
-            let array: [MineAuthListModel] =  try database.getObjects(on: searchPropertie, fromTable: CNLiveAuthListTableName, where: MineAuthListModel.Properties.identityId == identityId)
-            return array.count > 0 ? array.first! : MineAuthListModel.init()
-        } catch {
-            print("获取失败")
-            return MineAuthListModel.init()
+//    func searchOneObject(identityId: String) -> MineAuthListModel{
+//        do {
+//            let searchPropertie = [MineAuthListModel.Properties.identityId]
+//            let array: [MineAuthListModel] =  try database.getObjects(on: searchPropertie, fromTable: CNLiveAuthListTableName, where: MineAuthListModel.Properties.identityId == identityId)
+//            return array.count > 0 ? array.first! : MineAuthListModel.init()
+//        } catch {
+//            print("获取失败")
+//            return MineAuthListModel.init()
+//        }
+//    }
+    
+    
+    private lazy var userFileDir: String = {
+        let userFileDir = NSString()
+        var path: String = ""
+        path = "\(fileDir)/userId_\(UserInfoManager.shared.userInfo.uid)/"
+        let fileManager = FileManager.default
+        var isDir: ObjCBool = false
+        let exist: Bool = fileManager.fileExists(atPath: path, isDirectory: &isDir)
+        if !(isDir.boolValue && exist) {
+            do {
+                try fileManager.createDirectory(atPath: path, withIntermediateDirectories: true)
+            } catch {
+                debugPrint("文件目录创建失败")
+                return ""
+            }
         }
-    }
+        return path as String
+    }()
+    
+    private lazy var fileDir: String = {
+        let path = "\(NSHomeDirectory())/Documents/metaCode/saveAuth"
+        let fileManager = FileManager.default
+        var isDir: ObjCBool = false
+        let exist: Bool = fileManager.fileExists(atPath: path, isDirectory: &isDir)
+        if !(isDir.boolValue && exist) {
+            do {
+                try fileManager.createDirectory(atPath: path, withIntermediateDirectories: true)
+            } catch {
+                debugPrint("文件目录创建失败")
+                return ""
+            }
+        }
+        return path as String
+    }()
 }
@@ -6,169 +6,226 @@
 //
 import Foundation
-import WCDBSwift
+//import WCDBSwift
 ///身份列表表名  identityApi/allList 接口数据存储
 let CNLiveStandListTableName = "CNLiveStandListTableName"
 class CNLiveSaveStandDB: NSObject {
     ///数据库
-    var database: Database
+//    var database: Database
     static let shared = CNLiveSaveStandDB()
-    //重新init方法为私有,不让外部调用
-    private override init() {
-        //数据库地址
-        let filePath = NSHomeDirectory() + "/Documents/DB"+UserInfoManager.shared.userInfo.uid+"/CNLiveStandListTableName.db"
-        database = Database(at: filePath)
-        
-        super.init()
-        do {
-            try database.create(table: CNLiveStandListTableName, of: StandListModel.self)
-        } catch {
-            print("创建失败")
-        }
-    }
+//    //重新init方法为私有,不让外部调用
+//    private override init() {
+//        //数据库地址
+//        let filePath = NSHomeDirectory() + "/Documents/DB"+UserInfoManager.shared.userInfo.uid+"/CNLiveStandListTableName.db"
+//        database = Database(at: filePath)
+//
+//        super.init()
+//        do {
+//            try database.create(table: CNLiveStandListTableName, of: StandListModel.self)
+//        } catch {
+//            print("创建失败")
+//        }
+//    }
     /// 新增一条数据
     /// - Parameter object: 数据
-    func insterObject(object: StandListModel){
-        let array: [StandListModel] = [object]
-        do{
-            try  database.insert(array, intoTable: CNLiveStandListTableName)
-        }catch{
-            print("增加一条数据失败")
-        }
-    }
+//    func insterObject(object: StandListModel){
+//        let array: [StandListModel] = [object]
+//        do{
+//            try  database.insert(array, intoTable: CNLiveStandListTableName)
+//        }catch{
+//            print("增加一条数据失败")
+//        }
+//    }
     /// 批量增加数据
     /// - Parameter objects: 数据组
     func insertObjects(objects: [StandListModel]) {
-        if objects.count > 0 {
-            do{
-                try  database.insert(objects, intoTable: CNLiveStandListTableName)
-            }catch{
-                print("增加一条数据失败")
-            }
-        }else{
-            print("数据为空")
+        
+        var temp_dic = NSMutableDictionary.init(contentsOfFile: userFileDir+"storage.plist")
+        if (temp_dic == nil) {
+            temp_dic = NSMutableDictionary.init()
+        }
+        for item in objects {
+            temp_dic?.setObject((item.toJSON() ?? Dictionary()) as Dictionary, forKey: CNLiveStandListTableName+"\(item.id)" as NSCopying)
         }
+        temp_dic?.write(toFile: userFileDir+"storage.plist", atomically: true)
+        
+        
+//        if objects.count > 0 {
+//            do{
+//                try  database.insert(objects, intoTable: CNLiveStandListTableName)
+//            }catch{
+//                print("增加一条数据失败")
+//            }
+//        }else{
+//            print("数据为空")
+//        }
+    }
+    
+    /// 获取所有数据
+    /// - Returns: 返回查找的所以数据
+    func searchAllObject() -> Array<StandListModel>{
+        
+        let temp_dic = NSMutableDictionary.init(contentsOfFile: userFileDir+"storage.plist")
+        if (temp_dic == nil) {
+            return Array()
+        }
+        let tempArray = NSMutableArray.init()
+        temp_dic?.allValues.forEach({ value in
+            let listModel = dictionaryToModel(value as! [String : Any], StandListModel.self,"")
+            tempArray.add(listModel)
+        })
+        return tempArray as! Array<StandListModel>
+        
+//        do{
+//            let allData: [StandListModel] =  try database.getObjects(fromTable: CNLiveStandListTableName)
+//            return allData
+//        }catch{
+//            print("获取失败")
+//            return []
+//        }
     }
     /// 删除一条数据
     /// - Parameter delete: 被删除的数据
     func deleteObject(delete: StandListModel){
-        do{
-            try database.delete(fromTable: CNLiveStandListTableName, where: StandListModel.Properties.id == delete.id)
-        }catch{
-            print("删除一条数据失败")
-        }
+//        do{
+//            try database.delete(fromTable: CNLiveStandListTableName, where: StandListModel.Properties.id == delete.id)
+//        }catch{
+//            print("删除一条数据失败")
+//        }
     }
     /// 删除本地所有数据
     func deleteAllObjects() {
-        do {
-            try database.delete(fromTable: CNLiveStandListTableName)
-        } catch {
-            print("数据删除失败")
-        }
+//        do {
+//            try database.delete(fromTable: CNLiveStandListTableName)
+//        } catch {
+//            print("数据删除失败")
+//        }
     }
     /// 更新一条数据
     /// - Parameter newObject: 更新的数据源
     func updateObject(newObject: StandListModel){
-        do{
-            //需要更新的字段
-            let updateProperties = [StandListModel.Properties.name,
-                                    StandListModel.Properties.enable,
-                                    StandListModel.Properties.createTime,
-                                    StandListModel.Properties.createTimeString,
-                                    StandListModel.Properties.timeString,
-                                    StandListModel.Properties.auth,
-                                    StandListModel.Properties.backgroundImg,
-                                    StandListModel.Properties.backgroundColor,
-                                    StandListModel.Properties.backgroundColour,
-                                    StandListModel.Properties.description,
-                                    StandListModel.Properties.cardImg,
-                                    StandListModel.Properties.downPath,]
-            
-            try database.update(table: CNLiveStandListTableName, on:updateProperties, with: newObject,where: StandListModel.Properties.id == newObject.id)
-        }catch{
-            print("更新一条数据失败")
-        }
+//        do{
+//            //需要更新的字段
+//            let updateProperties = [StandListModel.Properties.name,
+//                                    StandListModel.Properties.enable,
+//                                    StandListModel.Properties.createTime,
+//                                    StandListModel.Properties.createTimeString,
+//                                    StandListModel.Properties.timeString,
+//                                    StandListModel.Properties.auth,
+//                                    StandListModel.Properties.backgroundImg,
+//                                    StandListModel.Properties.backgroundColor,
+//                                    StandListModel.Properties.backgroundColour,
+//                                    StandListModel.Properties.description,
+//                                    StandListModel.Properties.cardImg,
+//                                    StandListModel.Properties.downPath,]
+//
+//            try database.update(table: CNLiveStandListTableName, on:updateProperties, with: newObject,where: StandListModel.Properties.id == newObject.id)
+//        }catch{
+//            print("更新一条数据失败")
+//        }
     }
     /// 更新多条数据
     /// - Parameter newObjects: 新数据数组
     func updateObjects(newObjects: [StandListModel]) {
-        do {
-            let tempArray = NSMutableArray()
-            for _ in newObjects {
-                //需要更新的字段
-                let updateProperties = [StandListModel.Properties.name,
-                                        StandListModel.Properties.enable,
-                                        StandListModel.Properties.createTime,
-                                        StandListModel.Properties.createTimeString,
-                                        StandListModel.Properties.timeString,
-                                        StandListModel.Properties.auth,
-                                        StandListModel.Properties.backgroundImg,
-                                        StandListModel.Properties.backgroundColor,
-                                        StandListModel.Properties.backgroundColour,
-                                        StandListModel.Properties.description,
-                                        StandListModel.Properties.cardImg,
-                                        StandListModel.Properties.downPath,]
-                tempArray.add(updateProperties)
-            }
-            try database.update(table: CNLiveStandListTableName, on: tempArray as! [PropertyConvertible], with: newObjects)
-        } catch {
-            print("更新多条数据失败")
-        }
-    }
-    
-    
-    /// 获取所有数据
-    /// - Returns: 返回查找的所以数据
-    func searchAllObject() -> Array<StandListModel>{
-        do{
-            let allData: [StandListModel] =  try database.getObjects(fromTable: CNLiveStandListTableName)
-            return allData
-        }catch{
-            print("获取失败")
-            return []
-        }
+//        do {
+//            let tempArray = NSMutableArray()
+//            for _ in newObjects {
+//                //需要更新的字段
+//                let updateProperties = [StandListModel.Properties.name,
+//                                        StandListModel.Properties.enable,
+//                                        StandListModel.Properties.createTime,
+//                                        StandListModel.Properties.createTimeString,
+//                                        StandListModel.Properties.timeString,
+//                                        StandListModel.Properties.auth,
+//                                        StandListModel.Properties.backgroundImg,
+//                                        StandListModel.Properties.backgroundColor,
+//                                        StandListModel.Properties.backgroundColour,
+//                                        StandListModel.Properties.description,
+//                                        StandListModel.Properties.cardImg,
+//                                        StandListModel.Properties.downPath,]
+//                tempArray.add(updateProperties)
+//            }
+//            try database.update(table: CNLiveStandListTableName, on: tempArray as! [PropertyConvertible], with: newObjects)
+//        } catch {
+//            print("更新多条数据失败")
+//        }
     }
     /// 获取所有数据唯一值id
     /// - Returns: 返回查找的所以数据
-    func searchAllObjectId() -> Array<String>{
-        do{
-            let allData: [StandListModel] =  try database.getObjects(fromTable: CNLiveStandListTableName)
-            let tempArray = NSMutableArray.init()
-            for item in allData {
-                tempArray.add("\(item.id)")
-            }
-            return tempArray as! Array<String>
-        }catch{
-            print("获取失败")
-            return []
-        }
-    }
+//    func searchAllObjectId() -> Array<String>{
+//        do{
+//            let allData: [StandListModel] =  try database.getObjects(fromTable: CNLiveStandListTableName)
+//            let tempArray = NSMutableArray.init()
+//            for item in allData {
+//                tempArray.add("\(item.id)")
+//            }
+//            return tempArray as! Array<String>
+//        }catch{
+//            print("获取失败")
+//            return []
+//        }
+//    }
     /// 通过id获取特定数据
     /// - Parameter identityId: id
     /// - Returns: 返回查找的数据
-    func searchOneObject(identityId: String) -> StandListModel{
-        do {
-            let searchPropertie = [StandListModel.Properties.id]
-            let array: [StandListModel] =  try database.getObjects(on: searchPropertie, fromTable: CNLiveStandListTableName, where: StandListModel.Properties.id == identityId)
-            return array.count > 0 ? array.first! : StandListModel.init()
-        } catch {
-            print("获取失败")
-            return StandListModel.init()
+//    func searchOneObject(identityId: String) -> StandListModel{
+//        do {
+//            let searchPropertie = [StandListModel.Properties.id]
+//            let array: [StandListModel] =  try database.getObjects(on: searchPropertie, fromTable: CNLiveStandListTableName, where: StandListModel.Properties.id == identityId)
+//            return array.count > 0 ? array.first! : StandListModel.init()
+//        } catch {
+//            print("获取失败")
+//            return StandListModel.init()
+//        }
+//    }
+    
+    
+    private lazy var userFileDir: String = {
+        let userFileDir = NSString()
+        var path: String = ""
+        path = "\(fileDir)/userId_\(UserInfoManager.shared.userInfo.uid)/"
+        let fileManager = FileManager.default
+        var isDir: ObjCBool = false
+        let exist: Bool = fileManager.fileExists(atPath: path, isDirectory: &isDir)
+        if !(isDir.boolValue && exist) {
+            do {
+                try fileManager.createDirectory(atPath: path, withIntermediateDirectories: true)
+            } catch {
+                debugPrint("文件目录创建失败")
+                return ""
+            }
         }
-    }
+        return path as String
+    }()
+    
+    private lazy var fileDir: String = {
+        let path = "\(NSHomeDirectory())/Documents/metaCode/saveStannd"
+        let fileManager = FileManager.default
+        var isDir: ObjCBool = false
+        let exist: Bool = fileManager.fileExists(atPath: path, isDirectory: &isDir)
+        if !(isDir.boolValue && exist) {
+            do {
+                try fileManager.createDirectory(atPath: path, withIntermediateDirectories: true)
+            } catch {
+                debugPrint("文件目录创建失败")
+                return ""
+            }
+        }
+        return path as String
+    }()
 }
-//
-//  CNLiveHomePageViewModel.swift
-//  metaCode
-//
-//  Created by daojian on 2023/7/3.
-//
-
-import Foundation
-import CNLiveRequestBastKit
-
-///请求响应回调
-typealias responseBlock = (_ listArray:Array<CNLiveIdentityModel>, _ responseType:CNLiveNetworkingResponseType, _ errorMsg:String) -> Void
-
-class CNLiveHomePageViewModel:NSObject {
-    
-    /// 获取身份列表
-    class func getUserIdentityApi(resultBlock:@escaping responseBlock){
-        
-        //先从本地获取,本地有直接返回
-        let db = CNLiveIdentityDB()
-//        let allDbArray = db.searchAllObject()
-//        if(allDbArray.count > 0){
-//            resultBlock(allDbArray,.success,"")
-//            return
-//        }
-        
-        //从网络获取
-        CNLiveNetworking.setAllowRequestDefaultArgument(false)
-        CNLiveNetworking.setupShowDataResult(false)
-        CNLiveNetworking.requestNetwork(with: .GET, urlString: "\(APPBaseMCUrl)/identityApi/allList?sid=\(UserInfoManager.shared.userInfo.uid)&page=1&pageSize=1000", param: nil, cacheType: .networkOnly) { task , result, error in
-            
-            if((error) != nil){
-                //网络请求失败
-                if CNLiveNetworking.isNetworking(){
-                    resultBlock([],.failed,error?.localizedDescription ?? "请求失败")
-                }else{
-                    resultBlock([],.noNetwork,"无网络连接")
-                }
-                return
-            }
-            
-            let resultDic:NSDictionary = result as! NSDictionary
-            
-            let errorCode:String = "\(resultDic["errorCode"]!)"
-            if (errorCode == "0"){
-                let data:NSDictionary =  resultDic["data"] as! NSDictionary
-                let list:NSArray      = data["list"] as! NSArray
-                
-                //list数据转CNLiveIdentityModel, 并把model存入本地
-                
-                var array:Array = Array<CNLiveIdentityModel>()
-                for index in 0..<list.count{
-                    let item = dictionaryToModel(list[index] as! [String : Any], CNLiveIdentityModel.self, "")
-                    array.append(item as! CNLiveIdentityModel)
-                    //存入数据库
-                    db.insterObject(object: item as! CNLiveIdentityModel)
-                }
-                resultBlock(array,.success,"")
-            }
-            else{
-                let errorMessage:String = resultDic["errorMessage"] as! String
-                showMessage(message: errorMessage)
-                resultBlock([],.failed,errorMessage)
-            }
-            
-        }
-        
-    }
-    
-    
-}
@@ -46,7 +46,7 @@ class CNLiveMineViewController : CNLiveBaseViewController, UITableViewDelegate, 
         dataArray.add(array03)
-//        dataArray.add([["name":"订单列表","icon":"mine_list_icon_help_feedback"]])
+        dataArray.add([["name":"订单列表","icon":"mine_list_icon_help_feedback"]])
         return dataArray
@@ -7,7 +7,6 @@
 import Foundation
 import HandyJSON
-import WCDBSwift
 class UpdateInfoModel: BaseModel {
@@ -134,7 +133,7 @@ class StandListBaseModel: BaseModel {
     var pages: Int = 0
 }
-final class StandListModel: BaseModel, TableCodable {
+final class StandListModel: BaseModel {//, TableCodable {
     var id: Int = 0//ID号-
     var name: String?//名称-
@@ -184,31 +183,31 @@ final class StandListModel: BaseModel, TableCodable {
             })
     }
-    enum CodingKeys: String, CodingTableKey {
-        typealias Root = StandListModel
-        static let objectRelationalMapping = TableBinding(CodingKeys.self)
-        {
-            //设置表的主键key为id,用来区分数据唯一性, 如果id为int类型,可以按实现按顺序递增
-            BindColumnConstraint(id, isPrimary: true, isAutoIncrement: true)
-        }
-        case id
-        case name
-        case icon
-        case enable
-        case createTime
-        case createTimeString
-        case timeString
-        case auth
-        case backgroundImg
-        case backgroundColor
-        case backgroundColour
-        case description
-        case cardImg
-        case downPath
-        case descBackgroundImg
-        case upPath
-        case downType
-    }
+//    enum CodingKeys: String, CodingTableKey {
+//        typealias Root = StandListModel
+//        static let objectRelationalMapping = TableBinding(CodingKeys.self)
+//        {
+//            //设置表的主键key为id,用来区分数据唯一性, 如果id为int类型,可以按实现按顺序递增
+//            BindColumnConstraint(id, isPrimary: true, isAutoIncrement: true)
+//        }
+//        case id
+//        case name
+//        case icon
+//        case enable
+//        case createTime
+//        case createTimeString
+//        case timeString
+//        case auth
+//        case backgroundImg
+//        case backgroundColor
+//        case backgroundColour
+//        case description
+//        case cardImg
+//        case downPath
+//        case descBackgroundImg
+//        case upPath
+//        case downType
+//    }
 }
 // !!!: /api/identityApi/getIdentity 接口标记
@@ -267,8 +266,8 @@ class MineAuthListBaseModel: BaseModel {
     var pages: Int = 0
 }
-final class MineAuthListModel: BaseModel , TableCodable {
-
+final class MineAuthListModel: BaseModel {//,TableCodable {
+    
     required init() {}
     var cardImg: String? = ""
@@ -279,22 +278,22 @@ final class MineAuthListModel: BaseModel , TableCodable {
     var identityId: Int = 0
     var userStatus: Int = 0
-    enum CodingKeys: String, CodingTableKey {
-        
-        typealias Root = MineAuthListModel
-        static let objectRelationalMapping = TableBinding(CodingKeys.self)
-        {
-            //设置表的主键key为id,用来区分数据唯一性, 如果id为int类型,可以按实现按顺序递增
-            BindColumnConstraint(identityId, isPrimary: true, isAutoIncrement: true)
-        }
-        case identityId         //不修改数据库字段名,和属性名保持一直
-        case name       //不修改数据库字段名,和属性名保持一直
-        case icon
-        case cardImg
-        case authTime
-        case code
-        case userStatus
-    }
+//    enum CodingKeys: String, CodingTableKey {
+//
+//        typealias Root = MineAuthListModel
+//        static let objectRelationalMapping = TableBinding(CodingKeys.self)
+//        {
+//            //设置表的主键key为id,用来区分数据唯一性, 如果id为int类型,可以按实现按顺序递增
+//            BindColumnConstraint(identityId, isPrimary: true, isAutoIncrement: true)
+//        }
+//        case identityId         //不修改数据库字段名,和属性名保持一直
+//        case name       //不修改数据库字段名,和属性名保持一直
+//        case icon
+//        case cardImg
+//        case authTime
+//        case code
+//        case userStatus
+//    }
 }
 // !!!: /Api/Index3/myOrderCount 数据返回
@@ -109,6 +109,9 @@ class CNLiveShopOrderDetailViewController: CNLiveBaseViewController, EmptyDataSe
     func loadDataSourceAction() {
         CNLiveShopViewModel.requestOrderDetail(orderId: _orderId, isOrderDetai: _show_type == .order, isRefund: _form_type == .afterSale) { [weak self] result, respStatue in
+            if self == nil {
+                return
+            }
             if respStatue == .success {
                 if self!._show_type == .order {
                     self!.detailModel = result as? ShopOrderDetailModel
@@ -197,7 +200,8 @@ extension CNLiveShopOrderDetailViewController {
         if detailModel.send_num > 1 || detailModel.is_send == "0" {
             self.navigationController?.pushViewController(CNLiveShopOrderExpressListViewController.init(orderId: detailModel.id! as NSString), animated: true)
         } else {
-            self.navigationController?.pushViewController(CNLiveShopOrderExpressDetailViewController.init(orderId: "1000021749", expId: "0", express_num: "1234556789012345", show_type: .orderExpress, progress: .Zero), animated: true)
+//            self.navigationController?.pushViewController(CNLiveShopOrderExpressDetailViewController.init(orderId: "1000021749", expId: "0", express_num: "1234556789012345", show_type: .orderExpress, progress: .Zero), animated: true)
+            self.navigationController?.pushViewController(CNLiveShopOrderExpressDetailViewController.init(orderId: detailModel.id! as NSString, expId: "", express_num: detailModel.express_num! as NSString, show_type: .orderExpress, progress: .Zero), animated: true)
         }
     }
@@ -32,16 +32,25 @@ class CNLiveShopOrderExpressDetailViewController: CNLiveBaseViewController, UITa
         return tableView
     }()
+    lazy var headerView: ShopBodyOrderExpressDetailHeaderView = {
+        let headerView = ShopBodyOrderExpressDetailHeaderView.init(frame: CGRect(x: 0, y: 0, width: KSreenWidth, height: 0), show_type: _show_type)
+        if _show_type == .orderExpress || _show_type == .refundExpress {
+            headerView.expressModel = self.expressModel
+            headerView.express_num = _express_num! as String
+            headerView._orderId = _orderId! as String
+            headerView._expId = _expId! as String
+        } else {
+            headerView.TBY_progress = _progress
+        }
+        headerView.isUserInteractionEnabled = true
+        return headerView
+    }()
+    
     lazy var dataArray: NSMutableArray = {
         let dataArray = NSMutableArray.init()
         return dataArray
     }()
-    lazy var temp_array: NSMutableArray = {
-        let temp_array = NSMutableArray.init()
-        return temp_array
-    }()
-    
     var _expId: NSString!
     var _orderId: NSString!
     var _refundId: NSString!
@@ -68,7 +77,7 @@ class CNLiveShopOrderExpressDetailViewController: CNLiveBaseViewController, UITa
         navigationBarHidden = false
         titleName = "物流详情"
-//        loadDataSourceAction()
+        loadDataSourceAction()
         view.addSubview(tableView)
         tableView.snp.makeConstraints { make in
@@ -84,6 +93,7 @@ class CNLiveShopOrderExpressDetailViewController: CNLiveBaseViewController, UITa
             if respStatue == .success {
                 self!.expressModel = (result as! ShopOrderExpressDetailModel).express
                 self!.dataArray.addObjects(from: (result as! ShopOrderExpressDetailModel).data)
+                self!.tableView.tableHeaderView = self!.headerView
                 self!.tableView.reloadData()
             }else if (respStatue == .noNetwork) {
                 self!.network_type = .noNetwork
@@ -108,7 +118,6 @@ extension CNLiveShopOrderExpressDetailViewController {
         }
     }
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        return UITableViewCell.init()
         guard let cell = tableView.dequeueReusableCell(withIdentifier: kShopBodyOrderExpressDetailTableViewCellIdentifier) as? ShopBodyOrderExpressDetailTableViewCell else {
             return ShopBodyOrderExpressDetailTableViewCell()
         }
@@ -129,24 +138,11 @@ extension CNLiveShopOrderExpressDetailViewController {
                 isLastRow = true
             }
         }
-        cell.setupDataSource(dataModel: detailModel, row: indexPath.row, isLastRow: isLastRow, type: _show_type, address: expressModel.address! as NSString, express_state: expressModel.state! as NSString, temp_array: temp_array)
+        cell.setupDataSource(dataModel: detailModel, row: indexPath.row, isLastRow: isLastRow, type: _show_type, address: expressModel.address! as NSString, express_state: expressModel.state! as NSString)
         return cell
     }
-//    func tableView(_ tableView: UITableView, estimatedHeightForRowAt indexPath: IndexPath) -> CGFloat {
-//        var detailModel: ShopOrderExpressDetailDateModel!
-//        if _show_type == .orderExpress || _show_type == .refundExpress {
-//            if indexPath.row == 0 {
-//                detailModel = ShopOrderExpressDetailDateModel()
-//            } else {
-//                detailModel = (dataArray[indexPath.row - 1] as! ShopOrderExpressDetailDateModel)
-//            }
-//        } else {
-//            detailModel = (dataArray[indexPath.row] as! ShopOrderExpressDetailDateModel)
-//        }
-//        return adapt_length(length: detailModel.cellH+70)
-//    }
-    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        return 0.01
+    func tableView(_ tableView: UITableView, estimatedHeightForRowAt indexPath: IndexPath) -> CGFloat {
+        return adapt_length(length: 80)
     }
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
     }
@@ -197,7 +197,9 @@ extension CNLiveShopOrderExpressViewController {
             title = "快递单号"
             if express_num.isNotBlank() {
                 content = express_num! as String
-                selectExpressModel.no = express_num as String
+                if selectExpressModel != nil {
+                    selectExpressModel.no = "\(express_num ?? "")"
+                }
             } else {
                 if selectExpressModel != nil {
                     content = (selectExpressModel.no != nil) ? selectExpressModel.no! : ""
@@ -210,7 +212,9 @@ extension CNLiveShopOrderExpressViewController {
         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
+                if self!.selectExpressModel != nil {
+                    self!.selectExpressModel.no = content
+                }
             }
         }
         return cell
@@ -85,21 +85,21 @@ class CNLiveShopOrderListViewController: CNLiveBaseViewController, UITableViewDe
             state = "6"
         }
         showLoading(message: "")
-        CNLiveShopViewModel.requestOrderList(state: state, page: page) { [weak self] result, respStatue in
+        CNLiveShopViewModel.requestOrderList(state: state, keyword: "", page: page) { [weak self] result, respStatue in
             if respStatue == .success {
                 if self!.pageNum == 1 {
                     self!.dataArray.removeAllObjects()
                     self!.dataArray.addObjects(from: result as! [ShopOrderListModel])
-                    if self!.dataArray.count > 0 {
+                    if self!.dataArray.count > 0 && self!.tableView.mj_header == nil && self!.tableView.mj_footer == nil {
                         self!.addRefreshView()
                     }
                 }
                 if self!.pageNum > 1 {
                     self!.dataArray.addObjects(from: result as! [ShopOrderListModel])
                 }
-                self!.tableView.reloadData()
                 self!.tableView.mj_header?.endRefreshing()
                 self!.tableView.mj_footer?.endRefreshing()
+                self!.tableView.reloadData()
                 if (result as! Array<Any>).count == 0 {
                     self!.tableView.mj_footer?.endRefreshingWithNoMoreData()
                     self!.tableView.reloadData()
@@ -283,7 +283,8 @@ extension CNLiveShopOrderListViewController {
             self.navigationController?.pushViewController(CNLiveShopOrderExpressListViewController.init(orderId: listModel.id! as NSString), animated: true)
 //            self.navigationController?.pushViewController(CNLiveShopOrderExpressListViewController.init(orderId: "1000073435"), animated: true)
         } else {
-            self.navigationController?.pushViewController(CNLiveShopOrderExpressDetailViewController.init(orderId: "1000021749", expId: "0", express_num: "1234556789012345", show_type: .orderExpress, progress: .Zero), animated: true)
+            self.navigationController?.pushViewController(CNLiveShopOrderExpressDetailViewController.init(orderId: listModel.id! as NSString, expId: "", express_num: listModel.express_num! as NSString, show_type: .orderExpress, progress: .Zero), animated: true)
+//            self.navigationController?.pushViewController(CNLiveShopOrderExpressDetailViewController.init(orderId: "1000021749", expId: "0", express_num: "1234556789012345", show_type: .orderExpress, progress: .Zero), animated: true)
         }
     }
+//
+//  CNLiveShopOrderSearchListViewController.swift
+//  metaCode
+//
+//  Created by open on 2023/11/13.
+//
+
+import Foundation
+import EmptyDataSet_Swift
+import MJRefresh
+
+class CNLiveShopOrderSearchListViewController: CNLiveBaseViewController, UITextFieldDelegate, UITableViewDelegate, UITableViewDataSource, EmptyDataSetSource, EmptyDataSetDelegate {
+        
+    let kShopBodyOrderListViewCellIdentifier = "kShopBodyListViewCellIdentifier"
+    let kShopBodyOrderHeaderViewCellIdentifier = "kShopBodyOrderHeaderViewCellIdentifier"
+    let kShopBodyOrderFooterViewCellIdentifier = "kShopBodyOrderFooterViewCellIdentifier"
+    lazy var tableView : UITableView = {
+        let tableView = UITableView(frame: .zero, style: .grouped)
+        tableView.dataSource = self
+        tableView.delegate = self
+        tableView.emptyDataSetSource = self
+        tableView.emptyDataSetDelegate = self
+        tableView.backgroundColor = .clear
+        tableView.tableFooterView = UIView.init()
+        tableView.separatorStyle = .none
+        tableView.register(ShopBodyOrderListViewCell.self, forCellReuseIdentifier: kShopBodyOrderListViewCellIdentifier)
+        tableView.register(ShopBodyOrderHeaderViewCell.self, forHeaderFooterViewReuseIdentifier: kShopBodyOrderHeaderViewCellIdentifier)
+        tableView.register(ShopBodyOrderFooterViewCell.self, forHeaderFooterViewReuseIdentifier: kShopBodyOrderFooterViewCellIdentifier)
+        return tableView
+    }()
+    
+    lazy var searchTextField: UITextField = {
+        let searchTextField = UITextField.init(frame: CGRectMake(adapt_length(length: 30), get_system_statusBar_height() + (get_system_nav_ui_height() - adapt_length(length: 30))/2, KSreenWidth - adapt_length(length: 40), adapt_length(length: 30)))
+        return searchTextField
+    }()
+    
+    lazy var dataArray: NSMutableArray = {
+        let dataArray = NSMutableArray.init()
+        return dataArray
+    }()
+    
+    var pageNum: NSInteger!
+    var _searchText: String!
+    var network_type: CNLiveMineResponseType!
+    init(searchText: String) {
+        pageNum = 1
+        _searchText = searchText
+        super.init(nibName:nil, bundle:nil)
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        navigationBarHidden = false
+        
+        initNav()
+        view.addSubview(tableView)
+        
+        loadDataSourceAction(page: 1)
+    }
+    
+    func initNav() {        
+        let view = UIView.init(frame: CGRectMake(0, 0, adapt_length(length: 30), adapt_length(length: 30)))
+        
+        let imageView = UIImageView.init(frame: CGRect(x: adapt_length(length: 7), y: adapt_length(length: 4), width: adapt_length(length: 22), height: adapt_length(length: 22)))
+        imageView.image = UIImage(named: "DS_order_search")
+        imageView.clipsToBounds = true
+        imageView.contentMode = .scaleAspectFit
+        view.addSubview(imageView)
+        
+        searchTextField.leftView = view
+        searchTextField.delegate = self
+        searchTextField.leftViewMode = .always
+        searchTextField.placeholder = "请输入关键字..."
+        searchTextField.backgroundColor = HexColor("#f0f0f0")
+        searchTextField.returnKeyType = .search
+        searchTextField.layer.cornerRadius = adapt_length(length: 15)
+        searchTextField.layer.masksToBounds = true
+        searchTextField.font = regular_adapt_font(pointSize: 13)
+        searchTextField.text = _searchText
+        topNavView.addSubview(searchTextField)
+    }
+    
+    func loadDataSourceAction(page: NSInteger) {
+        showLoading(message: "")
+        CNLiveShopViewModel.requestOrderList(state: "", keyword: searchTextField.text!, page: page) { [weak self] result, respStatue in
+            if respStatue == .success {
+                if self!.pageNum == 1 {
+                    self!.dataArray.removeAllObjects()
+                    self!.dataArray.addObjects(from: result as! [ShopOrderListModel])
+                    if self!.dataArray.count > 0 && self!.tableView.mj_header == nil && self!.tableView.mj_footer == nil {
+                        self!.addRefreshView()
+                    }
+                }
+                if self!.pageNum > 1 {
+                    self!.dataArray.addObjects(from: result as! [ShopOrderListModel])
+                }
+                self!.tableView.mj_header?.endRefreshing()
+                self!.tableView.mj_footer?.endRefreshing()
+                self!.tableView.reloadData()
+                if (result as! Array<Any>).count == 0 {
+                    self!.tableView.mj_footer?.endRefreshingWithNoMoreData()
+                    self!.tableView.reloadData()
+                }
+            }else if (respStatue == .noNetwork) {
+                self!.network_type = .noNetwork
+                self!.tableView.reloadEmptyDataSet()
+            } else {
+                self!.network_type = .failed
+                self!.tableView.reloadEmptyDataSet()
+            }
+        }
+    }
+    
+    func addRefreshView() {
+        tableView.mj_header = MJRefreshNormalHeader.init(refreshingBlock: {[weak self] in
+            self!.pageNum = 1
+            self!.loadDataSourceAction(page: 1)
+        })
+        
+        tableView.mj_footer = MJRefreshAutoNormalFooter.init(refreshingBlock: {[weak self] in
+            self!.pageNum = self!.pageNum + 1
+            self!.loadDataSourceAction(page: self!.pageNum)
+        })
+    }
+    
+    override func viewWillLayoutSubviews() {
+        super.viewWillLayoutSubviews()
+        tableView.frame = CGRect(x: 0, y: get_system_nav_height(), width: KSreenWidth, height: view.height - get_system_nav_height())
+    }
+}
+
+extension CNLiveShopOrderSearchListViewController {
+    
+    func numberOfSections(in tableView: UITableView) -> Int {
+        return dataArray.count
+    }
+    
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        let order_detail = (dataArray[section] as! ShopOrderListModel).order_detail
+        return order_detail.count
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        guard let cell = tableView.dequeueReusableCell(withIdentifier: kShopBodyOrderListViewCellIdentifier) as? ShopBodyOrderListViewCell else {
+            return ShopBodyOrderListViewCell()
+        }
+        let order_detail = (dataArray[indexPath.section] as! ShopOrderListModel).order_detail
+        let addTime = (dataArray[indexPath.section] as! ShopOrderListModel).addtime!
+        cell.setupDataSource(goodsModel: order_detail[indexPath.row] , addTime: addTime)
+        return cell
+    }
+    
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        return adapt_length(length: 110)
+    }
+    
+    func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
+        return adapt_length(length: 40)
+    }
+    
+    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+        let headerView = tableView.dequeueReusableHeaderFooterView(withIdentifier: kShopBodyOrderHeaderViewCellIdentifier) as! ShopBodyOrderHeaderViewCell
+        let listModel = (dataArray[section] as! ShopOrderListModel)
+        headerView.setupDataSource(listModel: listModel)
+        return headerView
+    }
+    
+    func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
+        let listModel = (dataArray[section] as! ShopOrderListModel)
+        if listModel.isRefund == "1" {
+            return adapt_length(length: 60)
+        } else {
+            return adapt_length(length: 110)
+        }
+    }
+    
+    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
+        let footerView = tableView.dequeueReusableHeaderFooterView(withIdentifier: kShopBodyOrderFooterViewCellIdentifier) as! ShopBodyOrderFooterViewCell
+        let listModel = (dataArray[section] as! ShopOrderListModel)
+        footerView.setupDataSource(listModel: listModel)
+        footerView.clickRightBtnCallBack = { [weak self] title, clickEvent, listModel in
+            self?.orderOperation(title: title, event: clickEvent, listModel: listModel)
+        }
+        return footerView
+    }
+    
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        let listModel = (dataArray[indexPath.section] as! ShopOrderListModel)
+        pushOrderDetail(listModel: listModel)
+    }
+}
+extension CNLiveShopOrderSearchListViewController {
+    
+    
+    func textFieldShouldReturn(_ textField: UITextField) -> Bool {
+        view.endEditing(true)
+    
+        if textField.text!.count > 30 {
+            textField.text = "\(textField.text?.prefix(29) ?? "")"
+        }
+        
+        let historyDataArr = CNLiveFileManager.shared.take(key: kShopOrderListSearchHistroyDatas) as! NSMutableArray
+        if historyDataArr.contains(textField.text! as String) {
+            historyDataArr.remove(textField.text! as String)
+        }
+        
+        historyDataArr.insert(textField.text! as String, at: 0)
+        CNLiveFileManager.shared.save(object: historyDataArr, key: kShopOrderListSearchHistroyDatas)
+        
+        loadDataSourceAction(page: 1)
+        
+        return true
+    }
+}
+
+extension CNLiveShopOrderSearchListViewController {
+    
+    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(page: 1)
+        }
+    }
+}
+
+extension CNLiveShopOrderSearchListViewController {
+    
+    /// 通过不同的按钮逻辑跳转不同界面
+    /// - Parameters:
+    ///   - clickEvent: 按钮类型
+    ///   - listModel: 数据源
+    private func orderOperation(title: String, event: CNDSOrderListSectionFooterBtnClickEvent, listModel: ShopOrderListModel) {
+        switch event {
+        case .delivery:
+            if listModel.is_tui == "2" {
+                showMessage(message: "此为退款订单")
+                return
+            }
+            delivery(listModel: listModel)
+            break
+        case .notifyOrder:
+            if listModel.is_tui == "2" {
+                showMessage(message: "此为退款订单")
+                return
+            }
+            notifyOrder(listModel: listModel)
+            break
+        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 {
+            self.navigationController?.pushViewController(CNLiveShopOrderExpressDetailViewController.init(orderId: listModel.id! as NSString, expId: "", express_num: listModel.express_num! as NSString, show_type: .orderExpress, progress: .Zero), animated: true)
+//            self.navigationController?.pushViewController(CNLiveShopOrderExpressDetailViewController.init(orderId: "1000021749", expId: "0", express_num: "1234556789012345", show_type: .orderExpress, progress: .Zero), animated: true)
+        }
+    }
+    
+    /// 选取商品及拆单
+    /// - 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) {
+        ConfigAlertManager.shared.presentAlert(title: "提示", message: "确认通知用户自提?", actionTitles: ["取消","确认"]) { index in
+            if index == 1 {
+                CNLiveShopViewModel.requestNotifyOrder(orderId: listModel.id!) { result, respStatue in
+                    if respStatue == .success {
+                        showMessage(message: "通知成功")
+                    }
+                }
+            }
+        }
+    }
+    
+    /// 跳转到订单详情界面
+    /// - Parameter listModel: 数据源
+    private func pushOrderDetail(listModel: ShopOrderListModel) {
+        if listModel.isRefund == "1" {
+            let detailVC =  CNLiveShopOrderDetailViewController.init(orderId: listModel.id!, show_type: .sale, form_type: .afterSale)
+            self.navigationController?.pushViewController(detailVC, animated: true)
+        } else {
+            if listModel.address_address!.count > 0 {
+                self.navigationController?.pushViewController(CNLiveShopOrderDetailViewController.init(orderId: listModel.id!, show_type: .order, form_type: .afterSale), animated: true)
+            } else {
+                showMessage(message: "目前没有地址信息，暂无法发货")
+            }
+        }
+    }
+}
+//
+//  CNLiveShopOrderSearchViewController.swift
+//  metaCode
+//
+//  Created by open on 2023/11/13.
+//
+
+import Foundation
+
+let kShopOrderListSearchHistroyDatas = "kShopOrderListSearchHistroyDatas"
+class CNLiveShopOrderSearchViewController: CNLiveBaseViewController, UITextFieldDelegate, UITableViewDelegate, UITableViewDataSource {
+    
+
+    let kShopBodyOrderSearchHistoryTableViewCellIdentifier = "kShopBodyOrderSearchHistoryTableViewCellIdentifier"
+    lazy var tableView: UITableView = {
+        let tableView = UITableView.init(frame: CGRect(x: 0, y: get_system_nav_height(), width: KSreenWidth, height: KSreenHeight - get_system_nav_height()), style: .plain)
+        tableView.delegate = self
+        tableView.dataSource = self
+        tableView.separatorInset = UIEdgeInsets(top: 0, left: adapt_length(length: 20), bottom: 0, right: adapt_length(length: 20))
+        tableView.rowHeight = adapt_length(length: 45)
+        tableView.sectionHeaderHeight = adapt_length(length: 45)
+        tableView.backgroundColor = HexColor("#f1f2f6")
+        tableView.register(ShopBodyOrderSearchHistoryTableViewCell.self, forCellReuseIdentifier: kShopBodyOrderSearchHistoryTableViewCellIdentifier)
+        
+        let footerView = UIView.init(frame: CGRectMake(0, 0, KSreenWidth, adapt_length(length: 45)))
+        footerView.backgroundColor = .white
+        
+        let deleteBtn = UIButton.init(type: .custom)
+        deleteBtn.frame = footerView.bounds
+        if historyArr.count > 0 {
+            deleteBtn.setTitle("清除搜索历史", for: .normal)
+            deleteBtn.setTitleColor(HexColor("#FF3355"), for: .normal)
+        } else {
+            deleteBtn.setTitle("无搜索历史", for: .normal)
+            deleteBtn.setTitleColor(HexColor("#898989"), for: .normal)
+        }
+        deleteBtn.tag = 1
+        deleteBtn.titleLabel?.font = regular_adapt_font(pointSize: 14)
+        deleteBtn.addTarget(self, action: #selector(deleteAllBtnClick), for: .touchUpInside)
+        footerView.addSubview(deleteBtn)
+        
+        tableView.tableFooterView = footerView
+        
+        return tableView
+    }()
+    
+    
+    lazy var searchTextField: UITextField = {
+        let searchTextField = UITextField.init(frame: CGRectMake(adapt_length(length: 15), get_system_statusBar_height() + (get_system_nav_ui_height() - adapt_length(length: 30))/2, KSreenWidth - adapt_length(length: 95), adapt_length(length: 30)))
+        return searchTextField
+    }()
+    
+    lazy var cancelButton: UIButton = {
+        let cancelButton = UIButton.init(type: .custom)
+        cancelButton.frame = CGRect(x: KSreenWidth - 70, y: (get_system_nav_height() - (get_system_statusBar_height() + 25))/2 + get_system_statusBar_height(), width: 60, height: 25)
+        cancelButton.setTitle("取消", for: .normal)
+        cancelButton.titleLabel?.font = semibold_adapt_font(pointSize: 15)
+        cancelButton.setTitleColor(HexColor("#ff3355"), for: .normal)
+        cancelButton.backgroundColor = .clear
+        cancelButton.layer.masksToBounds  = true
+        cancelButton.layer.cornerRadius = 5
+        cancelButton.addTarget(self, action: #selector(cancelBtnClick), for: .touchUpInside)
+        return cancelButton
+    }()
+    
+    lazy var historyArr: NSMutableArray = {
+        let historyArr = NSMutableArray.init()
+        return historyArr
+    }()
+    
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        take()
+        searchTextField.text = ""
+    }
+    
+    override func viewWillLayoutSubviews() {
+        super.viewWillLayoutSubviews()
+        tableView.frame = CGRect(x: 0, y: get_system_nav_height(), width: KSreenWidth, height: view.height - get_system_nav_height())
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        navigationBarHidden = false
+        
+        initNav()
+        view.addSubview(tableView)
+    }
+    
+    func initNav() {
+        let btn = self.leftNavBtns.first! as UIButton
+        btn.isHidden = true
+        
+        let view = UIView.init(frame: CGRectMake(0, 0, adapt_length(length: 30), adapt_length(length: 30)))
+        
+        let imageView = UIImageView.init(frame: CGRect(x: adapt_length(length: 7), y: adapt_length(length: 4), width: adapt_length(length: 22), height: adapt_length(length: 22)))
+        imageView.image = UIImage(named: "DS_order_search")
+        imageView.clipsToBounds = true
+        imageView.contentMode = .scaleAspectFit
+        view.addSubview(imageView)
+        
+        searchTextField.leftView = view
+        searchTextField.delegate = self
+        searchTextField.leftViewMode = .always
+        searchTextField.placeholder = "请输入关键字..."
+        searchTextField.backgroundColor = HexColor("#f0f0f0")
+        searchTextField.returnKeyType = .search
+        searchTextField.layer.cornerRadius = adapt_length(length: 15)
+        searchTextField.layer.masksToBounds = true
+        searchTextField.font = regular_adapt_font(pointSize: 13)
+        topNavView.addSubview(searchTextField)
+        
+        topNavView.addSubview(cancelButton)
+    }
+    
+    @objc func cancelBtnClick() {
+        self.navigationController?.popViewController(animated: true)
+    }
+    
+    @objc func deleteAllBtnClick(deleteBtn: UIButton) {
+        if historyArr.count > 0 {
+            deleteAll()
+            deleteBtn.setTitle("无搜索历史", for: .normal)
+            deleteBtn.setTitleColor(HexColor("#898989"), for: .normal)
+        }
+    }
+    
+    ///!!!:
+    ///增删改查
+    func saveRecord(title: String) {
+        if !title.isNotBlank() {
+            return
+        }
+        if historyArr.contains(title) {
+            historyArr.remove(title)
+        }
+        historyArr.insert(title, at: 0)
+        tableView.reloadData()
+        
+        CNLiveFileManager.shared.save(object: historyArr, key: kShopOrderListSearchHistroyDatas)
+    }
+    
+    func take() {
+        let takeArr = CNLiveFileManager.shared.take(key: kShopOrderListSearchHistroyDatas)
+        if (takeArr as AnyObject).count > 0 {
+            historyArr = NSMutableArray.init(array: takeArr as! [Any])
+            tableView.reloadData()
+        }
+
+        
+        let deleteBtn = tableView.tableFooterView?.viewWithTag(1) as! UIButton
+        if historyArr.count > 0 {
+            deleteBtn.setTitle("清除搜索历史", for: .normal)
+            deleteBtn.setTitleColor(HexColor("#ff3355"), for: .normal)
+        } else {
+            deleteBtn.setTitle("无搜索历史", for: .normal)
+            deleteBtn.setTitleColor(HexColor("#898989"), for: .normal)
+        }
+    }
+    
+    func deleteAll() {
+        
+        historyArr.removeAllObjects()
+        CNLiveFileManager.shared.delete(key: kShopOrderListSearchHistroyDatas)
+        
+        tableView.reloadData()
+    }
+    
+    func delete(index: NSInteger) {
+        
+        historyArr.removeObject(at: index)
+        CNLiveFileManager.shared.save(object: historyArr, key: kShopOrderListSearchHistroyDatas)
+        
+        tableView.reloadData()
+    }
+}
+
+extension CNLiveShopOrderSearchViewController {
+    
+    
+    func textFieldShouldReturn(_ textField: UITextField) -> Bool {
+        view.endEditing(true)
+        
+        saveRecord(title: textField.text ?? "")
+        
+        let delectBtn = (tableView.tableFooterView?.viewWithTag(1))! as! UIButton
+        delectBtn.setTitle("清除搜索历史", for: .normal)
+        delectBtn.setTitleColor(HexColor("#ff3355"), for: .normal)
+        
+        self.navigationController?.pushViewController(CNLiveShopOrderSearchListViewController.init(searchText: textField.text!), animated: true)
+        
+        return true
+    }
+}
+
+extension CNLiveShopOrderSearchViewController {
+    
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return historyArr.count
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        guard let cell = tableView.dequeueReusableCell(withIdentifier: kShopBodyOrderSearchHistoryTableViewCellIdentifier) as? ShopBodyOrderSearchHistoryTableViewCell else {
+            return ShopBodyOrderSearchHistoryTableViewCell()
+        }
+        
+        cell.titleLabel.text = historyArr[indexPath.row] as? String
+        cell.deleteBtn.tag = indexPath.row
+        cell.clickBlock = {[weak self] button in
+            self!.delete(index: button.tag)
+            
+            if self!.historyArr.count == 0 {
+                let delectBtn = tableView.tableFooterView?.viewWithTag(1) as! UIButton
+                delectBtn.setTitle("无搜索历史", for: .normal)
+                delectBtn.setTitleColor(HexColor("#898989"), for: .normal)
+            }
+        }
+        return cell
+    }
+    
+    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+        let headerView = UIView(frame: CGRect(x: 0, y: 0, width: KSreenWidth, height: adapt_length(length: 45)))
+        headerView.backgroundColor = .white
+        
+        let titleLabel = UILabel.init(frame: CGRect(x: adapt_length(length: 20), y: 0, width: KSreenWidth - adapt_length(length: 65), height: adapt_length(length: 45)))
+        titleLabel.textColor = HexColor("#898989")
+        titleLabel.font = regular_adapt_font(pointSize: 14)
+        titleLabel.text = "历史搜索"
+        headerView.addSubview(titleLabel)
+        
+        let lineLabel = UILabel.init(frame: CGRect(x: adapt_length(length: 20), y: adapt_length(length: 44), width: KSreenWidth, height: adapt_length(length: 1)))
+        lineLabel.backgroundColor = HexColor("#e4e4e4")
+        headerView.addSubview(lineLabel)
+        return headerView
+    }
+    
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        
+        self.navigationController?.pushViewController(CNLiveShopOrderSearchListViewController.init(searchText: historyArr[indexPath.row] as! String), animated: true)
+        
+        saveRecord(title: historyArr[indexPath.row] as! String)
+    }
+    
+    func scrollViewWillBeginDragging(_ scrollView: UIScrollView) {
+        view.endEditing(true)
+    }
+}
@@ -52,6 +52,17 @@ class CNLiveShopOrderViewController: CNLiveBaseViewController {
         return categoryView
     }()
+    lazy var searchButton: UIButton = {
+        let searchButton = UIButton.init(type: .custom)
+        searchButton.frame = CGRect(x: KSreenWidth - adapt_length(length: 40), y: (get_system_nav_height() - (get_system_statusBar_height() + adapt_length(length: 30)))/2 + get_system_statusBar_height(), width: adapt_length(length: 30), height: adapt_length(length: 30))
+        searchButton.setImage(UIImage(named: "DS_order_search"), for: .normal)
+        searchButton.backgroundColor = .clear
+        searchButton.layer.masksToBounds  = true
+        searchButton.layer.cornerRadius = 5
+        searchButton.addTarget(self, action: #selector(searchBtnClick), for: .touchUpInside)
+        return searchButton
+    }()
+    
     lazy var listContainerView: JXSegmentedListContainerView! = {
         return JXSegmentedListContainerView(dataSource: self)
     }()
@@ -67,6 +78,8 @@ class CNLiveShopOrderViewController: CNLiveBaseViewController {
         categoryView.listContainer = listContainerView
         view.addSubview(listContainerView)
+        topNavView.addSubview(searchButton)
+        
     }
     override func viewDidLayoutSubviews() {
@@ -75,6 +88,10 @@ class CNLiveShopOrderViewController: CNLiveBaseViewController {
         categoryView.frame = CGRect(x: 0, y: KNavigationHeight, width: view.bounds.size.width, height: CGFloat(kCNLiveShopOrderListSectionTitleHeight))
         listContainerView.frame = CGRect(x: 0, y: KNavigationHeight+CGFloat(kCNLiveShopOrderListSectionTitleHeight), width: view.bounds.size.width, height: view.bounds.size.height - CGFloat(kCNLiveShopOrderListSectionTitleHeight) - KNavigationHeight)
     }
+    
+    @objc func searchBtnClick() {
+        self.navigationController?.pushViewController(CNLiveShopOrderSearchViewController.init(), animated: true)
+    }
 }
 extension CNLiveShopOrderViewController: JXSegmentedViewDelegate {
@@ -11,6 +11,7 @@ import Kingfisher
 typealias clickAgreeCallBack = (_ refundView: ShopBodyOrderRefundView,_ desc: String) -> Void
 typealias clickButtonCallBack = (_ isSelected: Bool) -> Void
+typealias clickSearchCallBack = (_ button: UIButton) -> Void
 typealias clickInputCallBack = (_ content: String, _ row: NSInteger) -> Void
 class ShopBodyOrderRefundView: UIView, UITextViewDelegate {
@@ -685,3 +686,52 @@ class ShopBodyOrderExpressFirmTableViewCell: UITableViewCell {
         fatalError("init(coder:) has not been implemented")
     }
 }
+
+class ShopBodyOrderSearchHistoryTableViewCell: UITableViewCell {
+    
+    lazy var titleLabel: UILabel = {
+        let titleLabel = UILabel.init()
+        titleLabel.textColor = HexColor("#6a6a6a")
+        titleLabel.font = regular_adapt_font(pointSize: 14)
+        return titleLabel
+    }()
+    
+    lazy var deleteBtn: UIButton = {
+        let deleteBtn = UIButton.init(type: .custom)
+        deleteBtn.setImage(UIImage(named: "mine_header_icon_close"), for: .normal)
+        deleteBtn.addTarget(self, action: #selector(buttonClick), for: .touchUpInside)
+        return deleteBtn
+    }()
+    
+    var clickBlock: clickSearchCallBack!
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        contentView.backgroundColor = .clear
+        selectionStyle = .none
+        
+        addSubview(deleteBtn)
+        deleteBtn.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.size.equalTo(adapt_length(length: 30))
+            make.right.equalToSuperview().offset(-adapt_length(length: 15))
+        }
+        
+        addSubview(titleLabel)
+        titleLabel.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.left.equalToSuperview().offset(adapt_length(length: 15))
+            make.right.equalTo(deleteBtn.snp.left).offset(-adapt_length(length: 10))
+        }
+    }
+    
+    
+    @objc func buttonClick(button: UIButton) {
+        if (clickBlock != nil) {
+            clickBlock(button)
+        }
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+}
@@ -7,6 +7,7 @@
 import Foundation
 import EmptyDataSet_Swift
+import Kingfisher
 class ShopBodyOrderExpressListTableViewCell: UITableViewCell, UICollectionViewDataSource {
@@ -145,7 +146,7 @@ class ShopBodyOrderExpressListTableViewCell: UITableViewCell, UICollectionViewDa
     func setupDataSource(listModel: ShopOrderExpressListModel) {
         _listModel = listModel
-        logoImageView.kf.setImage(with: URL(string: listModel.simg!))
+        logoImageView.kf.setImage(with: URL(string: listModel.simg!), placeholder: UIImage.imageWithColor(color: HexColor("#f9f9f9")!, size: CGSize(width: adapt_length(length: 39.68), height: adapt_length(length: 39.68))))
         expressName.text = listModel.express
         expressName.sizeToFit()
         expressNo.text = "快递编号：\(listModel.express_num ?? "0")"
@@ -168,7 +169,7 @@ class ShopBodyOrderExpressListTableViewCell: UITableViewCell, UICollectionViewDa
     }
     @objc func pushExpressDetail() {
-        currentViewController()?.navigationController?.pushViewController(CNLiveShopOrderExpressDetailViewController.init(orderId: _listModel.id! as NSString, expId: _listModel.express_num! as NSString, express_num: _listModel.express_num! as NSString, show_type: .orderExpress, progress: .Zero), animated: true)
+        currentViewController()?.navigationController?.pushViewController(CNLiveShopOrderExpressDetailViewController.init(orderId: _listModel.order_id! as NSString, expId: _listModel.id! as NSString, express_num: _listModel.express_num! as NSString, show_type: .orderExpress, progress: .Zero), animated: true)
     }
     @objc func actionClick(sender: UIButton) {
@@ -239,22 +240,6 @@ class ShopBodyOrderExpressListCollectionViewCell: UICollectionViewCell {
     }
 }
-class ShopBodyOrderExpressDetailHeaderView: UIView {
-    
-    var _showType: CNLiveShopOrderExpressDetailShowType!
-    init(frame: CGRect, showType: CNLiveShopOrderExpressDetailShowType) {
-        super.init(frame: frame)
-        _showType = showType
-    }
-    
-    
-    
-    required init?(coder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-    
-}
-
 class ShopBodyOrderExpressDetailTableViewCell: UITableViewCell, UITextViewDelegate {
@@ -295,19 +280,16 @@ class ShopBodyOrderExpressDetailTableViewCell: UITableViewCell, UITextViewDelega
         super.init(style: style, reuseIdentifier: reuseIdentifier)
         contentView.backgroundColor = .white
         selectionStyle = .none
-        _have_layout = false
         addSubview(lineLabel)
         addSubview(pointImageView)
         addSubview(titleTextView)
         addSubview(timeLabel)
         addSubview(bottomLine)
-        
-//        initLayout()
     }
     func textView(_ textView: UITextView, shouldInteractWith URL: URL, in characterRange: NSRange, interaction: UITextItemInteraction) -> Bool {
-        if URL.absoluteString == "tel://" {
+        if URL.absoluteString.contains("tel://") {
             let phone = URL.absoluteString.components(separatedBy: "tel://").last
             ConfigAlertManager.shared.presentAlert(title: phone!, message: "", actionTitles: ["取消","呼叫"]) { index in
                 if index == 1 {
@@ -322,14 +304,13 @@ class ShopBodyOrderExpressDetailTableViewCell: UITableViewCell, UITextViewDelega
         return false
     }
-    var _have_layout: Bool!
     var _dataModel: ShopOrderExpressDetailDateModel!
     var _row: NSInteger!
     var _isLastRow: Bool!
     var _type: CNLiveShopOrderExpressDetailShowType!
     var _address: NSString!
     var _express_state: NSString!
-    func setupDataSource(dataModel: ShopOrderExpressDetailDateModel, row: NSInteger, isLastRow: Bool, type: CNLiveShopOrderExpressDetailShowType, address: NSString, express_state: NSString, temp_array: NSMutableArray) {
+    func setupDataSource(dataModel: ShopOrderExpressDetailDateModel, row: NSInteger, isLastRow: Bool, type: CNLiveShopOrderExpressDetailShowType, address: NSString, express_state: NSString) {
         _dataModel = dataModel
         _row = row
         _isLastRow = isLastRow
@@ -350,7 +331,7 @@ class ShopBodyOrderExpressDetailTableViewCell: UITableViewCell, UITextViewDelega
                 pointImageView.image = nil
                 pointImageView.backgroundColor = HexColor("#d2d2d2")
                 pointImageView.size = CGSizeMake(adapt_length(length: 5), adapt_length(length: 5))
-                pointImageView.layer.cornerRadius = pointImageView.height/2
+                pointImageView.layer.cornerRadius = adapt_length(length: 2.5)
                 pointImageView.layer.masksToBounds = true
             } else if (_row == 1) {
                 let state = _express_state == "3" ? "已签收" : "运输中"
@@ -363,8 +344,8 @@ class ShopBodyOrderExpressDetailTableViewCell: UITableViewCell, UITextViewDelega
                 pointImageView.image = UIImage(named: "DS_express_current")
                 pointImageView.backgroundColor = .clear
                 pointImageView.size = CGSizeMake(adapt_length(length: 15), adapt_length(length: 15))
-                pointImageView.layer.cornerRadius = 0
-                pointImageView.layer.masksToBounds = false
+                pointImageView.layer.cornerRadius = adapt_length(length: 7.5)
+                pointImageView.layer.masksToBounds = true
             } else {
                 let title = NSMutableAttributedString.init(string: dataModel.AcceptStation!, attributes: [.font:medium_adapt_font(pointSize: 12),.foregroundColor:HexColor("#b4b4b4")!,.paragraphStyle:para.copy()])
                 titleTextView.attributedText = setHyperlinksAttrStr(attrStr: title)
@@ -373,7 +354,7 @@ class ShopBodyOrderExpressDetailTableViewCell: UITableViewCell, UITextViewDelega
                 pointImageView.image = nil
                 pointImageView.backgroundColor = backgroundColor
                 pointImageView.size = CGSize(width: adapt_length(length: 5), height: adapt_length(length: 5))
-                pointImageView.layer.cornerRadius = pointImageView.height/2
+                pointImageView.layer.cornerRadius = adapt_length(length: 2.5)
                 pointImageView.layer.masksToBounds = true
                 pointImageView.layer.borderColor = HexColor("#d2d2d2")?.cgColor
                 pointImageView.layer.borderWidth = adapt_length(length: 1)
@@ -386,7 +367,7 @@ class ShopBodyOrderExpressDetailTableViewCell: UITableViewCell, UITextViewDelega
                 pointImageView.image = UIImage(named: "DS_express_current")
                 pointImageView.backgroundColor = .clear
                 pointImageView.size = CGSizeMake(adapt_length(length: 15), adapt_length(length: 15))
-                pointImageView.layer.cornerRadius = 0
+                pointImageView.layer.cornerRadius = adapt_length(length: 7.5)
                 pointImageView.layer.masksToBounds = false
             } else {
                 titleTextView.textColor = HexColor("#999999")
@@ -394,7 +375,7 @@ class ShopBodyOrderExpressDetailTableViewCell: UITableViewCell, UITextViewDelega
                 pointImageView.image = UIImage(named: "DS_express_current")
                 pointImageView.backgroundColor = .clear
                 pointImageView.size = CGSizeMake(adapt_length(length: 15), adapt_length(length: 15))
-                pointImageView.layer.cornerRadius = pointImageView.height/2
+                pointImageView.layer.cornerRadius = adapt_length(length: 7.5)
                 pointImageView.layer.masksToBounds = true
                 pointImageView.layer.borderColor = HexColor("#d2d2d2")?.cgColor
                 pointImageView.layer.borderWidth = adapt_length(length: 1)
@@ -402,26 +383,12 @@ class ShopBodyOrderExpressDetailTableViewCell: UITableViewCell, UITextViewDelega
             titleTextView.text = dataModel.AcceptStation
             timeLabel.text = dataModel.AcceptTime
         }
-//        titleTextView.sizeToFit()
+        titleTextView.snp.removeConstraints()
+        pointImageView.snp.removeConstraints()
+        lineLabel.snp.removeConstraints()
+        titleTextView.sizeToFit()
         setupLayout()
-    }
-    
-    func initLayout() {
-        lineLabel.snp.makeConstraints { make in
-            make.centerX.equalTo(pointImageView)
-            make.top.bottom.equalToSuperview()
-            make.width.equalTo(adapt_length(length: 1))
-        }
-        pointImageView.snp.makeConstraints { make in
-            make.top.equalToSuperview().offset(adapt_length(length: 16))
-            make.left.equalTo(adapt_length(length: 20))
-            make.size.equalTo(adapt_length(length: 5))
-        }
-        titleTextView.snp.makeConstraints { make in
-            make.top.equalToSuperview().offset(adapt_length(length: 15))
-            make.left.equalToSuperview().offset(adapt_length(length: 48))
-            make.right.equalToSuperview().offset(-adapt_length(length: 20))
-        }
+
     }
     func setupLayout() {
@@ -464,26 +431,26 @@ class ShopBodyOrderExpressDetailTableViewCell: UITableViewCell, UITextViewDelega
             make.top.equalToSuperview().offset(adapt_length(length: 15))
             make.left.equalToSuperview().offset(adapt_length(length: 48))
             make.right.equalToSuperview().offset(-adapt_length(length: 20))
-            make.height.equalTo(_dataModel.cellH)
-        }
-//        let top = timeLabel.text!.isNotBlank() ? adapt_length(length: 15) : 0
-//        timeLabel.snp.makeConstraints { make in
-//            make.top.equalTo(titleTextView.snp.bottom).offset(adapt_length(length: top))
-//            make.left.equalTo(titleTextView.snp.left)
-//            make.right.equalToSuperview().offset(-adapt_length(length: 20))
-//            make.bottom.equalToSuperview().offset(-adapt_length(length: 15))
-//        }
-//        bottomLine.snp.makeConstraints { make in
-//            make.left.equalTo(titleTextView.snp.left)
-//            make.right.equalToSuperview().offset(-adapt_length(length: 20))
-//            make.bottom.equalToSuperview()
-//            make.height.equalTo(adapt_length(length: 1))
-//        }
+            make.height.equalTo(titleTextView.size)
+        }
+        let top = timeLabel.text!.isNotBlank() ? adapt_length(length: 15) : 0
+        timeLabel.snp.makeConstraints { make in
+            make.top.equalTo(titleTextView.snp.bottom).offset(adapt_length(length: top))
+            make.left.equalTo(titleTextView.snp.left)
+            make.right.equalToSuperview().offset(-adapt_length(length: 20))
+            make.bottom.equalToSuperview().offset(-adapt_length(length: 15))
+        }
+        bottomLine.snp.makeConstraints { make in
+            make.left.equalTo(titleTextView.snp.left)
+            make.right.equalToSuperview().offset(-adapt_length(length: 20))
+            make.bottom.equalToSuperview()
+            make.height.equalTo(adapt_length(length: 1))
+        }
     }
     func setHyperlinksAttrStr(attrStr: NSMutableAttributedString) -> NSAttributedString {
         do {
-            let dataDetector = try NSDataDetector(types: NSTextCheckingTypes(NSTextCheckingResult.CheckingType.link.rawValue) | NSTextCheckingTypes(NSTextCheckingResult.CheckingType.phoneNumber.rawValue))
+            let dataDetector = try NSDataDetector(types: NSTextCheckingTypes(NSTextCheckingResult.CheckingType.phoneNumber.rawValue) | NSTextCheckingTypes(NSTextCheckingResult.CheckingType.link.rawValue))
             let res = dataDetector.matches(in: attrStr.string, options: NSRegularExpression.MatchingOptions(rawValue: 0), range: NSMakeRange(0, attrStr.string.count))
             for checkingRes in res {
                 if (checkingRes.phoneNumber != nil) {
@@ -503,3 +470,181 @@ class ShopBodyOrderExpressDetailTableViewCell: UITableViewCell, UITextViewDelega
         fatalError("init(coder:) has not been implemented")
     }
 }
+
+class ShopBodyOrderExpressDetailHeaderView: UIView {
+ 
+    lazy var iconImageView: UIImageView = {
+        let iconImageView = UIImageView.init(frame: CGRectMake(0, 0, adapt_length(length: 40), adapt_length(length: 40)))
+        iconImageView.contentMode = .scaleAspectFill
+        return iconImageView
+    }()
+    
+    lazy var titleLabel: UILabel = {
+        let titleLabel = UILabel.init()
+        titleLabel.textColor = HexColor("#333333")
+        titleLabel.font = medium_adapt_font(pointSize: 14)
+        return titleLabel
+    }()
+    
+    lazy var descLabel: UILabel = {
+        let descLabel = UILabel.init()
+        descLabel.textColor = HexColor("#b4b4b4")
+        descLabel.font = regular_adapt_font(pointSize: 12)
+        descLabel.isHidden = !(_show_type == .orderExpress || _show_type == .refundExpress)
+        return descLabel
+    }()
+    
+    lazy var editBtn: UIButton = {
+        let editBtn = UIButton.init(type: .custom)
+        editBtn.size = CGSizeMake(adapt_length(length: 47), adapt_length(length: 30))
+        editBtn.setTitle("修改", for: .normal)
+        editBtn.setTitleColor(HexColor("#28c1c6"), for: .normal)
+        editBtn.titleLabel?.font = medium_adapt_font(pointSize: 14)
+        editBtn.layer.cornerRadius = adapt_length(length: 4)
+        editBtn.layer.masksToBounds = true
+        editBtn.layer.borderColor = HexColor("#28c1c6")?.cgColor
+        editBtn.layer.borderWidth = adapt_length(length: 1)
+        editBtn.isHidden = !(_show_type == .orderExpress || _show_type == .refundExpress)
+        editBtn.addTarget(self, action: #selector(editBtnClick), for: .touchUpInside)
+        return editBtn
+    }()
+    
+    lazy var enCopyBtn: UIButton = {
+        let enCopyBtn = UIButton.init(type: .custom)
+        enCopyBtn.size = CGSizeMake(adapt_length(length: 77), adapt_length(length: 30))
+        enCopyBtn.setTitle("复制单号", for: .normal)
+        enCopyBtn.setTitleColor(HexColor("#28c1c6"), for: .normal)
+        enCopyBtn.titleLabel?.font = medium_adapt_font(pointSize: 14)
+        enCopyBtn.layer.cornerRadius = adapt_length(length: 4)
+        enCopyBtn.layer.masksToBounds = true
+        enCopyBtn.layer.borderColor = HexColor("#28c1c6")?.cgColor
+        enCopyBtn.layer.borderWidth = adapt_length(length: 1)
+        enCopyBtn.isHidden = !(_show_type == .orderExpress || _show_type == .refundExpress)
+        enCopyBtn.addTarget(self, action: #selector(enCopyBtnClick), for: .touchUpInside)
+        return enCopyBtn
+    }()
+    
+    lazy var lineLabel: UILabel = {
+        let lineLabel = UILabel.init()
+        lineLabel.backgroundColor = HexColor("#f6f6f6")
+        return lineLabel
+    }()
+    //  自取进度 (自取有用)
+    var _TBY_progress: CNLiveShopOrderExpressDetailYBYProgress!
+    var TBY_progress: CNLiveShopOrderExpressDetailYBYProgress? {
+        set {
+            _TBY_progress = newValue
+            if _TBY_progress == .Zero {
+                titleLabel.text = "备货完成"
+            } else {
+                titleLabel.text = "自取完毕"
+            }
+        }
+        get {
+            _TBY_progress
+        }
+    }
+    //  快递公司信息 (快递有用)
+    var _expressModel: ShopOrderExpressModel!
+    var expressModel: ShopOrderExpressModel? {
+        set {
+            _expressModel = newValue
+            iconImageView.kf.setImage(with: URL(string: _expressModel.simg!), placeholder: UIImage.imageWithColor(color: HexColor("#f9f9f9")!, size: CGSize(width: adapt_length(length: 40), height: adapt_length(length: 40))))
+            titleLabel.text = _expressModel.com
+        }
+        get {
+            _expressModel
+        }
+    }
+    //  快递编号 (快递有用)
+    var _express_num: String!
+    var express_num: String {
+        set {
+            _express_num = newValue
+            descLabel.text = "快递编号:\(_express_num ?? "")"
+        }
+        get {
+            _express_num
+        }
+    }
+    var _orderId: String! // 快递订单号 (快递有用)
+    var _expId: String! //  发货单id (多物流快递有用)
+    
+    var _show_type: CNLiveShopOrderExpressDetailShowType!
+    init(frame: CGRect,show_type: CNLiveShopOrderExpressDetailShowType) {
+        _show_type = show_type
+        super.init(frame: CGRect(x: 0, y: 0, width: KSreenWidth, height: (_show_type == .orderExpress || _show_type == .refundExpress) ? adapt_length(length: 80) : adapt_length(length: 58)))
+        backgroundColor = UIColor.white
+        
+        addSubview(iconImageView)
+        iconImageView.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(adapt_length(length: 20))
+            make.top.equalToSuperview().offset(adapt_length(length: 15))
+            make.size.equalTo(adapt_length(length: 40))
+        }
+        addSubview(enCopyBtn)
+        enCopyBtn.snp.makeConstraints { make in
+            make.right.equalToSuperview().offset(-adapt_length(length: 20))
+            make.top.equalToSuperview().offset(adapt_length(length: 6))
+            make.size.equalTo(enCopyBtn.size)
+        }
+        addSubview(editBtn)
+        editBtn.snp.makeConstraints { make in
+            make.right.equalTo(enCopyBtn.snp.left).offset(-adapt_length(length: 10))
+            make.centerY.equalTo(enCopyBtn)
+            make.size.equalTo(editBtn.size)
+        }
+        addSubview(titleLabel)
+        titleLabel.snp.makeConstraints { make in
+            make.left.equalTo(iconImageView.snp.right).offset(adapt_length(length: 16))
+            if _show_type == .orderExpress || _show_type == .refundExpress {
+                make.right.equalTo(enCopyBtn.snp.left).offset(-adapt_length(length: 16))
+                make.top.equalToSuperview().offset(adapt_length(length: 16))
+                make.height.equalTo(adapt_length(length: 17))
+            } else {
+                make.centerY.equalTo(iconImageView)
+                make.right.equalToSuperview().offset(-adapt_length(length: 16))
+            }
+        }
+        addSubview(descLabel)
+        descLabel.snp.makeConstraints { make in
+            make.left.equalTo(iconImageView.snp.right).offset(adapt_length(length: 16))
+            if _show_type == .orderExpress || _show_type == .refundExpress {
+                make.right.equalTo(enCopyBtn.snp.left).offset(-adapt_length(length: 16))
+            } else {
+                make.right.equalToSuperview().offset(-adapt_length(length: 16))
+            }
+            make.top.equalTo(titleLabel.snp.bottom).offset(adapt_length(length: 10))
+            make.height.equalTo(adapt_length(length: 17))
+        }
+        addSubview(lineLabel)
+        lineLabel.snp.makeConstraints { make in
+            make.left.right.bottom.equalToSuperview()
+            make.height.equalTo(adapt_length(length: 10))
+        }
+    }
+    
+    @objc func editBtnClick(sender: UIButton) {
+        if _show_type == .orderExpress || _show_type == .refundExpress {
+            let vc = CNLiveShopOrderExpressViewController.init(orderId: _orderId! as NSString, isExp: (_expId != nil), goods_arr: [])
+            vc.expressModel = _expressModel
+            vc.express_num = _express_num
+            vc.expId = _expId
+            vc.hiddenShop = true
+            currentViewController()?.navigationController?.pushViewController(vc, animated: true)
+        }
+    }
+    
+    @objc func enCopyBtnClick(sender: UIButton) {
+        if !_express_num.isNotBlank() {
+            return
+        }
+        let pasteboard = UIPasteboard.general
+        pasteboard.string = _express_num
+        showMessage(message: "复制成功")
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+}
@@ -15,7 +15,7 @@ class CNLiveShopViewModel: NSObject {
     /// - Parameters:
     ///   - state:  0全部 1待发货 2配送中 3代付款 4订单退款
     ///   - resultShopBlock: 返回
-    static func requestOrderList(state: String, page: NSInteger, resultBlock: @escaping resultShopBlock) {
+    static func requestOrderList(state: String, keyword: String, page: NSInteger, resultBlock: @escaping resultShopBlock) {
         if state == "6" {
             let param = NSMutableDictionary()
             param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "uid")
@@ -65,7 +65,7 @@ class CNLiveShopViewModel: NSObject {
             param.setValue("\(page)", forKey: "page")
             param.setValue("", forKey: "delivery")
             param.setValue(state, forKey: "state")
-            param.setValue("", forKey: "keyword")
+            param.setValue(keyword, forKey: "keyword")
             let custom_param = NSMutableDictionary()
             custom_param.setValue(APPId_wjj, forKey: "appId")
             custom_param.setValue(APPKey_wjj, forKey: "appKey")