商品管理 , 新增商品 , 预览商品 ,店铺分类 , 商品分类等 (未完成)

张旭
1 parent eb9a911a
Showing 26 changed files with 4179 additions and 332 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Extensions/NSDictionary+CNLiveExtensions.swift
metaCode/Classes/Extensions/NSString+CNLiveExtensions.swift
metaCode/Classes/Extensions/String+Extension.swift
metaCode/Classes/Extensions/UIScrollView+CNLiveExtensions.swift
metaCode/Classes/Main/HomePage/Controller/GoodsDetail/CNLiveShopGoodsDetailsViewController.swift
metaCode/Classes/Main/HomePage/Controller/GoodsManager/CNLiveCreateShopClassifyViewController.swift
metaCode/Classes/Main/HomePage/Controller/GoodsManager/CNLiveGoodsCategoryController.swift
metaCode/Classes/Main/HomePage/Controller/GoodsManager/CNLiveModalPresentationViewController.swift
metaCode/Classes/Main/HomePage/Controller/GoodsManager/CNLiveShopNewProductController.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveAddGoodsSelectUploadImageView.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveSelUplSingleImageView.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveShopAddGoodsSingleView.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveShopClassifyCell.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveShopClassifyInputTableViewCell.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveShopClassifySwitchTableViewCell.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveShopClassilyIconTableViewCell.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveShopGoodsManageDetailsInputManager.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveShopTextView.swift
metaCode/Classes/Main/HomePage/ViewModel/CNLiveShopDetailViewModel.swift
@@ -11,6 +11,23 @@
 		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 */; };
+		191732CE2B04AACD007BCC04 /* CNLiveShopTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 191732CD2B04AACD007BCC04 /* CNLiveShopTextView.swift */; };
+		191732E32B05F474007BCC04 /* CNLiveShopGoodsManageDetailsInputManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 191732E22B05F474007BCC04 /* CNLiveShopGoodsManageDetailsInputManager.swift */; };
+		191732E52B05FFE8007BCC04 /* CNLiveModalPresentationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 191732E42B05FFE8007BCC04 /* CNLiveModalPresentationViewController.swift */; };
+		191732E72B0615C1007BCC04 /* UIScrollView+CNLiveExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 191732E62B0615C1007BCC04 /* UIScrollView+CNLiveExtensions.swift */; };
+		191732E92B0706B3007BCC04 /* CNLiveShopClassifyCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 191732E82B0706B3007BCC04 /* CNLiveShopClassifyCell.swift */; };
+		191732EB2B070943007BCC04 /* CNLiveShopGoodsManageDetailsGoodsCategoryModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 191732EA2B070943007BCC04 /* CNLiveShopGoodsManageDetailsGoodsCategoryModel.swift */; };
+		191732ED2B073C52007BCC04 /* CNLiveShopClassifyListModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 191732EC2B073C52007BCC04 /* CNLiveShopClassifyListModel.swift */; };
+		191732EF2B075C3A007BCC04 /* CNLiveCreateShopClassifyViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 191732EE2B075C3A007BCC04 /* CNLiveCreateShopClassifyViewController.swift */; };
+		191732F12B084822007BCC04 /* CNLiveShopClassifyInputTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 191732F02B084822007BCC04 /* CNLiveShopClassifyInputTableViewCell.swift */; };
+		191732F32B084DBC007BCC04 /* CNLiveShopClassifySwitchTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 191732F22B084DBC007BCC04 /* CNLiveShopClassifySwitchTableViewCell.swift */; };
+		191732F52B085BAE007BCC04 /* CNLiveShopClassilyIconTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 191732F42B085BAE007BCC04 /* CNLiveShopClassilyIconTableViewCell.swift */; };
+		191732F82B08AB9D007BCC04 /* CNLiveShopClassilyViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 191732F72B08AB9D007BCC04 /* CNLiveShopClassilyViewModel.swift */; };
+		191732FB2B0AF34A007BCC04 /* CNLiveShopGoodsDetailsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 191732FA2B0AF34A007BCC04 /* CNLiveShopGoodsDetailsModel.swift */; };
+		191732FE2B0B3EBF007BCC04 /* CNLiveShopGoodsDetailsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 191732FD2B0B3EBF007BCC04 /* CNLiveShopGoodsDetailsViewController.swift */; };
+		191733002B0B58E5007BCC04 /* CNLiveSelectUploadImageModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 191732FF2B0B58E5007BCC04 /* CNLiveSelectUploadImageModel.swift */; };
+		191733022B0C4EAB007BCC04 /* CNLiveSelUplSingleImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 191733012B0C4EAB007BCC04 /* CNLiveSelUplSingleImageView.swift */; };
+		191733042B0F216E007BCC04 /* NSDictionary+CNLiveExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 191733032B0F216E007BCC04 /* NSDictionary+CNLiveExtensions.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 */; };
@@ -178,6 +195,23 @@
 		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>"; };
+		191732CD2B04AACD007BCC04 /* CNLiveShopTextView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopTextView.swift; sourceTree = "<group>"; };
+		191732E22B05F474007BCC04 /* CNLiveShopGoodsManageDetailsInputManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopGoodsManageDetailsInputManager.swift; sourceTree = "<group>"; };
+		191732E42B05FFE8007BCC04 /* CNLiveModalPresentationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveModalPresentationViewController.swift; sourceTree = "<group>"; };
+		191732E62B0615C1007BCC04 /* UIScrollView+CNLiveExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIScrollView+CNLiveExtensions.swift"; sourceTree = "<group>"; };
+		191732E82B0706B3007BCC04 /* CNLiveShopClassifyCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopClassifyCell.swift; sourceTree = "<group>"; };
+		191732EA2B070943007BCC04 /* CNLiveShopGoodsManageDetailsGoodsCategoryModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopGoodsManageDetailsGoodsCategoryModel.swift; sourceTree = "<group>"; };
+		191732EC2B073C52007BCC04 /* CNLiveShopClassifyListModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopClassifyListModel.swift; sourceTree = "<group>"; };
+		191732EE2B075C3A007BCC04 /* CNLiveCreateShopClassifyViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveCreateShopClassifyViewController.swift; sourceTree = "<group>"; };
+		191732F02B084822007BCC04 /* CNLiveShopClassifyInputTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopClassifyInputTableViewCell.swift; sourceTree = "<group>"; };
+		191732F22B084DBC007BCC04 /* CNLiveShopClassifySwitchTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopClassifySwitchTableViewCell.swift; sourceTree = "<group>"; };
+		191732F42B085BAE007BCC04 /* CNLiveShopClassilyIconTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopClassilyIconTableViewCell.swift; sourceTree = "<group>"; };
+		191732F72B08AB9D007BCC04 /* CNLiveShopClassilyViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopClassilyViewModel.swift; sourceTree = "<group>"; };
+		191732FA2B0AF34A007BCC04 /* CNLiveShopGoodsDetailsModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopGoodsDetailsModel.swift; sourceTree = "<group>"; };
+		191732FD2B0B3EBF007BCC04 /* CNLiveShopGoodsDetailsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopGoodsDetailsViewController.swift; sourceTree = "<group>"; };
+		191732FF2B0B58E5007BCC04 /* CNLiveSelectUploadImageModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveSelectUploadImageModel.swift; sourceTree = "<group>"; };
+		191733012B0C4EAB007BCC04 /* CNLiveSelUplSingleImageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveSelUplSingleImageView.swift; sourceTree = "<group>"; };
+		191733032B0F216E007BCC04 /* NSDictionary+CNLiveExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSDictionary+CNLiveExtensions.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>"; };
@@ -361,12 +395,39 @@
 /* End PBXFrameworksBuildPhase section */
 /* Begin PBXGroup section */
+		191732F62B08AAD4007BCC04 /* ShopClassify */ = {
+			isa = PBXGroup;
+			children = (
+				191732F72B08AB9D007BCC04 /* CNLiveShopClassilyViewModel.swift */,
+			);
+			path = ShopClassify;
+			sourceTree = "<group>";
+		};
+		191732F92B0AF329007BCC04 /* GoodsDetail */ = {
+			isa = PBXGroup;
+			children = (
+				191732FA2B0AF34A007BCC04 /* CNLiveShopGoodsDetailsModel.swift */,
+				191732FF2B0B58E5007BCC04 /* CNLiveSelectUploadImageModel.swift */,
+			);
+			path = GoodsDetail;
+			sourceTree = "<group>";
+		};
+		191732FC2B0B3EB4007BCC04 /* GoodsDetail */ = {
+			isa = PBXGroup;
+			children = (
+				191732FD2B0B3EBF007BCC04 /* CNLiveShopGoodsDetailsViewController.swift */,
+			);
+			path = GoodsDetail;
+			sourceTree = "<group>";
+		};
 		19565EC32AF8ACC2007D6727 /* GoodsManager */ = {
 			isa = PBXGroup;
 			children = (
 				19565EC42AF8AD1F007D6727 /* CNLiveShopProductManagerController.swift */,
 				19565EC62AF8AD38007D6727 /* CNLiveShopNewProductController.swift */,
+				191732E42B05FFE8007BCC04 /* CNLiveModalPresentationViewController.swift */,
 				1965FA412AFB79EA00F0F435 /* CNLiveGoodsCategoryController.swift */,
+				191732EE2B075C3A007BCC04 /* CNLiveCreateShopClassifyViewController.swift */,
 			);
 			path = GoodsManager;
 			sourceTree = "<group>";
@@ -378,8 +439,15 @@
 				19565ECE2AF8D8F6007D6727 /* CNLiveShopGoodsListCell.swift */,
 				1965FA3D2AFB176E00F0F435 /* CNLiveShopAddGoodsSingleView.swift */,
 				1965FA3F2AFB38AA00F0F435 /* CNLiveAddGoodsSelectUploadImageView.swift */,
+				191733012B0C4EAB007BCC04 /* CNLiveSelUplSingleImageView.swift */,
 				1917328D2B032583007BCC04 /* CNLiveRoundedRectView.swift */,
 				1917328F2B0348F6007BCC04 /* CNLiveSwitchView.swift */,
+				191732CD2B04AACD007BCC04 /* CNLiveShopTextView.swift */,
+				191732E22B05F474007BCC04 /* CNLiveShopGoodsManageDetailsInputManager.swift */,
+				191732E82B0706B3007BCC04 /* CNLiveShopClassifyCell.swift */,
+				191732F02B084822007BCC04 /* CNLiveShopClassifyInputTableViewCell.swift */,
+				191732F22B084DBC007BCC04 /* CNLiveShopClassifySwitchTableViewCell.swift */,
+				191732F42B085BAE007BCC04 /* CNLiveShopClassilyIconTableViewCell.swift */,
 			);
 			path = GoodsManager;
 			sourceTree = "<group>";
@@ -397,6 +465,8 @@
 			children = (
 				19565ECA2AF8C59C007D6727 /* CNLiveShopGoodsListModel.swift */,
 				19565ED32AF9FEB4007D6727 /* CNLiveShopAddEditGoodsModel.swift */,
+				191732EA2B070943007BCC04 /* CNLiveShopGoodsManageDetailsGoodsCategoryModel.swift */,
+				191732EC2B073C52007BCC04 /* CNLiveShopClassifyListModel.swift */,
 			);
 			path = GoodsManager;
 			sourceTree = "<group>";
@@ -404,6 +474,7 @@
 		19BB1FE42AEB93850094D962 /* Model */ = {
 			isa = PBXGroup;
 			children = (
+				191732F92B0AF329007BCC04 /* GoodsDetail */,
 				19565ED22AF9FE67007D6727 /* GoodsManager */,
 				1926C2902AE0FD4500C71DC3 /* CNLiveDownSlideModel.swift */,
 				19BB1FE52AEB93B80094D962 /* CNLiveShopUserInfoModel.swift */,
@@ -453,6 +524,8 @@
 				79E496E72AB9674300127BF8 /* NSMutableAttributedString+CNLiveExtensions.swift */,
 				19CC4D482ADD06C500308E2A /* UITableView+Extension.swift */,
 				19CC4D552ADD19C200308E2A /* String+Extension.swift */,
+				191732E62B0615C1007BCC04 /* UIScrollView+CNLiveExtensions.swift */,
+				191733032B0F216E007BCC04 /* NSDictionary+CNLiveExtensions.swift */,
 			);
 			path = Extensions;
 			sourceTree = "<group>";
@@ -772,6 +845,7 @@
 		7C83B43C2A52B899004BF4A4 /* ViewModel */ = {
 			isa = PBXGroup;
 			children = (
+				191732F62B08AAD4007BCC04 /* ShopClassify */,
 				19565ED12AF9FE56007D6727 /* GoodsManager */,
 				1926C28E2AE0D76C00C71DC3 /* CNLiveDownSlideViewModel.swift */,
 				19BB1FE22AEB8B7C0094D962 /* CNLiveShopConsoleViewModel.swift */,
@@ -823,6 +897,7 @@
 		7CD6754D2A2840B9008354C1 /* Controller */ = {
 			isa = PBXGroup;
 			children = (
+				191732FC2B0B3EB4007BCC04 /* GoodsDetail */,
 				19565EC32AF8ACC2007D6727 /* GoodsManager */,
 				19BB1FDE2AEA3A450094D962 /* CNSlideBaseNavigationController.swift */,
 				7CD6754E2A2840B9008354C1 /* CNMetaCodeHomePageController.swift */,
@@ -1142,7 +1217,10 @@
 				19565EC92AF8BEC6007D6727 /* CNLiveShopGoodListViewModel.swift in Sources */,
 				19BB1FE82AECAD060094D962 /* CNLiveShopConsoleModel.swift in Sources */,
 				19BB1FEE2AF0E1EC0094D962 /* CNLiveShopDetailViewModel.swift in Sources */,
+				191733002B0B58E5007BCC04 /* CNLiveSelectUploadImageModel.swift in Sources */,
 				19F1C2332AB5728B0083D06C /* CNIDCardView.swift in Sources */,
+				191732F32B084DBC007BCC04 /* CNLiveShopClassifySwitchTableViewCell.swift in Sources */,
+				191732E72B0615C1007BCC04 /* UIScrollView+CNLiveExtensions.swift in Sources */,
 				1917328E2B032583007BCC04 /* CNLiveRoundedRectView.swift in Sources */,
 				7CD675292A270F6A008354C1 /* WJColorChange.m in Sources */,
 				79F4B11C2A33036E00993C03 /* CNLiveMineInfoAlertView.swift in Sources */,
@@ -1157,8 +1235,11 @@
 				19565ECB2AF8C59C007D6727 /* CNLiveShopGoodsListModel.swift in Sources */,
 				7963989D2A260E6200D045EB /* CNLiveBaseViewController.swift in Sources */,
 				798A44FB2A30999900815935 /* CNLiveAlertTool.swift in Sources */,
+				191732EB2B070943007BCC04 /* CNLiveShopGoodsManageDetailsGoodsCategoryModel.swift in Sources */,
 				19565EC02AF4DE0E007D6727 /* CNLiveShopDetailBtnsCell.swift in Sources */,
+				191732E92B0706B3007BCC04 /* CNLiveShopClassifyCell.swift in Sources */,
 				790D01A52A2DF65E00C5978D /* CNLiveLoginPickerView.swift in Sources */,
+				191733042B0F216E007BCC04 /* NSDictionary+CNLiveExtensions.swift in Sources */,
 				79BA085D2AB18E8300D01875 /* CNLiveSaveAuthDB.swift in Sources */,
 				79282A3C2A2EDC2500B5F8CF /* NSString+CNLiveExtensions.swift in Sources */,
 				19D2CE632AE8B65D00691757 /* CNLiveDownSlideTool.swift in Sources */,
@@ -1166,6 +1247,7 @@
 				19BB202B2AF382150094D962 /* CNLiveAdaptTool.swift in Sources */,
 				79E672032AFDFA9C00F2F768 /* CNLiveMineSignOutViewController.swift in Sources */,
 				19565ECD2AF8D256007D6727 /* CNLiveShopGoodsListClassifyView.swift in Sources */,
+				191732EF2B075C3A007BCC04 /* CNLiveCreateShopClassifyViewController.swift in Sources */,
 				798A44F22A30674200815935 /* CNLiveMineSubBodyListView.swift in Sources */,
 				799172382AF090CD00DC01A8 /* CNLiveShopBodyListView.swift in Sources */,
 				19565ED42AF9FEB4007D6727 /* CNLiveShopAddEditGoodsModel.swift in Sources */,
@@ -1183,17 +1265,20 @@
 				19BB1FEA2AEF7B4A0094D962 /* CNLiveShopConsoleCell.swift in Sources */,
 				790D019D2A2DCBD000C5978D /* UIView+CNLiveExtensions.swift in Sources */,
 				790B1FB62A41938F0074CF00 /* UIImage+CNLiveExtensions.swift in Sources */,
+				191732F82B08AB9D007BCC04 /* CNLiveShopClassilyViewModel.swift in Sources */,
 				19FA20172AE22D3C001F7186 /* CNLiveDownSlideRecommendCell.swift in Sources */,
 				19123FC12ABC11170075C883 /* CNWebViewController.swift in Sources */,
 				1926C28F2AE0D76C00C71DC3 /* CNLiveDownSlideViewModel.swift in Sources */,
 				790D019D2A2DCBD000C5978D /* UIView+CNLiveExtensions.swift in Sources */,
 				7C7C62F62A4D72E9007A912E /* CNLiveIdentityDB.swift in Sources */,
+				191732E52B05FFE8007BCC04 /* CNLiveModalPresentationViewController.swift in Sources */,
 				799172342AF08D3200DC01A8 /* CNLiveShopViewModel.swift in Sources */,
 				799172362AF08D4500DC01A8 /* CNLiveShopBaseModel.swift in Sources */,
 				790B1FB62A41938F0074CF00 /* UIImage+CNLiveExtensions.swift in Sources */,
 				790D019D2A2DCBD000C5978D /* UIView+CNLiveExtensions.swift in Sources */,
 				79E496E82AB9674300127BF8 /* NSMutableAttributedString+CNLiveExtensions.swift in Sources */,
 				19CC4D472ADD006600308E2A /* CNDownSlideSingleCourseCell.swift in Sources */,
+				191732FE2B0B3EBF007BCC04 /* CNLiveShopGoodsDetailsViewController.swift in Sources */,
 				79E496E32AB9357000127BF8 /* UITableViewCell+CNLiveExtension.swift in Sources */,
 				7C83B4422A541EBF004BF4A4 /* CALayer+CNLiveExtensions.swift in Sources */,
 				19565EC72AF8AD38007D6727 /* CNLiveShopNewProductController.swift in Sources */,
@@ -1214,6 +1299,8 @@
 				791C1C862AFB2EB4003E6362 /* CNLiveShopOrderExpressViewController.swift in Sources */,
 				7CD6753E2A2740B0008354C1 /* CNUpSlideView.swift in Sources */,
 				7CD675402A2740B0008354C1 /* CNDownSlideView.swift in Sources */,
+				191732F52B085BAE007BCC04 /* CNLiveShopClassilyIconTableViewCell.swift in Sources */,
+				191732E32B05F474007BCC04 /* CNLiveShopGoodsManageDetailsInputManager.swift in Sources */,
 				79B2E3602AF39191002A8524 /* NSObject+CNLiveConfigModuleInline.swift in Sources */,
 				7C2703362A3AFD3A0061EC50 /* CNLiveEnvironment.swift in Sources */,
 				798A44FD2A309EBA00815935 /* CNLiveTypeFeedBackViewController.swift in Sources */,
@@ -1222,8 +1309,10 @@
 				7CD6754F2A2840B9008354C1 /* CNMetaCodeHomePageController.swift in Sources */,
 				7989B5C52A4BDC6000A19B10 /* CNLiveMineEarnViewController.swift in Sources */,
 				792E57DB2A3AE9F4005834DB /* CNLiveCommonQiniuTool.swift in Sources */,
+				191732F12B084822007BCC04 /* CNLiveShopClassifyInputTableViewCell.swift in Sources */,
 				19BB1FE62AEB93B80094D962 /* CNLiveShopUserInfoModel.swift in Sources */,
 				7CD675472A274167008354C1 /* NewPagedFlowView.m in Sources */,
+				191732ED2B073C52007BCC04 /* CNLiveShopClassifyListModel.swift in Sources */,
 				79F4B11A2A32F21400993C03 /* CNLiveMineNickViewController.swift in Sources */,
 				798A44FF2A30A0A800815935 /* CNLiveInputFeedBackViewController.swift in Sources */,
 				79282A442A2F1C1E00B5F8CF /* CNLiveLoginAuthView.swift in Sources */,
@@ -1233,6 +1322,7 @@
 				790D01A32A2DDBA300C5978D /* CNLiveConfigManager.swift in Sources */,
 				19565EC52AF8AD1F007D6727 /* CNLiveShopProductManagerController.swift in Sources */,
 				19CC4D492ADD06C500308E2A /* UITableView+Extension.swift in Sources */,
+				191732CE2B04AACD007BCC04 /* CNLiveShopTextView.swift in Sources */,
 				7C2703332A36CC660061EC50 /* CNLiveGlobalBlock.swift in Sources */,
 				7987BF3D2A497644000A1ABC /* CNLiveMineQuestViewController.swift in Sources */,
 				798A44EA2A30135D00815935 /* CNLiveMineBodyListView.swift in Sources */,
@@ -1249,6 +1339,7 @@
 				19CC4D562ADD19C200308E2A /* String+Extension.swift in Sources */,
 				7905BB492AB0588B0089BC50 /* CNLiveMineAuthResultViewController.swift in Sources */,
 				19565EC22AF616CA007D6727 /* CNLiveShopDetailOrderAssetCell.swift in Sources */,
+				191732FB2B0AF34A007BCC04 /* CNLiveShopGoodsDetailsModel.swift in Sources */,
 				794FF1052B01FC8800385E85 /* CNLiveShopOrderSearchViewController.swift in Sources */,
 				798A44EC2A302DBE00815935 /* CNLiveMineAddInfoViewController.swift in Sources */,
 				791C1C882AFB6FD7003E6362 /* CNLiveShopOrderExpressFirmViewController.swift in Sources */,
@@ -1260,6 +1351,7 @@
 				19FA20192AE22D98001F7186 /* CNLiveDownSlideTodayRecommendCell.swift in Sources */,
 				790B1FB42A4153E90074CF00 /* CNLiveMineBaseModel.swift in Sources */,
 				7978A8432A396632007C86B8 /* CNLiveMineViewModel.swift in Sources */,
+				191733022B0C4EAB007BCC04 /* CNLiveSelUplSingleImageView.swift in Sources */,
 				798A44EE2A305AAC00815935 /* CNLiveBaseNavigationController.swift in Sources */,
 				7CD675422A2740F8008354C1 /* CNCustomIndexView.swift in Sources */,
 				7C4931292A2D8BA8000E44B4 /* CNLiveBaseTabBarViewController.swift in Sources */,
+//
+//  NSDictionary+CNLiveExtensions.swift
+//  metaCode
+//
+//  Created by zx on 2023/11/23.
+//
+
+import Foundation
+
+extension NSDictionary {
+    func stringValueForKey(key:NSString) -> NSString {
+        let value = self[key]
+        if value == nil || value as! NSObject == NSNull(){
+            return ""
+        }
+        if let newValue = value as? NSString {
+            return newValue
+        } else if let newValue = value as? NSNumber {
+            return newValue.description as NSString
+        } else {
+            return ""
+        }
+        
+    }
+}
@@ -6,6 +6,7 @@
 //
 import Foundation
+import UIKit
 extension NSString {
@@ -90,4 +91,29 @@ extension NSString {
         let filtered = filtered_array.componentsJoined(by: "")
         return self as String == filtered
     }
+    
+    /**
+     保留2位小数
+     */
+    func keepTwoDecimalPlaces() -> NSString{
+        var mSelf = NSMutableString(string: self)
+        if self.contains("."){
+            let decimalLocation = mSelf.range(of: ".").location
+            var lastDecimalLocationLength = mSelf.length - decimalLocation - 1
+            if lastDecimalLocationLength > 2{
+                while lastDecimalLocationLength != 2 {
+                    mSelf.deleteCharacters(in: NSRange(location: mSelf.length-1, length: 1))
+                    lastDecimalLocationLength -= lastDecimalLocationLength
+                }
+            }else if (lastDecimalLocationLength < 2) {
+                while (lastDecimalLocationLength != 0) {
+                    mSelf.append("0")
+                    lastDecimalLocationLength -= 1
+                }
+            }
+        }else {
+            mSelf.append(".00")
+        }
+        return mSelf
+    }
 }
@@ -17,4 +17,13 @@ extension String {
         let option = NSStringDrawingOptions.usesLineFragmentOrigin
         return self.boundingRect(with: (maxSize), options: option, attributes: attr, context: nil).size.height
     }
+    
+    //截取子字符串,eg "123456" start:2为第三位,length:3为长度是3,substring:345
+    func subString(start: Int, length: Int) -> String {
+        let startIndex = self.index(self.startIndex, offsetBy: start)
+        let endIndex = self.index(startIndex, offsetBy: length)
+        let substring = self[startIndex..<endIndex]
+        return String(substring)
+    }
+
 }
+//
+//  UIScrollView+CNLiveExtensions.swift
+//  metaCode
+//
+//  Created by zx on 2023/11/16.
+//
+
+import Foundation
+
+extension UIScrollView {
+    func scrollToBottom() {
+        let bottomOffset = CGPoint(x: 0, y: contentSize.height - bounds.size.height + contentInset.bottom)
+        setContentOffset(bottomOffset, animated: true)
+    }
+}
+//
+//  CNLiveShopGoodsDetailsViewController.swift
+//  metaCode
+//
+//  Created by zx on 2023/11/20.
+//
+
+import Foundation
+
+///分类类型
+enum CNLiveShopGoodsDetailsVCType:Int {
+    ///正常
+    case normal
+    ///预览
+    case preview
+}
+
+class CNLiveShopGoodsDetailsViewController:CNLiveBaseViewController{
+    /// 格式
+    var type:CNLiveShopGoodsDetailsVCType?
+    /// 商品id
+    var goodsId:String?
+    /// 编辑商品预览使用
+    var detailsModel:CNLiveShopGoodsDetailsModel?
+    
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+    }
+    
+    
+}
+//
+//  CNLiveCreateShopClassifyViewController.swift
+//  metaCode
+//
+//  Created by zx on 2023/11/17.
+//  创建/编辑 店铺分类控制器
+
+import Foundation
+
+///分类类型
+enum CNLiveCreateType:Int {
+    ///一级分类
+    case oneLevelClassify
+    ///二级分类
+    case twoLevelClassify
+}
+
+class CNLiveCreateShopClassifyViewController:CNLiveBaseViewController, UITableViewDataSource, UITableViewDelegate{
+    
+    
+    /// 分类类型,是一级还是二级
+    var classifyType:CNLiveCreateType?
+    /// 当创建二级分类时,需要传上一级分类的id
+    var superClassifyId:String = ""
+    /// 添加/编辑/删除 成功回调
+    var successCompleteBlock:successComplete?
+    
+    let kCNLiveShopClassifyInputTitelCellID = "kCNLiveShopClassifyInputTitelCellID"
+    let kCNLiveShopClassifyInputSortCellID = "kCNLiveShopClassifyInputSortCellID"
+    let kCNLiveShopClassifySwitchTableViewCellID = "kCNLiveShopClassifySwitchTableViewCellID"
+    let kCNLiveShopClassilyIconTableViewCellID = "kCNLiveShopClassilyIconTableViewCellID"
+
+    /// 编辑状态
+    var isEdite:Bool?
+    /// 编辑的数据
+    var shopClassifyModel:CNLiveShopClassifyModel?
+    /// 表
+    // MARK: - lazy
+    lazy var tableView : UITableView = {
+        let tableView = UITableView(frame: CGRect(x: 0, y: KNavigationHeight, width: KSreenWidth, height: KSreenHeight-KNavigationHeight-KTabBarHeight), style: .plain)
+        tableView.backgroundColor = HexColor("#F6F6F6")
+        tableView.dataSource = self
+        tableView.delegate = self
+        tableView.tableFooterView = UIView()
+        tableView.separatorStyle = .none
+        tableView.tableFooterView = UIView.init()
+        tableView.register(CNLiveShopClassifyInputTitleCell.self, forCellReuseIdentifier:kCNLiveShopClassifyInputTitelCellID )
+        tableView.register(CNLiveShopClassifyInputSortCell.self, forCellReuseIdentifier:kCNLiveShopClassifyInputSortCellID )
+        tableView.register(CNLiveShopClassifySwitchTableViewCell.self, forCellReuseIdentifier: kCNLiveShopClassifySwitchTableViewCellID)
+        tableView.register(CNLiveShopClassilyIconTableViewCell.self, forCellReuseIdentifier: kCNLiveShopClassilyIconTableViewCellID)
+        return tableView
+    }()
+    lazy var bottomNavView :UIView = {
+        let bottomNavView = UIView(frame: CGRect(x: 0, y: 0, width: self.view.width, height: self.view.height - KTabBarHeight))
+        bottomNavView.backgroundColor = HexColor("F2F2F2")
+        return bottomNavView
+    }()
+
+    
+    var titleField:UITextField?
+    var sortField:UITextField?
+    var uploadImageView:CNLiveAddGoodsSelectUploadImageView?
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        self.initUI()
+    }
+    
+    /// 初始化方法
+    /// @param model 要编辑的分类数据,当isEdite为YES,才需要传
+    /// @param isEdite 是否是编辑 YES:是   NO:不是
+    func initWithModel(model:CNLiveShopClassifyModel,isEdite:Bool){
+        self.shopClassifyModel = model
+        //设置店铺id
+        self.shopClassifyModel?.shop_id = DSUserInfoManager.shared.dsUserInfo.id
+        self.isEdite = isEdite
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    // MARK: - 初始化UI
+    func initUI(){
+        self.view.addSubview(self.tableView)
+        self.initTopNav()
+        self.initBottomNav()
+    }
+    
+    func initTopNav(){
+        if self.isEdite == true{
+            self.title = "编辑店铺分类"
+            let deleteNavBtn = UIButton(type: .custom)
+            deleteNavBtn.frame = CGRect(x: 0, y: KStatusBarHeight, width: KNavigationHeight-KStatusBarHeight, height: KNavigationHeight-KStatusBarHeight)
+            deleteNavBtn.backgroundColor = .clear
+            deleteNavBtn.setTitle("删除", for: .normal)
+            deleteNavBtn.setTitleColor(HexColor("#666666"), for: .normal)
+            deleteNavBtn.addTarget(self, action: #selector(deleteNavBtnClick), for: .touchUpInside)
+            self.rightNavBtns = [deleteNavBtn]
+        }else{
+            self.title = "创建店铺分类"
+            
+            //初始化model,赋值一些默认数据
+            self.shopClassifyModel = CNLiveShopClassifyModel()
+            self.shopClassifyModel?.title = ""
+            self.shopClassifyModel?.simg = ""
+            self.shopClassifyModel?.shop_id = DSUserInfoManager.shared.dsUserInfo.id
+            self.shopClassifyModel?.state = "2"
+            self.shopClassifyModel?.isnav = "2"
+            if self.classifyType == .twoLevelClassify{
+                self.shopClassifyModel?.pid = self.superClassifyId
+            }
+        }
+    }
+
+    func initBottomNav(){
+        self.bottomNavView.backgroundColor = .white
+        
+        let  cancelBtn = UIButton(type: .custom)
+        cancelBtn.frame = CGRect(x: 0, y: 0, width: 130, height: KTabBarHeight)
+        cancelBtn.setTitle("取消", for: .normal)
+        cancelBtn.setTitleColor(HexColor("#3A3A3A"), for: .normal)
+        cancelBtn.titleLabel?.font = Font_15
+        cancelBtn.addTarget(self, action: #selector(cancelBtnClick), for: .touchUpInside)
+        self.bottomNavView.addSubview(cancelBtn)
+        
+        let saveBtn = UIButton(type: .custom)
+        saveBtn.frame = CGRect(x: cancelBtn.right, y: 0, width: self.view.width - cancelBtn.right, height: KTabBarHeight)
+        saveBtn.setTitle("保存", for: .normal)
+        saveBtn.setTitleColor(HexColor("#FFFFFF"), for: .normal)
+        saveBtn.titleLabel?.font = Font_15
+        saveBtn.addTarget(self, action: #selector(saveBtnClick), for: .touchUpInside)
+        saveBtn.backgroundColor = UIColor(hue:0.31, saturation:0.39, brightness:0.77, alpha:1.00)
+        self.bottomNavView.addSubview(saveBtn)
+
+    }
+
+    // MARK: - UITableViewDelegate
+    
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return 1
+    }
+    
+    func numberOfSections(in tableView: UITableView) -> Int {
+        return 5
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        if indexPath.section == 0{
+            
+            guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveShopClassifyInputTitelCellID) as? CNLiveShopClassifyInputTitleCell
+            else {
+                let cell = CNLiveShopClassifyInputTitleCell()
+                return cell
+            }
+            self.titleField = cell.textFiled
+            if self.isEdite!{
+                cell.textFiled.text = self.shopClassifyModel?.title
+            }
+            return cell
+        }else if (indexPath.section == 1){
+            guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveShopClassilyIconTableViewCellID) as? CNLiveShopClassilyIconTableViewCell
+            else {
+                let cell = CNLiveShopClassifyInputTitleCell()
+                return cell
+            }
+            self.uploadImageView = cell.selectUploadImageView
+            cell.uploadImageSuceessBlock = {imageUrl in
+                self.shopClassifyModel?.simg = imageUrl
+            }
+            if self.isEdite!{
+                if self.shopClassifyModel?.simg?.count ?? 0 > 0{
+                    cell.selectUploadImageView?.networkImageArr = [self.shopClassifyModel?.simg ?? ""]
+                }
+            }
+            return cell
+        }else if (indexPath.section == 2){
+            guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveShopClassifyInputSortCellID) as? CNLiveShopClassifyInputSortCell
+            else {
+                let cell = CNLiveShopClassifyInputSortCell()
+                return cell
+            }
+            self.sortField = cell.textFiled
+            if (self.isEdite ?? false) {
+                cell.textFiled.text = self.shopClassifyModel?.ord
+            }
+            return cell
+        }else if (indexPath.section == 3){
+            guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveShopClassifySwitchTableViewCellID) as? CNLiveShopClassifySwitchTableViewCell
+            else {
+                let cell = CNLiveShopClassifySwitchTableViewCell()
+                return cell
+            }
+            cell.titlelab.text = "是否显示"
+            cell.switchType = .classify
+            if self.shopClassifyModel?.state == "2"{
+                cell.rightSwitch.isOn = true
+            }else{
+                cell.rightSwitch.isOn = false
+            }
+            cell.switchClickBlock = {on,type in
+                self.shopClassifyModel?.state = on ? "2" : "1"
+                let idxPath = IndexPath(row: 0, section: 3)
+                self.tableView.reloadRows(at: [idxPath], with: .none)
+            }
+            return cell
+        }else if (indexPath.section == 4){
+            guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveShopClassifySwitchTableViewCellID) as? CNLiveShopClassifySwitchTableViewCell
+            else {
+                let cell = CNLiveShopClassifySwitchTableViewCell()
+                return cell
+            }
+            cell.titlelab.text = "是否显示店铺导航栏"
+            cell.switchType = .nav
+            if self.shopClassifyModel?.isnav == "2"{
+                cell.rightSwitch.isOn = true
+            }else{
+                cell.rightSwitch.isOn = false
+            }
+            cell.switchClickBlock = {on,type in
+                self.shopClassifyModel?.isnav = on ? "2" : "1"
+                let idxPath = IndexPath(row: 0, section: 4)
+                self.tableView.reloadRows(at: [idxPath], with: .none)
+            }
+            return cell
+        }
+        return UITableViewCell()
+    }
+    
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        if indexPath.section == 0 || indexPath.section == 2{
+            return 50
+        }else if (indexPath.section == 1){
+            return 155
+        }else if (indexPath.section == 3 || indexPath.section == 4){
+            return 50
+        }
+        return 44
+    }
+    
+    func scrollViewWillBeginDragging(_ scrollView: UIScrollView) {
+        self.view.endEditing(true)
+    }
+    // MARK: - response method
+    ///删除
+    @objc func deleteNavBtnClick(){
+        if self.shopClassifyModel?.id?.isEmpty == true{
+            showMessage(message: "分类id不存在")
+            return
+        }
+        AlertTool.showSystemAlert(title: "是否要删除该分类？", message: nil, actionTitles: ["取消","确定"], style: .alert, actionStyles:[.cancel,.default] ) { index in
+            if index == 2{
+                self.deleteClassify()
+            }
+        }
+    }
+    
+    ///取消
+    @objc func cancelBtnClick(){
+        self.navigationController?.popViewController(animated: true)
+    }
+    
+    /// 保存
+    @objc func saveBtnClick(){
+        self.view.endEditing(true)
+        if self.uploadImageView?.getCurrentSelectImageUrls().count ?? 0 > 0{
+            self.shopClassifyModel?.simg = self.uploadImageView?.getCurrentSelectImageUrls().first
+        }else{
+            self.shopClassifyModel?.simg = ""
+        }
+        
+        if self.titleField?.text?.isEmpty == true{
+            showMessage(message: "请输入分类名称")
+            return
+        }
+        if self.titleField?.text?.count ?? 0 > 8{
+            showMessage(message: "分类名称最多只能输入8个字,请重新输入")
+            return
+        }
+        if self.shopClassifyModel?.simg?.isEmpty == true{
+            showMessage(message: "请选择图标")
+            return
+        }
+        if self.sortField?.text?.isEmpty == true {
+            showMessage(message: "请输入排序")
+            return
+        }
+        if self.sortField?.text?.isPurnInt() == false{
+            showMessage(message: "排序内容只能输入数字")
+            return
+        }
+        
+        if Int(self.sortField?.text ?? "0") ?? 0 >= 10000{
+            showMessage(message: "排序不能大于等于10000")
+            return
+        }
+        if Int(self.sortField?.text ?? "0") ?? 0 == 0{
+            showMessage(message: "排序不能等于0")
+            return
+        }
+        self.shopClassifyModel?.title = self.titleField?.text
+        self.shopClassifyModel?.ord = self.sortField?.text
+        if self.isEdite == true{
+            self.editClassify()
+        }else{
+            self.addClassify()
+        }
+        
+    }
+    
+    // MARK: - 网络请求
+    ///添加分类
+    func addClassify(){
+        showLoading(message: "")
+        CNLiveShopClassilyViewModel.postAddCateRequestWithModel(model: self.shopClassifyModel!) { result, status in
+            hiddenLoading()
+            if status == .success{
+                showMessage(message: "保存成功")
+                self.navigationController?.popViewController(animated: true)
+                self.successCompleteBlock!()
+            }else{
+                showMessage(message: "保存失败")
+            }
+        }
+    }
+    ///编辑分类
+    func editClassify(){
+        showLoading(message: "")
+        CNLiveShopClassilyViewModel.postEditCateRequestWithModel(model: self.shopClassifyModel!) { result, status in
+            hiddenLoading()
+            if status == .success{
+                showMessage(message: "保存成功")
+                self.navigationController?.popViewController(animated: true)
+                self.successCompleteBlock!()
+            }else{
+                showMessage(message: "保存失败")
+            }
+        }
+    }
+    ///删除分类
+    func deleteClassify(){
+        showLoading(message: "")
+        CNLiveShopClassilyViewModel.postDeleteCateRequestWithModel(model: self.shopClassifyModel!) { result, status in
+            hiddenLoading()
+            if status == .success{
+                showMessage(message: "删除成功")
+                self.navigationController?.popViewController(animated: true)
+                self.successCompleteBlock!()
+            }else{
+                showMessage(message: "删除失败")
+            }
+        }
+    }
+}
@@ -3,14 +3,583 @@
 //  metaCode
 //
 //  Created by zx on 2023/11/8.
