Merge branch 'master' of http://bj.gitlab.cnlive.com/ios-team/CNLiveMateCode

# Conflicts: # metaCode.xcodeproj/project.pbxproj

Merge branch 'master' of http://bj.gitlab.cnlive.com/ios-team/CNLiveMateCode
# Conflicts: # metaCode.xcodeproj/project.pbxproj
张旭
2 parents 9ad08da7 fa6dc868
Showing 41 changed files with 2681 additions and 45 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Common/Util/CNLiveCommonQiniuTool.swift
metaCode/Classes/Config/Database/CNLiveSaveAuthDB.swift
metaCode/Classes/Config/Database/CNLiveSavePointDB.swift
metaCode/Classes/Extensions/NSString+CNLiveExtensions.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineViewController.swift
metaCode/Classes/Main/MinePage/View/CNLiveMineBodyListView.swift
metaCode/Classes/Main/MinePage/View/CNLiveMineHeaderView.swift
metaCode/Classes/Main/MinePage/View/CNLiveMineInfoAlertView.swift
metaCode/Classes/Main/MinePage/View/CNLiveMineInputMessageView.swift
metaCode/Classes/Main/MinePage/View/CNLiveMineSubBodyListView.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineViewModel.swift
metaCode/Classes/Main/ShopPage/Controller/CNLiveShopCouponViewController.swift
metaCode/Classes/Main/ShopPage/Controller/CNLiveShopTransListViewController.swift
metaCode/Classes/Main/ShopPage/Controller/CNLiveShopTransViewController.swift
metaCode/Classes/Main/ShopPage/Model/CNLiveShopBaseModel.swift
metaCode/Classes/Main/ShopPage/View/CNLiveShopBodyCouponGoodsListView.swift
metaCode/Classes/Main/ShopPage/View/CNLiveShopBodyCouponView.swift
metaCode/Classes/Main/ShopPage/View/CNLiveShopBodyTransListView.swift
metaCode/Classes/Main/ShopPage/ViewModel/CNLiveShopViewModel.swift
@@ -106,6 +106,10 @@
 		79803E272AD68D3100F05F68 /* CNLiveMineShopViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79803E262AD68D3100F05F68 /* CNLiveMineShopViewController.swift */; };
 		79803E292AD6991200F05F68 /* CNLiveMineInputMessageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79803E282AD6991200F05F68 /* CNLiveMineInputMessageView.swift */; };
 		7987BF3D2A497644000A1ABC /* CNLiveMineQuestViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7987BF3C2A497644000A1ABC /* CNLiveMineQuestViewController.swift */; };
+		798916E92B04532D00D08302 /* CNLiveSavePointDB.swift in Sources */ = {isa = PBXBuildFile; fileRef = 798916E82B04532D00D08302 /* CNLiveSavePointDB.swift */; };
+		798916ED2B048E8200D08302 /* CNLiveShopTransViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 798916EC2B048E8200D08302 /* CNLiveShopTransViewController.swift */; };
+		798916EF2B048EC800D08302 /* CNLiveShopTransListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 798916EE2B048EC800D08302 /* CNLiveShopTransListViewController.swift */; };
+		798916F12B0491A400D08302 /* CNLiveShopBodyTransListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 798916F02B0491A400D08302 /* CNLiveShopBodyTransListView.swift */; };
 		7989B5C52A4BDC6000A19B10 /* CNLiveMineEarnViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7989B5C42A4BDC6000A19B10 /* CNLiveMineEarnViewController.swift */; };
 		7989B5C72A4BDC7200A19B10 /* CNLiveMineEarnListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7989B5C62A4BDC7200A19B10 /* CNLiveMineEarnListViewController.swift */; };
 		798A44E82A30134400815935 /* CNLiveMineHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 798A44E72A30134400815935 /* CNLiveMineHeaderView.swift */; };
@@ -129,9 +133,12 @@
 		79A68C4C2A26EA6000DC3B43 /* (null) in Sources */ = {isa = PBXBuildFile; };
 		79B2E3602AF39191002A8524 /* NSObject+CNLiveConfigModuleInline.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79B2E35F2AF39191002A8524 /* NSObject+CNLiveConfigModuleInline.swift */; };
 		79BA085D2AB18E8300D01875 /* CNLiveSaveAuthDB.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79BA085C2AB18E8300D01875 /* CNLiveSaveAuthDB.swift */; };
+		79BB1C142B05C51900C5720C /* CNLiveShopCouponViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79BB1C132B05C51900C5720C /* CNLiveShopCouponViewController.swift */; };
+		79BB1C162B05C62900C5720C /* CNLiveShopBodyCouponView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79BB1C152B05C62900C5720C /* CNLiveShopBodyCouponView.swift */; };
 		79BB96A62AF21E2800AEA4AC /* CNLiveShopOrderDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79BB96A52AF21E2800AEA4AC /* CNLiveShopOrderDetailViewController.swift */; };
 		79BB96A82AF223FB00AEA4AC /* CNLiveConfigAlertManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79BB96A72AF223FB00AEA4AC /* CNLiveConfigAlertManager.swift */; };
 		79BB96AA2AF2330900AEA4AC /* CNLiveShopBodyDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79BB96A92AF2330900AEA4AC /* CNLiveShopBodyDetailView.swift */; };
+		79D094DC2B0765DD008CB1F3 /* CNLiveShopBodyCouponGoodsListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79D094DB2B0765DD008CB1F3 /* CNLiveShopBodyCouponGoodsListView.swift */; };
 		79E496E32AB9357000127BF8 /* UITableViewCell+CNLiveExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79E496E22AB9357000127BF8 /* UITableViewCell+CNLiveExtension.swift */; };
 		79E496E82AB9674300127BF8 /* NSMutableAttributedString+CNLiveExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79E496E72AB9674300127BF8 /* NSMutableAttributedString+CNLiveExtensions.swift */; };
 		79E672032AFDFA9C00F2F768 /* CNLiveMineSignOutViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79E672022AFDFA9C00F2F768 /* CNLiveMineSignOutViewController.swift */; };
@@ -293,6 +300,10 @@
 		79803E262AD68D3100F05F68 /* CNLiveMineShopViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineShopViewController.swift; sourceTree = "<group>"; };
 		79803E282AD6991200F05F68 /* CNLiveMineInputMessageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineInputMessageView.swift; sourceTree = "<group>"; };
 		7987BF3C2A497644000A1ABC /* CNLiveMineQuestViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineQuestViewController.swift; sourceTree = "<group>"; };
+		798916E82B04532D00D08302 /* CNLiveSavePointDB.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveSavePointDB.swift; sourceTree = "<group>"; };
+		798916EC2B048E8200D08302 /* CNLiveShopTransViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopTransViewController.swift; sourceTree = "<group>"; };
+		798916EE2B048EC800D08302 /* CNLiveShopTransListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopTransListViewController.swift; sourceTree = "<group>"; };
+		798916F02B0491A400D08302 /* CNLiveShopBodyTransListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopBodyTransListView.swift; sourceTree = "<group>"; };
 		7989B5C42A4BDC6000A19B10 /* CNLiveMineEarnViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineEarnViewController.swift; sourceTree = "<group>"; };
 		7989B5C62A4BDC7200A19B10 /* CNLiveMineEarnListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineEarnListViewController.swift; sourceTree = "<group>"; };
 		798A44E72A30134400815935 /* CNLiveMineHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineHeaderView.swift; sourceTree = "<group>"; };
@@ -315,9 +326,12 @@
 		79A68C512A26F59C00DC3B43 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = metaCode/Info.plist; sourceTree = "<group>"; };
 		79B2E35F2AF39191002A8524 /* NSObject+CNLiveConfigModuleInline.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSObject+CNLiveConfigModuleInline.swift"; sourceTree = "<group>"; };
 		79BA085C2AB18E8300D01875 /* CNLiveSaveAuthDB.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveSaveAuthDB.swift; sourceTree = "<group>"; };
+		79BB1C132B05C51900C5720C /* CNLiveShopCouponViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopCouponViewController.swift; sourceTree = "<group>"; };
+		79BB1C152B05C62900C5720C /* CNLiveShopBodyCouponView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopBodyCouponView.swift; sourceTree = "<group>"; };
 		79BB96A52AF21E2800AEA4AC /* CNLiveShopOrderDetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopOrderDetailViewController.swift; sourceTree = "<group>"; };
 		79BB96A72AF223FB00AEA4AC /* CNLiveConfigAlertManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveConfigAlertManager.swift; sourceTree = "<group>"; };
 		79BB96A92AF2330900AEA4AC /* CNLiveShopBodyDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopBodyDetailView.swift; sourceTree = "<group>"; };
+		79D094DB2B0765DD008CB1F3 /* CNLiveShopBodyCouponGoodsListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopBodyCouponGoodsListView.swift; sourceTree = "<group>"; };
 		79E496E22AB9357000127BF8 /* UITableViewCell+CNLiveExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UITableViewCell+CNLiveExtension.swift"; sourceTree = "<group>"; };
 		79E496E72AB9674300127BF8 /* NSMutableAttributedString+CNLiveExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSMutableAttributedString+CNLiveExtensions.swift"; sourceTree = "<group>"; };
 		79E672022AFDFA9C00F2F768 /* CNLiveMineSignOutViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineSignOutViewController.swift; sourceTree = "<group>"; };
@@ -623,6 +637,7 @@
 				79BA085C2AB18E8300D01875 /* CNLiveSaveAuthDB.swift */,
 				79EABB882AB4497700F3A4E2 /* CNLiveSaveStandDB.swift */,
 				794FF1082B02131300385E85 /* CNLiveSaveSearchDB.swift */,
+				798916E82B04532D00D08302 /* CNLiveSavePointDB.swift */,
 			);
 			path = Database;
 			sourceTree = "<group>";
@@ -795,6 +810,9 @@
 				792B53272AFCD7640009AB49 /* CNLiveShopOrderExpressDetailViewController.swift */,
 				794FF1042B01FC8800385E85 /* CNLiveShopOrderSearchViewController.swift */,
 				794FF1062B01FC9800385E85 /* CNLiveShopOrderSearchListViewController.swift */,
+				798916EC2B048E8200D08302 /* CNLiveShopTransViewController.swift */,
+				798916EE2B048EC800D08302 /* CNLiveShopTransListViewController.swift */,
+				79BB1C132B05C51900C5720C /* CNLiveShopCouponViewController.swift */,
 			);
 			path = Controller;
 			sourceTree = "<group>";
@@ -814,6 +832,9 @@
 				79BB96A92AF2330900AEA4AC /* CNLiveShopBodyDetailView.swift */,
 				79A267822AF8D7BC0088D9F6 /* CNLiveShopBodyCustomView.swift */,
 				791C1C8B2AFB85F8003E6362 /* CNLiveShopBodyExpressView.swift */,
+				798916F02B0491A400D08302 /* CNLiveShopBodyTransListView.swift */,
+				79BB1C152B05C62900C5720C /* CNLiveShopBodyCouponView.swift */,
+				79D094DB2B0765DD008CB1F3 /* CNLiveShopBodyCouponGoodsListView.swift */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -1255,6 +1276,7 @@
 				19CC4D4B2ADD086F00308E2A /* CNUpSlideDetailViewController.swift in Sources */,
 				7C83B4402A52BB2B004BF4A4 /* CNGlobalEnum.swift in Sources */,
 				7C83B4442A541F36004BF4A4 /* NSDate+CNLiveExtensions.swift in Sources */,
+				798916F12B0491A400D08302 /* CNLiveShopBodyTransListView.swift in Sources */,
 				7CD675482A274167008354C1 /* PGIndexBannerSubiew.m in Sources */,
 				790D019F2A2DD66E00C5978D /* CNLiveLoginViewModel.swift in Sources */,
 				1926C2912AE0FD4500C71DC3 /* CNLiveDownSlideModel.swift in Sources */,
@@ -1266,6 +1288,8 @@
 				790D019D2A2DCBD000C5978D /* UIView+CNLiveExtensions.swift in Sources */,
 				790B1FB62A41938F0074CF00 /* UIImage+CNLiveExtensions.swift in Sources */,
 				191732F82B08AB9D007BCC04 /* CNLiveShopClassilyViewModel.swift in Sources */,
+				79BB1C162B05C62900C5720C /* CNLiveShopBodyCouponView.swift in Sources */,
+				798916E92B04532D00D08302 /* CNLiveSavePointDB.swift in Sources */,
 				19FA20172AE22D3C001F7186 /* CNLiveDownSlideRecommendCell.swift in Sources */,
 				19123FC12ABC11170075C883 /* CNWebViewController.swift in Sources */,
 				1926C28F2AE0D76C00C71DC3 /* CNLiveDownSlideViewModel.swift in Sources */,
@@ -1307,6 +1331,8 @@
 				79656E382AAEBA8E00119A61 /* CNLiveMineInputViewController.swift in Sources */,
 				19CC4D522ADD129800308E2A /* CNUpSlideAnimationTransition.swift in Sources */,
 				7CD6754F2A2840B9008354C1 /* CNMetaCodeHomePageController.swift in Sources */,
+				79D094DC2B0765DD008CB1F3 /* CNLiveShopBodyCouponGoodsListView.swift in Sources */,
+				798916EF2B048EC800D08302 /* CNLiveShopTransListViewController.swift in Sources */,
 				7989B5C52A4BDC6000A19B10 /* CNLiveMineEarnViewController.swift in Sources */,
 				792E57DB2A3AE9F4005834DB /* CNLiveCommonQiniuTool.swift in Sources */,
 				191732F12B084822007BCC04 /* CNLiveShopClassifyInputTableViewCell.swift in Sources */,
