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

# Conflicts: # Podfile # metaCode.xcodeproj/project.pbxproj # metaCode/Supporting Files/Assets.xcassets/Shop/DS_coupon_edit_se.imageset/Contents.json

Merge branch 'master' of http://bj.gitlab.cnlive.com/ios-team/CNLiveMateCode
# Conflicts: # Podfile # metaCode.xcodeproj/project.pbxproj # metaCode/Supporting Files/Assets.xcassets/Shop/DS_coupon_edit_se.imageset/Contents.json
liushiyu
2 parents 81cce419 9a46072b
Showing 31 changed files with 3546 additions and 389 deletions
Podfile
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Common/Base/CNLiveBaseNavigationController.swift
metaCode/Classes/Common/Base/CNLiveBaseTabBarViewController.swift
metaCode/Classes/Common/Base/CNLiveBaseViewController.swift
metaCode/Classes/Common/Util/CNLiveCommonQiniuTool.swift
metaCode/Classes/Config/CNLiveConfigManager.swift
metaCode/Classes/Config/CNLiveConfigstant.swift
metaCode/Classes/Config/NSObject+CNLiveConfigModuleInline.swift
metaCode/Classes/CustomView/CNLiveAlertTool.swift
metaCode/Classes/Extensions/Array+CNLiveExtensions.swift
metaCode/Classes/Extensions/NSDate+CNLiveExtensions.swift
metaCode/Classes/Extensions/NSDictionary+CNLiveExtensions.swift
metaCode/Classes/Extensions/NSObject+CNLiveExtensions.swift
metaCode/Classes/Extensions/NSString+CNLiveExtensions.swift
metaCode/Classes/Extensions/String+Extension.swift
metaCode/Classes/Extensions/UILabel+FormattedText.swift
metaCode/Classes/Extensions/UIScrollView+CNLiveExtensions.swift
metaCode/Classes/Main/HomePage/Controller/CNMetaCodeHomePageController.swift → metaCode/Classes/Main/HomePage/Controller/AuthMainController/CNMetaCodeHomePageController.swift
metaCode/Classes/Main/HomePage/Controller/CNSlideBaseNavigationController.swift → metaCode/Classes/Main/HomePage/Controller/DownSlideController/CNSlideBaseNavigationController.swift
@@ -56,6 +56,14 @@ target &#39;metaCode&#39; do
   #分享
   #pod 'CNLiveShareToolKit'
+  #图片浏览器
+  pod 'SKPhotoBrowser'
+  
+  #视频播放器
+  pod 'PLPlayerKit'
+  #UI框架
+  pod 'QMUIKit'
+
   target 'metaCodeTests' do
     inherit! :search_paths
     # Pods for testing
@@ -9,9 +9,87 @@
 /* Begin PBXBuildFile section */
 		0D39E93D7229931C86EB1161 /* Pods_metaCode_metaCodeUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D879B49B1E42F1584DD75E /* Pods_metaCode_metaCodeUITests.framework */; };
 		19123FC12ABC11170075C883 /* CNWebViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19123FC02ABC11170075C883 /* CNWebViewController.swift */; };
+		1917328E2B032583007BCC04 /* CNLiveRoundedRectView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1917328D2B032583007BCC04 /* CNLiveRoundedRectView.swift */; };
+		191732902B0348F6007BCC04 /* CNLiveSwitchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1917328F2B0348F6007BCC04 /* CNLiveSwitchView.swift */; };
+		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 */; };
+		1917330A2B10864F007BCC04 /* Array+CNLiveExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 191733092B10864F007BCC04 /* Array+CNLiveExtensions.swift */; };
+		1917330D2B1096AB007BCC04 /* CNLivePlayerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1917330C2B1096AB007BCC04 /* CNLivePlayerViewController.swift */; };
+		1917330F2B10989C007BCC04 /* CNLivePlayerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1917330E2B10989C007BCC04 /* CNLivePlayerView.swift */; };
+		191733112B109EDC007BCC04 /* CNLivePlayerControlView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 191733102B109EDC007BCC04 /* CNLivePlayerControlView.swift */; };
+		191733132B109F7B007BCC04 /* CNLivePlayerGestureView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 191733122B109F7B007BCC04 /* CNLivePlayerGestureView.swift */; };
+		191733152B109FD7007BCC04 /* CNLivePlayerTopNaviView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 191733142B109FD7007BCC04 /* CNLivePlayerTopNaviView.swift */; };
+		191733172B10A017007BCC04 /* CNLivePlayerBottomNaviView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 191733162B10A017007BCC04 /* CNLivePlayerBottomNaviView.swift */; };
+		191733192B10A05D007BCC04 /* CNLivePlayerProgressView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 191733182B10A05D007BCC04 /* CNLivePlayerProgressView.swift */; };
+		1917331B2B10A0EF007BCC04 /* CNLivePlayerLoadingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1917331A2B10A0EF007BCC04 /* CNLivePlayerLoadingView.swift */; };
+		1917331D2B10A15A007BCC04 /* CNLivePlayerFailureView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1917331C2B10A15A007BCC04 /* CNLivePlayerFailureView.swift */; };
+		1917331F2B10A1BE007BCC04 /* CNLivePlayerEnum.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1917331E2B10A1BE007BCC04 /* CNLivePlayerEnum.swift */; };
+		191733212B143F3A007BCC04 /* CNLiveGradientView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 191733202B143F3A007BCC04 /* CNLiveGradientView.swift */; };
+		191733232B14601A007BCC04 /* CNLivePlayerProgressSlider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 191733222B14601A007BCC04 /* CNLivePlayerProgressSlider.swift */; };
+		191733252B146078007BCC04 /* CNLivePlayerSlider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 191733242B146078007BCC04 /* CNLivePlayerSlider.swift */; };
+		191733272B148BB1007BCC04 /* CNLivePlayerFastForwardPreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 191733262B148BB1007BCC04 /* CNLivePlayerFastForwardPreviewView.swift */; };
+		191733292B148BF7007BCC04 /* CNLivePlayerVolumeBrightnessView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 191733282B148BF7007BCC04 /* CNLivePlayerVolumeBrightnessView.swift */; };
+		1917332B2B15CDC6007BCC04 /* CNLivePlayerLandscapeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1917332A2B15CDC6007BCC04 /* CNLivePlayerLandscapeViewController.swift */; };
+		1917332D2B15DB20007BCC04 /* CNLivePlayerKVOModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1917332C2B15DB20007BCC04 /* CNLivePlayerKVOModel.swift */; };
+		1917332F2B16C7C9007BCC04 /* CNLiveTimer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1917332E2B16C7C9007BCC04 /* CNLiveTimer.swift */; };
+		191733312B170537007BCC04 /* CNLiveCommonManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 191733302B170537007BCC04 /* CNLiveCommonManager.swift */; };
+		191733362B27EFD4007BCC04 /* CNLiveShopClassilyManageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 191733352B27EFD3007BCC04 /* CNLiveShopClassilyManageViewController.swift */; };
+		191733382B27FD66007BCC04 /* CNLiveShopClassifySectionHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 191733372B27FD66007BCC04 /* CNLiveShopClassifySectionHeaderView.swift */; };
+		1917333A2B27FDF3007BCC04 /* CNLiveShopClassilyManageTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 191733392B27FDF3007BCC04 /* CNLiveShopClassilyManageTableViewCell.swift */; };
+		1917333C2B27FE75007BCC04 /* CNLiveShopClassilyManageHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1917333B2B27FE75007BCC04 /* CNLiveShopClassilyManageHeaderView.swift */; };
+		1917333F2B284C93007BCC04 /* CNLiveShopCouponCreateViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1917333E2B284C93007BCC04 /* CNLiveShopCouponCreateViewController.swift */; };
+		191733422B284D5E007BCC04 /* CNLiveShopCouponCreateBottomView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 191733412B284D5E007BCC04 /* CNLiveShopCouponCreateBottomView.swift */; };
+		191733452B284DCD007BCC04 /* CNLiveShopCouponListModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 191733442B284DCD007BCC04 /* CNLiveShopCouponListModel.swift */; };
+		191733482B2855E8007BCC04 /* CNLiveShopCouponViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 191733472B2855E8007BCC04 /* CNLiveShopCouponViewModel.swift */; };
+		1917334A2B2BE746007BCC04 /* CNLiveCreateCouponTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 191733492B2BE746007BCC04 /* CNLiveCreateCouponTableViewCell.swift */; };
+		1917334C2B2BE9CA007BCC04 /* CNLiveCreateCouponTypeMoneyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1917334B2B2BE9CA007BCC04 /* CNLiveCreateCouponTypeMoneyView.swift */; };
+		1917334E2B2C1A08007BCC04 /* CNLiveSelectCouponTapView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1917334D2B2C1A08007BCC04 /* CNLiveSelectCouponTapView.swift */; };
+		191733502B2C3E1F007BCC04 /* CNLivePickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1917334F2B2C3E1F007BCC04 /* CNLivePickerView.swift */; };
+		191733522B2C4CEA007BCC04 /* CNLivePickerSelectDateTools.swift in Sources */ = {isa = PBXBuildFile; fileRef = 191733512B2C4CEA007BCC04 /* CNLivePickerSelectDateTools.swift */; };
+		191733542B2C4D58007BCC04 /* CNLivePickerToolsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 191733532B2C4D58007BCC04 /* CNLivePickerToolsView.swift */; };
+		191733562B2FE855007BCC04 /* CNLivePickerReusingModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 191733552B2FE855007BCC04 /* CNLivePickerReusingModel.swift */; };
+		191733582B319552007BCC04 /* CNLiveCouponGoodsListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 191733572B319552007BCC04 /* CNLiveCouponGoodsListView.swift */; };
+		1917335A2B3283A1007BCC04 /* CNLiveCouponGoodsSearchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 191733592B3283A1007BCC04 /* CNLiveCouponGoodsSearchView.swift */; };
+		1917335C2B3283FF007BCC04 /* CNLiveCouponGoodsListSearchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1917335B2B3283FF007BCC04 /* CNLiveCouponGoodsListSearchView.swift */; };
+		1917335E2B328495007BCC04 /* CNLiveCouponListTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1917335D2B328495007BCC04 /* CNLiveCouponListTableViewCell.swift */; };
+		191733602B352488007BCC04 /* CNLiveCouponGoodsListTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1917335F2B352488007BCC04 /* CNLiveCouponGoodsListTableViewCell.swift */; };
+		191733622B3538DC007BCC04 /* CNLiveShopCouponsManagerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 191733612B3538DC007BCC04 /* CNLiveShopCouponsManagerViewController.swift */; };
+		191733642B392011007BCC04 /* CNLiveShopGoodsSearchViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 191733632B392011007BCC04 /* CNLiveShopGoodsSearchViewController.swift */; };
+		191733662B39237D007BCC04 /* CNLiveShopGoodsManageListTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 191733652B39237D007BCC04 /* CNLiveShopGoodsManageListTableViewCell.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 */; };
+		1938BD172B3D6C7F00390A34 /* CNLiveAuthViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD162B3D6C7F00390A34 /* CNLiveAuthViewController.swift */; };
+		1938BD202B46799A00390A34 /* CNLivePlayletHomePageController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD1F2B46799A00390A34 /* CNLivePlayletHomePageController.swift */; };
+		1938BD222B467C1700390A34 /* CNLivePlayletHomePageCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD212B467C1700390A34 /* CNLivePlayletHomePageCell.swift */; };
+		1938BD242B468AC900390A34 /* CNLivePlayletHomePageHeaderCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD232B468AC900390A34 /* CNLivePlayletHomePageHeaderCell.swift */; };
+		1938BD262B479D3400390A34 /* UILabel+FormattedText.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD252B479D3400390A34 /* UILabel+FormattedText.swift */; };
+		1938BD2A2B48014E00390A34 /* CNHomepageDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD292B48014E00390A34 /* CNHomepageDetailViewController.swift */; };
+		1938BD2C2B4801A700390A34 /* CNHomePageAnimationTransition.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD2B2B4801A700390A34 /* CNHomePageAnimationTransition.swift */; };
+		1938BD2E2B48021E00390A34 /* CNHomePageBaseNavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD2D2B48021E00390A34 /* CNHomePageBaseNavigationController.swift */; };
+		1938BD302B4B8A3500390A34 /* CNLiveHomePageViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD2F2B4B8A3500390A34 /* CNLiveHomePageViewModel.swift */; };
+		1938BD322B4B8F0400390A34 /* CNLiveHomePageModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD312B4B8F0400390A34 /* CNLiveHomePageModel.swift */; };
+		1938BD342B4B968300390A34 /* CNLiveHomePageDuanJuCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD332B4B968300390A34 /* CNLiveHomePageDuanJuCell.swift */; };
+		1938BD362B4BCC7F00390A34 /* CNLiveAlbumModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD352B4BCC7F00390A34 /* CNLiveAlbumModel.swift */; };
+		1938BD382B4BDC2500390A34 /* CNLiveAlbumImageCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD372B4BDC2500390A34 /* CNLiveAlbumImageCell.swift */; };
+		1938BD3D2B4BDD4B00390A34 /* CNLiveAlbumCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD3C2B4BDD4B00390A34 /* CNLiveAlbumCell.swift */; };
+		1938BD3F2B4BE7C500390A34 /* CNLiveAlbumMsgModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD3E2B4BE7C500390A34 /* CNLiveAlbumMsgModel.swift */; };
+		1938BD412B4BEC6900390A34 /* CNLiveAlbumListModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD402B4BEC6900390A34 /* CNLiveAlbumListModel.swift */; };
 		19565EC02AF4DE0E007D6727 /* CNLiveShopDetailBtnsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19565EBF2AF4DE0E007D6727 /* CNLiveShopDetailBtnsCell.swift */; };
 		19565EC22AF616CA007D6727 /* CNLiveShopDetailOrderAssetCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19565EC12AF616CA007D6727 /* CNLiveShopDetailOrderAssetCell.swift */; };
 		19565EC52AF8AD1F007D6727 /* CNLiveShopProductManagerController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19565EC42AF8AD1F007D6727 /* CNLiveShopProductManagerController.swift */; };
@@ -43,6 +121,8 @@
 		19CC4D542ADD163D00308E2A /* CNUpSlideCardPresentationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19CC4D532ADD163D00308E2A /* CNUpSlideCardPresentationController.swift */; };
 		19CC4D562ADD19C200308E2A /* String+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19CC4D552ADD19C200308E2A /* String+Extension.swift */; };
 		19D2CE632AE8B65D00691757 /* CNLiveDownSlideTool.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19D2CE622AE8B65D00691757 /* CNLiveDownSlideTool.swift */; };
+		19E9D1602B3A98C200D0FB30 /* CNLiveShopAssociatedGoodsTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19E9D15F2B3A98C200D0FB30 /* CNLiveShopAssociatedGoodsTableViewCell.swift */; };
+		19E9D1622B3BBB2E00D0FB30 /* CNLiveFileManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19E9D1612B3BBB2E00D0FB30 /* CNLiveFileManager.swift */; };
 		19F1C2332AB5728B0083D06C /* CNIDCardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19F1C2322AB5728B0083D06C /* CNIDCardView.swift */; };
 		19FA20172AE22D3C001F7186 /* CNLiveDownSlideRecommendCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19FA20162AE22D3C001F7186 /* CNLiveDownSlideRecommendCell.swift */; };
 		19FA20192AE22D98001F7186 /* CNLiveDownSlideTodayRecommendCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19FA20182AE22D98001F7186 /* CNLiveDownSlideTodayRecommendCell.swift */; };