-//
+//  商品分类/店铺分类
 import Foundation
-class CNLiveGoodsCategoryController: CNLiveBaseViewController {
+///分类类型
+enum CNLiveGoodsCategoryType:Int {
+    ///商品分类
+    case goods
+    ///店铺分类
+    case shop
+}
+
+typealias finishSelectCategoryCallBack = ()->Void
+
+typealias successComplete = ()->Void
+class CNLiveGoodsCategoryController: CNLiveBaseViewController, UITableViewDataSource, UITableViewDelegate {
+    
+    let kCNLiveShopClassifyCellIdentifier = "kCNLiveShopClassifyCellIdentifier"
+
+    //
+    var successCompleteBlock:successComplete?
+    // MARK: - 属性
+    //开始输入前的文本
+    var firCategoryId:String?
+    var secCategoryId:String?
+    var thiCategoryId:String?
+    var firCategoryName:String?
+    var secCategoryName:String?
+    var thiCategoryName:String?
+    ///分类类型，现在有商品分类，店铺分类
+    var categoryType:CNLiveGoodsCategoryType?
+    //完成回调
+    var finishBlock:finishSelectCategoryCallBack?
+    
+    var shadowView:UIView?
+    var contentView:UIView?
+    var line:UIImageView?//DSImageView
+    var firCategoryBtn:UIButton?
+    var secCategoryBtn:UIButton?
+    var thiCategoryBtn:UIButton?
+    var selectImageView:UIImageView?//DSImageView
+    lazy var tableView : UITableView = {
+        let tableView = UITableView(frame:CGRect(x: 0, y: self.line!.bottom, width: self.contentView!.width, height: self.contentView!.height - self.line!.bottom), style: .plain)
+        tableView.dataSource = self
+        tableView.delegate = self
+        tableView.rowHeight = 40
+        tableView.showsVerticalScrollIndicator = false
+        tableView.backgroundColor = .white
+        tableView.separatorStyle = .none
+        let headerView = UIView(frame: CGRect(x: 0, y: 0, width: self.contentView!.width, height: 5))
+        tableView.tableHeaderView = headerView
+        tableView.register(CNLiveShopClassifyCell.self, forCellReuseIdentifier: kCNLiveShopClassifyCellIdentifier)
+        return tableView
+    }()
+
+    lazy var firCategoryDataArr: NSMutableArray = {
+        var firCategoryDataArr = NSMutableArray()
+        return firCategoryDataArr
+    }()
+    lazy var secCategoryDataArr: NSMutableArray = {
+        var secCategoryDataArr = NSMutableArray()
+        return secCategoryDataArr
+    }()
+    lazy var thiCategoryDataArr: NSMutableArray = {
+        var thiCategoryDataArr = NSMutableArray()
+        return thiCategoryDataArr
+    }()
+
+    /// 创建店铺分类按钮,没创建过店铺分类时展示
+    lazy var addShopCalssifyBtn: UIButton = {
+        let  addShopCalssifyBtn = UIButton(type: .custom)
+        addShopCalssifyBtn.frame = CGRect(x: 0, y: self.contentView!.height/2, width: KSreenWidth, height: 40)
+        addShopCalssifyBtn.setTitle("创建店铺分类", for: .normal)
+        addShopCalssifyBtn.setImage(UIImage(named: "DS_WB_CJDP"), for: .normal)
+        addShopCalssifyBtn.setupButtonImageAndTitlePossitionWith(padding: 8, style: .left)
+        addShopCalssifyBtn.setTitleColor(HexColor("FD862E"), for: .normal)
+        addShopCalssifyBtn.titleLabel?.font = Font_15
+        addShopCalssifyBtn.addTarget(self, action: #selector(createBtnClick), for: .touchUpInside)
+        return addShopCalssifyBtn
+    }()
+
+    var _displayLevel:Int = 0
+    var displayLevel:Int {
+        get{
+            _displayLevel
+        }
+        set{
+            _displayLevel = newValue
+            UIView.animate(withDuration: 0.2) {
+                if self.displayLevel == 2{
+                    self.selectImageView?.centerX = self.secCategoryBtn!.centerX
+                    self.secCategoryBtn?.setTitleColor(HexColor("333333"), for: .normal)
+                }else if self.displayLevel == 3{
+                    self.selectImageView?.centerX = self.thiCategoryBtn!.centerX
+                    self.thiCategoryBtn?.setTitleColor(HexColor("333333"), for: .normal)
+                }else{
+                    self.selectImageView?.centerX = self.firCategoryBtn!.centerX
+                }
+            }
+        }
+    }
+    
+    //临时选中一级分类
+    var _temp_selectFirCategoryModel : CNLiveShopGoodsManageDetailsGoodsCategoryModel?
+    var temp_selectFirCategoryModel : CNLiveShopGoodsManageDetailsGoodsCategoryModel? {
+        get{
+            _temp_selectFirCategoryModel
+        }
+        set{
+            _temp_selectFirCategoryModel = newValue!
+            if (_temp_selectFirCategoryModel?.id!.count)! > 0{
+                self.firCategoryBtn?.setTitle(_temp_selectFirCategoryModel?.title, for: .normal)
+            }else{
+                self.firCategoryBtn?.setTitle("请选择", for: .normal)
+            }
+        }
+    }
+    //临时选中二级分类
+    var _temp_selectSecCategoryModel : CNLiveShopGoodsManageDetailsGoodsCategoryModel?
+    var temp_selectSecCategoryModel : CNLiveShopGoodsManageDetailsGoodsCategoryModel? {
+        get{
+            _temp_selectSecCategoryModel
+        }
+        set{
+            _temp_selectSecCategoryModel = newValue!
+            if (_temp_selectSecCategoryModel?.id?.count)! > 0{
+                self.secCategoryBtn?.setTitle(_temp_selectSecCategoryModel?.title, for: .normal)
+                self.secCategoryBtn?.setTitleColor(HexColor("#333333"), for: .normal)
+            }else{
+                self.secCategoryBtn?.setTitle("请选择", for: .normal)
+                if self.displayLevel == 2{
+                    self.secCategoryBtn?.setTitleColor(HexColor("#333333"), for: .normal)
+                }else{
+                    self.secCategoryBtn?.setTitleColor(HexColor("#999999"), for: .normal)
+                }
+            }
+        }
+    }
+    //临时选中三级分类
+    var _temp_selectThiCategoryModel : CNLiveShopGoodsManageDetailsGoodsCategoryModel?
+    var temp_selectThiCategoryModel : CNLiveShopGoodsManageDetailsGoodsCategoryModel? {
+        get{
+            _temp_selectThiCategoryModel
+        }
+        set{
+            _temp_selectThiCategoryModel = newValue!
+
+            if _temp_selectThiCategoryModel!.id!.count > 0{
+                self.thiCategoryBtn?.setTitle(_temp_selectThiCategoryModel?.title, for: .normal)
+                self.thiCategoryBtn?.setTitleColor(HexColor("#333333"), for: .normal)
+            }else{
+                self.thiCategoryBtn?.setTitle("请选择", for: .normal)
+                if self.displayLevel == 3{
+                    self.thiCategoryBtn?.setTitleColor(HexColor("#333333"), for: .normal)
+                }else{
+                    self.thiCategoryBtn?.setTitleColor(HexColor("#999999"), for: .normal)
+                }
+            }
+        }
+    }
+
     override func viewDidLoad() {
         super.viewDidLoad()
+        self.view.backgroundColor = .clear
+        self.topNavView.removeFromSuperview()
+        self.initUI()
+        if self.firCategoryId == "0" || self.firCategoryId?.count == 0{
+            self.secCategoryId = "0"
+            self.thiCategoryId = "0"
+        }else if self.secCategoryId == "0" || self.secCategoryId?.count == 0{
+            self.thiCategoryId = "0"
+        }
+        if self.categoryType == .goods{
+            self.postDataWithPid(pid: "0", level: 1) {
+                if self.secCategoryId?.count ?? 0 > 0 && self.secCategoryId != "0"{
+                    self.postDataWithPid(pid: self.firCategoryId ?? "", level: 2) {
+                        if self.thiCategoryId?.count ?? 0 > 0 && self.thiCategoryId != "0"{
+                            self.postDataWithPid(pid: self.secCategoryId ?? "", level: 3) {
+                            }
+                        }
+                    }
+                }
+            }
+        }else if self.categoryType == .shop{
+            self.postShopClassify()
+        }
+    }
+    
+    
+    // MARK: - initUI
+    func initUI(){
+        self.shadowView = UIView(frame: self.view.bounds)
+        self.shadowView?.backgroundColor = UIColor(white: 0, alpha: 0.26)
+        self.shadowView?.alpha = 0
+        self.view.addSubview(self.shadowView!)
+        let shadowViewTap = UITapGestureRecognizer(target: self, action: #selector(shadowViewTap))
+        self.shadowView?.addGestureRecognizer(shadowViewTap)
+        
+        self.contentView = UIView(frame: CGRect(x: 0, y: self.view.height, width: self.view.width, height: 400))
+        self.contentView?.backgroundColor = .white
+        self.view.addSubview(self.contentView!)
+        
+        self.line = UIImageView(frame: CGRect(x: 0, y: 49-DS_RRV_ONE_PIXEL, width: self.view.width, height: DS_RRV_ONE_PIXEL))
+        self.line!.clipsToBounds = true
+        self.line!.contentMode = .scaleAspectFit
+        self.line!.backgroundColor = HexColor("#EBE9EA")
+        self.contentView?.addSubview(self.line!)
+        
+        self.firCategoryBtn = UIButton(type: .custom)
+        self.firCategoryBtn?.frame = CGRect(x: 5, y: 0, width: 59, height: 49)
+        self.firCategoryBtn?.setTitle("请选择", for: .normal)
+        self.firCategoryBtn?.setTitleColor(HexColor("#333333"), for: .normal)
+        self.firCategoryBtn?.clipsToBounds = true
+        self.firCategoryBtn?.titleLabel?.font = Font_13
+        self.firCategoryBtn?.titleLabel?.lineBreakMode = .byTruncatingTail
+        self.firCategoryBtn?.addTarget(self, action: #selector(firCategoryBtnClick), for: .touchUpInside)
+        self.contentView?.addSubview(self.firCategoryBtn!)
+        
+        self.secCategoryBtn = UIButton(type: .custom)
+        self.secCategoryBtn?.frame = CGRect(x: self.firCategoryBtn!.right+5, y: 0, width: 59, height: 49)
+        self.secCategoryBtn?.setTitle("请选择", for: .normal)
+        self.secCategoryBtn?.setTitleColor(HexColor("#999999"), for: .normal)
+        self.secCategoryBtn?.clipsToBounds = true
+        self.secCategoryBtn?.titleLabel?.font = Font_13
+        self.secCategoryBtn?.titleLabel?.lineBreakMode = .byTruncatingTail
+        self.secCategoryBtn?.addTarget(self, action: #selector(secCategoryBtnClick), for: .touchUpInside)
+        self.contentView?.addSubview(self.secCategoryBtn!)
+        
+        self.thiCategoryBtn = UIButton(type: .custom)
+        self.thiCategoryBtn?.frame = CGRect(x: self.secCategoryBtn!.right+5, y: 0, width: 59, height: 49)
+        self.thiCategoryBtn?.setTitle("请选择", for: .normal)
+        self.thiCategoryBtn?.setTitleColor(HexColor("#999999"), for: .normal)
+        self.thiCategoryBtn?.clipsToBounds = true
+        self.thiCategoryBtn?.titleLabel?.font = Font_13
+        self.thiCategoryBtn?.titleLabel?.lineBreakMode = .byTruncatingTail
+        self.thiCategoryBtn?.addTarget(self, action: #selector(thiCategoryBtnClick), for: .touchUpInside)
+        self.contentView?.addSubview(self.thiCategoryBtn!)
+        
+        if self.categoryType == .goods{
+            ///商品分类三级
+            self.thiCategoryBtn?.isHidden = false
+        }else if self.categoryType == .shop{
+            ///店铺分类二级
+            self.thiCategoryBtn?.isHidden = true
+        }
+        self.selectImageView = UIImageView(frame: CGRect(x: 0, y: self.line!.bottom - 2, width: 39, height: 2))
+        self.selectImageView!.clipsToBounds = true
+        self.selectImageView!.contentMode = .scaleAspectFit
+        self.selectImageView!.backgroundColor = HexColor("#FC1541")
+        self.contentView?.addSubview(self.selectImageView!)
+        self.selectImageView!.centerX = self.firCategoryBtn!.centerX
+        
+        
+        let confirmBtn = UIButton(type: .custom)
+        confirmBtn.frame = CGRect(x: self.contentView!.width-49, y: 0, width: 49, height: 49)
+        confirmBtn.setTitle("确定", for: .normal)
+        confirmBtn.setTitleColor(HexColor("#333333"), for: .normal)
+        confirmBtn.titleLabel?.font = Font_13
+        confirmBtn.addTarget(self, action: #selector(confirmBtnClick), for: .touchUpInside)
+        self.contentView?.addSubview(confirmBtn)
+        
+        self.contentView?.addSubview(self.tableView)
     }
+        
+    // MARK: - 显示/隐藏方法
+    public func display(){
+        self.view.isUserInteractionEnabled = true
+        UIView.animate(withDuration: 0.2) {
+            self.shadowView?.alpha = 1
+            self.contentView!.top = self.view.height-400
+        }
+    }
+    public func hide(){
+        UIView.animate(withDuration: 0.2) {
+            self.shadowView?.alpha = 0
+            self.contentView!.top = self.view.height
+        }completion: { finished in
+            self.view.isUserInteractionEnabled = false
+        }
+    }
+    public func hideView(){
+        self.shadowView?.alpha = 0
+        self.contentView!.top = self.view.height
+        self.view.isUserInteractionEnabled = false
+    }
+
+    // MARK: - UITableViewDelegate
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        if (self.displayLevel == 1) {
+            return self.firCategoryDataArr.count
+        }else if (self.displayLevel == 2) {
+            return self.secCategoryDataArr.count
+        }else if (self.displayLevel == 3) {
+            return self.thiCategoryDataArr.count
+        }else {
+            return 0
+        }
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveShopClassifyCellIdentifier) as? CNLiveShopClassifyCell
+        else {
+            let cell = CNLiveShopClassifyCell()
+            return cell
+        }
+        if self.displayLevel == 1{
+            let model = self.firCategoryDataArr[indexPath.row] as! CNLiveShopGoodsManageDetailsGoodsCategoryModel
+            cell.titleLabel.text = model.title
+            if model.id == self.temp_selectFirCategoryModel?.id{
+                cell.titleLabel.textColor = HexColor("#FC1541")
+            }else{
+                cell.titleLabel.textColor = HexColor("#666666")
+            }
+        }else if (self.displayLevel == 2) {
+            let model = self.secCategoryDataArr[indexPath.row] as! CNLiveShopGoodsManageDetailsGoodsCategoryModel
+            cell.titleLabel.text = model.title
+            if model.id == self.temp_selectSecCategoryModel?.id{
+                cell.titleLabel.textColor = HexColor("#FC1541")
+            }else{
+                cell.titleLabel.textColor = HexColor("#666666")
+            }
+        }else if (self.displayLevel == 3) {
+            let model = self.thiCategoryDataArr[indexPath.row] as! CNLiveShopGoodsManageDetailsGoodsCategoryModel
+            cell.titleLabel.text = model.title
+            if model.id == self.temp_selectThiCategoryModel?.id{
+                cell.titleLabel.textColor = HexColor("#FC1541")
+            }else{
+                cell.titleLabel.textColor = HexColor("#666666")
+            }
+        }else{
+            cell.titleLabel.text = ""
+        }
+        return cell
+    }
+    
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        if self.categoryType == .goods{
+            if self.displayLevel == 1{
+                let model = self.firCategoryDataArr[indexPath.row] as! CNLiveShopGoodsManageDetailsGoodsCategoryModel
+                self.postDataWithPid(pid: model.id!, level: 2) {
+                    self.temp_selectFirCategoryModel = model
+                    self.temp_selectSecCategoryModel = nil
+                    self.temp_selectThiCategoryModel = nil
+                }
+            }else if (self.displayLevel == 2) {
+                let model = self.secCategoryDataArr[indexPath.row] as! CNLiveShopGoodsManageDetailsGoodsCategoryModel
+                self.postDataWithPid(pid: model.id!, level: 3) {
+                    self.temp_selectSecCategoryModel = model
+                    self.temp_selectThiCategoryModel = nil
+                }
+            }else if (self.displayLevel == 3) {
+                let model = self.thiCategoryDataArr[indexPath.row] as! CNLiveShopGoodsManageDetailsGoodsCategoryModel
+                self.temp_selectThiCategoryModel = model
+                self.tableView.reloadData()
+            }
+        }else if self.categoryType == .shop{
+            if (self.displayLevel == 1) {
+                let model = self.firCategoryDataArr[indexPath.row] as! CNLiveShopClassifyModel
+                let tempFirMdl = CNLiveShopGoodsManageDetailsGoodsCategoryModel()
+                tempFirMdl.id = model.id
+                tempFirMdl.title = model.title
+                self.temp_selectFirCategoryModel = tempFirMdl
+                self.temp_selectSecCategoryModel = nil
+                if (model.child.count == 0) {
+                    self.tableView.reloadData()
+                    return
+                }
+                self.displayLevel = 2
+                self.secCategoryDataArr = NSMutableArray(array: model.child)
+                self.tableView.reloadData()
+            }else if (self.displayLevel == 2){
+                let model = self.secCategoryDataArr[indexPath.row] as! CNLiveShopClassifyModel
+                let tempFirMdl = CNLiveShopGoodsManageDetailsGoodsCategoryModel()
+                tempFirMdl.id = model.id
+                tempFirMdl.title = model.title
+                self.temp_selectSecCategoryModel = tempFirMdl
+                self.tableView.reloadData()
+            }
+        }
+    }
+    
+    // MARK: - 触发事件
+    @objc func shadowViewTap(){
+        self.hide()
+    }
+
+    @objc func confirmBtnClick(){
+        if self.categoryType == .goods{
+            if (self.temp_selectFirCategoryModel == nil) || (self.temp_selectSecCategoryModel == nil) || (self.temp_selectThiCategoryModel == nil){
+                showMessage(message: "未选择三级分类")
+                return
+            }
+        }else if self.categoryType == .shop{
+            if (self.temp_selectFirCategoryModel == nil && self.temp_selectSecCategoryModel == nil){
+                showMessage(message: "请选择级分类")
+                return
+            }
+            //需要看能不能转成功
+            let classModel = self.temp_selectFirCategoryModel as? CNLiveShopClassifyModel
+            //DSShopClassifyModel *classModel = (DSShopClassifyModel *)self.temp_selectFirCategoryModel;
+            if classModel!.child.count > 0 && self.temp_selectSecCategoryModel == nil{
+                showMessage(message: "未选择二级分类")
+                return
+            }
+        }
+        
+        self.firCategoryId = self.temp_selectFirCategoryModel?.id
+        self.firCategoryName = self.temp_selectFirCategoryModel?.title
+        self.secCategoryId = self.temp_selectSecCategoryModel?.id
+        self.secCategoryName = self.temp_selectSecCategoryModel?.title
+        self.thiCategoryId = self.temp_selectThiCategoryModel?.id
+        self.thiCategoryName = self.temp_selectThiCategoryModel?.title
+        self.finishBlock!()
+        self.hide()
+    }
+
+    @objc func firCategoryBtnClick(){
+        self.displayLevel = 1
+        self.tableView.reloadData()
+        self.tableView.setContentOffset(CGPointZero, animated: true)
+        if self.temp_selectSecCategoryModel != nil{
+            self.secCategoryBtn?.setTitleColor(HexColor("#333333"), for: .normal)
+            if self.temp_selectThiCategoryModel != nil{
+                self.thiCategoryBtn?.setTitleColor(HexColor("#333333"), for: .normal)
+            }else{
+                self.thiCategoryBtn?.setTitleColor(HexColor("#999999"), for: .normal)
+            }
+        }else{
+            self.secCategoryBtn?.setTitleColor(HexColor("#999999"), for: .normal)
+            self.thiCategoryBtn?.setTitleColor(HexColor("#999999"), for: .normal)
+        }
+    }
+
+    @objc func secCategoryBtnClick(){
+        if self.categoryType == .shop{
+            //需要看能不能转成功
+            let model = self.temp_selectFirCategoryModel as? CNLiveShopClassifyModel
+            if model?.child.count == 0 {
+                showMessage(message: "该分类暂没有添加子分类")
+                return
+            }
+        }
+        if self.temp_selectFirCategoryModel == nil{
+            return
+        }
+        self.displayLevel = 2
+        self.tableView.reloadData()
+        self.tableView.setContentOffset(CGPointZero, animated: true)
+        if self.temp_selectThiCategoryModel != nil{
+            self.thiCategoryBtn?.setTitleColor(HexColor("#333333"), for: .normal)
+        }else{
+            self.thiCategoryBtn?.setTitleColor(HexColor("#999999"), for: .normal)
+        }
+    }
+    @objc func thiCategoryBtnClick(){
+        if self.temp_selectSecCategoryModel == nil{
+            return
+        }
+        self.displayLevel = 3
+        self.tableView.reloadData()
+        self.tableView.setContentOffset(CGPointZero, animated: true)
+    }
+    
+    ///创建店铺分类
+    @objc func createBtnClick(){
+        let vc = CNLiveCreateShopClassifyViewController()
+        vc.classifyType = .oneLevelClassify
+        vc.successCompleteBlock = {
+            self.postShopClassify()
+        }
+        self.navigationController?.pushViewController(vc, animated: false)
+    }
+    
+    
+    // MARK: - 数据请求
+    /**
+     商品分类数据请求
+
+     @param pid 父级id
+     @param level 第几级
+     */
+    func postDataWithPid(pid:String,level:Int,successCompleteBlock:successComplete){
+        showLoading(message: "")
+        CNLiveShopGoodListViewModel.getGetGroupWithUid(uid: DSUserInfoManager.shared.dsUserInfo.uid!, pid: pid) { result, status in
+            hiddenLoading()
+            if status == .success{
+                
+                let dataArr = result as! [CNLiveShopGoodsManageDetailsGoodsCategoryModel]
+                self.displayLevel = level
+                if level == 1{
+                    self.firCategoryDataArr = NSMutableArray(array: dataArr)
+                    self.temp_selectSecCategoryModel = nil
+                    self.temp_selectThiCategoryModel = nil
+                    self.secCategoryDataArr.removeAllObjects()
+                    self.thiCategoryDataArr.removeAllObjects()
+                    if self.firCategoryId?.count ?? 0 > 0 && self.firCategoryId != "0"{
+                        
+                        let tempDataArr = Array(self.firCategoryDataArr)
+                        for (_,mdl) in tempDataArr.enumerated() {
+                            let model = mdl as! CNLiveShopGoodsManageDetailsGoodsCategoryModel
+                            if model.id == self.firCategoryId{
+                                self.temp_selectFirCategoryModel = model
+                                break
+                            }
+                        }
+                    }
+                }else if (level == 2){
+                    self.secCategoryDataArr = NSMutableArray(array: dataArr)
+                    self.temp_selectSecCategoryModel = nil
+                    self.temp_selectThiCategoryModel = nil
+                    self.thiCategoryDataArr.removeAllObjects()
+                    if self.secCategoryId?.count ?? 0 > 0 && self.secCategoryId != "0"{
+                        let tempDataArr = Array(self.thiCategoryDataArr)
+                        for (_,mdl) in tempDataArr.enumerated() {
+                            let model = mdl as! CNLiveShopGoodsManageDetailsGoodsCategoryModel
+                            if model.id == self.secCategoryId{
+                                self.temp_selectSecCategoryModel = model
+                                break
+                            }
+                        }
+                    }else {
+                        self.secCategoryBtn?.setTitle("请选择", for: .normal)
+                    }
+                }else if (level == 3) {
+                    self.thiCategoryDataArr = NSMutableArray(array: dataArr)
+                    self.temp_selectThiCategoryModel = nil
+                    if self.thiCategoryId?.count ?? 0 > 0 && self.thiCategoryId != "0"{
+                        let tempDataArr = Array(self.thiCategoryDataArr)
+                        for (_,mdl) in tempDataArr.enumerated() {
+                            let model = mdl as! CNLiveShopGoodsManageDetailsGoodsCategoryModel
+                            if model.id == self.thiCategoryId{
+                                self.temp_selectThiCategoryModel = model
+                                break
+                            }
+                        }
+                    }else {
+                        self.thiCategoryBtn?.setTitle("请选择", for: .normal)
+                    }
+                }
+                self.tableView.reloadData()
+                self.tableView.setContentOffset(CGPointZero, animated: true)
+                self.successCompleteBlock!()
+                
+            }else if (status == .failed){
+//                self.network_type = .failed
+            }else if (status == .noNetwork){
+//                self.network_type = .noNetwork
+            }
+        }
+    }
+    
+    ///店铺分类数据请求
+    func postShopClassify(){
+        showLoading(message: "")
+        CNLiveShopGoodListViewModel.getCateListWithShopId(shopId: DSUserInfoManager.shared.dsUserInfo.id!) { result, status in
+            hiddenLoading()
+            if status == .success{
+                let classifyListModel = result as! CNLiveShopClassifyListModel
+                self.firCategoryDataArr = NSMutableArray(array: classifyListModel.list)
+                self.displayLevel = 1
+                self.tableView.reloadData()
+                
+                if (self.firCategoryDataArr.count == 0) {
+                    self.contentView?.addSubview(self.addShopCalssifyBtn)
+                }
+                else{
+                    self.addShopCalssifyBtn.removeFromSuperview()
+                }
+            }else if (status == .failed){
+                //self.network_type = .failed
+                
+            }else if (status == .noNetwork){
+                //self.network_type = .noNetwork
+            }
+        }
+    }
+    
 }
+//
+//  CNLiveModalPresentationViewController.swift
+//  metaCode
+//
+//  Created by zx on 2023/11/16.
+//
+
+import Foundation
+
+typealias completionBlock = (_ finished:Bool)->Void
+
+class CNLiveModalPresentationViewController:UIViewController{
+    
+    var _contentView:UIView?
+    var contentView:UIView?{
+        get{
+            _contentView
+        }
+        set{
+            _contentView = newValue
+            
+        }
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        self.view.backgroundColor = .clear
+    }
+    
+    func showingAnimationWithCompletion(completion:completionBlock){
+        
+        self.contentView?.transform = CGAffineTransformMakeTranslation(0, self.view.height-(self.contentView?.top)!)
+        UIView.animate(withDuration: 0.3, delay: 0.0, options: .curveEaseOut) {
+            self.contentView?.transform = CGAffineTransformIdentity
+        } completion: { finished in
+            completion(finished)
+        }
+    }
+    
+    func hidingAnimationWithCompletion(completion:completionBlock){
+        UIView.animate(withDuration: 0.3, delay: 0.0, options: .curveEaseOut) {
+            self.contentView?.transform = CGAffineTransformMakeTranslation(0, self.view.height-self.contentView!.top)
+        } completion: { finished in
+            self.contentView?.transform = CGAffineTransformIdentity
+            completion(finished)
+        }
+    }
+    
+
+
+}
@@ -19,7 +19,12 @@ enum CNLiveShopGoodsAddEditType{
 class CNLiveShopNewProductController:CNLiveBaseViewController{
     var type:CNLiveShopGoodsAddEditType = .add
+    
+    ///最大价格
+    let kCNLiveShopMaxPrice = 10000000
     var goodsId = ""
+    var isRequestAdd:Bool = false
+    
     lazy var bgScrollView :UIScrollView = {
         let bgScrollView = UIScrollView(frame: CGRect(x: 0, y: KNavigationHeight, width: KSreenWidth, height: KSreenHeight-KNavigationHeight-KTabBarHeight))
         bgScrollView.showsVerticalScrollIndicator = false
@@ -30,8 +35,36 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
         let dataModel = CNLiveShopAddEditGoodsModel()
         return dataModel
     }()
+    lazy var shopGoodsDetailsModel: CNLiveShopGoodsDetailsModel = {
+        let shopGoodsDetailsModel = CNLiveShopGoodsDetailsModel()
+        return shopGoodsDetailsModel
+    }()
+    var selectCategoryVC:CNLiveGoodsCategoryController?
+    
+    lazy var selectShopClassifyVC:CNLiveGoodsCategoryController = {
+        let vc = CNLiveGoodsCategoryController()
+        
+        vc.categoryType = .shop
+        if self.shopGoodsDetailsModel.id!.count > 0{
+            vc.firCategoryId = self.shopGoodsDetailsModel.category_id
+            vc.secCategoryId = self.shopGoodsDetailsModel.category_id2
+        }
+        vc.finishBlock = {
+            var singleView = self.getShopClassifyView()
+            singleView.contentTextField.text = "\(self.selectShopClassifyVC.firCategoryName ?? "") \(self.selectShopClassifyVC.secCategoryName ?? "")"
+            singleView.layoutSubviews()
+        }
+        self.addChild(vc)
+        vc.view.frame = CGRect(x: 0, y: 0, width: self.view.width, height: self.view.height)
+        self.view.addSubview(vc.view)
+        vc.didMove(toParent: self)
+        self.selectShopClassifyVC = vc
+        self.selectShopClassifyVC.hideView()
+        return self.selectShopClassifyVC
+        
+    }()
+
-    var selectCategoryVC = CNLiveGoodsCategoryController()
     lazy var bottomNavView :UIView = {
         let bottomNavView = UIView(frame: CGRect(x: 0, y: KSreenHeight-KTabBarHeight, width: self.view.width, height: KTabBarHeight))
         bottomNavView.backgroundColor = HexColor("F2F2F2")
@@ -44,6 +77,9 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
         self.bgScrollView.backgroundColor = .white
         self.view.addSubview(self.bgScrollView)
         self.initBgScrollViewContentView()
+        if (self.type == .edit) {
+            self.requestGoodsData()
+        }
     }
     override func viewWillLayoutSubviews() {
@@ -59,12 +95,34 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
             lastView = singleView
         }
         self.bgScrollView.contentSize = CGSize(width: self.bgScrollView.width, height: lastView?.bottom ?? 0)
-        self.selectCategoryVC.view.frame = CGRect(x: 0, y: 0, width: self.view.width, height: self.view.height)
+        self.selectCategoryVC!.view.frame = CGRect(x: 0, y: 0, width: self.view.width, height: self.view.height)
     }
+    deinit {
+        for i in 0..<self.dataModel.list.count{
+            let singleView = self.view.viewWithTag(i+1) as! CNLiveShopAddGoodsSingleView
+            if singleView.addEditGoodsListModel?.style == "3"{
+                singleView.uploadImageView.deleteUploadImageUrlAfterCancelUploadThings()
+            }
+        }
+    }
     func setUI(){
         navigationBarHidden = false
         titleName = "新增商品"
+        if (self.type == .add) {
+            titleName = "新增商品"
+        }else {
+            titleName = "编辑商品"
+            let deleteNavBtn = UIButton(type: .custom)
+            deleteNavBtn.frame = CGRect(x: 0, y: KStatusBarHeight, width: KNavigationHeight-KStatusBarHeight, height: KNavigationHeight-KStatusBarHeight)
+            deleteNavBtn.backgroundColor = .clear
+            deleteNavBtn.setTitle("删除", for: .normal)
+            deleteNavBtn.setTitleColor(HexColor("#FC1541"), for: .normal)
+            deleteNavBtn.addTarget(self, action: #selector(deleteNavBtnClick), for: .touchUpInside)
+            self.rightNavBtns = [deleteNavBtn]
+            
+        }
+        
         self.initBottomView()
     }
     func initBottomView(){
@@ -90,7 +148,9 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
     func initBgScrollViewContentView(){
         if self.type == .edit{
-            
+            var tempArray = Array(self.dataModel.list)
+            tempArray.removeSubrange(self.dataModel.list.count - 3..<3)
+            self.dataModel.list = tempArray
         }
         self.dataModel.initDataSource()
         for i in 0..<self.dataModel.list.count {
@@ -104,29 +164,173 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
             }
             singleView.tapBlock = { single in
                 // TODO:
-//                if (single.tag == 1) {
-//                    //点击了商品分类
-//                    
-//                    if (self.type == DSShopGoodsManageDetailsVCTypeEdit) {
-//                        DS_showMessage(@"商品分类不能修改");
-//                        return;
-//                    }
-//                    [weakSelf displaySelectCategoryVC];
-//                }
-//                else if([single.addEditGoodsListModel.title isEqualToString:@"店铺分类"])
-//                {
-//                    //点击了店铺分类
-//                    [weakSelf displaySelectShopClassifyVC];
-//                }
+                if (single.tag == 1) {
+                    //点击了商品分类
+                    
+                    if (self.type == .edit) {
+                        showMessage(message: "商品分类不能修改")
+                        return
+                    }
+                    self.displaySelectCategoryVC()
+                }
+                else if single.addEditGoodsListModel!.title == "店铺分类"
+                {
+                    //点击了店铺分类
+                    self.displaySelectShopClassifyVC()
+                }
+            }
+            singleView.changeFrameBlock = {
+                isDelect,model,singleView in
+                if isDelect{
+                    let tempArray = NSMutableArray(array: self.dataModel.list)
+                    tempArray.remove(model)
+                    self.dataModel.list = tempArray as! [CNLiveShopAddEditGoodsListModel]
+                    self.reloadRemoveBgScrollViewContentView(singleView: singleView)
+                }else{
+                    CNLiveShopGoodsManageDetailsInputManager().showCustomParamAlertWithCompleterBlock { k, v in
+                        let paramDict = ["style":1,"isHaveTo":false,"title":k,"contentTextFieldkeyboardType":1,"isDisplayLine":true,"contentType":1,"isDelect":true,"content":v]
+                        let listModel = newDictionaryToModel(paramDict, CNLiveShopAddEditGoodsListModel.self) as! CNLiveShopAddEditGoodsListModel
+                        self.reloadBgScrollViewContentViewModel(model: listModel, index: self.dataModel.list.count+1, isScrollToBottom: true)
+                        self.dataModel.list.append(listModel)
+                    }
+                }
             }
-            
             self.bgScrollView.addSubview(singleView)
         }
     }
+    func reloadBgScrollViewContentViewModel(model:CNLiveShopAddEditGoodsListModel,index:Int,isScrollToBottom:Bool){
+        let singleView = CNLiveShopAddGoodsSingleView()
+        singleView.addEditGoodsListModel = model
+        singleView.tag = index
+        singleView.updateFrameBlock = {
+            self.viewWillLayoutSubviews()
+        }
+        singleView.tapBlock = {singleView in
+            if singleView.tag == 1{
+                if self.type == .edit{
+                    showMessage(message: "商品分类不能修改")
+                    return
+                }
+                self.displaySelectCategoryVC()
+            }else if singleView.addEditGoodsListModel?.title == "店铺分类"{
+                //点击了店铺分类
+                self.displaySelectShopClassifyVC()
+            }
+        }
+        singleView.changeFrameBlock = {isDelect,model,singleView in
+
+            if (isDelect) {
+                
+                let tempArray = NSMutableArray(array: self.dataModel.list)
+                tempArray.remove(model)
+                self.dataModel.list = tempArray as! [CNLiveShopAddEditGoodsListModel]
+                self.reloadRemoveBgScrollViewContentView(singleView: singleView)
+            }
+        }
+        self.bgScrollView.addSubview(singleView)
+        singleView.frame = CGRect(x: 0, y: self.bgScrollView.height, width: self.bgScrollView.width, height: singleView.height)
+        self.bgScrollView.contentSize = CGSize(width: self.bgScrollView.width, height: self.bgScrollView.contentSize.height+50)
+        if (isScrollToBottom) {
+            self.bgScrollView.scrollToBottom()
+        }
+    }
+
+    func reloadRemoveBgScrollViewContentView(singleView:CNLiveShopAddGoodsSingleView){
+        var tempViews = Array(self.bgScrollView.subviews)
+        if (tempViews.firstIndex(of: singleView) == tempViews.count - 1){
+            //是最后一个 直接移除
+            let singView = self.view.viewWithTag(singleView.tag-1) as! CNLiveShopAddGoodsSingleView
+            singleView.removeFromSuperview()
+            self.bgScrollView.contentSize = CGSize(width: self.bgScrollView.width, height: singView.bottom)
+        }else
+        {
+            let i = tempViews.firstIndex(of: singleView)
+            tempViews.removeSubrange(0...i!)
+            singleView.removeFromSuperview()
+            if (tempViews.last!.isKind(of: UIImage.self)){
+                tempViews.removeLast()
+            }
+            for subView in tempViews {
+                subView.top = subView.top - 50
+            }
+            let lastView = tempViews.last
+            self.bgScrollView.contentSize = CGSize(width: self.bgScrollView.width, height: lastView!.bottom)
+            
+        }
+        self.bgScrollView.scrollToBottom()
+    }
+    
+    // MARK: - 显示选取分类界面
+    func displaySelectCategoryVC(){
+        if self.selectCategoryVC == nil{
+            let vc = CNLiveGoodsCategoryController()
+            vc.categoryType = .goods
+            if self.shopGoodsDetailsModel.id!.count > 0{
+                vc.firCategoryId = self.shopGoodsDetailsModel.groupid
+                vc.secCategoryId = self.shopGoodsDetailsModel.groupid2
+                vc.thiCategoryId = self.shopGoodsDetailsModel.groupid3
+            }
+            vc.finishBlock = {
+                //商品分类
+                let singleView1 = self.bgScrollView.viewWithTag(1) as! CNLiveShopAddGoodsSingleView
+                singleView1.contentTextField.text = "\(self.selectCategoryVC?.firCategoryName ?? "") \(self.selectCategoryVC?.secCategoryName ?? "")"
+                singleView1.layoutSubviews()
+            }
+            self.addChild(vc)
+            vc.view.frame = CGRect(x: 0, y: 0, width: self.view.width, height: self.view.height)
+            vc.didMove(toParent: self)
+            self.selectCategoryVC = vc
+        }
+        self.selectCategoryVC?.display()
+    }
+    
+    // MARK: - 获取店铺分类view
+    func getShopClassifyView()->CNLiveShopAddGoodsSingleView{
+        for singleView in self.bgScrollView.subviews {
+            if singleView.isKind(of: CNLiveShopAddGoodsSingleView.self){
+                let single = singleView as! CNLiveShopAddGoodsSingleView
+                if single.addEditGoodsListModel?.title == "店铺分类"{
+                    return single
+                }
+            }
+        }
+        return CNLiveShopAddGoodsSingleView()
+    }
+    // MARK: - 显示选取店铺分类界面
+    func displaySelectShopClassifyVC(){
+        self.selectShopClassifyVC.display()
+    }
+    
+    // MARK: - 字符串trim处理
+    func strimStr(str:String)->String{
+        var strimStr = str
+        strimStr = strimStr.replacingOccurrences(of: " ", with: "")
+        strimStr = strimStr.replacingOccurrences(of: "\n", with: "")
+        return strimStr
+    }
+    
     // MARK: - BtnAction
+    @objc func deleteNavBtnClick(){
+        AlertTool.showSystemAlert(title: "确认删除？", message: nil, actionTitles: ["取消","确定"], style: .alert, actionStyles:[.cancel,.default] ) { index in
+            if (index == 1) {
+                showLoading(message: "")
+                CNLiveShopGoodListViewModel.postChangeGoodsStateWithGoodsId(goodsId: self.goodsId, state: "3") { result, status in
+                    hiddenLoading()
+                    if status == .success{
+                        showMessage(message: "删除成功")
+                        NotificationCenter.default.post(name: Notification.Name.ShopGoodsManage.kDSGoodsManageDeleteNotification, object: nil, userInfo: ["goodsId":self.goodsId ])
+                        self.navigationController?.popViewController(animated: true)
+                    }else{
+                        showMessage(message: "删除失败")
+                    }
+                }
+            }
+        }
+    }
+    
     @objc func previewBtnClick(){
-        /*
+        
         //商品轮播
         let singleView4 = self.bgScrollView.viewWithTag(4) as! CNLiveShopAddGoodsSingleView
         //商品名称
@@ -147,10 +351,10 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
         let singleView20 = self.bgScrollView.viewWithTag(20) as! CNLiveShopAddGoodsSingleView
         //发货时效
         let singleView21 = self.bgScrollView.viewWithTag(21) as! CNLiveShopAddGoodsSingleView
-//        let bannersSelectImageUrls = singleView4.uploadImageView.getCurrentSelectImageUrls
-//        let bannersSelectImageUrls = singleView4.uploadImageView.getCurrentSelectVideoUrl
-//        let bannerSelectVideoImage = singleView4.uploadImageView.getCurrentSelectLocalVideoUrlFirstImage
-//        let contentDetailsSelectImageUrls = singleView13.uploadImageView.getCurrentSelectImageUrls
+        let bannersSelectImageUrls = singleView4.uploadImageView.getCurrentSelectImageUrls()
+        let bannerSelectVideoUrl = singleView4.uploadImageView.getCurrentSelectVideoUrl()
+        let bannerSelectVideoImage = singleView4.uploadImageView.getCurrentSelectLocalVideoUrlFirstImage()
+        let contentDetailsSelectImageUrls = singleView13.uploadImageView.getCurrentSelectImageUrls()
         if (bannersSelectImageUrls.count == 0 && bannerSelectVideoUrl.count == 0) {
             showMessage(message: "请选择商品轮播")
@@ -165,299 +369,431 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
             showMessage(message: "请选择商品详情图")
             return
         }
-        else if (self.selectShopClassifyVC.firCategoryId.count == 0) {
+        else if (self.selectShopClassifyVC.firCategoryId!.count == 0) {
             showMessage(message: "请选择店铺分类")
             return
         }
-        BKShopGoodsDetailsModel * goodsDetailsModel = [[BKShopGoodsDetailsModel alloc] init];
-        NSMutableArray * bannerImage = [NSMutableArray array];
-        for (NSString * imageUrl in bannersSelectImageUrls) {
-            BKGoodsDetailsImageModel * model = [[BKGoodsDetailsImageModel alloc] init];
-            model.simg = imageUrl;
-            [bannerImage addObject:model];
-        }
-        goodsDetailsModel.image = [bannerImage copy];
-        DSGoodsDetailsBannerVideosModel * banner_video = [[DSGoodsDetailsBannerVideosModel alloc] init];
-        if (bannerSelectVideoImage) {
-            banner_video.video_image = bannerSelectVideoImage;
-        }else {
-            banner_video.video_img = self.shopGoodsDetailsModel.video.video_img;
-        }
-        banner_video.video_url = bannerSelectVideoUrl;
-        goodsDetailsModel.video = banner_video;
-        goodsDetailsModel.title = singleView5.contentTextField.text;
-        goodsDetailsModel.ads = singleView6.contentTextView.text;
-        goodsDetailsModel.price = singleView7.contentTextField.text;
-        goodsDetailsModel.prices = singleView8.contentTextField.text;
-        goodsDetailsModel.category_id = self.selectShopClassifyVC.firCategoryId;
-        goodsDetailsModel.category_id2 = self.selectShopClassifyVC.secCategoryId;
-        
-        NSMutableArray * contentDetailsImage = [NSMutableArray array];
-        for (NSString * imageUrl in contentDetailsSelectImageUrls) {
-            BKGoodsDetailsContentModel * model = [[BKGoodsDetailsContentModel alloc] init];
-            model.simg = imageUrl;
-            [contentDetailsImage addObject:model];
+        let goodsDetailsModel = CNLiveShopGoodsDetailsModel()
+        var bannerImage = NSMutableArray()
+        for imageUrl in bannersSelectImageUrls {
+            let model = CNLiveShopGoodsDetailsModel()
+            model.simg = imageUrl
+            bannerImage.add(model)
         }
-        goodsDetailsModel.detail_img = [contentDetailsImage copy];
-        
-        NSMutableArray * kvArray = [[NSMutableArray alloc] init];
-        [kvArray addObject:@{@"k":@"品名",@"v":singleView18.contentTextField.text}];
-        [kvArray addObject:@{@"k":@"规格",@"v":singleView19.contentTextField.text}];
-        [kvArray addObject:@{@"k":@"寄送区域",@"v":singleView20.contentTextView.text}];
-        [kvArray addObject:@{@"k":@"发货时效",@"v":singleView21.contentTextField.text}];
+        goodsDetailsModel.image = Array(bannerImage) as! [CNLiveGoodsDetailsImageModel]
+        let banner_video = CNLiveGoodsDetailsBannerVideosModel()
+        if (bannerSelectVideoImage != nil){
+            banner_video.video_image = bannerSelectVideoImage
+        }else{
+            banner_video.video_img = self.shopGoodsDetailsModel.video?.video_img
+        }
+        banner_video.video_url = bannerSelectVideoUrl
+        goodsDetailsModel.video = banner_video
+        goodsDetailsModel.title = singleView5.contentTextField.text
+        goodsDetailsModel.ads = singleView6.contentTextView.text
+        goodsDetailsModel.price = singleView7.contentTextField.text
+        goodsDetailsModel.prices = singleView8.contentTextField.text
+        goodsDetailsModel.category_id = self.selectShopClassifyVC.firCategoryId
+        goodsDetailsModel.category_id2 = self.selectShopClassifyVC.secCategoryId
+        var contentDetailsImage = NSMutableArray()
+        for imageUrl in contentDetailsSelectImageUrls{
+            let model = CNLiveGoodsDetailsContentModel()
+            model.simg = imageUrl
+            contentDetailsImage.add(model)
+        }
+        goodsDetailsModel.detail_img = Array(contentDetailsImage) as! [CNLiveGoodsDetailsContentModel]
+        var kvArray = NSMutableArray()
+        kvArray.add(["k":"品名","v":singleView18.contentTextField.text])
+        kvArray.add(["k":"规格","v":singleView19.contentTextField.text])
+        kvArray.add(["k":"寄送区域","v":singleView20.contentTextField.text])
+        kvArray.add(["k":"发货时效","v":singleView21.contentTextField.text])
+        var tempArray = NSMutableArray(array: self.bgScrollView.subviews)
-        NSMutableArray * tempArray = [self.bgScrollView.subviews mutableCopy];
-        [tempArray removeObjectsInRange:NSMakeRange(0, [tempArray indexOfObject:singleView19])];
-        if (tempArray.count > 2) {
-            for (DSShopGoodsManageDetailsSingleView * singleView in tempArray) {
-                if ([singleView isKindOfClass:DSShopGoodsManageDetailsSingleView.class]) {
-                    if (singleView.contentTextField.text.length > 0 && ![kvArray containsObject:@{@"k":singleView.model.title,@"v":singleView.contentTextField.text}]) {
-                        [kvArray addObject:@{@"k":singleView.model.title,@"v":singleView.contentTextField.text}];
+        let subArr = tempArray.subarray(with: NSRange(location: 0, length: tempArray.index(of: singleView19)))
+        tempArray.removeObjects(in: subArr)
+        if tempArray.count > 2{
+            for singleView in tempArray{
+                if (singleView as AnyObject).isKind(of: CNLiveShopAddGoodsSingleView.self){
+                    let single = singleView as! CNLiveShopAddGoodsSingleView
+                    if single.contentTextField.text!.count > 0 && kvArray.contains(["k":single.addEditGoodsListModel!.title,"v":single.contentTextField.text]){
+                        kvArray.add(["k":single.addEditGoodsListModel!.title,"v":single.contentTextField.text])
                     }
                 }
             }
         }
-        goodsDetailsModel.attrArray = kvArray;
-        
-        BKShopGoodsDetailsViewController * vc = [[BKShopGoodsDetailsViewController alloc] init];
-        vc.type = BKShopGoodsDetailsVCTypePreview;
-        vc.detailsModel = goodsDetailsModel;
-        vc.goodsId = self.goodsId;
-        [self dsPushViewController:vc animated:YES];
-         */
+        goodsDetailsModel.attrArray = kvArray as! [Dictionary<String, Any>]
+        let vc = CNLiveShopGoodsDetailsViewController()
+        vc.type = .preview
+        vc.detailsModel = goodsDetailsModel
+        vc.goodsId = self.goodsId
+        self.navigationController?.pushViewController(vc, animated: false)
     }
     @objc func saveBtnClick(){
-         /*
-        DSShopGoodsManageDetailsSingleView * singleView4 = [self.bgScrollView viewWithTag:4];//商品轮播
-        DSShopGoodsManageDetailsSingleView * singleView5 = [self.bgScrollView viewWithTag:5];//商品名称
-        DSShopGoodsManageDetailsSingleView * singleView6 = [self.bgScrollView viewWithTag:6];//商品副标题
-        DSShopGoodsManageDetailsSingleView * singleView7 = [self.bgScrollView viewWithTag:7];//本店售价
-        DSShopGoodsManageDetailsSingleView * singleView8 = [self.bgScrollView viewWithTag:8];//市场售价
-        DSShopGoodsManageDetailsSingleView * singleView9 = [self.bgScrollView viewWithTag:9];//商品重量
-        DSShopGoodsManageDetailsSingleView * singleView10 = [self.bgScrollView viewWithTag:10];//最低起售
-        DSShopGoodsManageDetailsSingleView * singleView11 = [self.bgScrollView viewWithTag:11];//上架
-        
-        DSShopGoodsManageDetailsSingleView * singleView13 = [self.bgScrollView viewWithTag:13];//商品详情图
-        DSShopGoodsManageDetailsSingleView * singleView14 = [self.bgScrollView viewWithTag:14];//商品运费
-        DSShopGoodsManageDetailsSingleView * singleView15 = [self.bgScrollView viewWithTag:15];//是否支持退货
-        DSShopGoodsManageDetailsSingleView * singleView16 = [self.bgScrollView viewWithTag:16];//商品单位
-        
-        DSShopGoodsManageDetailsSingleView * singleView18 = [self.bgScrollView viewWithTag:18];//品名
-        DSShopGoodsManageDetailsSingleView * singleView19 = [self.bgScrollView viewWithTag:19];//规格
-        DSShopGoodsManageDetailsSingleView * singleView20 = [self.bgScrollView viewWithTag:20];//寄送区域
-        DSShopGoodsManageDetailsSingleView * singleView21 = [self.bgScrollView viewWithTag:21];//发货时效
-        
-
-        NSArray * bannersSelectImageUrls = [singleView4.uploadImageView getCurrentSelectImageUrls];
-        NSMutableArray * bannerImage = [NSMutableArray array];
-        for (NSString * imageUrl in bannersSelectImageUrls) {
-            [bannerImage addObject:@{@"img":imageUrl, @"ord":@"99"}];
-        }
-        NSData * bannerImageData = [NSJSONSerialization dataWithJSONObject:bannerImage options:NSJSONWritingPrettyPrinted error:nil];
-        NSString * bannerImageStr = [[NSString alloc] initWithData:bannerImageData encoding:NSUTF8StringEncoding];
-        bannerImageStr = [bannerImageStr stringByReplacingOccurrencesOfString:@"\\n" withString:@""];
-        bannerImageStr = [bannerImageStr stringByReplacingOccurrencesOfString:@"\n" withString:@""];
-        bannerImageStr = [bannerImageStr stringByReplacingOccurrencesOfString:@"\\" withString:@""];
-        bannerImageStr = [bannerImageStr stringByReplacingOccurrencesOfString:@" " withString:@""];
-        
-        NSString * bannerSelectVideoUrl = [singleView4.uploadImageView getCurrentSelectVideoUrl];
-        
-        NSArray * contentDetailsSelectImageUrls = [singleView13.uploadImageView getCurrentSelectImageUrls];
-        NSMutableArray * contentDetailsImage = [NSMutableArray array];
-        for (NSString * imageUrl in contentDetailsSelectImageUrls) {
-            [contentDetailsImage addObject:@{@"img":imageUrl, @"ord":@"99"}];
-        }
-        NSData * contentDetailsImageData = [NSJSONSerialization dataWithJSONObject:contentDetailsImage options:NSJSONWritingPrettyPrinted error:nil];
-        NSString * contentDetailsImageStr = [[NSString alloc] initWithData:contentDetailsImageData encoding:NSUTF8StringEncoding];
-        contentDetailsImageStr = [contentDetailsImageStr stringByReplacingOccurrencesOfString:@"\\n" withString:@""];
-        contentDetailsImageStr = [contentDetailsImageStr stringByReplacingOccurrencesOfString:@"\n" withString:@""];
-        contentDetailsImageStr = [contentDetailsImageStr stringByReplacingOccurrencesOfString:@"\\" withString:@""];
-        contentDetailsImageStr = [contentDetailsImageStr stringByReplacingOccurrencesOfString:@" " withString:@""];
+        //商品轮播
+        let singleView4 = self.bgScrollView.viewWithTag(4) as! CNLiveShopAddGoodsSingleView
+        //商品名称
+        let singleView5 = self.bgScrollView.viewWithTag(5) as! CNLiveShopAddGoodsSingleView
+        //商品副标题
+        let singleView6 = self.bgScrollView.viewWithTag(6) as! CNLiveShopAddGoodsSingleView
+        //本店售价
+        let singleView7 = self.bgScrollView.viewWithTag(7) as! CNLiveShopAddGoodsSingleView
+        //市场售价
+        let singleView8 = self.bgScrollView.viewWithTag(8) as! CNLiveShopAddGoodsSingleView
+        //商品重量
+        let singleView9 = self.bgScrollView.viewWithTag(9) as! CNLiveShopAddGoodsSingleView
+        //最低起售
+        let singleView10 = self.bgScrollView.viewWithTag(10) as! CNLiveShopAddGoodsSingleView
+        //上架
+        let singleView11 = self.bgScrollView.viewWithTag(11) as! CNLiveShopAddGoodsSingleView
+        //商品详情图
+        let singleView13 = self.bgScrollView.viewWithTag(13) as! CNLiveShopAddGoodsSingleView
+        //商品运费
+        let singleView14 = self.bgScrollView.viewWithTag(14) as! CNLiveShopAddGoodsSingleView
+        //是否支持退货
+        let singleView15 = self.bgScrollView.viewWithTag(15) as! CNLiveShopAddGoodsSingleView
+        //商品单位
+        let singleView16 = self.bgScrollView.viewWithTag(16) as! CNLiveShopAddGoodsSingleView
+        //品名
+        let singleView18 = self.bgScrollView.viewWithTag(18) as! CNLiveShopAddGoodsSingleView
+        //规格
+        let singleView19 = self.bgScrollView.viewWithTag(19) as! CNLiveShopAddGoodsSingleView
+        //寄送区域
+        let singleView20 = self.bgScrollView.viewWithTag(20) as! CNLiveShopAddGoodsSingleView
+        //发货时效
+        let singleView21 = self.bgScrollView.viewWithTag(21) as! CNLiveShopAddGoodsSingleView
+        let bannersSelectImageUrls = singleView4.uploadImageView.getCurrentSelectImageUrls()
-        if (self.type == DSShopGoodsManageDetailsVCTypeAdd && [self.selectCategoryVC.thiCategoryId length] == 0) {
-            DS_showMessage(@"请选择商品分类");
-            return;
-        }
-        else if (!self.selectShopClassifyVC.firCategoryId ||[DS_ToString(self.selectShopClassifyVC.firCategoryId) length] == 0
-            || [DS_ToString(self.selectShopClassifyVC.firCategoryId) isEqualToString:@"0"]) {
-            DS_showMessage(@"请选择店铺分类");
-            return;
-        }
-        else if ([bannersSelectImageUrls count] == 0 && [bannerSelectVideoUrl length] == 0) {
-            DS_showMessage(@"请选择商品轮播");
-            return;
-        }else if ([[self strimStr:singleView5.contentTextField.text] length] == 0) {
-            DS_showMessage(@"请输入商品名称");
-            return;
-        }
-        else if ([singleView5.contentTextField.text length] > 50) {
-            DS_showMessage(@"商品名称最多支持50个字");
-            return;
-        }
-        else if ([singleView6.contentTextView.text length] > 30)
-        {
-            DS_showMessage(@"副商品名称最多支持30个字");
-            return;
-        }else if ([singleView7.contentTextField.text length] == 0) {
-            DS_showMessage(@"请输入本店售价");
-            return;
-        }else if ([singleView7.contentTextField.text onlyNumber] && [singleView7.contentTextField.text length] >= DSMaxPrice) {
-            DS_showMessage(@"请输入正确的售价");
-            return;
-        }else if ([singleView8.contentTextField.text onlyNumber] && [singleView8.contentTextField.text length] >= DSMaxPrice) {
-            DS_showMessage(@"请输入正确的市场售价");
-            return;
-        }else if ([singleView8.contentTextField.text length] == 0) {
-            DS_showMessage(@"请输入的市场售价");
-            return;
-        }else if ([singleView10.countTF.text length] >= 5) {
-            DS_showMessage(@"请输入正确的起售件数");
-            return;
-        }else if ([contentDetailsSelectImageUrls count] == 0) {
-            DS_showMessage(@"请选择商品详情图");
-            return;
-        }else if ([[self strimStr:singleView18.contentTextField.text] length] == 0) {
-            DS_showMessage(@"请输入品名");
-            return;
-        }else if ([[self strimStr:singleView19.contentTextField.text] length] == 0) {
-            DS_showMessage(@"请输入规格");
-            return;
-        }else if ([[self strimStr:singleView20.contentTextView.text] length] == 0) {
-            DS_showMessage(@"请输入寄送区域");
-            return;
-        }else if ([singleView21.contentTextField.text length] == 0) {
-            DS_showMessage(@"请输入发货时效");
-            return;
+        var bannerImage = NSMutableArray()
+        for imageUrl in bannersSelectImageUrls{
+            bannerImage.add(["img":imageUrl,"ord":"99"])
         }
+        var bannerImageStr = ""
+        do {
+            let bannerImageData = try  JSONSerialization.data(withJSONObject: bannerImage, options: .prettyPrinted)
+            bannerImageStr = String(data: bannerImageData, encoding: .utf8) ?? ""
+            bannerImageStr = bannerImageStr.replacingOccurrences(of: "\\n", with: "")
+            bannerImageStr = bannerImageStr.replacingOccurrences(of: "\n", with: "")
+            bannerImageStr = bannerImageStr.replacingOccurrences(of: "\\", with: "")
+            bannerImageStr = bannerImageStr.replacingOccurrences(of: " ", with: "")
+        } catch _ {}
-        
-        NSMutableArray * kvArray = [[NSMutableArray alloc] init];
-        [kvArray addObject:@{@"k":@"品名",@"v":singleView18.contentTextField.text}];
-        [kvArray addObject:@{@"k":@"规格",@"v":singleView19.contentTextField.text}];
-        [kvArray addObject:@{@"k":@"寄送区域",@"v":singleView20.contentTextView.text}];
-        [kvArray addObject:@{@"k":@"发货时效",@"v":singleView21.contentTextField.text}];
-        
-        NSMutableArray * tempArray = [self.bgScrollView.subviews mutableCopy];
-        [tempArray removeObjectsInRange:NSMakeRange(0, [tempArray indexOfObject:singleView21])];
-        if (tempArray.count > 2) {
-            for (DSShopGoodsManageDetailsSingleView * singleView in tempArray) {
-                if ([singleView isKindOfClass:DSShopGoodsManageDetailsSingleView.class]) {
-                    if (singleView.contentTextField.text.length > 0 && ![kvArray containsObject:@{@"k":singleView.model.title,@"v":singleView.contentTextField.text}]) {
-                        [kvArray addObject:@{@"k":singleView.model.title,@"v":singleView.contentTextField.text}];
+        let bannerSelectVideoUrl = singleView4.uploadImageView.getCurrentSelectVideoUrl()
+        let contentDetailsSelectImageUrls = singleView13.uploadImageView.getCurrentSelectImageUrls()
+        var contentDetailsImage = NSMutableArray()
+        for imageUrl in contentDetailsSelectImageUrls{
+            contentDetailsImage.add(["img":imageUrl,"ord":"99"])
+        }
+        var contentDetailsImageStr = ""
+        do {
+            let contentDetailsImageData = try JSONSerialization.data(withJSONObject: contentDetailsImage, options: .prettyPrinted)
+            contentDetailsImageStr = String(data: contentDetailsImageData, encoding: .utf8)!
+            contentDetailsImageStr = contentDetailsImageStr.replacingOccurrences(of: "\\n", with: "")
+            contentDetailsImageStr = contentDetailsImageStr.replacingOccurrences(of: "\n", with: "")
+            contentDetailsImageStr = contentDetailsImageStr.replacingOccurrences(of: "\\", with: "")
+            contentDetailsImageStr = contentDetailsImageStr.replacingOccurrences(of: " ", with: "")
+        } catch _ {}
+        if self.type == .add && self.selectCategoryVC?.thiCategoryId?.count == 0{
+            showMessage(message: "请选择商品分类")
+            return
+        }else if self.selectShopClassifyVC.firCategoryId == nil || self.selectShopClassifyVC.firCategoryId?.count == 0 || self.selectShopClassifyVC.firCategoryId == "0"{
+            showMessage(message: "请选择店铺分类")
+            return
+        }else if bannersSelectImageUrls.count == 0 && bannerSelectVideoUrl.count == 0{
+            showMessage(message: "请选择商品轮播")
+            return
+        }else if self.strimStr(str: singleView5.contentTextField.text!).count == 0{
+            showMessage(message: "请输入商品名称")
+            return
+        }else if singleView5.contentTextField.text?.count ?? 0 > 50{
+            showMessage(message: "商品名称最多支持50个字")
+            return
+        }else if singleView6.contentTextView.text.count > 30{
+            showMessage(message: "副商品名称最多支持30个字")
+            return
+        }else if singleView7.contentTextField.text?.count == 0{
+            showMessage(message: "请输入本店售价")
+            return
+        }else if singleView7.contentTextField.text?.isPurnInt() == true && singleView7.contentTextField.text!.count >= kCNLiveShopMaxPrice{
+            showMessage(message: "请输入正确的售价")
+            return
+        }else if singleView8.contentTextField.text?.isPurnInt() == true && singleView8.contentTextField.text!.count >= kCNLiveShopMaxPrice{
+            showMessage(message: "请输入正确的市场售价")
+            return
+        }else if singleView8.contentTextField.text?.count == 0{
+            showMessage(message: "请输入的市场售价")
+            return
+        }else if singleView10.countTF.text?.count ?? 0 >= 5{
+            showMessage(message: "请输入正确的起售件数")
+            return
+        }else if contentDetailsSelectImageUrls.count == 0{
+            showMessage(message: "请选择商品详情图")
+            return
+        }else if self.strimStr(str: singleView18.contentTextField.text ?? "").count == 0{
+            showMessage(message: "请输入品名")
+            return
+        }else if self.strimStr(str: singleView19.contentTextField.text ?? "").count == 0{
+            showMessage(message: "请输入规格")
+            return
+        }else if self.strimStr(str: singleView20.contentTextView.text ?? "").count == 0{
+            showMessage(message: "请输入寄送区域")
+            return
+        }else if self.strimStr(str: singleView21.contentTextField.text ?? "").count == 0{
+            showMessage(message: "请输入发货时效")
+            return
+        }
+        var kvArray = NSMutableArray()
+        kvArray.add(["k":"品名","v":singleView18.contentTextField.text])
+        kvArray.add(["k":"规格","v":singleView19.contentTextField.text])
+        kvArray.add(["k":"寄送区域","v":singleView20.contentTextView.text])
+        kvArray.add(["k":"发货时效","v":singleView21.contentTextField.text])
+        var tempArray = NSMutableArray(array: self.bgScrollView.subviews)
+        tempArray.subarray(with: NSRange(location: 0, length: tempArray.index(of: singleView21)))
+        if tempArray.count > 2{
+            for singleView in tempArray {
+                if (singleView as AnyObject).isKind(of: CNLiveShopAddGoodsSingleView.self){
+                    
+                    if (singleView as! CNLiveShopAddGoodsSingleView).contentTextField.text?.count ?? 0 > 0 && !kvArray.contains(["k":(singleView as! CNLiveShopAddGoodsSingleView).addEditGoodsListModel?.title,"v":(singleView as! CNLiveShopAddGoodsSingleView).contentTextField.text]){
+                        kvArray.add(["k":(singleView as! CNLiveShopAddGoodsSingleView).addEditGoodsListModel?.title,"v":(singleView as! CNLiveShopAddGoodsSingleView).contentTextField.text])
                     }
                 }
             }
         }
-        
-        for (int i = 4; i < 20; i ++) {
-            if (i == 11 || i == 16) continue;
-            DSShopGoodsManageDetailsSingleView * singleView = [self.bgScrollView viewWithTag:i];
-            NSString * content = [singleView.contentTextField.text isNotBlank] ? singleView.contentTextField.text : singleView.contentTextView.text;
-            if ([self stringContainsEmoji:content]) {
-                DS_showMessage(@"参数不能添加表情");
-                return;
+        for i in 4..<20 {
+            if i == 11 || i == 16{
+                continue
+            }
+            var singleView = self.bgScrollView.viewWithTag(i) as! CNLiveShopAddGoodsSingleView
+            let content = (singleView.contentTextField.text?.isEmpty == true ? singleView.contentTextField.text : singleView.contentTextView.text) ?? ""
+            if self.stringContainsEmoji(string: content){
+                showMessage(message: "参数不能添加表情")
+                return
             }
         }
-        
-        
-        for (NSDictionary * subDict in kvArray) {
-            if ([self stringContainsEmoji:[subDict objectForKey:@"k"]]) {
-                DS_showMessage(@"规格参数不能添加表情");
-                return;
+            
+        for sub in kvArray{
+            let subDict = sub as! NSDictionary
+            if self.stringContainsEmoji(string: subDict.object(forKey: "k") as! String){
+                showMessage(message: "规格参数不能添加表情")
+                return
             }
-            if ([self stringContainsEmoji:[subDict objectForKey:@"v"]]) {
-                DS_showMessage(@"规格参数不能添加表情");
-                return;
+            if self.stringContainsEmoji(string: subDict.object(forKey: "v") as! String){
+                showMessage(message: "规格参数不能添加表情")
+                return
             }
         }
-        
-        NSString *category_id = @"";
-        if (![NSString isEmpty:self.selectShopClassifyVC.secCategoryId]) {
-            category_id = self.selectShopClassifyVC.secCategoryId;
+        var category_id = ""
+        if self.selectShopClassifyVC.secCategoryId?.isEmpty == false {
+            category_id = self.selectShopClassifyVC.secCategoryId!
+        }else{
+            category_id = self.selectShopClassifyVC.firCategoryId!
         }
-        else
-        {
-            category_id = self.selectShopClassifyVC.firCategoryId;
+        showLoading(message: "")
+        if self.type == .add{
+            CNLiveShopGoodListViewModel.postGoodsAddWithUid(uid: DSUserInfoManager.shared.dsUserInfo.uid!, groupid3: self.selectCategoryVC?.thiCategoryId ?? "", bannerImg: bannerImageStr, simg: bannersSelectImageUrls.first!, video: bannerSelectVideoUrl, title: singleView5.contentTextField.text ?? "", ads: singleView6.contentTextView.text, price: singleView7.contentTextField.text ?? "", prices: singleView8.contentTextField.text ?? "", kg: singleView9.contentTextField.text ?? "", unit: singleView16.contentTextField.text ?? "", state: singleView11.contentSwitch.isOn ? "2" : "1", storage:self.dicArrayToJson(kvArray as! [Dictionary<String, Any>]), infoImg: contentDetailsImageStr, yunfei: singleView14.contentTextField.text ?? "", min_count: singleView10.countTF.text ?? "", isRefund: "0", category_id: category_id) { result, status in
+                hiddenLoading()
+                if status == .failed{
+                    showMessage(message: "发布失败")
+                    return
+                }
+                if status == .success{
+                    showMessage(message: "发布成功")
+                    NotificationCenter.default.post(name: NSNotification.Name.ShopGoodsManage.kDSGoodsManageAddNotification, object: nil)
+                    for i in 0..<self.dataModel.list.count{
+                        var singleView = self.view.viewWithTag(i+1) as! CNLiveShopAddGoodsSingleView
+                        if singleView.addEditGoodsListModel?.style == "3"{
+                            singleView.uploadImageView.deleteReplaceImageUrlAfterSuccessUploadThings()
+                        }
+                    }
+                    self.navigationController?.popViewController(animated: true)
+                }
+            }
+        }else{
+            CNLiveShopGoodListViewModel.postGoodsAddWithUid(uid: DSUserInfoManager.shared.dsUserInfo.uid!, groupid3: self.selectCategoryVC?.thiCategoryId ?? "", bannerImg: bannerImageStr, simg: bannersSelectImageUrls.first!, video: bannerSelectVideoUrl, title: singleView5.contentTextField.text ?? "", ads: singleView6.contentTextView.text ?? "", price: singleView7.contentTextField.text ?? "", prices: singleView8.contentTextField.text ?? "", kg: singleView9.contentTextField.text ?? "", unit: singleView16.contentTextField.text ?? "", state: singleView11.contentSwitch.isOn ? "2" : "1", storage: self.dicArrayToJson(kvArray as! [Dictionary<String, Any>]), infoImg: contentDetailsImageStr, yunfei: singleView14.contentTextField.text ?? "", min_count: singleView10.countTF.text ?? "", isRefund: "0", category_id: category_id) { result, status in
+                hiddenLoading()
+                if status == .failed{
+                    showMessage(message: "修改失败")
+                    return
+                }
+                if status == .success{
+                    showMessage(message: "修改成功")
+                    NotificationCenter.default.post(name: NSNotification.Name.ShopGoodsManage.kDSGoodsManageEditNotification, object: nil, userInfo: (result as! Dictionary))
+                    for i in 0..<self.dataModel.list.count{
+                        var singleView = self.view.viewWithTag(i+1) as! CNLiveShopAddGoodsSingleView
+                        if singleView.addEditGoodsListModel?.style == "3"{
+                            singleView.uploadImageView.deleteReplaceImageUrlAfterSuccessUploadThings()
+                        }
+                    }
+                    self.navigationController?.popViewController(animated: true)
+                }
+            }
+        }
+    }
+    func dicArrayToJson(_ dicArray:[Dictionary<String, Any>])->String{
+        //首先判断能不能转换
+        if (!JSONSerialization.isValidJSONObject(dicArray)) {
+            //print("is not a valid json object")
+            return ""
         }
-        
-        [self.view showLoading];
-        if (self.type == DSShopGoodsManageDetailsVCTypeAdd) {
-            [DSShopRequest postGoodsAddWithUid:DS_USER_MODEL.uid
-                                      groupid3:self.selectCategoryVC.thiCategoryId
-                                     bannerImg:bannerImageStr
-                                          simg:[bannersSelectImageUrls firstObject]
-                                         video:bannerSelectVideoUrl
-                                         title:singleView5.contentTextField.text
-                                           ads:singleView6.contentTextView.text
-                                         price:singleView7.contentTextField.text
-                                        prices:singleView8.contentTextField.text
-                                            kg:singleView9.contentTextField.text
-                                          unit:singleView16.contentTextField.text
-                                         state:singleView11.contentSwitch.on ? @"2" : @"1"
-                                       storage:[kvArray mj_JSONString]
-                                       infoImg:contentDetailsImageStr
-                                        yunfei:singleView14.contentTextField.text
-                                     min_count:singleView10.countTF.text
-                                      isRefund:@"0"//singleView15.contentSwitch.on ? @"0" : @"1"
-                                       category_id:category_id
-                                        result:^(NSDictionary * _Nonnull jsonData, NSString * _Nonnull errorMessage) {
-                [self.view hideLoading];
-                if (errorMessage) {
-                    DS_showMessage(errorMessage);
-                    return;
-                }
-                DS_showMessage(@"发布成功");
-                [[NSNotificationCenter defaultCenter] postNotificationName:kDSGoodsManageAddNotification object:nil];
+        //利用OC的json库转换成OC的NSData，
+        //如果设置options为NSJSONWritingOptions.PrettyPrinted，则打印格式更好阅读
+        let data : Data! = try? JSONSerialization.data(withJSONObject: dicArray, options: [])
+        //NSData转换成NSString打印输出
+        let str = NSString(data:data, encoding: String.Encoding.utf8.rawValue)
+        //输出json字符串
+        return str! as String
+    }
+    // MARK: - 是否包含表情
+    func stringContainsEmoji(string:String) -> Bool {
+        for scalar in string.unicodeScalars {
+            switch scalar.value {
+            case 0x1F600...0x1F64F, // Emoticons
+            0x1F300...0x1F5FF, // Misc Symbols and Pictographs
+            0x1F680...0x1F6FF, // Transport and Map
+            0x1F1E6...0x1F1FF, // Regional country flags
+            0x2600...0x26FF,   // Misc symbols
+            0x2700...0x27BF,   // Dingbats
+            0xFE00...0xFE0F,   // Variation Selectors
+            0x1F900...0x1F9FF,  // Supplemental Symbols and Pictographs
+            127000...127600, // Various asian characters
+            65024...65039, // Variation selector
+            9100...9300, // Misc items
+            8400...8447: // Combining Diacritical Marks for Symbols
+                return true
+            default:
+                continue
+            }
+        }
+        return false
+    }
+    
+    // MARK: - 获取商品数据
+    func requestGoodsData(){
+        showLoading(message: "")
+        CNLiveShopGoodListViewModel.getGoodsInfoWithGoodsId(goodsId: self.goodsId) { result, status in
+            hiddenLoading()
+            if status == .failed{
+                showMessage(message: "获取失败")
+                return
+            }
+            if status == .success{
+                let model = result as! CNLiveShopGoodsDetailsModel
+                self.shopGoodsDetailsModel = model
+                //商品分类
+                var singleView1 = self.bgScrollView.viewWithTag(1) as! CNLiveShopAddGoodsSingleView
+                //店铺分类
+                var singleView2 = self.bgScrollView.viewWithTag(2) as! CNLiveShopAddGoodsSingleView
+                //商品轮播
+                var singleView4 = self.bgScrollView.viewWithTag(4) as! CNLiveShopAddGoodsSingleView
+                //商品名称
+                var singleView5 = self.bgScrollView.viewWithTag(5) as! CNLiveShopAddGoodsSingleView
+                //商品副标题
+                var singleView6 = self.bgScrollView.viewWithTag(6) as! CNLiveShopAddGoodsSingleView
+                //本店售价
+                var singleView7 = self.bgScrollView.viewWithTag(7) as! CNLiveShopAddGoodsSingleView
+                //市场售价
+                var singleView8 = self.bgScrollView.viewWithTag(8) as! CNLiveShopAddGoodsSingleView
+                //商品重量
+                var singleView9 = self.bgScrollView.viewWithTag(9) as! CNLiveShopAddGoodsSingleView
+                //最低起售
+                var singleView10 = self.bgScrollView.viewWithTag(10) as! CNLiveShopAddGoodsSingleView
+                //上架
+                var singleView11 = self.bgScrollView.viewWithTag(11) as! CNLiveShopAddGoodsSingleView
+                //商品详情图
+                var singleView13 = self.bgScrollView.viewWithTag(13) as! CNLiveShopAddGoodsSingleView
+                //商品运费
+                var singleView14 = self.bgScrollView.viewWithTag(14) as! CNLiveShopAddGoodsSingleView
+                //是否支持退货
+                var singleView15 = self.bgScrollView.viewWithTag(15) as! CNLiveShopAddGoodsSingleView
+                //商品单位
+                var singleView16 = self.bgScrollView.viewWithTag(16) as! CNLiveShopAddGoodsSingleView
+                //品名
+                var singleView18 = self.bgScrollView.viewWithTag(18) as! CNLiveShopAddGoodsSingleView
+                //规格
+                var singleView19 = self.bgScrollView.viewWithTag(19) as! CNLiveShopAddGoodsSingleView
+                //寄送区域
+                var singleView20 = self.bgScrollView.viewWithTag(20) as! CNLiveShopAddGoodsSingleView
+                //发货时效
+                var singleView21 = self.bgScrollView.viewWithTag(21) as! CNLiveShopAddGoodsSingleView
-                for (int i = 0; i < [self.disposeDataModel.list count]; i++) {
-                    DSShopGoodsManageDetailsSingleView * singleView = (DSShopGoodsManageDetailsSingleView*)[self.view viewWithTag:i+1];
-                    if (singleView.model.style == 3) {
-                        [singleView.uploadImageView deleteReplaceImageUrlAfterSuccessUploadThings];
+                var tempArray = NSMutableArray(array: self.shopGoodsDetailsModel.storageArray)
+                for dic in self.shopGoodsDetailsModel.storageArray{
+                    let dict = dic as NSDictionary
+                    if dict.object(forKey: "k") as! String == "品名"{
+                        let str = dict.stringValueForKey(key: "v") as String
+                        singleView18.contentTextField.text = str
+                        tempArray.remove(dict)
+                    }
+                    if dict.object(forKey: "k") as! String == "规格"{
+                        let str = dict.stringValueForKey(key: "v") as String
+                        singleView19.contentTextField.text = str
+                        tempArray.remove(dict)
+                    }
+                    if dict.object(forKey: "k") as! String == "寄送区域"{
+                        let str = dict.stringValueForKey(key: "v") as String
+                        singleView20.contentTextView.text = str
+                        tempArray.remove(dict)
+                    }
+                    if dict.object(forKey: "k") as! String == "发货时效"{
+                        let str = dict.stringValueForKey(key: "v") as String
+                        singleView21.contentTextField.text = str
+                        tempArray.remove(dict)
                     }
                 }
+                singleView1.contentTextField.text = self.shopGoodsDetailsModel.group_name
+                singleView1.layoutSubviews()
-                [self dsPopViewControllerAnimated:YES];
-            }];
-        }else {
-            [DSShopRequest postGoodsEditWithGoodsId:self.goodsId
-                                                uid:DS_USER_MODEL.uid
-                                          bannerImg:bannerImageStr
-                                               simg:[bannersSelectImageUrls firstObject]
-                                              video:bannerSelectVideoUrl
-                                              title:singleView5.contentTextField.text
-                                                ads:singleView6.contentTextView.text
-                                              price:singleView7.contentTextField.text
-                                             prices:singleView8.contentTextField.text
-                                                 kg:singleView9.contentTextField.text
-                                               unit:singleView16.contentTextField.text
-                                              state:singleView11.contentSwitch.on ? @"2" : @"1"
-                                            storage:[kvArray mj_JSONString]
-                                            infoImg:contentDetailsImageStr
-                                             yunfei:singleView14.contentTextField.text
-                                          min_count:singleView10.countTF.text
-                                           isRefund:@"0"//singleView15.contentSwitch.on ? @"0" : @"1"
-                                          category_id:category_id
-                                             result:^(NSDictionary * _Nonnull jsonData, NSString * _Nonnull errorMessage) {
-                [self.view hideLoading];
-                if (errorMessage) {
-                    DS_showMessage(errorMessage);
-                    return;
+                singleView2.contentTextField.text = self.shopGoodsDetailsModel.cate_name
+                singleView2.layoutSubviews()
+                
+                var bannerImageUrls = NSMutableArray()
+                for model in self.shopGoodsDetailsModel.image{
+                    bannerImageUrls.add(model.simg ?? "")
                 }
-                DS_showMessage(@"修改成功");
-                [[NSNotificationCenter defaultCenter] postNotificationName:kDSGoodsManageEditNotification object:nil userInfo:jsonData];
+                if let array = bannerImageUrls as? [String] {
+                    singleView4.uploadImageView.networkImageArr = array
+                }
+                singleView4.uploadImageView.setNetworkVideoUrl(networkVideoUrl: self.shopGoodsDetailsModel.video?.video_url ?? "", networkVideoImageUrl: self.shopGoodsDetailsModel.video?.video_img ?? "")
+                
+                singleView5.contentTextField.text = self.shopGoodsDetailsModel.title
+                singleView6.contentTextView.text = self.shopGoodsDetailsModel.ads
+                singleView7.contentTextField.text = self.shopGoodsDetailsModel.price?.keepTwoDecimalPlaces()
+                singleView8.contentTextField.text = self.shopGoodsDetailsModel.prices?.keepTwoDecimalPlaces()
+                singleView9.contentTextField.text = self.shopGoodsDetailsModel.kg
+                singleView10.countTF.text = self.shopGoodsDetailsModel.min_buy_num
+                singleView11.contentSwitch.isOn = self.shopGoodsDetailsModel.state == 2 ? true : false
+                singleView10.subtractBtn.setImage(UIImage(named: Int(self.shopGoodsDetailsModel.min_buy_num ?? "0")! > 1 ? "DS_main_unadd_count" : "DS_main_unadd_count_n"), for: .normal)
-                for (int i = 0; i < [self.disposeDataModel.list count]; i++) {
-                    DSShopGoodsManageDetailsSingleView * singleView = (DSShopGoodsManageDetailsSingleView*)[self.view viewWithTag:i+1];
-                    if (singleView.model.style == 3) {
-                        [singleView.uploadImageView deleteReplaceImageUrlAfterSuccessUploadThings];
+                var contentDetailsImageUrls = NSMutableArray()
+                for model in self.shopGoodsDetailsModel.detail_img{
+                    contentDetailsImageUrls.add(model.simg)
+                }
+                singleView13.uploadImageView.networkImageArr = contentDetailsImageUrls as! Array<String>
+                if let array = contentDetailsImageUrls as? [String] {
+                    singleView13.uploadImageView.networkImageArr = array
+                }
+                singleView14.contentTextField.text = self.shopGoodsDetailsModel.yunfei?.keepTwoDecimalPlaces()
+                singleView15.contentSwitch.isOn = self.shopGoodsDetailsModel.is_refund == 0 ? true : false
+                singleView16.contentTextField.text = self.shopGoodsDetailsModel.unit
+                singleView4.uploadImageView.deleteImage = UIImage.imageWithColor(color: .clear, size: singleView4.uploadImageView.size)
+                singleView13.uploadImageView.deleteImage = UIImage.imageWithColor(color: .clear, size: singleView13.uploadImageView.size)
+                if tempArray.count > 0{
+                    var array = NSMutableArray(array: self.dataModel.list)
+                    for i in 0..<tempArray.count{
+                        let dict = tempArray.object(at: i) as! NSDictionary
+                        let paramDict = ["style":1,"isHaveTo":false,"title":dict.object(forKey: "k"),"contentTextFieldkeyboardType":1,"isDisplayLine":true,"contentType":1,"isDelect":true,"content":dict.object(forKey: "v")]
+                        let listModel = newDictionaryToModel(paramDict as [String : Any], CNLiveShopAddEditGoodsListModel.self) as! CNLiveShopAddEditGoodsListModel
+                        array.add(listModel)
+                        self.reloadBgScrollViewContentViewModel(model: listModel, index: self.dataModel.list.count+1+i, isScrollToBottom: false)
+                        if tempArray.count-1 == i{
+                            self.dataModel.list = array as! [CNLiveShopAddEditGoodsListModel]
+                            self.viewWillLayoutSubviews()
+                        }
                     }
                 }
-                
-                [self dsPopViewControllerAnimated:YES];
-            }];
-        }*/
+            }
+        }
     }
 }
@@ -6,8 +6,398 @@
 //
 import Foundation
+import UIKit
+import UniformTypeIdentifiers
+import AVFoundation
+import HXPHPicker
+///类型
+enum CNLiveSelectUploadImageViewDisplayType:Int {
+    ///选择
+    case select = 0
+    ///展示
+    case display
+}
+
+enum CNLiveSelectUploadImageViewHeightStyle:Int {
+    ///高度自动控制
+    case autoCalc = 0
+    ///高度固定
+    case fixed
+}
+let DS_SUIV_ADD_TAG_COUNT = 123321 //所有view加一个默认tag值 以防和别的tag重复
-class CNLiveAddGoodsSelectUploadImageView: UIView {
+typealias clickCallBackBlock = ()->Void
+typealias changeFrameCallBackBlock = ()->Void
+typealias changeUploadDataCallBackBlock = (_ imageUrls:Array<String> ,_ videoUrl:String)->Void
+typealias beginUploadImageCallBackBlock = ()->Void
+typealias endUploadImageCallBackBlock = ()->Void
+
+
+class CNLiveAddGoodsSelectUploadImageView: UIView,UIImagePickerControllerDelegate, PhotoPickerControllerDelegate {
+    
+    // MARK: - 属性
+    /// 显示类型
+    var _displayType:CNLiveSelectUploadImageViewDisplayType?
+    var displayType:CNLiveSelectUploadImageViewDisplayType?{
+        get{
+            _displayType
+        }
+        set{
+            _displayType = newValue
+            self.resetUI()
+        }
+    }
+    
+    /// 高度类型
+    var heightStyle:CNLiveSelectUploadImageViewHeightStyle
+    /// 每张图的间距 默认DS_adapt_length(15)
+    var _space:CGFloat = 15
+    var space:CGFloat{
+        get{
+            _space
+        }
+        set{
+            _space = newValue
+            self.resetUI()
+            self.autoAdjustHeight()
+        }
+    }
+    /// 每行第一张图距左边的间距 默认DS_adapt_length(15)
+    var _lSpace:CGFloat = 15
+    var lSpace:CGFloat{
+        get{
+            _lSpace
+        }
+        set{
+            _lSpace = newValue
+            self.resetUI()
+            self.autoAdjustHeight()
+        }
+    }
+    /// 每行最后一张图距右边的间距 默认DS_adapt_length(15)
+    var _rSpace:CGFloat = 15
+    var rSpace:CGFloat{
+        get{
+            _rSpace
+        }
+        set{
+            _rSpace = newValue
+            self.resetUI()
+            self.autoAdjustHeight()
+        }
+    }
+    /// 图片的宽高(正方形) heightStyle=DSSelectUploadImageViewHeightStyleAutoCalc时自动计算 heightStyle=DSSelectUploadImageViewHeightStyleFixed时为0需自己赋值 （提示：图片右上角需留出DS_adapt_length(17)/2的空间，给X的图片留位置）
+    var WHeight:CGFloat = 0
+    /// 自定义删除图片 默认DS_SelUplImageView_delete
+    var _deleteImage:UIImage?
+    var deleteImage:UIImage?{
+        get{
+            _deleteImage
+        }
+        set{
+            _deleteImage = newValue
+            self.resetUI()
+        }
+    }
+    /// 是否显示选取封面
+    var _isDisplySelectCover:Bool?
+    var isDisplySelectCover:Bool?{
+        get{
+            _isDisplySelectCover
+        }
+        set{
+            _isDisplySelectCover = newValue
+            self.resetUI()
+        }
+    }
+
+    // MARK: - 回调
+    /// 点击处理事务前回调
+    var clickCallBack:clickCallBackBlock?
+    /// 修改自身高度回调
+    var changeFrameCallBack:changeFrameCallBackBlock?
+    /// 修改上传数据回调
+    var changeUploadDataCallBack:changeUploadDataCallBackBlock?
+
+    // MARK: - 展示属性
+    /// 获取的网络图片数组
+    var _networkImageArr:Array<String>
+    var networkImageArr:Array<String>{
+        get{
+            _networkImageArr
+        }
+        set{
+            _networkImageArr = newValue
+            self.deleteUploadImageUrl()
+            self.uploadImageUrls.removeAll()
+            self.replaceImageUrls.removeAll()
+            for imageUrl in self.networkImageArr{
+                var uploadImageModel = CNLiveSelectUploadImageModel()
+                uploadImageModel.imageUrl = imageUrl
+                uploadImageModel.isUploading = false
+                self.uploadImageUrls.append(uploadImageModel)
+            }
+            self.resetUI()
+            self.autoAdjustHeight()
+        }
+    }
+    
+    /// 获取的网络视频url
+    var networkVideoUrl:String?
+    /// 获取的网络视频图片
+    var networkVideoImageUrl:String?
+
+    // MARK: - 选择属性
+    /// 列数默认4
+    var _column:Int = 4
+    var column:Int{
+        get{
+            _column
+        }
+        set{
+            _column = newValue
+            self.resetUI()
+            self.autoAdjustHeight()
+        }
+    }
+    /// 图片选取最大数量 默认0 必传
+    var _maxSelectImageCount:Int = 0
+    var maxSelectImageCount:Int{
+        get{
+            _maxSelectImageCount
+        }
+        set{
+            _maxSelectImageCount = newValue
+            if self.uploadImageUrls.count > self.maxSelectImageCount{
+                var i = self.uploadImageUrls.count-1
+                while i >= self.maxSelectImageCount {
+                    i -= 1
+                    let model = self.uploadImageUrls[i]
+                    if model.isUploading == true{
+                        [[DSQiNiuUploadManager sharedManager] cancelUploadKey:model.uploadKey];
+                    }else{
+                        [[DSQiNiuUploadManager sharedManager] requestQiNiuDeleteImageUrl:model.imageUrl complete:nil];
+                        self.uploadImageUrls.remove(model)
+                    }
+                }
+            }
+            self.resetUI()
+        }
+    }
+    
+    /// 是否可以选择视频 (目前只能选取一个，在索引1显示)
+    var _isAbleSelectVideo:Bool?
+    var isAbleSelectVideo:Bool?{
+        get{
+            _isAbleSelectVideo
+        }
+        set{
+            _isAbleSelectVideo = newValue
+            self.resetUI()
+        }
+    }
+    // MARK: - 上传操作
+    /// 是否正在上传图片中
+    var isUploading:Bool?
+    /// 开始上传图片
+    var beginUploadImageCallBack:beginUploadImageCallBackBlock?
+    /// 结束上传图片
+    var endUploadImageCallBack:endUploadImageCallBackBlock?
+   
+    /// 获取的网络视频属性
+    /// @param networkVideoUrl 获取的网络视频url
+    /// @param networkVideoImageUrl 获取的网络视频图片
+    func setNetworkVideoUrl(networkVideoUrl:String,networkVideoImageUrl:String){
+        self.networkVideoUrl = networkVideoUrl
+        self.networkVideoImageUrl = networkVideoImageUrl
+        self.deleteUploadVideoUrl()
+        self.uploadVideoModel = nil
+        self.uploadVideoModel = CNLiveSelectUploadImageModel()
+        self.uploadVideoModel?.isVideo = true
+        self.uploadVideoModel?.videoUrl = self.networkVideoUrl
+        self.uploadVideoModel?.imageUrl = self.networkVideoImageUrl
+        self.uploadVideoModel?.isUploading = false
+        self.resetUI()
+        
+    }
+
+    // MARK: - 私有属性
+    /**
+     这次要上传的视频url
+    */
+    var _uploadVideoModel:CNLiveSelectUploadImageModel?
+    var uploadVideoModel:CNLiveSelectUploadImageModel?{
+        get{
+            if _uploadVideoModel == nil{
+                _uploadVideoModel = CNLiveSelectUploadImageModel()
+                _uploadVideoModel?.isVideo = true
+            }
+            return _uploadVideoModel
+        }
+        set{
+            _uploadVideoModel = newValue
+        }
+    }
+    /**
+     需要删除的视频urls
+    */
+    var replaceVideoUrls = [CNLiveSelectUploadImageModel]()
+    /**
+     这次要上传的图片urls
+     */
+    var uploadImageUrls = [CNLiveSelectUploadImageModel]()
+    /**
+     需要删除的图片urls
+     */
+    var replaceImageUrls = [CNLiveSelectUploadImageModel]()
+    /**
+     正在上传的图片数量
+     */
+    var _uploadingCount:Int = 0
+    var uploadingCount:Int{
+        get{
+            _uploadingCount
+        }
+        set{
+            _uploadingCount = newValue
+            if _uploadingCount > 0{
+                self.isUploading = true
+            }else{
+                self.isUploading = false
+            }
+        }
+    }
+    
+    // MARK: - 公开方法
+    /**
+     获取当前选取的网络图片Url数组
+     @return 网络图片Url数组
+     */
+    func getCurrentSelectImageUrls()->Array<String>{
+        var imageUrls = NSMutableArray()
+        for uploadImageModel in self.uploadImageUrls{
+            if uploadImageModel.isUploading == true || uploadImageModel.imageUrl?.isEmpty == true{
+                return Array()
+            }
+            imageUrls.add(uploadImageModel.imageUrl!)
+        }
+        let arr = imageUrls as NSArray
+        return arr as! Array<String>
+    }
+    /**
+     获取当前选取的网络视频Url
+
+     @return 网络视频Url
+     */
+    func getCurrentSelectVideoUrl()->String{
+        if ((self.uploadVideoModel?.isUploading == true) || self.uploadVideoModel?.videoUrl?.count == 0){
+            return ""
+        }
+        return self.uploadVideoModel?.videoUrl ?? ""
+    }
+    /**
+     获取当前选取的本地视频Url
+
+     @return 网络视频Url
+     */
+    func getCurrentSelectLocalVideoUrl()->NSURL{
+        return self.uploadVideoModel?.localVideoUrl ?? NSURL()
+    }
+    /**
+     获取当前选取的本地视频Url第一帧图片
+
+     @return 网络视频Url第一帧图片
+     */
+    func getCurrentSelectLocalVideoUrlFirstImage() -> UIImage? {
+        return self.uploadVideoModel?.image
+    }
+    /**
+     提交成功XXX后 删除(云中)替换掉的图片 （提交成功调用）
+     */
+    func deleteReplaceImageUrlAfterSuccessUploadThings(){
+        for replaceImageModel in self.replaceImageUrls {
+            [[DSQiNiuUploadManager sharedManager] requestQiNiuDeleteImageUrl:replaceImageModel.imageUrl complete:nil];
+        }
+        self.networkImageArr = self.getCurrentSelectImageUrls()
+        for replaceVideoModel in self.replaceVideoUrls {
+            [[DSQiNiuUploadManager sharedManager] requestQiNiuDeleteImageUrl:replaceVideoModel.videoUrl complete:nil];
+        }
+        self.networkVideoUrl = self.getCurrentSelectVideoUrl()
+    }
+    /**
+     不上传了 删除(云中)新上传的图片 （dealloc调用）
+     */
+    func deleteUploadImageUrlAfterCancelUploadThings(){
+        self.deleteUploadImageUrl()
+        self.deleteUploadVideoUrl()
+    }
+    /**
+     不上传了 删除(云中)新上传的图片
+     */
+    func deleteUploadImageUrl(){
+        for uploadImageModel in self.uploadImageUrls {
+            if ((self.networkImageArr?.contains(uploadImageModel.imageUrl ?? "")) != nil){
+                [[DSQiNiuUploadManager sharedManager] requestQiNiuDeleteImageUrl:uploadImageModel.imageUrl complete:nil];
+            }else if uploadImageModel.isUploading == true{
+                [[DSQiNiuUploadManager sharedManager] cancelUploadKey:uploadImageModel.uploadKey];
+            }
+        }
+        for replaceImageModel in self.replaceImageUrls{
+            if ((self.networkImageArr.contains(replaceImageModel.imageUrl ?? "")) != nil){
+                [[DSQiNiuUploadManager sharedManager] requestQiNiuDeleteImageUrl:replaceImageModel.imageUrl complete:nil];
+            }
+        }
+    }
+    /**
+     不上传了 删除(云中)新上传的视频
+     */
+    func deleteUploadVideoUrl(){
+        if self.networkVideoUrl != self.uploadVideoModel?.videoUrl{
+            [[DSQiNiuUploadManager sharedManager] requestQiNiuDeleteImageUrl:self.uploadVideoModel.videoUrl complete:nil];
+        }else if self.uploadVideoModel?.isUploading == true{
+            [[DSQiNiuUploadManager sharedManager] cancelUploadKey:self.uploadVideoModel.uploadKey];
+        }
+        for replaceVideoModel in self.replaceVideoUrls {
+            if self.networkVideoUrl != replaceVideoModel.videoUrl{
+                [[DSQiNiuUploadManager sharedManager] requestQiNiuDeleteImageUrl:replaceVideoModel.videoUrl complete:nil];
+            }
+        }
+    }
+    // MARK: - 系统属性
+    override var frame: CGRect{
+        didSet {
+            if self.heightStyle == .autoCalc{
+                //算出带X图片的间距 X图片宽高均为DS_adapt_length(17)
+                var addXRSpace = self.rSpace - 17*0.5
+                var addXSpace = self.space - 17*0.5
+                let column = self.maxSelectImageCount < self.column ? self.maxSelectImageCount : self.column
+                let totalSpace = self.lSpace + addXRSpace + addXSpace*CGFloat(column - 1)
+                let aHeight = column == 0 ? 0.0 : (frame.size.width - totalSpace / CGFloat(column))
+                
+                let subviewsCount = self.subviews.count
+                let row = subviewsCount / column + (subviewsCount % column > 0 ? 1 : 0)
+                let height = aHeight * CGFloat(row) + (row > 1 ? addXSpace : 0) + 10
+                var isNeedCallBack = false
+                if self.height != 0 && self.height != height{
+                    isNeedCallBack = true
+                }
+                super.frame = CGRect(x: frame.origin.x, y: frame.origin.y, width: frame.size.width, height: height == 0 ? frame.size.height : height)
+                if isNeedCallBack{
+                    self.changeFrameCallBack!()
+                }
+            }else{
+                super.frame = frame
+            }
+        }
+    }
+
+    // MARK: - 自动调整高度
+    func autoAdjustHeight(){
+        if self.heightStyle == .autoCalc{
+            self.frame = self.frame
+        }
+    }
+    
     override init(frame: CGRect) {
         super.init(frame: frame)
     }
@@ -15,4 +405,470 @@ class CNLiveAddGoodsSelectUploadImageView: UIView {
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
+    // MARK: - 初始化
+    init(frame:CGRect ,heightStyle:CNLiveSelectUploadImageViewHeightStyle,maxSelectImageCount:Int) {
+        super.init(frame: frame)
+        self.initData()
+        self.resetUI()
+    }
+    
+    func initData(){
+        self.backgroundColor = .clear
+        self.clipsToBounds = true
+        self.column = 4
+        self.space = 15
+        self.lSpace = 15
+        self.rSpace = 15
+        NotificationCenter.default.addObserver(self, selector: #selector(willTerminateNotification), name: UIApplication.willTerminateNotification, object: nil)
+    }
+    override func layoutSubviews() {
+        super.layoutSubviews()
+        
+        //算出带X图片的间距 X图片宽高均为DS_adapt_length(17)
+        let addXRSpace = self.rSpace - 17*0.5
+        let addXSpace = self.space - 17*0.5
+        let column = self.maxSelectImageCount < self.column ? self.maxSelectImageCount : self.column
+        var width = 0.0
+        if self.heightStyle == .autoCalc{
+            let totalSpace = self.lSpace + addXRSpace + addXSpace * CGFloat(column - 1)
+            width = (self.width - totalSpace) / Double(column)
+        }else{
+            width = self.WHeight
+        }
+        let height = width
+        let subViews = self.subviews
+        for i in 0..<subViews.count {
+            let singleImageView = self.viewWithTag(i+1+DS_SUIV_ADD_TAG_COUNT)
+            singleImageView?.frame = CGRect(x: self.lSpace+(width+addXSpace)*Double((i%column)), y: (height+addXSpace)*Double((i/column)), width: width, height: height)
+        }
+    }
+    deinit {
+        NotificationCenter.default.removeObserver(self, name: UIApplication.willTerminateNotification, object: nil)
+    }
+
+    // MARK: - 通知
+    @objc func willTerminateNotification(){
+        self.deleteUploadImageUrlAfterCancelUploadThings()
+    }
+
+    // MARK: - resetUI
+    func resetUI(){
+        self.subviews.forEach { $0.removeFromSuperview() }
+        var isHideDeleteBtn = false
+        if self.displayType == .display{
+            isHideDeleteBtn = true
+        }
+        if self.displayType == .select{
+            var lastIsSelectImage = false
+            if self.isAbleSelectVideo == true{
+                let model1 = CNLiveSelectUploadImageModel()
+                model1.isSelectPhotoPlaceholder = true
+                let singleImageView1 = self.createSingleImageView()
+                singleImageView1.tag = 1+DS_SUIV_ADD_TAG_COUNT
+                singleImageView1.setModel(model: model1, isHideDeleteBtn: isHideDeleteBtn, isCover: false)
+                self.addSubview(singleImageView1)
+                let singleImageView2 = self.createSingleImageView()
+                singleImageView2.tag = 2+DS_SUIV_ADD_TAG_COUNT
+                singleImageView2.setModel(model: self.uploadVideoModel!, isHideDeleteBtn: isHideDeleteBtn, isCover: false)
+                self.addSubview(singleImageView2)
+            }else if self.uploadImageUrls.count < self.maxSelectImageCount{
+                lastIsSelectImage = true
+            }
+            var lastView:CNLiveSelUplSingleImageView? = nil
+            for i in 0..<self.uploadImageUrls.count {
+                let model = self.uploadImageUrls[i]
+                var singleImageView = self.createSingleImageView()
+                if self.isAbleSelectVideo! == true{
+                    singleImageView.tag = i+3+DS_SUIV_ADD_TAG_COUNT
+                }else{
+                    singleImageView.tag = i+1+DS_SUIV_ADD_TAG_COUNT
+                }
+                singleImageView.setModel(model: model, isHideDeleteBtn: isHideDeleteBtn, isCover: i == 0 ? true : false)
+                self.addSubview(singleImageView)
+                lastView = singleImageView
+            }
+            if lastIsSelectImage{
+                var model = CNLiveSelectUploadImageModel()
+                model.isSelectPhotoPlaceholder = true
+                var singleImageView = self.createSingleImageView()
+                if (lastView != nil){
+                    singleImageView.tag = lastView!.tag
+                }else{
+                    singleImageView.tag = DS_SUIV_ADD_TAG_COUNT+1
+                }
+                singleImageView.setModel(model: model, isHideDeleteBtn: isHideDeleteBtn, isCover: false)
+                self.addSubview(singleImageView)
+            }
+        }else{
+            if self.networkVideoUrl!.count > 0{
+                var model = CNLiveSelectUploadImageModel()
+                model.videoUrl = self.networkVideoUrl
+                model.imageUrl = self.networkVideoImageUrl
+                model.isVideo = true
+                
+                var singleImageView = self.createSingleImageView()
+                singleImageView.tag = 1+DS_SUIV_ADD_TAG_COUNT
+                singleImageView.setModel(model: model, isHideDeleteBtn: isHideDeleteBtn, isCover: false)
+                self.addSubview(singleImageView)
+            }
+            for i in 0..<self.networkImageArr.count {
+                var model = CNLiveSelectUploadImageModel()
+                model.imageUrl = self.networkImageArr![i]
+                
+                var singleImageView = self.createSingleImageView()
+                if self.networkVideoUrl!.count > 0{
+                    singleImageView.tag = i + 2+DS_SUIV_ADD_TAG_COUNT
+                }else{
+                    singleImageView.tag = i+1+DS_SUIV_ADD_TAG_COUNT
+                }
+                singleImageView.setModel(model: model, isHideDeleteBtn: isHideDeleteBtn, isCover: i == 0 ? true : false)
+                self.addSubview(singleImageView)
+            }
+        }
+        
+    }
+    
+    /// 创建单个视图
+    func createSingleImageView()->CNLiveSelUplSingleImageView{
+        var singleImageView = CNLiveSelUplSingleImageView()
+        singleImageView.deleteImage = self.deleteImage
+        singleImageView.isDisplySelectCover = self.isDisplySelectCover
+        singleImageView.displayType = self.displayType
+        singleImageView.clickCallBack = {model in
+            self.selectImageModel(model: model)
+        }
+        singleImageView.clickDeleteCallBack = {model in
+            self.delteImageModel(model: model)
+        }
+        singleImageView.clickSettingCoverCallBack = {model in
+            self.clickCallBack!()
+            UIApplication.shared.keyWindow?.endEditing(true)
+            
+            if let index = self.uploadImageUrls.firstIndex(of: model){
+                self.uploadImageUrls.remove(at: index)
+                self.uploadImageUrls.insert(model, at: 0)
+            }else{
+                return
+            }
+            self.resetUI()
+        }
+        return singleImageView
+    }
+
+    // MARK: - 选取图片/视频
+    func selectImageModel(model:CNLiveSelectUploadImageModel){
+        self.clickCallBack!()
+        UIApplication.shared.keyWindow?.endEditing(true)
+        if model.isVideo! == true{
+            if model.localVideoUrl != nil{
+                if ([[DSToolsModuleManager sharedManager].delegate respondsToSelector:@selector(skipPlayerVCWithPlayURL:coverImage:coverImageUrl:)]) {
+                    [[DSToolsModuleManager sharedManager].delegate skipPlayerVCWithPlayURL:model.localVideoUrl coverImage:model.image coverImageUrl:nil];
+                }
+            }else if model.videoUrl?.count ?? 0 > 0{
+                if ([[DSToolsModuleManager sharedManager].delegate respondsToSelector:@selector(skipPlayerVCWithPlayURL:coverImage:coverImageUrl:)]) {
+                    [[DSToolsModuleManager sharedManager].delegate skipPlayerVCWithPlayURL:[NSURL URLWithString:model.videoUrl] coverImage:nil coverImageUrl:model.imageUrl];
+                }
+            }else{
+                //TODO:后面再调整具体的配置
+                // 设置与微信主题一致的配置
+                let config = PhotoTools.getWXPickerConfig()
+                config.selectOptions = [.video]
+                config.previewView.bottomView.editButtonHidden = false
+                let pickerController = PhotoPickerController(picker: config)
+                pickerController.pickerDelegate = self
+                // 是否选中原图
+                pickerController.isOriginal = true
+                pickerController.modalPresentationStyle = .fullScreen
+                currentViewController()?.present(pickerController, animated: true)
+            }
+        }else{
+            if model.isSelectPhotoPlaceholder! == true{
+                if self.uploadImageUrls.count >= self.maxSelectImageCount{
+                    let message = String(format: "最多只能选取%ld张图片", self.maxSelectImageCount)
+                    showMessage(message: message)
+                    return
+                }
+                let config = PhotoTools.getWXPickerConfig()
+                config.selectMode = .multiple
+                config.selectOptions = .photo
+                config.maximumSelectedPhotoCount = self.maxSelectImageCount-self.uploadImageUrls.count
+                let pickerController = PhotoPickerController(picker: config)
+                pickerController.pickerDelegate = self
+                // 是否选中原图
+                pickerController.isOriginal = false
+                pickerController.modalPresentationStyle = .fullScreen
+                //TODO 少了一个不允许拍摄视频 allowTakeVideo=false
+                currentViewController()?.present(pickerController, animated: true)
+                
+            }else{
+                if model.isUploading! == true || model.imageUrl == nil{
+                    return
+                }
+                let subviews = self.subviews
+                let currentPage = 0
+                var sourceDatas = NSMutableArray()
+                for i in 0..<self.uploadImageUrls.count {
+                    var cmodel = self.uploadImageUrls[i]
+                    if cmodel.isUploading == nil && cmodel.imageUrl?.count ?? 0 > 0{
+                        YBIBImageData * data = [YBIBImageData new];
+                        data.imageURL = [NSURL URLWithString:cmodel.imageUrl];
+                        for (DSSelUplSingleImageView * singleImageView in subviews) {
+                            if ([singleImageView.model.imageUrl isEqualToString:cmodel.imageUrl]) {
+                                data.projectiveView = singleImageView.displayImageView;
+                                break;
+                            }
+                        }
+                        [sourceDatas addObject:data];
+                    }
+                    if ([cmodel.imageUrl isEqualToString:model.imageUrl]) {
+                        currentPage = i;
+                    }
+                }
+                YBImageBrowser * browser = [YBImageBrowser new];
+                browser.dataSourceArray = [sourceDatas copy];
+                browser.currentPage = currentPage;
+                [browser show];
+            }
+        }
+    }
+
+    // MARK: - 删除图片/视频
+    func delteImageModel(model:CNLiveSelectUploadImageModel){
+        self.clickCallBack!()
+        UIApplication.shared.keyWindow?.endEditing(true)
+        let subviews = self.subviews
+        for i in 0..<subviews.count {
+            var singleImageView = self.viewWithTag(i+1+DS_SUIV_ADD_TAG_COUNT) as! CNLiveSelUplSingleImageView
+            if model.imageUrl == singleImageView.model?.imageUrl{
+                if singleImageView.model?.isVideo == true{
+                    if singleImageView.model?.isUploading == true{
+                        [[DSQiNiuUploadManager sharedManager] cancelUploadKey:singleImageView.model.uploadKey];
+                    }else{
+                        self.replaceVideoUrls.append(singleImageView.model!)
+                        var videoModel = CNLiveSelectUploadImageModel()
+                        videoModel.isVideo = true
+                        self.uploadVideoModel = videoModel
+                    }
+                }else{
+                    if singleImageView.model?.isUploading == true{
+                        [[DSQiNiuUploadManager sharedManager] cancelUploadKey:singleImageView.model.uploadKey];
+                    }else{
+                        let index = self.uploadImageUrls.firstIndex(of: singleImageView.model!)!
+                        self.uploadImageUrls.remove(at: index)
+                        self.replaceImageUrls.append(singleImageView.model!)
+                    }
+                }
+                break
+            }
+        }
+        self.resetUI()
+        self.autoAdjustHeight()
+        self.changeUploadDataCallBack!(self.getCurrentSelectImageUrls(),self.getCurrentSelectVideoUrl())
+    }
+    
+    // MARK: - PickerControllerDelegate
+    func pickerController(_ pickerController: HXPHPicker.PhotoPickerController, didFinishSelection result: HXPHPicker.PickerResult) {
+        let photoAssets = result.photoAssets
+        for asset in photoAssets{
+            if asset.mediaType == .video
+            {
+                let videoFileName = "\(asset.phAsset?.localIdentifier ?? "").mp4".replacingOccurrences(of: "-", with: "").replacingOccurrences(of: "/", with: "")
+                let videoURL = URL(fileURLWithPath: NSTemporaryDirectory()).appendingPathComponent(videoFileName)
+                
+                let videoData = NSData(contentsOf: videoURL)
+                self.splitVideoFileUrlFps(splitFileUrl: videoURL, fps: 1) { isSucc,firstImage in
+                    if isSucc{
+                        self.uploadVideoModel?.videoUrl = nil
+                        self.uploadVideoModel?.image = firstImage.first
+                        self.uploadVideoModel?.localVideoUrl = videoURL
+                        self.uploadVideoModel.isUploading = true
+                        
+                        self.uploadVideoModel?.uploadKey = [[DSQiNiuUploadManager sharedManager] uploadVideoData:videoData uploadProgress:^(NSString * _Nonnull key, CGFloat percent) {
+                            weakSelf.uploadVideoModel.uploadingPercent = percent;
+                            [weakSelf replaceVideoModelInSubviews:self.uploadVideoModel target:firstImage];
+                        } complete:^(NSString * _Nonnull key, DSQiNiuUploadResult result, NSString * _Nonnull videoUrl, NSString * _Nonnull errorMessage) {
+                            if (errorMessage) {
+                                DS_showMessage(errorMessage);
+                                DSSelectUploadImageModel * videoModel = [[DSSelectUploadImageModel alloc] init];
+                                videoModel.isVideo = YES;
+                                weakSelf.uploadVideoModel = videoModel;
+                            }else {
+                                self.uploadVideoModel.videoUrl = videoUrl;
+                                self.uploadVideoModel.isUploading = NO;
+                                self.uploadVideoModel.uploadKey = nil;
+                                [weakSelf replaceVideoModelInSubviews:self.uploadVideoModel target:firstImage];
+                            }
+
+                            weakSelf.uploadingCount = weakSelf.uploadingCount - 1;
+                            if (weakSelf.uploadingCount == 0) {
+                                if (weakSelf.endUploadImageCallBack) {
+                                    weakSelf.endUploadImageCallBack();
+                                }
+                            }
+                            if (weakSelf.changeUploadDataCallBack) {
+                                weakSelf.changeUploadDataCallBack([weakSelf getCurrentSelectImageUrls], [weakSelf getCurrentSelectVideoUrl]);
+                            }
+                        }];
+                        [self resetUI];
+                        [self autoAdjustHeight];
+
+                        self.uploadingCount = self.uploadingCount + 1;
+                        if (self.uploadingCount == 1) {
+                            if (self.beginUploadImageCallBack) {
+                                self.beginUploadImageCallBack();
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        pickerController.dismiss(animated: true)
+    }
+    
+    // MARK: - TZImagePickerControllerDelegate
+    - (void)imagePickerController:(TZImagePickerController *)picker didFinishPickingPhotos:(NSArray<UIImage *> *)photos sourceAssets:(NSArray *)assets isSelectOriginalPhoto:(BOOL)isSelectOriginalPhoto
+    {
+        [photos enumerateObjectsUsingBlock:^(UIImage * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+            UIImage * image = obj;
+
+            DSSelectUploadImageModel * model = [[DSSelectUploadImageModel alloc] init];
+            model.image = image;
+            model.isUploading = YES;
+            DS_WEAK_SELF(self);
+            model.uploadKey = [[DSQiNiuUploadManager sharedManager] uploadImageData:UIImageJPEGRepresentation(image, 0.5) uploadProgress:^(NSString * _Nonnull key, CGFloat percent) {
+                model.uploadingPercent = percent;
+                [weakSelf replaceImageModelInDataArr:model target:image];
+            } complete:^(NSString * _Nonnull key, DSQiNiuUploadResult result, NSString * _Nonnull imageUrl, NSString * _Nonnull errorMessage) {
+                if (errorMessage) {
+                    DS_showMessage(errorMessage);
+                    [weakSelf.uploadImageUrls removeObject:model];
+                }else {
+                    model.imageUrl = imageUrl;
+                    model.isUploading = NO;
+                    model.uploadKey = nil;
+                    [weakSelf replaceImageModelInDataArr:model target:image];
+                }
+
+                weakSelf.uploadingCount = weakSelf.uploadingCount - 1;
+                if (weakSelf.uploadingCount == 0) {
+                    if (weakSelf.endUploadImageCallBack) {
+                        weakSelf.endUploadImageCallBack();
+                    }
+                }
+                if (weakSelf.changeUploadDataCallBack) {
+                    weakSelf.changeUploadDataCallBack([weakSelf getCurrentSelectImageUrls], [weakSelf getCurrentSelectVideoUrl]);
+                }
+            }];
+            [self.uploadImageUrls addObject:model];
+            [self resetUI];
+            [self autoAdjustHeight];
+
+            self.uploadingCount = self.uploadingCount + 1;
+            if (self.uploadingCount == 1) {
+                if (self.beginUploadImageCallBack) {
+                    self.beginUploadImageCallBack();
+                }
+            }
+        }];
+    }
+    // MARK: - 获取视频的第一帧
+    func splitVideoFileUrlFps(splitFileUrl: URL, fps: Float, splitCompleteClosure: @escaping (Bool, [UIImage]) -> Void) {
+
+        var splitImages = [UIImage]()
+        let optDict = NSDictionary(object: NSNumber(value: false), forKey: AVURLAssetPreferPreciseDurationAndTimingKey as NSCopying)
+        let urlAsset = AVURLAsset(url: splitFileUrl, options: optDict as? [String: Any])
+
+        let cmTime = urlAsset.duration
+        let durationSeconds: Float64 = CMTimeGetSeconds(cmTime) //视频总秒数
+
+        var times = [NSValue]()
+        let totalFrames: Float64 = durationSeconds * Float64(fps) //获取视频的总帧数
+        var timeFrame: CMTime
+
+        for i in 0...Int(totalFrames) {
+            timeFrame = CMTimeMake(value: Int64(i), timescale: Int32(fps)) //第i帧， 帧率
+            let timeValue = NSValue(time: timeFrame)
+
+            times.append(timeValue)
+        }
+
+        let imgGenerator = AVAssetImageGenerator(asset: urlAsset)
+        imgGenerator.requestedTimeToleranceBefore = CMTime.zero //防止时间出现偏差
+        imgGenerator.requestedTimeToleranceAfter = CMTime.zero
+        imgGenerator.appliesPreferredTrackTransform = true //不知道是什么属性，不写true视频帧图方向不对
+
+        let timesCount = times.count
+
+        //获取每一帧的图片
+        imgGenerator.generateCGImagesAsynchronously(forTimes: times) { (requestedTime, image, actualTime, result, error) in
+
+            //times有多少次body就循环多少次。。。
+
+            var isSuccess = false
+            switch (result) {
+            case AVAssetImageGenerator.Result.cancelled:
+                print("cancelled------")
+
+            case AVAssetImageGenerator.Result.failed:
+                print("failed++++++")
+
+            case AVAssetImageGenerator.Result.succeeded:
+                let framImg = UIImage(cgImage: image!)
+                splitImages.append(framImg)
+
+                if (Int(requestedTime.value) == (timesCount - 1)) { //最后一帧时 回调赋值
+                    isSuccess = true
+                    splitCompleteClosure(isSuccess, splitImages)
+                    print("completed")
+                }
+            }
+        }
+    }
+
+    // MARK: - 刷新数组中的图片model
+
+    /**
+     刷新数组中的图片model
+     
+     @param model model
+     @param target 目标图片
+     */
+    func replaceImageModelInDataArr(model:CNLiveSelectUploadImageModel,target:UIImage){
+        var muteArr = NSMutableArray(array: self.uploadImageUrls)
+        for (idx,obj) in muteArr.enumerated() {
+            let tempObj = obj as! CNLiveSelectUploadImageModel
+            if tempObj.image == target{
+                muteArr.replaceObject(at: idx, with: tempObj)
+                break
+            }
+        }
+        self.uploadImageUrls = muteArr as! [CNLiveSelectUploadImageModel]
+        for singleImageView in self.subviews{
+            let singleImgView = singleImageView as! CNLiveSelUplSingleImageView
+
+            if singleImgView.model?.image == target{
+                singleImgView.setModel(model: model, isHideDeleteBtn: singleImgView.isHideDeleteBtn!, isCover: singleImgView.isCover)
+                break
+            }
+        }
+    }
+
+    // MARK: - 刷新视图中视频view的model
+
+    /**
+     刷新视图中视频view的model
+
+     @param model model
+     @param target 目标图片
+    */
+    func replaceVideoModelInSubviews(model:CNLiveSelectUploadImageModel,target:UIImage){
+        for singleImageView in self.subviews {
+            let singleImgView = singleImageView as! CNLiveSelUplSingleImageView
+            if singleImgView.model?.image == target{
+                singleImgView.setModel(model: model, isHideDeleteBtn: singleImgView.isHideDeleteBtn ?? false, isCover: singleImgView.isCover)
+                break
+            }
+        }
+    }
+
 }
+//
+//  CNLiveSelUplSingleImageView.swift
+//  metaCode
+//
+//  Created by zx on 2023/11/21.
+//
+
+import Foundation
+import Kingfisher
+
+
+typealias clickCallBackBlock1 = (_ model:CNLiveSelectUploadImageModel)->Void
+typealias clickDeleteCallBackBlock = (_ model:CNLiveSelectUploadImageModel)->Void
+typealias clickSettingCoverCallBackBlock = (_ model:CNLiveSelectUploadImageModel)->Void
+
+
+class CNLiveSelUplSingleImageView: UIView {
+    
+    // MARK: - UI
+    /// 当前显示
+    var displayImageView : UIImageView?
+    // MARK: - 赋值
+    /// 自定义删除图片 默认DS_SelUplImageView_delete
+    var _deleteImage : UIImage?
+    var deleteImage : UIImage?{
+        get{
+            _deleteImage
+        }
+        set{
+            _deleteImage = newValue
+            
+            if _deleteImage?.isKind(of: UIImage.self) == true {
+                self.deleteImageView?.image = _deleteImage
+            }else{
+                self.deleteImageView?.image = UIImage(named: "DS_SelUplImageView_delete")
+            }
+            self.deleteImageView?.image = UIImage(named: "DS_SelUplImageView_delete")
+        }
+    }
+    /// 是否显示选取封面
+    var _isDisplySelectCover : Bool?
+    var isDisplySelectCover : Bool?{
+        get{
+            _isDisplySelectCover
+        }
+        set{
+            _isDisplySelectCover = newValue
+            if (self.model?.isSelectPhotoPlaceholder == false && self.model?.isVideo == false){
+                if _isDisplySelectCover!{
+                    self.coverBtn?.isHidden = false
+                }else{
+                    self.coverBtn?.isHidden = true
+                }
+            }else{
+                self.coverBtn?.isHidden = true
+            }
+        }
+    }
+    
+    /// 显示类型
+    var _displayType : CNLiveSelectUploadImageViewDisplayType?
+    var displayType : CNLiveSelectUploadImageViewDisplayType?{
+        get{
+            _displayType
+        }
+        set{
+            _displayType = newValue
+            if _displayType == .select{
+                self.coverBtn?.isUserInteractionEnabled = true
+            }else{
+                self.coverBtn?.isUserInteractionEnabled = false
+            }
+            self.deleteImageView?.image = UIImage(named: "DS_SelUplImageView_delete")
+        }
+    }
+
+    /// 数据
+    var model : CNLiveSelectUploadImageModel?
+
+    /// 是否隐藏删除按钮
+    var isHideDeleteBtn : Bool?
+    /// 是否是封面
+    var isCover : Bool
+    /// 赋值
+    /// @param model 数据
+    /// @param isHideDeleteBtn 是否隐藏删除按钮
+    /// @param isCover 是否是封面
+    func setModel(model:CNLiveSelectUploadImageModel,isHideDeleteBtn:Bool,isCover:Bool){
+        self.model = model
+        self.isHideDeleteBtn = isHideDeleteBtn
+        self.isCover = isCover
+        if self.model?.isSelectPhotoPlaceholder! == true{
+            self.displayImageView?.image = UIImage(named: "DS_SelUplImageView_selectImage")
+            self.progressLab?.isHidden = true
+            self.deleteBtn?.isHidden = true
+            self.playImageView?.isHidden = true
+            self.coverBtn?.isHidden = true
+        }else if self.model?.isVideo! == true{
+            if self.model?.videoUrl?.count ?? 0 > 0{
+                self.displayImageView?.image = self.model?.image
+                if self.model?.image == nil{
+                    self.displayImageView?.kf.setImage(with: URL(string: self.model?.imageUrl ?? ""), placeholder: self.model?.image)
+                }
+                self.progressLab?.isHidden = true
+                if self.isHideDeleteBtn! == true{
+                    self.deleteBtn?.isHidden = true
+                }else{
+                    self.deleteBtn?.isHidden = false
+                }
+                self.playImageView?.isHidden = false
+            }else if self.model?.isUploading! == true{
+                self.displayImageView?.image = self.model?.image
+                self.progressLab?.text = String(format: "%.0f%%", (self.model?.uploadingPercent)!*100)
+                self.progressLab?.isHidden = false
+                self.deleteBtn?.isHidden = false
+                self.playImageView?.isHidden = true
+            }else{
+                self.displayImageView?.image = UIImage(named: "DS_SelUplImageView_selectVideo")
+                self.progressLab?.isHidden = true
+                self.deleteBtn?.isHidden = true
+                self.playImageView?.isHidden = true
+
+            }
+            self.coverBtn?.isHidden = true
+        }else{
+            self.displayImageView?.image = self.model?.image
+            if self.model?.imageUrl?.count ?? 0 > 0 {
+                self.displayImageView?.kf.setImage(with: URL(string: self.model?.imageUrl ?? ""), placeholder: self.model?.image)
+                self.progressLab?.isHidden = true
+                if self.isHideDeleteBtn! == true{
+                    self.deleteBtn?.isHidden = true
+                }else{
+                    self.deleteBtn?.isHidden = false
+                }
+            }else if self.model?.isUploading! == true{
+                self.progressLab?.text = String(format: "%.0f%%", (self.model?.uploadingPercent)!*100)
+                self.progressLab?.isHidden = false
+                self.deleteBtn?.isHidden = false
+            }
+            self.playImageView?.isHidden = true
+            self.coverBtn?.isHidden = self.isDisplySelectCover! == true ? false : true
+            if self.isCover == true{
+                self.coverBtn?.setTitle("主页", for: .normal)
+                self.coverBtn?.setTitleColor(HexColor("#F5A623"), for: .normal)
+                self.coverBtn?.backgroundColor = HexColor("#FEF4E4")
+            }else{
+                if self.displayType == .select{
+                    self.coverBtn?.setTitle("设置主页", for: .normal)
+                    self.coverBtn?.setTitleColor(HexColor("#787878"), for: .normal)
+                    self.coverBtn?.backgroundColor = HexColor("#EAEAEA")
+                }else{
+                    self.coverBtn?.setTitle("", for: .normal)
+                    self.coverBtn?.setTitleColor(.clear, for: .normal)
+                    self.coverBtn?.backgroundColor = .clear
+                }
+            }
+        }
+        self.deleteImageView?.image = UIImage(named: "DS_SelUplImageView_delete")
+    }
+
+    // MARK: - 回调
+    /// 点击自身回调
+    var clickCallBack:clickCallBackBlock1?
+    /// 点击删除回调
+    var clickDeleteCallBack:clickDeleteCallBackBlock?
+    /// 点击设为主页回调
+    var clickSettingCoverCallBack:clickSettingCoverCallBackBlock?
+    var progressLab : UILabel?
+    var deleteBtn : UIButton?
+    var deleteImageView : UIImageView?
+    var playImageView : UIImageView?
+    var coverBtn : UIButton?
+
+    // MARK: - init
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        self.initUI()
+        let selfTap = UITapGestureRecognizer(target: self, action: #selector(selfTap))
+        self.addGestureRecognizer(selfTap)
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    override func layoutSubviews() {
+        super.layoutSubviews()
+        self.deleteBtn?.frame = CGRect(x: self.width-25, y: 0, width: 25, height: 30)
+        self.deleteImageView?.frame = CGRect(x: self.deleteBtn!.width-17, y: 0, width: 17, height: 17)
+        self.displayImageView?.frame = CGRect(x: 0, y: self.deleteImageView!.height/2, width: self.width-self.deleteImageView!.width/2, height: self.width-self.deleteImageView!.height/2)
+        self.progressLab?.frame = self.displayImageView!.frame
+        self.playImageView?.frame = CGRect(x: self.displayImageView!.width-26/2, y: self.displayImageView!.top+self.displayImageView!.height-26/2, width: 26, height: 26)
+        self.coverBtn?.frame = CGRect(x: self.displayImageView!.left, y: self.displayImageView!.bottom, width: self.displayImageView!.width, height: 20)
+    }
+
+    // MARK: - initUI
+    func initUI(){
+        self.displayImageView = UIImageView(frame: CGRect(x: 0, y: 0, width: 78, height: 78))
+        self.displayImageView?.clipsToBounds = true
+        self.displayImageView?.contentMode = .scaleAspectFill
+        self.addSubview(self.displayImageView!)
+        
+        self.progressLab = UILabel()
+        self.progressLab?.textColor = HexColor("#ffffff")
+        self.progressLab?.font = Font_12
+        self.progressLab?.backgroundColor = HexColor("#000000", alpha: 0.6)
+        self.progressLab?.textAlignment = .center
+        self.addSubview(self.progressLab!)
+        
+        self.deleteBtn = UIButton(type: .custom)
+        self.deleteBtn?.addTarget(self, action: #selector(deleteBtnClick), for: .touchUpInside)
+        self.addSubview(self.deleteBtn!)
+        
+        self.deleteImageView = UIImageView()
+        self.deleteImageView?.clipsToBounds = true
+        self.deleteImageView?.contentMode = .scaleAspectFit
+        self.deleteImageView?.image = UIImage(named: "DS_SelUplImageView_delete")
+        self.deleteBtn?.addSubview(self.deleteImageView!)
+        
+        self.playImageView = UIImageView()
+        self.playImageView?.clipsToBounds = true
+        self.playImageView?.contentMode = .scaleAspectFit
+        self.playImageView?.image = UIImage(named: "DS_SelUplImageView_play")
+        self.addSubview(self.playImageView!)
+        
+        self.coverBtn = UIButton(type: .custom)
+        self.coverBtn?.addTarget(self, action: #selector(coverBtnClick), for: .touchUpInside)
+        self.coverBtn?.titleLabel?.font = Font_11
+        self.coverBtn?.isUserInteractionEnabled = false
+        self.addSubview(self.coverBtn!)
+    }
+
+    // MARK: - 触发事件
+    @objc func selfTap(){
+        self.clickCallBack!(self.model)
+    }
+    @objc func deleteBtnClick(){
+        self.clickDeleteCallBack!(self.model!)
+    }
+    @objc func coverBtnClick(){
+        self.clickSettingCoverCallBack!(self.model!)
+    }
+}
@@ -7,13 +7,21 @@
 import Foundation
-///回调
+//商品标题最大长度
+let TitleMaxLength = 50
+/// 修改自身高度回调
 typealias updateBlock = ()->Void
+
+///修改添加通用参数回调
+typealias changeFrameParamCallBack = (_ isDelect:Bool,_ model:CNLiveShopAddEditGoodsListModel,_ singleView:CNLiveShopAddGoodsSingleView)->Void
+
 typealias tapClickBlock = (_ singleView:CNLiveShopAddGoodsSingleView)->Void
-class CNLiveShopAddGoodsSingleView: UIView, UITextFieldDelegate {
-    ///
+class CNLiveShopAddGoodsSingleView: UIView, UITextFieldDelegate, UITextViewDelegate {
+    
     var updateFrameBlock:updateBlock?
+    ///
+    var changeFrameBlock:changeFrameParamCallBack?
     //
     var tapBlock:tapClickBlock?
     //model
@@ -31,11 +39,6 @@ class CNLiveShopAddGoodsSingleView: UIView, UITextFieldDelegate {
     ///标题
     lazy var titleLabel: UILabel = {
         let titleLabel = UILabel.init(frame: CGRectMake(15 , 15, 145, 20))
-//        titleLabel.textColor = HexColor("#333333")
-//        titleLabel.textAlignment = .left
-//        titleLabel.font = Font_15
-//        titleLabel.adjustsFontSizeToFitWidth=true
-//        titleLabel.text = "啊啊啊啊啊"
         return titleLabel
     }()
     //副标题
@@ -45,24 +48,28 @@ class CNLiveShopAddGoodsSingleView: UIView, UITextFieldDelegate {
     var rightImageView = UIImageView()
     var contentSwitch = UISwitch()
     var uploadImageView = CNLiveAddGoodsSelectUploadImageView(frame: CGRectZero)
-    var contentTextBgView = UIView()
-    var contentTextView = UITextView()//
+    var contentTextBgView = CNLiveRoundedRectView()
+    var contentTextView = CNLiveShopTextView()
     var addBtn = UIButton()
     var subtractBtn = UIButton()
     var countTF = UITextField()
     var descLab = UILabel()
     var line = UIImageView()
     var starImageView = UIImageView()
-    
-    
+    //开始输入前的文本
+    var beginText:String
     override init(frame: CGRect) {
         super.init(frame: frame)
-        self.setUI()
+
+        NotificationCenter.default.addObserver(self, selector: #selector(textFieldTextDidChangeNotification), name: Notification.Name("UITextFieldTextDidChangeNotification"), object:nil)
+        self.addObserver(self, forKeyPath: "tag",options: [.new,.old],context: nil)
+        
     }
-    func setUI(){
-
+    deinit {
+        NotificationCenter.default.removeObserver(self, name: Notification.Name("UITextFieldTextDidChangeNotification"), object: nil)
+        self.removeObserver(self, forKeyPath: "tag")
     }
     func setupNewUI(model:CNLiveShopAddEditGoodsListModel){
@@ -86,7 +93,7 @@ class CNLiveShopAddGoodsSingleView: UIView, UITextFieldDelegate {
                 subBtn.setTitleColor(HexColor("#0091FF"), for: .normal)
                 subBtn.titleLabel?.font = Font_14
                 subBtn.titleLabel?.textAlignment = .right
-                subBtn.addTarget(self, action: #selector(subBtnAction), for: .touchUpInside)
+                subBtn.addTarget(self, action: #selector(selectAddParamAction), for: .touchUpInside)
                 self.subButton = subBtn
                 self.addSubview(self.subButton)
             }
@@ -160,35 +167,33 @@ class CNLiveShopAddGoodsSingleView: UIView, UITextFieldDelegate {
             self.height = 50
         }else if (model.style == "3") {
             self.uploadImageView = CNLiveAddGoodsSelectUploadImageView(frame: CGRectZero)
-//            self.uploadImageView.column = 3
-//            self.uploadImageView.maxSelectImageCount = model.maxSelectImageCount
-//            self.uploadImageView.isAbleSelectVideo = model.isAbleSelectVideo
-//            self.uploadImageView.isDisplySelectCover = model.isAbleSelectCover
-//            if model.id?.isEmpty {
-//                self.uploadImageView.deleteImage = UIImage(named: "DS_shop_manageGoodsDetails_delete")
-//            }
-//            [self.uploadImageView setChangeFrameCallBack:^{
-//                weakSelf.height = CGRectGetMaxY(weakSelf.uploadImageView.frame) + DS_adapt_length(15);
-//                if (weakSelf.changeFrameCallBack) {
-//                    weakSelf.changeFrameCallBack();
-//                }
-//            }];
+            self.uploadImageView.column = 3
+            self.uploadImageView.maxSelectImageCount = (model.maxSelectImageCount! as NSString).integerValue
+            self.uploadImageView.isAbleSelectVideo = model.isAbleSelectVideo
+            self.uploadImageView.isDisplySelectCover = model.isAbleSelectCover
+            if model.id?.isEmpty == true {
+                self.uploadImageView.deleteImage = UIImage(named: "DS_shop_manageGoodsDetails_delete")
+            }
+            self.uploadImageView.changeFrameCallBack = {[weak self] in
+                self?.height = (self?.uploadImageView.bottom)! + 15
+                self?.updateFrameBlock!()
+            }
             self.addSubview(self.uploadImageView)
         }else if (model.style == "4") {
-            self.contentTextBgView = UIView()
-//            self.contentTextBgView.fillColor = HexColor("F9F9F9")
-//            self.contentTextBgView.radius = 8
+            self.contentTextBgView = CNLiveRoundedRectView()
+            self.contentTextBgView.fillColor = HexColor("F9F9F9")
+            self.contentTextBgView.radius = 8
             self.addSubview(self.contentTextBgView)
-//            self.contentTextView = UITextView()
-//            self.contentTextView.placeholder = model.placeholder
-//            self.contentTextView.placeholderColor = HexColor("c6c6c6")
-//            self.contentTextView.font = Font_14
-//            self.contentTextView.textColor = HexColor("787878")
-//            self.contentTextView.delegate = self
-//            if (model.content?.count ?? 0 > 0){ self.contentTextView.text = model.content
-//            }
-//            self.contentTextBgView.addSubview(self.contentTextView)
+            self.contentTextView = CNLiveShopTextView()
+            self.contentTextView.placeHolder = model.placeholder ?? ""
+            self.contentTextView.placeHolderColor = HexColor("c6c6c6") ?? .gray
+            self.contentTextView.font = Font_14
+            self.contentTextView.textColor = HexColor("787878")
+            self.contentTextView.delegate = self
+            if (model.content?.count ?? 0 > 0){ self.contentTextView.text = model.content
+            }
+            self.contentTextBgView.addSubview(self.contentTextView)
             self.height = 120
         }else if (model.style == "5") {
             //添加输入框
@@ -288,10 +293,20 @@ class CNLiveShopAddGoodsSingleView: UIView, UITextFieldDelegate {
         fatalError("init(coder:) has not been implemented")
     }
+    // MARK: - KVO
+    override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) {
+        let newTagValue = change?[NSKeyValueChangeKey.newKey] as! Int
+        if newTagValue == 5 {
+            self.contentTextField.placeholder = "请输入(最多输入50个字)"
+        }else if newTagValue == 6{
+            self.contentTextView.placeHolder = "请在此输入...(备注：最多输入30个字)"
+        }
+    }
+
     // MARK: - BtnAction
-    @objc func subBtnAction(){
-        if ((self.updateFrameBlock) != nil) {
-            self.updateFrameBlock!()
+    @objc func selectAddParamAction(){
+        if ((self.changeFrameBlock) != nil) {
+            self.changeFrameBlock!(false, self.addEditGoodsListModel!, self)
         }
     }
     @objc func selectDelectParamAction(){
@@ -313,12 +328,30 @@ class CNLiveShopAddGoodsSingleView: UIView, UITextFieldDelegate {
     }
     @objc func addBtnClick(){
-        
+        if (self.countTF.text?.count ?? 0 > 0 && self.countTF.text?.isPurnInt() == true){
+            var count = Int(self.countTF.text!)!
+            count = count + 1
+            self.countTF.text = "\(count)"
+            self.subtractBtn.setImage(UIImage(named: "DS_main_unadd_count"), for: .normal)
+        }
     }
+    
     @objc func subtractBtnClick(){
-        
+        if (self.countTF.text?.count ?? 0 > 0 && self.countTF.text?.isPurnInt() == true){
+            var count = Int(self.countTF.text!)!
+            if (count <= 2){
+                self.countTF.text = "1"
+                subtractBtn.setImage(UIImage(named: "DS_main_unadd_count_n"), for: .normal)
+            }else{
+                count = count - 1
+                self.countTF.text = "\(count)"
+                subtractBtn.setImage(UIImage(named: "DS_main_unadd_count"), for: .normal)
+            }
+        }
     }
+    // MARK: - UITextFieldDelegate
+    
     @objc func textDidChange(sender:UITextField) {
         if (sender == self.countTF) {
             if (self.countTF.text?.count ?? 0 > 0 &&  (self.countTF.text?.isPurnInt() == false)) {
@@ -331,5 +364,165 @@ class CNLiveShopAddGoodsSingleView: UIView, UITextFieldDelegate {
             }
         }
     }
+    func textViewDidEndEditing(_ textView: UITextView) {
+        if self.stringContainsEmoji(string: textView.text){
+            showMessage(message: "输入内容不能包含表情")
+        }else{
+            if textView.text.count > 0{
+                self.addEditGoodsListModel?.content = textView.text
+            }
+        }
+    }
+    
+    // MARK: - UITextFieldDelegate
+    func textFieldDidBeginEditing(_ textField: UITextField) {
+        if self.addEditGoodsListModel?.style == "1"{
+            if self.contentTextField == textField && self.addEditGoodsListModel?.contentTextFieldkeyboardType == "2"{
+                self.beginText = textField.text ?? ""
+            }
+        }
+    }
+    func textFieldShouldEndEditing(_ textField: UITextField) -> Bool {
+        if textField.text?.count ?? 0 > 0{
+            self.addEditGoodsListModel?.content = textField.text
+        }
+        if self.stringContainsEmoji(string: textField.text ?? ""){
+            showMessage(message: "输入内容不能包含表情")
+        }
+        if textField == self.countTF && (self.countTF.text?.count == 0 || Int(self.countTF.text ?? "0") ?? 0 <= 0){
+            showMessage(message: "最低起售不能为空")
+            self.subtractBtn.setImage(UIImage(named: "DS_main_unadd_count_n"), for: .normal)
+            return false
+        }
+        if textField == self.countTF{
+            if (self.countTF.text?.count ?? 0 > 0 && self.countTF.text?.isPurnInt() == true){
+                let count = Int(self.countTF.text ?? "0")!
+                if count > 255{
+                    showMessage(message: "最大起售数不能超过255")
+                    return false
+                }
+            }
+        }
+        return true
+    }
+
+    func textFieldShouldReturn(_ textField: UITextField) -> Bool {
+        if textField == self.countTF{
+            if (self.countTF.text?.count ?? 0 > 0 && self.countTF.text?.isPurnInt() == true){
+                let count = Int(self.countTF.text ?? "0")!
+                if count > 255{
+                    showMessage(message: "最大起售数不能超过255")
+                    return false
+                }
+            }
+        }
+        keyWindow?.endEditing(true)
+        return true
+    }
+   
+    func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool {
+        if string.isEmpty{
+            //点击的删除键
+            return true
+        }
+        if (self.tag == 5 && textField.text?.count ?? 0 >= TitleMaxLength || (textField.text?.count ?? 0) + string.count > TitleMaxLength){
+            return false
+        }
+        if self.addEditGoodsListModel?.style == "1"{
+            if self.contentTextField == textField && self.addEditGoodsListModel?.contentTextFieldkeyboardType == "2"{
+                return self.allowWriteString(string: "0123456789.")
+            }
+        }
+        if self.stringContainsEmoji(string: textField.text ?? ""){
+            showMessage(message: "输入内容不能包含表情")
+            return false
+        }
+        return true
+    }
+    
+    @objc func textFieldTextDidChangeNotification(notification:Notification){
+        let textField = notification.object as! UITextField
+        if self.addEditGoodsListModel?.style == "1"{
+            if (self.contentTextField == textField && self.addEditGoodsListModel?.contentTextFieldkeyboardType == "2"){
+                let oldStr = self.beginText
+                var newStr = textField.text
+                
+                if newStr?.count ?? 0 > 0{
+                    let newFirstStr = newStr?.subString(start: 0, length:1)
+                    if newFirstStr == "."{
+                        newStr = "0%\(newFirstStr ?? ".")"
+                        textField.text = newStr
+                        return
+                    }
+                }
+                var isFindDecimalPoint = false
+                var behindDecimalPointLength = 0
+                if newStr?.count ?? 0 > oldStr.count{
+                    for i in 0..<(newStr?.count ?? 0) {
+                        let newNextStr = newStr?.subString(start: i, length: 1)
+                        if (!isFindDecimalPoint && newNextStr == "."){
+                            isFindDecimalPoint = true
+                        }else if isFindDecimalPoint{
+                            if (behindDecimalPointLength >= Int((self.addEditGoodsListModel?.decimalLength!)!)! || newNextStr == "."){
+                                textField.text = newStr?.subString(start: 0, length: i+1)
+                                return
+                            }
+                            behindDecimalPointLength += 1
+                        }
+                    }
+                }
+            }
+        }
+    }
+    // MARK: - UITextViewDelegate
+    func textView(_ textView: UITextView, shouldChangeTextIn range: NSRange, replacementText text: String) -> Bool {
+        if text.isEmpty{
+            //点击的删除键
+            return true
+        }
+        if self.stringContainsEmoji(string: textView.text){
+            showMessage(message: "输入内容不能包含表情")
+            return false
+        }
+        return true
+            
+    }
+    
+    // MARK: - 是否包含表情
+    func stringContainsEmoji(string:String) -> Bool {
+        for scalar in string.unicodeScalars {
+            switch scalar.value {
+            case 0x1F600...0x1F64F, // Emoticons
+            0x1F300...0x1F5FF, // Misc Symbols and Pictographs
+            0x1F680...0x1F6FF, // Transport and Map
+            0x1F1E6...0x1F1FF, // Regional country flags
+            0x2600...0x26FF,   // Misc symbols
+            0x2700...0x27BF,   // Dingbats
+            0xFE00...0xFE0F,   // Variation Selectors
+            0x1F900...0x1F9FF,  // Supplemental Symbols and Pictographs
+            127000...127600, // Various asian characters
+            65024...65039, // Variation selector
+            9100...9300, // Misc items
+            8400...8447: // Combining Diacritical Marks for Symbols
+                return true
+            default:
+                continue
+            }
+        }
+        return false
+    }
+    
+    /**
+     查看允不允许输入 例如 允许输入1、2时传入12
+     */
+    func allowWriteString(string:String)->Bool{
+        //判断输入的是否是数字 否则无效
+        var cs = CharacterSet()
+        // 获取除以下数字所有的字符集合
+        cs = CharacterSet(charactersIn: string).inverted
+        let filterArr = string.components(separatedBy: cs)
+        // 对比一下是否为数字
+        return  filterArr.count == string.count ? true:false
+    }
 }
+//
+//  CNLiveShopClassifyCell.swift
+//  metaCode
+//
+//  Created by zx on 2023/11/17.
+//
+
+import Foundation
+
+class CNLiveShopClassifyCell: UITableViewCell {
+    ///标题
+    lazy var titleLabel: UILabel = {
+        let titleLabel = UILabel.init(frame: CGRectMake(15, 0, KSreenWidth-15*2, 40))
+        titleLabel.textColor = HexColor("#666666")
+        titleLabel.textAlignment = .left
+        titleLabel.font = Font_14
+        titleLabel.adjustsFontSizeToFitWidth=true
+        titleLabel.lineBreakMode = .byTruncatingTail
+        titleLabel.tag = 1
+        return titleLabel
+    }()
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        self.selectionStyle = .none
+        contentView.backgroundColor = .white
+        contentView.addSubview(self.titleLabel)
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+}
+//
+//  CNLiveShopClassifyInputTableViewCell.swift
+//  metaCode
+//
+//  Created by zx on 2023/11/18.
+//
+
+import Foundation
+
+class CNLiveShopClassifyInputTableViewCell:UITableViewCell{
+    
+    // MARK: - Lazy
+    lazy var titlelab: UILabel = {
+        let titlelab = UILabel.init()
+        titlelab.textColor = HexColor("#333333")
+        titlelab.textAlignment = .left
+        titlelab.font = Font_14
+        titlelab.adjustsFontSizeToFitWidth=true
+        return titlelab
+    }()
+    lazy var star: UILabel = {
+        let star = UILabel.init(frame: CGRect(x: 5, y: 0, width: 6, height: 50))
+        star.textColor = HexColor("#FF725C")
+        star.textAlignment = .left
+        star.text = "*"
+        star.font = Font_12
+        return star
+    }()
+    lazy var textFiled :UITextField = {
+        let textFiled = UITextField()
+        textFiled.textAlignment = .right
+        textFiled.font = Font_14
+        return textFiled
+    }()
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        self.selectionStyle = .none
+        self.initUI()
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    func initUI(){
+        self.contentView.addSubview(self.titlelab)
+        self.contentView.addSubview(self.star)
+        self.contentView.addSubview(self.textFiled)
+        self.p_massony()
+    }
+    
+    func p_massony(){
+        
+        self.titlelab.snp.makeConstraints { make in
+            make.left.equalTo(15)
+            make.centerY.equalTo(self.contentView.centerY)
+        }
+        self.titlelab.setContentCompressionResistancePriority(.required, for: .horizontal)
+        self.textFiled.snp.makeConstraints { make in
+            make.left.equalTo(self.titlelab.right).offset(15)
+            make.centerY.equalTo(self.contentView.centerY)
+            make.right.equalTo(self.contentView.right).offset(-15)
+            make.height.equalTo(50)
+        }
+    }
+}
+
+///输入标题cell
+class CNLiveShopClassifyInputTitleCell:CNLiveShopClassifyInputTableViewCell{
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        self.titlelab.text = "分类名称"
+        self.textFiled.placeholder = "请输入分类名称"
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+}
+
+///输入排序cell
+class CNLiveShopClassifyInputSortCell:CNLiveShopClassifyInputTableViewCell{
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        self.selectionStyle = .none
+        self.titlelab.text = "排序"
+        self.textFiled.placeholder = "请输入排序"
+        self.textFiled.keyboardType = .numberPad
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+}
+//
+//  CNLiveShopClassifySwitchTableViewCell.swift
+//  metaCode
+//
+//  Created by zx on 2023/11/18.
+//
+
+import Foundation
+
+///排序类型
+enum CNLiveShopClassifySwitchType:Int {
+    ///是否显示分类
+    case classify
+    ///是否显示导航栏
+    case nav
+}
+
+typealias switchBlock = (_ on:Bool,_ type:CNLiveShopClassifySwitchType)->Void
+
+///包含 Switch的 cell
+class CNLiveShopClassifySwitchTableViewCell: UITableViewCell {
+    var switchType:CNLiveShopClassifySwitchType?
+    var switchClickBlock:switchBlock?
+
+    // MARK: - Lazy
+    lazy var titlelab: UILabel = {
+        let titlelab = UILabel.init()
+        titlelab.textColor = HexColor("#333333")
+        titlelab.textAlignment = .left
+        titlelab.font = Font_14
+        titlelab.adjustsFontSizeToFitWidth=true
+        return titlelab
+    }()
+    lazy var star: UILabel = {
+        let star = UILabel.init(frame: CGRect(x: 5, y: 0, width: 6, height: 50))
+        star.textColor = HexColor("#FF725C")
+        star.textAlignment = .left
+        star.text = "*"
+        star.font = Font_12
+        return star
+    }()
+    lazy var rightSwitch: UISwitch = {
+        let rightSwitch = UISwitch.init()
+        rightSwitch.tintColor = .green
+        rightSwitch.addTarget(self, action: #selector(switchAction), for: .valueChanged)
+        return rightSwitch
+    }()
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        self.selectionStyle = .none
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    // MARK: - 初始化UI
+    func initUI(){
+        self.contentView.addSubview(self.titlelab)
+        self.contentView.addSubview(self.star)
+        self.contentView.addSubview(self.rightSwitch)
+        self.p_massony()
+    }
+    
+    func p_massony(){
+        
+        self.titlelab.snp.makeConstraints { make in
+            make.left.equalTo(15)
+            make.centerY.equalTo(self.contentView.centerY)
+        }
+        self.rightSwitch.snp.makeConstraints { make in
+            
+            make.right.equalTo(-15)
+            make.centerY.equalTo(self.contentView.centerY)
+            make.size.equalTo(CGSize(width: 45, height: 22))
+        }
+    }
+    // MARK: - switchAction
+    @objc func switchAction(sender:UISwitch){
+        self.switchClickBlock!(self.rightSwitch.isOn, self.switchType!)
+    }
+}
+//
+//  CNLiveShopClassilyIconTableViewCell.swift
+//  metaCode
+//
+//  Created by zx on 2023/11/18.
+//
+
+import Foundation
+
+///上传图片成功
+typealias uploadImageViewSuceessBlock = (_ imageUrl:String)->Void
+
+///店铺分类图标cell
+class CNLiveShopClassilyIconTableViewCell: UITableViewCell {
+    var _selectUploadImageView:CNLiveAddGoodsSelectUploadImageView?
+    var selectUploadImageView:CNLiveAddGoodsSelectUploadImageView?{
+        get{
+            if _selectUploadImageView == nil{
+                _selectUploadImageView = CNLiveAddGoodsSelectUploadImageView()
+                _selectUploadImageView?.maxSelectImageCount = 1
+                _selectUploadImageView?.isAbleSelectVideo = false
+                _selectUploadImageView?.deleteImage = UIImage(named: "DS_happ_daren_dynamic_delete")
+                _selectUploadImageView?.endUploadImageCallBack = {
+                    let imageUrl = self.selectUploadImageView?.getCurrentSelectImageUrls().first
+                    self.uploadImageSuceessBlock!(imageUrl ?? "")
+                }
+                
+            }
+            return _selectUploadImageView
+        }
+        set{
+            _selectUploadImageView = newValue
+            
+        }
+    }
+    var uploadImageSuceessBlock:uploadImageViewSuceessBlock?
+    
+    // MARK: - Lazy
+    lazy var titlelab: UILabel = {
+        let titlelab = UILabel.init()
+        titlelab.textColor = HexColor("#999999")
+        titlelab.textAlignment = .left
+        titlelab.font = Font_12
+        titlelab.numberOfLines = 2
+        var att = NSMutableAttributedString(string: "分类图标 (注：手机端专用,建议上传正方形图片 100*100)")
+        att.addAttribute(NSAttributedString.Key.font, value: Font_14, range: NSRange(location: 0, length: 4))
+        att.addAttribute(NSAttributedString.Key.foregroundColor, value: HexColor("#333333")! as UIColor, range: NSRange(location: 0, length: 4))
+        titlelab.attributedText = att
+        return titlelab
+    }()
+    lazy var star: UILabel = {
+        let star = UILabel.init(frame: CGRect(x: 5, y: 0, width: 6, height: 40))
+        star.textColor = HexColor("#FF725C")
+        star.textAlignment = .left
+        star.text = "*"
+        star.font = Font_12
+        return star
+    }()
+
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        self.selectionStyle = .none
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    // MARK: - 初始化UI
+    func initUI(){
+        self.contentView.addSubview(self.titlelab)
+        self.contentView.addSubview(self.star)
+        self.contentView.addSubview(self.selectUploadImageView!)
+        self.p_massony()
+    }
+    func p_massony(){
+        self.titlelab.snp.makeConstraints { make in
+            make.left.equalTo(15)
+            make.top.equalTo(0)
+            make.height.equalTo(40)
+        }
+        self.selectUploadImageView?.frame = CGRect(x: 0, y: 40, width: 120, height: 120)
+    }    
+}
+//
+//  CNLiveShopGoodsManageDetailsInputManager.swift
+//  metaCode
+//
+//  Created by zx on 2023/11/16.
+//
+
+import Foundation
+
+typealias completerDoneBlock = (_ k:String,_ v:String)->Void
+
+    
+class CNLiveShopGoodsManageDetailsInputManager:NSObject{
+    var modalViewController = CNLiveModalPresentationViewController()
+    var paramField = UITextField()
+    var contentField = UITextField()
+    var completerBlock:completerDoneBlock?
+    
+    func showCustomParamAlertWithCompleterBlock(completeBlock:@escaping completerDoneBlock){
+        let contentView = UIView(frame: CGRect(x: 0, y: 0, width: KSreenWidth, height: 230))
+        contentView.backgroundColor = .white
+        contentView.layer.cornerRadius = 6
+        
+        let titleLabel = UILabel(frame: CGRect(x: 0, y: 20, width: KSreenWidth-20, height: 30))
+        titleLabel.font = Font_16
+        titleLabel.textAlignment = .center
+        titleLabel.text = "添加通用参数"
+        titleLabel.textColor = HexColor("#333333")
+        titleLabel.backgroundColor = .white
+        contentView.addSubview(titleLabel)
+
+        let paramView = UIView(frame: CGRect(x: 10, y: titleLabel.bottom+10, width: KSreenWidth-40, height: 40))
+        paramView.backgroundColor = HexColor("#F7F7F7")
+        paramView.layer.masksToBounds = true
+        paramView.layer.cornerRadius = 5
+        contentView.addSubview(paramView)
+
+        let paramField = UITextField(frame: CGRect(x: 5, y: 5, width: KSreenWidth-50, height: 35))
+        paramField.placeholder = "请输入参数名称"
+        paramField.returnKeyType = .next
+        paramField.font = Font_14
+        paramField.textColor = HexColor("#333333")
+        paramField.backgroundColor = .clear
+        paramView.addSubview(paramField)
+        self.paramField = paramField
+
+        let contentSubView = UIView(frame: CGRect(x: 10, y: paramView.bottom+10, width: contentView.width-40, height: 40))
+        contentSubView.backgroundColor = HexColor("#F7F7F7")
+        contentSubView.layer.masksToBounds = true
+        contentSubView.layer.cornerRadius = 5
+        contentView.addSubview(contentSubView)
+
+        let contentField = UITextField(frame: CGRect(x: 5, y: 5, width: KSreenWidth-50, height: 30))
+        contentField.placeholder = "请输入参数内容"
+        contentField.returnKeyType = .done
+        contentField.font = Font_14
+        contentField.textColor = HexColor("#333333")
+        contentField.backgroundColor = .clear
+        contentSubView.addSubview(contentField)
+        self.contentField = contentField
+        
+        let cancelButton = UIButton(type: .custom)
+        cancelButton.frame = CGRect(x: 10, y: contentSubView.bottom+10, width: (contentView.width-50)*0.5, height: 40)
+        cancelButton.setTitle("取消", for: .normal)
+        cancelButton.setTitle("取消", for: .highlighted)
+        cancelButton.setTitleColor(HexColor("#999999"), for: .normal)
+        cancelButton.setTitleColor(HexColor("#999999"), for: .highlighted)
+        cancelButton.layer.cornerRadius = 5
+        cancelButton.backgroundColor = .white
+        cancelButton.layer.borderColor = HexColor("#999999")!.cgColor
+        cancelButton.layer.borderWidth = 1
+        cancelButton.layer.masksToBounds = true
+        cancelButton.titleLabel?.font = Font_14
+        contentView.addSubview(cancelButton)
+
+        let confirmButton = UIButton(type: .custom)
+        confirmButton.frame = CGRect(x: 20+cancelButton.width, y: contentSubView.bottom+10, width: (contentView.width-50)*0.5, height: 40)
+        confirmButton.setTitle("确定", for: .normal)
+        confirmButton.setTitle("确定", for: .highlighted)
+        confirmButton.setTitleColor(HexColor("#FFFFFF"), for: .normal)
+        confirmButton.setTitleColor(HexColor("#FFFFFF"), for: .highlighted)
+        confirmButton.layer.cornerRadius = 5
+        confirmButton.layer.masksToBounds = true
+        confirmButton.backgroundColor = HexColor("#61C463")
+        confirmButton.titleLabel?.font = Font_14
+        contentView.addSubview(confirmButton)
+
+        let modalViewController = CNLiveModalPresentationViewController()
+        modalViewController.contentView = contentView
+        modalViewController.showingAnimationWithCompletion { finished in
+            
+        }
+        self.modalViewController = modalViewController
+
+        cancelButton.addTarget(modalViewController, action: #selector(cancelButtonAction), for: .touchUpInside)
+        
+        self.completerBlock = completeBlock
+    }
+    
+    @objc func cancelButtonAction(){
+        self.modalViewController.hidingAnimationWithCompletion { finished in
+            
+        }
+    }
+    @objc func confirmButtonAction(){
+        
+        if self.paramField.text?.count ?? 0 > 0 && self.contentField.text?.count ?? 0 > 0{
+            self.modalViewController.hidingAnimationWithCompletion { finished in
+                if finished{
+                    
+                    self.completerBlock!((self.paramField.text?.count ?? 0 > 10 ? self.paramField.text?.subString(start: 0, length: 10) : self.paramField.text) ?? "",self.contentField.text ?? "")
+                }
+            }
+        }
+    }
+ 
+}
+//
+//  CNLiveShopTextView.swift
+//  metaCode
+//
+//  Created by zx on 2023/11/15.
+//
+
+import Foundation
+
+class CNLiveShopTextView: UITextView {
+    /// setNeedsDisplay调用drawRect
+    var placeHolder: String = ""{
+        didSet{
+            self.setNeedsDisplay()
+        }
+    }
+    var placeHolderColor: UIColor = UIColor.gray{
+        didSet{
+            self.setNeedsDisplay()
+        }
+    }
+    override var font: UIFont?{
+        didSet{
+            self.setNeedsDisplay()
+        }
+    }
+    override var text: String!{
+        didSet{
+            self.setNeedsDisplay()
+        }
+    }
+    override var attributedText: NSAttributedString!{
+        didSet{
+            self.setNeedsDisplay()
+        }
+    }
+    
+    override init(frame: CGRect, textContainer: NSTextContainer?) {
+        super.init(frame: frame, textContainer: textContainer)
+        /// default字号
+        self.font = UIFont.systemFont(ofSize: 14)
+        NotificationCenter.default.addObserver(self, selector: #selector(textDidChanged(noti:)), name: UITextView.textDidChangeNotification, object: self)
+    }
+    required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    @objc func textDidChanged(noti: NSNotification)  {
+        self.setNeedsDisplay()
+    }
+    override func draw(_ rect: CGRect) {
+        if self.hasText {
+            return
+        }
+        var newRect = CGRect()
+        newRect.origin.x = 5
+        newRect.origin.y = 7
+        let size = self.placeHolder.getStringSize(rectSize: rect.size, font: self.font ?? UIFont.systemFont(ofSize: 14))
+        newRect.size.width = size.width
+        newRect.size.height = size.height
+        /// 将placeHolder画在textView上
+        (self.placeHolder as NSString).draw(in: newRect, withAttributes: [NSAttributedString.Key.font: self.font ?? UIFont.systemFont(ofSize: 14),NSAttributedString.Key.foregroundColor: self.placeHolderColor])
+    }
+    override func layoutSubviews() {
+        super.layoutSubviews()
+        self.setNeedsDisplay()
+    }
+    
+    deinit {
+        NotificationCenter.default.removeObserver(self, name: UITextView.textDidChangeNotification, object: self)
+    }
+    
+}
+
+extension String {
+    /// 计算字符串的尺寸
+    ///
+    /// - Parameters:
+    ///   - text: 字符串
+    ///   - rectSize: 容器的尺寸
+    ///   - fontSize: 字体
+    /// - Returns: 尺寸
+    ///
+    public func getStringSize(rectSize: CGSize,font: UIFont) -> CGSize {
+        let str: NSString = self as NSString
+        let rect = str.boundingRect(with: rectSize, options: NSStringDrawingOptions.usesLineFragmentOrigin, attributes: [NSAttributedString.Key.font: font], context: nil)
+        return CGSize(width: ceil(rect.width), height: ceil(rect.height))
+    }
+}
@@ -33,4 +33,8 @@ class CNLiveShopDetailViewModel:NSObject{
             }
         }
     }
+    
+   
+    
+    
 }
@@ -8,6 +8,8 @@
 import Foundation
 import CNLiveRequestBastKit
+typealias categoryResultBlock = (_ result: Any,_ status:CNLiveDownSlideResponseType) -> Void
+
 class CNLiveShopGoodListViewModel:NSObject{
     /// 请求店铺商品列表
     /// - Parameters:
@@ -44,6 +46,142 @@ class CNLiveShopGoodListViewModel:NSObject{
         }
     }
+    // MARK: - 商品管理
+    /// 商品发布
+    /// @param uid 用户id
+    /// @param groupid3 三级分类id
+    /// @param bannerImg 轮播图片json字符串 案例：[{"img":"","ord":"99"}]
+    /// @param simg 轮播主图
+    /// @param video 主图视频地址
+    /// @param title 商品名称
+    /// @param ads 商品副标题
+    /// @param price 本店售价
+    /// @param prices 市场售价
+    /// @param kg 商品重量
+    /// @param unit 商品单位
+    /// @param storage 商品参数
+    /// @param state 上下架状态 1下架 2上架
+    /// @param infoImg 详情图片json字符串 案例：[{"img":"","ord":"99"}]
+    /// @param min_count 最小起购数
+    /// @param yunfei 运费
+    /// @param isRefund 是否可退 0可以退 1不可退
+    /// @param category_id 店铺分类id,选中了二级分类,传二级分类的id,没选二级分类就传一级分类的id
+    /// @param result 结果
+    static func postGoodsAddWithUid(uid:String,groupid3:String,bannerImg:String,simg:String,video:String,title:String,ads:String,price:String,prices:String,kg:String,unit:String,state:String,storage:String,infoImg:String,yunfei:String,min_count:String,isRefund:String,category_id:String,resultBlock: @escaping downSlideResultBlock){
+        let param = NSMutableDictionary()
+        param.setValue(uid, forKey: "uid")
+        param.setValue(groupid3, forKey: "groupid3")
+        param.setValue(bannerImg, forKey: "banner_img")
+        param.setValue(simg, forKey: "simg")
+        param.setValue(video, forKey: "video")
+        param.setValue(title, forKey: "title")
+        param.setValue(ads, forKey: "ads")
+        param.setValue(price, forKey: "price")
+        param.setValue(prices, forKey: "prices")
+        param.setValue(kg, forKey: "kg")
+        param.setValue(unit, forKey: "unit")
+        param.setValue(state, forKey: "state")
+        param.setValue(storage, forKey: "storage")
+        param.setValue(infoImg, forKey: "info_img")
+        param.setValue(yunfei, forKey: "yunfei")
+        param.setValue(min_count, forKey: "min_buy_num")
+        param.setValue(isRefund, forKey: "is_refund")
+        param.setValue(category_id, forKey: "category_id")
+        
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.setupDSRequest(true)
+        CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseWjjBUrl+"/api/v1/goodsAdd", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
+            hiddenLoading()
+            if (error == nil) {
+                resultBlock(result as Any,.success)
+            }else{
+                resultBlock(NSNull(),.failed)
+            }
+        }
+    }
+    
+    // MARK: - 商品详情
+    /**
+     商品详情
+
+     @param goodsId 商品id
+     @param result 结果
+     */
+    static func getGoodsInfoWithGoodsId(goodsId:String,resultBlock: @escaping categoryResultBlock){
+        let param = NSMutableDictionary()
+        param.setValue(goodsId, forKey: "id")
+        
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.setupDSRequest(true)
+        CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseWjjBUrl+"/api/v1/goodsInfo", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
+            hiddenLoading()
+            if (error == nil) {
+                let resp = result as! NSDictionary
+                let model = newDictionaryToModel(resp as! [String : Any], CNLiveShopGoodsDetailsModel.self)
+                resultBlock(model,.success)
+            }else{
+                resultBlock(NSNull(),.failed)
+            }
+        }
+    }
+    
+    /// 商品修改
+    /// @param goodsId 商品id
+    /// @param uid 用户id
+    /// @param bannerImg 轮播图片json字符串 案例：[{"img":"","ord":"99"}]
+    /// @param simg 轮播主图
+    /// @param video 主图视频地址
+    /// @param title 商品名称
+    /// @param ads 商品副标题
+    /// @param price 本店售价
+    /// @param prices 市场售价
+    /// @param kg 商品重量
+    /// @param unit 商品单位
+    /// @param state 上下架状态 1下架 2上架
+    /// @param storage 规格参数
+    /// @param infoImg 详情图片json字符串 案例：[{"img":"","ord":"99"}]
+    /// @param min_count 最小起购数
+    /// @param yunfei 运费
+    /// @param isRefund 是否可退 0可以退 1不可退
+    /// @param category_id 店铺分类id,选中了二级分类,传二级分类的id,没选二级分类就传一级分类的id
+    /// @param result 结果
+    static func postGoodsEditWithGoodsId(goodsId:String,uid:String,bannerImg:String,simg:String,video:String,title:String,ads:String,price:String,prices:String,kg:String,unit:String,state:String,storage:String,infoImg:String,yunfei:String,min_count:String,isRefund:String,category_id:String,resultBlock: @escaping downSlideResultBlock){
+        
+        let param = NSMutableDictionary()
+        param.setValue(goodsId, forKey: "id")
+        param.setValue(uid, forKey: "uid")
+        param.setValue(bannerImg, forKey: "banner_img")
+        param.setValue(simg, forKey: "simg")
+        param.setValue(video, forKey: "video")
+        param.setValue(title, forKey: "title")
+        param.setValue(ads, forKey: "ads")
+        param.setValue(price, forKey: "price")
+        param.setValue(prices, forKey: "prices")
+        param.setValue(kg, forKey: "kg")
+        param.setValue(unit, forKey: "unit")
+        param.setValue(state, forKey: "state")
+        param.setValue(storage, forKey: "storage")
+        param.setValue(infoImg, forKey: "info_img")
+        param.setValue(yunfei, forKey: "yunfei")
+        param.setValue(min_count, forKey: "min_buy_num")
+        param.setValue(isRefund, forKey: "is_refund")
+        param.setValue(category_id, forKey: "category_id")
+        
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.setupDSRequest(true)
+        CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseWjjBUrl+"/api/v1/goodsEdit", 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 shopId 商家id
     /// @param goodsId 商品id
@@ -93,4 +231,56 @@ class CNLiveShopGoodListViewModel:NSObject{
         }
     }
+    /// 获取店铺分类
+    /// @param uid 用户id
+    /// @param pid 上级分类id
+    /// @param result 结果
+    static func getGetGroupWithUid(uid:String,pid:String,resultBlock: @escaping categoryResultBlock){
+        let param = NSMutableDictionary()
+        param.setValue(uid, forKey: "uid")
+        param.setValue(pid, forKey: "pid")
+        
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.setupDSRequest(true)
+        CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseWjjBUrl+"/api/v1/getGroup", 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["list"] as! NSArray
+                for dic in respArr{
+                    let dataDic = dic as! NSDictionary
+                    let cateListModel =  newDictionaryToModel(dataDic as! [String : Any], CNLiveShopGoodsManageDetailsGoodsCategoryModel.self)
+                    dataArr.append(cateListModel)
+                }
+                resultBlock(dataArr,.success)
+            }else{
+                resultBlock(NSNull(),.failed)
+            }
+        }
+    }
+    
+    /// 获取分类列表
+    /// @param shopId 店铺id
+    /// @param resultBlock 回调
+    static func getCateListWithShopId(shopId:String,resultBlock: @escaping categoryResultBlock){
+        let param = NSMutableDictionary()
+        param.setValue(shopId, forKey: "shop_id")
+        
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.setupDSRequest(true)
+        CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseWjjBUrl+"/api/v1/cateList", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
+            hiddenLoading()
+            if (error == nil) {
+                let resp = result as! NSDictionary
+                let listModel = newDictionaryToModel(resp as! [String : Any], CNLiveShopClassifyListModel.self)
+                resultBlock(listModel,.success)
+            }else{
+                resultBlock(NSNull(),.failed)
+            }
+        }
+    }
+    
 }
+//
+//  CNLiveShopClassilyViewModel.swift
+//  metaCode
+//
+//  Created by zx on 2023/11/18.
+//
+
+import Foundation
+import CNLiveRequestBastKit
+
+class CNLiveShopClassilyViewModel: BaseModel{
+    
+    /// 添加分类接口
+    /// @param model 分类数据
+    /// @param resultBlock 请求完成回调
+    static func postAddCateRequestWithModel(model:CNLiveShopClassifyModel,resultBlock: @escaping downSlideResultBlock){
+        let param = NSMutableDictionary()
+        param.setValue(model.shop_id, forKey: "shop_id")
+        param.setValue(model.title, forKey: "title")
+        param.setValue(model.state, forKey: "state")
+        param.setValue(model.isnav, forKey: "isnav")
+        param.setValue(model.ord, forKey: "ord")
+        param.setValue(model.pid, forKey: "pid")
+        param.setValue(model.simg, forKey: "simg")
+        
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.setupDSRequest(true)
+        CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseWjjBUrl+"/api/v1/addCate", 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 model 分类数据
+    /// @param resultBlock 请求完成回调
+    static func postEditCateRequestWithModel(model:CNLiveShopClassifyModel,resultBlock: @escaping downSlideResultBlock){
+        let param = NSMutableDictionary()
+        param.setValue(model.shop_id, forKey: "shop_id")
+        param.setValue(model.title, forKey: "title")
+        param.setValue(model.state, forKey: "state")
+        param.setValue(model.isnav, forKey: "isnav")
+        param.setValue(model.ord, forKey: "ord")
+        param.setValue(model.id, forKey: "id")
+        param.setValue(model.simg, forKey: "simg")
+        
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.setupDSRequest(true)
+        CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseWjjBUrl+"/api/v1/editCate", 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 model 分类数据
+    /// @param resultBlock 请求完成回调
+    static func postDeleteCateRequestWithModel(model:CNLiveShopClassifyModel,resultBlock: @escaping downSlideResultBlock){
+        let param = NSMutableDictionary()
+        param.setValue(model.id, forKey: "id")
+        
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.setupDSRequest(true)
+        CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseWjjBUrl+"/api/v1/delCate", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
+            hiddenLoading()
+            if (error == nil) {
+                resultBlock(result as Any,.success)
+            }else{
+                resultBlock(NSNull(),.failed)
+            }
+        }
+    }
+}
@@ -158,7 +158,7 @@ class CNLiveMineInfoViewController: CNLiveBaseViewController, PhotoPickerControl
 extension CNLiveMineInfoViewController {
     func pickerController(_ pickerController: PhotoPickerController,
-                            didFinishSelection result: PickerResult) {
+                            didFinishSelection result: CNLiveMineInputViewControllerPickerResult) {
         result.getImage { [weak self] (image, photoAsset, index) in
             if let image = image {
                 self!._select_image = image
@@ -12,7 +12,9 @@ class CNLiveShopUserInfoModel:BaseModel{
     ///darenid生成付款码时用到
     var daren_id: String?
-    ///uid 用于请求老达人信息接口
+    ///用户云中用户id uid
+    var uid: String?
+    //用于请求老达人信息接口
     var daren_uid: String?
     ///id
     var id: String?
+//
+//  CNLiveSelectUploadImageModel.swift
+//  metaCode
+//
+//  Created by zx on 2023/11/20.
+//
+
+import Foundation
+
+class CNLiveSelectUploadImageModel: BaseModel,Equatable {
+    static func == (lhs: CNLiveSelectUploadImageModel, rhs: CNLiveSelectUploadImageModel) -> Bool {
+        
+    }
+    
+    
+    /**
+     是否是选取图片占位
+     */
+    var isSelectPhotoPlaceholder:Bool?
+    /**
+     是否是视频
+     */
+    var isVideo:Bool?
+    /**
+     本地视频路径
+     */
+    var localVideoUrl:URL?
+    /**
+     视频url
+     */
+    var videoUrl:String?
+    /**
+     图片url
+     */
+    var imageUrl:String?
+    /**
+     图片
+     */
+    var image:UIImage?
+    /**
+     是否正在上传中
+     */
+    var isUploading:Bool?
+    /**
+     上传的key 用于取消上传
+     */
+    var uploadKey:String?
+    /**
+     上传百分比 0~1
+     */
+    var uploadingPercent:CGFloat?
+}
+//
+//  CNLiveShopGoodsDetailsModel.swift
+//  metaCode
+//
+//  Created by zx on 2023/11/20.
+//
+
+import Foundation
+// MARK: - 商品属性
+class CNLiveGoodsDetailsAttrModel:BaseModel{
+    /**
+     表格左侧
+     */
+    var k:String?
+    /**
+     表格右侧
+     */
+    var v:String?
+}
+
+// MARK: - 详情多图
+class CNLiveGoodsDetailsContentModel: BaseModel {
+    /**
+     详情图片id
+     */
+    var id:String = ""
+    /**
+     图片
+     */
+    var simg:String?
+    /**
+     宽
+     */
+    var w:CGFloat = 0
+    /**
+     高
+     */
+    var h:CGFloat = 0
+    /**
+     失败次数>3不重新请求
+     */
+    var failureCount:CGFloat = 0
+    
+}
+// MARK: - banner多图
+class CNLiveGoodsDetailsImageModel:BaseModel{
+    /**
+     图片id
+     */
+    var id:String = ""
+    /**
+     图片
+     */
+    var simg:String?
+    /**
+     排序
+     */
+    var ord:String?
+}
+// MARK: - 视频模型
+class CNLiveGoodsDetailsBannerVideosModel:BaseModel{
+    /**
+     视频
+     */
+    var video_url:String?
+    /**
+     图片
+     */
+    var video_img:String?
+    /**
+     图片（自己加的用于预览传）
+     */
+    var video_image:UIImage?
+}
+// MARK: - 第一级
+class CNLiveShopGoodsDetailsModel:BaseModel{
+    /**
+     商品id
+     */
+    var id:String?
+    /**
+     商家id
+     */
+    var shopid:String?
+    /**
+     货号
+     */
+    var code:String?
+    
+    /**
+     名称
+     */
+    var title:String?
+    /**
+     广告语
+     */
+    var ads:String?
+    /**
+     系列id
+     */
+    var pid:String?
+    /**
+     封面图
+     */
+    var simg:String?
+    /**
+     销售价格
+     */
+    var price:String?
+    /**
+     划去的价格
+     */
+    var prices:String?
+    /**
+     店铺商品分类id,一级分类id
+     */
+    var category_id:String?
+    /**
+     店铺商品分类id,二级分类id
+     */
+    var category_id2:String?
+    /**
+     店铺商品分类名
+     */
+    var cate_name:String?
+    /**
+     平台分类id 1级
+     */
+    var groupid:String?
+    /**
+     平台分类id 2级
+     */
+    var groupid2:String?
+    /**
+     平台分类id 3级
+     */
+    var groupid3:String?
+    /**
+     1/2/3级分类名称合并
+     */
+    var group_name:String?
+    /**
+     可销售库存
+     */
+    var count:String?
+    /**
+     banner图片数组
+     */
+    var image = [CNLiveGoodsDetailsImageModel]()
+    /**
+     详情图片数组
+     */
+    var detail_img = [CNLiveGoodsDetailsContentModel]()
+    /**
+     当前选择
+     */
+    var attr = [CNLiveGoodsDetailsAttrModel]()
+    /**
+     预览当前选择
+     */
+    var attrArray = [Dictionary<String, Any>]()
+    /**
+     赠送礼物入口图片
+     */
+    var give_goods_img:String?
+    /**
+     商品删除
+     */
+    var is_del:String?
+    /**
+     是否开启赠送礼物 1开启 0关闭
+     */
+    var is_gift:Bool?
+    /**
+     banner第一个视频
+     */
+    var video:CNLiveGoodsDetailsBannerVideosModel?
+    /**
+     重量
+     */
+    var kg:String?
+    /**
+     运费
+     */
+    var yunfei:String?
+    /**
+     1不可退 0可退
+     */
+    var is_refund:Int = 0
+    /**
+     状态 2上架 1下架
+     */
+    var state:Int = 0
+    /**
+     单位
+     */
+    var unit:String?
+    /**
+     规格
+     */
+    var storage:String?
+    /**
+     规格
+     */
+    var storage_arr:String?
+    /**
+     最小购买数
+     */
+    var min_buy_num:String?
+    /**
+     规格所有参数 @{@"k":@"品名",@"v":@"商品名"}
+     */
+    var storageArray = [Dictionary<String, Any>]()
+    
+}