@@ -1361,6 +1387,8 @@
 				19565ECF2AF8D8F6007D6727 /* CNLiveShopGoodsListCell.swift in Sources */,
 				1965FA3E2AFB176E00F0F435 /* CNLiveShopAddGoodsSingleView.swift in Sources */,
 				7CD6753C2A2740B0008354C1 /* CNUpSlideViewRemindView.swift in Sources */,
+				79BB1C142B05C51900C5720C /* CNLiveShopCouponViewController.swift in Sources */,
+				798916ED2B048E8200D08302 /* CNLiveShopTransViewController.swift in Sources */,
 				19BB1FEC2AF0AB8E0094D962 /* CNLiveDownShopDetailController.swift in Sources */,
 				794FF1072B01FC9800385E85 /* CNLiveShopOrderSearchListViewController.swift in Sources */,
 				798A44E82A30134400815935 /* CNLiveMineHeaderView.swift in Sources */,
@@ -39,6 +39,16 @@ class UploadManager: NSObject {
         UploadManager.uploadData(madiaData: imageData, key: key, progress: progressBlock, success: successBlock)
     }
+    /// 上传视频
+    /// - Parameters:
+    ///   - imageData: 视频数据
+    ///   - progressBlock: 进度回调
+    ///   - successBlock: 成功回调
+    static func uploadVideo(videoData: NSData, progressBlock:@escaping ProgressBlcok, successBlock: @escaping SuccessBlock) {
+        let key = UploadManager.createVideoFileName()
+        UploadManager.uploadData(madiaData: videoData, key: key, progress: progressBlock, success: successBlock)
+    }
+    
     /// 上传到七牛
@@ -113,6 +123,13 @@ class UploadManager: NSObject {
         let imageName = "802/mateCode/img/\(NSDate().string(withFormat: "yyyy/MM/dd") )/\(arc4random()).jpg"
         return imageName
     }
+    
+    /// 设置视频名称
+    /// - Returns: 图片名
+    static private func createVideoFileName() -> String {
+        let imageName = "802/mateCode/video/\(NSDate().string(withFormat: "yyyy/MM/dd") )/\(arc4random()).mp4"
+        return imageName
+    }
 }
 class QiNiuUploadModel: BaseModel {
@@ -71,6 +71,30 @@ class CNLiveSaveAuthDB : NSObject{
 //        }
     }
+    /// 获取所有数据
+    /// - Returns: 返回查找的所以数据
+    func searchAllObject() -> Array<MineAuthListModel>{
+        
+        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 []
+//        }
+    }
+    
     /// 删除一条数据
     /// - Parameter delete: 被删除的数据
     func deleteObject(delete: MineAuthListModel){
@@ -132,29 +156,7 @@ class CNLiveSaveAuthDB : NSObject{
     }
-    /// 获取所有数据
-    /// - Returns: 返回查找的所以数据
-    func searchAllObject() -> Array<MineAuthListModel>{
-        
-        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: 返回查找的所以数据
+//
+//  CNLiveSavePointDB.swift
+//  metaCode
+//
+//  Created by open on 2023/11/15.
+//
+
+import Foundation
+
+let CNLiveSavePointCacheKey = "kCNLiveSavePointCacheKey"
+class CNLiveSavePointDB: NSObject {
+    
+    static let shared = CNLiveSavePointDB.init()
+    
+    open func save(object: MinePointCheckInModel) {
+        var temp_dic = NSMutableDictionary.init(contentsOfFile: userFileDir+"storage.plist")
+        if (temp_dic == nil) {
+            temp_dic = NSMutableDictionary.init()
+        }
+        temp_dic?.setObject((object.toJSON() ?? Dictionary()) as Dictionary, forKey: CNLiveSavePointCacheKey as NSCopying)
+        temp_dic?.write(toFile: userFileDir+"storage.plist", atomically: true)
+    }
+    
+    open func take() -> MinePointCheckInModel {
+        let temp_dic = NSMutableDictionary.init(contentsOfFile: userFileDir+"storage.plist")
+        if (temp_dic == nil) {
+            return MinePointCheckInModel()
+        }
+        let resp = temp_dic?.object(forKey: CNLiveSavePointCacheKey)
+        let listModel = dictionaryToModel(resp as! [String : Any], MinePointCheckInModel.self,"") as! MinePointCheckInModel
+        return listModel
+    }
+    
+    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/savePoint"
+        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
+    }()
+}
@@ -37,10 +37,10 @@ extension NSString {
         return false;
     }
-    /// 时间戳转字符串
+    /// 字符串转秒数
     /// - Parameter dateFormat: 时间格式
     /// - Returns: 返回
-    func timeStrChangeTotimeInterval(dateFormat:String?) -> String {
+    func timeStrChangeTotimeInterval(_ dateFormat:String? = "yyyy-MM-dd HH:mm:ss") -> String {
         if !self.isNotBlank() {
             return ""
         }
@@ -58,6 +58,26 @@ extension NSString {
         return "\(Int(date!.timeIntervalSince1970))"
     }
+    /// 字符串转date
+    /// - Parameter dateFormat: 日期格式
+    /// - Returns: 返回
+    func timeStrChangeTotimedate(_ dateFormat:String? = "yyyy-MM-dd HH:mm:ss") -> NSDate {
+        if !self.isNotBlank() {
+            return NSDate()
+        }
+        let format = DateFormatter.init()
+        format.dateStyle = .medium
+        format.timeStyle = .short
+        format.locale = Locale(identifier: "zh_CN")
+        format.timeZone = TimeZone(abbreviation: "UTC+8:00")
+        if dateFormat == nil {
+            format.dateFormat = "yyyy-MM-dd HH:mm:ss"
+        }else{
+            format.dateFormat = dateFormat
+        }
+        return format.date(from: self as String)! as NSDate
+    }
+    
     /// 保留2位小数
     /// - Returns: 返回
     func keepTwoDecimalPlaces() -> String {
@@ -45,9 +45,11 @@ class CNLiveMineViewController : CNLiveBaseViewController, UITableViewDelegate, 
                                      ["name":"更多设置","icon":"mine_list_icon_set_more"]]
         dataArray.add(array03)
-        
-//        dataArray.add([["name":"订单列表","icon":"mine_list_icon_help_feedback"]])
-        
+//        let array04 : [Dictionary] = [["name":"订单列表","icon":"mine_list_icon_help_feedback"],
+//                                      ["name":"交易记录","icon":"mine_list_icon_help_feedback"],
+//                                      ["name":"新增优惠券","icon":"mine_list_icon_help_feedback"],
+//                                      ["name":"优惠券管理","icon":"mine_list_icon_help_feedback"]]
+//        dataArray.add(array04)
         return dataArray
     }()
@@ -87,6 +89,9 @@ class CNLiveMineViewController : CNLiveBaseViewController, UITableViewDelegate, 
             if respStatue == .success {
                 self?.checkModel = result as? MinePointCheckInModel
                 self?.tableView.reloadData()
+            } else {
+                self?.checkModel = MinePointCheckInModel.init()
+                self?.tableView.reloadData()
             }
         }
     }
@@ -174,7 +179,15 @@ extension CNLiveMineViewController {
         }
         if indexPath.section == 4 {
-            self.navigationController?.pushViewController(CNLiveShopOrderViewController.init(), animated: true)
+            if indexPath.row == 0 {
+                self.navigationController?.pushViewController(CNLiveShopOrderViewController.init(), animated: true)
+            }
+            if indexPath.row == 1 {
+                self.navigationController?.pushViewController(CNLiveShopTransViewController.init(), animated: true)
+            }
+            if indexPath.row == 2 {
+                self.navigationController?.pushViewController(CNLiveShopCouponViewController.init(), animated: true)
+            }
         }
     }
@@ -397,8 +397,13 @@ class MineBodyThreeViewCell: UITableViewCell {
             _checkModel = newValue
             balanceNumberButton.stopAnimating()
             pointNumberButton.stopAnimating()
-            balanceNumberButton.setTitle(newValue?.money, for: .normal)
-            pointNumberButton.setTitle(newValue?.integral, for: .normal)
+            if newValue == nil {
+                balanceNumberButton.setTitle("0", for: .normal)
+                pointNumberButton.setTitle("0", for: .normal)
+            } else {
+                balanceNumberButton.setTitle((newValue!.money!.isNotBlank()) ? newValue?.money : "0", for: .normal)
+                pointNumberButton.setTitle((newValue!.integral!.isNotBlank()) ? newValue?.integral : "0", for: .normal)
+            }
         }
     }
@@ -370,8 +370,8 @@ class MineQuestHeaderView: UIView {
         mainView.addSubview(balanceDescButton)
         mainView.addSubview(descBtn)
-        balanceDescButton.setTitle(checkModel.money, for: .normal)
-        pointDescButton.setTitle(checkModel.integral, for: .normal)
+        balanceDescButton.setTitle((checkModel.money!.isNotBlank()) ? checkModel.money : "0", for: .normal)
+        pointDescButton.setTitle((checkModel.integral!.isNotBlank()) ? checkModel.integral : "0", for: .normal)
         setupConstraints()
     }
@@ -540,8 +540,8 @@ class MineEarnHeaderView: UIView {
 //        mainView.addSubview(tipView)
 //        tipView.addSubview(tipLabel)
-        left_Label.text = checkModel.integral
-        right_Label.text = checkModel.money
+        left_Label.text = checkModel.integral!.isNotBlank() ? checkModel.integral : "0"
+        right_Label.text = checkModel.money!.isNotBlank() ? checkModel.money : "0"
         setupConstraints()
     }