@@ -190,9 +270,87 @@
 		0EC910AB9EBD717B04432BC4 /* Pods-metaCode-metaCodeUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-metaCode-metaCodeUITests.debug.xcconfig"; path = "Target Support Files/Pods-metaCode-metaCodeUITests/Pods-metaCode-metaCodeUITests.debug.xcconfig"; sourceTree = "<group>"; };
 		170BC5D0622EA2969D110A3B /* Pods-metaCode.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-metaCode.release.xcconfig"; path = "Target Support Files/Pods-metaCode/Pods-metaCode.release.xcconfig"; sourceTree = "<group>"; };
 		19123FC02ABC11170075C883 /* CNWebViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNWebViewController.swift; sourceTree = "<group>"; };
+		1917328D2B032583007BCC04 /* CNLiveRoundedRectView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveRoundedRectView.swift; sourceTree = "<group>"; };
+		1917328F2B0348F6007BCC04 /* CNLiveSwitchView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveSwitchView.swift; sourceTree = "<group>"; };
+		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>"; };
+		191733092B10864F007BCC04 /* Array+CNLiveExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Array+CNLiveExtensions.swift"; sourceTree = "<group>"; };
+		1917330C2B1096AB007BCC04 /* CNLivePlayerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLivePlayerViewController.swift; sourceTree = "<group>"; };
+		1917330E2B10989C007BCC04 /* CNLivePlayerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLivePlayerView.swift; sourceTree = "<group>"; };
+		191733102B109EDC007BCC04 /* CNLivePlayerControlView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLivePlayerControlView.swift; sourceTree = "<group>"; };
+		191733122B109F7B007BCC04 /* CNLivePlayerGestureView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLivePlayerGestureView.swift; sourceTree = "<group>"; };
+		191733142B109FD7007BCC04 /* CNLivePlayerTopNaviView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLivePlayerTopNaviView.swift; sourceTree = "<group>"; };
+		191733162B10A017007BCC04 /* CNLivePlayerBottomNaviView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLivePlayerBottomNaviView.swift; sourceTree = "<group>"; };
+		191733182B10A05D007BCC04 /* CNLivePlayerProgressView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLivePlayerProgressView.swift; sourceTree = "<group>"; };
+		1917331A2B10A0EF007BCC04 /* CNLivePlayerLoadingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLivePlayerLoadingView.swift; sourceTree = "<group>"; };
+		1917331C2B10A15A007BCC04 /* CNLivePlayerFailureView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLivePlayerFailureView.swift; sourceTree = "<group>"; };
+		1917331E2B10A1BE007BCC04 /* CNLivePlayerEnum.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLivePlayerEnum.swift; sourceTree = "<group>"; };
+		191733202B143F3A007BCC04 /* CNLiveGradientView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveGradientView.swift; sourceTree = "<group>"; };
+		191733222B14601A007BCC04 /* CNLivePlayerProgressSlider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLivePlayerProgressSlider.swift; sourceTree = "<group>"; };
+		191733242B146078007BCC04 /* CNLivePlayerSlider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLivePlayerSlider.swift; sourceTree = "<group>"; };
+		191733262B148BB1007BCC04 /* CNLivePlayerFastForwardPreviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLivePlayerFastForwardPreviewView.swift; sourceTree = "<group>"; };
+		191733282B148BF7007BCC04 /* CNLivePlayerVolumeBrightnessView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLivePlayerVolumeBrightnessView.swift; sourceTree = "<group>"; };
+		1917332A2B15CDC6007BCC04 /* CNLivePlayerLandscapeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLivePlayerLandscapeViewController.swift; sourceTree = "<group>"; };
+		1917332C2B15DB20007BCC04 /* CNLivePlayerKVOModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLivePlayerKVOModel.swift; sourceTree = "<group>"; };
+		1917332E2B16C7C9007BCC04 /* CNLiveTimer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveTimer.swift; sourceTree = "<group>"; };
+		191733302B170537007BCC04 /* CNLiveCommonManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveCommonManager.swift; sourceTree = "<group>"; };
+		191733352B27EFD3007BCC04 /* CNLiveShopClassilyManageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopClassilyManageViewController.swift; sourceTree = "<group>"; };
+		191733372B27FD66007BCC04 /* CNLiveShopClassifySectionHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopClassifySectionHeaderView.swift; sourceTree = "<group>"; };
+		191733392B27FDF3007BCC04 /* CNLiveShopClassilyManageTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopClassilyManageTableViewCell.swift; sourceTree = "<group>"; };
+		1917333B2B27FE75007BCC04 /* CNLiveShopClassilyManageHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopClassilyManageHeaderView.swift; sourceTree = "<group>"; };
+		1917333E2B284C93007BCC04 /* CNLiveShopCouponCreateViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopCouponCreateViewController.swift; sourceTree = "<group>"; };
+		191733412B284D5E007BCC04 /* CNLiveShopCouponCreateBottomView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopCouponCreateBottomView.swift; sourceTree = "<group>"; };
+		191733442B284DCD007BCC04 /* CNLiveShopCouponListModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopCouponListModel.swift; sourceTree = "<group>"; };
+		191733472B2855E8007BCC04 /* CNLiveShopCouponViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopCouponViewModel.swift; sourceTree = "<group>"; };
+		191733492B2BE746007BCC04 /* CNLiveCreateCouponTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveCreateCouponTableViewCell.swift; sourceTree = "<group>"; };
+		1917334B2B2BE9CA007BCC04 /* CNLiveCreateCouponTypeMoneyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveCreateCouponTypeMoneyView.swift; sourceTree = "<group>"; };
+		1917334D2B2C1A08007BCC04 /* CNLiveSelectCouponTapView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveSelectCouponTapView.swift; sourceTree = "<group>"; };
+		1917334F2B2C3E1F007BCC04 /* CNLivePickerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLivePickerView.swift; sourceTree = "<group>"; };
+		191733512B2C4CEA007BCC04 /* CNLivePickerSelectDateTools.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLivePickerSelectDateTools.swift; sourceTree = "<group>"; };
+		191733532B2C4D58007BCC04 /* CNLivePickerToolsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLivePickerToolsView.swift; sourceTree = "<group>"; };
+		191733552B2FE855007BCC04 /* CNLivePickerReusingModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLivePickerReusingModel.swift; sourceTree = "<group>"; };
+		191733572B319552007BCC04 /* CNLiveCouponGoodsListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveCouponGoodsListView.swift; sourceTree = "<group>"; };
+		191733592B3283A1007BCC04 /* CNLiveCouponGoodsSearchView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveCouponGoodsSearchView.swift; sourceTree = "<group>"; };
+		1917335B2B3283FF007BCC04 /* CNLiveCouponGoodsListSearchView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveCouponGoodsListSearchView.swift; sourceTree = "<group>"; };
+		1917335D2B328495007BCC04 /* CNLiveCouponListTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveCouponListTableViewCell.swift; sourceTree = "<group>"; };
+		1917335F2B352488007BCC04 /* CNLiveCouponGoodsListTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveCouponGoodsListTableViewCell.swift; sourceTree = "<group>"; };
+		191733612B3538DC007BCC04 /* CNLiveShopCouponsManagerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopCouponsManagerViewController.swift; sourceTree = "<group>"; };
+		191733632B392011007BCC04 /* CNLiveShopGoodsSearchViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopGoodsSearchViewController.swift; sourceTree = "<group>"; };
+		191733652B39237D007BCC04 /* CNLiveShopGoodsManageListTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopGoodsManageListTableViewCell.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>"; };
+		1938BD162B3D6C7F00390A34 /* CNLiveAuthViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveAuthViewController.swift; sourceTree = "<group>"; };
+		1938BD1F2B46799A00390A34 /* CNLivePlayletHomePageController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLivePlayletHomePageController.swift; sourceTree = "<group>"; };
+		1938BD212B467C1700390A34 /* CNLivePlayletHomePageCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLivePlayletHomePageCell.swift; sourceTree = "<group>"; };
+		1938BD232B468AC900390A34 /* CNLivePlayletHomePageHeaderCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLivePlayletHomePageHeaderCell.swift; sourceTree = "<group>"; };
+		1938BD252B479D3400390A34 /* UILabel+FormattedText.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UILabel+FormattedText.swift"; sourceTree = "<group>"; };
+		1938BD292B48014E00390A34 /* CNHomepageDetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNHomepageDetailViewController.swift; sourceTree = "<group>"; };
+		1938BD2B2B4801A700390A34 /* CNHomePageAnimationTransition.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNHomePageAnimationTransition.swift; sourceTree = "<group>"; };
+		1938BD2D2B48021E00390A34 /* CNHomePageBaseNavigationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNHomePageBaseNavigationController.swift; sourceTree = "<group>"; };
+		1938BD2F2B4B8A3500390A34 /* CNLiveHomePageViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveHomePageViewModel.swift; sourceTree = "<group>"; };
+		1938BD312B4B8F0400390A34 /* CNLiveHomePageModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveHomePageModel.swift; sourceTree = "<group>"; };
+		1938BD332B4B968300390A34 /* CNLiveHomePageDuanJuCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveHomePageDuanJuCell.swift; sourceTree = "<group>"; };
+		1938BD352B4BCC7F00390A34 /* CNLiveAlbumModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveAlbumModel.swift; sourceTree = "<group>"; };
+		1938BD372B4BDC2500390A34 /* CNLiveAlbumImageCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveAlbumImageCell.swift; sourceTree = "<group>"; };
+		1938BD3C2B4BDD4B00390A34 /* CNLiveAlbumCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveAlbumCell.swift; sourceTree = "<group>"; };
+		1938BD3E2B4BE7C500390A34 /* CNLiveAlbumMsgModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveAlbumMsgModel.swift; sourceTree = "<group>"; };
+		1938BD402B4BEC6900390A34 /* CNLiveAlbumListModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveAlbumListModel.swift; sourceTree = "<group>"; };
 		19565EBF2AF4DE0E007D6727 /* CNLiveShopDetailBtnsCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopDetailBtnsCell.swift; sourceTree = "<group>"; };
 		19565EC12AF616CA007D6727 /* CNLiveShopDetailOrderAssetCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopDetailOrderAssetCell.swift; sourceTree = "<group>"; };
 		19565EC42AF8AD1F007D6727 /* CNLiveShopProductManagerController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopProductManagerController.swift; sourceTree = "<group>"; };
@@ -224,6 +382,8 @@
 		19CC4D532ADD163D00308E2A /* CNUpSlideCardPresentationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNUpSlideCardPresentationController.swift; sourceTree = "<group>"; };
 		19CC4D552ADD19C200308E2A /* String+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+Extension.swift"; sourceTree = "<group>"; };
 		19D2CE622AE8B65D00691757 /* CNLiveDownSlideTool.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveDownSlideTool.swift; sourceTree = "<group>"; };
+		19E9D15F2B3A98C200D0FB30 /* CNLiveShopAssociatedGoodsTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopAssociatedGoodsTableViewCell.swift; sourceTree = "<group>"; };
+		19E9D1612B3BBB2E00D0FB30 /* CNLiveFileManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveFileManager.swift; sourceTree = "<group>"; };
 		19F1C2322AB5728B0083D06C /* CNIDCardView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNIDCardView.swift; sourceTree = "<group>"; };
 		19FA20162AE22D3C001F7186 /* CNLiveDownSlideRecommendCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveDownSlideRecommendCell.swift; sourceTree = "<group>"; };
 		19FA20182AE22D98001F7186 /* CNLiveDownSlideTodayRecommendCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveDownSlideTodayRecommendCell.swift; sourceTree = "<group>"; };
@@ -389,12 +549,256 @@
 /* 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>";
+		};
+		1917330B2B109691007BCC04 /* CNLivePlayer */ = {
+			isa = PBXGroup;
+			children = (
+				1917330C2B1096AB007BCC04 /* CNLivePlayerViewController.swift */,
+				1917330E2B10989C007BCC04 /* CNLivePlayerView.swift */,
+				191733102B109EDC007BCC04 /* CNLivePlayerControlView.swift */,
+				191733122B109F7B007BCC04 /* CNLivePlayerGestureView.swift */,
+				191733142B109FD7007BCC04 /* CNLivePlayerTopNaviView.swift */,
+				191733162B10A017007BCC04 /* CNLivePlayerBottomNaviView.swift */,
+				191733182B10A05D007BCC04 /* CNLivePlayerProgressView.swift */,
+				1917331A2B10A0EF007BCC04 /* CNLivePlayerLoadingView.swift */,
+				1917331C2B10A15A007BCC04 /* CNLivePlayerFailureView.swift */,
+				1917331E2B10A1BE007BCC04 /* CNLivePlayerEnum.swift */,
+				191733202B143F3A007BCC04 /* CNLiveGradientView.swift */,
+				191733222B14601A007BCC04 /* CNLivePlayerProgressSlider.swift */,
+				191733242B146078007BCC04 /* CNLivePlayerSlider.swift */,
+				191733262B148BB1007BCC04 /* CNLivePlayerFastForwardPreviewView.swift */,
+				191733282B148BF7007BCC04 /* CNLivePlayerVolumeBrightnessView.swift */,
+				1917332A2B15CDC6007BCC04 /* CNLivePlayerLandscapeViewController.swift */,
+				1917332C2B15DB20007BCC04 /* CNLivePlayerKVOModel.swift */,
+				1917332E2B16C7C9007BCC04 /* CNLiveTimer.swift */,
+			);
+			path = CNLivePlayer;
+			sourceTree = "<group>";
+		};
+		1917333D2B284C6B007BCC04 /* ShopCoupon */ = {
+			isa = PBXGroup;
+			children = (
+				1917333E2B284C93007BCC04 /* CNLiveShopCouponCreateViewController.swift */,
+				191733612B3538DC007BCC04 /* CNLiveShopCouponsManagerViewController.swift */,
+			);
+			path = ShopCoupon;
+			sourceTree = "<group>";
+		};
+		191733402B284D4A007BCC04 /* ShopCoupon */ = {
+			isa = PBXGroup;
+			children = (
+				191733412B284D5E007BCC04 /* CNLiveShopCouponCreateBottomView.swift */,
+				191733572B319552007BCC04 /* CNLiveCouponGoodsListView.swift */,
+				1917335F2B352488007BCC04 /* CNLiveCouponGoodsListTableViewCell.swift */,
+				191733592B3283A1007BCC04 /* CNLiveCouponGoodsSearchView.swift */,
+				1917335B2B3283FF007BCC04 /* CNLiveCouponGoodsListSearchView.swift */,
+				1917335D2B328495007BCC04 /* CNLiveCouponListTableViewCell.swift */,
+				191733492B2BE746007BCC04 /* CNLiveCreateCouponTableViewCell.swift */,
+				1917334B2B2BE9CA007BCC04 /* CNLiveCreateCouponTypeMoneyView.swift */,
+				1917334D2B2C1A08007BCC04 /* CNLiveSelectCouponTapView.swift */,
+				1917334F2B2C3E1F007BCC04 /* CNLivePickerView.swift */,
+				191733512B2C4CEA007BCC04 /* CNLivePickerSelectDateTools.swift */,
+				191733532B2C4D58007BCC04 /* CNLivePickerToolsView.swift */,
+			);
+			path = ShopCoupon;
+			sourceTree = "<group>";
+		};
+		191733432B284DB9007BCC04 /* ShopCoupon */ = {
+			isa = PBXGroup;
+			children = (
+				191733442B284DCD007BCC04 /* CNLiveShopCouponListModel.swift */,
+				191733552B2FE855007BCC04 /* CNLivePickerReusingModel.swift */,
+			);
+			path = ShopCoupon;
+			sourceTree = "<group>";
+		};
+		191733462B2855D6007BCC04 /* ShopCoupon */ = {
+			isa = PBXGroup;
+			children = (
+				191733472B2855E8007BCC04 /* CNLiveShopCouponViewModel.swift */,
+			);
+			path = ShopCoupon;
+			sourceTree = "<group>";
+		};
+		1938BD112B3D6C0C00390A34 /* HomePages */ = {
+			isa = PBXGroup;
+			children = (
+				1938BD152B3D6C6000390A34 /* Controller */,
+				1938BD142B3D6C5C00390A34 /* View */,
+				1938BD132B3D6C5700390A34 /* Model */,
+				1938BD122B3D6C4700390A34 /* ViewModel */,
+			);
+			path = HomePages;
+			sourceTree = "<group>";
+		};
+		1938BD122B3D6C4700390A34 /* ViewModel */ = {
+			isa = PBXGroup;
+			children = (
+				1938BD2F2B4B8A3500390A34 /* CNLiveHomePageViewModel.swift */,
+			);
+			path = ViewModel;
+			sourceTree = "<group>";
+		};
+		1938BD132B3D6C5700390A34 /* Model */ = {
+			isa = PBXGroup;
+			children = (
+				1938BD312B4B8F0400390A34 /* CNLiveHomePageModel.swift */,
+				1938BD352B4BCC7F00390A34 /* CNLiveAlbumModel.swift */,
+				1938BD3E2B4BE7C500390A34 /* CNLiveAlbumMsgModel.swift */,
+				1938BD402B4BEC6900390A34 /* CNLiveAlbumListModel.swift */,
+			);
+			path = Model;
+			sourceTree = "<group>";
+		};
+		1938BD142B3D6C5C00390A34 /* View */ = {
+			isa = PBXGroup;
+			children = (
+				1938BD3B2B4BDC5700390A34 /* PlayletHomePage */,
+				1938BD3A2B4BDC4200390A34 /* HomePage */,
+				1938BD392B4BDC2900390A34 /* HomepageDetail */,
+			);
+			path = View;
+			sourceTree = "<group>";
+		};
+		1938BD152B3D6C6000390A34 /* Controller */ = {
+			isa = PBXGroup;
+			children = (
+				1938BD272B48009600390A34 /* AuthController */,
+				1938BD1D2B46791400390A34 /* PlayletHomePage */,
+			);
+			path = Controller;
+			sourceTree = "<group>";
+		};
+		1938BD182B454DB100390A34 /* ShopUpConsole */ = {
+			isa = PBXGroup;
+			children = (
+				19BB1FE02AEB5C220094D962 /* CNLiveShopConsoleController.swift */,
+			);
+			path = ShopUpConsole;
+			sourceTree = "<group>";
+		};
+		1938BD192B454E1500390A34 /* ShopDownDetail */ = {
+			isa = PBXGroup;
+			children = (
+				19BB1FEB2AF0AB8E0094D962 /* CNLiveDownShopDetailController.swift */,
+			);
+			path = ShopDownDetail;
+			sourceTree = "<group>";
+		};
+		1938BD1A2B4554A800390A34 /* AuthMainController */ = {
+			isa = PBXGroup;
+			children = (
+				7CD6754E2A2840B9008354C1 /* CNMetaCodeHomePageController.swift */,
+			);
+			path = AuthMainController;
+			sourceTree = "<group>";
+		};
+		1938BD1B2B45557700390A34 /* DownSlideController */ = {
+			isa = PBXGroup;
+			children = (
+				19BB1FDE2AEA3A450094D962 /* CNSlideBaseNavigationController.swift */,
+				19CC4D532ADD163D00308E2A /* CNUpSlideCardPresentationController.swift */,
+				192336EA2AD9224300D47CD4 /* CNUpSlideViewController.swift */,
+				19CC4D4A2ADD086F00308E2A /* CNUpSlideDetailViewController.swift */,
+			);
+			path = DownSlideController;
+			sourceTree = "<group>";
+		};
+		1938BD1C2B4555A000390A34 /* WebController */ = {
+			isa = PBXGroup;
+			children = (
+				19123FC02ABC11170075C883 /* CNWebViewController.swift */,
+			);
+			path = WebController;
+			sourceTree = "<group>";
+		};
+		1938BD1D2B46791400390A34 /* PlayletHomePage */ = {
+			isa = PBXGroup;
+			children = (
+				1938BD1F2B46799A00390A34 /* CNLivePlayletHomePageController.swift */,
+			);
+			path = PlayletHomePage;
+			sourceTree = "<group>";
+		};
+		1938BD272B48009600390A34 /* AuthController */ = {
+			isa = PBXGroup;
+			children = (
+				1938BD282B4800E500390A34 /* push相关 */,
+				1938BD162B3D6C7F00390A34 /* CNLiveAuthViewController.swift */,
+			);
+			path = AuthController;
+			sourceTree = "<group>";
+		};
+		1938BD282B4800E500390A34 /* push相关 */ = {
+			isa = PBXGroup;
+			children = (
+				1938BD292B48014E00390A34 /* CNHomepageDetailViewController.swift */,
+				1938BD2B2B4801A700390A34 /* CNHomePageAnimationTransition.swift */,
+				1938BD2D2B48021E00390A34 /* CNHomePageBaseNavigationController.swift */,
+			);
+			path = "push相关";
+			sourceTree = "<group>";
+		};
+		1938BD392B4BDC2900390A34 /* HomepageDetail */ = {
+			isa = PBXGroup;
+			children = (
+				1938BD372B4BDC2500390A34 /* CNLiveAlbumImageCell.swift */,
+				1938BD3C2B4BDD4B00390A34 /* CNLiveAlbumCell.swift */,
+			);
+			path = HomepageDetail;
+			sourceTree = "<group>";
+		};
+		1938BD3A2B4BDC4200390A34 /* HomePage */ = {
+			isa = PBXGroup;
+			children = (
+				1938BD332B4B968300390A34 /* CNLiveHomePageDuanJuCell.swift */,
+			);
+			path = HomePage;
+			sourceTree = "<group>";
+		};
+		1938BD3B2B4BDC5700390A34 /* PlayletHomePage */ = {
+			isa = PBXGroup;
+			children = (
+				1938BD212B467C1700390A34 /* CNLivePlayletHomePageCell.swift */,
+				1938BD232B468AC900390A34 /* CNLivePlayletHomePageHeaderCell.swift */,
+			);
+			path = PlayletHomePage;
+			sourceTree = "<group>";
+		};
 		19565EC32AF8ACC2007D6727 /* GoodsManager */ = {
 			isa = PBXGroup;
 			children = (
 				19565EC42AF8AD1F007D6727 /* CNLiveShopProductManagerController.swift */,
 				19565EC62AF8AD38007D6727 /* CNLiveShopNewProductController.swift */,
+				191733632B392011007BCC04 /* CNLiveShopGoodsSearchViewController.swift */,
+				191732E42B05FFE8007BCC04 /* CNLiveModalPresentationViewController.swift */,
 				1965FA412AFB79EA00F0F435 /* CNLiveGoodsCategoryController.swift */,
+				191732EE2B075C3A007BCC04 /* CNLiveCreateShopClassifyViewController.swift */,
+				191733352B27EFD3007BCC04 /* CNLiveShopClassilyManageViewController.swift */,
 			);
 			path = GoodsManager;
 			sourceTree = "<group>";
@@ -404,8 +808,22 @@
 			children = (
 				19565ECC2AF8D256007D6727 /* CNLiveShopGoodsListClassifyView.swift */,
 				19565ECE2AF8D8F6007D6727 /* CNLiveShopGoodsListCell.swift */,
+				191733652B39237D007BCC04 /* CNLiveShopGoodsManageListTableViewCell.swift */,
+				19E9D15F2B3A98C200D0FB30 /* CNLiveShopAssociatedGoodsTableViewCell.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 */,
+				191733372B27FD66007BCC04 /* CNLiveShopClassifySectionHeaderView.swift */,
+				191733392B27FDF3007BCC04 /* CNLiveShopClassilyManageTableViewCell.swift */,
+				1917333B2B27FE75007BCC04 /* CNLiveShopClassilyManageHeaderView.swift */,
 			);
 			path = GoodsManager;
 			sourceTree = "<group>";
@@ -423,6 +841,8 @@
 			children = (
 				19565ECA2AF8C59C007D6727 /* CNLiveShopGoodsListModel.swift */,
 				19565ED32AF9FEB4007D6727 /* CNLiveShopAddEditGoodsModel.swift */,
+				191732EA2B070943007BCC04 /* CNLiveShopGoodsManageDetailsGoodsCategoryModel.swift */,
+				191732EC2B073C52007BCC04 /* CNLiveShopClassifyListModel.swift */,
 			);
 			path = GoodsManager;
 			sourceTree = "<group>";
@@ -430,6 +850,8 @@
 		19BB1FE42AEB93850094D962 /* Model */ = {
 			isa = PBXGroup;
 			children = (
+				191733432B284DB9007BCC04 /* ShopCoupon */,
+				191732F92B0AF329007BCC04 /* GoodsDetail */,
 				19565ED22AF9FE67007D6727 /* GoodsManager */,
 				1926C2902AE0FD4500C71DC3 /* CNLiveDownSlideModel.swift */,
 				19BB1FE52AEB93B80094D962 /* CNLiveShopUserInfoModel.swift */,
@@ -442,10 +864,13 @@
 		19CC4D502ADD126D00308E2A /* Util */ = {
 			isa = PBXGroup;
 			children = (
+				1917330B2B109691007BCC04 /* CNLivePlayer */,
 				19CC4D512ADD129800308E2A /* CNUpSlideAnimationTransition.swift */,
 				19FA201A2AE60423001F7186 /* CNLiveDownSlideModelLayout.swift */,
 				19D2CE622AE8B65D00691757 /* CNLiveDownSlideTool.swift */,
 				19BB202A2AF382150094D962 /* CNLiveAdaptTool.swift */,
+				191733302B170537007BCC04 /* CNLiveCommonManager.swift */,
+				19E9D1612B3BBB2E00D0FB30 /* CNLiveFileManager.swift */,
 			);
 			path = Util;
 			sourceTree = "<group>";
@@ -479,6 +904,10 @@
 				79E496E72AB9674300127BF8 /* NSMutableAttributedString+CNLiveExtensions.swift */,
 				19CC4D482ADD06C500308E2A /* UITableView+Extension.swift */,
 				19CC4D552ADD19C200308E2A /* String+Extension.swift */,
+				191732E62B0615C1007BCC04 /* UIScrollView+CNLiveExtensions.swift */,
+				191733032B0F216E007BCC04 /* NSDictionary+CNLiveExtensions.swift */,
+				191733092B10864F007BCC04 /* Array+CNLiveExtensions.swift */,
+				1938BD252B479D3400390A34 /* UILabel+FormattedText.swift */,
 			);
 			path = Extensions;
 			sourceTree = "<group>";
@@ -681,10 +1110,11 @@
 			isa = PBXGroup;
 			children = (
 				7939B06D2B47EB46005AE981 /* VideoPage */,
+				1938BD112B3D6C0C00390A34 /* HomePages */,
 				7991722C2AF08CF100DC01A8 /* ShopPage */,
 				790D01972A2DCAE400C5978D /* MinePage */,
 				790D018C2A2D8C9A00C5978D /* LoginPage */,
-				7CD675212A26F844008354C1 /* HomePage */,
+				7CD675212A26F844008354C1 /* AuthPage */,
 			);
 			path = Main;
 			sourceTree = "<group>";
@@ -717,8 +1147,8 @@
 		796398952A260C3700D045EB /* Supporting Files */ = {
 			isa = PBXGroup;
 			children = (
-				818163C12A25CFCC00579C86 /* Main.storyboard */,
 				818163C42A25CFCF00579C86 /* Assets.xcassets */,
+				818163C12A25CFCC00579C86 /* Main.storyboard */,
 				818163C62A25CFCF00579C86 /* LaunchScreen.storyboard */,
 			);
 			path = "Supporting Files";
@@ -854,6 +1284,8 @@
 		7C83B43C2A52B899004BF4A4 /* ViewModel */ = {
 			isa = PBXGroup;
 			children = (
+				191733462B2855D6007BCC04 /* ShopCoupon */,
+				191732F62B08AAD4007BCC04 /* ShopClassify */,
 				19565ED12AF9FE56007D6727 /* GoodsManager */,
 				1926C28E2AE0D76C00C71DC3 /* CNLiveDownSlideViewModel.swift */,
 				19BB1FE22AEB8B7C0094D962 /* CNLiveShopConsoleViewModel.swift */,
@@ -863,7 +1295,7 @@
 			path = HomePage/ViewModel;
 			sourceTree = "<group>";
 		};
-		7CD675212A26F844008354C1 /* HomePage */ = {
+		7CD675212A26F844008354C1 /* AuthPage */ = {
 			isa = PBXGroup;
 			children = (
 				19CC4D502ADD126D00308E2A /* Util */,
@@ -872,18 +1304,19 @@
 				7CD6754D2A2840B9008354C1 /* Controller */,
 				7CD675232A26F8F8008354C1 /* View */,
 			);
-			name = HomePage;
+			name = AuthPage;
 			sourceTree = "<group>";
 		};
 		7CD675232A26F8F8008354C1 /* View */ = {
 			isa = PBXGroup;
 			children = (
+				191733402B284D4A007BCC04 /* ShopCoupon */,
 				19565ED02AF8D904007D6727 /* GoodsManager */,
 				7CD675372A2740B0008354C1 /* CNUpSlideViewRemindView.swift */,
 				7CD6753B2A2740B0008354C1 /* CNDownSlideView.swift */,
 				7CD675382A2740B0008354C1 /* CNMainView.swift */,
-				7CD675392A2740B0008354C1 /* CNUpSlideView.swift */,
 				7CD6753A2A2740B0008354C1 /* CNDownSlideViewRemindView.swift */,
+				7CD675392A2740B0008354C1 /* CNUpSlideView.swift */,
 				7CD675412A2740F8008354C1 /* CNCustomIndexView.swift */,
 				7C4931302A2F142F000E44B4 /* CNHomePageBackgroupView.swift */,
 				7C4931372A307BDB000E44B4 /* CNHomePageGuideView.swift */,
@@ -905,15 +1338,14 @@
 		7CD6754D2A2840B9008354C1 /* Controller */ = {
 			isa = PBXGroup;
 			children = (
+				1938BD1A2B4554A800390A34 /* AuthMainController */,
+				1938BD1C2B4555A000390A34 /* WebController */,
+				1938BD1B2B45557700390A34 /* DownSlideController */,
+				1938BD192B454E1500390A34 /* ShopDownDetail */,
+				1938BD182B454DB100390A34 /* ShopUpConsole */,
+				1917333D2B284C6B007BCC04 /* ShopCoupon */,
+				191732FC2B0B3EB4007BCC04 /* GoodsDetail */,
 				19565EC32AF8ACC2007D6727 /* GoodsManager */,
-				19BB1FDE2AEA3A450094D962 /* CNSlideBaseNavigationController.swift */,
-				7CD6754E2A2840B9008354C1 /* CNMetaCodeHomePageController.swift */,
-				19123FC02ABC11170075C883 /* CNWebViewController.swift */,
-				192336EA2AD9224300D47CD4 /* CNUpSlideViewController.swift */,
-				19CC4D4A2ADD086F00308E2A /* CNUpSlideDetailViewController.swift */,
-				19CC4D532ADD163D00308E2A /* CNUpSlideCardPresentationController.swift */,
-				19BB1FE02AEB5C220094D962 /* CNLiveShopConsoleController.swift */,
-				19BB1FEB2AF0AB8E0094D962 /* CNLiveDownShopDetailController.swift */,
 			);
 			name = Controller;
 			path = HomePage/Controller;
@@ -1260,67 +1692,107 @@
 				19565EC92AF8BEC6007D6727 /* CNLiveShopGoodListViewModel.swift in Sources */,
 				19BB1FE82AECAD060094D962 /* CNLiveShopConsoleModel.swift in Sources */,
 				19BB1FEE2AF0E1EC0094D962 /* CNLiveShopDetailViewModel.swift in Sources */,
+				1917334C2B2BE9CA007BCC04 /* CNLiveCreateCouponTypeMoneyView.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 */,
+				1938BD2E2B48021E00390A34 /* CNHomePageBaseNavigationController.swift in Sources */,
+				1917332F2B16C7C9007BCC04 /* CNLiveTimer.swift in Sources */,
 				7CD675292A270F6A008354C1 /* WJColorChange.m in Sources */,
+				1938BD172B3D6C7F00390A34 /* CNLiveAuthViewController.swift in Sources */,
 				79F4B11C2A33036E00993C03 /* CNLiveMineInfoAlertView.swift in Sources */,
 				79BB96A82AF223FB00AEA4AC /* CNLiveConfigAlertManager.swift in Sources */,
 				19BB1FF02AF0E5B30094D962 /* CNLiveShopDetailModel.swift in Sources */,
+				1938BD382B4BDC2500390A34 /* CNLiveAlbumImageCell.swift in Sources */,
 				796398942A260C0100D045EB /* AppDelegate.swift in Sources */,
 				7939B0792B47FC33005AE981 /* CNLiveShortVideoCustomControlView.swift in Sources */,
+				1917330D2B1096AB007BCC04 /* CNLivePlayerViewController.swift in Sources */,
+				1917330F2B10989C007BCC04 /* CNLivePlayerView.swift in Sources */,
 				7989B5C72A4BDC7200A19B10 /* CNLiveMineEarnListViewController.swift in Sources */,
+				191733502B2C3E1F007BCC04 /* CNLivePickerView.swift in Sources */,
+				191733622B3538DC007BCC04 /* CNLiveShopCouponsManagerViewController.swift in Sources */,
+				191732902B0348F6007BCC04 /* CNLiveSwitchView.swift in Sources */,
 				792B53282AFCD7640009AB49 /* CNLiveShopOrderExpressDetailViewController.swift in Sources */,
 				79396EF12A31C21B0053E1AF /* CNLiveInfoShowViewController.swift in Sources */,
+				191733422B284D5E007BCC04 /* CNLiveShopCouponCreateBottomView.swift in Sources */,
 				192336EB2AD9224300D47CD4 /* CNUpSlideViewController.swift in Sources */,
 				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 */,
 				790B1FB82A41B6A60074CF00 /* CNLiveMineMessageViewController.swift in Sources */,
+				1917333C2B27FE75007BCC04 /* CNLiveShopClassilyManageHeaderView.swift in Sources */,
+				191733252B146078007BCC04 /* CNLivePlayerSlider.swift in Sources */,
 				19BB202B2AF382150094D962 /* CNLiveAdaptTool.swift in Sources */,
 				79E672032AFDFA9C00F2F768 /* CNLiveMineSignOutViewController.swift in Sources */,
 				19565ECD2AF8D256007D6727 /* CNLiveShopGoodsListClassifyView.swift in Sources */,
+				1938BD322B4B8F0400390A34 /* CNLiveHomePageModel.swift in Sources */,
+				191732EF2B075C3A007BCC04 /* CNLiveCreateShopClassifyViewController.swift in Sources */,
+				1938BD302B4B8A3500390A34 /* CNLiveHomePageViewModel.swift in Sources */,
 				798A44F22A30674200815935 /* CNLiveMineSubBodyListView.swift in Sources */,
 				799172382AF090CD00DC01A8 /* CNLiveShopBodyListView.swift in Sources */,
 				19565ED42AF9FEB4007D6727 /* CNLiveShopAddEditGoodsModel.swift in Sources */,
 				790D01822A2D88FC00C5978D /* CNLiveConfigMacro.swift in Sources */,
 				19CC4D4B2ADD086F00308E2A /* CNUpSlideDetailViewController.swift in Sources */,
+				1938BD362B4BCC7F00390A34 /* CNLiveAlbumModel.swift in Sources */,
 				7C83B4402A52BB2B004BF4A4 /* CNGlobalEnum.swift in Sources */,
 				7C83B4442A541F36004BF4A4 /* NSDate+CNLiveExtensions.swift in Sources */,
+				1917332B2B15CDC6007BCC04 /* CNLivePlayerLandscapeViewController.swift in Sources */,
 				798916F12B0491A400D08302 /* CNLiveShopBodyTransListView.swift in Sources */,
 				7CD675482A274167008354C1 /* PGIndexBannerSubiew.m in Sources */,
+				191733562B2FE855007BCC04 /* CNLivePickerReusingModel.swift in Sources */,
 				790D019F2A2DD66E00C5978D /* CNLiveLoginViewModel.swift in Sources */,
 				1926C2912AE0FD4500C71DC3 /* CNLiveDownSlideModel.swift in Sources */,
 				7C7C62F62A4D72E9007A912E /* CNLiveIdentityDB.swift in Sources */,
 				19CC4D4F2ADD0FC200308E2A /* CNUpSlideDetailScrollView.swift in Sources */,
+				191733642B392011007BCC04 /* CNLiveShopGoodsSearchViewController.swift in Sources */,
 				79EABB892AB4497700F3A4E2 /* CNLiveSaveStandDB.swift in Sources */,
 				790B1FB62A41938F0074CF00 /* UIImage+CNLiveExtensions.swift in Sources */,
 				7939B0732B47F12F005AE981 /* CNLiveShortVideoViewController.swift in Sources */,
 				19BB1FEA2AEF7B4A0094D962 /* CNLiveShopConsoleCell.swift in Sources */,
+				191733132B109F7B007BCC04 /* CNLivePlayerGestureView.swift in Sources */,
+				1938BD202B46799A00390A34 /* CNLivePlayletHomePageController.swift in Sources */,
 				790D019D2A2DCBD000C5978D /* UIView+CNLiveExtensions.swift in Sources */,
 				790B1FB62A41938F0074CF00 /* UIImage+CNLiveExtensions.swift in Sources */,
+				191732F82B08AB9D007BCC04 /* CNLiveShopClassilyViewModel.swift in Sources */,
 				79BB1C162B05C62900C5720C /* CNLiveShopBodyCouponView.swift in Sources */,
 				798916E92B04532D00D08302 /* CNLiveSavePointDB.swift in Sources */,
+				1938BD242B468AC900390A34 /* CNLivePlayletHomePageHeaderCell.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 */,
+				1938BD3D2B4BDD4B00390A34 /* CNLiveAlbumCell.swift in Sources */,
+				19E9D1622B3BBB2E00D0FB30 /* CNLiveFileManager.swift in Sources */,
 				79E496E82AB9674300127BF8 /* NSMutableAttributedString+CNLiveExtensions.swift in Sources */,
 				19CC4D472ADD006600308E2A /* CNDownSlideSingleCourseCell.swift in Sources */,
+				191733232B14601A007BCC04 /* CNLivePlayerProgressSlider.swift in Sources */,
+				1917334A2B2BE746007BCC04 /* CNLiveCreateCouponTableViewCell.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 */,
 				798A44F72A3077ED00815935 /* CNLiveHotButton.swift in Sources */,
 				7CD6753D2A2740B0008354C1 /* CNMainView.swift in Sources */,
+				191733662B39237D007BCC04 /* CNLiveShopGoodsManageListTableViewCell.swift in Sources */,
 				793CAF522A58FCA200882EF4 /* CNLiveMineExchangeViewController.swift in Sources */,
+				1917334E2B2C1A08007BCC04 /* CNLiveSelectCouponTapView.swift in Sources */,
+				191733272B148BB1007BCC04 /* CNLivePlayerFastForwardPreviewView.swift in Sources */,
 				7CD675522A29C04B008354C1 /* CNLiveConfigstant.swift in Sources */,
 				79282A402A2F055100B5F8CF /* CNLiveConfigUserInfo.swift in Sources */,
 				1965FA402AFB38AA00F0F435 /* CNLiveAddGoodsSelectUploadImageView.swift in Sources */,
@@ -1328,30 +1800,48 @@
 				19BB1FE12AEB5C220094D962 /* CNLiveShopConsoleController.swift in Sources */,
 				7C4931382A307BDB000E44B4 /* CNHomePageGuideView.swift in Sources */,
 				7CD6753E2A2740B0008354C1 /* CNUpSlideView.swift in Sources */,
+				191733582B319552007BCC04 /* CNLiveCouponGoodsListView.swift in Sources */,
 				7CD675402A2740B0008354C1 /* CNDownSlideView.swift in Sources */,
 				19BB1FE32AEB8B7C0094D962 /* CNLiveShopConsoleViewModel.swift in Sources */,
+				1938BD2A2B48014E00390A34 /* CNHomepageDetailViewController.swift in Sources */,
 				1965FA422AFB79EA00F0F435 /* CNLiveGoodsCategoryController.swift in Sources */,
 				792E57D92A3AA2F2005834DB /* CNLiveCommonBaseModel.swift in Sources */,
 				791C1C862AFB2EB4003E6362 /* CNLiveShopOrderExpressViewController.swift in Sources */,
 				7CD6753E2A2740B0008354C1 /* CNUpSlideView.swift in Sources */,
+				191733312B170537007BCC04 /* CNLiveCommonManager.swift in Sources */,
 				7CD675402A2740B0008354C1 /* CNDownSlideView.swift in Sources */,
+				191732F52B085BAE007BCC04 /* CNLiveShopClassilyIconTableViewCell.swift in Sources */,
+				191732E32B05F474007BCC04 /* CNLiveShopGoodsManageDetailsInputManager.swift in Sources */,
 				79B2E3602AF39191002A8524 /* NSObject+CNLiveConfigModuleInline.swift in Sources */,
 				79A212C02B0B5C5400BFA8E3 /* CNLiveShopCouponManagerViewController.swift in Sources */,
 				7C2703362A3AFD3A0061EC50 /* CNLiveEnvironment.swift in Sources */,
 				798A44FD2A309EBA00815935 /* CNLiveTypeFeedBackViewController.swift in Sources */,
 				79656E382AAEBA8E00119A61 /* CNLiveMineInputViewController.swift in Sources */,
 				19CC4D522ADD129800308E2A /* CNUpSlideAnimationTransition.swift in Sources */,
+				1917331D2B10A15A007BCC04 /* CNLivePlayerFailureView.swift in Sources */,
 				7CD6754F2A2840B9008354C1 /* CNMetaCodeHomePageController.swift in Sources */,
 				79D094DC2B0765DD008CB1F3 /* CNLiveShopBodyCouponGoodsListView.swift in Sources */,
 				798916EF2B048EC800D08302 /* CNLiveShopTransListViewController.swift in Sources */,
 				7989B5C52A4BDC6000A19B10 /* CNLiveMineEarnViewController.swift in Sources */,
 				792E57DB2A3AE9F4005834DB /* CNLiveCommonQiniuTool.swift in Sources */,
+				191732F12B084822007BCC04 /* CNLiveShopClassifyInputTableViewCell.swift in Sources */,
+				191733212B143F3A007BCC04 /* CNLiveGradientView.swift in Sources */,
 				19BB1FE62AEB93B80094D962 /* CNLiveShopUserInfoModel.swift in Sources */,
 				7CD675472A274167008354C1 /* NewPagedFlowView.m in Sources */,
+				191732ED2B073C52007BCC04 /* CNLiveShopClassifyListModel.swift in Sources */,
+				191733482B2855E8007BCC04 /* CNLiveShopCouponViewModel.swift in Sources */,
 				79F4B11A2A32F21400993C03 /* CNLiveMineNickViewController.swift in Sources */,
+				191733542B2C4D58007BCC04 /* CNLivePickerToolsView.swift in Sources */,
+				191733112B109EDC007BCC04 /* CNLivePlayerControlView.swift in Sources */,
+				1917331F2B10A1BE007BCC04 /* CNLivePlayerEnum.swift in Sources */,
+				191733382B27FD66007BCC04 /* CNLiveShopClassifySectionHeaderView.swift in Sources */,
+				1938BD222B467C1700390A34 /* CNLivePlayletHomePageCell.swift in Sources */,
+				1938BD3F2B4BE7C500390A34 /* CNLiveAlbumMsgModel.swift in Sources */,
 				798A44FF2A30A0A800815935 /* CNLiveInputFeedBackViewController.swift in Sources */,
 				79282A442A2F1C1E00B5F8CF /* CNLiveLoginAuthView.swift in Sources */,
 				79BB96A62AF21E2800AEA4AC /* CNLiveShopOrderDetailViewController.swift in Sources */,
+				1938BD2C2B4801A700390A34 /* CNHomePageAnimationTransition.swift in Sources */,
+				191733452B284DCD007BCC04 /* CNLiveShopCouponListModel.swift in Sources */,
 				7C2703302A36CBE30061EC50 /* CNCertificationView.swift in Sources */,
 				796308752B4B90700090D22A /* CNLiveShortVideoHomeModel.swift in Sources */,
 				19CC4D542ADD163D00308E2A /* CNUpSlideCardPresentationController.swift in Sources */,
@@ -1361,15 +1851,24 @@
 				19565EC52AF8AD1F007D6727 /* CNLiveShopProductManagerController.swift in Sources */,
 				19CC4D492ADD06C500308E2A /* UITableView+Extension.swift in Sources */,
 				796308732B4B8EB80090D22A /* CNLiveShortVideoViewModel.swift in Sources */,
+				19E9D1602B3A98C200D0FB30 /* CNLiveShopAssociatedGoodsTableViewCell.swift in Sources */,
+				191732CE2B04AACD007BCC04 /* CNLiveShopTextView.swift in Sources */,
 				7C2703332A36CC660061EC50 /* CNLiveGlobalBlock.swift in Sources */,
 				7987BF3D2A497644000A1ABC /* CNLiveMineQuestViewController.swift in Sources */,
 				798A44EA2A30135D00815935 /* CNLiveMineBodyListView.swift in Sources */,
+				1917335A2B3283A1007BCC04 /* CNLiveCouponGoodsSearchView.swift in Sources */,
+				191733362B27EFD4007BCC04 /* CNLiveShopClassilyManageViewController.swift in Sources */,
 				799172322AF08D1B00DC01A8 /* CNLiveShopOrderViewController.swift in Sources */,
+				1917332D2B15DB20007BCC04 /* CNLivePlayerKVOModel.swift in Sources */,
+				1917333F2B284C93007BCC04 /* CNLiveShopCouponCreateViewController.swift in Sources */,
+				1917335C2B3283FF007BCC04 /* CNLiveCouponGoodsListSearchView.swift in Sources */,
 				798A44F92A30835400815935 /* CNLiveHelpFeedBackViewController.swift in Sources */,
 				79A68C4A2A26E6CE00DC3B43 /* (null) in Sources */,
+				1938BD262B479D3400390A34 /* UILabel+FormattedText.swift in Sources */,
 				790D01852A2D89E100C5978D /* UIColor+CNLiveExtensions.swift in Sources */,
 				794FF1092B02131300385E85 /* CNLiveSaveSearchDB.swift in Sources */,
 				79396EED2A319F220053E1AF /* NSObject+CNLiveExtensions.swift in Sources */,
+				1917331B2B10A0EF007BCC04 /* CNLivePlayerLoadingView.swift in Sources */,
 				19FA201B2AE60423001F7186 /* CNLiveDownSlideModelLayout.swift in Sources */,
 				7C4931312A2F142F000E44B4 /* CNHomePageBackgroupView.swift in Sources */,
 				19BB1FF22AF21A950094D962 /* CNLliveShopDetailBannerCell.swift in Sources */,
@@ -1377,6 +1876,9 @@
 				19CC4D562ADD19C200308E2A /* String+Extension.swift in Sources */,
 				7905BB492AB0588B0089BC50 /* CNLiveMineAuthResultViewController.swift in Sources */,
 				19565EC22AF616CA007D6727 /* CNLiveShopDetailOrderAssetCell.swift in Sources */,
+				1917330A2B10864F007BCC04 /* Array+CNLiveExtensions.swift in Sources */,
+				191732FB2B0AF34A007BCC04 /* CNLiveShopGoodsDetailsModel.swift in Sources */,
+				191733152B109FD7007BCC04 /* CNLivePlayerTopNaviView.swift in Sources */,
 				794FF1052B01FC8800385E85 /* CNLiveShopOrderSearchViewController.swift in Sources */,
 				798A44EC2A302DBE00815935 /* CNLiveMineAddInfoViewController.swift in Sources */,
 				791C1C882AFB6FD7003E6362 /* CNLiveShopOrderExpressFirmViewController.swift in Sources */,
@@ -1388,8 +1890,11 @@
 				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 */,
+				1938BD412B4BEC6900390A34 /* CNLiveAlbumListModel.swift in Sources */,
 				7CD675422A2740F8008354C1 /* CNCustomIndexView.swift in Sources */,
+				191733292B148BF7007BCC04 /* CNLivePlayerVolumeBrightnessView.swift in Sources */,
 				7C4931292A2D8BA8000E44B4 /* CNLiveBaseTabBarViewController.swift in Sources */,
 				79F4B1162A32B96B00993C03 /* CNLiveMineInfoViewController.swift in Sources */,
 				791C1C8A2AFB84EE003E6362 /* CNLiveShopOrderExpressListViewController.swift in Sources */,
@@ -1398,22 +1903,29 @@
 				1965FA3E2AFB176E00F0F435 /* CNLiveShopAddGoodsSingleView.swift in Sources */,
 				7CD6753C2A2740B0008354C1 /* CNUpSlideViewRemindView.swift in Sources */,
 				7939B0772B47F88A005AE981 /* CNLiveShortVideoControlView.swift in Sources */,
+				191733602B352488007BCC04 /* CNLiveCouponGoodsListTableViewCell.swift in Sources */,
 				79BB1C142B05C51900C5720C /* CNLiveShopCouponViewController.swift in Sources */,
 				798916ED2B048E8200D08302 /* CNLiveShopTransViewController.swift in Sources */,
+				191733172B10A017007BCC04 /* CNLivePlayerBottomNaviView.swift in Sources */,
 				19BB1FEC2AF0AB8E0094D962 /* CNLiveDownShopDetailController.swift in Sources */,
 				79A212C22B0B5D0700BFA8E3 /* CNLiveShopBodyCouponManagerView.swift in Sources */,
 				794FF1072B01FC9800385E85 /* CNLiveShopOrderSearchListViewController.swift in Sources */,
 				798A44E82A30134400815935 /* CNLiveMineHeaderView.swift in Sources */,
 				7C49312D2A2DB9FA000E44B4 /* UITabBar+CNLiveExtensions.swift in Sources */,
 				79A267832AF8D7BC0088D9F6 /* CNLiveShopBodyCustomView.swift in Sources */,
+				1917335E2B328495007BCC04 /* CNLiveCouponListTableViewCell.swift in Sources */,
 				791C1C8C2AFB85F8003E6362 /* CNLiveShopBodyExpressView.swift in Sources */,
 				790D019A2A2DCAE400C5978D /* CNLiveViewController.swift in Sources */,
+				191733192B10A05D007BCC04 /* CNLivePlayerProgressView.swift in Sources */,
 				79803E272AD68D3100F05F68 /* CNLiveMineShopViewController.swift in Sources */,
 				79A68C4C2A26EA6000DC3B43 /* (null) in Sources */,
 				79803E292AD6991200F05F68 /* CNLiveMineInputMessageView.swift in Sources */,
 				79282A462A2F457D00B5F8CF /* CNLiveMineViewController.swift in Sources */,
 				7991723A2AF091E100DC01A8 /* CNLiveShopOrderListViewController.swift in Sources */,
 				798A44F02A305BC200815935 /* UIButton+CNLiveExtensions.swift in Sources */,
+				1938BD342B4B968300390A34 /* CNLiveHomePageDuanJuCell.swift in Sources */,
+				191733522B2C4CEA007BCC04 /* CNLivePickerSelectDateTools.swift in Sources */,
+				1917333A2B27FDF3007BCC04 /* CNLiveShopClassilyManageTableViewCell.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1591,7 +2103,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.0.1.23.11.13.10;
+				CURRENT_PROJECT_VERSION = 1.0.3.24.01.03.11;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				EXCLUDED_ARCHS = "";
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1614,7 +2126,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.1;
+				MARKETING_VERSION = 1.0.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.metaCode;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -1636,7 +2148,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.0.1.23.11.13.10;
+				CURRENT_PROJECT_VERSION = 1.0.3.24.01.03.11;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				EXCLUDED_ARCHS = "";
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1659,7 +2171,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.1;
+				MARKETING_VERSION = 1.0.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.metaCode;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -7,7 +7,7 @@
 import Foundation
-class CNLiveBaseNavigationController : UINavigationController, UIGestureRecognizerDelegate {
+class CNLiveBaseNavigationController : UINavigationController,UINavigationControllerDelegate {
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -20,15 +20,28 @@ class CNLiveBaseNavigationController : UINavigationController, UIGestureRecogniz
         view.addGestureRecognizer(panges)
         self.interactivePopGestureRecognizer?.delegate = self //侧滑返回
+        self.delegate = self as UINavigationControllerDelegate
     }
     // MARK: - <UIGestureRecognizerDelegate>
     // 什么时候调用：每次触发手势之前都会询问下代理，是否触发。
     // 作用：拦截手势触发,手势识别器对象会调用这个代理方法来决定手势是否有效
-    func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool {
+    override func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool {
+        
         return viewControllers.count > 1
     }
+    func navigationController(_ navigationController: UINavigationController, willShow viewController: UIViewController, animated: Bool) {
+        
+    }
+    func navigationController(_ navigationController: UINavigationController, didShow viewController: UIViewController, animated: Bool) {
+        
+        if navigationController.viewControllers.count > 1 {
+            self.interactivePopGestureRecognizer?.isEnabled = true
+        }else {
+            self.interactivePopGestureRecognizer?.isEnabled = false
+        }
+    }
     /// 重写push方法的目的 : 拦截所有push进来的子控制器
     override func pushViewController(_ viewController: UIViewController, animated: Bool) {
@@ -58,22 +58,23 @@ class CNLiveBaseTabBarViewController: UITabBarController
     // MARK: - 控制器的信息
     func setUpTabBar() {
-        let homeVC  = CNMetaCodeHomePageController()
+        let homeVC  = CNLiveAuthViewController()
+        let authVC  = CNMetaCodeHomePageController()
         let mineVC  = CNLiveMineViewController()
         creatTabbarView(viewController: homeVC, image: "tabbar_hoem_icon_default", selectImage: "tabbar_hoem_icon_selected", title: "首页")
+        creatTabbarView(viewController: authVC, image: "tabbar_hoem_icon_default", selectImage: "tabbar_hoem_icon_selected", title: "认证")
+        
         creatTabbarView(viewController: mineVC, image: "tabbar_mine_icon_default", selectImage: "tabbar_mine_icon_selected", title: "我的")
         self.tabBar.tintColor = UIColor("#0066FE")
         self.tabBar.isTranslucent = false
         self.viewControllers = [
-            CNLiveBaseNavigationController(rootViewController: homeVC),
+            CNLiveBaseNavigationController(rootViewController: homeVC),CNLiveBaseNavigationController(rootViewController: authVC),
             CNLiveBaseNavigationController(rootViewController: mineVC),
         ];
-        
-        
     }
     // MARK: - Tabar 背景图
@@ -116,6 +116,11 @@ class CNLiveBaseViewController: UIViewController  {
     private var leftNavSpace: CGFloat = 0.0
     private var rightNavSpace: CGFloat = 0.0
+    /**
+     是否禁止右滑返回
+     */
+    var popGestureRecognizerEnable:Bool = false
+    
     deinit {
         log("主界面已销毁")
     }
@@ -139,7 +144,7 @@ class CNLiveBaseViewController: UIViewController  {
     override func viewWillLayoutSubviews() {
         super.viewWillLayoutSubviews()
-        topNavView.frame = CGRect(x: 0, y: 0, width: view.width, height: topNavViewHeight +  get_system_statusBar_height())
+        topNavView.frame = CGRect(x: 0, y: 0, width: view.width, height:topNavViewHeight)// topNavViewHeight +  get_system_statusBar_height())
         let lrSpace = leftNavSpace > rightNavSpace ? leftNavSpace : rightNavSpace
         titleLabel.frame = CGRect(x: CGFloat(Int(lrSpace)) , y: topNavViewHeight - get_system_nav_ui_height() - topNavViewSubUIContentOffsetY, width: topNavView.width - (lrSpace * 2), height: get_system_nav_ui_height())
         leftNavBtns.forEach { currentBtn in
@@ -218,9 +223,15 @@ class CNLiveBaseViewController: UIViewController  {
     @objc func ClickBackBtn() {
         let viewControllers = self.navigationController?.viewControllers
-        if viewControllers!.count > 1 {
+        if viewControllers?.count ?? 0 > 1 {
             if viewControllers?.last == self {
                 self.navigationController!.popViewController(animated: true)
+            }else{
+                viewControllers?.last?.children.forEach({ vc in
+                    if vc == self{
+                        self.navigationController!.popViewController(animated: true)
+                    }
+                })
             }
         }else{
             if (self.presentingViewController != nil) {
@@ -11,6 +11,7 @@ import CNLiveRequestBastKit
 typealias ProgressBlcok = (_ key: String,_ percent: CGFloat) -> Void
 typealias SuccessBlock = (_ key: String,_ url: String) -> Void
+
 class UploadManager: NSObject {
     var uploadModels = NSMutableArray()
@@ -34,9 +35,10 @@ class UploadManager: NSObject {
     ///   - imageData: 图片数据
     ///   - progressBlock: 进度回调
     ///   - successBlock: 成功回调
-    static func uploadImage(imageData: NSData, progressBlock:@escaping ProgressBlcok, successBlock: @escaping SuccessBlock) {
+    static func uploadImage(imageData: NSData, progressBlock:@escaping ProgressBlcok, successBlock: @escaping SuccessBlock) -> String {
         let key = UploadManager.createImageFileName()
         UploadManager.uploadData(madiaData: imageData, key: key, progress: progressBlock, success: successBlock)
+        return key
     }
     /// 上传视频
@@ -44,12 +46,41 @@ class UploadManager: NSObject {
     ///   - imageData: 视频数据
     ///   - progressBlock: 进度回调
     ///   - successBlock: 成功回调
-    static func uploadVideo(videoData: NSData, progressBlock:@escaping ProgressBlcok, successBlock: @escaping SuccessBlock) {
+    static func uploadVideo(videoData: NSData, progressBlock:@escaping ProgressBlcok, successBlock: @escaping SuccessBlock) -> String {
         let key = UploadManager.createVideoFileName()
         UploadManager.uploadData(madiaData: videoData, key: key, progress: progressBlock, success: successBlock)
+        return key
     }
-    
+    // MARK: - 取消上传
+    func cancelUploadKey(key:String){
+        for (_,obj) in self.uploadModels.enumerated() {
+            let model = obj as! QiNiuUploadModel
+            if model.key == key{
+                model.isCancel = true
+                break
+            }
+        }
+    }
+    // MARK: - 删除云中图片
+    func requestQiNiuDeleteImageUrl(imageUrl:String,resultBlock:@escaping downSlideResultBlock){
+        
+        let param = NSMutableDictionary()
+        param.setValue(imageUrl, forKey: "img")
+        showLoading(message: "处理中...")
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.setupDSRequest(true)
+        CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseWjjBUrl+"/Api/v1/delQiniuImg", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
+            hiddenLoading()
+            if (error == nil) {
+                resultBlock(result as Any,.success)
+            }else{
+                resultBlock(NSNull(),.failed)
+            }
+        }
+        
+    }
     /// 上传到七牛
     /// - Parameters:
@@ -63,13 +94,14 @@ class UploadManager: NSObject {
         param.setValue("POST", forKey: "verb")
         param.setValue("2", forKey: "storageType")
         param.setValue(kBucketName_QN, forKey: "bucket")
-        showLoading(message: "上传处理中...")
         CNLiveNetworking.setupShowResult(true)
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
-        CNLiveNetworking.setupSignRequestKey(APPKey_wjj)
+        CNLiveNetworking.setupSignRequestKey(APPKey)//APPKey_wjj APPKey
+
         CNLiveNetworking.requestNetwork(with: .POST, urlString: "\(CNLiveEnvironmentManager.shared.img_token_url)/vod_epg/getUploadAuthForApp", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
+
             if (error == nil) {
                 let resp = result as! NSDictionary
                 let errorCode = "\(resp["errorCode"] ?? 0)"
@@ -112,7 +144,7 @@ class UploadManager: NSObject {
                     showMessage(message: resp["errorMessage"] as! String)
                 }
             } else {
-                showMessage(message: error!.localizedDescription)
+                showMessage(message: error?.localizedDescription ?? "上传失败")
             }
         }
     }
@@ -73,4 +73,14 @@ extension Notification.Name {
         //发货成功通知
         public static let CNLiveShopOrderSendExpressNotification = Notification.Name("CNLiveShopOrderSendExpressNotification")
     }
+    struct ShopGoodsManage {
+        //新增商品通知
+        public static let kDSGoodsManageAddNotification = Notification.Name("kDSGoodsManageAddNotification")
+        //编辑商品通知
+        public static let kDSGoodsManageEditNotification = Notification.Name("kDSGoodsManageEditNotification")
+        //删除商品通知
+        public static let kDSGoodsManageDeleteNotification = Notification.Name("kDSGoodsManageDeleteNotification")
+        //搜索确认处理
+        public static let kDSSelectGoodsNotification = Notification.Name("kDSSelectGoodsNotification")
+    }
 }
@@ -18,6 +18,14 @@ let KStatusBarHeight:CGFloat = UIApplication.shared.statusBarFrame.height;
 let KNavigationHeight:CGFloat = (KStatusBarHeight + 44)
 ///tabbar高度
 let KTabBarHeight:CGFloat = (KStatusBarHeight == 44 ? 83 : 49)
+/**
+ 获取系统tabbarUI高度
+ */
+let KTabBar_UIHeight:CGFloat = 49
+/**
+ 获取系统tabbarUI增加的高度 (因iPhoneX系列底部有安全区域增加的高度)
+ */
+let KTabBar_UI_OffsetHeight:CGFloat = KTabBarHeight - KTabBar_UIHeight
 //MARK: - 常用三方key
 let kBucketName_QN:String = "mam-wjjtest-802"
@@ -26,33 +34,21 @@ let kBucketName_QN:String = &quot;mam-wjjtest-802&quot;
 ///控制器背景色
 let KVCBackgroupColor = UIColor("#F9F9F9")
-/**
- 判断是否是iPhone X系列
- */
-public func is_iPhoneX_series() -> Bool {
-    var iPhoneXSeries: Bool = false
-    if (UIDevice.current.userInterfaceIdiom != .phone)  {
-        return iPhoneXSeries
-    }
-    let window = UIApplication.shared.delegate?.window!!
-    if (window?.safeAreaInsets.bottom ?? 0.0 > 0.0) {
-        iPhoneXSeries = true;
-    }
-    return iPhoneXSeries;
-}
+///控制器push动画Bool
+let pushAnimated = false
 /**
  获取系统状态栏高度
  */
 public func get_system_statusBar_height() -> CGFloat {
-    return is_iPhoneX_series() ? 44 : 20;
+    return isiPhoneXSeries ? 44 : 20;
 }
 /**
  获取系统导航高度
  */
 public func get_system_nav_height() -> CGFloat {
-    return is_iPhoneX_series() ? (44.0 + 44.0) : 64;
+    return isiPhoneXSeries ? (44.0 + 44.0) : 64;
 }
 /**
@@ -66,28 +62,28 @@ public func get_system_nav_ui_height() -&gt; CGFloat {
  获取iPhoneX顶部高度
  */
 public func get_system_nav_top_height() -> CGFloat {
-    return is_iPhoneX_series() ? KStatusBarHeight - 64.0 : 0.0
+    return isiPhoneXSeries ? KStatusBarHeight - 64.0 : 0.0
 }
 /**
  获取系统tabbar高度
  */
 public func get_system_tabbar_height() -> CGFloat {
-    return is_iPhoneX_series() ? 83.0 : 49.0;
+    return isiPhoneXSeries ? 83.0 : 49.0
 }
 /**
  获取系统tabbarUI高度
  */
 public func get_system_tabbar_ui_height() -> CGFloat {
-    return 49.0;
+    return 49.0
 }
 /**
  获取系统tabbarUI增加的高度 (因iPhoneX系列底部有安全区域增加的高度)
  */
 public func get_system_tabbar_ui_offsetHeight() -> CGFloat {
-    return get_system_tabbar_height() - get_system_tabbar_ui_height();
+    return get_system_tabbar_height() - get_system_tabbar_ui_height()
 }
@@ -39,7 +39,7 @@ var getSystemNavUiHeight: CGFloat {
 /**获取系统tabbar高度*/
 var getSystemTabbarHeight: CGFloat {
-    return is_iPhoneX_series() ? 83 : 49
+    return isiPhoneXSeries ? 83 : 49
 }
 /**获取系统tabbarUI高度*/
@@ -21,7 +21,7 @@ class AlertTool: NSObject {
     static func showSystemAlert(title:String?, message:String?, actionTitles:Array<String>, cancelTitle:String="", style:UIAlertController.Style, actionStyles:Array<UIAlertAction.Style>=[], completion: @escaping ((_ index: Int) -> ())) {
         let vc = UIApplication.shared.keyWindow?.rootViewController
-        vc?.dismiss(animated: false)
+        vc?.dismiss(animated: true)
         DispatchQueue.main.async {
             let alertController = UIAlertController(title: title, message: message, preferredStyle: style)
+//
+//  Array+CNLiveExtensions.swift
+//  metaCode
+//
+//  Created by zx on 2023/11/24.
+//
+
+import Foundation
+
+extension Array where Element: Equatable {
+    
+    // Remove first collection element that is equal to the given `object`:
+    mutating func remove(_ object: Element) {
+        if let index = firstIndex(of: object) {
+            remove(at: index)
+        }
+    }
+}
@@ -27,5 +27,4 @@ extension NSDate{
         }
         return formatter.string(from: date as Date)
     }
-    
 }
+//
+//  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 ""
+        }
+        
+    }
+}
@@ -9,6 +9,16 @@ import Foundation
 import MBProgressHUD
 import HandyJSON
+//func currentIfChildViewController() -> (UIViewController?){
+//    let vc = currentViewController()
+//    if vc != nil && vc?.children.count ?? 0 > 0{
+//        //有children , 用last
+//        return vc?.children.last
+//    }else{
+//        return vc
+//    }
+//}
+
 func currentViewController() -> (UIViewController?) {
    var window = UIApplication.shared.keyWindow
    if window?.windowLevel != UIWindow.Level.normal{
@@ -20,8 +30,9 @@ func currentViewController() -&gt; (UIViewController?) {
         }
       }
     }
-   let vc = window?.rootViewController
-   return currentVC(vc)
+    let vc = window?.rootViewController
+    let retVC = currentVC(vc)
+    return retVC
 }
 private func currentVC(_ vc :UIViewController?) -> UIViewController? {
@@ -41,10 +52,46 @@ private func currentVC(_ vc :UIViewController?) -&gt; UIViewController? {
        return currentVC(naiVC.visibleViewController)
     }
     else {
-       return vc
+        return vc
     }
  }
+    // 获取当前活动的navigationcontroller
+    func navigationViewController() -> UINavigationController{
+        var window = UIApplication.shared.keyWindow
+        if window?.windowLevel != UIWindow.Level.normal{
+          let windows = UIApplication.shared.windows
+          for  windowTemp in windows{
+            if windowTemp.windowLevel == UIWindow.Level.normal{
+               window = windowTemp
+               break
+             }
+           }
+         }
+        if let isNav = window!.rootViewController?.isKind(of: UINavigationController.self){
+            if isNav{
+                let nav = window?.rootViewController as! UINavigationController
+                return nav
+            }else{
+                if let isTabbar = window!.rootViewController?.isKind(of: UITabBarController.self){
+                    if isTabbar{
+                        let tabbar = window?.rootViewController as! UITabBarController
+                        let selectVc = tabbar.selectedViewController
+                        if let isNavi = selectVc?.isKind(of: UINavigationController.self){
+                            if isNavi{
+                                let nav = selectVc as! UINavigationController
+                                return nav
+                            }
+                        }
+                    }else{
+                        
+                    }
+                }
+            }
+        }
+        return UINavigationController()
+    }
+
 /// 弹框提示
 /// - Parameter message: 内容提示
 func showMessage(message: String) {
@@ -6,6 +6,7 @@
 //
 import Foundation
+import UIKit
 extension NSString {
@@ -113,4 +114,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)
+    }
+
 }
+//
+//  UILabel+FormattedText.swift
+//  metaCode
+//
+//  Created by zx on 2024/1/5.
+//
+
+import Foundation
+
+extension UILabel {
+    //计算label的行数
+    func getRealLabelTextLines() -> Int {
+        guard let labelText = text else {
+            return 0
+        }
+        //计算理论上显示所有文字需要的尺寸
+        let rect = CGSize(width: self.bounds.width, height: CGFloat.greatestFiniteMagnitude)
+        let labelTextSize = (labelText as NSString)
+            .boundingRect(with: rect, options:.usesLineFragmentOrigin,attributes: [NSAttributedString.Key.font: self.font!], context: nil)
+        
+        //计算理论上需要的行数
+        let labelTextLines = Int(ceil(CGFloat(labelTextSize.height) / self.font.lineHeight))
+        return labelTextLines
+    }
+}
+//
+//  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)
+    }
+}
@@ -572,7 +572,8 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
         if(navigationAction.navigationType == .linkActivated){
             let webVC =  CNWebViewController()
             webVC.url = URL(string: url)
-            currentViewController()?.navigationController?.pushViewController(webVC, animated: true)
+            navigationViewController().pushViewController(webVC, animated: pushAnimated)
+//            currentViewController()?.navigationController?.pushViewController(webVC, animated: pushAnimated)
             decisionHandler(.cancel, preferences)
             return
         }else if(navigationAction.navigationType == .other){
@@ -592,7 +593,7 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
     //MARK: - 网络请求获取身份列表
     func getUserIdentityApi()
     {
-        showLoading(message: "")
+//        showLoading(message: "")
         CNLiveMineViewModel.requestAuthStandList(page: 1)
         { result, respStatue in
@@ -3,7 +3,7 @@
 //  metaCode
 //
 //  Created by zx on 2023/10/16.
-//
+//  下滑页原生页-push毛玻璃中间页
 import UIKit
@@ -22,7 +22,7 @@ class CNUpSlideCardPresentationController: UIPresentationController {
         blurView.edges(to: container)
         blurView.alpha = 0.0
-        presentingViewController.beginAppearanceTransition(false, animated: false)
+        presentingViewController.beginAppearanceTransition(false, animated: true)
         presentedViewController.transitionCoordinator!.animate(alongsideTransition: { (ctx) in
             self.blurView.effect = UIBlurEffect(style: .light)
             self.blurView.alpha = 1
@@ -3,7 +3,7 @@
 //  metaCode
 //
 //  Created by zx on 2023/10/16.
-//
+//  下滑页原生页--大图点击详情页
 import Foundation
@@ -3,7 +3,7 @@
 //  metaCode
 //
 //  Created by zx on 2023/10/13.
-//
+//  下滑页原生页-首页
 import Foundation
 import UIKit
@@ -205,7 +205,7 @@ class CNUpSlideViewController: CNLiveBaseViewController,UITableViewDelegate,UITa
     //MARK: - 网络请求获取详情页
     func getPageApi()
     {
-        showLoading(message: "")
+//        showLoading(message: "")
         CNLiveDownSlideViewModel.requestGetPage(pageId: _downPath! as NSString) { result, status in
             hiddenLoading()
+//
+//  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 = false
+    /// 编辑的数据
+    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: self.view.height - KTabBarHeight, width: self.view.width, height: KTabBarHeight))
+        bottomNavView.backgroundColor = HexColor("F2F2F2")
+        return bottomNavView
+    }()
+
+    
+    var titleField:UITextField?
+    var sortField:UITextField?
+    var uploadImageView:CNLiveAddGoodsSelectUploadImageView?
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        self.initUI()
+    }
+    // MARK: - 初始化UI
+    /// 初始化方法
+    /// @param model 要编辑的分类数据,当isEdite为YES,才需要传
+    /// @param isEdite 是否是编辑 YES:是   NO:不是
+    init(model:CNLiveShopClassifyModel,isEdite:Bool){
+        super.init(nibName: nil, bundle: nil)
+        self.shopClassifyModel = model
+        //设置店铺id
+        self.shopClassifyModel?.shop_id = DSUserInfoManager.shared.dsUserInfo.id
+        self.isEdite = isEdite
+    }
+    
+    convenience init(){
+        self.init(model: CNLiveShopClassifyModel(), isEdite: false)
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+   
+    func initUI(){
+        self.view.addSubview(self.tableView)
+        self.initTopNav()
+        self.initBottomNav()
+    }
+    
+    func initTopNav(){
+        navigationBarHidden = false
+        if self.isEdite == true{
+            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("#666666"), for: .normal)
+            deleteNavBtn.addTarget(self, action: #selector(deleteNavBtnClick), for: .touchUpInside)
+            self.rightNavBtns = [deleteNavBtn]
+        }else{
+            titleName = "创建店铺分类"
+            
+            //初始化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
+        self.view.addSubview(self.bottomNavView)
+        
+        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 == true{
+                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)
+                if (self.successCompleteBlock?()) != nil{
+                    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,604 @@
 //  metaCode
 //
 //  Created by zx on 2023/11/8.
-//
+//  商品分类/店铺分类
 import Foundation
+import QMUIKit
+///分类类型
+enum CNLiveGoodsCategoryType:Int {
+    ///商品分类
+    case goods
+    ///店铺分类
+    case shop
+}
+
+typealias finishSelectCategoryCallBack = ()->Void
+
+typealias successComplete = ()->Void
+    
+class CNLiveGoodsCategoryController: CNLiveBaseViewController, UITableViewDataSource, UITableViewDelegate {
+    
+    let kCNLiveShopClassifyCellIdentifier = "kCNLiveShopClassifyCellIdentifier"
-class CNLiveGoodsCategoryController: CNLiveBaseViewController {
+    // MARK: - 属性
+    //开始输入前的文本
+    var firCategoryId:Int = 0
+    var secCategoryId:Int = 0
+    var thiCategoryId:Int = 0
+    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 :CNLiveShopClassifyModel?
+    var temp_selectFirCategoryModel :CNLiveShopClassifyModel?{
+        get{
+            _temp_selectFirCategoryModel
+        }
+        set{
+            if newValue != nil{
+                _temp_selectFirCategoryModel = newValue!
+            }else{
+                return
+            }
+            if Int(_temp_selectFirCategoryModel?.id ?? "0")! > 0{
+                self.firCategoryBtn?.setTitle(_temp_selectFirCategoryModel?.title, for: .normal)
+            }else{
+                self.firCategoryBtn?.setTitle("请选择", for: .normal)
+            }
+        }
+    }
+    //临时选中二级分类
+    var _temp_selectSecCategoryModel :CNLiveShopClassifyModel?
+    var temp_selectSecCategoryModel :CNLiveShopClassifyModel?{
+        get{
+            _temp_selectSecCategoryModel
+        }
+        set{
+            if newValue != nil{
+                _temp_selectSecCategoryModel = newValue!
+            }else{
+                return
+            }
+            if Int(_temp_selectSecCategoryModel?.id ?? "0")! > 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 :CNLiveShopClassifyModel?
+    var temp_selectThiCategoryModel :CNLiveShopClassifyModel?{
+        get{
+            _temp_selectThiCategoryModel
+        }
+        set{
+            if newValue != nil{
+                _temp_selectThiCategoryModel = newValue!
+            }else{
+                return
+            }
+            if Int(_temp_selectThiCategoryModel!.id ?? "0")! > 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()
+        navigationBarHidden = false
+        self.view.backgroundColor = .clear
+        self.initUI()
+        if self.firCategoryId == 0{
+            self.secCategoryId = 0
+            self.thiCategoryId = 0
+        }else if self.secCategoryId == 0 || self.secCategoryId == 0{
+            self.thiCategoryId = 0
+        }
+        if self.categoryType == .goods{
+            self.postDataWithPid(pid: "0", level: 1) {
+                if self.secCategoryId > 0{
+                    self.postDataWithPid(pid:String(format: "%d", self.firCategoryId), level: 2) {
+                        if self.thiCategoryId > 0{
+                            self.postDataWithPid(pid:String(format: "%d",self.secCategoryId), level: 3) {
+                            }
+                        }
+                    }
+                }
+            }
+        }else if self.categoryType == .shop{
+            self.postShopClassify()
+        }
+    }
+    
+    func initTitleName(name:String){
+        titleName = name
+    }
+    
+    // MARK: - initUI
+    func initUI(){
+        self.shadowView = UIView(frame: CGRect(x: 0, y: self.topNavView.height, width: self.view.width, height: self.view.height - self.topNavView.height))
+        self.shadowView?.backgroundColor = UIColor(white: 0, alpha: 0.26)
+        self.shadowView?.isHidden = true
+        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)
+    }
+    deinit {
+        print("CNLiveGoodsCategoryController销毁")
     }
+    
+    // MARK: - 显示/隐藏方法
+    public func display(){
+
+        self.view.isUserInteractionEnabled = true
+        UIView.animate(withDuration: 0.2) {
+            self.shadowView?.isHidden = false
+            self.contentView!.top = self.view.height-400
+        }
+    }
+    public func hide(){
+        let vc = self.view.superview?.qmui_viewController?.qmui_visibleViewControllerIfExist() as! CNLiveShopNewProductController
+        if self.categoryType == .goods{
+            vc.isShowGoodsCategory = false
+        }else{
+            vc.isShowShopCategory = false
+        }
+        UIView.animate(withDuration: 0.2) {
+            self.shadowView?.isHidden = true
+            self.contentView!.top = self.view.height
+            self.view.removeFromSuperview()
+        }completion: { finished in
+            self.view.isUserInteractionEnabled = false
+        }
+    }
+    public func hideView(){
+        self.shadowView?.isHidden = true
+        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! CNLiveShopClassifyModel
+            
+            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! CNLiveShopClassifyModel
+            
+            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! CNLiveShopClassifyModel
+            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! CNLiveShopClassifyModel
+                self.postDataWithPid(pid: model.id ?? "", level: 2) {
+//                self.postDataWithPid(pid: String(format: "%d", 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! CNLiveShopClassifyModel
+                self.postDataWithPid(pid: model.id ?? "", level: 3) {
+//                self.postDataWithPid(pid: String(format: "%d", model.id), level: 3) {
+                    self.temp_selectSecCategoryModel = model
+                    self.temp_selectThiCategoryModel = nil
+                }
+            }else if (self.displayLevel == 3) {
+                let model = self.thiCategoryDataArr[indexPath.row] as! CNLiveShopClassifyModel
+                self.temp_selectThiCategoryModel = model
+                self.tableView.reloadData()
+            }
+        }else if self.categoryType == .shop{
+            if (self.displayLevel == 1) {
+                let model = self.firCategoryDataArr[indexPath.row] as! CNLiveShopClassifyModel
+                self.temp_selectFirCategoryModel = model
+                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
+                self.temp_selectSecCategoryModel = model
+                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
+            }
+            if let classModel = self.temp_selectFirCategoryModel{
+                if classModel.child.count > 0 && self.temp_selectSecCategoryModel == nil{
+                    showMessage(message: "未选择二级分类")
+                    return
+                }
+            }
+        }
+        
+        self.firCategoryId = Int(self.temp_selectFirCategoryModel?.id ?? "0")!
+        self.firCategoryName = self.temp_selectFirCategoryModel?.title
+        self.secCategoryId = Int(self.temp_selectSecCategoryModel?.id ?? "0")!
+        self.secCategoryName = self.temp_selectSecCategoryModel?.title
+        self.thiCategoryId = Int(self.temp_selectThiCategoryModel?.id ?? "0")!
+        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
+            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()
+        }
+        if self.navigationController == nil{
+            print("self nil")
+        }
+        navigationViewController().pushViewController(vc, animated: pushAnimated)
+//        currentViewController()?.navigationController?.pushViewController(vc, animated: pushAnimated)
+    }
+    
+    // MARK: - 数据请求
+    /**
+     商品分类数据请求
+
+     @param pid 父级id
+     @param level 第几级
+     */
+    func postDataWithPid(pid:String,level:Int,successCompleteBlock:@escaping successComplete){
+        showLoading(message: "")
+        CNLiveShopGoodListViewModel.getGetGroupWithUid(uid: DSUserInfoManager.shared.dsUserInfo.uid!, pid: pid) { result, status in
+            hiddenLoading()
+            if status == .success{
+                
+                let dataArr = result as! [CNLiveShopClassifyModel]
+                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 > 0{
+                        
+                        let tempDataArr = Array(self.firCategoryDataArr)
+                        for (_,mdl) in tempDataArr.enumerated() {
+                            let model = mdl as! CNLiveShopClassifyModel
+                            if Int(model.id ?? "0")! == 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 > 0{
+                        let tempDataArr = Array(self.thiCategoryDataArr)
+                        for (_,mdl) in tempDataArr.enumerated() {
+                            let model = mdl as! CNLiveShopClassifyModel
+                            if Int(model.id ?? "0")! == 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 > 0{
+                        let tempDataArr = Array(self.thiCategoryDataArr)
+                        for (_,mdl) in tempDataArr.enumerated() {
+                            let model = mdl as! CNLiveShopClassifyModel
+                            if Int(model.id ?? "0")! == self.thiCategoryId{
+                                self.temp_selectThiCategoryModel = model
+                                break
+                            }
+                        }
+                    }else {
+                        self.thiCategoryBtn?.setTitle("请选择", for: .normal)
+                    }
+                }
+                self.tableView.reloadData()
+                self.tableView.setContentOffset(CGPointZero, animated: true)
+                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
+typealias confirmActionBlock = ()->Void
+
+class CNLiveModalPresentationViewController:UIViewController{
+    
+    var confirmBlock:confirmActionBlock?
+    lazy var contentView :UIView = {
+        let contentView = UIView(frame: CGRect(x: 0, y: 0, width: 200, height: 200))
+        return contentView
+    }()
+    
+    lazy var bgView :UIView = {
+        let bgView = UIView(frame: CGRect(x: 0, y: 0, width: self.view.width, height: self.view.height))
+        bgView.backgroundColor = .black
+        bgView.alpha = 0.2
+        return bgView
+    }()
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        self.view.backgroundColor = .clear
+        self.view.addSubview(self.bgView)
+        self.view.addSubview(self.contentView)
+    }
+    
+    @objc func cancelButtonAction(){
+        self.hidingAnimationWithCompletion { finished in
+            
+        }
+    }
+    @objc func confirmButtonAction(){
+        if ((self.confirmBlock?()) != nil){
+            self.confirmBlock!()
+        }
+    }
+    func showingAnimationWithCompletion(completion:@escaping completionBlock){
+ 
+        UIView.animate(withDuration: 0.3, delay: 0.0, options: .curveEaseOut) {
+            self.contentView.top = (self.view.height-self.contentView.height)/2
+        } completion: { finished in
+            completion(finished)
+        }
+    }
+    
+    func hidingAnimationWithCompletion(completion:@escaping completionBlock){
+        UIView.animate(withDuration: 0.3, delay: 0.0, options: .curveEaseOut) {
+            self.contentView.top = self.view.height
+        } completion: { finished in
+            completion(finished)
+            self.view.removeFromSuperview()
+        }
+    }
+}
+//
+//  CNLiveShopClassilyManageViewController.swift
+//  metaCode
+//
+//  Created by zx on 2023/12/12.
+//
+
+import Foundation
+
+///区头id
+let kCNLiveShopClassifySectionHeaderViewID = "kCNLiveShopClassifySectionHeaderViewID"
+///cell ID
+let kCNLiveShopClassilyManageTableViewCellID = "kCNLiveShopClassilyManageTableViewCellID"
+
+class CNLiveShopClassilyManageViewController:CNLiveBaseViewController, UITableViewDataSource, UITableViewDelegate{
+    
+    // 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.tableHeaderView = self.headerView
+        tableView.register(CNLiveShopClassifySectionHeaderView.self, forHeaderFooterViewReuseIdentifier: kCNLiveShopClassifySectionHeaderViewID)
+        
+        tableView.register(CNLiveShopClassilyManageTableViewCell.self, forCellReuseIdentifier:kCNLiveShopClassilyManageTableViewCellID )
+        return tableView
+    }()
+
+    ///表头
+    lazy var headerView :CNLiveShopClassilyManageHeaderView = {
+        let headerView = CNLiveShopClassilyManageHeaderView(frame: CGRect(x: 0, y: 0, width: KSreenWidth, height: 114))
+        return headerView
+    }()
+    
+    lazy var bottomNavView :UIView = {
+        let bottomNavView = UIView(frame: CGRect(x: 0, y: KSreenHeight-KTabBarHeight, width: KSreenWidth, height: KTabBarHeight))
+        bottomNavView.backgroundColor = .white
+        return bottomNavView
+    }()
+
+    
+    ///分类列表详情数据
+    var classifyListModel:CNLiveShopClassifyListModel?
+
+    ///一级分类数据源,一级分类里面包含了二级分类
+    var listArray:[CNLiveShopClassifyModel]?
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        self.initUI()
+        self.loadData()
+    }
+    // MARK: - 初始化UI
+    func initUI(){
+        self.view.addSubview(self.tableView)
+        self.initTopNav()
+        self.initBottomNav()
+    }
+    func initTopNav(){
+        navigationBarHidden = false
+        titleName = "店铺分类管理"
+    }
+    func initBottomNav(){
+        self.view.addSubview(self.bottomNavView)
+        
+        let createBtn = UIButton(type: .custom)
+        createBtn.frame = CGRect(x: 0, y: 0, width: KSreenWidth, height: KTabBar_UIHeight)
+        createBtn.setTitle("创建店铺分类", for: .normal)
+        createBtn.setImage(UIImage(named: "DS_WB_CJDP"), for: .normal)
+        createBtn.imageEdgeInsets = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 8)
+        createBtn.setTitleColor(HexColor("#FD862E"), for: .normal)
+        createBtn.titleLabel?.font = Font_15
+        createBtn.addTarget(self, action: #selector(createBtnClick), for: .touchUpInside)
+        self.bottomNavView.addSubview(createBtn)
+
+    }
+    // MARK: - load data
+    func loadData(){
+        showLoading(message: "")
+        CNLiveShopClassilyViewModel.getCateListWithShopId(shopId: DSUserInfoManager.shared.dsUserInfo.id!) { result, status in
+            hiddenLoading()
+            if status == .success{
+                let model = result as! CNLiveShopClassifyListModel
+                self.listArray = Array(model.list)
+                self.headerView.classifyModel = model
+                self.tableView.reloadData()
+            }else{
+                showMessage(message: "获取分类失败")
+            }
+        }
+    }
+    
+    // MARK: - UITableViewDelegate,UITableViewDataSource
+    func numberOfSections(in tableView: UITableView) -> Int {
+        return self.listArray?.count ?? 0
+    }
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        if self.listArray != nil{
+            let model = self.listArray![section]
+            if model.showChild{
+                return model.child.count
+            }
+        }
+        return 0
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveShopClassilyManageTableViewCellID, for: indexPath) as? CNLiveShopClassilyManageTableViewCell
+        else {
+            let cell = CNLiveShopClassilyManageTableViewCell()
+            return cell
+        }
+        let model = self.listArray![indexPath.section] 
+        cell.classifyModel = model.child[indexPath.row]
+        cell.editBtnBlock = { [weak self] classifyModel in
+            self!.editBtnActionWithMModel(classifyModel: classifyModel, type: .twoLevelClassify)
+        }
+        return cell
+    }
+    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+        let sectionHeaderView = tableView.dequeueReusableHeaderFooterView(withIdentifier: kCNLiveShopClassifySectionHeaderViewID) as! CNLiveShopClassifySectionHeaderView
+        sectionHeaderView.classifyModel = self.listArray![section]
+        sectionHeaderView.section = section
+        sectionHeaderView.showChildCalssifyBlock = { [weak self] section,classifyModel in
+            self?.showChildCalssifyAction(section: section, classifyModel: classifyModel)
+        }
+        sectionHeaderView.addSubClassifyBtnBlock = { [weak self] classifyModel in
+            self?.addSubClassifyBtnActionWithModel(classifyModel: classifyModel)
+        }
+        sectionHeaderView.editBtnBlock = { [weak self] classifyModel in
+            self?.editBtnActionWithMModel(classifyModel: classifyModel, type: .oneLevelClassify)
+        }
+        return sectionHeaderView
+    }
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        return 50
+    }
+    func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
+        return 50
+    }
+    // MARK: - response method
+    @objc func createBtnClick(){
+        let vc = CNLiveCreateShopClassifyViewController()
+        vc.classifyType = .oneLevelClassify
+        vc.successCompleteBlock = {[weak self] in
+            self!.loadData()
+        }
+        navigationViewController().pushViewController(vc, animated: pushAnimated)
+//        currentViewController()?.navigationController?.pushViewController(vc, animated: pushAnimated)
+    }
+    ///显示/隐藏子分类
+    func showChildCalssifyAction(section:Int,classifyModel:CNLiveShopClassifyModel){
+        if classifyModel.child.count == 0{
+            showMessage(message: "当前分类没有子分类")
+            return
+        }
+        classifyModel.showChild = !classifyModel.showChild
+        self.tableView.reloadSections([section], with: .fade)
+    }
+    ///添加子分类
+    func addSubClassifyBtnActionWithModel(classifyModel:CNLiveShopClassifyModel){
+        let vc = CNLiveCreateShopClassifyViewController()
+        vc.classifyType = .twoLevelClassify
+        vc.superClassifyId = classifyModel.id!
+        vc.successCompleteBlock = {[weak self] in
+            self!.loadData()
+        }
+        navigationViewController().pushViewController(vc, animated: pushAnimated)
+//        currentViewController()?.navigationController?.pushViewController(vc, animated: pushAnimated)
+    }
+    func editBtnActionWithMModel(classifyModel:CNLiveShopClassifyModel,type:CNLiveCreateType){
+        let data = modelToDictionary(classifyModel) 
+        ///重新拷贝一个对象
+        var copyClassifyModel = newDictionaryToModel(data, CNLiveShopClassifyModel.self) as! CNLiveShopClassifyModel
+        let vc = CNLiveCreateShopClassifyViewController(model: copyClassifyModel, isEdite: true)
+        vc.classifyType = type
+        vc.successCompleteBlock = {[weak self] in
+            self!.loadData()
+        }
+        currentViewController()?.navigationController?.pushViewController(vc, animated: true)
+    }
+}
+//
+//  CNLiveShopGoodsSearchViewController.swift
+//  metaCode
+//
+//  Created by zx on 2023/12/25.
+//
+
+import Foundation
+import MJRefresh
+import QMUIKit
+enum CNSearchType{
+   
+    /// 搜索普通商品类型
+    case defaultGoods
+    /// 搜索关联商品类型
+    case associateGoods
+}
+
+class CNLiveShopGoodsSearchViewController:CNLiveBaseViewController,UITableViewDelegate,UITableViewDataSource,UITextFieldDelegate{
+    
+    
+    
+    /// 搜索历史最大缓存数量
+    let kCNLiveMaxCacheSearchKeywordKey = 30
+    /// 历史记录本地缓存key
+    let kDSSaveShopSearchHistroyData = "kDSSaveShopSearchHistroyData"
+    /// 搜索关键字
+    var keyWord:String?
+    var rightNavBtn:UIButton?
+    
+    lazy var tableView : UITableView = {
+        let tableView = UITableView(frame: CGRect(x: 0, y: KNavigationHeight, width: KSreenWidth, height: KSreenHeight-KNavigationHeight), style: .plain)
+        tableView.dataSource = self
+        tableView.delegate = self
+        tableView.backgroundColor = .white
+        tableView.contentInset = UIEdgeInsets(top: 0, left: 0, bottom:getSystemTabbarUiOffsetHeight , right: 0)
+//        tableView.emptyDataSetSource = self
+//        tableView.emptyDataSetDelegate = self
+        tableView.separatorStyle = .none
+        tableView.tableFooterView = UIView.init()
+        tableView.tableHeaderView = self.cn_tableHeaderView()
+        tableView.mj_footer = MJRefreshAutoNormalFooter.init(refreshingBlock: {[weak self] in
+            self!.loadMoreAction()
+        })
+        tableView.mj_footer?.isHidden = true
+        tableView.register(CNLiveShopGoodsManageListTableViewCell.self, forCellReuseIdentifier: kDSShopGoodsManageListTableViewCellID)
+        tableView.register(CNLiveShopAssociatedGoodsTableViewCell.self, forCellReuseIdentifier: kDSShopAssociatedGoodsTableViewCellID)
+        return tableView
+    }()
+    /// 搜索结果数据源
+    lazy var dataArr: NSMutableArray = {
+        return NSMutableArray()
+    }()
+    /// 历史记录数据
+    lazy var hisDataArr = {
+        return NSMutableArray()
+    }()
+    var searchTextField:UITextField?
+    /// 页码
+    var page:Int = 0
+    var searchType:CNSearchType = .defaultGoods
+
+    /// 选中的关联商品
+    var selectAssociatedGoodsModel:ShopOrderAssociatedGoodsModel?
+
+    init(searchType:CNSearchType) {
+        super.init(nibName: nil, bundle: nil)
+        self.searchType = searchType
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        self.view.backgroundColor = .white
+        navigationBarHidden = false
+        self.initTopNav()
+        self.view.addSubview(self.tableView)
+    }
+
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+        self.searchTextField?.becomeFirstResponder()
+        self.popGestureRecognizerEnable = false
+    }
+
+    override func viewDidDisappear(_ animated: Bool) {
+        super.viewDidDisappear(animated)
+        self.popGestureRecognizerEnable = true
+    }
+
+    override func viewWillLayoutSubviews() {
+        super.viewWillLayoutSubviews()
+        self.tableView.frame = CGRect(x: 0, y: KNavigationHeight, width: KSreenWidth, height: self.view.height-KNavigationHeight)
+        
+    }
+
+    // MARK: - initTopNav
+    func initTopNav(){
+        let searchBgView = CNLiveRoundedRectView(frame: CGRect(x: 52, y: get_system_statusBar_height()+(get_system_nav_ui_height()-30)/2, width: self.topNavView.width-52*2, height: 30))
+        searchBgView.fillColor = HexColor("#F2F2F2")
+        searchBgView.radius = searchBgView.height/2
+        self.topNavView.addSubview(searchBgView)
+        
+        let searchImageView = UIImageView(frame: CGRect(x: 15, y: (searchBgView.height-16)/2, width: 16, height: 16))
+        searchImageView.clipsToBounds = true
+        searchImageView.contentMode = .scaleAspectFit
+        searchImageView.image = UIImage(named: "DS_goods_search_icon")
+        searchBgView.addSubview(searchImageView)
+        
+        let searchLine = UIImageView(frame: CGRect(x: searchImageView.right+10, y: (searchBgView.height-11)/2, width: DS_RRV_ONE_PIXEL, height: 11))
+        searchLine.backgroundColor = HexColor("#999999")
+        searchBgView.addSubview(searchLine)
+        
+        let searchTextField = UITextField(frame: CGRect(x: searchLine.right+10, y: 0, width: searchBgView.width-(searchLine.right+10+15), height: searchBgView.height))
+        searchTextField.attributedPlaceholder = NSAttributedString(string: "请输你要搜索的商品", attributes: [.foregroundColor: HexColor("#D2D2D2")!])
+        searchTextField.textColor = HexColor("#333333")
+        searchTextField.font = Font_13
+        searchTextField.delegate = self
+        searchTextField.returnKeyType = .search
+        searchTextField.clearButtonMode = .whileEditing
+        searchBgView.addSubview(searchTextField)
+        self.searchTextField = searchTextField
+        searchTextField.addTarget(self, action: #selector(textFieldDidOnClearAndBecomeFirstResponder), for: .editingChanged)
+        
+        self.rightNavBtn = UIButton(type: .custom)
+        self.rightNavBtn?.setTitle("取消", for: .normal)
+        self.rightNavBtn?.frame = CGRect(x: 0, y: KStatusBarHeight, width: KNavigationHeight-KStatusBarHeight, height: KNavigationHeight-KStatusBarHeight)
+        self.rightNavBtn?.setTitleColor(HexColor("#ff725c"), for: .normal)
+        self.rightNavBtn?.addTarget(self, action: #selector(cancelNavBtnAction), for: .touchUpInside)
+        self.rightNavBtns = [self.rightNavBtn!]
+        
+        let leftNavBtn = UIButton(type: .custom)
+        leftNavBtn.setImage(UIImage(named: "DS_goods_search_back_icon"), for: .normal)
+        leftNavBtn.addTarget(self, action: #selector(rightNavBtnAction), for: .touchUpInside)
+        self.leftNavBtns = [leftNavBtn]
+    }
+    
+    // MARK: - UITableView 代理
+    func numberOfSections(in tableView: UITableView) -> Int {
+        if (self.dataArr.count == 0) {
+            return 0
+        }
+        return 1
+    }
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return self.dataArr.count
+    }
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        if self.searchType == .associateGoods{
+            guard let cell = tableView.dequeueReusableCell(withIdentifier: kDSShopAssociatedGoodsTableViewCellID) as? CNLiveShopAssociatedGoodsTableViewCell
+            else {
+                let cell = CNLiveShopAssociatedGoodsTableViewCell()
+                return cell
+            }
+            let goodsModel = self.dataArr[indexPath.row] as! ShopOrderAssociatedGoodsModel
+            var isSelect = false
+            if goodsModel.id == self.selectAssociatedGoodsModel!.id{
+                isSelect = true
+            }
+            cell.setModel(model: goodsModel, isSelect: isSelect, keyword: self.keyWord!)
+            return cell
+        }else{
+            guard let cell = tableView.dequeueReusableCell(withIdentifier: kDSShopGoodsManageListTableViewCellID) as? CNLiveShopGoodsManageListTableViewCell
+            else {
+                let cell = CNLiveShopGoodsManageListTableViewCell()
+                return cell
+            }
+            cell.editCallBack = { model in
+                self.editGoodsModel(goodsModel: model)
+            }
+            cell.operStateCallBack = { model ,state in
+                self.operStateWithGoodsModel(goodsModel: model, state: state)
+            }
+            cell.editCountCallBack = { model in
+                self.editGoodsCountModel(goodsModel: model)
+            }
+            let model = self.dataArr[indexPath.row] as! ShopOrderAssociatedGoodsModel
+            cell.setSearchModel(model: model, keyWork: self.keyWord!)
+            return cell
+        }
+    }
+    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+        let tempView = UIView(frame: CGRect(x: 0, y: 0, width: KSreenWidth, height: 50))
+        tempView.backgroundColor = .white
+        if section == 1{
+            tempView.height = 60
+            let topView = UIView(frame: CGRect(x: 0, y: 0, width: KSreenWidth, height: 10))
+            topView.backgroundColor = HexColor("#F9F9F9")
+            tempView.addSubview(topView)
+        }
+        
+        let nameLabel = UILabel(frame: CGRect(x: 10, y: 12 + (section == 1 ? 10 : 0), width: KSreenWidth - 90, height: 26))
+        nameLabel.textColor = HexColor("#333333")
+        nameLabel.font = UIFont.boldSystemFont(ofSize: 16)
+        nameLabel.lineBreakMode = .byTruncatingTail
+        nameLabel.numberOfLines = 1
+        nameLabel.text = String(format: "%@-商品", self.keyWord!)
+        tempView.addSubview(nameLabel)
+          
+        let lineLabel = UILabel(frame: CGRect(x: 10, y: 49 + (section == 1 ? 10 : 0), width: KSreenWidth - 20, height: DS_RRV_ONE_PIXEL))
+        lineLabel.backgroundColor = HexColor("#F2F2F2")
+        tempView.addSubview(lineLabel)
+        
+        return tempView
+    }
+
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        switch self.searchType {
+        case .defaultGoods:
+            return 167//100
+        case .associateGoods:
+            return 167
+        }
+    }
+    func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
+        return 50
+    }
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        let goodsModel = self.dataArr[indexPath.row] as! ShopOrderAssociatedGoodsModel
+        switch self.searchType {
+        case .defaultGoods:
+            let vc = CNLiveShopGoodsDetailsViewController()
+            vc.goodsId = goodsModel.id
+//            navigationViewController().pushViewController(vc, animated: pushAnimated)
+            break
+        case .associateGoods:
+            self.selectAssociatedGoodsModel = goodsModel
+            self.rightNavBtn?.setTitle("确认", for: .normal)
+            self.tableView.reloadData()
+        }
+    }
+    // MARK: - UIScrollViewDelegate
+    func scrollViewWillBeginDragging(_ scrollView: UIScrollView) {
+        self.view.endEditing(true)
+    }
+
+    // MARK: - UITextFieldDelegate
+    func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool {
+        if textField.tag == 666{
+            let isAllow = (string as NSString).allowWriteString(string: "0123456789")
+            return !isAllow
+        }
+        return true
+    }
+    func textFieldDidEndEditing(_ textField: UITextField) {
+        if textField.text?.count ?? 0 > 20{
+            textField.text = (textField.text! as NSString).substring(to: 20)
+        }
+    }
+
+    func textFieldShouldReturn(_ textField: UITextField) -> Bool {
+        self.cn_skipGoodsListWithSearchKeyword(searchKeyword: textField.text ?? "")
+        return true
+    }
+
+    @objc func textFieldShouldClear(_ textField: UITextField) -> Bool {
+        self.textFieldDidOnClearAndBecomeFirstResponder(textField: textField)
+        return true
+    }
+    @objc func textFieldDidOnClearAndBecomeFirstResponder(textField:UITextField){
+        if textField.text?.count == 0{
+            self.rightNavBtn?.setTitle("取消", for: .normal)
+            self.dataArr.removeAllObjects()
+            self.tableView.mj_footer?.isHidden = true
+            self.searchTextField?.text = ""
+            self.tableView.tableHeaderView = self.cn_tableHeaderView()
+            self.tableView.reloadData()
+            self.searchTextField?.becomeFirstResponder()
+        }
+        if textField.text?.count ?? 0 > 20{
+            showMessage(message: "最长20个字！超出部分会在输入完成时自动删除")
+        }
+    }
+    // MARK: - response method
+    /// 点击历史记录
+    /// @param button
+    @objc func hisBtnClick(_ button:UIButton){
+        self.searchTextField?.text = button.titleLabel?.text
+        self.cn_skipGoodsListWithSearchKeyword(searchKeyword: button.titleLabel?.text ?? "")
+    }
+
+    /// 删除历史记录
+    @objc func deleteAllData(){
+        CNLiveFileManager.shared.deleteKey(resetKey: kDSSaveShopSearchHistroyData)
+        self.tableView.tableHeaderView = self.cn_tableHeaderView()
+        self.tableView.reloadData()
+        
+    }
+
+    /// 返回事件
+    /// @param button 戳发按钮
+    @objc func rightNavBtnAction(_ button:UIButton){
+        navigationViewController().popViewController(animated: false)
+    }
+
+    /// 取消或确认选中的搜索商品 事件
+    /// @param button 戳发按钮
+    @objc func cancelNavBtnAction(_ button:UIButton){
+        if self.searchType == .associateGoods && self.selectAssociatedGoodsModel != nil{
+            // 搜索确认处理
+            NotificationCenter.default.post(name: Notification.Name.ShopGoodsManage.kDSSelectGoodsNotification, object: self.selectAssociatedGoodsModel)
+            let vcArray = self.navigationController?.viewControllers
+            for vc in vcArray!{
+//                if vc.isKind(of: CNDSDarenReleaseDynamicViewController.self){
+//                    navigationViewController().popToViewController(vc, animated: true)
+//                    return
+//                }
+            }
+        }else{
+            self.navigationController?.popViewController(animated: true)
+        }
+    }
+    
+    func loadMoreAction(){
+        self.page += 1
+        self.requestSearchWordDataWithKeyword(keyword: self.keyWord!, page: self.page)
+    }
+    /// 编辑商品
+    /// @param goodsModel 商品数据
+    func editGoodsModel(goodsModel:ShopOrderAssociatedGoodsModel){
+        let vc = CNLiveShopNewProductController()
+        vc.type = .edit
+        vc.goodsId = goodsModel.id!
+        navigationViewController().pushViewController(vc, animated: true)
+    }
+
+    /// 编辑商品库存
+    /// @param goodsModel 商品数据
+    func editGoodsCountModel(goodsModel:ShopOrderAssociatedGoodsModel){
+        let alert = UIAlertController(title: "编辑商品库存", message: "请输入库存数量", preferredStyle: .alert)
+        alert.addTextField { textField in
+            textField.delegate = self
+            textField.keyboardType = .numberPad
+            textField.returnKeyType = .done
+            textField.tag = 666
+        }
+        alert.addAction(UIAlertAction(title: "取消", style: .cancel, handler: nil))
+          
+        alert.addAction(UIAlertAction(title: "修改", style: .default, handler: { action in
+            self.view.endEditing(true)
+            let textField = alert.textFields?.first
+            if textField?.text?.count == 0 || textField?.text?.count ?? 0 >= 6{
+                showMessage(message: "请输入有效的商品库存数量")
+                return
+            }
+            self.requsetEditGoodsCount(count: textField?.text ?? "", goodsModel: goodsModel)
+        }))
+        present(alert, animated: true, completion: nil)
+    }
+
+    /// 编辑商品上下架状态
+    /// @param goodsModel 商品数据
+    /// @param state 1：上架 2：下架
+    func operStateWithGoodsModel(goodsModel:ShopOrderAssociatedGoodsModel,state:Int){
+        var message = ""
+        if (state == 2) {
+            message = "确认下架？"
+        }else {
+            message = "确认上架？"
+        }
+        ConfigAlertManager.shared.presentAlert(title: "", message: message, actionTitles: ["取消","确认"]) { index in
+            if index == 1 {
+                showLoading(message: "")
+                CNLiveShopGoodListViewModel.postChangeGoodsStateWithGoodsId(goodsId: goodsModel.id!, state: "") { result, status in
+                    if status == .success{
+                        for (_,obj) in self.dataArr.enumerated(){
+                            let model = obj as! ShopOrderAssociatedGoodsModel
+                            if model.id == goodsModel.id{
+                                if (model.state == "2") {
+                                    model.state = "1"
+                                }else {
+                                    model.state = "2"
+                                }
+                                self.tableView.reloadData()
+                            }
+                        }
+                    }else{
+                        showMessage(message: "失败")
+                        return
+                    }
+                }
+            }
+        }
+    }
+    // MARK: - 网络请求
+    /// 搜索接口
+    /// @param keyword 关键字
+    func requestSearchWordDataWithKeyword(keyword:String,page:Int){
+        showLoading(message: "")
+        CNLiveShopGoodListViewModel.getGetGoodsListWithShopId(shopId: DSUserInfoManager.shared.dsUserInfo.id, sortType: "1", state: 0, categoryId: nil, keyword: keyword, page: page) { result, status in
+            hiddenLoading()
+            if status == .success{
+                let dataArr = result as! [ShopOrderAssociatedGoodsModel]
+                if (self.page == 1 && dataArr.count == 0) {
+                    showMessage(message: "未搜索到相关结果")
+                    self.dataArr.removeAllObjects()
+                    self.tableView.tableHeaderView = self.cn_tableHeaderView()
+                    self.tableView.reloadData()
+                    self.rightNavBtn?.setTitle("取消", for: .normal)
+                    self.searchTextField?.becomeFirstResponder()
+                }else{
+                    if (page == 1) {
+                        self.dataArr.removeAllObjects()
+                        self.tableView.mj_footer?.isHidden = false
+                    }
+                    
+                    /**没有更多数据判断依据为：每页数据默认为20条，如果当前获取的这页数据小于20条，说明没有下页数据*/
+                    if (dataArr.count < 20) {
+                        self.tableView.mj_footer?.isHidden = true
+                    }
+                    self.dataArr.addObjects(from: dataArr)
+                    self.tableView.tableHeaderView = UIView()
+                    self.tableView.reloadData()
+                }
+            }else{
+                showMessage(message: "搜索失败")
+            }
+        }
+    }
+    /// 设置库存数
+    /// @param count 库存数
+    /// @param goodsModel 商品数据
+    func requsetEditGoodsCount(count:String,goodsModel:ShopOrderAssociatedGoodsModel){
+        showLoading(message: "")
+        CNLiveShopGoodListViewModel.postGoodsEditAttrWithShopId(shopId: DSUserInfoManager.shared.dsUserInfo.id!, goodsId: goodsModel.id!, type: 1, value: count) { result, status in
+            if status == .success{
+                goodsModel.count = count
+                self.tableView.reloadData()
+            }else{
+                showMessage(message: "操作失败")
+            }
+        }
+    }
+    
+    func cn_tableHeaderView() -> UIView{
+        let headerView = UIView(frame: CGRect(x: 0, y: 0, width: KSreenWidth, height: 0))
+        let whiteView = UIView(frame: CGRect(x: 0, y: 0, width: KSreenWidth, height: 0))
+        whiteView.backgroundColor = .white
+        headerView.addSubview(whiteView)
+        
+        let markLab = UILabel(frame: CGRect(x: 25, y: 10, width: KSreenWidth-50, height: 30))
+        markLab.textColor = HexColor("#898989")
+        markLab.text = "历史搜索"
+        markLab.font = Font_15
+        whiteView.addSubview(markLab)
+        
+        self.hisDataArr.removeAllObjects()
+        if (CNLiveFileManager.shared.takeDataKey(key: kDSSaveShopSearchHistroyData)) != nil {
+            let arr = CNLiveFileManager.shared.takeDataKey(key: kDSSaveShopSearchHistroyData)!
+            self.hisDataArr.addObjects(from: arr)
+        }
+        if self.hisDataArr.count == 0{
+            whiteView.height = markLab.bottom
+            headerView.height = whiteView.bottom + 5
+            return whiteView
+        }
+
+        let floatLayoutView = QMUIFloatLayoutView()
+        floatLayoutView.padding = UIEdgeInsets(top: 12, left: 12, bottom: 12, right: 12)
+        floatLayoutView.itemMargins = UIEdgeInsets(top: 0, left: 0, bottom: 10, right: 10)
+        floatLayoutView.minimumItemSize = CGSizeMake(40, 29)// 以2个字的按钮作为最小宽度
+        whiteView.addSubview(floatLayoutView)
+        
+        for i in 0..<self.hisDataArr.count{
+            let button = UIButton(type: .custom)
+            button.backgroundColor = HexColor("#F9F9F9")
+            button.setTitleColor(HexColor("#666666"), for: .normal)
+            button.layer.cornerRadius = 5
+            button.titleLabel?.lineBreakMode = .byTruncatingTail
+            button.setTitle(self.hisDataArr[i] as? String, for: .normal)
+            button.titleLabel?.font = Font_13
+            button.contentEdgeInsets = UIEdgeInsets(top: 6, left: 10, bottom: 6, right: 10)
+            button.addTarget(self, action: #selector(hisBtnClick), for: .touchUpInside)
+            floatLayoutView.addSubview(button)
+        }
+        let padding = UIEdgeInsets(top: markLab.bottom, left: 10, bottom: 100, right: 10)
+        let contentWidth = whiteView.width - UIEdgeInsetsGetHorizontalValue(padding)
+        let floatLayoutViewSize = floatLayoutView.sizeThatFits(CGSize(width: contentWidth, height: CGFLOAT_MAX))
+        floatLayoutView.frame = CGRect(x: padding.left, y: padding.top, width: contentWidth, height: floatLayoutViewSize.height)
+        
+        let lineView = UIView(frame: CGRect(x: 10, y: floatLayoutView.bottom, width: KSreenWidth-20, height: DS_RRV_ONE_PIXEL))
+        lineView.backgroundColor = HexColor("#F2F2F2")
+        whiteView.addSubview(lineView)
+        
+        let deleteAllBtn = UIButton(type: .custom)
+        deleteAllBtn.frame = CGRect(x: 10, y: lineView.bottom+10, width: KSreenWidth-20, height: 30)
+        deleteAllBtn.addTarget(self, action: #selector(deleteAllData), for: .touchUpInside)
+        deleteAllBtn.titleLabel?.font = Font_15
+        deleteAllBtn.setTitleColor(HexColor("#f5a623"), for: .normal)
+        deleteAllBtn.setTitle("清除搜索历史", for: .normal)
+        whiteView.addSubview(deleteAllBtn)
+        whiteView.height = deleteAllBtn.bottom+10
+        headerView.height = whiteView.bottom+5
+        return headerView
+    }
+    func cn_skipGoodsListWithSearchKeyword(searchKeyword:String){
+        var searchKeywordStr = searchKeyword
+        let text = searchKeywordStr.replacingOccurrences(of: "\u{FFFC}", with: "")
+        //去除掉首尾的空白字符和换行字符
+        searchKeywordStr = searchKeywordStr.trimmingCharacters(in: .whitespacesAndNewlines)
+        if (searchKeywordStr.isEmpty) {
+            showMessage(message: "搜索关键字不能为空")
+            return
+        }
+        self.view.endEditing(true)
+        if self.hisDataArr.contains(searchKeywordStr){
+            self.hisDataArr.remove(searchKeywordStr)
+        }
+        self.hisDataArr.insert(searchKeyword, at: 0)
+        if self.hisDataArr.count > kCNLiveMaxCacheSearchKeywordKey{
+            self.hisDataArr.removeObjects(in: NSMakeRange(kCNLiveMaxCacheSearchKeywordKey - 1, self.hisDataArr.count - (kCNLiveMaxCacheSearchKeywordKey - 1) - 1))
+        }
+        CNLiveFileManager.shared.saveData(object: Array(self.hisDataArr), key: kDSSaveShopSearchHistroyData)
+        self.page = 1
+        self.keyWord = searchKeywordStr
+        self.requestSearchWordDataWithKeyword(keyword: self.keyWord!, page: self.page)
+        
+    }
+}
@@ -6,7 +6,7 @@
 //  新增商品
 import Foundation
-
+import HandyJSON
 ///
 enum CNLiveShopGoodsAddEditType{
@@ -19,8 +19,14 @@ 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))
+        let bgScrollView = UIScrollView(frame: CGRect(x: 0, y: self.topNavView.height, width: KSreenWidth, height: KSreenHeight-self.topNavView.height-KTabBarHeight))
         bgScrollView.showsVerticalScrollIndicator = false
         return bgScrollView
     }()
@@ -29,20 +35,103 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
         let dataModel = CNLiveShopAddEditGoodsModel()
         return dataModel
     }()
+    lazy var shopGoodsDetailsModel: CNLiveShopGoodsDetailsModel = {
+        let shopGoodsDetailsModel = CNLiveShopGoodsDetailsModel()
+        return shopGoodsDetailsModel
+    }()
+    
+    var _selectCategoryVC:CNLiveGoodsCategoryController?
+    var selectCategoryVC:CNLiveGoodsCategoryController?{
+        get{
+            if _selectCategoryVC == nil{
+                let vc = CNLiveGoodsCategoryController()
+                vc.categoryType = .goods
+                if self.shopGoodsDetailsModel.id?.count ?? 0 > 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.view.addSubview(vc.view)
+                _selectCategoryVC = vc
+            }
+            if _selectCategoryVC!.view.superview == nil && self.isShowGoodsCategory == true{
+                self.view.addSubview(_selectCategoryVC!.view)
+            }
+            return _selectCategoryVC
+        }
+        set{
+            
+            _selectCategoryVC = newValue
+            
+        }
+    }
-    var selectCategoryVC = CNLiveGoodsCategoryController()
+    var _selectShopClassifyVC:CNLiveGoodsCategoryController?
+    var selectShopClassifyVC:CNLiveGoodsCategoryController?{
+        get{
+            if _selectShopClassifyVC == nil{
+                let vc = CNLiveGoodsCategoryController()
+                
+                vc.categoryType = .shop
+                if self.shopGoodsDetailsModel.id?.count ?? 0 > 0{
+                    vc.firCategoryId = self.shopGoodsDetailsModel.category_id
+                    vc.secCategoryId = self.shopGoodsDetailsModel.category_id2
+                }
+                vc.finishBlock = {
+                    let 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)
+                _selectShopClassifyVC = vc
+                _selectShopClassifyVC!.hideView()
+                if (self.type == .add) {
+                    _selectShopClassifyVC!.initTitleName(name: "新增商品")
+                }else {
+                    _selectShopClassifyVC!.initTitleName(name: "编辑商品")
+                }
+            }
+            if _selectShopClassifyVC!.view.superview == nil && self.isShowShopCategory == true{
+                self.view.addSubview(_selectShopClassifyVC!.view)
+            }
+            return _selectShopClassifyVC
+        }
+        set{
+            _selectShopClassifyVC = newValue
+        }
+    }
+
     lazy var bottomNavView :UIView = {
         let bottomNavView = UIView(frame: CGRect(x: 0, y: KSreenHeight-KTabBarHeight, width: self.view.width, height: KTabBarHeight))
         bottomNavView.backgroundColor = HexColor("F2F2F2")
         return bottomNavView
     }()
+    var isShowGoodsCategory = false
+    var isShowShopCategory = false
+    
     override func viewDidLoad() {
         super.viewDidLoad()
+        navigationBarHidden = false
         self.setUI()
         self.bgScrollView.backgroundColor = .white
         self.view.addSubview(self.bgScrollView)
         self.initBgScrollViewContentView()
+        if (self.type == .edit) {
+            self.requestGoodsData()
+        }
     }
     override func viewWillLayoutSubviews() {
@@ -50,20 +139,41 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
         self.bgScrollView.frame = CGRect(x: 0, y: KNavigationHeight, width: KSreenWidth, height: KSreenHeight-KNavigationHeight-KTabBarHeight)
         var lastView:UIView? = nil
         for i in 0..<self.dataModel.list.count{
-            let singleView = self.view.viewWithTag(i+1) as! CNLiveShopAddGoodsSingleView
-            singleView.frame = CGRect(x: 0, y: lastView?.bottom ?? 0, width: self.bgScrollView.width, height: singleView.height)
-            if i+1 == 15{
-                singleView.frame = CGRect(x: 0, y: lastView?.bottom ?? 0, width: self.bgScrollView.width, height: 0.001)
-            }
-            lastView = singleView
+            let singleView = self.bgScrollView.viewWithTag(i+1) as! CNLiveShopAddGoodsSingleView
+                singleView.frame = CGRect(x: 0, y: lastView?.bottom ?? 0, width: self.bgScrollView.width, height: singleView.height)
+                if i+1 == 15{
+                    singleView.frame = CGRect(x: 0, y: lastView?.bottom ?? 0, width: self.bgScrollView.width, height: 0.001)
+                }
+                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.bgScrollView.viewWithTag(i+1) as! CNLiveShopAddGoodsSingleView
+            if singleView.addEditGoodsListModel?.style == "3"{
+                singleView.uploadImageView.deleteUploadImageUrlAfterCancelUploadThings()
+            }
+        }
+    }
     func setUI(){
-        navigationBarHidden = false
         titleName = "新增商品"
+        if (self.type == .add) {
+            self.selectCategoryVC?.initTitleName(name: "新增商品")
+        }else {
+            self.selectCategoryVC?.initTitleName(name: "编辑商品")
+            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(){
@@ -75,7 +185,7 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
         previewBtn.setTitleColor(HexColor("#3A3A3A"), for: .normal)
         previewBtn.titleLabel?.font = Font_15
         previewBtn.addTarget(self, action: #selector(previewBtnClick), for: .touchUpInside)
-        self.bottomNavView.addSubview(previewBtn)
+//        self.bottomNavView.addSubview(previewBtn)
         let saveBtn = UIButton(type: .custom)
         saveBtn.frame = CGRect(x: previewBtn.right, y: 0, width: self.view.width - previewBtn.right, height: KTabBarHeight)
@@ -88,14 +198,19 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
     }
     func initBgScrollViewContentView(){
+        
+        self.dataModel.initDataSource()
         if self.type == .edit{
-            
+            if self.dataModel.list.count > 3{
+                var tempArray = Array(self.dataModel.list)
+                tempArray.removeSubrange(Range(NSRange(location: self.dataModel.list.count - 3, length: 3))!)
+                self.dataModel.list = tempArray
+            }
         }
-        self.dataModel.initDataSource()
         for i in 0..<self.dataModel.list.count {
             let model = self.dataModel.list[i]
-            let singleView = CNLiveShopAddGoodsSingleView.init(frame: CGRect(x: 0, y: 0, width: KSreenWidth, height: 50))
-            singleView.addEditGoodsListModel = model
+            let singleView = CNLiveShopAddGoodsSingleView.init(frame: CGRect(x: 0, y: 0, width: KSreenWidth, height: 50), model: model)
+//            singleView.addEditGoodsListModel = model
             singleView.tag = i+1
             //完成frame更新通知
             singleView.updateFrameBlock = {
@@ -103,29 +218,156 @@ 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(frame: CGRect(x: 0, y: self.bgScrollView.height, width: self.bgScrollView.width, height: 50), model: 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)
+        
+        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(){
+        self.isShowGoodsCategory = true
+        self.view.bringSubviewToFront(self.selectCategoryVC!.view)
+        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 nil
+    }
+    // MARK: - 显示选取店铺分类界面
+    func displaySelectShopClassifyVC(){
+        self.isShowShopCategory = true
+        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
+            //1取消 2确定
+            if (index == 2) {
+                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
         //商品名称
@@ -146,10 +388,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: "请选择商品轮播")
@@ -164,299 +406,453 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
             showMessage(message: "请选择商品详情图")
             return
         }
-        else if (self.selectShopClassifyVC.firCategoryId.count == 0) {
+        else if (self.selectShopClassifyVC!.firCategoryId == 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()
+        let bannerImage = NSMutableArray()
+        for imageUrl in bannersSelectImageUrls {
+            let model = CNLiveGoodsDetailsImageModel()
+            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
+        let contentDetailsImage = NSMutableArray()
+        for imageUrl in contentDetailsSelectImageUrls{
+            let model = CNLiveGoodsDetailsContentModel()
+            model.simg = imageUrl
+            contentDetailsImage.add(model)
+        }
+        goodsDetailsModel.detail_img = Array(contentDetailsImage) as! [CNLiveGoodsDetailsContentModel]
+        let 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])
+        let 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: true)
     }
     @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;
+        let 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()
+        let 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 == 0{
+            showMessage(message: "请选择商品分类")
+            return
+        }else if 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 = Array<Dictionary<String, String>>()
+        kvArray.append(["k":"品名","v":singleView18.contentTextField.text!])
+        kvArray.append(["k":"规格","v":singleView19.contentTextField.text!])
+        kvArray.append(["k":"寄送区域","v":singleView20.contentTextView.text!])
+        kvArray.append(["k":"发货时效","v":singleView21.contentTextField.text!])
+        let 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.append(["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
+            }
+            let 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 = 0
+        if self.selectShopClassifyVC!.secCategoryId != 0 {
+            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 != 0 ? String(format: "%d", 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: String(format: "%d", 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{
+                        let singleView = self.bgScrollView.viewWithTag(i+1) as! CNLiveShopAddGoodsSingleView
+                        if singleView.addEditGoodsListModel?.style == "3"{
+                            singleView.uploadImageView.deleteReplaceImageUrlAfterSuccessUploadThings()
+                        }
+                    }
+                    self.navigationController?.popViewController(animated: true)
+                }
+            }
+        }else{
+            //编辑
+            var kvArrayJSONStr = ""
+            do {
+                let jsonData = try JSONSerialization.data(withJSONObject: kvArray) // 将数组转换为JSON格式的NSData对象
+                
+                if let jsonString = String(data: jsonData, encoding: .utf8) {
+                    print("转换后的JSON字符串:\n\(jsonString)")
+                    kvArrayJSONStr = jsonString
+                } else {
+                    print("无法将JSON数据转换为字符串")
+                }
+            } catch {
+                print("发生错误：\(error)")
+            }
+            CNLiveShopGoodListViewModel.postGoodsEditWithGoodsId(goodsId: self.goodsId, uid: DSUserInfoManager.shared.dsUserInfo.uid!, 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: kvArrayJSONStr, infoImg: contentDetailsImageStr, yunfei: singleView14.contentTextField.text ?? "", min_count: singleView10.countTF.text ?? "", isRefund: "0", category_id: String(format: "%d", category_id)) { result, status in
+                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{
+                        let singleView = self.bgScrollView.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
+                let thiCategoryId =  self.selectCategoryVC!.thiCategoryId
+                //商品分类
+                let singleView1 = self.bgScrollView.viewWithTag(1) as! CNLiveShopAddGoodsSingleView
+                //店铺分类
+                let singleView2 = self.bgScrollView.viewWithTag(2) as! CNLiveShopAddGoodsSingleView
+                //商品轮播
+                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
-                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];
+                let tempArray = NSMutableArray()
+                for mdl in self.shopGoodsDetailsModel.storage_arr{
+                    let dic = modelToDictionary(mdl)
+                    tempArray.add(dic)
+                }
+                                
+                self.shopGoodsDetailsModel.storageArray = tempArray as! [Dictionary<String, Any>]
+                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()
+                
+                let 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];
+                let contentDetailsImageUrls = NSMutableArray()
+                for model in self.shopGoodsDetailsModel.detail_img{
+                    contentDetailsImageUrls.add(model.simg as Any)
+                }
+                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 = 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.append(listModel)
+                        self.reloadBgScrollViewContentViewModel(model: listModel, index: self.dataModel.list.count+1+i, isScrollToBottom: false)
+                        if tempArray.count-1 == i{
+                            self.dataModel.list = array 
+                            self.viewWillLayoutSubviews()
+                        }
                     }
                 }
-                
-                [self dsPopViewControllerAnimated:YES];
-            }];
-        }*/
+            }
+        }
     }
 }
@@ -6,12 +6,22 @@
 //  商品管理
 import Foundation
+import MJRefresh
+import EmptyDataSet_Swift
-class CNLiveShopProductManagerController:CNLiveBaseViewController, UITableViewDataSource, UITableViewDelegate{
+///商品管理通知
+let kDSGoodsManageAddNotification = "kDSGoodsManageAddNotification"
+let kDSGoodsManageEditNotification = "kDSGoodsManageEditNotification"
+let kDSGoodsManageDeleteNotification = "kDSGoodsManageDeleteNotification"
+
+class CNLiveShopProductManagerController:CNLiveBaseViewController, UITableViewDataSource, UITableViewDelegate, CNLiveGoodsManagerClassifyViewDelegate, EmptyDataSetSource, EmptyDataSetDelegate, UITextFieldDelegate{
     let kCNLiveShopGoodsListCellIdentifier = "kCNLiveShopGoodsListCellIdentifier"
-    
+    ///排序类型 1新品 2价格从底到高 3 价格从高到底
+    var sortType = "1"
+    var network_type: CNLiveMineResponseType!
+    var pageNum: NSInteger = 0
     // MARK: - 懒加载
     ///数据源
     lazy var dataArray: NSMutableArray = {
@@ -20,8 +30,12 @@ class CNLiveShopProductManagerController:CNLiveBaseViewController, UITableViewDa
     }()
     lazy var classifyView: CNLiveShopGoodsListClassifyView = {
-        let classifyView = CNLiveShopGoodsListClassifyView(frame: CGRect(x: 0, y: KNavigationHeight, width: KSreenWidth, height: 44))
+        let itemA = CNLiveClassifyItem.init(itemTitle: "最新", itemImage: nil)
+        let itemB = CNLiveClassifyItem.init(itemTitle: "价格", itemImage: UIImage(named: "DS_goods_manager_pirce_default"))
+        
+        let classifyView = CNLiveShopGoodsListClassifyView(frame: CGRect(x: 0, y: KNavigationHeight, width: KSreenWidth, height: 44), itemArray: [itemA,itemB])
         classifyView.backgroundColor = .white
+        classifyView.delegate = self
         return classifyView
     }()
     lazy var addBtn: UIButton = {
@@ -36,7 +50,10 @@ class CNLiveShopProductManagerController:CNLiveBaseViewController, UITableViewDa
         let tableView = UITableView(frame: .zero, style: .plain)
         tableView.dataSource = self
         tableView.delegate = self
+        tableView.emptyDataSetSource = self
+        tableView.emptyDataSetDelegate = self
         tableView.separatorStyle = .none
+        tableView.tableFooterView = UIView.init()
         tableView.rowHeight = 167
         tableView.register(CNLiveShopGoodsListCell.self, forCellReuseIdentifier: kCNLiveShopGoodsListCellIdentifier)
         return tableView
@@ -52,16 +69,44 @@ class CNLiveShopProductManagerController:CNLiveBaseViewController, UITableViewDa
         emptyLabel.adjustsFontSizeToFitWidth=true
         return emptyLabel
     }()
-        
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         self.setUI()
-        self.getGoodsListApi(page: "1")
+        self.getGoodsListApi(page: 1)
+        
+        NotificationCenter.default.addObserver(self, selector: #selector(goodsManageAddNotification), name: Notification.Name.ShopGoodsManage.kDSGoodsManageAddNotification, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(goodsManageEditNotification), name: Notification.Name.ShopGoodsManage.kDSGoodsManageEditNotification, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(goodsManageDeleteNotification), name: Notification.Name.ShopGoodsManage.kDSGoodsManageDeleteNotification, object: nil)
+    }
+    deinit {
+        NotificationCenter.default.removeObserver(self, name: Notification.Name.ShopGoodsManage.kDSGoodsManageAddNotification, object: nil)
+        NotificationCenter.default.removeObserver(self, name: Notification.Name.ShopGoodsManage.kDSGoodsManageEditNotification, object: nil)
+        NotificationCenter.default.removeObserver(self, name: Notification.Name.ShopGoodsManage.kDSGoodsManageDeleteNotification, object: nil)
     }
+    
     func setUI(){
         navigationBarHidden = false
         titleName = "商品管理"
-//        rightNavBtns = [self.addBtn]
+        rightNavBtns = [self.addBtn]
+                
+        let leftNavBtn = UIButton(type: .custom)
+        leftNavBtn.setImage(UIImage(named: "DS_goods_search_back_icon"), for: .normal)
+        leftNavBtn.addTarget(self, action: #selector(changeCancelAction), for: .touchUpInside)
+        leftNavBtn.width = 44
+        leftNavBtn.height = 44
+        
+        let leftSearchNavBtn = UIButton(type: .custom)
+        leftSearchNavBtn.setImage(UIImage(named: "DS_goods_manager_searchNav"), for: .normal)
+        leftSearchNavBtn.addTarget(self, action: #selector(searchBtnClick), for: .touchUpInside)
+        leftSearchNavBtn.width = 44
+        leftSearchNavBtn.height = 44
+        for btn in self.leftNavBtns{
+            btn.removeFromSuperview()
+        }
+        self.leftNavBtns =  [leftNavBtn,leftSearchNavBtn]
+        
+        self.pageNum = 1
         self.view.addSubview(self.classifyView)
         self.view.addSubview(tableView)
         self.view.addSubview(self.emptyLabel)
@@ -69,6 +114,18 @@ class CNLiveShopProductManagerController:CNLiveBaseViewController, UITableViewDa
         tableView.frame = CGRect(x: 0, y:self.classifyView.bottom , width: KSreenWidth, height: KSreenHeight - self.classifyView.bottom)
     }
+    func addRefreshView() {
+        tableView.mj_header = MJRefreshNormalHeader.init(refreshingBlock: {[weak self] in
+            self!.pageNum = 1
+            self?.getGoodsListApi(page: 1)
+        })
+        
+        tableView.mj_footer = MJRefreshAutoNormalFooter.init(refreshingBlock: {[weak self] in
+            self!.pageNum = self!.pageNum + 1
+            self?.getGoodsListApi(page: self!.pageNum)
+        })
+    }
+    
     // MARK: - UITableViewDelegate
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         return self.dataArray.count
@@ -84,6 +141,17 @@ class CNLiveShopProductManagerController:CNLiveBaseViewController, UITableViewDa
         }
         cell.goodsModel = goodsModel
+        cell.editBlock = { mdl in
+            let model = mdl
+            self.editGoodsModel(goodsModel: model)
+        }
+        cell.editCountBlock = { mdl in
+            let model = mdl 
+            self.editGoodsCountModel(goodsModel: model)
+        }
+        cell.operStateBlock = { model,state in
+            self.operStateWithGoodsModel(goodsModel: model, state: state)
+        }
         return cell
     }
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
@@ -95,47 +163,239 @@ class CNLiveShopProductManagerController:CNLiveBaseViewController, UITableViewDa
         return 167
     }
+    func title(forEmptyDataSet scrollView: UIScrollView) -> NSAttributedString? {
+        var defult_string = ""
+        if network_type == .failed  || network_type == .unkonw {
+            defult_string = "接口请求错误,刷新试试～"
+        }
+        if network_type == .noNetwork {
+            defult_string = "网络开小差了,刷新试试～"
+        }
+        if dataArray.count == 0 {
+            defult_string = "暂时没有数据～"
+        }
+        return NSAttributedString(string: defult_string, attributes: [.font: Font_17,.foregroundColor: HexColor("#666666")!])
+    }
+    
+    func buttonTitle(forEmptyDataSet scrollView: UIScrollView, for state: UIControl.State) -> NSAttributedString? {
+        if network_type == .failed || network_type == .noNetwork {
+            let attributes = [NSAttributedString.Key.font:Font_16_Fit,
+                              NSAttributedString.Key.foregroundColor: HexColor("#609BFF")]
+            return NSAttributedString(string: "刷一刷", attributes: attributes as [NSAttributedString.Key : Any])
+        }
+        return nil
+    }
+    
+    func emptyDataSet(_ scrollView: UIScrollView, didTapView view: UIView) {
+        if network_type == .failed || network_type == .noNetwork  {
+            getGoodsListApi(page: 1)
+        }
+    }
+    
+    // MARK: - 编辑商品
+    func editGoodsModel(goodsModel:CNLiveShopGoodsListModel){
+        let vc = CNLiveShopNewProductController.init()
+        vc.type = .edit
+        vc.goodsId = goodsModel.id!
+        self.navigationController?.pushViewController(vc, animated: true)
+    }
+
+    // MARK: - 编辑商品库存
+    func editGoodsCountModel(goodsModel:CNLiveShopGoodsListModel){
+        let alertController = UIAlertController(title: "编辑商品库存", message: "请输入库存数量", preferredStyle: .alert)
+        alertController.addTextField { textField in
+            textField.delegate = self
+            textField.keyboardType = .numberPad
+            textField.returnKeyType = .done
+            textField.tag = 666
+        }
+        let cancel = UIAlertAction(title: "取消", style: .cancel) { action in
+        }
+        alertController.addAction(cancel)
+        let confirm = UIAlertAction(title: "修改", style: .default) { action in
+            self.view.endEditing(true)
+            let textField = alertController.textFields?.first
+            if (textField!.text?.count ?? 0 > 0 && (textField!.text?.isPurnInt() == false)) {
+                showMessage(message: "只能输入数字")
+                return
+            }
+            if (textField!.text?.count == 0 || textField!.text?.count ?? 0 >= 6){
+                showMessage(message: "请输入1~99999范围内的数量")
+                return
+            }
+            self.requsetEditGoodsCount(count: textField!.text ?? "", goodsModel: goodsModel)
+        }
+        alertController.addAction(confirm)
+        self.present(alertController, animated: true)
+            
+    }
+    
+    func requsetEditGoodsCount(count:String,goodsModel:CNLiveShopGoodsListModel){
+        showLoading(message: "")
+        CNLiveShopGoodListViewModel.postGoodsEditAttrWithShopId(shopId: DSUserInfoManager.shared.dsUserInfo.id!, goodsId: goodsModel.id!, type: 1, value: count) { result, status in
+            if status == .success{
+                showMessage(message: "操作成功")
+                let dataArr = Array(self.dataArray)
+                for (idx,mdl) in dataArr.enumerated() {
+                    let model = mdl as! CNLiveShopGoodsListModel
+                    if model.id == goodsModel.id {
+                        model.count = count
+                        self.dataArray.replaceObject(at: idx, with: model)
+                        self.tableView.reloadData()
+                        break
+                    }
+                }
+            }else{
+                showMessage(message: "操作失败")
+            }
+        }
+    }
+    
+    // MARK: - 编辑商品上下架状态
+    func operStateWithGoodsModel(goodsModel:CNLiveShopGoodsListModel,state:Int){
+        var message = ""
+        if state == 2{
+            message = "确认下架？"
+        }else{
+            message = "确认上架？"
+        }
+        AlertTool.showSystemAlert(title: message, message: nil, actionTitles: ["取消","确定"], style: .alert, actionStyles:[.cancel,.default] ) { index in
+            if (index == 2) {
+                showLoading(message: "")
+                CNLiveShopGoodListViewModel.postChangeGoodsStateWithGoodsId(goodsId: goodsModel.id!, state: "") { result, status in
+                    if status == .success{
+                        showMessage(message: "操作成功")
+                        let dataArr = Array(self.dataArray)
+                        for (idx,mdl) in dataArr.enumerated() {
+                            let model = mdl as! CNLiveShopGoodsListModel
+                            if model.id == goodsModel.id {
+                                if (model.state == 2) {
+                                    model.state = 1
+                                }else {
+                                    model.state = 2
+                                }
+                                self.dataArray.replaceObject(at: idx, with: model)
+                                
+                                self.tableView.reloadData()
+                                break
+                            }
+                        }
+                    }else if (status == .failed){
+                        self.network_type = .failed
+                        showMessage(message: "操作失败")
+                    }else if (status == .noNetwork){
+                        self.network_type = .noNetwork
+                        showMessage(message: "操作失败")
+                    }
+                }
+            }
+        }
+    }
+
+    
+    // MARK: -CNLiveGoodsManagerClassifyViewDelegate
+    func shopGoodsManagerClassifyViewDidSeleted(type: CNLiveGoodsManagerClassifyType) {
+        switch (type) {
+        case .newest:
+            self.sortType = "1"
+        case .priceMin:
+            self.sortType = "2"
+        case .priceMax:
+            self.sortType = "3"
+        }
+        self.tableView.mj_header?.beginRefreshing()
+    }
+
+    
     // MARK: - BtnAction
+    @objc func changeCancelAction() {
+        self.navigationController?.popViewController(animated: true)
+    }
     @objc func addBtnAction(){
+        navigationViewController().pushViewController(CNLiveShopNewProductController(), animated: pushAnimated)
+//        currentViewController()?.navigationController?.pushViewController(CNLiveShopNewProductController(), animated: pushAnimated)
+    }
+    @objc func searchBtnClick(){
+        navigationViewController().pushViewController(CNLiveShopGoodsSearchViewController(searchType: .defaultGoods), animated: pushAnimated)
+    }
+    
+    // MARK: - 商品编辑通知
+    @objc func goodsManageAddNotification(notification:Notification) {
+        self.getGoodsListApi(page: 1)
+    }
+    @objc func goodsManageEditNotification(notification:Notification){
+        let dict = (notification.userInfo ?? ["":""]) as! [String :Any]
+        let nModel = newDictionaryToModel(dict["data"] as! [String : Any], CNLiveShopGoodsListModel.self) as! CNLiveShopGoodsListModel
+        let dataArr = Array(self.dataArray)
+        
+        for (idx,mdl) in dataArr.enumerated() {
+            let model = mdl as! CNLiveShopGoodsListModel
+            if model.id == nModel.id {
+                model.title = nModel.title
+                model.simg = nModel.simg
+                model.price = nModel.price
+                model.ads = nModel.ads
+                model.groupid = nModel.groupid
+                model.shopid = nModel.shopid
+                model.category_id = nModel.category_id
+                model.state = nModel.state
+                model.count = nModel.count
+                model.ord = nModel.ord
+                self.dataArray.replaceObject(at: idx, with: model)
+                self.tableView.reloadData()
+                break
+            }
+        }
-        currentViewController()?.navigationController?.pushViewController(CNLiveShopNewProductController(), animated: true)
+    }
+
+    @objc func goodsManageDeleteNotification(notification:Notification){
+        let dict = (notification.userInfo ?? ["":""]) as! [String :Any]
+        let dataArr = Array(self.dataArray)
+        
+        for (_,mdl) in dataArr.enumerated() {
+            let model = mdl as! CNLiveShopGoodsListModel
+            if model.id == (dict["goodsId"] as! String){
+                self.dataArray.remove(model)
+                self.tableView.reloadData()
+                break
+            }
+        }
     }
     //MARK: - 网络请求获取商品列表
-    func getGoodsListApi(page:String)
+    func getGoodsListApi(page:NSInteger)
     {
         showLoading(message: "")
         CNLiveShopGoodListViewModel.requestGoodsList(shopId: DSUserInfoManager.shared.dsUserInfo.id, sortType: "1", page: page) { result, status in
             hiddenLoading()
             if status == .success{
                 let arr = result as! [CNLiveShopGoodsListModel]
-                if arr.count > 0
-                {
-                    self.dataArray.addObjects(from: result as! [CNLiveShopGoodsListModel])
-                    let newDataArray = NSMutableArray()
-                    for goodsModel in self.dataArray {
-                        if let model = goodsModel as? CNLiveShopGoodsListModel{
-                            newDataArray.add(model)
-                        }
-                    }
+                
+                if self.pageNum == 1 {
                     self.dataArray.removeAllObjects()
-                    self.dataArray.addObjects(from: newDataArray as! [Any])
-                    
+                    self.dataArray.addObjects(from: arr)
+                    if (self.dataArray.count > 0 && self.tableView.mj_header == nil && self.tableView.mj_footer == nil) {
+                        self.addRefreshView()
+                    }
+                }else if self.pageNum > 1 {
+                    self.dataArray.addObjects(from: arr)
+                }
+                self.tableView.reloadData()
+                self.tableView.mj_header?.endRefreshing()
+                self.tableView.mj_footer?.endRefreshing()
+                if (result as! Array<Any>).count == 0 {
+                    self.tableView.mj_footer?.endRefreshingWithNoMoreData()
                     self.tableView.reloadData()
-                    self.emptyLabel.isHidden = true
-                    self.classifyView.emptyView(isEmpty: false)
-                }else if arr.count == 0{
-                    //展示emptyView
-                    self.classifyView.emptyView(isEmpty: true)
-                    self.emptyLabel.isHidden = false
                 }
             }else if (status == .failed){
-//                self.NetApiStatus = .apiError
+                self.network_type = .failed
+                self.tableView.reloadEmptyDataSet()
             }else if (status == .noNetwork){
-                
-//                self.NetApiStatus = .notNetwork
+                self.network_type = .noNetwork
+                self.tableView.reloadEmptyDataSet()
             }
+            
         }
-//
     }
 }