商品管理-新增商品model

张旭
1 parent 095bdd4e
Showing 13 changed files with 598 additions and 74 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Environment/CNLiveEnvironment.swift
metaCode/Classes/Main/HomePage/Controller/GoodsManager/CNLiveShopNewProductController.swift
metaCode/Classes/Main/HomePage/Controller/GoodsManager/CNLiveShopProductManagerController.swift
metaCode/Classes/Main/HomePage/Controller/商品管理/CNLiveShopNewProductController.swift
metaCode/Classes/Main/HomePage/Controller/商品管理/CNLiveShopProductManagerController.swift
metaCode/Classes/Main/HomePage/View/GoodsList/CNLiveShopGoodsListCell.swift
metaCode/Classes/Main/HomePage/View/GoodsList/CNLiveShopGoodsListClassifyView.swift
metaCode/Classes/Main/HomePage/ViewModel/CNLiveShopConsoleViewModel.swift
metaCode/Classes/Main/HomePage/ViewModel/CNLiveShopDetailViewModel.swift
metaCode/Classes/Main/HomePage/ViewModel/GoodsManager/CNLiveShopGoodListViewModel.swift
metaCode/Classes/Main/Model/GoodsManager/CNLiveShopAddEditGoodsModel.swift
metaCode/Classes/Main/Model/GoodsManager/CNLiveShopGoodsListModel.swift
@@ -16,6 +16,11 @@
 		19565EC22AF616CA007D6727 /* CNLiveShopDetailOrderAssetCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19565EC12AF616CA007D6727 /* CNLiveShopDetailOrderAssetCell.swift */; };
 		19565EC52AF8AD1F007D6727 /* CNLiveShopProductManagerController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19565EC42AF8AD1F007D6727 /* CNLiveShopProductManagerController.swift */; };
 		19565EC72AF8AD38007D6727 /* CNLiveShopNewProductController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19565EC62AF8AD38007D6727 /* CNLiveShopNewProductController.swift */; };
+		19565EC92AF8BEC6007D6727 /* CNLiveShopGoodListViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19565EC82AF8BEC6007D6727 /* CNLiveShopGoodListViewModel.swift */; };
+		19565ECB2AF8C59C007D6727 /* CNLiveShopGoodsListModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19565ECA2AF8C59C007D6727 /* CNLiveShopGoodsListModel.swift */; };
+		19565ECD2AF8D256007D6727 /* CNLiveShopGoodsListClassifyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19565ECC2AF8D256007D6727 /* CNLiveShopGoodsListClassifyView.swift */; };
+		19565ECF2AF8D8F6007D6727 /* CNLiveShopGoodsListCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19565ECE2AF8D8F6007D6727 /* CNLiveShopGoodsListCell.swift */; };
+		19565ED42AF9FEB4007D6727 /* CNLiveShopAddEditGoodsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19565ED32AF9FEB4007D6727 /* CNLiveShopAddEditGoodsModel.swift */; };
 		19BB1FDF2AEA3A450094D962 /* CNSlideBaseNavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19BB1FDE2AEA3A450094D962 /* CNSlideBaseNavigationController.swift */; };
 		19BB1FE12AEB5C220094D962 /* CNLiveShopConsoleController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19BB1FE02AEB5C220094D962 /* CNLiveShopConsoleController.swift */; };
 		19BB1FE32AEB8B7C0094D962 /* CNLiveShopConsoleViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19BB1FE22AEB8B7C0094D962 /* CNLiveShopConsoleViewModel.swift */; };
@@ -163,6 +168,11 @@
 		19565EC12AF616CA007D6727 /* CNLiveShopDetailOrderAssetCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopDetailOrderAssetCell.swift; sourceTree = "<group>"; };
 		19565EC42AF8AD1F007D6727 /* CNLiveShopProductManagerController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopProductManagerController.swift; sourceTree = "<group>"; };
 		19565EC62AF8AD38007D6727 /* CNLiveShopNewProductController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopNewProductController.swift; sourceTree = "<group>"; };
+		19565EC82AF8BEC6007D6727 /* CNLiveShopGoodListViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopGoodListViewModel.swift; sourceTree = "<group>"; };
+		19565ECA2AF8C59C007D6727 /* CNLiveShopGoodsListModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopGoodsListModel.swift; sourceTree = "<group>"; };
+		19565ECC2AF8D256007D6727 /* CNLiveShopGoodsListClassifyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopGoodsListClassifyView.swift; sourceTree = "<group>"; };
+		19565ECE2AF8D8F6007D6727 /* CNLiveShopGoodsListCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopGoodsListCell.swift; sourceTree = "<group>"; };
+		19565ED32AF9FEB4007D6727 /* CNLiveShopAddEditGoodsModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopAddEditGoodsModel.swift; sourceTree = "<group>"; };
 		19BB1FDE2AEA3A450094D962 /* CNSlideBaseNavigationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNSlideBaseNavigationController.swift; sourceTree = "<group>"; };
 		19BB1FE02AEB5C220094D962 /* CNLiveShopConsoleController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopConsoleController.swift; sourceTree = "<group>"; };
 		19BB1FE22AEB8B7C0094D962 /* CNLiveShopConsoleViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopConsoleViewModel.swift; sourceTree = "<group>"; };
@@ -321,18 +331,45 @@
 /* End PBXFrameworksBuildPhase section */
 /* Begin PBXGroup section */