@@ -547,6 +547,8 @@ enum CNLiveStandListAlertShowType {
     case text
     case date
     case string
+    case min_date//今天最小
+    case max_date//今天最大
 }
 class MineStandListAlertView: UIView, UIPickerViewDelegate, UIPickerViewDataSource {
@@ -584,7 +586,7 @@ class MineStandListAlertView: UIView, UIPickerViewDelegate, UIPickerViewDataSour
         datePicker.locale = Locale(identifier: "zh_CN")
         datePicker.setValue(HexColor("#3C3C3C"), forKey: "textColor")
         datePicker.datePickerMode = .date
-        datePicker.isHidden = !(_show_type == .date)
+        datePicker.isHidden = !(_show_type == .date || _show_type == .min_date || _show_type == .max_date)
         if #available(iOS 13.4, *) {
             datePicker.preferredDatePickerStyle = .wheels
         } else {
@@ -651,6 +653,18 @@ class MineStandListAlertView: UIView, UIPickerViewDelegate, UIPickerViewDataSour
             text = infos.firstObject as? Dictionary<String, String>
         } else if _show_type == .string {
             text = infos.firstObject as? String
+        } else if (_show_type == .min_date || _show_type == .max_date) {
+            let current_date = infos.firstObject as! Date
+            let formatter = DateFormatter()
+            formatter.locale = Locale.init(identifier: "zh_CN")
+            formatter.dateFormat = (infos.lastObject as! String)
+            datePicker.setDate(current_date as Date, animated: true)
+            if _show_type == .min_date {
+                datePicker.minimumDate = Date(timeIntervalSinceNow: 0)
+            } else {
+                datePicker.maximumDate = Date(timeIntervalSinceNow: 0)
+            }
+            text = formatter.string(from: datePicker.date)
         }else{
             let formatter = DateFormatter()
             formatter.dateFormat = "yyyy-MM-dd"
@@ -364,7 +364,7 @@ class MineInputTextShopCustomView: UIView, UITextViewDelegate, UITextFieldDelega
         contentTextView.resignFirstResponder()
         MineStandListAlertView.showStandListView(infos: dataArray, name:String(title[index...]), show_type:dataArray.count == 0 ? .date : .text, result: { [self] text in
             if dataArray.count == 0 {
-                _dict.setObject((text as! NSString).timeStrChangeTotimeInterval(dateFormat: "yyyy-MM-dd"), forKey: "content" as NSCopying)
+                _dict.setObject((text as! NSString).timeStrChangeTotimeInterval("yyyy-MM-dd"), forKey: "content" as NSCopying)
                 moreBtn.setTitle(text as? String, for: .normal)
             } else {
                 let dict = text as! NSDictionary
@@ -51,7 +51,7 @@ class MineInfoLListTableViewCell : UITableViewCell {
     public func setupWithDataSource(icon: String, name: String, is_auth: Bool) {
         iconView.kf.indicatorType = .activity
-        iconView.kf.setImage(with: URL(string: icon), placeholder: UIImage.imageWithColor(color: HexColor("0xf9f9f9")!, size: CGSize(width: 50, height: 50)))
+        iconView.kf.setImage(with: URL(string: icon), placeholder: UIImage.imageWithColor(color: HexColor("#f9f9f9")!, size: CGSize(width: 50, height: 50)))
         titleLabel.text = name
         if is_auth {
             addBtn.backgroundColor = HexColor("#DCDCDC")
@@ -644,18 +644,34 @@ class CNLiveMineViewModel: NSObject {
                 let errorCode = "\(resp["code"] ?? "0")"
                 if (errorCode == "200") {
                     let listModel = dictionaryToModel(resp as! [String : Any], MinePointCheckInModel.self,"data") as! MinePointCheckInModel
+                    CNLiveSavePointDB.shared.save(object: listModel)
                     resultBlock(listModel,.success)
                 } else {
-                    showMessage(message: resp["message"] as! String)
-                    resultBlock(NSNull(),.failed)
+                    let listModel = CNLiveSavePointDB.shared.take()
+                    if  listModel.integral!.isNotBlank() && listModel.money!.isNotBlank() {
+                        resultBlock(listModel,.success)
+                    } else {
+                        showMessage(message: resp["message"] as! String)
+                        resultBlock(NSNull(),.failed)
+                    }
                 }
             } else {
                 if CNLiveNetworking.isNetworking() {
-                    showMessage(message: "获取失败")
-                    resultBlock(NSNull(),.failed)
+                    let listModel = CNLiveSavePointDB.shared.take()
+                    if  listModel.integral!.isNotBlank() && listModel.money!.isNotBlank() {
+                        resultBlock(listModel,.success)
+                    } else {
+                        showMessage(message: "获取失败")
+                        resultBlock(NSNull(),.failed)
+                    }
                 } else {
-                    showMessage(message: "似乎与网络断开链接")
-                    resultBlock(NSNull(),.noNetwork)
+                    let listModel = CNLiveSavePointDB.shared.take()
+                    if  listModel.integral!.isNotBlank() && listModel.money!.isNotBlank() {
+                        resultBlock(listModel,.success)
+                    } else {
+                        showMessage(message: "似乎与网络断开链接")
+                        resultBlock(NSNull(),.noNetwork)
+                    }
                 }
             }
         }
+//
+//  CNLiveShopCouponViewController.swift
+//  metaCode
+//
+//  Created by open on 2023/11/16.
+//
+
+import Foundation
+import EmptyDataSet_Swift
+import IQKeyboardManagerSwift
+import APButton
+
+enum CNLiveShopCouponShowType {
+    case create //创建
+    case edit //编辑
+}
+class CNLiveShopCouponViewController: CNLiveBaseViewController, UITableViewDelegate, UITableViewDataSource, EmptyDataSetSource, EmptyDataSetDelegate {
+    
+    let kShopBodyCouponCreateTableViewCellIdentifier = "kShopBodyCouponCreateTableViewCellIdentifier"
+    let kUITableViewHeaderFooterViewIdentifier = "kUITableViewHeaderFooterViewIdentifier"
+    lazy var tableView : UITableView = {
+        let tableView = UITableView(frame: .zero, style: .plain)
+        tableView.dataSource = self
+        tableView.delegate = self
+        tableView.emptyDataSetSource = self
+        tableView.emptyDataSetDelegate = self
+        tableView.backgroundColor = HexColor("#f6f6f6")
+        tableView.tableFooterView = UIView.init()
+        tableView.separatorStyle = .none
+        tableView.register(ShopBodyCouponCreateTableViewCell.self, forCellReuseIdentifier: kShopBodyCouponCreateTableViewCellIdentifier)
+        tableView.register(UITableViewHeaderFooterView.self, forHeaderFooterViewReuseIdentifier: kUITableViewHeaderFooterViewIdentifier)
+        return tableView
+    }()
+    
+    lazy var footerView: UIView = {
+        let footerView = UIView.init(frame: CGRect(x: 0, y: KSreenHeight - get_system_tabbar_height(), width: KSreenWidth, height: get_system_tabbar_height()))
+        footerView.backgroundColor = .white
+        footerView.addSubview(cancelBtn)
+        cancelBtn.snp.makeConstraints { make in
+            make.width.equalTo(adapt_length(length: 130))
+            make.height.equalTo(get_system_tabbar_ui_height())
+            make.left.equalToSuperview()
+            make.top.equalToSuperview()
+        }
+        footerView.addSubview(deliveryBtn)
+        deliveryBtn.snp.makeConstraints { make in
+            make.width.equalTo(KSreenWidth - adapt_length(length: 130))
+            make.height.equalTo(get_system_tabbar_ui_height())
+            make.right.equalToSuperview()
+            make.top.equalToSuperview()
+        }
+        return footerView
+    }()
+    
+    lazy var cancelBtn: UIButton = {
+        let cancelBtn = UIButton.init(type: .custom)
+        cancelBtn.backgroundColor = .white
+        cancelBtn.setTitle("取消", for: .normal)
+        cancelBtn.setTitleColor(HexColor("#3A3A3A"), for: .normal)
+        cancelBtn.titleLabel?.font = medium_adapt_font(pointSize: 14)
+        cancelBtn.addTarget(self, action: #selector(cancelBtnClick), for: .touchUpInside)
+        return cancelBtn
+    }()
+    
+    lazy var deliveryBtn: APButton = {
+        let deliveryBtn = APButton.init()
+        deliveryBtn.backgroundColor = HexColor("#65C368")
+        deliveryBtn.setTitle("保存", for: .normal)
+        deliveryBtn.activityIndicator.color = .white
+        deliveryBtn.titleLabel?.font = regular_adapt_font(pointSize: 15)
+        deliveryBtn.setTitleColor(HexColor("#FFFFFF"), for: .normal)
+        deliveryBtn.addTarget(self, action: #selector(sendBtnClick), for: .touchUpInside)
+        return deliveryBtn
+    }()
+    
+    lazy var dataArray: NSMutableArray = {
+        let dataArray = NSMutableArray.init()
+        return dataArray
+    }()
+    
+    
+    
+    var _listModel: ShopOrderCouponListModel!
+    var _show_type: CNLiveShopCouponShowType!
+    /// 创建优惠券使用的
+    init() {
+        _show_type = .create
+        _listModel = ShopOrderCouponListModel.init()
+        super.init(nibName:nil, bundle:nil)
+    }
+    
+    /// 编辑优惠券需要调用
+    /// - Parameters:
+    ///   - listModel: 数据源
+    ///   - show_type: 显示类型
+    init(listModel: ShopOrderCouponListModel) {
+        _show_type = .edit
+        _listModel = listModel
+        super.init(nibName:nil, bundle:nil)
+    }
+    
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+
+    var hiddenGoodsLine: Bool!
+    var network_type: CNLiveMineResponseType!
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        view.backgroundColor = HexColor("#f6f6f6")
+        navigationBarHidden = false
+        titleName = "发布优惠券"
+        
+        loadDataSourceAction()
+        
+        view.addSubview(tableView)
+        tableView.snp.makeConstraints { make in
+            make.top.equalTo(KNavigationHeight)
+            make.left.right.equalToSuperview()
+            make.bottom.equalToSuperview().offset(-get_system_tabbar_height())
+        }
+        view.addSubview(footerView)
+    }
+    
+    func loadDataSourceAction() {
+        
+        CNLiveShopViewModel.requestCoupon(model: _listModel) { [weak self] result, respStatue in
+            if respStatue == .success {
+                self!.dataArray = result as! NSMutableArray
+                self!.tableView.reloadData()
+                let model = (self!.dataArray[1] as! NSArray)[0] as! ShopOrderCouponDataModel
+                self!.hiddenGoodsLine = model.section == "1"
+            }
+        }
+    }
+    
+    @objc func cancelBtnClick() {
+        self.navigationController?.popViewController(animated: true)
+    }
+    
+    
+    var couponTitle: String! = ""
+    var totalNum: String! = ""
+    var maxMoney: String! = ""
+    var lessMoney: String! = ""
+    var startTime: String! = ""
+    var endTime: String! = ""
+    var goodsId: String! = ""
+    @objc func sendBtnClick(sender: APButton) {
+        let model01 = (self.dataArray[1] as! NSArray)[0] as! ShopOrderCouponDataModel
+        let model02 = (self.dataArray[1] as! NSArray)[2] as! ShopOrderCouponDataModel
+        let model03 = (self.dataArray[1] as! NSArray)[3] as! ShopOrderCouponDataModel
+        let model04 = (self.dataArray[1] as! NSArray)[4] as! ShopOrderCouponDataModel
+        if _show_type == .create {
+            showLoading(message: "提交中...")
+            sender.startAnimating()
+            CNLiveShopViewModel.requestCouponCreate(title: couponTitle, filled: maxMoney, discount: lessMoney, startTime: startTime, endTime: endTime, state: model02.section!, isShow: model04.section!, receiveNum: model03.section!, totalNum: totalNum, goodsType: model01.section!, goodsId: goodsId) { result, respStatue in
+                sender.stopAnimating()
+                if respStatue == .success {
+                    showMessage(message: result as! String)
+                }
+            }
+        } else {
+            showLoading(message: "提交中...")
+            sender.startAnimating()
+            CNLiveShopViewModel.requestCouponEdit(model: _listModel, title: (couponTitle.isNotBlank() ? couponTitle : _listModel.title)!, state: model02.section!, isShow: model04.section!, receiveNum: model03.section!) { result, respStatue in
+                sender.stopAnimating()
+                if respStatue == .success {
+                    showMessage(message: result as! String)
+                }
+            }
+        }
+    }
+     
+}
+
+extension CNLiveShopCouponViewController {
+    func numberOfSections(in tableView: UITableView) -> Int {
+        return dataArray.count
+    }
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        let temp_array = dataArray[section] as! NSArray
+        return temp_array.count
+    }
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        guard let cell = tableView.dequeueReusableCell(withIdentifier: kShopBodyCouponCreateTableViewCellIdentifier) as? ShopBodyCouponCreateTableViewCell else {
+            return ShopBodyCouponCreateTableViewCell()
+        }
+        if _show_type == .edit {
+            if ((indexPath.section == 0 && indexPath.row == 0) || (indexPath.section == 1  && (indexPath.row == 2 || indexPath.row == 3 || indexPath.row == 4))) {
+                cell.editEnabled = true
+            } else {
+                cell.editEnabled = false
+            }
+        } else {
+            cell.editEnabled = true
+        }
+        cell.setupWithDataSource(couponModel: (dataArray[indexPath.section] as! NSArray)[indexPath.row] as! ShopOrderCouponDataModel)
+        cell.textFieldCallBack = { [self] section, number in
+            switch section {
+            case "1":
+                couponTitle = number
+                break
+            case "3":
+                totalNum = number
+                break
+            case "1001":
+                maxMoney = number
+                break
+            case "1002":
+                lessMoney = number
+                break
+            default:
+                break
+            }
+        }
+        cell.dateSelectCallBack = { [self] id, date in
+            let interval = date.timeIntervalSince1970
+            if id == "4" {
+                startTime = "\(interval)"
+            } else {
+                endTime = "\(interval + 3600 * 24 - 1)"
+            }
+        }
+        if (indexPath.row == 1 && indexPath.section == 1)  {
+            if goodsId.isNotBlank() && _listModel.goods_id!.isNotBlank() && _listModel.goods_id != "0" {
+                cell.goodsLabel.text = ""
+            }
+            cell.isHidden = hiddenGoodsLine
+        }
+        cell.goodsHiddenCallBack = { [self] isHidden in
+            hiddenGoodsLine = isHidden
+            goodsId = ""
+            let indexPath = IndexPath(row: 1, section: 1)
+            tableView.reloadRows(at: [indexPath], with: .middle)
+        }
+        cell.goodsCallBack = { [weak self] goodsId in
+            self!.goodsId = goodsId
+        }
+        return cell
+    }
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        if indexPath.section == 1 && indexPath.row == 1 && hiddenGoodsLine {
+            return 0
+        }
+        return adapt_length(length: 50)
+    }
+    func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
+        if section == 0 {
+            return 0
+        }
+        return adapt_length(length: 5)
+    }
+    func scrollViewWillBeginDragging(_ scrollView: UIScrollView) {
+        view.endEditing(true)
+    }
+    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+        let view = tableView.dequeueReusableHeaderFooterView(withIdentifier: kUITableViewHeaderFooterViewIdentifier)
+        view?.contentView.backgroundColor = HexColor("#f6f6f6")
+        return view
+    }
+
+}
+
+extension CNLiveShopCouponViewController {
+    
+    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()
+        }
+    }
+}
+//
+//  CNLiveShopTransListViewController.swift
+//  metaCode
+//
+//  Created by open on 2023/11/15.
+//
+
+
+
+import Foundation
+import JXSegmentedView
+import JXPagingView
+import EmptyDataSet_Swift
+import MJRefresh
+
+enum CNLiveShopTransListShowType {
+    case all //全部
+    case income //收入
+    case outcome //支出
+}
+
+class CNLiveShopTransListViewController: CNLiveBaseViewController, UITableViewDelegate, UITableViewDataSource, JXSegmentedListContainerViewListDelegate, EmptyDataSetSource, EmptyDataSetDelegate {
+    
+    func listView() -> UIView {
+        return view
+    }
+    
+    let kShopBodyTransListViewCellIdentifier = "kShopBodyTransListViewCellIdentifier"
+    lazy var tableView : UITableView = {
+        let tableView = UITableView(frame: .zero, style: .plain)
+        tableView.dataSource = self
+        tableView.delegate = self
+        tableView.emptyDataSetSource = self
+        tableView.emptyDataSetDelegate = self
+        tableView.backgroundColor = .white
+        tableView.tableFooterView = UIView.init()
+        tableView.contentInset = UIEdgeInsets(top: adapt_length(length: 82), left: 0, bottom: 0, right: 0)
+        tableView.scrollIndicatorInsets = UIEdgeInsets(top: adapt_length(length: 82), left: 0, bottom: 0, right: 0)
+        tableView.separatorInset = UIEdgeInsets(top: 0, left: adapt_length(length: 20), bottom: 0, right: adapt_length(length: 20))
+        tableView.register(ShopBodyTransListViewCell.self, forCellReuseIdentifier: kShopBodyTransListViewCellIdentifier)
+        return tableView
+    }()
+    
+    lazy var headerView: ShopBodyTransListHeaderView = {
+        let headerView = ShopBodyTransListHeaderView.init(frame: CGRect.zero)
+        headerView.clickBlcok = { [self] headerView in
+            MineStandListAlertView.showStandListView(infos: [currentDate!,"YYYY年MM月"], name:"选择月份", show_type:.max_date, result: { [self] text in
+                currentDate = (text as! NSString).timeStrChangeTotimedate("YYYY-MM-dd")
+                current_string = (text as! String)
+                let array = (text as! NSString).components(separatedBy: "-") as NSArray
+                headerView.dateLab.text = "\(array[0])年\(array[1])月"
+                loadDataSourceAction()
+            })
+        }
+        return headerView
+    }()
+    
+    lazy var dataArray: NSMutableArray = {
+        let dataArray = NSMutableArray.init()
+        return dataArray
+    }()
+    
+    var currentDate: NSDate!
+    var current_string: String!
+    var network_type: CNLiveMineResponseType!
+    var _show_type:CNLiveShopTransListShowType!
+    init(show_type: CNLiveShopTransListShowType) {
+        _show_type = show_type
+        currentDate = Date() as NSDate
+        current_string = NSDate.timeIntervalChangeToTimeStr(timeInterval: 0)
+       super.init(nibName:nil, bundle:nil)
+    }
+
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        view.backgroundColor = HexColor("#FAFAFA")
+        
+        loadDataSourceAction()
+        
+        view.addSubview(tableView)
+        tableView.snp.makeConstraints { make in
+            make.top.equalToSuperview()
+            make.bottom.left.right.equalToSuperview()
+        }
+        view.addSubview(headerView)
+        headerView.snp.makeConstraints { make in
+            make.top.left.right.equalToSuperview()
+            make.height.equalTo(adapt_length(length: 82))
+        }
+    }
+    
+    func loadDataSourceAction() {
+        showLoading(message: "")
+        CNLiveShopViewModel.requestAccount(date: current_string, type: _show_type) { [weak self] result, respStatue in
+            if respStatue == .success {
+                let baseModel = (result as! ShopOrderTransBaseDataModel)
+                self!.dataArray.addObjects(from: (result as! ShopOrderTransBaseDataModel).list)
+                self!.tableView.reloadData()
+                if self!.dataArray.count > 0 && self!.tableView.mj_header == nil && self!.tableView.mj_footer == nil {
+                    self!.addRefreshView()
+                }
+                self!.headerView.priceLab.text = "支出 ¥\(baseModel.payment ?? "0.00") 收入 ¥\(baseModel.income ?? "0.00")"
+            }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!.tableView.mj_header?.endRefreshing()
+        })
+        
+        tableView.mj_footer = MJRefreshAutoNormalFooter.init(refreshingBlock: {[weak self] in
+            self!.tableView.mj_footer?.endRefreshing()
+            self!.tableView.mj_footer?.endRefreshingWithNoMoreData()
+        })
+    }
+    
+    override func viewDidLayoutSubviews() {
+        super.viewDidLayoutSubviews()
+    }
+    
+}
+extension CNLiveShopTransListViewController {
+    
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return dataArray.count
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        guard let cell = tableView.dequeueReusableCell(withIdentifier: kShopBodyTransListViewCellIdentifier) as? ShopBodyTransListViewCell else {
+            return ShopBodyTransListViewCell()
+        }
+        cell.setupWithDataSource(listModel: dataArray[indexPath.row] as! ShopOrderTransListDataModel)
+        return cell
+    }
+    
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        return adapt_length(length: 75)
+    }
+    
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        let listModel = self.dataArray[indexPath.row] as! ShopOrderTransListDataModel
+        if listModel.type == "1" {
+            if listModel.title == "order" {
+                self.navigationController?.pushViewController(CNLiveShopOrderDetailViewController.init(orderId: listModel.order_id!, show_type: .order, form_type: .afterSale), animated: true)
+            }
+            if listModel.title == "foods_order" {
+                
+            }
+        }
+    }
+}
+
+extension CNLiveShopTransListViewController {
+    
+    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()
+        }
+    }
+}
+//
+//  CNLiveShopTransViewController.swift
+//  metaCode
+//
+//  Created by open on 2023/11/15.
+//
+
+import Foundation
+import JXSegmentedView
+import JXPagingView
+
+class CNLiveShopTransViewController: CNLiveBaseViewController {
+    
+    lazy var viewControllers: NSMutableArray = {
+        let viewControllers = NSMutableArray.init()
+        viewControllers.add(CNLiveShopTransListViewController.init(show_type: .all))
+        viewControllers.add(CNLiveShopTransListViewController.init(show_type: .income))
+        viewControllers.add(CNLiveShopTransListViewController.init(show_type: .outcome))
+        return viewControllers
+    }()
+    
+    lazy var dataSource: JXSegmentedNumberDataSource = {
+        let dataSource = JXSegmentedNumberDataSource()
+        dataSource.titles = ["全部","收入","支出"]
+        dataSource.numbers = [0,0,0,0]
+        dataSource.isTitleColorGradientEnabled = true
+        dataSource.itemWidth = JXSegmentedViewAutomaticDimension
+        dataSource.itemSpacing = 0
+        dataSource.titleNormalFont = Font_15_Fit
+        dataSource.titleSelectedFont = Font_15_Fit
+        dataSource.titleNormalColor = HexColor("#999999")!
+        dataSource.titleSelectedColor = HexColor("#28C1C6")!
+        return dataSource
+    }()
+    
+    lazy var categoryView: JXSegmentedView = {
+        let categoryView = JXSegmentedView.init(frame: CGRectMake(0, KNavigationHeight, KSreenWidth, CGFloat(kCNLiveShopOrderListSectionTitleHeight)))
+        categoryView.dataSource = dataSource
+        categoryView.delegate = self
+        categoryView.collectionView.backgroundColor = HexColor("fafbfd")
+        categoryView.backgroundColor = .white
+        
+        let lineView = JXSegmentedIndicatorBackgroundView.init()
+        lineView.indicatorColor = HexColor("#28C1C6")!
+        lineView.indicatorHeight = 2
+        lineView.indicatorPosition = .bottom
+        lineView.indicatorWidthIncrement = 0
+        lineView.indicatorCornerRadius = 0
+        categoryView.indicators = [lineView]
+        
+        return categoryView
+    }()
+        
+    lazy var listContainerView: JXSegmentedListContainerView! = {
+        return JXSegmentedListContainerView(dataSource: self)
+    }()
+    
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        self.navigationController?.interactivePopGestureRecognizer?.isEnabled = (categoryView.selectedIndex == 0)
+    }
+    
+    override func viewWillDisappear(_ animated: Bool) {
+        super.viewWillDisappear(animated)
+        self.navigationController?.interactivePopGestureRecognizer?.isEnabled = true
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        view.backgroundColor = .white
+        navigationBarHidden = false
+        titleName = "交易记录"
+        
+        view.addSubview(categoryView)
+
+        categoryView.listContainer = listContainerView
+        view.addSubview(listContainerView)
+    }
+    
+    override func viewDidLayoutSubviews() {
+        super.viewDidLayoutSubviews()
+
+        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)
+    }
+}
+extension CNLiveShopTransViewController: JXSegmentedViewDelegate {
+    func segmentedView(_ segmentedView: JXSegmentedView, didSelectedItemAt index: Int) {
+        navigationController?.interactivePopGestureRecognizer?.isEnabled = (segmentedView.selectedIndex == 0)
+    }
+}
+
+extension CNLiveShopTransViewController: JXSegmentedListContainerViewDataSource {
+    func numberOfLists(in listContainerView: JXSegmentedListContainerView) -> Int {
+        if let titleDataSource = categoryView.dataSource as? JXSegmentedBaseDataSource {
+            return titleDataSource.dataSource.count
+        }
+        return 0
+    }
+
+    func listContainerView(_ listContainerView: JXSegmentedListContainerView, initListAt index: Int) -> JXSegmentedListContainerViewListDelegate {
+        return viewControllers[index] as! JXSegmentedListContainerViewListDelegate
+    }
+}
+
@@ -249,5 +249,98 @@ class ShopOrderExpressDetailDateModel: BaseModel {
             })
     }
 }
