商品管理页面 , 上下架 , 编辑库存

张旭
1 parent 6b5d3459
Showing 19 changed files with 856 additions and 79 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Config/CNLiveConfigManager.swift
metaCode/Classes/Main/HomePage/Controller/GoodsManager/CNLiveShopNewProductController.swift
metaCode/Classes/Main/HomePage/Controller/GoodsManager/CNLiveShopProductManagerController.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveRoundedRectView.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveShopAddGoodsSingleView.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveShopGoodsListCell.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveShopGoodsListClassifyView.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveSwitchView.swift
metaCode/Classes/Main/HomePage/ViewModel/GoodsManager/CNLiveShopGoodListViewModel.swift
metaCode/Supporting Files/Assets.xcassets/Shop/DS_goods_manager_pirce_default.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/Shop/DS_goods_manager_pirce_default.imageset/DS_goods_manager_pirce_default@2x.png
metaCode/Supporting Files/Assets.xcassets/Shop/DS_goods_manager_pirce_default.imageset/DS_goods_manager_pirce_default@3x.png
metaCode/Supporting Files/Assets.xcassets/Shop/DS_goods_manager_pirce_max.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/Shop/DS_goods_manager_pirce_max.imageset/DS_goods_manager_pirce_max@2x.png
metaCode/Supporting Files/Assets.xcassets/Shop/DS_goods_manager_pirce_max.imageset/DS_goods_manager_pirce_max@3x.png
metaCode/Supporting Files/Assets.xcassets/Shop/DS_goods_manager_pirce_min.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/Shop/DS_goods_manager_pirce_min.imageset/DS_goods_manager_pirce_min@2x.png
metaCode/Supporting Files/Assets.xcassets/Shop/DS_goods_manager_pirce_min.imageset/DS_goods_manager_pirce_min@3x.png
@@ -9,6 +9,8 @@
 /* Begin PBXBuildFile section */
 		0D39E93D7229931C86EB1161 /* Pods_metaCode_metaCodeUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D879B49B1E42F1584DD75E /* Pods_metaCode_metaCodeUITests.framework */; };
 		19123FC12ABC11170075C883 /* CNWebViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19123FC02ABC11170075C883 /* CNWebViewController.swift */; };
+		1917328E2B032583007BCC04 /* CNLiveRoundedRectView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1917328D2B032583007BCC04 /* CNLiveRoundedRectView.swift */; };
+		191732902B0348F6007BCC04 /* CNLiveSwitchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1917328F2B0348F6007BCC04 /* CNLiveSwitchView.swift */; };
 		192336EB2AD9224300D47CD4 /* CNUpSlideViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 192336EA2AD9224300D47CD4 /* CNUpSlideViewController.swift */; };
 		1926C28F2AE0D76C00C71DC3 /* CNLiveDownSlideViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1926C28E2AE0D76C00C71DC3 /* CNLiveDownSlideViewModel.swift */; };
 		1926C2912AE0FD4500C71DC3 /* CNLiveDownSlideModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1926C2902AE0FD4500C71DC3 /* CNLiveDownSlideModel.swift */; };
@@ -174,6 +176,8 @@
 		0EC910AB9EBD717B04432BC4 /* Pods-metaCode-metaCodeUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-metaCode-metaCodeUITests.debug.xcconfig"; path = "Target Support Files/Pods-metaCode-metaCodeUITests/Pods-metaCode-metaCodeUITests.debug.xcconfig"; sourceTree = "<group>"; };
 		170BC5D0622EA2969D110A3B /* Pods-metaCode.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-metaCode.release.xcconfig"; path = "Target Support Files/Pods-metaCode/Pods-metaCode.release.xcconfig"; sourceTree = "<group>"; };
 		19123FC02ABC11170075C883 /* CNWebViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNWebViewController.swift; sourceTree = "<group>"; };
+		1917328D2B032583007BCC04 /* CNLiveRoundedRectView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveRoundedRectView.swift; sourceTree = "<group>"; };
+		1917328F2B0348F6007BCC04 /* CNLiveSwitchView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveSwitchView.swift; sourceTree = "<group>"; };
 		192336EA2AD9224300D47CD4 /* CNUpSlideViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNUpSlideViewController.swift; sourceTree = "<group>"; };
 		1926C28E2AE0D76C00C71DC3 /* CNLiveDownSlideViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveDownSlideViewModel.swift; sourceTree = "<group>"; };
 		1926C2902AE0FD4500C71DC3 /* CNLiveDownSlideModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveDownSlideModel.swift; sourceTree = "<group>"; };
@@ -374,6 +378,8 @@
 				19565ECE2AF8D8F6007D6727 /* CNLiveShopGoodsListCell.swift */,
 				1965FA3D2AFB176E00F0F435 /* CNLiveShopAddGoodsSingleView.swift */,
 				1965FA3F2AFB38AA00F0F435 /* CNLiveAddGoodsSelectUploadImageView.swift */,
+				1917328D2B032583007BCC04 /* CNLiveRoundedRectView.swift */,
+				1917328F2B0348F6007BCC04 /* CNLiveSwitchView.swift */,
 			);
 			path = GoodsManager;
 			sourceTree = "<group>";
@@ -1137,12 +1143,14 @@
 				19BB1FE82AECAD060094D962 /* CNLiveShopConsoleModel.swift in Sources */,
 				19BB1FEE2AF0E1EC0094D962 /* CNLiveShopDetailViewModel.swift in Sources */,
 				19F1C2332AB5728B0083D06C /* CNIDCardView.swift in Sources */,
+				1917328E2B032583007BCC04 /* CNLiveRoundedRectView.swift in Sources */,
 				7CD675292A270F6A008354C1 /* WJColorChange.m in Sources */,
 				79F4B11C2A33036E00993C03 /* CNLiveMineInfoAlertView.swift in Sources */,
 				79BB96A82AF223FB00AEA4AC /* CNLiveConfigAlertManager.swift in Sources */,
 				19BB1FF02AF0E5B30094D962 /* CNLiveShopDetailModel.swift in Sources */,
 				796398942A260C0100D045EB /* AppDelegate.swift in Sources */,
 				7989B5C72A4BDC7200A19B10 /* CNLiveMineEarnListViewController.swift in Sources */,