-		19565EC32AF8ACC2007D6727 /* 商品管理 */ = {
+		19565EC32AF8ACC2007D6727 /* GoodsManager */ = {
 			isa = PBXGroup;
 			children = (
 				19565EC42AF8AD1F007D6727 /* CNLiveShopProductManagerController.swift */,
 				19565EC62AF8AD38007D6727 /* CNLiveShopNewProductController.swift */,
 			);
-			path = "商品管理";
+			path = GoodsManager;
+			sourceTree = "<group>";
+		};
+		19565ED02AF8D904007D6727 /* GoodsList */ = {
+			isa = PBXGroup;
+			children = (
+				19565ECC2AF8D256007D6727 /* CNLiveShopGoodsListClassifyView.swift */,
+				19565ECE2AF8D8F6007D6727 /* CNLiveShopGoodsListCell.swift */,
+			);
+			path = GoodsList;
+			sourceTree = "<group>";
+		};
+		19565ED12AF9FE56007D6727 /* GoodsManager */ = {
+			isa = PBXGroup;
+			children = (
+				19565EC82AF8BEC6007D6727 /* CNLiveShopGoodListViewModel.swift */,
+			);
+			path = GoodsManager;
+			sourceTree = "<group>";
+		};
+		19565ED22AF9FE67007D6727 /* GoodsManager */ = {
+			isa = PBXGroup;
+			children = (
+				19565ECA2AF8C59C007D6727 /* CNLiveShopGoodsListModel.swift */,
+				19565ED32AF9FEB4007D6727 /* CNLiveShopAddEditGoodsModel.swift */,
+			);
+			path = GoodsManager;
 			sourceTree = "<group>";
 		};
 		19BB1FE42AEB93850094D962 /* Model */ = {
 			isa = PBXGroup;
 			children = (
+				19565ED22AF9FE67007D6727 /* GoodsManager */,
 				1926C2902AE0FD4500C71DC3 /* CNLiveDownSlideModel.swift */,
 				19BB1FE52AEB93B80094D962 /* CNLiveShopUserInfoModel.swift */,
 				19BB1FE72AECAD060094D962 /* CNLiveShopConsoleModel.swift */,
@@ -689,6 +726,7 @@
 		7C83B43C2A52B899004BF4A4 /* ViewModel */ = {
 			isa = PBXGroup;
 			children = (
+				19565ED12AF9FE56007D6727 /* GoodsManager */,
 				7C83B43D2A52B8BA004BF4A4 /* CNHomePageViewModel.swift */,
 				1926C28E2AE0D76C00C71DC3 /* CNLiveDownSlideViewModel.swift */,
 				19BB1FE22AEB8B7C0094D962 /* CNLiveShopConsoleViewModel.swift */,
@@ -713,6 +751,7 @@
 		7CD675232A26F8F8008354C1 /* View */ = {
 			isa = PBXGroup;
 			children = (
+				19565ED02AF8D904007D6727 /* GoodsList */,
 				7CD675372A2740B0008354C1 /* CNUpSlideViewRemindView.swift */,
 				7CD6753B2A2740B0008354C1 /* CNDownSlideView.swift */,
 				7CD675382A2740B0008354C1 /* CNMainView.swift */,
@@ -739,7 +778,7 @@
 		7CD6754D2A2840B9008354C1 /* Controller */ = {
 			isa = PBXGroup;
 			children = (
-				19565EC32AF8ACC2007D6727 /* 商品管理 */,
+				19565EC32AF8ACC2007D6727 /* GoodsManager */,
 				19BB1FDE2AEA3A450094D962 /* CNSlideBaseNavigationController.swift */,
 				7CD6754E2A2840B9008354C1 /* CNMetaCodeHomePageController.swift */,
 				19123FC02ABC11170075C883 /* CNWebViewController.swift */,
@@ -1055,6 +1094,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				19565EC92AF8BEC6007D6727 /* CNLiveShopGoodListViewModel.swift in Sources */,
 				19BB1FE82AECAD060094D962 /* CNLiveShopConsoleModel.swift in Sources */,
 				19BB1FEE2AF0E1EC0094D962 /* CNLiveShopDetailViewModel.swift in Sources */,
 				19F1C2332AB5728B0083D06C /* CNIDCardView.swift in Sources */,
@@ -1066,6 +1106,7 @@
 				7989B5C72A4BDC7200A19B10 /* CNLiveMineEarnListViewController.swift in Sources */,
 				79396EF12A31C21B0053E1AF /* CNLiveInfoShowViewController.swift in Sources */,
 				192336EB2AD9224300D47CD4 /* CNUpSlideViewController.swift in Sources */,
+				19565ECB2AF8C59C007D6727 /* CNLiveShopGoodsListModel.swift in Sources */,
 				7963989D2A260E6200D045EB /* CNLiveBaseViewController.swift in Sources */,
 				798A44FB2A30999900815935 /* CNLiveAlertTool.swift in Sources */,
 				19565EC02AF4DE0E007D6727 /* CNLiveShopDetailBtnsCell.swift in Sources */,
@@ -1075,8 +1116,10 @@
 				19D2CE632AE8B65D00691757 /* CNLiveDownSlideTool.swift in Sources */,
 				790B1FB82A41B6A60074CF00 /* CNLiveMineMessageViewController.swift in Sources */,
 				19BB202B2AF382150094D962 /* CNLiveAdaptTool.swift in Sources */,
+				19565ECD2AF8D256007D6727 /* CNLiveShopGoodsListClassifyView.swift in Sources */,
 				798A44F22A30674200815935 /* CNLiveMineSubBodyListView.swift in Sources */,
 				799172382AF090CD00DC01A8 /* CNLiveShopBodyListView.swift in Sources */,
+				19565ED42AF9FEB4007D6727 /* CNLiveShopAddEditGoodsModel.swift in Sources */,
 				790D01822A2D88FC00C5978D /* CNLiveConfigMacro.swift in Sources */,
 				19CC4D4B2ADD086F00308E2A /* CNUpSlideDetailViewController.swift in Sources */,
 				7C83B4402A52BB2B004BF4A4 /* CNGlobalEnum.swift in Sources */,
@@ -1167,6 +1210,7 @@
 				7C4931292A2D8BA8000E44B4 /* CNLiveBaseTabBarViewController.swift in Sources */,
 				79F4B1162A32B96B00993C03 /* CNLiveMineInfoViewController.swift in Sources */,
 				7CD6753F2A2740B0008354C1 /* CNDownSlideViewRemindView.swift in Sources */,
+				19565ECF2AF8D8F6007D6727 /* CNLiveShopGoodsListCell.swift in Sources */,
 				7CD6753C2A2740B0008354C1 /* CNUpSlideViewRemindView.swift in Sources */,
 				19BB1FEC2AF0AB8E0094D962 /* CNLiveDownShopDetailController.swift in Sources */,
 				798A44E82A30134400815935 /* CNLiveMineHeaderView.swift in Sources */,
@@ -31,8 +31,6 @@ let APPBaseWjjUrl: String = CNLiveEnvironmentManager.shared.base_wjj_url
 let APPBaseWjjBUrl: String = CNLiveEnvironmentManager.shared.base_wjj_b_url
 /// 网家家内电商接口
 let APPBaseWjjShopUrl: String = CNLiveEnvironmentManager.shared.base_mjj_shop_url
-/// 商家版电商接口
-let APPBaseShopUrl: String = CNLiveEnvironmentManager.shared.base_shop_url
 /// cms接口
 let APPBaseCMSUrl: String = CNLiveEnvironmentManager.shared.base_cms_url
 ///当前APP的环境
@@ -80,8 +78,6 @@ class CNLiveEnvironmentManager: NSObject{
     var img_token_url: String
     /// 网家家电商域名请求
     var base_mjj_shop_url: String
-    /// 电商域名请求
-    var base_shop_url: String
     /// 元码webViewUA设置
     var base_web_UA: String = "yuanma"
     /// cms域名请求
@@ -105,7 +101,6 @@ class CNLiveEnvironmentManager: NSObject{
         self.base_wjj_url = ""
         self.base_wjj_b_url = ""
         self.base_mjj_shop_url = ""
-        self.base_shop_url = ""
         self.base_cms_url = ""
         self.currentEnvironment = .development
     }
@@ -148,7 +143,6 @@ class CNLiveEnvironmentManager: NSObject{
         self.base_wjj_b_url = "https://managemall.cnlive.com:8080"
         self.base_wjj_url = "https://apiwjj.cnlive.com"
         self.base_mjj_shop_url = "https://manageshop.cnlive.com"
-        self.base_shop_url = "https://managemall.cnlive.com:8080"
         self.base_cms_url = "https://cmsapi.cnlive.com"
     }
     //testFlight 环境配置
@@ -166,7 +160,6 @@ class CNLiveEnvironmentManager: NSObject{
         self.base_wjj_b_url = "https://managemall.cnlive.com:8080"
         self.base_wjj_url = "https://apiwjj.cnlive.com"
         self.base_mjj_shop_url = "https://manageshop.cnlive.com"
-        self.base_shop_url = "https://managemall.cnlive.com:8080"
         self.base_cms_url = "https://cmsapi.cnlive.com"
     }
     //production 生产环境配置
@@ -184,7 +177,6 @@ class CNLiveEnvironmentManager: NSObject{
         self.base_wjj_b_url = "https://managemall.cnlive.com:8080"
         self.base_wjj_url = "https://apiwjj.cnlive.com"
         self.base_mjj_shop_url = "https://manageshop.cnlive.com"
-        self.base_shop_url = "https://managemall.cnlive.com:8080"
         self.base_cms_url = "https://cmsapi.cnlive.com"
     }
+//
+//  CNLiveShopNewProductController.swift
+//  metaCode
+//
+//  Created by zx on 2023/11/6.
+//  新增商品
+
+import Foundation
+
+///
+enum CNLiveShopGoodsAddEditType{
+   
+    /// 新增商品
+    case add
+    /// 编辑商品
+    case edit
+}
+
+class CNLiveShopNewProductController:CNLiveBaseViewController{
+    
+    var type:CNLiveShopGoodsAddEditType = .add
+    lazy var bgScrollView :UIScrollView = {
+        let bgScrollView = UIScrollView(frame: CGRect(x: 0, y: KNavigationHeight, width: KSreenWidth, height: KSreenHeight-KNavigationHeight-KTabBarHeight))
+        bgScrollView.showsVerticalScrollIndicator = false
+        return bgScrollView
+    }()
+
+    lazy var dataModel: CNLiveShopAddEditGoodsModel = {
+        let dataModel = CNLiveShopAddEditGoodsModel()
+        return dataModel
+    }()
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        self.setUI()
+        self.bgScrollView.backgroundColor = .red
+        self.view.addSubview(self.bgScrollView)
+        self.type = .add
+    }
+    func setUI(){
+        navigationBarHidden = false
+        titleName = "新增商品"
+        
+    }
+    func initBgScrollViewContentView(){
+        if self.type == .add{
+            self.dataModel.initDataSource()
+            self.dataModel.list
+        }else if self.type == .edit{
+            
+        }else{
+            
+        }
+        
+    }
+    
+}
+//
+//  CNLiveShopProductManagerController.swift
+//  metaCode
+//
+//  Created by zx on 2023/11/6.
+//  商品管理
+
+import Foundation
+
+class CNLiveShopProductManagerController:CNLiveBaseViewController, UITableViewDataSource, UITableViewDelegate{
+    
+    let kCNLiveShopGoodsListCellIdentifier = "kCNLiveShopGoodsListCellIdentifier"
+    
+    
+    // MARK: - 懒加载
+    ///数据源
+    lazy var dataArray: NSMutableArray = {
+        var dataArray = NSMutableArray()
+        return dataArray
+    }()
+    
+    lazy var classifyView: CNLiveShopGoodsListClassifyView = {
+        let classifyView = CNLiveShopGoodsListClassifyView(frame: CGRect(x: 0, y: KNavigationHeight, width: KSreenWidth, height: 44))
+        classifyView.backgroundColor = .white
+        return classifyView
+    }()
+    lazy var addBtn: UIButton = {
+        let addBtn = UIButton(type: .custom)
+        addBtn.frame = CGRect(x: 0, y: 0, width: 100, height:KNavigationHeight-KStatusBarHeight )
+        addBtn.addTarget(self, action: #selector(addBtnAction), for: .touchUpInside)
+        addBtn.setTitle("新增商品", for: .normal)
+        addBtn.setTitleColor(HexColor("#666666"), for: .normal)
+        return addBtn
+    }()
+    lazy var tableView : UITableView = {
+        let tableView = UITableView(frame: .zero, style: .plain)
+        tableView.dataSource = self
+        tableView.delegate = self
+        tableView.separatorStyle = .none
+        tableView.rowHeight = 167
+        tableView.register(CNLiveShopGoodsListCell.self, forCellReuseIdentifier: kCNLiveShopGoodsListCellIdentifier)
+        return tableView
+    }()
+        
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        self.setUI()
+        self.getGoodsListApi(page: "1")
+    }
+    func setUI(){
+        navigationBarHidden = false
+        titleName = "商品管理"
+        rightNavBtns = [self.addBtn]
+        self.view.addSubview(self.classifyView)
+        self.view.addSubview(tableView)
+        tableView.frame = CGRect(x: 0, y:self.classifyView.bottom , width: KSreenWidth, height: KSreenHeight - self.classifyView.bottom)
+    }
+    
+    // MARK: - UITableViewDelegate
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return self.dataArray.count
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        let goodsModel = self.dataArray[indexPath.row] as! CNLiveShopGoodsListModel
+        guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveShopGoodsListCellIdentifier) as? CNLiveShopGoodsListCell
+        else {
+            let cell = CNLiveShopGoodsListCell()
+            cell.goodsModel = goodsModel
+            return cell
+        }
+        
+        cell.goodsModel = goodsModel
+        return cell
+    }
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        
+        let goodsModel = self.dataArray[indexPath.row] as! CNLiveShopGoodsListModel
+        
+    }
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        return 167
+    }
+    
+    // MARK: - BtnAction
+    @objc func addBtnAction(){
+        
+        currentViewController()?.navigationController?.pushViewController(CNLiveShopNewProductController(), animated: true)
+    }
+    
+    //MARK: - 网络请求获取商品列表
+    func getGoodsListApi(page:String)
+    {
+        showLoading(message: "")
+        CNLiveShopGoodListViewModel.requestGoodsList(shopId: DSUserInfoManager.shared.dsUserInfo.id, sortType: "1", page: page) { result, status in
+            hiddenLoading()
+            if status == .success{
+                self.dataArray.addObjects(from: result as! [CNLiveShopGoodsListModel])
+                let newDataArray = NSMutableArray()
+                for goodsModel in self.dataArray {
+                    if let model = goodsModel as? CNLiveShopGoodsListModel{
+                        newDataArray.add(model)
+                    }
+                }
+                self.dataArray.removeAllObjects()
+                self.dataArray.addObjects(from: newDataArray as! [Any])
+                
+                self.tableView.reloadData()
+            }else if (status == .failed){
+//                self.NetApiStatus = .apiError
+            }else if (status == .noNetwork){
+                
+//                self.NetApiStatus = .notNetwork
+            }
+        }
+//
+    }
+}
-//
-//  CNLiveShopNewProductController.swift
-//  metaCode
-//
-//  Created by zx on 2023/11/6.
-//  新增商品
-
-import Foundation
-
-class CNLiveShopNewProductController:CNLiveBaseViewController{
-    
-}
-//
-//  CNLiveShopProductManagerController.swift
-//  metaCode
-//
-//  Created by zx on 2023/11/6.
-//  商品管理
-
-import Foundation
-
-class CNLiveShopProductManagerController:CNLiveBaseViewController{
-    
-//    lazy var navView: UIView = {
-//        let navView = UIView(frame: CGRect(x: 0, y: 0, width: KSreenWidth, height: KNavigationHeight))
-//        navView.backgroundColor = .white
-//        return navView
-//    }()
-//    lazy var titleLbl: UILabel = {
-//        let titleLbl = UILabel(frame: CGRect(x: KSreenWidth*0.5-100, y: KStatusBarHeight, width: 200, height: KNavigationHeight-KStatusBarHeight))
-//        titleLbl.text = "商品管理"
-//        titleLbl.font = Font_18
-//        titleLbl.textAlignment = .center
-//        titleLbl.textColor = HexColor("#333333")
-//        return titleLbl
-//    }()
-    
-    lazy var addBtn: UIButton = {
-        let addBtn = UIButton(type: .custom)
-        addBtn.frame = CGRect(x: 0, y: 0, width: 100, height:KNavigationHeight-KStatusBarHeight )
-        addBtn.addTarget(self, action: #selector(addBtnAction), for: .touchUpInside)
-        addBtn.setTitle("新增商品", for: .normal)
-        addBtn.setTitleColor(HexColor("#666666"), for: .normal)
-        return addBtn
-    }()
-        
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        self.setUI()
-    }
-    func setUI(){
-        navigationBarHidden = false
-        titleName = "商品管理"
-        rightNavBtns = [self.addBtn]
-    }
-    
-    // MARK: - BtnAction
-    @objc func addBtnAction(){
-        
-    }
-}
+//
+//  CNLiveShopGoodsListCell.swift
+//  metaCode
+//
+//  Created by zx on 2023/11/6.
+//
+
+import Foundation
+
+class CNLiveShopGoodsListCell: UITableViewCell {
+    
+    //goodsModel
+    var _goodsModel : CNLiveShopGoodsListModel?
+    var goodsModel : CNLiveShopGoodsListModel? {
+        get{
+            _goodsModel
+        }
+        set{
+            _goodsModel = newValue!
+            setupNewUI(model: _goodsModel!)
+        }
+    }
+    //MARK: - 懒加载
+    lazy var iconImgView :UIImageView = {
+        let iconImgView = UIImageView(frame: CGRect(x: 15, y: 15, width: 90, height: 90))
+        return iconImgView
+    }()
+    ///编辑按钮
+    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.setTitleColor(HexColor("#333333"), for: .normal)
+        editBtn.titleLabel?.font = Font_15
+        editBtn.addTarget(self, action: #selector(editBtnAction), for: .touchUpInside)
+        return editBtn
+    }()
+    ///标题
+    lazy var titleLabel: UILabel = {
+        let titleLabel = UILabel.init(frame: CGRectMake(self.iconImgView.right+15, 15, self.editBtn.left-self.iconImgView.right-15*2, 21))
+        titleLabel.textColor = HexColor("#333333")
+        titleLabel.textAlignment = .left
+        titleLabel.font = Font_15
+        titleLabel.adjustsFontSizeToFitWidth=true
+        titleLabel.text = "啊啊啊啊啊"
+        return titleLabel
+    }()
+    ///副标题
+    lazy var subTitleLabel: UILabel = {
+        let subTitleLabel = UILabel.init(frame: CGRectMake(self.iconImgView.right+15, self.editBtn.bottom, KSreenWidth-self.iconImgView.right-15*2, 18))
+        subTitleLabel.textColor = HexColor("#999999")
+        subTitleLabel.textAlignment = .left
+        subTitleLabel.font = Font_13
+        subTitleLabel.adjustsFontSizeToFitWidth=true
+        subTitleLabel.text = "啊啊啊啊"
+        return subTitleLabel
+    }()
+    ///价格
+    lazy var priceLabel: UILabel = {
+        let priceLabel = UILabel.init(frame: CGRectMake(self.iconImgView.right+15, self.subTitleLabel.bottom+19, KSreenWidth-80-17-15*2-self.iconImgView.right, 27))
+        priceLabel.textColor = HexColor("#FF3355")
+        priceLabel.textAlignment = .left
+        priceLabel.font = Font_19
+        priceLabel.adjustsFontSizeToFitWidth=true
+        priceLabel.text = "10000.00"
+        return priceLabel
+    }()
+    ///底部line
+    lazy var bottomLineView :UIView = {
+        let bottomLineView = UIView(frame: CGRect(x: 0, y: 167-5, width: KSreenWidth, height: 5))
+        bottomLineView.backgroundColor = UIColor(hue:0.00, saturation:0.00, brightness:0.98, alpha:1.00)
+        return bottomLineView
+    }()
+    ///库存
+    lazy var countLabel: UILabel = {
+        let countLabel = UILabel.init(frame: CGRectMake(15, self.iconImgView.bottom+15, KSreenWidth-58-15-15*2, self.bottomLineView.top-self.iconImgView.bottom-15))
+        countLabel.textColor = HexColor("#333333")
+        countLabel.textAlignment = .left
+        countLabel.font = Font_15
+        countLabel.adjustsFontSizeToFitWidth=true
+        countLabel.text = "库存:10000"
+        return countLabel
+    }()
+    ///编辑库存按钮
+    lazy var editCountBtn: UIButton = {
+        let  editCountBtn = UIButton(type: .custom)
+        editCountBtn.frame = CGRect(x: KSreenWidth-15-58, y: self.countLabel.top, width: 58, height: self.countLabel.height)
+        editCountBtn.setTitle("编辑库存", for: .normal)
+        editCountBtn.setTitleColor(HexColor("#61C464"), for: .normal)
+        editCountBtn.titleLabel?.font = Font_14
+        editCountBtn.addTarget(self, action: #selector(editCountBtnAction), for: .touchUpInside)
+        return editCountBtn
+    }()
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        self.selectionStyle = .none
+        contentView.backgroundColor = .white
+        contentView.addSubview(self.iconImgView)
+        contentView.addSubview(self.editBtn)
+        contentView.addSubview(self.titleLabel)
+        contentView.addSubview(self.subTitleLabel)
+        contentView.addSubview(self.priceLabel)
+        contentView.addSubview(self.bottomLineView)
+        contentView.addSubview(self.countLabel)
+        contentView.addSubview(self.editCountBtn)
+        
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    func setupNewUI(model:CNLiveShopGoodsListModel){
+        self.iconImgView.kf.setImage(with: URL(string: model.simg ?? ""))
+        self.titleLabel.text = model.title ?? ""
+        self.subTitleLabel.text = model.ads ?? ""
+        self.priceLabel.text = "¥"+(model.price ?? "0.00")
+        if model.state == 2{
+            //设置 上架
+        }else{
+            //设置 下架
+        }
+        self.countLabel.text = "库存: "+(model.count ?? "0")
+    }
+    
+    // MARK: - BtnAction
+    @objc func editBtnAction(){
+        
+    }
+    @objc func editCountBtnAction(){
+        
+    }
+    
+}
+//
+//  CNLiveShopGoodsListClassifyView.swift
+//  metaCode
+//
+//  Created by zx on 2023/11/6.
+//
+
+import Foundation
+
+class CNLiveShopGoodsListClassifyView: UIView {
+    
+    //最新
+    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
+    }()
+    
+    //价格 后面再完善
+    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
+    }()
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        self.setUI()
+    }
+    
+    func setUI(){
+        self.addSubview(self.lastestBtn)
+        self.addSubview(self.priceBtn)
+        self.lastestBtn.isSelected = true
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    @objc func priceBtnAction(){
+        self.priceBtn.isSelected = true
+        self.lastestBtn.isSelected = false
+    }
+    @objc func lastestBtnAction(){
+        self.lastestBtn.isSelected = true
+        self.priceBtn.isSelected = false
+    }
+}
+
@@ -17,7 +17,8 @@ class CNLiveShopConsoleViewModel: NSObject {
         param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "uid")
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
-        CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseShopUrl+"/api/v1/isSellerNew", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
+        CNLiveNetworking.setupDSRequest(true)
+        CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseWjjBUrl+"/api/v1/isSellerNew", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
             if (error == nil) {
                 let resp = result as! NSDictionary
@@ -20,7 +20,8 @@ class CNLiveShopDetailViewModel:NSObject{
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
-        CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseShopUrl+"/api/v1/index", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
+        CNLiveNetworking.setupDSRequest(true)
+        CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseWjjBUrl+"/api/v1/index", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
             if (error == nil) {
                 let resp = result as! NSDictionary
+//
+//  CNLiveShopGoodListViewModel.swift
+//  metaCode
+//
+//  Created by zx on 2023/11/6.
+//
+
+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) {
+        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")
+
+        
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.setupDSRequest(true)
+        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
+                var dataArr:[BaseModel] = []
+                let respArr = resp["data"] as! NSArray
+                for dic in respArr{
+                    let dataDic = dic as! NSDictionary
+                    let goodsListModel =  newDictionaryToModel(dataDic as! [String : Any], CNLiveShopGoodsListModel.self)
+                    dataArr.append(goodsListModel)
+                }
+                resultBlock(dataArr,.success)
+            }else{
+                resultBlock(NSNull(),.failed)
+            }
+        }
+    }
+}
+//
+//  CNLiveShopAddEditGoodsModel.swift
+//  metaCode
+//
+//  Created by zx on 2023/11/7.
+//
+
+import Foundation
+
+class CNLiveShopAddEditGoodsModel: BaseModel {
+    ///列表
+    var list = [CNLiveShopAddEditGoodsListModel]()
+    func initDataSource(){
+        var dataSource =
+        [ ["style":"1","isHaveTo":true,"title":"商品分类","contentType":"2"],
+            ["style":"1","isHaveTo":true,"title":"店铺分类","contentType":"2"],
+            ["style":"2","title":"基本信息"],
+            ["style":"3","isHaveTo":true,"title":"商品轮播","isDisplayLine":true,"isAbleSelectVideo":true,"isAbleSelectCover":true,"maxSelectImageCount":"7"],
+            ["style":"1","isHaveTo":true,"title":"商品名称","isDisplayLine":true,"contentType":"1"],
+            ["style":"4","isHaveTo":false,"title":"商品副标题","isDisplayLine":true,"placeholder":"请在此输入..."],
+            ["style":"1","isHaveTo":true,"title":"本店售价","subtitle":"(实际售价)","isDisplayLine":true,"contentTextFieldkeyboardType":"2","decimalLength":"2","contentTextColor":"0xFC1541","contentType":"1"],
+            ["style":"1","isHaveTo":true,"title":"市场售价","isDisplayLine":true,"contentTextFieldkeyboardType":"2","decimalLength":"2","contentType":"1"],
+            ["style":"1","isHaveTo":false,"title":"商品重量","subtitle":"(kg)","isDisplayLine":true,"contentTextFieldkeyboardType":"2","decimalLength":"3","contentType":"1"],
+            ["style":"5","isHaveTo":false,"title":"最低起售","subtitle":"(件)","isDisplayLine":true,"desc":"如起售数超出库存买家无法购买","decimalLength":"3","contentType":"4"],
+            ["style":"1","isHaveTo":false,"title":"上架","contentType":"3"],
+            ["style":"2","title":"通用信息"],
+            ["style":"3","isHaveTo":true,"title":"商品详情图","isDisplayLine":true,"maxSelectImageCount":"9"],
+            ["style":"1","isHaveTo":false,"title":"商品运费","subtitle":"(0为包邮)","isDisplayLine":true,"contentTextFieldkeyboardType":"2","decimalLength":"2","contentType":"1"],
+            ["style":"1","isHaveTo":false,"title":"是否支持退货","isDisplayLine":true,"contentType":"3"],
+            ["style":"1","isHaveTo":false,"title":"商品单位","contentTextFieldkeyboardType":"1","isDisplayLine":true,"contentType":"1"],
+            ["style":"2","title":"通用参数(*为必填)","touchSubtitle":"添加通用参数"],
+            ["style":"1","isHaveTo":true,"title":"品名","isDisplayLine":true,"contentType":"1"],
+            ["style":"1","isHaveTo":true,"title":"规格","isDisplayLine":true,"contentType":"1"],
+            ["style":"4","isHaveTo":true,"title":"寄送区域","isDisplayLine":true,"contentType":"1","placeholder":"请填写不配送**地区、仅配送**地区或全国包邮"],
+            ["style":"1","isHaveTo":true,"title":"发货时效","isDisplayLine":true,"contentType":"1"],
+            ["style":"1","isHaveTo":false,"title":"口味","contentTextFieldkeyboardType":"1","isDisplayLine":true,"contentType":"1","isDelect":true],
+            ["style":"1","isHaveTo":false,"title":"产地","contentTextFieldkeyboardType":"1","isDisplayLine":true,"contentType":"1","isDelect":true],
+            ["style":"1","isHaveTo":false,"title":"存储方式及期限","contentTextFieldkeyboardType":"1","isDisplayLine":true,"contentType":"1","isDelect":true]
+        ]
+                
+        for dic in dataSource{
+            let mdl = newDictionaryToModel(dic, CNLiveShopAddEditGoodsListModel.self)
+            list.append(mdl as! CNLiveShopAddEditGoodsListModel)
+            
+        }
+    }
+}
+
+
+class CNLiveShopAddEditGoodsListModel: BaseModel {
+    /// 商品id
+    var id: String?
+    /// 样式4中 二是标题 三是选取图片 四是输入框 五添加起售数量
+    var style:Int = 0
+    /// 是否必须
+    var isHaveTo: Bool?
+    /// 标题
+    var title: String?
+    /// 副标题
+    var subtitle: String?
+    /// 对主标题下方进行说明文字
+    var desc: String?
+    /// 自定义规格内容输入
+    var content: String?
+    /// 副标题点击样式
+    var touchSubtitle: String?
+    /// style=4 占位标识
+    var placeholder: String?
+    /// 是否显示底部的线
+    var isDisplayLine: Bool?
+    /// 样式一属性 内容输入框键盘类型 1默认类型 2数字类型带小数点
+    var contentTextFieldkeyboardType:Int = 0
+    /// 样式一属性 小数点位数
+    var decimalLength:Int = 0
+    /// 样式一属性 内容输入框颜色 默认0x787878
+    var contentTextColor: String?
+    /// 样式一属性 1输入框 2选择 3开关 4可以增加数量
+    var contentType:Int = 0
+    /// 样式一属性 是不是显示输入框右边删除按钮
+    var isDelect: Bool?
+    /// 样式三属性 是否可以选择视频
+    var isAbleSelectVideo: Bool?
+    /// 样式三属性 是否可以选择主页
+    var isAbleSelectCover: Bool?
+    /// 样式三属性 最多可以选取多少张图片
+    var maxSelectImageCount:Int = 0
+}
+//
+//  CNLiveShopGoodsListModel.swift
+//  metaCode
+//
+//  Created by zx on 2023/11/6.
+//
+
+import Foundation
+
+class CNLiveShopGoodsListModel:BaseModel{
+    ///商品id
+    var id: String?
+    ///商品名称
+    var title: String?
+    ///商品图片
+    var simg: String?
+//    var img: String?
+    ///商品价格
+    var price: String?
+    ///商品介绍
+    var ads: String?
+    ///商品分类
+    var groupid: String?
+    ///店铺id
+    var shopid: String?
+//    var shop_id: String?
+    ///店铺分类id
+    var category_id: String?
+    ///1下架 2上架
+    var state: Int?
+    ///库存
+    var count: String?
+    ///1普通商品 2文创商品
+    var shop_type: String?
+    ///排序
+    var ord: String?
+    ///商品是否被选中(本地标记)
+    var select: Bool?
+    ///最小购买数量
+    var min_buy_num: String?
+}