+//!!!: 电商流水数据
+class ShopOrderTransBaseDataModel: BaseModel {
+    var payment: String? = ""// 支出
+    var income: String? = ""// 收入
+    var list = [ShopOrderTransListDataModel]()// 电商流水
+}
+
+class ShopOrderTransListDataModel: BaseModel {
+    var id: String? = ""//  id
+    var uid: String? = ""//  用户id
+    var price: String? = ""//  金钱
+    var addtime: String? = ""//  时间戳
+    var type: String? = ""// 1 收入 2 支出
+    var title: String? = ""//   order电商 foods_order美食
+    var order_id: String? = ""// 订单id
+    var payment: String? = ""//  1支付宝 2微信 3银联 4钱包
+    var img: String? = ""//  头像
+    var username: String? = ""//  昵称
+    
+    override func mapping(mapper: HelpingMapper) {
+        mapper <<<
+            self.addtime <-- TransformOf(fromJSON: { (raw) -> String in
+                if raw!.count > 0 {
+                    let date = NSDate(timeIntervalSince1970: TimeInterval(raw!)!)
+                    let dateFormatter = DateFormatter()
+                    dateFormatter.locale = Locale.init(identifier: "zh_CN")
+                    dateFormatter.dateFormat = "YYYY-MM-dd hh:mm:SS"
+                    return dateFormatter.string(from: date as Date)
+                }
+                return raw!
+            }, toJSON: { (tuple) -> String? in
+                return tuple
+            });
+    }
+}
+///优惠券相关数据
+//!!!:
+class ShopOrderCouponDataModel: BaseModel {
+    var id: String? = ""
+    var type: String? = ""
+    var title: String? = ""
+    var subTitle: String? = ""
+    var section: String? = ""
+    var message: String? = ""
+    var filled: String? = ""
+    var disCount: String? = ""
+}
+
+class ShopOrderCouponListModel: BaseModel {
+    var id: String? = ""//优惠券id
+    var type: String? = ""//
+    var sort: String? = ""//优惠券使用范围  1 店铺全场  3 单品券
+    var num: String? = ""//剩余数量
+    var goods_id: String? = ""//商品Id
+    var goods_title: String? = ""//
+    var filled: String? = ""//满
+    var discount: String? = ""//减
+    var starttime: String? = ""//开始时间
+    var endtime: String? = ""//结束时间
+    var addtime: String? = ""//发布时间
+    var store_id: String? = ""//店铺iD
+    var genre: String? = ""//
+    var day: String? = ""//
+    var total: String? = ""//已领取数量
+    var state: String? = ""//优惠券状态  1 正常  2 冻结
+    var title: String? = ""//标题
+    var receive_number: String? = ""//领取次数  1 不限制  2 限制一次
+    var types: String? = ""//
+    var is_show: String? = ""//是否显示 1 对外显示 2 不对外
+}
+
+class ShopOrderCouponDataListModel: BaseModel {
+    var list = [ShopOrderCouponListModel]()// 数据
+}
+
+//!!!: 优惠券商品数据
+class ShopOrderAssociatedGoodsModel: BaseModel {
+    var id: String? = ""// 商品id
+    var title: String? = ""// 商品名称
+    var simg: String? = ""// 商品图片
+    var img: String? = ""//
+    var price: String? = ""//商品价格
+    var ads: String? = ""// 商品介绍
+    var groupid: String? = ""// 商品分类
+    var shopid: String? = ""// 店铺id
+    var shop_id: String? = ""//
+    var category_id: String? = ""// 店铺分类id
+    var state: String? = ""// 1下架 2上架
+    var count: String? = ""// 库存
+    var shop_type: String? = ""// 1普通商品 2文创商品
+    var ord: String? = ""// 排序
+    var select: Bool = false// 商品是否被选中(本地标记)
+}
+//
+//  CNLiveShopBodyCouponGoodsListView.swift
+//  metaCode
+//
+//  Created by open on 2023/11/17.
+//
+
+import Foundation
+import EmptyDataSet_Swift
+import Kingfisher
+import MJRefresh
+import IQKeyboardManagerSwift
+
+typealias clickCouponSearchTextFieldCallBack = (_ searchText: String) -> Void
+typealias clickCouponChooseGoodsCallBack = (_ model: ShopOrderAssociatedGoodsModel) -> Void
+//!!!: 商品搜索相关界面
+class ShopBodyCouponGoodsListView: UIView, UITableViewDelegate, UITableViewDataSource, EmptyDataSetSource, EmptyDataSetDelegate {
+    
+    lazy var listBackView: UIView = {
+        let listBackView = UIView.init()
+        listBackView.backgroundColor = .white
+        let path = UIBezierPath.init(roundedRect: CGRect(x: 0, y: 0, width: KSreenWidth, height: adapt_length(length: 390)), byRoundingCorners: [.bottomLeft,.bottomRight], cornerRadii: CGSizeMake(adapt_length(length: 9), adapt_length(length: 9)))
+        let masklayer = CAShapeLayer()
+        masklayer.path = path.cgPath
+        listBackView.layer.mask = masklayer
+        return listBackView
+    }()
+    
+    let kShopBodyCouponGoodsListTableViewCellIdentifier = "kShopBodyCouponGoodsListTableViewCellIdentifier"
+    lazy var tableView : UITableView = {
+        let tableView = UITableView(frame: .zero, style: .plain)
+        tableView.dataSource = self
+        tableView.delegate = self
+        tableView.emptyDataSetSource = self
+        tableView.emptyDataSetDelegate = self
+        tableView.backgroundColor = .white
+        tableView.tableFooterView = UIView.init()
+        tableView.separatorStyle = .none
+        tableView.register(ShopBodyCouponGoodsListTableViewCell.self, forCellReuseIdentifier: kShopBodyCouponGoodsListTableViewCellIdentifier)
+        return tableView
+    }()
+    
+    lazy var closeBtn: UIButton = {
+        let closeBtn = UIButton.init(type: .custom)
+        closeBtn.setImage(UIImage(named: "mine_header_icon_close"), for: .normal)
+        closeBtn.addTarget(self, action: #selector(closeClick), for: .touchUpInside)
+        return closeBtn
+    }()
+    
+    lazy var headerLabel: UILabel = {
+        let headerLabel = UILabel.init()
+        headerLabel.textColor = HexColor("#3a3a3a")
+        headerLabel.font = regular_adapt_font(pointSize: 16)
+        headerLabel.textAlignment = .left
+        headerLabel.text = "请选择您要优惠的商品"
+        return headerLabel
+    }()
+    
+    lazy var searchView: ShopBodyCouponGoodsSearchView = {
+        let searchView = ShopBodyCouponGoodsSearchView.init(frame: .zero)
+        searchView.searchCallBack = {[weak self] searchText in
+            if searchText.isNotBlank() {
+                self!.pageNum = 1
+                self!.searchText = searchText
+                self!.loadDataSourceAction(page: 1)
+            }
+        }
+        return searchView
+    }()
+    
+    lazy var dataArray: NSMutableArray = {
+        let dataArray = NSMutableArray.init()
+        return dataArray
+    }()
+    
+    var searchText: String!
+    var pageNum: NSInteger!
+    var network_type: CNLiveMineResponseType!
+    var clickGoodsCallBack: clickCouponChooseGoodsCallBack!
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        pageNum = 1
+        searchText = ""
+        backgroundColor = HexColor("#000000", alpha: 0.6)
+        
+        loadDataSourceAction(page: 1)
+        
+        addSubview(listBackView)
+        listBackView.snp.makeConstraints { make in
+            make.left.right.equalToSuperview()
+            make.top.equalTo(self.snp.bottom)
+            make.height.equalTo(adapt_length(length: 390))
+        }
+        listBackView.addSubview(headerLabel)
+        headerLabel.snp.makeConstraints { make in
+            make.left.top.equalToSuperview().offset(adapt_length(length: 15))
+        }
+        listBackView.addSubview(closeBtn)
+        closeBtn.snp.makeConstraints { make in
+            make.right.equalTo(listBackView).offset(-adapt_length(length: 15))
+            make.centerY.equalTo(headerLabel)
+        }
+        listBackView.addSubview(searchView)
+        searchView.snp.makeConstraints { make in
+            make.left.right.equalTo(listBackView)
+            make.top.equalTo(headerLabel.snp.bottom).offset(adapt_length(length: 15))
+            make.height.equalTo(adapt_length(length: 52.5))
+        }
+        listBackView.addSubview(tableView)
+        tableView.snp.makeConstraints { make in
+            make.left.right.bottom.equalTo(listBackView)
+            make.top.equalTo(searchView.snp.bottom).offset(adapt_length(length: 10))
+        }
+        
+        NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillShow), name: UIResponder.keyboardWillShowNotification, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillHide), name: UIResponder.keyboardWillHideNotification, object: nil)
+    }
+    
+    func loadDataSourceAction(page: NSInteger) {
+        showLoading(message: "")
+        CNLiveShopViewModel.requestCouponSearchGoods(shopId: DSUserInfoManager.shared.dsUserInfo.id!, sortType: "1", state: "0", categoryId: "", keyword: searchText, page: pageNum) { [weak self] result, respStatue in
+            if self == nil {
+                return
+            }
+            if respStatue == .success {
+                if self!.pageNum == 1 {
+                    self!.dataArray.removeAllObjects()
+                    self!.dataArray.addObjects(from: result as! [ShopOrderAssociatedGoodsModel])
+                    if self!.dataArray.count > 0 && self!.tableView.mj_footer == nil {
+                        self!.addRefreshView()
+                    }
+                    if self!.dataArray.count == 0 && self!.tableView.mj_footer != nil {
+                        self!.tableView.mj_footer = nil
+                    }
+                }
+                if self!.pageNum > 1 {
+                    self!.dataArray.addObjects(from: result as! [ShopOrderAssociatedGoodsModel])
+                }
+                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_footer = MJRefreshAutoNormalFooter.init(refreshingBlock: {[weak self] in
+            self!.pageNum = self!.pageNum + 1
+            self!.loadDataSourceAction(page: self!.pageNum)
+        })
+    }
+    
+    @objc func closeClick() {
+        self.endEditing(true)
+        listBackView.snp.remakeConstraints { make in
+            make.left.right.equalToSuperview()
+            make.top.equalTo(self.snp.bottom)
+            make.height.equalTo(adapt_length(length: 390))
+        }
+        removeFromSuperview()
+    }
+    
+    @objc func keyboardWillShow(notification: NSNotification) {
+        let userInfo = notification.userInfo! as NSDictionary
+        let rect = (userInfo[UIResponder.keyboardFrameEndUserInfoKey] as! NSValue).cgRectValue
+        let height = rect.size.height
+        UIView.animate(withDuration: 1) { [self] in
+            listBackView.snp.remakeConstraints { make in
+                make.left.right.equalToSuperview()
+                make.top.equalTo(self.snp.bottom).offset(-adapt_length(length: 300) - height)
+                make.height.equalTo(adapt_length(length: 390))
+            }
+        }
+    }
+    
+    @objc func keyboardWillHide(notification: NSNotification) {
+        UIView.animate(withDuration: 1) { [self] in
+            listBackView.snp.remakeConstraints { make in
+                make.left.right.equalToSuperview()
+                make.top.equalTo(self.snp.bottom).offset(-adapt_length(length: 390))
+                make.height.equalTo(adapt_length(length: 390))
+            }
+        }
+    }
+    
+    static func couponGoodsShow(_ clickGoodsCallBack: @escaping clickCouponChooseGoodsCallBack) {
+        let goodsView = ShopBodyCouponGoodsListView.init(frame: CGRect(x: 0, y: 0, width: KSreenWidth, height: KSreenHeight))
+        goodsView.clickGoodsCallBack = clickGoodsCallBack
+        UIApplication.shared.delegate?.window?!.addSubview(goodsView)
+        UIView.animate(withDuration: 1) {
+            goodsView.listBackView.snp.remakeConstraints { make in
+                make.left.right.bottom.equalTo(goodsView)
+                make.top.equalTo(goodsView.snp.bottom).offset(-adapt_length(length: 390))
+            }
+        }
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    func numberOfSections(in tableView: UITableView) -> Int {
+        return 1
+    }
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return dataArray.count
+    }
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        guard let cell = tableView.dequeueReusableCell(withIdentifier: kShopBodyCouponGoodsListTableViewCellIdentifier) as? ShopBodyCouponGoodsListTableViewCell else {
+            return ShopBodyCouponGoodsListTableViewCell()
+        }
+        cell.setupWithDataSource(goodsModel: dataArray[indexPath.row] as! ShopOrderAssociatedGoodsModel)
+        return cell
+    }
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        return adapt_length(length: 90)
+    }
+    
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        let model = dataArray[indexPath.row] as! ShopOrderAssociatedGoodsModel
+        if (clickGoodsCallBack != nil) {
+            clickGoodsCallBack(model)
+        }
+        closeClick()
+    }
+    
+    
+    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)
+        }
+    }
+    
+}
+
+class ShopBodyCouponGoodsListTableViewCell: UITableViewCell {
+    
+    lazy var backView: UIView = {
+        let backView = UIView.init()
+        backView.backgroundColor = HexColor("#f9f9f9")
+        backView.layer.cornerRadius = adapt_length(length: 6)
+        return backView
+    }()
+    
+    lazy var singImageView: UIImageView = {
+        let singImageView = UIImageView.init()
+        singImageView.contentMode = .scaleAspectFit
+        singImageView.layer.cornerRadius = adapt_length(length: 5)
+        return singImageView
+    }()
+    
+    lazy var titleLabel: UILabel = {
+        let titleLabel = UILabel.init()
+        titleLabel.textAlignment = .justified
+        titleLabel.numberOfLines = 2
+        titleLabel.textColor = HexColor("#333333")
+        titleLabel.font = regular_adapt_font(pointSize: 13)
+        return titleLabel
+    }()
+    
+    lazy var priceLabel: UILabel = {
+        let priceLabel = UILabel.init()
+        priceLabel.font = regular_adapt_font(pointSize: 12)
+        priceLabel.textAlignment = .left
+        priceLabel.textColor = HexColor("#333333")
+        return priceLabel
+    }()
+    
+    lazy var sendBtn: UIButton = {
+        let sendBtn = UIButton.init(type: .custom)
+        let layer = CAGradientLayer()
+        layer.frame = CGRect(x: 0, y: 0, width: adapt_length(length: 65), height: adapt_length(length: 19))
+        layer.startPoint = CGPoint(x: 0, y: 0.5)
+        layer.endPoint = CGPoint(x: 1, y: 0.5)
+        layer.locations = [0,1]
+        layer.colors = [HexColor("#fd9700")?.cgColor as Any,HexColor("#ff5907")?.cgColor as Any]
+        sendBtn.layer.addSublayer(layer)
+        sendBtn.right = backView.width - 10
+        sendBtn.bottom = backView.bottom - 10
+        sendBtn.isUserInteractionEnabled = false
+        sendBtn.setTitle("选择商品", for: .normal)
+        sendBtn.setTitleColor(.white, for: .normal)
+        sendBtn.titleLabel?.font = regular_adapt_font(pointSize: 13)
+        sendBtn.layer.cornerRadius = adapt_length(length: 6)
+        sendBtn.clipsToBounds = true
+        return sendBtn
+    }()
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        contentView.backgroundColor = .clear
+        selectionStyle = .none
+        
+        addSubview(backView)
+        backView.snp.makeConstraints { make in
+            make.top.equalToSuperview().offset(adapt_length(length: 10))
+            make.left.equalToSuperview().offset(adapt_length(length: 15))
+            make.right.equalToSuperview().offset(-adapt_length(length: 15))
+            make.bottom.equalToSuperview()
+        }
+        addSubview(singImageView)
+        singImageView.snp.makeConstraints { make in
+            make.left.top.equalTo(backView).offset(adapt_length(length: 10))
+            make.size.equalTo(adapt_length(length: 60))
+        }
+        addSubview(titleLabel)
+        titleLabel.snp.makeConstraints { make in
+            make.left.equalTo(singImageView.snp.right).offset(adapt_length(length: 10))
+            make.right.equalTo(backView).offset(-adapt_length(length: 10))
+            make.top.equalTo(singImageView)
+        }
+        addSubview(priceLabel)
+        priceLabel.snp.makeConstraints { make in
+            make.left.equalTo(titleLabel)
+            make.bottom.equalTo(singImageView)
+        }
+        addSubview(sendBtn)
+        sendBtn.snp.makeConstraints { make in
+            make.right.equalTo(titleLabel)
+            make.bottom.equalTo(singImageView)
+            make.width.equalTo(adapt_length(length: 65))
+            make.height.equalTo(adapt_length(length: 19))
+        }
+    }
+    
+    func setupWithDataSource(goodsModel: ShopOrderAssociatedGoodsModel) {
+        singImageView.kf.setImage(with: URL(string: goodsModel.simg!), placeholder: UIImage.imageWithColor(color: HexColor("#f9f9f9")!, size: CGSize(width: adapt_length(length: 60), height: adapt_length(length: 60))))
+        titleLabel.text = goodsModel.title
+        priceLabel.text = "¥\(goodsModel.price ?? "0.00")"
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+}
+
+class ShopBodyCouponGoodsSearchView: UIView, UITextFieldDelegate {
+    
+    lazy var searchTextField: UITextField = {
+        let searchTextField = UITextField.init()
+        
+        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)
+        return searchTextField
+    }()
+    
+    lazy var searchButton: UIButton = {
+        let searchButton = UIButton.init(type: .custom)
+        searchButton.setTitle("搜索", for: .normal)
+        searchButton.titleLabel?.font = semibold_adapt_font(pointSize: 15)
+        searchButton.setTitleColor(HexColor("#ff3355"), for: .normal)
+        searchButton.backgroundColor = .clear
+        searchButton.layer.masksToBounds  = true
+        searchButton.layer.cornerRadius = 5
+        searchButton.addTarget(self, action: #selector(searchBtnClick), for: .touchUpInside)
+        return searchButton
+    }()
+    
+    var searchCallBack: clickCouponSearchTextFieldCallBack!
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        backgroundColor = .clear
+        
+        addSubview(searchButton)
+        searchButton.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.right.equalToSuperview().offset(-adapt_length(length: 15))
+            make.width.equalTo(adapt_length(length: 60))
+            make.height.equalTo(adapt_length(length: 25))
+        }
+        
+        addSubview(searchTextField)
+        searchTextField.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(adapt_length(length: 15))
+            make.centerY.centerY.equalToSuperview()
+            make.right.equalTo(searchButton.snp.left).offset(-adapt_length(length: 15))
+            make.height.equalTo(adapt_length(length: 30))
+        }
+        
+
+    }
+    
+    @objc func searchBtnClick() {
+        if (searchCallBack != nil) {
+            searchCallBack(searchTextField.text!)
+        }
+        self.endEditing(true)
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    func textFieldDidEndEditing(_ textField: UITextField) {
+        if (searchCallBack != nil) {
+            searchCallBack(textField.text!)
+        }
+    }
+    
+    func textFieldShouldReturn(_ textField: UITextField) -> Bool {
+        self.endEditing(true)
+        return true
+    }
+}
+
+
+//
+//  CNLiveShopCouponView.swift
+//  metaCode
+//
+//  Created by open on 2023/11/16.
+//
+
+import Foundation
+
+
+typealias clickCouponGoodsHiddenCallBack = (_ isHidden: Bool) -> Void
+typealias clickCouponTextFieldCallBack = (_ section: String,_ number: String) -> Void
+typealias clickCouponDateSelectCallBack = (_ id: NSString,_ date: NSDate) -> Void
+typealias clickCouponGoodsCallBack = (_ goodsId: String) -> Void
+typealias clickCouponSelectCallBack = (_ section: NSInteger) -> Void
+class ShopBodyCouponCreateTableViewCell: UITableViewCell, UITextFieldDelegate {
+    
+    lazy var leftLabel: UILabel = {
+        let leftLabel = UILabel.init()
+        leftLabel.textColor = .red
+        leftLabel.textAlignment = .center
+        leftLabel.font = semibold_adapt_font(pointSize: 18)
+        leftLabel.text = "*"
+        return leftLabel
+    }()
+    
+    lazy var titleLabel: UILabel = {
+        let titleLabel = UILabel.init()
+        titleLabel.textColor = HexColor("#333333")
+        titleLabel.font = medium_adapt_font(pointSize: 14)
+        return titleLabel
+    }()
+    
+    lazy var lineView: UILabel = {
+        let lineLabel = UILabel.init()
+        lineLabel.backgroundColor = HexColor("#f6f6f6")
+        return lineLabel
+    }()
+    
+    lazy var titleNumber: UITextField = {
+        let titleNumber = UITextField.init()
+        titleNumber.textColor = HexColor("#333333")
+        titleNumber.font = regular_adapt_font(pointSize: 14)
+        titleNumber.textAlignment = .right
+        titleNumber.delegate = self
+        return titleNumber
+    }()
+    
+    lazy var moneyView: ShopBodyCreateCouponTypeMoneyView = {
+        let moneyView = ShopBodyCreateCouponTypeMoneyView.init(frame: CGRect.zero)
+        moneyView.textFieldCallBack = { [weak self] section, number in
+            if self!.textFieldCallBack != nil {
+                self!.textFieldCallBack(section, number)
+            }
+        }
+        return moneyView
+    }()
+    
+    lazy var chooseView: ShopBodySelectCouponTapView = {
+        let chooseView =  ShopBodySelectCouponTapView.init(frame: .zero)
+        chooseView.selectCallBack = { [weak self] section in
+            self!._couponModel.section = "\(section)"
+            if self!._couponModel.id == "6" {
+                if (self!.goodsHiddenCallBack != nil) {
+                    self!.goodsHiddenCallBack(section == 1)
+                }
+            }
+        }
+        return chooseView
+    }()
+    
+    lazy var rightView: UIImageView = {
+        let rightView = UIImageView.init()
+        rightView.contentMode = .scaleAspectFit
+        rightView.image = UIImage(named: "mine_header_message_gray_more")
+        return rightView
+    }()
+    
+    lazy var goodsLabel: UITextField = {
+        let goodsLabel = UITextField.init()
+        goodsLabel.textColor = HexColor("#333333")
+        goodsLabel.font = regular_adapt_font(pointSize: 14)
+        goodsLabel.textAlignment = .right
+        goodsLabel.delegate = self
+        goodsLabel.isEnabled = false
+        return goodsLabel
+    }()
+    
+    lazy var showSwitch: UISwitch = {
+        let showSwitch = UISwitch.init()
+        showSwitch.addTarget(self, action: #selector(switchChange), for: .valueChanged)
+        return showSwitch
+    }()
+
+    var textFieldCallBack: clickCouponTextFieldCallBack!
+    var goodsHiddenCallBack: clickCouponGoodsHiddenCallBack!
+    var dateSelectCallBack: clickCouponDateSelectCallBack!
+    var goodsCallBack: clickCouponGoodsCallBack!
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        contentView.backgroundColor = .clear
+        selectionStyle = .none
+        currentDate = Date() as NSDate
+        
+        addSubview(leftLabel)
+        leftLabel.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.left.equalToSuperview().offset(adapt_length(length: 5.5))
+            make.width.equalTo(adapt_length(length: 10))
+            make.height.equalTo(adapt_length(length: 15))
+        }
+        
+        addSubview(titleLabel)
+        titleLabel.snp.makeConstraints { make in
+            make.left.equalTo(leftLabel.snp.right).offset(adapt_length(length: 2.5))
+            make.centerY.equalToSuperview()
+            make.width.equalTo(adapt_length(length: 70))
+        }
+        
+        addSubview(lineView)
+        lineView.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(adapt_length(length: 15))
+            make.right.equalToSuperview().offset(-adapt_length(length: 15))
+            make.height.equalTo(adapt_length(length: 0.5))
+            make.bottom.equalToSuperview()
+        }
+        
+        addSubview(titleNumber)
+        titleNumber.snp.makeConstraints { make in
+            make.right.equalToSuperview().offset(-adapt_length(length: 15))
+            make.left.equalTo(titleLabel.snp.right)
+            make.centerY.equalToSuperview()
+        }
+        addSubview(moneyView)
+        moneyView.snp.makeConstraints { make in
+            make.right.equalTo(titleNumber)
+            make.centerY.height.equalToSuperview()
+            make.left.equalTo(titleLabel.snp.right)
+        }
+        addSubview(chooseView)
+        chooseView.snp.makeConstraints { make in
+            make.right.equalTo(titleNumber)
+            make.centerY.height.equalToSuperview()
+            make.left.equalTo(titleLabel.snp.right)
+        }
+        addSubview(rightView)
+        rightView.snp.makeConstraints { make in
+            make.right.equalTo(titleNumber)
+            make.centerY.height.equalToSuperview()
+            make.width.height.equalTo(adapt_length(length: 16))
+        }
+        addSubview(goodsLabel)
+        goodsLabel.snp.makeConstraints { make in
+            make.right.equalTo(rightView.snp.left).offset(-adapt_length(length: 5))
+            make.centerY.equalToSuperview()
+        }
+        addSubview(showSwitch)
+        showSwitch.snp.makeConstraints { make in
+            make.right.equalTo(titleNumber)
+            make.centerY.equalToSuperview()
+        }
+    }
+    
+    var editEnabled: Bool!
+    var currentDate: NSDate!
+    var _couponModel: ShopOrderCouponDataModel!
+    func setupWithDataSource(couponModel: ShopOrderCouponDataModel) {
+        _couponModel = couponModel
+        titleLabel.text = couponModel.title
+        leftLabel.isHidden = true
+        titleNumber.isHidden = true
+        moneyView.isHidden = true
+        chooseView.isHidden = true
+        goodsLabel.isHidden = true
+        rightView.isHidden = true
+        showSwitch.isHidden = true
+        if Int(couponModel.id!)!%5 == 0 {
+            lineView.isHidden = true
+        } else {
+            lineView.isHidden = false
+        }
+        switch couponModel.type {
+        case "1":
+            leftLabel.isHidden = false
+            titleNumber.isHidden = false
+            titleNumber.isEnabled = true
+            titleNumber.placeholder = couponModel.subTitle
+            titleNumber.text = couponModel.message
+            if couponModel.id == "3" {
+                titleNumber.keyboardType = .numberPad
+            } else {
+                titleNumber.keyboardType = .default
+            }
+            break
+        case "2":
+            leftLabel.isHidden = false
+            moneyView.isHidden = false
+            moneyView.editEnabled = editEnabled
+            moneyView._couponModel = couponModel
+            break
+        case "3":
+            leftLabel.isHidden = false
+            titleNumber.isHidden = false
+            titleNumber.placeholder = couponModel.subTitle
+            titleNumber.isEnabled = false
+            if couponModel.message!.isNotBlank() {
+                let interval = Double(couponModel.message!)!
+                let formatter = DateFormatter.init()
+                formatter.dateFormat = "yyyy-MM-dd"
+                let date = NSDate.init(timeIntervalSince1970: interval)
+                let dateStr = formatter.string(from: date as Date)
+                titleNumber.text = dateStr
+            }
+            break
+        case "4":
+            chooseView.isHidden = false
+            chooseView.editEnabled = editEnabled
+            chooseView.titles = selectTitles(id: _couponModel.id!)
+            chooseView.selectIndex = Int(couponModel.section!)
+            break
+        case "5":
+            rightView.isHidden = false
+            goodsLabel.isHidden = false
+            goodsLabel.placeholder = couponModel.subTitle
+            goodsLabel.text = couponModel.message
+            break
+        case "6":
+            showSwitch.isHidden = false
+            if couponModel.section == "1" {
+                showSwitch.isOn = true
+            } else {
+                showSwitch.isOn = false
+            }
+            break
+        default:
+            break
+        }
+    }
+    
+    override func setSelected(_ selected: Bool, animated: Bool) {
+        if _couponModel.type == "3" && selected {
+            if !editEnabled {
+                showMessage(message: "该项不可编辑")
+                return
+            }
+            MineStandListAlertView.showStandListView(infos: [currentDate!,"YYYY-MM-dd"], name:_couponModel.subTitle!, show_type:.min_date, result: { [self] text in
+                currentDate = (text as! NSString).timeStrChangeTotimedate("YYYY-MM-dd")
+                titleNumber.text = (text as! String)
+                if (dateSelectCallBack != nil) {
+                    let formatter = DateFormatter.init()
+                    formatter.dateFormat = "yyyy-MM-dd"
+                    formatter.timeZone = NSTimeZone.local
+                    dateSelectCallBack(_couponModel.id! as NSString,formatter.date(from: text as! String)! as NSDate)
+                }
+            })
+        } else if _couponModel.type == "5" && selected {
+            if !editEnabled {
+                showMessage(message: "该项不可编辑")
+                return
+            }
+            ShopBodyCouponGoodsListView.couponGoodsShow { [self] model in
+                if (goodsCallBack != nil) {
+                    goodsCallBack(model.id ?? "")
+                }
+                if model.title!.count > 20 {
+                    goodsLabel.text = (model.title! as NSString).substring(with: NSRange(location: 0, length: 20))
+                } else {
+                    goodsLabel.text = model.title
+                }
+            }
+        }
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    @objc func switchChange(sender: UISwitch) {
+        _couponModel.section = sender.isOn ? "1" : "2"
+    }
+    
+    func selectTitles(id: String) -> NSArray {
+        var selectTitles: NSArray = []
+        switch id {
+        case "6":
+            selectTitles = ["店铺全场","单个商品"]
+            break
+        case "8":
+            selectTitles = ["正常","冻结"]
+            break
+        case "9":
+            selectTitles = ["不限","限一次"]
+            break
+        default:
+            break
+        }
+        return selectTitles
+    }
+    
+    func textFieldShouldBeginEditing(_ textField: UITextField) -> Bool {
+        if _couponModel.id != "1" {
+            if !editEnabled {
+                showMessage(message: "该项不可编辑")
+                return false
+            }
+        }
+        return true
+    }
+    
+    func textFieldDidEndEditing(_ textField: UITextField) {
+        if (textFieldCallBack != nil) {
+            if _couponModel.id == "1" {
+                _couponModel.message = textField.text
+            }
+            textFieldCallBack(_couponModel.id!, textField.text!)
+        }
+    }
+    
+    func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool {
+        if _couponModel.id == "1" {
+            if textField.text!.count + string.count > 20 {
+                textField.text = textField.text! + (string as NSString).substring(with: NSMakeRange(0, 20-textField.text!.count))
+                return false
+            }
+            return true
+        }
+        return true
+    }
+}
+
+
+class ShopBodyCreateCouponTypeMoneyView: UIView, UITextFieldDelegate {
+    
+    lazy var man1Label: UILabel = {
+        let man1Label = UILabel.init()
+        man1Label.textColor = HexColor("#999999")
+        man1Label.font = regular_adapt_font(pointSize: 14)
+        man1Label.text = "满"
+        return man1Label
+    }()
+    
+    lazy var maxPut: UITextField = {
+        let maxPut = UITextField.init()
+        maxPut.textColor = HexColor("#333333")
+        maxPut.font = regular_adapt_font(pointSize: 14)
+        maxPut.delegate = self
+        maxPut.tag = 1001
+        maxPut.textAlignment = .center
+        maxPut.backgroundColor = HexColor("#f9f9f9")
+        maxPut.keyboardType = .numberPad
+        let path = UIBezierPath.init(roundedRect: CGRectMake(0, 0, adapt_length(length: 60), adapt_length(length: 29)), byRoundingCorners: .allCorners, cornerRadii: CGSize(width: adapt_length(length: 4), height: adapt_length(length: 4)))
+        let shapelayer = CAShapeLayer()
+        shapelayer.path = path.cgPath
+        maxPut.layer.mask = shapelayer
+        return maxPut
+    }()
+    
+    lazy var midLabel: UILabel = {
+        let midLabel  = UILabel.init()
+        midLabel.textColor = HexColor("#999999")
+        midLabel.font = regular_adapt_font(pointSize: 14)
+        midLabel.text = "元减"
+        return midLabel
+    }()
+    
+    lazy var lessPut: UITextField = {
+        let lessPut = UITextField.init()
+        lessPut.textColor = HexColor("#333333")
+        lessPut.font = regular_adapt_font(pointSize: 14)
+        lessPut.delegate = self
+        lessPut.tag = 1002
+        lessPut.textAlignment = .center
+        lessPut.backgroundColor = HexColor("#f9f9f9")
+        lessPut.keyboardType = .numberPad
+        let path = UIBezierPath.init(roundedRect: CGRectMake(0, 0, adapt_length(length: 60), adapt_length(length: 29)), byRoundingCorners: .allCorners, cornerRadii: CGSize(width: adapt_length(length: 4), height: adapt_length(length: 4)))
+        let shapelayer = CAShapeLayer()
+        shapelayer.path = path.cgPath
+        lessPut.layer.mask = shapelayer
+        return lessPut
+    }()
+    
+    lazy var lastLabel: UILabel = {
+        let lastLabel  = UILabel.init()
+        lastLabel.textColor = HexColor("#999999")
+        lastLabel.font = regular_adapt_font(pointSize: 14)
+        lastLabel.text = "元"
+        return lastLabel
+    }()
+    
+    var editEnabled: Bool!
+    var _couponModel: ShopOrderCouponDataModel!
+    var textFieldCallBack: clickCouponTextFieldCallBack!
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        addSubview(lastLabel)
+        lastLabel.snp.makeConstraints { make in
+            make.right.centerY.equalToSuperview()
+        }
+        addSubview(lessPut)
+        lessPut.snp.makeConstraints { make in
+            make.right.equalTo(lastLabel.snp.left).offset(-adapt_length(length: 10))
+            make.centerY.equalToSuperview()
+            make.width.equalTo(adapt_length(length: 60))
+            make.height.equalTo(adapt_length(length: 29))
+        }
+        addSubview(midLabel)
+        midLabel.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.right.equalTo(lessPut.snp.left).offset(-adapt_length(length: 10))
+        }
+        addSubview(maxPut)
+        maxPut.snp.makeConstraints { make in
+            make.right.equalTo(midLabel.snp.left).offset(-adapt_length(length: 10))
+            make.centerY.equalToSuperview()
+            make.width.equalTo(adapt_length(length: 60))
+            make.height.equalTo(adapt_length(length: 29))
+        }
+        addSubview(man1Label)
+        man1Label.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.right.equalTo(maxPut.snp.left).offset(-adapt_length(length: 10))
+        }
+    }
+    
+    func setupWithDataSource(couponModel: ShopOrderCouponDataModel) {
+        _couponModel = couponModel
+        
+        maxPut.text = couponModel.filled
+        lessPut.text = couponModel.disCount
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    func textFieldShouldBeginEditing(_ textField: UITextField) -> Bool {
+        if !editEnabled {
+            showMessage(message: "该项不可编辑")
+            return false
+        }
+        return true
+    }
+    func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool {
+        if string == "" {
+            return true
+        }
+        if !string.isNotBlank() {
+            return false
+        }
+        let cs = NSCharacterSet.init(charactersIn: "0123456789.").inverted
+        let filtered = (string.components(separatedBy: cs) as NSArray).componentsJoined(by: "")
+        if string != filtered {
+            return false
+        }
+        return true
+    }
+    func textFieldDidEndEditing(_ textField: UITextField) {
+        if textFieldCallBack != nil {
+            textFieldCallBack("\(textField.tag)",textField.text!)
+        }
+    }
+}
+
+class ShopBodySelectCouponTapView: UIView {
+    
+    var _titles: NSArray?
+    var titles: NSArray? {
+        get {
+            return _titles
+        }
+        set {
+            _titles = newValue
+            titles?.enumerateObjects({ obj, idx, stop in
+                let btn = UIButton.init(type: .custom)
+                btn.setTitleColor(HexColor("#666666"), for: .normal)
+                btn.setTitle(obj as? String, for: .normal)
+                btn.setImage(UIImage(named: "DS_coupon_unSelect"), for: .normal)
+                btn.titleLabel?.font = regular_adapt_font(pointSize: 15)
+                btn.setImage(UIImage(named: "DS_coupon_select"), for: .selected)
+                btn.tag = 1001+idx
+                btn.addTarget(self, action: #selector(selectIndexClick), for: .touchUpInside)
+                addSubview(btn)
+                btnArray.add(btn)
+            })
+            let btn1 = btnArray[1] as! UIButton
+            let btn2 = btnArray[0] as! UIButton
+            var width1: CGFloat = 0.0
+            if (titles![1] as! String).count == 4 {
+                width1 = adapt_length(length: 83)
+            } else if (titles![1] as! String).count == 3 {
+                width1 = adapt_length(length: 68)
+            } else if (titles![1] as! String).count == 2 {
+                width1 = adapt_length(length: 53)
+            }
+            btn1.snp.makeConstraints { make in
+                make.right.equalToSuperview()
+                make.width.equalTo(width1)
+                make.height.equalToSuperview()
+            }
+            var width2: CGFloat = 0.0
+            if (titles![0] as! String).count == 4 {
+                width2 = adapt_length(length: 83)
+            } else if (titles![0] as! String).count == 3 {
+                width2 = adapt_length(length: 68)
+            } else if (titles![0] as! String).count == 2 {
+                width2 = adapt_length(length: 53)
+            }
+            btn2.snp.makeConstraints { make in
+                make.right.equalTo(btn1.snp.left).offset(-adapt_length(length: 30))
+                make.width.equalTo(width2)
+                make.height.equalToSuperview()
+            }
+        }
+    }
+    var _selectIndex: NSInteger?
+    var selectIndex: NSInteger? {
+        get {
+            return _selectIndex
+        }
+        set {
+            _selectIndex = newValue
+            for item in btnArray {
+                let btn = item as! UIButton
+                if btn.tag - 1000 == selectIndex {
+                    btn.isSelected = true
+                } else {
+                    btn.isSelected = false
+                }
+            }
+        }
+    }
+    
+    lazy var btnArray: NSMutableArray = {
+        let btnArray = NSMutableArray.init()
+        return btnArray
+    }()
+     
+    var editEnabled: Bool!
+    var selectCallBack: clickCouponSelectCallBack!
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        
+    }
+    
+    @objc func selectIndexClick(sender: UIButton) {
+        if !editEnabled {
+            showMessage(message: "该项不可编辑")
+            return
+        }
+        for item in btnArray {
+            let btn = item as! UIButton
+            if btn.tag == sender.tag {
+                btn.isSelected = true
+                if (selectCallBack != nil) {
+                    selectCallBack(sender.tag - 1000)
+                }
+            } else {
+                btn.isSelected = false
+            }
+        }
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+}
+
+
+
+
+//
+//  CNLiveShopTransListView.swift
+//  metaCode
+//
+//  Created by open on 2023/11/15.
+//
+
+import Foundation
+import Kingfisher
+
+typealias clickTransListHeaderCallBack = (_ headerView: ShopBodyTransListHeaderView) -> Void
+class ShopBodyTransListHeaderView: UIView {
+    
+    lazy var dateLab: UILabel = {
+        let dateLab = UILabel.init()
+        dateLab.textColor = HexColor("#333333")
+        dateLab.font = medium_adapt_font(pointSize: 16)
+        dateLab.text = NSDate.timeIntervalChangeToTimeStr(timeInterval: NSDate().timeIntervalSince1970, "YYYY年M月")
+        return dateLab
+    }()
+    
+    lazy var downArrowImageView: UIImageView = {
+        let downArrowImageView = UIImageView.init(image: UIImage(named: "ye_xl"))
+        downArrowImageView.contentMode = .scaleAspectFit
+        downArrowImageView.clipsToBounds = true
+        return downArrowImageView
+    }()
+    
+    lazy var priceLab: UILabel = {
+        let priceLab = UILabel.init()
+        priceLab.textColor = HexColor("#9d9d9d")
+        priceLab.font = medium_adapt_font(pointSize: 14)
+        priceLab.text = "支出 ¥0.00 收入 ¥0.00"
+        return priceLab
+    }()
+    
+    var clickBlcok: clickTransListHeaderCallBack!
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        backgroundColor = HexColor("#f6f6f6")
+        
+        addSubview(dateLab)
+        dateLab.snp.makeConstraints { make in
+            make.left.top.equalToSuperview().offset(adapt_length(length: 20))
+            make.height.equalTo(adapt_length(length: 23))
+            make.width.lessThanOrEqualTo(adapt_length(length: 300))
+        }
+        addSubview(downArrowImageView)
+        downArrowImageView.snp.makeConstraints { make in
+            make.left.equalTo(dateLab.snp.right).offset(adapt_length(length: 5))
+            make.centerY.equalTo(dateLab)
+            make.size.equalTo(CGSize(width: adapt_length(length: 10), height: adapt_length(length: 10)))
+        }
+        addSubview(priceLab)
+        priceLab.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(adapt_length(length: 20))
+            make.right.equalToSuperview().offset(-adapt_length(length: 20))
+            make.top.equalTo(dateLab.snp.bottom).offset(adapt_length(length: 5))
+            make.height.equalTo(adapt_length(length: 20))
+        }
+        
+        isUserInteractionEnabled = true
+        let tap = UITapGestureRecognizer(target: self, action: #selector(selfTap))
+        addGestureRecognizer(tap)
+    }
+    
+    @objc func selfTap() {
+        if (clickBlcok != nil) {
+            clickBlcok(self)
+        }
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+}
+
+class ShopBodyTransListViewCell: UITableViewCell {
+    
+    lazy var iconImageView: UIImageView = {
+        let iconImageView = UIImageView.init(frame: CGRectMake(0, 0, adapt_length(length: 40), adapt_length(length: 40)))
+        iconImageView.contentMode = .scaleAspectFill
+        iconImageView.layer.cornerRadius = adapt_length(length: 20)
+        iconImageView.layer.masksToBounds = true
+        return iconImageView
+    }()
+    
+    lazy var titleLabel: UILabel = {
+        let titleLabel = UILabel.init()
+        titleLabel.textColor = HexColor("#333333")
+        titleLabel.font = medium_adapt_font(pointSize: 15)
+        return titleLabel
+    }()
+    
+    lazy var timeLabel: UILabel = {
+        let timeLabel = UILabel.init()
+        timeLabel.textColor = HexColor("#999999")
+        timeLabel.font = regular_adapt_font(pointSize: 12)
+        return timeLabel
+    }()
+    
+    lazy var payTypeImageView: UIImageView = {
+        let payTypeImageView = UIImageView.init(frame: CGRectMake(0, 0, adapt_length(length: 54), adapt_length(length: 16)))
+        payTypeImageView.contentMode = .scaleAspectFit
+        return payTypeImageView
+    }()
+    
+    lazy var priceLab: UILabel = {
+        let priceLab = UILabel.init()
+        priceLab.textColor = HexColor("#333333")
+        priceLab.font = medium_adapt_font(pointSize: 18)
+        priceLab.textAlignment = .right
+        return priceLab
+    }()
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        contentView.backgroundColor = .clear
+        selectionStyle = .none
+        
+        addSubview(iconImageView)
+        iconImageView.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.left.equalToSuperview().offset(20)
+            make.size.equalTo(adapt_length(length: 40))
+        }
+        addSubview(titleLabel)
+        titleLabel.snp.makeConstraints { make in
+            make.left.equalTo(iconImageView.snp.right).offset(adapt_length(length: 15))
+            make.right.equalToSuperview().offset(-adapt_length(length: 75))
+            make.top.equalTo(iconImageView.snp.top)
+            make.height.equalTo(adapt_length(length: 21))
+        }
+        addSubview(timeLabel)
+        timeLabel.snp.makeConstraints { make in
+            make.left.equalTo(titleLabel.snp.left)
+            make.top.equalTo(titleLabel.snp.bottom).offset(adapt_length(length: 5))
+            make.size.equalTo(CGSize(width: adapt_length(length: 130), height: 17))
+        }
+        addSubview(payTypeImageView)
+        payTypeImageView.snp.makeConstraints { make in
+            make.right.equalToSuperview().offset(-adapt_length(length: 20))
+            make.top.equalToSuperview().offset(adapt_length(length: 17))
+            make.size.equalTo(payTypeImageView.size)
+        }
+        addSubview(priceLab)
+        priceLab.snp.makeConstraints { make in
+            make.right.equalToSuperview().offset(-adapt_length(length: 20))
+            make.left.equalTo(timeLabel.snp.right).offset(adapt_length(length: 15))
+            make.top.equalTo(payTypeImageView.snp.bottom).offset(4)
+            make.height.equalTo(adapt_length(length: 25))
+        }
+    }
+    
+    func setupWithDataSource(listModel: ShopOrderTransListDataModel) {
+        iconImageView.kf.setImage(with: URL(string: listModel.img!), placeholder: UIImage.imageWithColor(color: HexColor("#f9f9f9")!, size: CGSize(width: adapt_length(length: 40), height: adapt_length(length: 40))))
+        titleLabel.text = listModel.username
+        timeLabel.text = listModel.addtime
+        if listModel.payment == "1" {
+            payTypeImageView.image = UIImage(named: "tsq_zhifubaozf")
+        }
+        if listModel.payment == "2" {
+            payTypeImageView.image = UIImage(named: "tsq_wweixinzf")
+        }
+        if listModel.payment == "3" {
+            payTypeImageView.image = UIImage(named: "tsq_yinlianzf")
+        }
+        if listModel.payment == "4" {
+            payTypeImageView.image = UIImage(named: "ye_wjjzf")
+        }
+        priceLab.text = listModel.price
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+}
@@ -538,7 +538,6 @@ class CNLiveShopViewModel: NSObject {
         if networkType == .refundExpress {
             url = "/api/v1/getRefundExpress"
         }
-
         let custom_param = NSMutableDictionary()
         custom_param.setValue(APPId_wjj, forKey: "appId")
         custom_param.setValue(APPKey_wjj, forKey: "appKey")
@@ -575,4 +574,375 @@ class CNLiveShopViewModel: NSObject {
         }
     }