+				191732902B0348F6007BCC04 /* CNLiveSwitchView.swift in Sources */,
 				792B53282AFCD7640009AB49 /* CNLiveShopOrderExpressDetailViewController.swift in Sources */,
 				79396EF12A31C21B0053E1AF /* CNLiveInfoShowViewController.swift in Sources */,
 				192336EB2AD9224300D47CD4 /* CNUpSlideViewController.swift in Sources */,
@@ -73,4 +73,12 @@ extension Notification.Name {
         //发货成功通知
         public static let CNLiveShopOrderSendExpressNotification = Notification.Name("CNLiveShopOrderSendExpressNotification")
     }
+    struct ShopGoodsManage {
+        //新增商品通知
+        public static let kDSGoodsManageAddNotification = Notification.Name("kDSGoodsManageAddNotification")
+        //编辑商品通知
+        public static let kDSGoodsManageEditNotification = Notification.Name("kDSGoodsManageEditNotification")
+        //删除商品通知
+        public static let kDSGoodsManageDeleteNotification = Notification.Name("kDSGoodsManageDeleteNotification")
+    }
 }
@@ -19,6 +19,7 @@ enum CNLiveShopGoodsAddEditType{
 class CNLiveShopNewProductController:CNLiveBaseViewController{
     var type:CNLiveShopGoodsAddEditType = .add
+    var goodsId = ""
     lazy var bgScrollView :UIScrollView = {
         let bgScrollView = UIScrollView(frame: CGRect(x: 0, y: KNavigationHeight, width: KSreenWidth, height: KSreenHeight-KNavigationHeight-KTabBarHeight))
         bgScrollView.showsVerticalScrollIndicator = false
@@ -6,12 +6,22 @@
 //  商品管理
 import Foundation
+import MJRefresh
+import EmptyDataSet_Swift
-class CNLiveShopProductManagerController:CNLiveBaseViewController, UITableViewDataSource, UITableViewDelegate{
+///商品管理通知
+let kDSGoodsManageAddNotification = "kDSGoodsManageAddNotification"
+let kDSGoodsManageEditNotification = "kDSGoodsManageEditNotification"
+let kDSGoodsManageDeleteNotification = "kDSGoodsManageDeleteNotification"
+
+class CNLiveShopProductManagerController:CNLiveBaseViewController, UITableViewDataSource, UITableViewDelegate, CNLiveGoodsManagerClassifyViewDelegate, EmptyDataSetSource, EmptyDataSetDelegate, UITextFieldDelegate{
     let kCNLiveShopGoodsListCellIdentifier = "kCNLiveShopGoodsListCellIdentifier"
-    
+    ///排序类型 1新品 2价格从底到高 3 价格从高到底
+    var sortType = "1"
+    var network_type: CNLiveMineResponseType!
+    var pageNum: NSInteger = 0
     // MARK: - 懒加载
     ///数据源
     lazy var dataArray: NSMutableArray = {
@@ -20,8 +30,12 @@ class CNLiveShopProductManagerController:CNLiveBaseViewController, UITableViewDa
     }()
     lazy var classifyView: CNLiveShopGoodsListClassifyView = {
-        let classifyView = CNLiveShopGoodsListClassifyView(frame: CGRect(x: 0, y: KNavigationHeight, width: KSreenWidth, height: 44))
+        let itemA = CNLiveClassifyItem.init(itemTitle: "最新", itemImage: nil)
+        let itemB = CNLiveClassifyItem.init(itemTitle: "价格", itemImage: UIImage(named: "DS_goods_manager_pirce_default"))
+        
+        let classifyView = CNLiveShopGoodsListClassifyView(frame: CGRect(x: 0, y: KNavigationHeight, width: KSreenWidth, height: 44), itemArray: [itemA,itemB])
         classifyView.backgroundColor = .white
+        classifyView.delegate = self
         return classifyView
     }()
     lazy var addBtn: UIButton = {
@@ -36,7 +50,10 @@ class CNLiveShopProductManagerController:CNLiveBaseViewController, UITableViewDa
         let tableView = UITableView(frame: .zero, style: .plain)
         tableView.dataSource = self
         tableView.delegate = self
+        tableView.emptyDataSetSource = self
+        tableView.emptyDataSetDelegate = self
         tableView.separatorStyle = .none
+        tableView.tableFooterView = UIView.init()
         tableView.rowHeight = 167
         tableView.register(CNLiveShopGoodsListCell.self, forCellReuseIdentifier: kCNLiveShopGoodsListCellIdentifier)
         return tableView
@@ -52,16 +69,27 @@ class CNLiveShopProductManagerController:CNLiveBaseViewController, UITableViewDa
         emptyLabel.adjustsFontSizeToFitWidth=true
         return emptyLabel
     }()
-        
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         self.setUI()
-        self.getGoodsListApi(page: "1")
+        self.getGoodsListApi(page: 1)
+        
+        NotificationCenter.default.addObserver(self, selector: #selector(goodsManageAddNotification), name: Notification.Name.ShopGoodsManage.kDSGoodsManageAddNotification, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(goodsManageEditNotification), name: Notification.Name.ShopGoodsManage.kDSGoodsManageEditNotification, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(goodsManageDeleteNotification), name: Notification.Name.ShopGoodsManage.kDSGoodsManageDeleteNotification, object: nil)
+    }
+    deinit {
+        NotificationCenter.default.removeObserver(self, name: Notification.Name.ShopGoodsManage.kDSGoodsManageAddNotification, object: nil)
+        NotificationCenter.default.removeObserver(self, name: Notification.Name.ShopGoodsManage.kDSGoodsManageEditNotification, object: nil)
+        NotificationCenter.default.removeObserver(self, name: Notification.Name.ShopGoodsManage.kDSGoodsManageDeleteNotification, object: nil)
     }
+    
     func setUI(){
         navigationBarHidden = false
         titleName = "商品管理"
-//        rightNavBtns = [self.addBtn]
+        rightNavBtns = [self.addBtn]
+        self.pageNum = 1
         self.view.addSubview(self.classifyView)
         self.view.addSubview(tableView)
         self.view.addSubview(self.emptyLabel)
@@ -69,6 +97,18 @@ class CNLiveShopProductManagerController:CNLiveBaseViewController, UITableViewDa
         tableView.frame = CGRect(x: 0, y:self.classifyView.bottom , width: KSreenWidth, height: KSreenHeight - self.classifyView.bottom)
     }
+    func addRefreshView() {
+        tableView.mj_header = MJRefreshNormalHeader.init(refreshingBlock: {[weak self] in
+            self!.pageNum = 1
+            self?.getGoodsListApi(page: 1)
+        })
+        
+        tableView.mj_footer = MJRefreshAutoNormalFooter.init(refreshingBlock: {[weak self] in
+            self!.pageNum = self!.pageNum + 1
+            self?.getGoodsListApi(page: self!.pageNum)
+        })
+    }
+    
     // MARK: - UITableViewDelegate
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         return self.dataArray.count
@@ -84,6 +124,17 @@ class CNLiveShopProductManagerController:CNLiveBaseViewController, UITableViewDa
         }
         cell.goodsModel = goodsModel
+        cell.editBlock = { mdl in
+            let model = mdl
+            self.editGoodsModel(goodsModel: model)
+        }
+        cell.editCountBlock = { mdl in
+            let model = mdl 
+            self.editGoodsCountModel(goodsModel: model)
+        }
+        cell.operStateBlock = { model,state in
+            self.operStateWithGoodsModel(goodsModel: model, state: state)
+        }
         return cell
     }
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
@@ -95,47 +146,233 @@ class CNLiveShopProductManagerController:CNLiveBaseViewController, UITableViewDa
         return 167
     }
+    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  {
+            getGoodsListApi(page: 1)
+        }
+    }
+    
+    // MARK: - 编辑商品
+    func editGoodsModel(goodsModel:CNLiveShopGoodsListModel){
+        let vc = CNLiveShopNewProductController.init()
+        vc.type = .edit
+        vc.goodsId = goodsModel.id!
+        self.navigationController?.pushViewController(vc, animated: false)
+    }
+
+    // MARK: - 编辑商品库存
+    func editGoodsCountModel(goodsModel:CNLiveShopGoodsListModel){
+        let alertController = UIAlertController(title: "编辑商品库存", message: "请输入库存数量", preferredStyle: .alert)
+        alertController.addTextField { textField in
+            textField.delegate = self
+            textField.keyboardType = .numberPad
+            textField.returnKeyType = .done
+            textField.tag = 666
+        }
+        let cancel = UIAlertAction(title: "取消", style: .cancel) { action in
+        }
+        alertController.addAction(cancel)
+        let confirm = UIAlertAction(title: "修改", style: .default) { action in
+            self.view.endEditing(true)
+            let textField = alertController.textFields?.first
+            if (textField!.text?.count ?? 0 > 0 && (textField!.text?.isPurnInt() == false)) {
+                showMessage(message: "只能输入数字")
+                return
+            }
+            if (textField!.text?.count == 0 || textField!.text?.count ?? 0 >= 6){
+                showMessage(message: "请输入1~99999范围内的数量")
+                return
+            }
+            self.requsetEditGoodsCount(count: textField!.text ?? "", goodsModel: goodsModel)
+        }
+        alertController.addAction(confirm)
+        self.present(alertController, animated: true)
+            
+    }
+    
+    func requsetEditGoodsCount(count:String,goodsModel:CNLiveShopGoodsListModel){
+        showLoading(message: "")
+        CNLiveShopGoodListViewModel.postGoodsEditAttrWithShopId(shopId: DSUserInfoManager.shared.dsUserInfo.id!, goodsId: goodsModel.id!, type: 1, value: count) { result, status in
+            if status == .success{
+                showMessage(message: "操作成功")
+                let dataArr = Array(self.dataArray)
+                for (idx,mdl) in dataArr.enumerated() {
+                    let model = mdl as! CNLiveShopGoodsListModel
+                    if model.id == goodsModel.id {
+                        model.count = count
+                        self.dataArray.replaceObject(at: idx, with: model)
+                        self.tableView.reloadData()
+                        break
+                    }
+                }
+            }else{
+                showMessage(message: "操作失败")
+            }
+        }
+    }
+    
+    // MARK: - 编辑商品上下架状态
+    func operStateWithGoodsModel(goodsModel:CNLiveShopGoodsListModel,state:Int){
+        var message = ""
+        if state == 2{
+            message = "确认下架？"
+        }else{
+            message = "确认上架？"
+        }
+        AlertTool.showSystemAlert(title: message, message: nil, actionTitles: ["取消","确定"], style: .alert, actionStyles:[.cancel,.default] ) { index in
+            if (index == 2) {
+                showLoading(message: "")
+                CNLiveShopGoodListViewModel.postChangeGoodsStateWithGoodsId(goodsId: goodsModel.id!, state: "") { result, status in
+                    if status == .success{
+                        showMessage(message: "操作成功")
+                        let dataArr = Array(self.dataArray)
+                        for (idx,mdl) in dataArr.enumerated() {
+                            let model = mdl as! CNLiveShopGoodsListModel
+                            if model.id == goodsModel.id {
+                                if (model.state == 2) {
+                                    model.state = 1
+                                }else {
+                                    model.state = 2
+                                }
+                                self.dataArray.replaceObject(at: idx, with: model)
+                                
+                                self.tableView.reloadData()
+                                break
+                            }
+                        }
+                    }else if (status == .failed){
+                        self.network_type = .failed
+                        showMessage(message: "操作失败")
+                    }else if (status == .noNetwork){
+                        self.network_type = .noNetwork
+                        showMessage(message: "操作失败")
+                    }
+                }
+            }
+        }
+    }
+
+    
+    // MARK: -CNLiveGoodsManagerClassifyViewDelegate
+    func shopGoodsManagerClassifyViewDidSeleted(type: CNLiveGoodsManagerClassifyType) {
+        switch (type) {
+        case .newest:
+            self.sortType = "1"
+        case .priceMin:
+            self.sortType = "2"
+        case .priceMax:
+            self.sortType = "3"
+        }
+        self.tableView.mj_header?.beginRefreshing()
+    }
+
+    
     // MARK: - BtnAction
     @objc func addBtnAction(){
         currentViewController()?.navigationController?.pushViewController(CNLiveShopNewProductController(), animated: true)
     }
+    // MARK: - 商品编辑通知
+    @objc func goodsManageAddNotification(notification:Notification) {
+        self.getGoodsListApi(page: 1)
+    }
+    @objc func goodsManageEditNotification(notification:Notification){
+        let dict = (notification.userInfo ?? ["":""]) as! [String :Any]
+        let nModel = newDictionaryToModel(dict, CNLiveShopGoodsListModel.self) as! CNLiveShopGoodsListModel
+        var dataArr = Array(self.dataArray)
+        
+        for (idx,mdl) in dataArr.enumerated() {
+            let model = mdl as! CNLiveShopGoodsListModel
+            if model.id == nModel.id {
+                model.title = nModel.title
+                model.simg = nModel.simg
+                model.price = nModel.price
+                model.ads = nModel.ads
+                model.groupid = nModel.groupid
+                model.shopid = nModel.shopid
+                model.category_id = nModel.category_id
+                model.state = nModel.state
+                model.count = nModel.count
+                model.ord = nModel.ord
+                self.dataArray.replaceObject(at: idx, with: nModel)
+                self.tableView.reloadData()
+                break
+            }
+        }
+        
+    }
+
+    @objc func goodsManageDeleteNotification(notification:Notification){
+        let dict = (notification.userInfo ?? ["":""]) as! [String :Any]
+        let dataArr = Array(self.dataArray)
+        
+        for (_,mdl) in dataArr.enumerated() {
+            let model = mdl as! CNLiveShopGoodsListModel
+            if model.id == (dict["goodsId"] as! String){
+                self.dataArray.remove(model)
+                self.tableView.reloadData()
+                break
+            }
+        }
+    }
+    
     //MARK: - 网络请求获取商品列表
-    func getGoodsListApi(page:String)
+    func getGoodsListApi(page:NSInteger)
     {
         showLoading(message: "")
         CNLiveShopGoodListViewModel.requestGoodsList(shopId: DSUserInfoManager.shared.dsUserInfo.id, sortType: "1", page: page) { result, status in
             hiddenLoading()
             if status == .success{
                 let arr = result as! [CNLiveShopGoodsListModel]
-                if arr.count > 0
-                {
+                
+                if self.pageNum == 1 {
+                    self.dataArray.removeAllObjects()
                     self.dataArray.addObjects(from: result as! [CNLiveShopGoodsListModel])
-                    let newDataArray = NSMutableArray()
-                    for goodsModel in self.dataArray {
-                        if let model = goodsModel as? CNLiveShopGoodsListModel{
-                            newDataArray.add(model)
-                        }
+                    if (self.dataArray.count > 0 && self.tableView.mj_header == nil && self.tableView.mj_footer == nil) {
+                        self.addRefreshView()
                     }
-                    self.dataArray.removeAllObjects()
-                    self.dataArray.addObjects(from: newDataArray as! [Any])
-                    
+                }else if self.pageNum > 1 {
+                    self.dataArray.addObjects(from: result as! [CNLiveShopGoodsListModel])
+                }
+                self.tableView.reloadData()
+                self.tableView.mj_header?.endRefreshing()
+                self.tableView.mj_footer?.endRefreshing()
+                if (result as! Array<Any>).count == 0 {
+                    self.tableView.mj_footer?.endRefreshingWithNoMoreData()
                     self.tableView.reloadData()
-                    self.emptyLabel.isHidden = true
-                    self.classifyView.emptyView(isEmpty: false)
-                }else if arr.count == 0{
-                    //展示emptyView
-                    self.classifyView.emptyView(isEmpty: true)
-                    self.emptyLabel.isHidden = false
                 }
             }else if (status == .failed){
-//                self.NetApiStatus = .apiError
+                self.network_type = .failed
+                self.tableView.reloadEmptyDataSet()
             }else if (status == .noNetwork){
-                
-//                self.NetApiStatus = .notNetwork
+                self.network_type = .noNetwork
+                self.tableView.reloadEmptyDataSet()
             }
+            
         }
-//
     }
 }
+//
+//  CNLiveRoundedRectView.swift
+//  metaCode
+//
+//  Created by zx on 2023/11/14.
+//
+
+import Foundation
+import CoreGraphics
+
+let DS_RRV_ONE_PIXEL = 1.0 / UIScreen.main.scale
+
+class CNLiveRoundedRectView: UIView {
+    
+    //填充色
+    var _fillColor:UIColor?
+    var fillColor:UIColor?{
+        get{
+            _fillColor
+        }
+        set{
+            _fillColor = newValue
+            self.setNeedsDisplay()
+        }
+    }
+    //边框色
+    var _strokeColor:UIColor?
+    var strokeColor:UIColor?{
+        get{
+            _strokeColor
+        }
+        set{
+            _strokeColor = newValue
+            self.setNeedsDisplay()
+        }
+    }
+    //边框宽度
+    var _strokeWidth:CGFloat = 0.0
+    var strokeWidth:CGFloat{
+        get{
+            _strokeWidth
+        }
+        set{
+            _strokeWidth = newValue
+            self.setNeedsDisplay()
+        }
+    }
+    
+    //圆角度数 默认0
+    var _radius:CGFloat = 0.0
+    var radius:CGFloat{
+        get{
+            _radius
+        }
+        set{
+            _radius = newValue
+            self.setNeedsDisplay()
+        }
+    }
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        self.backgroundColor = .clear
+    }
+
+    override var frame:CGRect{
+        didSet {
+            let newFrame = frame
+            super.frame = newFrame
+            self.setNeedsDisplay()
+        }
+    }
+
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+
+    override func draw(_ rect: CGRect) {
+        super.draw(rect)
+        if ((self.strokeColor != nil && self.strokeColor?.cgColor != UIColor.clear.cgColor) && ( self.fillColor != nil && self.fillColor?.cgColor != UIColor.clear.cgColor))
+        {
+            let fpath = UIBezierPath(roundedRect: self.bounds, cornerRadius: self.radius)
+            self.fillColor?.setFill()
+            fpath.fill()
+            let lineWidth = self.strokeWidth == 0 ? DS_RRV_ONE_PIXEL : self.strokeWidth
+            let fx = lineWidth
+            let fy = lineWidth
+            let fwidth = self.width - fx*2
+            let fheight = self.height - fy*2
+            let spath = UIBezierPath(roundedRect: CGRect(x: fx, y: fy, width: fwidth, height: fheight), cornerRadius: self.radius-lineWidth)
+            spath.lineWidth = lineWidth
+            self.strokeColor?.setStroke()
+            spath.stroke()
+        }else if ((self.strokeColor != nil && self.strokeColor?.cgColor != UIColor.clear.cgColor) && (self.fillColor == nil || self.fillColor?.cgColor == UIColor.clear.cgColor)) {
+            UIColor.clear.setFill()
+            let lineWidth = self.strokeWidth == 0 ? DS_RRV_ONE_PIXEL : self.strokeWidth
+            let x = lineWidth
+            let y = lineWidth
+            let width = self.width - x*2
+            let height = self.height - y*2
+            let path = UIBezierPath(roundedRect: CGRect(x: x, y: y, width: width, height: height), cornerRadius: self.radius-lineWidth)
+            path.lineWidth = lineWidth
+            self.strokeColor?.setStroke()
+            path.stroke()
+        }else if ((self.strokeColor == nil || self.strokeColor?.cgColor == UIColor.clear.cgColor) && (self.fillColor != nil && self.fillColor?.cgColor != UIColor.clear.cgColor)){
+            UIColor.clear.setStroke()
+            let path = UIBezierPath(roundedRect: self.bounds, cornerRadius: self.radius)
+            self.fillColor?.setFill()
+            path.fill()
+        }else{
+            UIColor.clear.setStroke()
+            UIColor.clear.setFill()
+        }
+    }
+}
@@ -321,7 +321,7 @@ class CNLiveShopAddGoodsSingleView: UIView, UITextFieldDelegate {
     @objc func textDidChange(sender:UITextField) {
         if (sender == self.countTF) {
-            if (self.countTF.text?.count ?? 0 > 0 &&  self.countTF.text?.isPurnInt() ?? false) {
+            if (self.countTF.text?.count ?? 0 > 0 &&  (self.countTF.text?.isPurnInt() == false)) {
                 let count:Int = (self.countTF.text! as NSString).integerValue
                 if (count <= 1) {
                     self.subtractBtn.setImage(UIImage(named: "DS_main_unadd_count_n"), for: .normal)
@@ -7,8 +7,16 @@
 import Foundation
+typealias editClickBlock = (_ goodsModel:CNLiveShopGoodsListModel)->Void
+typealias operStateClickBlock = (_ goodsModel:CNLiveShopGoodsListModel , _ state:Int)->Void
 class CNLiveShopGoodsListCell: UITableViewCell {
+    // 操作上下架回调 state:1上架 2下架
+    var operStateBlock:operStateClickBlock?
+    //编辑按钮回调
+    var editBlock:editClickBlock?
+    //编辑库存按钮回调
+    var editCountBlock:editClickBlock?
     //goodsModel
     var _goodsModel : CNLiveShopGoodsListModel?
     var goodsModel : CNLiveShopGoodsListModel? {
@@ -29,8 +37,7 @@ class CNLiveShopGoodsListCell: UITableViewCell {
     lazy var editBtn: UIButton = {
         let  editBtn = UIButton(type: .custom)
         editBtn.frame = CGRect(x: KSreenWidth-15*2-28, y: 0, width: 15*2+28, height: 15*2+20)
-        editBtn.setTitle(" ", for: .normal)
-//        editBtn.setTitle("编辑", for: .normal)
+        editBtn.setTitle("编辑", for: .normal)
         editBtn.setTitleColor(HexColor("#333333"), for: .normal)
         editBtn.titleLabel?.font = Font_15
         editBtn.addTarget(self, action: #selector(editBtnAction), for: .touchUpInside)
@@ -92,6 +99,29 @@ class CNLiveShopGoodsListCell: UITableViewCell {
         editCountBtn.addTarget(self, action: #selector(editCountBtnAction), for: .touchUpInside)
         return editCountBtn
     }()
+    lazy var stateView :CNLiveSwitchView = {
+        let stateView = CNLiveSwitchView(frame: CGRect(x: KSreenWidth-80-17, y: 0, width: 80, height: 20))
+        stateView.radius = stateView.height/2
+        stateView.centerY = self.priceLabel.centerY
+        stateView.selectedBgColor = HexColor("#61C464")
+        stateView.selectedTitleColor = HexColor("#FFFFFF")
+        stateView.unselectedBgColor = HexColor("#F0F0F0")
+        stateView.unselectedTitleColor = HexColor("#999999")
+        stateView.titleFont = Font_11
+        stateView.titles = ["下架","上架"]
+        stateView.switchBlock = {index in
+            var state = 2
+            if index == 0{
+                state = 2
+            }else{
+                state = 1
+            }
+            if ((self.operStateBlock) != nil) {
+                self.operStateBlock!(self.goodsModel!,state)
+            }
+        }
+        return stateView
+    }()
     override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
         super.init(style: style, reuseIdentifier: reuseIdentifier)
@@ -104,7 +134,8 @@ class CNLiveShopGoodsListCell: UITableViewCell {
         contentView.addSubview(self.priceLabel)
         contentView.addSubview(self.bottomLineView)
         contentView.addSubview(self.countLabel)
-//        contentView.addSubview(self.editCountBtn)
+        contentView.addSubview(self.editCountBtn)
+        contentView.addSubview(self.stateView)
     }
@@ -119,18 +150,26 @@ class CNLiveShopGoodsListCell: UITableViewCell {
         self.priceLabel.text = "¥"+(model.price ?? "0.00")
         if model.state == 2{
             //设置 上架
+            self.stateView.selectIndex = 1
         }else{
             //设置 下架
+            self.stateView.selectIndex = 0
         }
         self.countLabel.text = "库存: "+(model.count ?? "0")
     }
     // MARK: - BtnAction
     @objc func editBtnAction(){
-        
+        if ((self.editBlock) != nil) {
+            self.editBlock!(self.goodsModel!)
+        }
     }
     @objc func editCountBtnAction(){
-        
+        if ((self.editCountBlock) != nil) {
+            self.editCountBlock!(self.goodsModel!)
+        }
     }
+//    operStateBlock
+    
 }
@@ -3,67 +3,146 @@
 //  metaCode
 //
 //  Created by zx on 2023/11/6.
-//
+//  商品管理 - 顶部分类筛选
 import Foundation
-class CNLiveShopGoodsListClassifyView: UIView {
+//分类的每个小块
+class CNLiveClassifyItem: NSObject {
+    var title:String?
+    var image:UIImage?
-    //最新
-    lazy var lastestBtn: UIButton = {
-        let lastestBtn = UIButton(type: .custom)
-        lastestBtn.frame = CGRect(x: 0, y: 0, width: KSreenWidth*0.5, height: self.height)
-        lastestBtn.setTitle("最新", for: .normal)
-        lastestBtn.setTitle("最新", for: .selected)
-        lastestBtn.titleLabel?.font = Font_14
-        lastestBtn.setTitleColor(HexColor("#999999"), for: .normal)
-        lastestBtn.setTitleColor(HexColor("#FC1541"), for: .selected)
-        lastestBtn.addTarget(self, action: #selector(lastestBtnAction), for: .touchUpInside)
-        return lastestBtn
-    }()
+    init(itemTitle:String?,itemImage:UIImage?){
+        super.init()
+        self.title = itemTitle
+        self.image = itemImage
+    }
+}
+
+///排序类型
+enum CNLiveGoodsManagerClassifyType:Int {
+    ///按最新上架排序
+    case newest,
+    ///按价格从底到高排序
+    priceMin,
+    ///按价格从高到底排序
+    priceMax
+}
+
+typealias classifyClickBlock = (_ classifyType:CNLiveGoodsManagerClassifyType)->Void
+
+protocol CNLiveGoodsManagerClassifyViewDelegate:NSObjectProtocol{
+    /// 已经选中某个item
+    /// @param type 类型
+    func shopGoodsManagerClassifyViewDidSeleted(type:CNLiveGoodsManagerClassifyType)
+}
+
+class CNLiveShopGoodsListClassifyView: UIView {
-    //价格 后面再完善
-    lazy var priceBtn: UIButton = {
-        let priceBtn = UIButton(type: .custom)
-        priceBtn.frame = CGRect(x: KSreenWidth*0.5, y: 0, width: KSreenWidth*0.5, height: self.height)
-        priceBtn.setTitle("价格", for: .normal)
-        priceBtn.setTitle("价格", for: .selected)
-        priceBtn.titleLabel?.font = Font_14
-        priceBtn.setTitleColor(HexColor("#999999"), for: .normal)
-        priceBtn.setTitleColor(HexColor("#FC1541"), for: .selected)
-        priceBtn.addTarget(self, action: #selector(priceBtnAction), for: .touchUpInside)
-        return priceBtn
-    }()
+    weak var delegate:CNLiveGoodsManagerClassifyViewDelegate?
+    ///当前选择的按钮
+    var seletedBtn = UIButton()
+    var itemArray:Array<CNLiveClassifyItem> = []
+    var type:CNLiveGoodsManagerClassifyType = .newest
+    lazy var scrollView :UIScrollView = {
+        let scrollView = UIScrollView(frame: CGRect(x: 0, y: 0, width: KSreenWidth, height: 40))
+        scrollView.showsVerticalScrollIndicator = false
+        scrollView.showsHorizontalScrollIndicator = false
+        return scrollView
+    }()
-    override init(frame: CGRect) {
+    required init(frame: CGRect ,itemArray:Array<CNLiveClassifyItem>) {
         super.init(frame: frame)
+        self.backgroundColor = .white
+        self.itemArray = itemArray
         self.setUI()
     }
     func setUI(){
-        self.addSubview(self.lastestBtn)
-//        self.addSubview(self.priceBtn)
-        self.lastestBtn.isSelected = true
+        self.addSubview(self.scrollView)
+        //底部灰色线条
+        let bottomLine = UILabel.init(frame: CGRectMake(0, 43, KSreenWidth, 1))
+        bottomLine.backgroundColor = HexColor("#e4e4e4")
+        self.addSubview(bottomLine)
+        
+        var itemW:CGFloat = 0.0
+        let itemH:CGFloat = self.scrollView.height
+        //根据最多itemArray的个数计算item显示的宽度，最多显示4个
+        if (self.itemArray.count > 4) {
+            itemW = KSreenWidth / 4
+        }else{
+            itemW = KSreenWidth / CGFloat(self.itemArray.count)
+        }
+        for i in 0..<self.itemArray.count {
+            let item = self.itemArray[i]
+            
+            let btn = UIButton(type: .custom)
+            btn.tag = i
+            btn.frame = CGRect(x: itemW * CGFloat(i), y: 0, width: itemW, height: itemH)
+            btn.setupButtonImageAndTitlePossitionWith(padding: 4, style: .left)
+            btn.setTitle(item.title, for: .normal)
+            btn.setTitleColor(HexColor("#999999"), for: .normal)
+            btn.setTitleColor(HexColor("#FC1541"), for: .selected)
+            btn.titleLabel?.font = Font_14
+            btn.imageEdgeInsets = UIEdgeInsets(top: 0, left: 4, bottom: 0, right: 0)
+            if (item.image != nil){
+                btn.setImage(item.image, for: .normal)
+            }
+            btn.addTarget(self, action: #selector(btnAction(_:)), for: .touchUpInside)
+            self.scrollView.addSubview(btn)
+            //默认第一个选中
+            if (i == 0) {
+                btn.isSelected = true
+                self.seletedBtn = btn
+            }
+            /**添加 btn 之间分割线*/
+            if (i < self.itemArray.count-1) {
+                let line = UIView(frame: CGRect(x: btn.right-1, y: 12, width: 1, height: 20))
+                line.backgroundColor = HexColor("#e6e6e6")
+                self.scrollView.addSubview(line)
+            }
+            
+            //更新scrollView 的 contentSize
+            if (i == self.itemArray.count-1) {
+                self.scrollView.contentSize = CGSize(width: btn.right, height: 40)
+            }
+        }
     }
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
-    public func emptyView(isEmpty:Bool){
-        //后面替换成其他
-        self.lastestBtn.isHidden = isEmpty
+    @objc func btnAction(_ btn: UIButton){
+        self.seletedBtn.isSelected = false
+        btn.isSelected = true
+        let item = self.itemArray[btn.tag]
+        if (item.title == "价格" && self.seletedBtn.titleLabel?.text == "价格"){
+            //切换价格排序规则
+            if self.type == .priceMin{
+                self.type = .priceMax
+                btn.setImage(UIImage(named: "DS_goods_manager_pirce_max"), for: .selected)
+            }else{
+                self.type = .priceMin
+                btn.setImage(UIImage(named: "DS_goods_manager_pirce_min"), for: .selected)
+            }
+            self.delegate?.shopGoodsManagerClassifyViewDidSeleted(type: self.type)
+        }else if (item.title == "价格" && self.seletedBtn.titleLabel?.text != "价格"){
+            self.type = .priceMin
+            btn.setImage(UIImage(named: "DS_goods_manager_pirce_min"), for: .selected)
+            self.delegate?.shopGoodsManagerClassifyViewDidSeleted(type: self.type)
+            
+            
+        }else if (btn.tag == 0 &&  self.seletedBtn.tag != 0){
+            self.type = .newest
+            self.delegate?.shopGoodsManagerClassifyViewDidSeleted(type: self.type)
+        }else if(btn.tag == 0 &&  self.seletedBtn.tag == 0)
+        {
+            //再次选中了最新按钮不做处理
+        }
-    }
-    
-    @objc func priceBtnAction(){
-        self.priceBtn.isSelected = true
-        self.lastestBtn.isSelected = false
-    }
-    @objc func lastestBtnAction(){
-        self.lastestBtn.isSelected = true
-        self.priceBtn.isSelected = false
+        self.seletedBtn = btn
     }
 }
+//
+//  CNLiveSwitchView.swift
+//  metaCode
+//
+//  Created by zx on 2023/11/14.
+//  商品列表 - 上架,下架Switch
+
+import Foundation
+
+typealias switchClickBlock = (_ index:Int)->Void
+
+class CNLiveSwitchView: UIView {
+    //开关点击回调
+    var switchBlock:switchClickBlock?
+    
+    /// 未选中背景颜色 无默认
+    var _unselectedBgColor:UIColor?
+    var unselectedBgColor:UIColor?{
+        get{
+            _unselectedBgColor
+        }
+        set{
+            _unselectedBgColor = newValue
+            self.resetUI()
+        }
+    }
+    /// 选中背景颜色 无默认
+    var _selectedBgColor:UIColor?
+    var selectedBgColor:UIColor?{
+        get{
+            _selectedBgColor
+        }
+        set{
+            _selectedBgColor = newValue
+            self.resetUI()
+        }
+    }
+    /// 未选中颜色 无默认
+    var _unselectedTitleColor:UIColor?
+    var unselectedTitleColor:UIColor?{
+        get{
+            _unselectedTitleColor
+        }
+        set{
+            _unselectedTitleColor = newValue
+            self.resetUI()
+        }
+    }
+    /// 选中颜色 无默认
+    var _selectedTitleColor:UIColor?
+    var selectedTitleColor:UIColor?{
+        get{
+            _selectedTitleColor
+        }
+        set{
+            _selectedTitleColor = newValue
+            self.resetUI()
+        }
+    }
+    /// 标题 无默认
+    var _titleFont:UIFont?
+    var titleFont:UIFont?{
+        get{
+            _titleFont
+        }
+        set{
+            _titleFont = newValue
+            self.resetUI()
+        }
+    }
+    /// 选中的索引 默认0
+    var _selectIndex:Int = 0
+    var selectIndex:Int{
+        get{
+            _selectIndex
+        }
+        set{
+            _selectIndex = newValue
+            self.resetUI()
+        }
+    }
+    /// 标题数组 无默认
+    var _titles:NSArray = []
+    var titles:NSArray{
+        get{
+            _titles
+        }
+        set{
+            _titles = newValue
+            self.resetUI()
+        }
+    }
+    /// 角度 无默认
+    var _radius:CGFloat = 0.0
+    var radius:CGFloat{
+        get{
+            _radius
+        }
+        set{
+            _radius = newValue
+            self.resetUI()
+        }
+    }
+    lazy var bgView :CNLiveRoundedRectView = {
+        let bgView = CNLiveRoundedRectView()
+        return bgView
+    }()
+
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        self.backgroundColor = .clear
+        self.setUI()
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    override func layoutSubviews() {
+        super.layoutSubviews()
+        self.bgView.frame = CGRect(x: 0, y: 0, width: self.width, height: self.height)
+        self.bgView.layer.cornerRadius = self.height/2
+        self.bgView.clipsToBounds = true
+        let titlesCount = CGFloat(self.titles.count)
+        let width = self.width/titlesCount
+        for i in 0..<self.titles.count {
+            let titleBgView = self.bgView.viewWithTag((i+1)*100+1) as! CNLiveRoundedRectView
+            let titleBtn = self.bgView.viewWithTag((i+1)*100+2) as! UIButton
+            titleBgView.frame = CGRect(x: CGFloat(i)*width, y: 0, width: width, height: self.height)
+            titleBtn.frame = CGRect(x: CGFloat(i)*width, y: 0, width: width, height: self.height)
+        }
+    }
+    
+    func setUI(){
+        self.bgView = CNLiveRoundedRectView(frame: CGRectZero)
+        self.bgView.backgroundColor = UIColor(hue:0.00, saturation:0.00, brightness:0.94, alpha:1.00)
+        self.addSubview(self.bgView)
+    }
+    
+    func resetUI(){
+        self.bgView.subviews.forEach {$0.removeFromSuperview()}
+        for i in 0..<self.titles.count {
+            let titleBgView = CNLiveRoundedRectView.init()
+            titleBgView.tag = (i+1)*100+1
+            titleBgView.radius = self.radius
+            self.bgView.addSubview(titleBgView)
+            
+            let titleBtn = UIButton(type: .custom)
+            titleBtn.setTitle((self.titles[i] as! String), for: .normal)
+            titleBtn.titleLabel?.font = self.titleFont
+            titleBtn.addTarget(self, action: #selector(titleBtnClick), for: .touchUpInside)
+            titleBtn.tag = (i+1)*100+2
+            self.bgView.addSubview(titleBtn)
+            
+            if self.selectIndex == i{
+                titleBgView.fillColor = self.selectedBgColor
+                titleBtn.setTitleColor(self.selectedTitleColor, for: .normal)
+            }else{
+                titleBgView.fillColor =  self.unselectedBgColor
+                titleBtn.setTitleColor(self.unselectedTitleColor, for: .normal)
+            }
+        }
+        self.layoutSubviews()
+    }
+    
+    @objc func titleBtnClick(sender:UIButton){
+        let selectIndex = (sender.tag-2)/100-1
+        if self.selectIndex == selectIndex {
+            return
+        }
+        if ((self.switchBlock) != nil) {
+            self.switchBlock!(selectIndex)
+        }
+    }
+}
@@ -9,20 +9,19 @@ import Foundation
 import CNLiveRequestBastKit
 class CNLiveShopGoodListViewModel:NSObject{
-    /// 商品列表获取
+    /// 请求店铺商品列表
     /// - Parameters:
     ///   - shopId:id
     ///   - sortType:排序类型 1新品 2价格从底到高 3 价格从高到底
     ///   - page:页数 1
-    static func requestGoodsList(shopId:String?,sortType:String?,page:String?,resultBlock: @escaping downSlideResultBlock) {
+    static func requestGoodsList(shopId:String?,sortType:String?,page:NSInteger?,resultBlock: @escaping downSlideResultBlock) {
         let param = NSMutableDictionary()
         param.setValue(shopId, forKey: "shop_id")
         param.setValue(sortType ?? "1", forKey: "type")
         param.setValue("0", forKey: "state")
         param.setValue("", forKey: "category_id")
         param.setValue("", forKey: "keyword")
-        param.setValue(page ?? "1", forKey: "page")
-
+        param.setValue("\(page ?? 1)", forKey: "page")
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
@@ -44,4 +43,54 @@ class CNLiveShopGoodListViewModel:NSObject{
             }
         }
     }
+    
+    /// 商品单个属性修改
+    /// @param shopId 商家id
+    /// @param goodsId 商品id
+    /// @param type 1修改库存 2修改排序
+    /// @param value 修改的值
+    /// @param result 结果
+    static func postGoodsEditAttrWithShopId(shopId:String,goodsId:String,type:Int,value:String,resultBlock: @escaping downSlideResultBlock){
+        
+        let param = NSMutableDictionary()
+        param.setValue(shopId, forKey: "shop_id")
+        param.setValue(goodsId, forKey: "id")
+        param.setValue("\(type)", forKey: "type")
+        param.setValue(value, forKey: "value")
+        
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.setupDSRequest(true)
+        CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseWjjBUrl+"/api/v1/goodsEditAttr", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
+            hiddenLoading()
+            if (error == nil) {
+                resultBlock(result as Any,.success)
+            }else{
+                resultBlock(NSNull(),.failed)
+            }
+        }
+    }
+    
+    /// 商品上下架删除
+    /// @param goodsId 商品id
+    /// @param state 传3为删除 不传为上下架
+    /// @param result 结果
+    static func postChangeGoodsStateWithGoodsId(goodsId:String,state:String,resultBlock: @escaping downSlideResultBlock){
+        let param = NSMutableDictionary()
+        param.setValue(state, forKey: "state")
+        param.setValue(goodsId, forKey: "id")
+        
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.setupDSRequest(true)
+        CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseWjjBUrl+"/api/v1/changeGoodsState", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
+            hiddenLoading()
+            if (error == nil) {
+                resultBlock(result as Any,.success)
+            }else{
+                resultBlock(NSNull(),.failed)
+            }
+        }
+    }
+    
 }
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "DS_goods_manager_pirce_default@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "DS_goods_manager_pirce_default@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "DS_goods_manager_pirce_max@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "DS_goods_manager_pirce_max@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "DS_goods_manager_pirce_min@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "DS_goods_manager_pirce_min@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}