+    ///  电商商家流水
+    /// - Parameters:
+    ///   - date: 时间
+    ///   - type: 0 全部 1 收入 2 支出
+    ///   - resultBlock: 返回
+    static func requestAccount(date: String, type:CNLiveShopTransListShowType, resultBlock: @escaping resultShopBlock) {
+        let param = NSMutableDictionary()
+        param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "uid")
+        param.setValue(date, forKey: "date")
+        if type == .all {
+            param.setValue("0", forKey: "type")
+        }
+        if type == .income {
+            param.setValue("1", forKey: "type")
+        }
+        if type == .outcome {
+            param.setValue("2", forKey: "type")
+        }
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(APPId_wjj, forKey: "appId")
+        custom_param.setValue(APPKey_wjj, forKey: "appKey")
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.setupDSRequest(true)
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
+        CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseWjjBUrl+"/api/v1/getShopAccount", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
+            hiddenLoading()
+            if (error == nil) {
+                let resp = result as! NSDictionary
+                let errorCode = "\(resp["code"] ?? "0")"
+                if (errorCode == "200") {
+                    if resp["data"] is NSNull {
+                        resultBlock(NSNull(),.failed)
+                    } else {
+                        let model = dictionaryToModel(resp as! [String : Any], ShopOrderTransBaseDataModel.self,"data") as! ShopOrderTransBaseDataModel
+                        resultBlock(model,.success)
+                    }
+                } else {
+                    showMessage(message: resp["message"] as! String)
+                    resultBlock(NSNull(),.failed)
+                }
+            } else {
+                if CNLiveNetworking.isNetworking() {
+                    showMessage(message: "请求失败")
+                    resultBlock(NSNull(),.failed)
+                } else {
+                    showMessage(message: "似乎与网络断开链接")
+                    resultBlock(NSNull(),.noNetwork)
+                }
+            }
+        }
+    }
+    
+    /// 获取店铺商品列表
+    /// - Parameters:
+    ///   - shopId: 店铺id
+    ///   - sortType: 排序类型
+    ///   - state: 类型
+    ///   - categoryId: 类别id
+    ///   - keyword: 搜索关键词
+    ///   - page: 页数
+    ///   - resultBlock: 返回
+    static func requestCouponSearchGoods(shopId: String,sortType: String,state: String,categoryId: String,keyword: String,page: NSInteger,resultBlock: @escaping resultShopBlock) {
+        let param = NSMutableDictionary()
+        param.setValue(shopId, forKey: "shop_id")
+        param.setValue(sortType, forKey: "type")
+        param.setValue(state, forKey: "state")
+        param.setValue(categoryId, forKey: "category_id")
+        param.setValue(keyword, forKey: "keyword")
+        param.setValue("\(page)", forKey: "page")
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(APPId_wjj, forKey: "appId")
+        custom_param.setValue(APPKey_wjj, forKey: "appKey")
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.setupDSRequest(true)
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
+        CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseWjjBUrl+"/api/v1/getGoodsList", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
+            hiddenLoading()
+            if (error == nil) {
+                let resp = result as! NSDictionary
+                let errorCode = "\(resp["code"] ?? "0")"
+                if (errorCode == "200") {
+                    if resp["data"] is NSNull {
+                        resultBlock(NSNull(),.failed)
+                    } else {
+                        let array = resp["data"] as! NSArray
+                        let tempArray = NSMutableArray()
+                        for item in array {
+                            let listModel = dictionaryToModel(item as! [String : Any], ShopOrderAssociatedGoodsModel.self,"") as! ShopOrderAssociatedGoodsModel
+                            tempArray.add(listModel)
+                        }
+                        resultBlock(tempArray, .success)
+                    }
+                } else {
+                    showMessage(message: resp["message"] as! String)
+                    resultBlock(NSNull(),.failed)
+                }
+            } else {
+                if CNLiveNetworking.isNetworking() {
+                    showMessage(message: "请求失败")
+                    resultBlock(NSNull(),.failed)
+                } else {
+                    showMessage(message: "似乎与网络断开链接")
+                    resultBlock(NSNull(),.noNetwork)
+                }
+            }
+        }
+    }
+    
+    
+    /// 构建创建优惠券相关数据
+    /// - Parameter resultBlock: 返回
+    static func requestCoupon(model: ShopOrderCouponListModel ,resultBlock: @escaping resultShopBlock) {
+        let array: NSMutableArray = NSMutableArray(array: [
+            [
+                [
+                    "id":"1",
+                    "type":"1",
+                    "title":"名称",
+                    "subTitle":"请输入(20字以内)",
+                    "section":"1",
+                    "message":model.title ?? ""
+                ],
+                [
+                    "id":"2",
+                    "type":"2",
+                    "title":"满减折扣",
+                    "subTitle":"",
+                    "section":"1",
+                    "filled":model.filled ?? "",
+                    "disCount":model.discount ?? ""
+                ] as [String : Any],
+                [
+                    "id":"3",
+                    "type":"1",
+                    "title":"数量",
+                    "subTitle":"请输入数量",
+                    "section":"1",
+                    "message":model.num ?? ""
+                ],
+                [
+                    "id":"4",
+                    "type":"3",
+                    "title":"开始时间",
+                    "subTitle":"请选择开始时间",
+                    "section":"1",
+                    "message":model.starttime ?? ""
+                ],
+                [
+                    "id":"5",
+                    "type":"3",
+                    "title":"结束时间",
+                    "subTitle":"请选择结束时间",
+                    "section":"1",
+                    "message":model.endtime ?? ""
+                ],
+            ],
+            [
+                [
+                    "id":"6",
+                    "type":"4",
+                    "title":"所属类型",
+                    "subTitle":"",
+                    "section":(model.sort?.isNotBlank())! && model.sort != "1" ? "2":"1",
+                ],
+                [
+                    "id":"7",
+                    "type":"5",
+                    "title":"优惠商品",
+                    "subTitle":"请选择",
+                    "section":"1",
+                    "message":model.goods_title ?? ""
+                ],
+                [
+                    "id":"8",
+                    "type":"4",
+                    "title":"领取状态",
+                    "subTitle":"",
+                    "section":(model.state?.isNotBlank())!  && model.state != "1" ? "2":"1",
+                ],
+                [
+                    "id":"9",
+                    "type":"4",
+                    "title":"领取次数",
+                    "subTitle":"",
+                    "section":(model.receive_number?.isNotBlank())! && model.receive_number != "1" ? "2":"1",
+                ] as [String : Any],
+                [
+                    "id":"10",
+                    "type":"6",
+                    "title":"显示状态",
+                    "subTitle":"",
+                    "section":(model.is_show?.isNotBlank())! && model.is_show != "1" ?"2":"1",
+                ],
+            ]
+        ])
+        let dataArr = NSMutableArray.init()
+        for subArr in array {
+            let temp_array = subArr as! NSArray
+            let dataSubArr = NSMutableArray.init()
+            for dict in temp_array {
+                let model = dictionaryToModel(dict as! [String : Any], ShopOrderCouponDataModel.self,"") as! ShopOrderCouponDataModel
+                dataSubArr.add(model)
+            }
+            dataArr.add(dataSubArr)
+        }
+        resultBlock(dataArr,.success)
+    }
+    
+    /// 发布优惠券
+    /// - Parameters:
+    ///   - title: 优惠券标题
+    ///   - filled: 满多少
+    ///   - discount: 减多少
+    ///   - startTime: 开始时间戳
+    ///   - endTime: 结束时间戳
+    ///   - state: 是否开启 1 开启 2 关闭
+    ///   - isShow: 是否显示 1 对外显示 2 不对外
+    ///   - receiveNum: 领取次数 1 不限制 2 限领一次
+    ///   - totalNum: 优惠券数量  -1 为不限量
+    ///   - goodsType: 所属类型 1全场 2 单品，判断需要
+    ///   - goodsId: 商品id 单品优惠券传此值
+    ///   - resultBlock: 返回
+    static func requestCouponCreate(title: String,filled: String,discount: String, startTime: String,endTime: String,state: String,isShow: String, receiveNum: String,totalNum: String, goodsType: String,goodsId: String,resultBlock: @escaping resultShopBlock) {
+        if !title.isNotBlank() {
+            showMessage(message: "优惠券名称不能为空")
+            return
+        }
+        if !filled.isNotBlank() || !discount.isNotBlank() {
+            showMessage(message: "优惠券满减金额不能为空")
+            return
+        }
+        if Float(discount)! > Float(filled)! {
+            showMessage(message: "减免金额不可大于总金额")
+            return
+        }
+        if !totalNum.isNotBlank() {
+            showMessage(message: "优惠券总数量不能为空")
+            return
+        }
+        if Int(totalNum)! <= 0 {
+            showMessage(message: "优惠券总数量必须大于0")
+            return
+        }
+        if !startTime.isNotBlank() {
+            showMessage(message: "优惠券开始时间不能为空")
+            return
+        }
+        if !endTime.isNotBlank() {
+            showMessage(message: "优惠券结束时间不能为空")
+            return
+        }
+        if Float(startTime)! >= Float(endTime)! {
+            showMessage(message: "结束时间必须大于开始时间")
+            return
+        }
+        if goodsType == "2" && !goodsId.isNotBlank() {
+            showMessage(message: "请选择需要优惠的商品")
+            return
+        }
+        let param = NSMutableDictionary()
+        param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "uid")
+        param.setValue(title, forKey: "title")
+        param.setValue(filled, forKey: "filled")
+        param.setValue(discount, forKey: "discount")
+        param.setValue(startTime, forKey: "startTime")
+        param.setValue(endTime, forKey: "endTime")
+        param.setValue(state, forKey: "state")
+        param.setValue(isShow, forKey: "is_show")
+        param.setValue(receiveNum, forKey: "receive_number")
+        param.setValue(totalNum, forKey: "num")
+        param.setValue(goodsId, forKey: "goods_id")
+        print("创建优惠券数据===>\(param)")
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(APPId_wjj, forKey: "appId")
+        custom_param.setValue(APPKey_wjj, forKey: "appKey")
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.setupDSRequest(true)
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
+        CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseWjjBUrl+"/api/v1/addCoupon", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
+            hiddenLoading()
+            if (error == nil) {
+                let resp = result as! NSDictionary
+                let errorCode = "\(resp["code"] ?? "0")"
+                if (errorCode == "200") {
+                    if resp["data"] is NSNull {
+                        resultBlock(NSNull(),.failed)
+                    } else {
+                        resultBlock("提交成功", .success)
+                    }
+                } else {
+                    showMessage(message: resp["message"] as! String)
+                    resultBlock(NSNull(),.failed)
+                }
+            } else {
+                if CNLiveNetworking.isNetworking() {
+                    showMessage(message: "提交失败")
+                    resultBlock(NSNull(),.failed)
+                } else {
+                    showMessage(message: "似乎与网络断开链接")
+                    resultBlock(NSNull(),.noNetwork)
+                }
+            }
+        }
+    }
+    
+    /// 修改优惠券
+    /// - Parameters:
+    ///   - model: 优惠券数据
+    ///   - title: 优惠券标题
+    ///   - state: 是否开启 1 开启 2 关闭
+    ///   - isShow: 是否显示 1 对外显示 2 不对外
+    ///   - receiveNum: 领取次数 1 不限制 2 限领一次
+    ///   - resultBlock: 返回
+    static func requestCouponEdit(model: ShopOrderCouponListModel,title: String,state: String,isShow: String, receiveNum: String,resultBlock: @escaping resultShopBlock) {
+        if !title.isNotBlank() {
+            showMessage(message: "优惠券名称不能为空")
+            return
+        }
+        let param = NSMutableDictionary()
+        param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "uid")
+        param.setValue(model.id, forKey: "id")
+        param.setValue(title, forKey: "title")
+        param.setValue(model.filled, forKey: "filled")
+        param.setValue(model.discount, forKey: "discount")
+        param.setValue("\(Int(model.starttime!) ?? 0)", forKey: "startTime")
+        param.setValue("\(Int(model.endtime!) ?? 0)", forKey: "endTime")
+        param.setValue(state, forKey: "state")
+        param.setValue(isShow, forKey: "is_show")
+        param.setValue(receiveNum, forKey: "receive_number")
+        param.setValue(model.num, forKey: "num")
+        param.setValue(model.goods_id, forKey: "goods_id")
+        print("修改优惠券数据===>\(param)")
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(APPId_wjj, forKey: "appId")
+        custom_param.setValue(APPKey_wjj, forKey: "appKey")
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.setupDSRequest(true)
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
+        CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseWjjBUrl+"/api/v1/editCoupon", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
+            hiddenLoading()
+            if (error == nil) {
+                let resp = result as! NSDictionary
+                let errorCode = "\(resp["code"] ?? "0")"
+                if (errorCode == "200") {
+                    if resp["data"] is NSNull {
+                        resultBlock(NSNull(),.failed)
+                    } else {
+                        resultBlock("修改成功", .success)
+                    }
+                } else {
+                    showMessage(message: resp["message"] as! String)
+                    resultBlock(NSNull(),.failed)
+                }
+            } else {
+                if CNLiveNetworking.isNetworking() {
+                    showMessage(message: "修改失败")
+                    resultBlock(NSNull(),.failed)
+                } else {
+                    showMessage(message: "似乎与网络断开链接")
+                    resultBlock(NSNull(),.noNetwork)
+                }
+            }
+        }
+    }
+    
+    
+    
 }
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "选中@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "选中@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "未选中@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "未选中@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "tsq_wweixinzf@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "tsq_wweixinzf@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "tsq_yinlianzf@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "tsq_yinlianzf@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "tsq_zhifubaozf@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "tsq_zhifubaozf@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "ye_wjjzf@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "ye_wjjzf@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "ye_xl@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "ye_xl@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}