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

# Conflicts: # metaCode.xcodeproj/project.pbxproj # metaCode/Classes/Other/AppDelegate.swift

Merge branch 'master' of http://bj.gitlab.cnlive.com/ios-team/CNLiveMateCode
# Conflicts: # metaCode.xcodeproj/project.pbxproj # metaCode/Classes/Other/AppDelegate.swift
liushiyu
2 parents c297edd8 81b032f8
Showing 69 changed files with 3031 additions and 95 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/Config/CNLiveConfigFontMacro.swift
metaCode/Classes/Environment/CNLiveEnvironment.swift
metaCode/Classes/Extensions/NSObject+CNLiveExtensions.swift
metaCode/Classes/Extensions/String+Extension.swift
metaCode/Classes/Extensions/UITableView+Extension.swift
metaCode/Classes/Extensions/UIView+CNLiveExtensions.swift
metaCode/Classes/Main/HomePage/Controller/CNLiveDownShopDetailController.swift
metaCode/Classes/Main/HomePage/Controller/CNLiveShopConsoleController.swift
metaCode/Classes/Main/HomePage/Controller/CNMetaCodeHomePageController.swift
metaCode/Classes/Main/HomePage/Controller/CNSlideBaseNavigationController.swift
metaCode/Classes/Main/HomePage/Controller/CNUpSlideCardPresentationController.swift
metaCode/Classes/Main/HomePage/Controller/CNUpSlideDetailViewController.swift
metaCode/Classes/Main/HomePage/Controller/CNUpSlideViewController.swift
metaCode/Classes/Main/HomePage/Controller/CNWebViewController.swift
metaCode/Classes/Main/HomePage/View/CNCustomIndexView.swift
@@ -42,10 +42,10 @@ target &#39;metaCode&#39; do
   #分类滚动切换视图
   pod 'JXSegmentedView', :git => 'https://gitee.com/mirrors/JXSegmentedView.git'
   pod 'JXPagingView/Paging'
-
-
+  #轮播图
+  pod 'FSPagerView', '~> 0.8.3'
   #应用调试工具
-  pod 'FWDebug', :configurations => ['Debug']
+#  pod 'FWDebug', :configurations => ['Debug']
   target 'metaCodeTests' do
     inherit! :search_paths
@@ -9,7 +9,32 @@
 /* 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 */; };
+		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 */; };
+		19BB1FDF2AEA3A450094D962 /* CNSlideBaseNavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19BB1FDE2AEA3A450094D962 /* CNSlideBaseNavigationController.swift */; };
+		19BB1FE12AEB5C220094D962 /* CNLiveShopConsoleController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19BB1FE02AEB5C220094D962 /* CNLiveShopConsoleController.swift */; };
+		19BB1FE32AEB8B7C0094D962 /* CNLiveShopConsoleViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19BB1FE22AEB8B7C0094D962 /* CNLiveShopConsoleViewModel.swift */; };
+		19BB1FE62AEB93B80094D962 /* CNLiveShopUserInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19BB1FE52AEB93B80094D962 /* CNLiveShopUserInfoModel.swift */; };
+		19BB1FE82AECAD060094D962 /* CNLiveShopConsoleModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19BB1FE72AECAD060094D962 /* CNLiveShopConsoleModel.swift */; };
+		19BB1FEA2AEF7B4A0094D962 /* CNLiveShopConsoleCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19BB1FE92AEF7B4A0094D962 /* CNLiveShopConsoleCell.swift */; };
+		19BB1FEC2AF0AB8E0094D962 /* CNLiveDownShopDetailController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19BB1FEB2AF0AB8E0094D962 /* CNLiveDownShopDetailController.swift */; };
+		19BB1FEE2AF0E1EC0094D962 /* CNLiveShopDetailViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19BB1FED2AF0E1EC0094D962 /* CNLiveShopDetailViewModel.swift */; };
+		19BB1FF02AF0E5B30094D962 /* CNLiveShopDetailModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19BB1FEF2AF0E5B30094D962 /* CNLiveShopDetailModel.swift */; };
+		19BB1FF22AF21A950094D962 /* CNLliveShopDetailBannerCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19BB1FF12AF21A950094D962 /* CNLliveShopDetailBannerCell.swift */; };
+		19BB202B2AF382150094D962 /* CNLiveAdaptTool.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19BB202A2AF382150094D962 /* CNLiveAdaptTool.swift */; };
+		19CC4D472ADD006600308E2A /* CNDownSlideSingleCourseCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19CC4D462ADD006600308E2A /* CNDownSlideSingleCourseCell.swift */; };
+		19CC4D492ADD06C500308E2A /* UITableView+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19CC4D482ADD06C500308E2A /* UITableView+Extension.swift */; };
+		19CC4D4B2ADD086F00308E2A /* CNUpSlideDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19CC4D4A2ADD086F00308E2A /* CNUpSlideDetailViewController.swift */; };
+		19CC4D4F2ADD0FC200308E2A /* CNUpSlideDetailScrollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19CC4D4E2ADD0FC200308E2A /* CNUpSlideDetailScrollView.swift */; };
+		19CC4D522ADD129800308E2A /* CNUpSlideAnimationTransition.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19CC4D512ADD129800308E2A /* CNUpSlideAnimationTransition.swift */; };
+		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 */; };
 		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 */; };
+		19FA201B2AE60423001F7186 /* CNLiveDownSlideModelLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19FA201A2AE60423001F7186 /* CNLiveDownSlideModelLayout.swift */; };
 		1DD2808DF02C120276F99F4D /* Pods_metaCode.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F1C55A719CFEE073C06D37CE /* Pods_metaCode.framework */; };
 		7905BB492AB0588B0089BC50 /* CNLiveMineAuthResultViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7905BB482AB0588B0089BC50 /* CNLiveMineAuthResultViewController.swift */; };
 		790B1FB42A4153E90074CF00 /* CNLiveMineBaseModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 790B1FB32A4153E90074CF00 /* CNLiveMineBaseModel.swift */; };
@@ -127,7 +152,32 @@
 		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>"; };
+		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>"; };
+		19BB1FDE2AEA3A450094D962 /* CNSlideBaseNavigationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNSlideBaseNavigationController.swift; sourceTree = "<group>"; };
+		19BB1FE02AEB5C220094D962 /* CNLiveShopConsoleController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopConsoleController.swift; sourceTree = "<group>"; };
+		19BB1FE22AEB8B7C0094D962 /* CNLiveShopConsoleViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopConsoleViewModel.swift; sourceTree = "<group>"; };
+		19BB1FE52AEB93B80094D962 /* CNLiveShopUserInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopUserInfoModel.swift; sourceTree = "<group>"; };
+		19BB1FE72AECAD060094D962 /* CNLiveShopConsoleModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopConsoleModel.swift; sourceTree = "<group>"; };
+		19BB1FE92AEF7B4A0094D962 /* CNLiveShopConsoleCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopConsoleCell.swift; sourceTree = "<group>"; };
+		19BB1FEB2AF0AB8E0094D962 /* CNLiveDownShopDetailController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveDownShopDetailController.swift; sourceTree = "<group>"; };
+		19BB1FED2AF0E1EC0094D962 /* CNLiveShopDetailViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopDetailViewModel.swift; sourceTree = "<group>"; };
+		19BB1FEF2AF0E5B30094D962 /* CNLiveShopDetailModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopDetailModel.swift; sourceTree = "<group>"; };
+		19BB1FF12AF21A950094D962 /* CNLliveShopDetailBannerCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLliveShopDetailBannerCell.swift; sourceTree = "<group>"; };
+		19BB202A2AF382150094D962 /* CNLiveAdaptTool.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveAdaptTool.swift; sourceTree = "<group>"; };
+		19CC4D462ADD006600308E2A /* CNDownSlideSingleCourseCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNDownSlideSingleCourseCell.swift; sourceTree = "<group>"; };
+		19CC4D482ADD06C500308E2A /* UITableView+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UITableView+Extension.swift"; sourceTree = "<group>"; };
+		19CC4D4A2ADD086F00308E2A /* CNUpSlideDetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNUpSlideDetailViewController.swift; sourceTree = "<group>"; };
+		19CC4D4E2ADD0FC200308E2A /* CNUpSlideDetailScrollView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNUpSlideDetailScrollView.swift; sourceTree = "<group>"; };
+		19CC4D512ADD129800308E2A /* CNUpSlideAnimationTransition.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNUpSlideAnimationTransition.swift; sourceTree = "<group>"; };
+		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>"; };
 		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>"; };
+		19FA201A2AE60423001F7186 /* CNLiveDownSlideModelLayout.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveDownSlideModelLayout.swift; sourceTree = "<group>"; };
 		54E09C540E13D78166D71395 /* Pods_metaCodeTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_metaCodeTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		63D879B49B1E42F1584DD75E /* Pods_metaCode_metaCodeUITests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_metaCode_metaCodeUITests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		67F8190701D1AB7F7724E8BA /* Pods-metaCodeTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-metaCodeTests.release.xcconfig"; path = "Target Support Files/Pods-metaCodeTests/Pods-metaCodeTests.release.xcconfig"; sourceTree = "<group>"; };
@@ -263,6 +313,28 @@
 /* End PBXFrameworksBuildPhase section */
 /* Begin PBXGroup section */
+		19BB1FE42AEB93850094D962 /* Model */ = {
+			isa = PBXGroup;
+			children = (
+				1926C2902AE0FD4500C71DC3 /* CNLiveDownSlideModel.swift */,
+				19BB1FE52AEB93B80094D962 /* CNLiveShopUserInfoModel.swift */,
+				19BB1FE72AECAD060094D962 /* CNLiveShopConsoleModel.swift */,
+				19BB1FEF2AF0E5B30094D962 /* CNLiveShopDetailModel.swift */,
+			);
+			path = Model;
+			sourceTree = "<group>";
+		};
+		19CC4D502ADD126D00308E2A /* Util */ = {
+			isa = PBXGroup;
+			children = (
+				19CC4D512ADD129800308E2A /* CNUpSlideAnimationTransition.swift */,
+				19FA201A2AE60423001F7186 /* CNLiveDownSlideModelLayout.swift */,
+				19D2CE622AE8B65D00691757 /* CNLiveDownSlideTool.swift */,
+				19BB202A2AF382150094D962 /* CNLiveAdaptTool.swift */,
+			);
+			path = Util;
+			sourceTree = "<group>";
+		};
 		20238A324E444EF8C813D9FA /* Pods */ = {
 			isa = PBXGroup;
 			children = (
@@ -290,6 +362,8 @@
 				7C83B4432A541F36004BF4A4 /* NSDate+CNLiveExtensions.swift */,
 				79E496E22AB9357000127BF8 /* UITableViewCell+CNLiveExtension.swift */,
 				79E496E72AB9674300127BF8 /* NSMutableAttributedString+CNLiveExtensions.swift */,
+				19CC4D482ADD06C500308E2A /* UITableView+Extension.swift */,
+				19CC4D552ADD19C200308E2A /* String+Extension.swift */,
 			);
 			path = Extensions;
 			sourceTree = "<group>";
@@ -599,6 +673,9 @@
 			isa = PBXGroup;
 			children = (
 				7C83B43D2A52B8BA004BF4A4 /* CNHomePageViewModel.swift */,
+				1926C28E2AE0D76C00C71DC3 /* CNLiveDownSlideViewModel.swift */,
+				19BB1FE22AEB8B7C0094D962 /* CNLiveShopConsoleViewModel.swift */,
+				19BB1FED2AF0E1EC0094D962 /* CNLiveShopDetailViewModel.swift */,
 			);
 			name = ViewModel;
 			path = HomePage/ViewModel;
@@ -607,6 +684,8 @@
 		7CD675212A26F844008354C1 /* HomePage */ = {
 			isa = PBXGroup;
 			children = (
+				19CC4D502ADD126D00308E2A /* Util */,
+				19BB1FE42AEB93850094D962 /* Model */,
 				7C83B43C2A52B899004BF4A4 /* ViewModel */,
 				7CD6754D2A2840B9008354C1 /* Controller */,
 				7CD675232A26F8F8008354C1 /* View */,
@@ -627,6 +706,12 @@
 				7C4931372A307BDB000E44B4 /* CNHomePageGuideView.swift */,
 				7C27032F2A36CBE30061EC50 /* CNCertificationView.swift */,
 				19F1C2322AB5728B0083D06C /* CNIDCardView.swift */,
+				19FA20162AE22D3C001F7186 /* CNLiveDownSlideRecommendCell.swift */,
+				19FA20182AE22D98001F7186 /* CNLiveDownSlideTodayRecommendCell.swift */,
+				19CC4D462ADD006600308E2A /* CNDownSlideSingleCourseCell.swift */,
+				19CC4D4E2ADD0FC200308E2A /* CNUpSlideDetailScrollView.swift */,
+				19BB1FE92AEF7B4A0094D962 /* CNLiveShopConsoleCell.swift */,
+				19BB1FF12AF21A950094D962 /* CNLliveShopDetailBannerCell.swift */,
 			);
 			name = View;
 			path = HomePage/View;
@@ -635,8 +720,14 @@
 		7CD6754D2A2840B9008354C1 /* Controller */ = {
 			isa = PBXGroup;
 			children = (
+				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;
@@ -944,32 +1035,44 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				19BB1FE82AECAD060094D962 /* CNLiveShopConsoleModel.swift in Sources */,
+				19BB1FEE2AF0E1EC0094D962 /* CNLiveShopDetailViewModel.swift in Sources */,
 				19F1C2332AB5728B0083D06C /* CNIDCardView.swift in Sources */,
 				7CD675292A270F6A008354C1 /* WJColorChange.m in Sources */,
 				79F4B11C2A33036E00993C03 /* CNLiveMineInfoAlertView.swift in Sources */,
 				79BB96A82AF223FB00AEA4AC /* CNLiveConfigAlertManager.swift in Sources */,
+				19BB1FF02AF0E5B30094D962 /* CNLiveShopDetailModel.swift in Sources */,
 				796398942A260C0100D045EB /* AppDelegate.swift in Sources */,
 				7989B5C72A4BDC7200A19B10 /* CNLiveMineEarnListViewController.swift in Sources */,
 				79396EF12A31C21B0053E1AF /* CNLiveInfoShowViewController.swift in Sources */,
+				192336EB2AD9224300D47CD4 /* CNUpSlideViewController.swift in Sources */,
 				7963989D2A260E6200D045EB /* CNLiveBaseViewController.swift in Sources */,
 				798A44FB2A30999900815935 /* CNLiveAlertTool.swift in Sources */,
 				790D01A52A2DF65E00C5978D /* CNLiveLoginPickerView.swift in Sources */,
 				79BA085D2AB18E8300D01875 /* CNLiveSaveAuthDB.swift in Sources */,
 				79282A3C2A2EDC2500B5F8CF /* NSString+CNLiveExtensions.swift in Sources */,
+				19D2CE632AE8B65D00691757 /* CNLiveDownSlideTool.swift in Sources */,
 				790B1FB82A41B6A60074CF00 /* CNLiveMineMessageViewController.swift in Sources */,
+				19BB202B2AF382150094D962 /* CNLiveAdaptTool.swift in Sources */,
 				798A44F22A30674200815935 /* CNLiveMineSubBodyListView.swift in Sources */,
 				799172382AF090CD00DC01A8 /* CNLiveShopBodyListView.swift in Sources */,
 				790D01822A2D88FC00C5978D /* CNLiveConfigMacro.swift in Sources */,
+				19CC4D4B2ADD086F00308E2A /* CNUpSlideDetailViewController.swift in Sources */,
 				7C83B4402A52BB2B004BF4A4 /* CNGlobalEnum.swift in Sources */,
 				7C83B4442A541F36004BF4A4 /* NSDate+CNLiveExtensions.swift in Sources */,
 				7CD675482A274167008354C1 /* PGIndexBannerSubiew.m in Sources */,
 				790D019F2A2DD66E00C5978D /* CNLiveLoginViewModel.swift in Sources */,
+				1926C2912AE0FD4500C71DC3 /* CNLiveDownSlideModel.swift in Sources */,
 				7C7C62F62A4D72E9007A912E /* CNLiveIdentityDB.swift in Sources */,
+				19CC4D4F2ADD0FC200308E2A /* CNUpSlideDetailScrollView.swift in Sources */,
 				79EABB892AB4497700F3A4E2 /* CNLiveSaveStandDB.swift in Sources */,
 				790B1FB62A41938F0074CF00 /* UIImage+CNLiveExtensions.swift in Sources */,
+				19BB1FEA2AEF7B4A0094D962 /* CNLiveShopConsoleCell.swift in Sources */,
 				790D019D2A2DCBD000C5978D /* UIView+CNLiveExtensions.swift in Sources */,
 				790B1FB62A41938F0074CF00 /* UIImage+CNLiveExtensions.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 */,
 				799172342AF08D3200DC01A8 /* CNLiveShopViewModel.swift in Sources */,
@@ -977,6 +1080,7 @@
 				790B1FB62A41938F0074CF00 /* UIImage+CNLiveExtensions.swift in Sources */,
 				790D019D2A2DCBD000C5978D /* UIView+CNLiveExtensions.swift in Sources */,
 				79E496E82AB9674300127BF8 /* NSMutableAttributedString+CNLiveExtensions.swift in Sources */,
+				19CC4D472ADD006600308E2A /* CNDownSlideSingleCourseCell.swift in Sources */,
 				79E496E32AB9357000127BF8 /* UITableViewCell+CNLiveExtension.swift in Sources */,
 				7C83B4422A541EBF004BF4A4 /* CALayer+CNLiveExtensions.swift in Sources */,
 				798A44F72A3077ED00815935 /* CNLiveHotButton.swift in Sources */,
@@ -985,9 +1089,12 @@
 				7CD675522A29C04B008354C1 /* CNLiveConfigstant.swift in Sources */,
 				79282A402A2F055100B5F8CF /* CNLiveConfigUserInfo.swift in Sources */,
 				7C83B43E2A52B8BA004BF4A4 /* CNHomePageViewModel.swift in Sources */,
+				19BB1FDF2AEA3A450094D962 /* CNSlideBaseNavigationController.swift in Sources */,
+				19BB1FE12AEB5C220094D962 /* CNLiveShopConsoleController.swift in Sources */,
 				7C4931382A307BDB000E44B4 /* CNHomePageGuideView.swift in Sources */,
 				7CD6753E2A2740B0008354C1 /* CNUpSlideView.swift in Sources */,
 				7CD675402A2740B0008354C1 /* CNDownSlideView.swift in Sources */,
+				19BB1FE32AEB8B7C0094D962 /* CNLiveShopConsoleViewModel.swift in Sources */,
 				792E57D92A3AA2F2005834DB /* CNLiveCommonBaseModel.swift in Sources */,
 				7CD6753E2A2740B0008354C1 /* CNUpSlideView.swift in Sources */,
 				7CD675402A2740B0008354C1 /* CNDownSlideView.swift in Sources */,
@@ -995,16 +1102,20 @@
 				7C2703362A3AFD3A0061EC50 /* CNLiveEnvironment.swift in Sources */,
 				798A44FD2A309EBA00815935 /* CNLiveTypeFeedBackViewController.swift in Sources */,
 				79656E382AAEBA8E00119A61 /* CNLiveMineInputViewController.swift in Sources */,
+				19CC4D522ADD129800308E2A /* CNUpSlideAnimationTransition.swift in Sources */,
 				7CD6754F2A2840B9008354C1 /* CNMetaCodeHomePageController.swift in Sources */,
 				7989B5C52A4BDC6000A19B10 /* CNLiveMineEarnViewController.swift in Sources */,
 				792E57DB2A3AE9F4005834DB /* CNLiveCommonQiniuTool.swift in Sources */,
+				19BB1FE62AEB93B80094D962 /* CNLiveShopUserInfoModel.swift in Sources */,
 				7CD675472A274167008354C1 /* NewPagedFlowView.m in Sources */,
 				79F4B11A2A32F21400993C03 /* CNLiveMineNickViewController.swift in Sources */,
 				798A44FF2A30A0A800815935 /* CNLiveInputFeedBackViewController.swift in Sources */,
 				79282A442A2F1C1E00B5F8CF /* CNLiveLoginAuthView.swift in Sources */,
 				79BB96A62AF21E2800AEA4AC /* CNLiveShopOrderDetailViewController.swift in Sources */,
 				7C2703302A36CBE30061EC50 /* CNCertificationView.swift in Sources */,
+				19CC4D542ADD163D00308E2A /* CNUpSlideCardPresentationController.swift in Sources */,
 				790D01A32A2DDBA300C5978D /* CNLiveConfigManager.swift in Sources */,
+				19CC4D492ADD06C500308E2A /* UITableView+Extension.swift in Sources */,
 				7C2703332A36CC660061EC50 /* CNLiveGlobalBlock.swift in Sources */,
 				7987BF3D2A497644000A1ABC /* CNLiveMineQuestViewController.swift in Sources */,
 				798A44EA2A30135D00815935 /* CNLiveMineBodyListView.swift in Sources */,
@@ -1013,14 +1124,18 @@
 				79A68C4A2A26E6CE00DC3B43 /* (null) in Sources */,
 				790D01852A2D89E100C5978D /* UIColor+CNLiveExtensions.swift in Sources */,
 				79396EED2A319F220053E1AF /* NSObject+CNLiveExtensions.swift in Sources */,
+				19FA201B2AE60423001F7186 /* CNLiveDownSlideModelLayout.swift in Sources */,
 				7C4931312A2F142F000E44B4 /* CNHomePageBackgroupView.swift in Sources */,
+				19BB1FF22AF21A950094D962 /* CNLliveShopDetailBannerCell.swift in Sources */,
 				790D018B2A2D8B3300C5978D /* CNLiveLoginViewController.swift in Sources */,
+				19CC4D562ADD19C200308E2A /* String+Extension.swift in Sources */,
 				7905BB492AB0588B0089BC50 /* CNLiveMineAuthResultViewController.swift in Sources */,
 				798A44EC2A302DBE00815935 /* CNLiveMineAddInfoViewController.swift in Sources */,
 				7CD675422A2740F8008354C1 /* CNCustomIndexView.swift in Sources */,
 				79BB96AA2AF2330900AEA4AC /* CNLiveShopBodyDetailView.swift in Sources */,
 				790D01912A2DAC5E00C5978D /* CNLiveConfigFontMacro.swift in Sources */,
 				790D01852A2D89E100C5978D /* UIColor+CNLiveExtensions.swift in Sources */,
+				19FA20192AE22D98001F7186 /* CNLiveDownSlideTodayRecommendCell.swift in Sources */,
 				790B1FB42A4153E90074CF00 /* CNLiveMineBaseModel.swift in Sources */,
 				7978A8432A396632007C86B8 /* CNLiveMineViewModel.swift in Sources */,
 				798A44EE2A305AAC00815935 /* CNLiveBaseNavigationController.swift in Sources */,
@@ -1029,6 +1144,7 @@
 				79F4B1162A32B96B00993C03 /* CNLiveMineInfoViewController.swift in Sources */,
 				7CD6753F2A2740B0008354C1 /* CNDownSlideViewRemindView.swift in Sources */,
 				7CD6753C2A2740B0008354C1 /* CNUpSlideViewRemindView.swift in Sources */,
+				19BB1FEC2AF0AB8E0094D962 /* CNLiveDownShopDetailController.swift in Sources */,
 				798A44E82A30134400815935 /* CNLiveMineHeaderView.swift in Sources */,
 				7C49312D2A2DB9FA000E44B4 /* UITabBar+CNLiveExtensions.swift in Sources */,
 				790D019A2A2DCAE400C5978D /* CNLiveViewController.swift in Sources */,
@@ -11,7 +11,6 @@ class CNLiveBaseNavigationController : UINavigationController, UIGestureRecogniz
     override func viewDidLoad() {
         super.viewDidLoad()
-        
         guard let targets  = interactivePopGestureRecognizer?.value(forKey: "_targets") as? [NSObject] else {return}
         let targetObjc = targets[0]
         let target = targetObjc.value(forKey: "target")
@@ -36,12 +36,12 @@ class CNLiveBaseTabBarViewController: UITabBarController
         self.setupBackgroup()
     }
-    override func viewWillAppear(_ animated: Bool) {
-        super.viewWillAppear(animated)
-        
-        self.selectedIndex = 1
-        
-    }
+//    override func viewWillAppear(_ animated: Bool) {
+//        super.viewWillAppear(animated)
+//        
+//        self.selectedIndex = 1
+//        
+//    }
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
         print("获取用户用户数据=====>\(UserInfoManager.shared.userInfo.uid)")
@@ -8,7 +8,7 @@
 import UIKit
 import Foundation
-class CNLiveBaseViewController: UIViewController {
+class CNLiveBaseViewController: UIViewController  {
     static let kTopNavLeftRightOffset = 6.0
     /// topNavView的高度 默认高度为 get_system_nav_height()
@@ -215,12 +215,23 @@ class CNLiveBaseViewController: UIViewController {
         leftBtnWhite = false
     }
+    
     @objc func ClickBackBtn() {
-        if (self.presentingViewController != nil) {
-            self.dismiss(animated: true)
+        let viewControllers = self.navigationController?.viewControllers
+        if viewControllers!.count > 1 {
+            if viewControllers?.last == self {
+                self.navigationController!.popViewController(animated: true)
+            }
         }else{
-            self.navigationController!.popViewController(animated: true)
+            if (self.presentingViewController != nil) {
+                self.dismiss(animated: true)
+            }
         }
+//        if (self.presentingViewController != nil) {
+//            self.dismiss(animated: true)
+//        }else{
+//            self.navigationController!.popViewController(animated: true)
+//        }
     }
     @objc func topNavViewTap() {
@@ -61,6 +61,7 @@ let Font_17 = Font(17)
 let Font_18 = Font(18)
 let Font_19 = Font(19)
 let Font_20 = Font(20)
+let Font_21 = Font(21)
 let Font_25 = Font(25)
 let Font_30 = Font(30)
@@ -77,6 +78,7 @@ let Font_17_Fit = Font(17 * FontFit)
 let Font_18_Fit = Font(18 * FontFit)
 let Font_19_Fit = Font(19 * FontFit)
 let Font_20_Fit = Font(20 * FontFit)
+let Font_21_Fit = Font(21 * FontFit)
 let Font_25_Fit = Font(25 * FontFit)
 let Font_30_Fit = Font(30 * FontFit)
@@ -93,6 +95,8 @@ let BoldFont_17 = BoldFont(17)
 let BoldFont_18 = BoldFont(18)
 let BoldFont_19 = BoldFont(19)
 let BoldFont_20 = BoldFont(20)
+let BoldFont_21 = BoldFont(21)
+let BoldFont_24 = BoldFont(24)
 let BoldFont_25 = BoldFont(25)
 let BoldFont_30 = BoldFont(30)
@@ -31,8 +31,10 @@ let APPBaseWjjUrl: String = CNLiveEnvironmentManager.shared.base_wjj_url
 let APPBaseWjjBUrl: String = CNLiveEnvironmentManager.shared.base_wjj_b_url
 /// 网家家内电商接口
 let APPBaseWjjShopUrl: String = CNLiveEnvironmentManager.shared.base_mjj_shop_url
-
-
+/// 商家版电商接口
+let APPBaseShopUrl: String = CNLiveEnvironmentManager.shared.base_shop_url
+/// cms接口
+let APPBaseCMSUrl: String = CNLiveEnvironmentManager.shared.base_cms_url
 ///当前APP的环境
 let APPCurrentEnvironment: CNLiveEnvironment = CNLiveEnvironmentManager.shared.currentEnvironment
@@ -78,8 +80,12 @@ class CNLiveEnvironmentManager: NSObject{
     var img_token_url: String
     /// 网家家电商域名请求
     var base_mjj_shop_url: String
+    /// 电商域名请求
+    var base_shop_url: String
     /// 元码webViewUA设置
     var base_web_UA: String = "yuanma"
+    /// cms域名请求
+    var base_cms_url: String
     ///当前环境
     var currentEnvironment: CNLiveEnvironment
@@ -99,6 +105,8 @@ class CNLiveEnvironmentManager: NSObject{
         self.base_wjj_url = ""
         self.base_wjj_b_url = ""
         self.base_mjj_shop_url = ""
+        self.base_shop_url = ""
+        self.base_cms_url = ""
         self.currentEnvironment = .development
     }
     //重新copy 和 mutableCopy 方法
@@ -140,6 +148,8 @@ class CNLiveEnvironmentManager: NSObject{
         self.base_wjj_b_url = "https://managemall.cnlive.com:8080"
         self.base_wjj_url = "https://apiwjj.cnlive.com"
         self.base_mjj_shop_url = "https://manageshop.cnlive.com"
+        self.base_shop_url = "https://managemall.cnlive.com:8080"
+        self.base_cms_url = "https://cmsapi.cnlive.com"
     }
     //testFlight 环境配置
     func testFlightEnvironment(){
@@ -156,6 +166,8 @@ class CNLiveEnvironmentManager: NSObject{
         self.base_wjj_b_url = "https://managemall.cnlive.com:8080"
         self.base_wjj_url = "https://apiwjj.cnlive.com"
         self.base_mjj_shop_url = "https://manageshop.cnlive.com"
+        self.base_shop_url = "https://managemall.cnlive.com:8080"
+        self.base_cms_url = "https://cmsapi.cnlive.com"
     }
     //production 生产环境配置
     func productionEnvironment(){
@@ -172,6 +184,8 @@ class CNLiveEnvironmentManager: NSObject{
         self.base_wjj_b_url = "https://managemall.cnlive.com:8080"
         self.base_wjj_url = "https://apiwjj.cnlive.com"
         self.base_mjj_shop_url = "https://manageshop.cnlive.com"
+        self.base_shop_url = "https://managemall.cnlive.com:8080"
+        self.base_cms_url = "https://cmsapi.cnlive.com"
     }
 }
@@ -45,7 +45,6 @@ private func currentVC(_ vc :UIViewController?) -&gt; UIViewController? {
     }
  }
-
 /// 弹框提示
 /// - Parameter message: 内容提示
 func showMessage(message: String) {
@@ -138,7 +137,7 @@ func jsonToModel(_ jsonStr:String,_ modelType:HandyJSON.Type) -&gt; BaseModel {
 /**
  *  Json转数组对象
  */
-func jsonArrayToModel(_ jsonArrayStr:String, _ modelType:HandyJSON.Type,_ path: String) ->[BaseModel] {
+func jsonArrayToModel(_ jsonArrayStr:String, _ modelType:HandyJSON.Type) ->[BaseModel] {
     if jsonArrayStr == "" || jsonArrayStr.count == 0 {
         #if DEBUG
             print("jsonToModelArray:字符串为空")
@@ -149,12 +148,24 @@ func jsonArrayToModel(_ jsonArrayStr:String, _ modelType:HandyJSON.Type,_ path: 
     let data = jsonArrayStr.data(using: String.Encoding.utf8)
     let peoplesArray = try! JSONSerialization.jsonObject(with:data!, options: JSONSerialization.ReadingOptions()) as? [AnyObject]
     for people in peoplesArray! {
-        modelArray.append(dictionaryToModel(people as! [String : Any], modelType,path))
+        modelArray.append(newDictionaryToModel(people as! [String : Any], modelType))
     }
     return modelArray
 }
 /**
+ *  (新)字典转对象
+ */
+func newDictionaryToModel(_ dictionStr:[String:Any],_ modelType:HandyJSON.Type) -> BaseModel {
+    if dictionStr.count == 0 {
+        #if DEBUG
+            print("dictionaryToModel:字符串为空")
+        #endif
+        return BaseModel()
+    }
+    return modelType.deserialize(from: dictionStr) as! BaseModel
+}
+/**
  *  字典转对象
  */
 func dictionaryToModel(_ dictionStr:[String:Any],_ modelType:HandyJSON.Type,_ path: String) -> BaseModel {
+//
+//  String+Extension.swift
+//  metaCode
+//
+//  Created by zx on 2023/10/16.
+//
+
+
+import UIKit
+
+
+extension String {
+    /// Calculate text's height from `width` and `front`.
+    func calculateHeightWith(width: CGFloat, font: UIFont)-> CGFloat {
+        let attr = [NSAttributedString.Key.font: font]
+        let maxSize: CGSize = CGSize(width: width, height: CGFloat(MAXFLOAT))
+        let option = NSStringDrawingOptions.usesLineFragmentOrigin
+        return self.boundingRect(with: (maxSize), options: option, attributes: attr, context: nil).size.height
+    }
+}
+//
+//  UITableView+Extension.swift
+//  metaCode
+//
+//  Created by zx on 2023/10/16.
+//
+
+
+import UIKit
+
+extension UITableView {
+    // 注册有nib的cell
+    func ut_registerNibCell<T>(_ cellType: T.Type) where T: UITableViewCell {
+        let nib = UINib(nibName: "\(cellType)", bundle: nil)
+        let identifier = "\(cellType)"
+        register(nib, forCellReuseIdentifier: identifier)
+    }
+    // 注册无nib的cell
+    func ut_registerClassCell<T>(_ cellType: T.Type) where T: UITableViewCell {
+        let identifier = "\(cellType)"
+        register(cellType, forCellReuseIdentifier: identifier)
+    }
+    // 从缓存池池出队已经存在的 cell
+    func ut_dequeueReusable<T: UITableViewCell>(_ cell: T.Type, for indexPath: IndexPath) -> T {
+        let cell = dequeueReusableCell(withIdentifier: "\(T.self)", for: indexPath) as! T
+        return cell
+    }
+    
+    // 注册有nib的headerFooterView
+    func ut_registerNibHeaderFooterView<T>(_ viewType: T.Type) where T: UITableViewHeaderFooterView {
+        let nib = UINib(nibName: "\(viewType)", bundle: nil)
+        let identifier = "\(viewType)"
+        register(nib, forHeaderFooterViewReuseIdentifier: identifier)
+    }
+    
+    // 注册无nib的headerFooterView
+    func ut_registerClassHeaderFooterView<T>(_ viewType: T.Type) where T: UITableViewHeaderFooterView {
+        let identifier = "\(viewType)"
+        register(viewType, forHeaderFooterViewReuseIdentifier: identifier)
+    }
+    
+    // 从缓存池里取出已注册的headerFooterView
+    func ut_dequeueReusableHeaderFooterView<T: UITableViewHeaderFooterView>(_ view: T.Type) -> T {
+        let headerFooterView = dequeueReusableHeaderFooterView(withIdentifier: "\(T.self)") as! T
+        return headerFooterView
+    }
+}
+
+extension UICollectionView {
+    // 注册有nib的cell
+    func ut_registerNibCell<T>(_ cellType: T.Type) where T: UICollectionViewCell {
+        let nib = UINib(nibName: "\(cellType)", bundle: nil)
+        let identifier = "\(cellType)"
+        register(nib, forCellWithReuseIdentifier: identifier)
+    }
+    // 注册无nib的cell
+    func ut_registerClassCell<T>(_ cellType: T.Type) where T: UICollectionViewCell {
+        let identifier = "\(cellType)"
+        register(cellType, forCellWithReuseIdentifier: identifier)
+    }
+    // 从缓存池池出队已经存在的 cell
+    func ut_dequeueReusable<T: UICollectionViewCell>(_ cell: T.Type, for indexPath: IndexPath) -> T {
+        let cell = dequeueReusableCell(withReuseIdentifier: "\(T.self)", for: indexPath) as! T
+        return cell
+    }
+}
@@ -237,4 +237,14 @@ extension UIView {
             return self.frame.size
         }
     }
+    
+    // Constrain 4 edges of `self` to specified `view`.
+    func edges(to view: UIView, top: CGFloat=0, left: CGFloat=0, bottom: CGFloat=0, right: CGFloat=0) {
+        NSLayoutConstraint.activate([
+            self.leftAnchor.constraint(equalTo: view.leftAnchor, constant: left),
+            self.rightAnchor.constraint(equalTo: view.rightAnchor, constant: right),
+            self.topAnchor.constraint(equalTo: view.topAnchor, constant: top),
+            self.bottomAnchor.constraint(equalTo: view.bottomAnchor, constant: bottom)
+            ])
+    }
 }
+//
+//  CNLiveDownShopDetailController.swift
+//  metaCode
+//
+//  Created by zx on 2023/10/31.
+//
+
+import Foundation
+
+class CNLiveDownShopDetailController:CNLiveBaseViewController, UICollectionViewDelegate, UICollectionViewDataSource,UICollectionViewDelegateFlowLayout{
+    
+    let kCNLiveShopDetailDefaultCellID = "kCNLiveShopDetailDefaultCellID"
+    let kCNLiveShopDetailHeaderViewID = "kCNLiveShopDetailHeaderViewID"
+    
+    let kCNLiveShopDetailBannerCellID = "kCNLiveShopDetailBannerCellID"
+    
+    
+    lazy var shopDetailModel: CNLiveShopDetailModel = {
+        let shopDetailModel = CNLiveShopDetailModel()
+        return shopDetailModel
+    }()
+    
+    lazy var collectionView: UICollectionView = {
+        let layout = UICollectionViewFlowLayout.init()
+        let collectionView = UICollectionView(frame: .zero, collectionViewLayout: layout)
+        collectionView.delegate = self
+        collectionView.dataSource = self
+        collectionView.backgroundColor = .white
+//        collectionView.register(CNLiveShopConsoleHeaderView.self, forSupplementaryViewOfKind: UICollectionView.elementKindSectionHeader, withReuseIdentifier: kCNLiveShopConsoleCollectionReusableHeaderViewID)
+        collectionView.register(CNLliveShopDetailBannerCell.self, forCellWithReuseIdentifier: kCNLiveShopDetailBannerCellID)
+        collectionView.register(UICollectionViewCell.self, forCellWithReuseIdentifier: kCNLiveShopDetailDefaultCellID)
+        
+        return collectionView
+    }()
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        self.getShopDetailApi()
+        
+        self.view.addSubview(collectionView)
+        collectionView.snp.makeConstraints { make in
+            make.top.equalToSuperview().offset(KNavigationHeight)
+            make.left.bottom.right.equalToSuperview()
+        }
+    }
+    
+    // MARK: - UICollectionViewDelegate
+    func numberOfSections(in collectionView: UICollectionView) -> Int {
+        if self.shopDetailModel.is_seller != nil{
+            if self.shopDetailModel.is_seller == true{
+                return 5
+            }else{//非商家,不处理
+                return 3
+            }
+        }else{
+            return 1
+        }
+    }
+    func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
+        if self.shopDetailModel.is_seller != nil {
+            if (self.shopDetailModel.is_seller == true) {
+                if (section == 4) {
+                    let count = self.shopDetailModel.dynamic.count
+                    return count == 0 ? 1 : count
+                }else {
+                    return 1
+                }
+            }else {
+                return 1
+            }
+        }else{
+            return 1
+        }
+    }
+//    func collectionView(_ collectionView: UICollectionView, viewForSupplementaryElementOfKind kind: String, at indexPath: IndexPath) -> UICollectionReusableView {
+//        if (kind == UICollectionView.elementKindSectionHeader){
+//            let headerView:CNLiveShopConsoleHeaderView = collectionView .dequeueReusableSupplementaryView(ofKind: UICollectionView.elementKindSectionHeader, withReuseIdentifier: kCNLiveShopDetailHeaderViewID, for: indexPath) as! CNLiveShopConsoleHeaderView
+//
+//            return headerView
+//        }else{
+//             return
+//    }
+    func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
+        switch indexPath.section {
+        case 0:
+            let cell = collectionView.dequeueReusableCell(withReuseIdentifier: kCNLiveShopDetailBannerCellID, for: indexPath) as! CNLliveShopDetailBannerCell
+
+            cell.shopDetailModel = self.shopDetailModel
+            return cell
+//        case 1:
+//            
+//        case 2:
+//        case 3:
+//        case 4:
+        default:
+            let cell = collectionView.dequeueReusableCell(withReuseIdentifier: kCNLiveShopDetailDefaultCellID, for: indexPath)
+            return cell
+        }
+        
+    }
+    
+    // MARK: - UICollectionViewDelegateFlowLayout
+    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
+        if (self.shopDetailModel.is_seller != nil && self.shopDetailModel.is_seller == true) {
+            switch (indexPath.section) {
+                case 0:
+                    return CGSize(width: KSreenWidth, height: CNLiveAdaptTool.adaptLength(length: 210))
+                case 1:
+                    return CGSize(width: KSreenWidth, height: 50)
+                case 2:
+                    return CGSize(width: KSreenWidth, height: 50)
+                case 3:
+                    return CGSize(width: KSreenWidth, height: 50)
+                case 4:
+                    return CGSize(width: KSreenWidth, height: 50)
+                default:
+                    return CGSizeZero
+            }
+        }else {
+            return CGSizeZero
+//            switch (indexPath.section) {
+//                case 0:
+//                {
+//                    if (self.mainHPModel.is_show_btn) {
+//                        return CGSizeMake(self.view.width, DS_adapt_length(262));
+//                    }else {
+//                        return CGSizeMake(self.view.width, DS_adapt_length(262) - DS_adapt_length(50));
+//                    }
+//                }
+//                    break;
+//                case 1:
+//                {
+//                    if (self.mainHPModel.is_show_btn) {
+//                        return CGSizeMake(self.view.width, DS_adapt_length(145));
+//                    }else {
+//                        return CGSizeMake(self.view.width, 0.000001);
+//                    }
+//                }
+//                    break;
+//                case 2:
+//                {
+//                    if (self.mainHPModel.is_show_user) {
+//                        return CGSizeMake(self.view.width, DS_adapt_length(191));
+//                    }else {
+//                        return CGSizeMake(self.view.width, 0.000001);
+//                    }
+//                }
+//                    break;
+//                default:
+//                {
+//                    return CGSizeZero;
+//                }
+//                    break;
+//            }
+        }
+    }
+    
+    //MARK: - 网络请求获取店铺详情
+    func getShopDetailApi()
+    {
+        showLoading(message: "")
+        CNLiveShopDetailViewModel.requestShopDetailInfo(storeId: "") { result, status in
+            hiddenLoading()
+            if status == .success{
+                let model = result as! CNLiveShopDetailModel
+                self.shopDetailModel = model
+                self.collectionView.reloadData()
+            }else if (status == .failed){
+//                self.NetApiStatus = .apiError
+            }else if (status == .noNetwork){
+                
+//                self.NetApiStatus = .notNetwork
+            }
+        }
+    }
+}
+//
+//  CNLiveShopConsoleController.swift
+//  metaCode
+//
+//  Created by zx on 2023/10/27.
+//
+
+import Foundation
+
+class CNLiveShopConsoleController: CNLiveBaseViewController, UICollectionViewDelegate, UICollectionViewDataSource {
+    
+    let kCNLiveShopConsoleCellKey = "kCNLiveShopConsoleCellKey"
+    
+    let kCNLiveShopConsoleCollectionReusableHeaderViewID = "kCNLiveShopConsoleCollectionReusableHeaderViewID"
+    let kCNLiveShopConsoleCollectionReusableFooterViewID = "kCNLiveShopConsoleCollectionReusableFooterViewID"
+    
+    lazy var collectionView: UICollectionView = {
+        let gap = CGFloat(15)
+        let layout = UICollectionViewFlowLayout.init()
+        layout.itemSize = CGSize(width: (KSreenWidth - gap*2-10)/2, height: 72)
+        layout.sectionInset = .init(top: gap, left: gap, bottom: gap, right: gap)
+        layout.headerReferenceSize = CGSize(width: KSreenWidth, height: 20)
+        let collectionView = UICollectionView(frame: .zero, collectionViewLayout: layout)
+        collectionView.delegate = self
+        collectionView.dataSource = self
+        collectionView.backgroundColor = .clear
+        collectionView.register(CNLiveShopConsoleHeaderView.self, forSupplementaryViewOfKind: UICollectionView.elementKindSectionHeader, withReuseIdentifier: kCNLiveShopConsoleCollectionReusableHeaderViewID)
+        collectionView.register(CNLiveShopConsoleCell.self, forCellWithReuseIdentifier: kCNLiveShopConsoleCellKey)
+        return collectionView
+    }()
+    
+    lazy var dataModel: CNLiveShopConsoleModel = {
+        let dataModel = CNLiveShopConsoleModel()
+        return dataModel
+    }()
+        
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        self.view.backgroundColor = .clear
+        self.getPageApi()
+        
+        view.addSubview(collectionView)
+        collectionView.snp.makeConstraints { make in
+            make.top.equalToSuperview().offset(KNavigationHeight)
+            make.left.bottom.right.equalToSuperview()
+        }
+    }
+    
+    // MARK: - UICollectionViewDelegate
+    func numberOfSections(in collectionView: UICollectionView) -> Int {
+        return self.dataModel.list.count
+    }
+    func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
+        let listMdl = self.dataModel.list[section]
+        return listMdl.list.count
+    }
+    func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
+        let cell = collectionView.dequeueReusableCell(withReuseIdentifier: kCNLiveShopConsoleCellKey, for: indexPath) as! CNLiveShopConsoleCell
+        let listMdl = self.dataModel.list[indexPath.section]
+        let model = listMdl.list[indexPath.item]
+        cell.shopListContentModel = model
+        return cell
+    }
+//    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, referenceSizeForHeaderInSection section: Int) -> CGSize {
+//        if (section == 0) {
+//            return CGSizeMake(self.view.width, 33);
+//        }else {
+//            return CGSizeMake(self.view.width, 33);
+//        }
+//    }
+    
+    func collectionView(_ collectionView: UICollectionView, viewForSupplementaryElementOfKind kind: String, at indexPath: IndexPath) -> UICollectionReusableView {
+        if (kind == UICollectionView.elementKindSectionHeader){
+            let sectionMdl = self.dataModel.list[indexPath.section]
+            let headerView:CNLiveShopConsoleHeaderView = collectionView .dequeueReusableSupplementaryView(ofKind: UICollectionView.elementKindSectionHeader, withReuseIdentifier: kCNLiveShopConsoleCollectionReusableHeaderViewID, for: indexPath) as! CNLiveShopConsoleHeaderView
+            headerView.height = 24
+            headerView.title = sectionMdl.title
+            return headerView
+        }else {
+            let footer = collectionView .dequeueReusableSupplementaryView(ofKind: UICollectionView.elementKindSectionFooter, withReuseIdentifier: kCNLiveShopConsoleCollectionReusableFooterViewID, for: indexPath)
+            return footer
+        }
+    }
+    
+    func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
+        let listMdl = self.dataModel.list[indexPath.section]
+        let itemModel = listMdl.list[indexPath.item]
+        if itemModel.type == CNLiveShopConsoleType.XZSP.rawValue{
+            //商城新增商品
+            
+        }else if itemModel.type == CNLiveShopConsoleType.SPGL.rawValue{
+            //商城商品管理
+            
+        }else if itemModel.type == CNLiveShopConsoleType.XZYHQ.rawValue{
+            //新增优惠券
+            
+        }else if itemModel.type == CNLiveShopConsoleType.GLYHQ.rawValue{
+            //优惠券管理
+            
+        }else if itemModel.type == CNLiveShopConsoleType.CreateShopClassify.rawValue{
+            //创建店铺分类
+            
+        }else if itemModel.type == CNLiveShopConsoleType.ShopClassifyManager.rawValue{
+            //店铺分类管理
+            
+        }else if itemModel.type == CNLiveShopConsoleType.FBDT.rawValue{
+            //发布动态
+            
+        }else if itemModel.type == CNLiveShopConsoleType.DTGL.rawValue{
+            //动态管理
+            
+        }else if itemModel.type == CNLiveShopConsoleType.DDGL.rawValue{
+            //订单管理
+            
+        }
+//        else if itemModel.type == CNLiveShopConsoleType.SH.rawValue{
+//            //退款/售后
+//            
+//        }
+        else if itemModel.type == CNLiveShopConsoleType.JYJL.rawValue{
+            //交易记录
+            
+        }else if itemModel.type == CNLiveShopConsoleType.OnManagerment.rawValue{
+            //直播管理
+            
+        }
+    }
+    
+    //MARK: - 网络请求获取详情页
+    func getPageApi()
+    {
+        showLoading(message: "")
+        CNLiveShopConsoleViewModel.requestUserInfo() { result, status in
+            hiddenLoading()
+            
+            if status == .success{
+                let shopUserModel = result as! CNLiveShopUserInfoModel
+                if shopUserModel.type != "3"{
+                    //type 1商家或者8达人
+                    let shopConsoleModel = CNLiveShopConsoleModel()
+                    shopConsoleModel.initDataSource()
+                    self.dataModel = shopConsoleModel
+                    self.collectionView.reloadData()
+                }
+            }else if (status == .failed){
+//                self.NetApiStatus = .apiError
+            }else if (status == .noNetwork){
+                
+//                self.NetApiStatus = .notNetwork
+            }
+        }
+//
+    }
+}
@@ -18,6 +18,8 @@ let LeftGap: CGFloat = UIScreen.main.bounds.size.width &lt;= 375 ? 23 : 40
 ///主窗口宽度
 let MainViewW: CGFloat = Width-LeftGap*2//Width-50
+///下滑页底部工具条高度
+let DownSlideBottomViewHeight: CGFloat = 74
 ///存储是否第一次显示首页上滑引导
 let CNKeyIsFirstAppearUpSlideHomeGuide: String = "isFirstAppearUpSlideHomeGuideKey"
@@ -383,13 +385,24 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
             bannerView?.layer.cornerRadius = 4
             bannerView?.layer.masksToBounds = false
         }
+        let identityModel = dataArray[index] as! StandListModel
+        bannerView?.idModel = identityModel
+        if (identityModel.auth == true){
+            bannerView?.baseScrollView.isScrollEnabled = true
+        }else{
+            if (identityModel.downType == 3 || identityModel.downType == 4 || identityModel.upType == 3 || identityModel.upType == 4)
+            {
+//                bannerView?.baseScrollView.isScrollEnabled = false
+            }else{
+                bannerView?.baseScrollView.isScrollEnabled = true
+            }
+        }
+        
         bannerView?.superScrollView = flowView.scrollView
         bannerView?.associatedVCView = self.view
         bannerView?.delegate  = self
         bannerView?.upSlideView.webView.navigationDelegate = self
         bannerView?.downSlideView.webView.navigationDelegate = self
-        let identityModel = dataArray[index] as! StandListModel
-        bannerView?.idModel = identityModel
         return bannerView
     }
@@ -557,7 +570,7 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
         print(url)
         if(navigationAction.navigationType == .linkActivated){
             let webVC =  CNWebViewController()
-            webVC.url = url
+            webVC.url = URL(string: url)
             currentViewController()?.navigationController?.pushViewController(webVC, animated: true)
             decisionHandler(.cancel, preferences)
             return
+//
+//  CNSlideBaseNavigationController.swift
+//  metaCode
+//
+//  Created by zx on 2023/10/26.
+//
+
+import Foundation
+
+class CNSlideBaseNavigationController: UINavigationController
+    ,UIViewControllerTransitioningDelegate {
+    var dismissClosure: (()->())?
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        modalPresentationStyle = .custom
+        transitioningDelegate = self
+    }
+
+    func animationController(forPresented presented: UIViewController, presenting: UIViewController, source: UIViewController) -> UIViewControllerAnimatedTransitioning? {
+        return CNUpSlideAnimationTransition(animationType: .present)
+    }
+    
+    func animationController(forDismissed dismissed: UIViewController) -> UIViewControllerAnimatedTransitioning? {
+        return CNUpSlideAnimationTransition(animationType:  .dismiss)
+    }
+    
+    func presentationController(forPresented presented: UIViewController, presenting: UIViewController?, source: UIViewController) -> UIPresentationController? {
+        return CNUpSlideCardPresentationController(presentedViewController: presented, presenting: presenting)
+    }
+}
+//
+//  CNUpSlideCardPresentationController.swift
+//  metaCode
+//
+//  Created by zx on 2023/10/16.
+//
+
+import UIKit
+
+class CNUpSlideCardPresentationController: UIPresentationController {
+    
+    private lazy var blurView = UIVisualEffectView(effect: nil)
+    
+    override var shouldRemovePresentersView: Bool {
+        return false
+    }
+    
+    override func presentationTransitionWillBegin() {
+        let container = containerView!
+        blurView.translatesAutoresizingMaskIntoConstraints = false
+        container.addSubview(blurView)
+        blurView.edges(to: container)
+        blurView.alpha = 0.0
+        
+        presentingViewController.beginAppearanceTransition(false, animated: false)
+        presentedViewController.transitionCoordinator!.animate(alongsideTransition: { (ctx) in
+            self.blurView.effect = UIBlurEffect(style: .light)
+            self.blurView.alpha = 1
+        }) { (ctx) in }
+    }
+    
+    override func presentationTransitionDidEnd(_ completed: Bool) {
+        presentingViewController.endAppearanceTransition()
+    }
+    
+    override func dismissalTransitionWillBegin() {
+        presentingViewController.beginAppearanceTransition(true, animated: true)
+        presentedViewController.transitionCoordinator!.animate(alongsideTransition: { (ctx) in
+            self.blurView.alpha = 0.0
+        }, completion: nil)
+    }
+    
+    override func dismissalTransitionDidEnd(_ completed: Bool) {
+        presentingViewController.endAppearanceTransition()
+        if completed {
+            blurView.removeFromSuperview()
+        }
+    }
+}
+//
+//  CNUpSlideDetailViewController.swift
+//  metaCode
+//
+//  Created by zx on 2023/10/16.
+//
+
+import Foundation
+
+class CNUpSlideDetailViewController: CNLiveBaseViewController {
+    
+    //slideModel
+    var _slideModel : CNLiveDownSlideModel?
+    var slideModel : CNLiveDownSlideModel? {
+        get{
+            _slideModel
+        }
+        set{
+            _slideModel = newValue!
+        }
+    }
+    
+    var dismissClosure: (()->())?
+    //the point when start to interactive
+    var interactiveStartingPoint: CGPoint? = nil
+
+    var draggingDownToDismiss = false
+    
+    let cell: CNDownSlideSingleCourseCell!
+    
+    private lazy var dismissPanGesture: UIPanGestureRecognizer = {
+        let ges = UIPanGestureRecognizer()
+        ges.maximumNumberOfTouches = 1
+        ges.addTarget(self, action: #selector(handleDismissPan(gesture:)))
+        ges.delegate = self
+        return ges
+    }()
+    
+    lazy var scrollView: CNUpSlideDetailScrollView = {
+        let frame = self.view.bounds
+        let view = CNUpSlideDetailScrollView(frame: frame)
+        view.callBack = {(contentMdl:CNLiveDownSlideContentsModel)->Void in
+            CNLiveDownSlideTool.detailPushWebVCWithContentsMdl(contentMdl: contentMdl, viewController: self)
+        }
+        view.delegate = self
+        return view
+    }()
+    
+    lazy var closeBtn: UIButton = {
+        let btn = UIButton()
+        btn.frame = CGRect(x: KSreenWidth - 20 - 30, y: 20, width: 30, height: 30)
+        btn.setImage(#imageLiteral(resourceName: "close_button"), for: .normal)
+        btn.addTarget(self, action: #selector(closeAction), for: .touchUpInside)
+        return btn
+    }()
+    
+    init(cell: CNDownSlideSingleCourseCell,slideModel:CNLiveDownSlideModel) {
+        self.cell = cell
+        super.init(nibName: nil, bundle: nil)
+        self.slideModel = slideModel
+        self.setupTranstion()
+        setNeedsStatusBarAppearanceUpdate()
+    }
+    
+    private func setupTranstion() {
+        modalPresentationStyle = .custom
+        transitioningDelegate = self
+    }
+    
+    required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        setupUI()
+        getImageFromCell()
+    }
+    
+    private func setupUI() {
+        self.view.layer.masksToBounds = true
+        view.addSubview(scrollView)
+        scrollView.slideModel = _slideModel
+        view.addSubview(closeBtn)
+        view.addGestureRecognizer(dismissPanGesture)
+        
+        if #available(iOS 11.0, *) {
+            scrollView.contentInsetAdjustmentBehavior = .never
+        } else {
+            automaticallyAdjustsScrollViewInsets = false
+        }
+    }
+    
+    private func getImageFromCell() {
+        scrollView.imageView.image = cell.bgImageView.image
+    }
+    
+    @objc private func closeAction() {
+        dismiss(animated: true, completion: nil)
+        let nav = self.navigationController as! CNSlideBaseNavigationController
+        nav.dismissClosure?()
+    }
+    
+    @objc private func handleDismissPan(gesture: UIPanGestureRecognizer) {
+        if !draggingDownToDismiss {
+            return
+        }
+        
+        let startingPoint: CGPoint
+        
+        if let p = interactiveStartingPoint {
+            startingPoint = p
+        } else {
+            startingPoint = gesture.location(in: nil)
+            interactiveStartingPoint = startingPoint
+        }
+
+        let currentLocation = gesture.location(in: nil)
+        
+        var progress = (currentLocation.y - startingPoint.y) / 100
+        
+        //prevent viewController bigger when scrolling up
+        if currentLocation.y <= startingPoint.y {
+            progress = 0
+        }
+        
+        if progress >= 1.0 {
+            dismiss(animated: true, completion: nil)
+            let nav = self.navigationController as! CNSlideBaseNavigationController
+            nav.dismissClosure?()
+//            dismissClosure?()
+            stopDismissPanGesture(gesture)
+            return
+        }
+
+        let targetShrinkScale: CGFloat = 0.86
+        let currentScale: CGFloat = 1 - (1 - targetShrinkScale) * progress
+        
+        switch gesture.state {
+        case .began,.changed:
+            scrollView.isScrollEnabled = false
+            gesture.view?.transform = CGAffineTransform(scaleX: currentScale, y: currentScale)
+            gesture.view?.layer.cornerRadius = GlobalConstants.toDayCardCornerRadius * (progress)
+            scrollView.showsVerticalScrollIndicator = false
+        case .cancelled,.ended:
+            scrollView.isScrollEnabled = true
+            stopDismissPanGesture(gesture)
+        default:
+            break
+        }
+    }
+    
+    //当下拉Offset超过100或取消下拉手势时，执行此方法
+    private func stopDismissPanGesture(_ gesture: UIPanGestureRecognizer) {
+        draggingDownToDismiss = false
+        interactiveStartingPoint = nil
+        scrollView.showsVerticalScrollIndicator = true
+        
+        UIView.animate(withDuration: 0.2) {
+            gesture.view?.transform = CGAffineTransform.identity
+        }
+    }
+
+}
+
+extension CNUpSlideDetailViewController: UIViewControllerTransitioningDelegate {
+    
+    func animationController(forPresented presented: UIViewController, presenting: UIViewController, source: UIViewController) -> UIViewControllerAnimatedTransitioning? {
+        return CNUpSlideAnimationTransition(animationType: .present)
+    }
+    
+    func animationController(forDismissed dismissed: UIViewController) -> UIViewControllerAnimatedTransitioning? {
+        return CNUpSlideAnimationTransition(animationType: .dismiss)
+    }
+    
+    func presentationController(forPresented presented: UIViewController, presenting: UIViewController?, source: UIViewController) -> UIPresentationController? {
+        return CNUpSlideCardPresentationController(presentedViewController: presented, presenting: presenting)
+    }
+}
+
+extension CNUpSlideDetailViewController: UIScrollViewDelegate {
+    func scrollViewDidScroll(_ scrollView: UIScrollView) {
+        
+        if scrollView.contentOffset.y < 0 {
+            scrollView.contentOffset = .zero
+            draggingDownToDismiss = true
+        }
+    }
+}
+
+extension CNUpSlideDetailViewController: UIGestureRecognizerDelegate {
+    func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {
+        return true
+    }
+}
+//
+//  CNUpSlideViewController.swift
+//  metaCode
+//
+//  Created by zx on 2023/10/13.
+//
+
+import Foundation
+import UIKit
+
+//下滑tableview背景颜色
+let kCNDownSlideBackgroundColorHex: String = "#F7F8FA"
+
+///CNliveDownSlideModel Type
+let SlideModelTypeRecommend4: String = "4"//4一排两个 推荐课程&推荐活动
+let SlideModelTypeTodayRecommend74: String = "74"//74今日推荐
+let SlideModelTypeAllCourse12: String = "12"//12列表全部课程
+let SlideModelTypeOneCourse75: String = "75"//75单课程大图
+
+class CNUpSlideViewController: CNLiveBaseViewController,UITableViewDelegate,UITableViewDataSource{
+    
+    let kCNLiveDownSlideCellIdentifier = "kCNLiveDownSlideCellIdentifier"
+    let kCNLiveDownSlideRecommendCellIdentifier = "kCNLiveDownSlideRecommendCellIdentifier"
+    let kCNLiveDownSlideTodayRecommendCellIdentifier = "kCNLiveDownSlideTodayRecommendCellIdentifier"
+    
+    var totolNum = 0//一共显示多少行cell
+    
+    var selectedCell: CNDownSlideSingleCourseCell?
+    
+    var statusBarShouldBeHidden = false
+    //we need to set `View controller-based status bar appearance = YES` in info.plist.
+    //so we can be able to hide statusBar.
+    override var prefersStatusBarHidden: Bool {
+        return statusBarShouldBeHidden
+    }
+    
+    override var preferredStatusBarUpdateAnimation: UIStatusBarAnimation {
+        return .slide
+    }
+    
+    var _downPath:String?
+    var downPath:String? {
+        get{
+            return _downPath
+        }
+        set{
+            _downPath = newValue!
+            self.getPageApi()
+        }
+    }
+    
+    // MARK: - 懒加载
+    ///数据源
+    lazy var dataArray: NSMutableArray = {
+        var dataArray = NSMutableArray()
+        return dataArray
+    }()
+    
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        self.updateStatusBarAndTabbarFrame(visible: true)
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        self.view.backgroundColor = HexColor(kCNDownSlideBackgroundColorHex)
+        view.addSubview(tableView)
+        tableView.frame = CGRect(x: 0, y: KStatusBarHeight, width: KSreenWidth, height: KSreenHeight-DownSlideBottomViewHeight-KStatusBarHeight)
+    }
+
+    lazy var tableView : UITableView = {
+        let tableView = UITableView(frame: .zero, style: .plain)
+        tableView.dataSource = self
+        tableView.delegate = self
+        tableView.separatorStyle = .none
+        tableView.register(CNDownSlideSingleCourseCell.self, forCellReuseIdentifier: kCNLiveDownSlideCellIdentifier)
+        tableView.backgroundColor = HexColor(kCNDownSlideBackgroundColorHex)
+        return tableView
+    }()
+    
+    private func updateStatusBarAndTabbarFrame(visible: Bool) {
+        statusBarShouldBeHidden = !visible
+        UIView.animate(withDuration: 0.25) {
+            self.setNeedsStatusBarAppearanceUpdate()
+        }
+    }
+
+    // MARK: - UITableViewDelegate
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        
+        self.dataArray.count
+    }
+
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+                
+        let slideModel = self.dataArray[indexPath.row] as! CNLiveDownSlideModel
+        
+        //type=4一排两个 推荐课程&推荐活动; 74今日推荐; 12列表全部课程; 75单课程大图
+        if slideModel.type == SlideModelTypeRecommend4{
+            guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveDownSlideRecommendCellIdentifier) as? CNLiveDownSlideRecommendCell 
+            else {
+                let cell = CNLiveDownSlideRecommendCell()
+                cell.slideModel = slideModel
+                return cell
+            }
+            cell.slideModel = slideModel
+            return cell
+        }else if slideModel.type == SlideModelTypeTodayRecommend74{
+            guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveDownSlideTodayRecommendCellIdentifier) as? CNLiveDownSlideTodayRecommendCell 
+            else {
+                let cell = CNLiveDownSlideTodayRecommendCell()
+                cell.slideModel = slideModel
+                return cell
+            }
+            cell.slideModel = slideModel
+            return cell
+        }else if slideModel.type == SlideModelTypeAllCourse12{
+            guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveDownSlideCellIdentifier) as? CNDownSlideSingleCourseCell
+            else {
+                let cell = CNDownSlideSingleCourseCell()
+                cell.slideModel = slideModel
+                return cell
+            }
+            cell.slideModel = slideModel
+            return cell
+        }else if slideModel.type == SlideModelTypeOneCourse75{
+            guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveDownSlideCellIdentifier) as? CNDownSlideSingleCourseCell 
+            else {
+                let cell = CNDownSlideSingleCourseCell()
+                cell.slideModel = slideModel
+                return cell
+            }
+            cell.slideModel = slideModel
+            return cell
+        }else{
+            return UITableViewCell()
+        }
+    }
+    
+    
+    func tableView(_ tableView: UITableView, didHighlightRowAt indexPath: IndexPath) {
+        guard let row = tableView.cellForRow(at: indexPath) as? CNDownSlideSingleCourseCell else { return }
+        UIView.animate(withDuration: 0.1) {
+            row.bgBackView.transform = CGAffineTransform(scaleX: 0.95, y: 0.95)
+        }
+    }
+    
+    func tableView(_ tableView: UITableView, didUnhighlightRowAt indexPath: IndexPath) {
+        guard let row = tableView.cellForRow(at: indexPath) as? CNDownSlideSingleCourseCell else { return }
+        UIView.animate(withDuration: 0.3) {
+            row.bgBackView.transform = CGAffineTransform(scaleX: 1.0, y: 1.0)
+        }
+    }
+
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        
+        let slideModel = self.dataArray[indexPath.row] as! CNLiveDownSlideModel
+        //type=4一排两个 推荐课程&推荐活动; 74今日推荐; 12列表全部课程; 75单课程大图
+        if slideModel.type == SlideModelTypeRecommend4{
+            
+        }else if slideModel.type == SlideModelTypeTodayRecommend74{
+            
+        }else if slideModel.type == SlideModelTypeAllCourse12{
+            guard let cell = tableView.cellForRow(at: indexPath) as? CNDownSlideSingleCourseCell else { return }
+            selectedCell = cell
+            let detailVC = CNSlideBaseNavigationController(rootViewController: CNUpSlideDetailViewController(cell: cell,slideModel: slideModel))
+            detailVC.dismissClosure = { [weak self] in
+                guard let StrongSelf = self else { return }
+                StrongSelf.updateStatusBarAndTabbarFrame(visible: true)
+            }
+            updateStatusBarAndTabbarFrame(visible: false)
+            
+            present(detailVC, animated: true, completion: nil)
+        }else if slideModel.type == SlideModelTypeOneCourse75{
+            guard let cell = tableView.cellForRow(at: indexPath) as? CNDownSlideSingleCourseCell else { return }
+            selectedCell = cell
+            
+            let detailVC = CNSlideBaseNavigationController(rootViewController: CNUpSlideDetailViewController(cell: cell,slideModel: slideModel))
+            
+            detailVC.dismissClosure = { [weak self] in
+                guard let StrongSelf = self else { return }
+                StrongSelf.updateStatusBarAndTabbarFrame(visible: true)
+            }
+            updateStatusBarAndTabbarFrame(visible: false)
+            present(detailVC, animated: true, completion: nil)
+        }
+    }
+    
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        let slideModel = self.dataArray[indexPath.row] as! CNLiveDownSlideModel
+        return CGFloat(slideModel.cellH)
+    }
+    
+    func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
+        return 0
+    }
+    func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
+        return 0
+    }
+    //MARK: - 网络请求获取详情页
+    func getPageApi()
+    {
+        showLoading(message: "")
+        CNLiveDownSlideViewModel.requestGetPage(pageId: _downPath! as NSString) { result, status in
+            hiddenLoading()
+            
+            if status == .success{
+                self.dataArray.addObjects(from: result as! [Any])
+                let newDataArray = NSMutableArray()
+                for slideModel in self.dataArray {
+                    if let model = slideModel as? CNLiveDownSlideModel{
+                        
+                         let layout = CNLiveDownSlideModelLayout.init(model: model)
+                        newDataArray.addObjects(from: [layout.getCellHModel()])
+                    }
+                }
+                self.dataArray.removeAllObjects()
+                self.dataArray.addObjects(from: newDataArray as! [Any])
+                
+                self.tableView.reloadData()
+            }else if (status == .failed){
+//                self.NetApiStatus = .apiError
+            }else if (status == .noNetwork){
+                
+//                self.NetApiStatus = .notNetwork
+            }
+        }
+//
+    }
+}
@@ -18,15 +18,15 @@ class CNWebViewController:CNLiveBaseViewController ,WKNavigationDelegate{
         return webView
     }()
-    var _url:String?
-    var url:String? {
+    var _url:URL?
+    var url:URL? {
         get{
             return _url
         }
         set{
             _url = newValue!
-            if (_url != ""){
-                let webUrl: URL! = URL.init(string: _url!)
+            if (_url != nil){
+                let webUrl: URL! = _url!
                 webView.evaluateJavaScript("navigator.userAgent") { [self] result, error in
                     let userAgent = result as! String
                     if error == nil && userAgent.count > 0 {
@@ -13,15 +13,14 @@ class CNCustomIndexTopView : UIView{
     ///关闭按钮事件回调
     var closeAction: closeBlock?
-    
     //MARK: - 懒加载
     ///标题
     lazy var titleLabel: UILabel = {
-        let titleLabel = UILabel.init(frame: CGRectMake(10, 0, 75, 35))
+        let titleLabel = UILabel.init(frame: CGRectMake(0, 0, 75, 35))
         titleLabel.bottom = self.bottom - 5
         titleLabel.textColor = .white
         titleLabel.textAlignment = .left
-        titleLabel.font = UIFont.systemFont(ofSize: 24, weight: .semibold)
+        titleLabel.font = BoldFont_24
         titleLabel.adjustsFontSizeToFitWidth=true
         return titleLabel
     }()
@@ -118,9 +117,15 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange
         set{
             self.mainView.idModel = newValue!
             _idModel = newValue
-            self.upSlideView.url = _idModel?.downPath
-            self.downSlideView.url = _idModel?.upPath
+            self.upSlideView.type = _idModel?.downType
+            self.upSlideView.downPath = _idModel?.downPath
+            
+            self.downSlideView.type = _idModel?.upType
+            self.downSlideView.downPath = _idModel?.upPath
+            
             self.topNavView.setTitleString(title:(_idModel?.name)!)
+            
+            self.colorDataArr = NSMutableArray(array: NSArray(objects: UIColor.white,KVCBackgroupColor!,HexColor(_idModel!.backgroundColor)!))
         }
     }
@@ -143,7 +148,7 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange
     ///颜色数据
     lazy var colorDataArr: NSMutableArray = {
-        let colorDataArr = NSMutableArray(array: NSArray(objects: UIColor.white,KVCBackgroupColor!,UIColor("#004FE0")!))
+        let colorDataArr = NSMutableArray(array: NSArray(objects: UIColor.white,KVCBackgroupColor!,UIColor.yellow))//UIColor("#004FE0")!
         return colorDataArr
     }()
@@ -180,7 +185,8 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange
     ///下滑显示的VIew
     lazy var downSlideView: CNDownSlideView = {
-        let collectionView = CNDownSlideView.init(frame: CGRectMake(-25, 0, self.frame.size.width + 50, self.frame.size.height))
+        
+        let collectionView = CNDownSlideView.init(frame: CGRectMake(-LeftGap, 0, self.frame.size.width+LeftGap*2, self.frame.size.height))
         collectionView.backgroundColor = .clear
         collectionView.backAction = {[weak self] in
             self?.baseScrollView.setContentOffset(CGPoint(x: 0, y: (self!.baseScrollView.height)), animated: true)
@@ -199,8 +205,7 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange
     ///上滑显示的View
     lazy var upSlideView : CNUpSlideView = {
-        let upSlideView = CNUpSlideView(frame: CGRectMake(-25, self.frame.size.height*2 + 120,self.frame.size.width+50, self.frame.size.height - 120))
-        
+        let upSlideView = CNUpSlideView(frame: CGRectMake(-LeftGap, self.frame.size.height*2,self.frame.size.width+LeftGap*2, self.frame.size.height))
         return upSlideView
     }()
@@ -224,7 +229,7 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange
     /// 顶部自定义导航
     lazy var topNavView: CNCustomIndexTopView = {
-        let topNavView = CNCustomIndexTopView.init(frame: CGRect(x: 0, y: 30, width: self.width, height: KNavigationHeight))
+        let topNavView = CNCustomIndexTopView.init(frame: CGRect(x: 0, y: KStatusBarHeight, width: self.width, height: KNavigationHeight))
         topNavView.alpha = 0
         topNavView.closeAction = { [weak self ] in
             self!.baseScrollView.setContentOffset(CGPoint(x: 0, y: self!.baseScrollView.height), animated: true)
@@ -250,13 +255,10 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange
         self.addSubview(self.downSlideViewRemindView)
         self.addSubview(self.baseScrollView)
-        self.addSubview(self.topNavView)
-//        self.topNavView.setTitleString(title: "志愿者")
-        
         self.baseScrollView.addSubview(self.downSlideView)
         self.baseScrollView.addSubview(self.mainView)
         self.baseScrollView.addSubview(self.upSlideView)
-        
+        self.addSubview(self.topNavView)
         //默认偏移到中间
         self.baseScrollView.setContentOffset(CGPointMake(0, self.frame.size.height), animated: false)
     }
@@ -380,12 +382,16 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange
         else{
             self.topNavView.alpha = 0
         }
-    
         //隐藏downSlideView的bottomView
         if scrollView.contentOffset.y > 10{
             self.downSlideView.bottomView.isHidden = true
             self.downSlideView.contentView.backgroundColor = .clear
         }
+        if scrollView.contentOffset.y == 0{
+            //滚动到第一页,显示downSlideView的底部view
+            self.downSlideView.bottomView.isHidden = false
+            self.downSlideView.contentView.backgroundColor = HexColor(kCNDownSlideBackgroundColorHex)  //KVCBackgroupColor
+        }
         delegate?.customIndexViewDidScroll(scrollView: self.baseScrollView)
@@ -408,16 +414,29 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange
             self.superScrollView?.isScrollEnabled = false
         }
-        
         if scrollView.contentOffset.y == 0{
             //滚动到第一页,显示downSlideView的底部view
             self.downSlideView.bottomView.isHidden = false
-            self.downSlideView.contentView.backgroundColor = KVCBackgroupColor
+            self.downSlideView.contentView.backgroundColor = HexColor(kCNDownSlideBackgroundColorHex)//KVCBackgroupColor
         }
-        
-        //滑动结束 把topNavView 放到scrollView的上层
-        self.bringSubviewToFront(self.topNavView)
+        //滑动结束 网页类型downType=1时把topNavView 放到scrollView的上层
+        if scrollView.contentOffset.y == ceil(defaultOffset*2) {
+            if  self.idModel?.downType == 1 {
+                self.bringSubviewToFront(self.topNavView)
+                self.topNavView.isHidden = false
+            }else if self.idModel?.downType == 0{
+                self.topNavView.isHidden = false
+                self.bringSubviewToFront(self.topNavView)
+            }else{
+                self.topNavView.isHidden = true
+            }
+        }else{
+            self.topNavView.isHidden = true
+        }
+        if scrollView.contentOffset.y == ceil(defaultOffset*2){
+            
+        }
         //下滑提醒View回到初始位置
         self.downSlideViewRemindView.top = -(self.downSlideViewRemindView.height + 50)
+//
+//  CNDownSlideSingleCourseCell.swift
+//  metaCode
+//
+//  Created by zx on 2023/10/16.
+//  单课程大图专辑
+
+
+import Foundation
+import UIKit
+
+enum GlobalConstants {
+    static let leftMargin: CGFloat = 20
+    
+    static let toDayCardRowH: CGFloat = 440
+    static let toDayCardCornerRadius: CGFloat = 12.0
+    static let todayCardSize: CGSize = CGSize(width: KSreenWidth - 2 * 15, height: DownSlideSingleCourseImgH)
+    static let cardDetailTopImageH: CGFloat = 500
+    
+    static let iconBorderColor: CGColor = UIColor(red: 239/255.0, green: 240/255.0, blue: 241/255.0, alpha: 1).cgColor
+    static let iconBorderWidth: CGFloat = 0.8
+    static let iconCornerRadius: CGFloat = 17.5
+    
+    static let textBlueColor = UIColor(red: 0/255.0, green: 122/255.0, blue: 255/255.0, alpha: 1.0)   //007AFF
+    static let speratorLineColor = UIColor(red: 224/255.0, green: 224/255.0, blue: 224/255.0, alpha: 1)
+
+}
+
+///全部课程 标题高度
+let DownSlideAllCourseTitleH: CGFloat = 55
+//全部课程 每row_topY间距
+let DownSlideAllCourseRowTopYGap: CGFloat = 10
+//全部课程 每row_topY间距
+let DownSlideAllCourseRowBottomYGap: CGFloat = 20
+//全部课程 每row_img宽高
+let DownSlideAllCourseRowImageWH: CGFloat = 45
+
+///全部课程 每row高度
+let DownSlideAllCourseRowH: CGFloat = DownSlideAllCourseRowTopYGap+DownSlideAllCourseRowBottomYGap + DownSlideAllCourseRowImageWH
+///全部课程 宽度
+let DownSlideAllCourseW: CGFloat = KSreenWidth - DownSlideRecommendLeftGap*2
+
+///单节课程 大图高度
+let DownSlideSingleCourseImgH: CGFloat = 345
+///单节课程 更多课程高度
+let DownSlideSingleCourseMoreH: CGFloat = 60
+///单节课程 宽度
+let DownSlideSingleCourseW: CGFloat = KSreenWidth - DownSlideRecommendLeftGap*2
+
+class CNDownSlideSingleCourseCell: UITableViewCell {
+    
+    let bgBackView = UIView()
+    let bgImageView = UIImageView()
+
+    //slideModel
+    var _slideModel : CNLiveDownSlideModel?
+    var slideModel : CNLiveDownSlideModel? {
+        get{
+            _slideModel
+        }
+        set{
+            _slideModel = newValue!
+            self.setupNewUI(model: _slideModel!)
+        }
+    }
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        self.selectionStyle = .none
+        setupUI()
+    }
+    
+    required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    private func setupUI() {
+        contentView.backgroundColor = HexColor(kCNDownSlideBackgroundColorHex)
+    }
+    
+    func setupNewUI(model:CNLiveDownSlideModel){
+        if model.type == SlideModelTypeAllCourse12 {
+            //全部课程列表
+            contentView.addSubview(bgBackView)
+
+            bgBackView.frame = CGRect(x: DownSlideRecommendLeftGap, y: 0,width:DownSlideSingleCourseW , height:model.cellH-DownSlideRecommendLeftGap)
+            bgBackView.layer.shadowColor = HexColor("#000000")?.cgColor
+            bgBackView.layer.shadowRadius = 12
+            bgBackView.layer.shadowOpacity = 1
+            bgBackView.layer.shadowOffset = CGSize(width: 0, height: 0)
+            bgBackView.layer.cornerRadius = 12
+            bgBackView.clipsToBounds = true
+            bgBackView.backgroundColor = HexColor("#FFFFFF")
+            
+            let titleLbl = UILabel(frame: CGRect(x: DownSlideRecommendLeftGap, y: DownSlideRecommendLeftGap, width: DownSlideSingleCourseW-DownSlideRecommendLeftGap*2, height: 30))
+            titleLbl.text = model.blockName ?? "全部课程"
+            titleLbl.font = BoldFont_21
+            titleLbl.textColor = HexColor("#333333")
+            bgBackView.addSubview(titleLbl)
+            
+            //总块数
+            let contentsNum = model.contents.count
+            //model行数
+            let row = model.rowNum
+            //总显示块数
+            var totalNum = (contentsNum >= row) ? row : contentsNum
+            if row == 0{//row为0 , contents全部显示
+                totalNum = contentsNum
+            }
+            for i in 0..<totalNum{//i是第几行
+                let contentMdl = model.contents[i]
+                
+                //小icon
+                let imageView = UIImageView(frame: CGRectMake(DownSlideRecommendLeftGap, titleLbl.bottom+DownSlideRecommendLeftGap+CGFloat(i)*(DownSlideAllCourseRowTopYGap+DownSlideAllCourseRowImageWH+DownSlideAllCourseRowBottomYGap), CGFloat(DownSlideAllCourseRowImageWH), CGFloat(DownSlideAllCourseRowImageWH)))
+                imageView.kf.setImage(with: URL(string:contentMdl.poster!))
+                bgBackView.addSubview(imageView)
+                
+                let titleLbl = UILabel(frame: CGRect(x: imageView.right+DownSlideRecommendLeftGap, y: imageView.top, width: DownSlideSingleCourseW-90-imageView.right, height: 21))
+                titleLbl.text = contentMdl.title ?? "婴儿课程"
+                titleLbl.font = Font_15
+                titleLbl.textColor = HexColor("#333333")
+                bgBackView.addSubview(titleLbl)
+                
+                let subTitleLbl = UILabel(frame: CGRect(x: titleLbl.left, y:titleLbl.bottom+3 , width: titleLbl.width, height: 17))
+                subTitleLbl.text = contentMdl.subTitle ?? "适应3-6岁"
+                subTitleLbl.font = Font_12
+                subTitleLbl.textColor = HexColor("#999999")
+                bgBackView.addSubview(subTitleLbl)
+                
+                let enterBtn = UIButton(type: .custom)
+                enterBtn.frame = CGRect(x: bgBackView.right-25-65, y: 0, width: 65, height: 30)
+                enterBtn.centerY = imageView.centerY
+                enterBtn.setBackgroundImage(UIImage(named: "homepage_down_enter"), for: .normal)
+                enterBtn.setTitle("进入", for: .normal)
+                enterBtn.titleLabel?.font = BoldFont_13
+                enterBtn.setTitleColor(HexColor("#FFFFFF"), for: .normal)
+                enterBtn.addTarget(self, action: #selector(enterBtnAction(_:)), for: .touchUpInside)
+                enterBtn.tag = i
+                bgBackView.addSubview(enterBtn)
+            }
+        }else if model.type == SlideModelTypeOneCourse75 {
+            //单图课程
+            contentView.addSubview(bgBackView)
+            bgBackView.addSubview(bgImageView)
+            
+            bgBackView.frame = CGRect(x: DownSlideRecommendLeftGap, y: 0,width:DownSlideSingleCourseW , height:DownSlideSingleCourseMoreH+DownSlideSingleCourseImgH)
+            bgBackView.layer.shadowColor = UIColor.black.cgColor
+            bgBackView.layer.shadowOpacity = 0.4
+            bgBackView.layer.shadowOffset = CGSize(width: 0, height: 1)
+            
+            bgImageView.frame = CGRect(x: 0, y: 0,width:DownSlideSingleCourseW , height:DownSlideSingleCourseImgH)
+            bgImageView.contentMode = .scaleAspectFill
+            bgImageView.layer.cornerRadius = GlobalConstants.toDayCardCornerRadius
+            bgImageView.layer.maskedCorners = [.layerMinXMinYCorner, .layerMaxXMinYCorner]
+            bgImageView.layer.masksToBounds = true
+            bgImageView.kf.setImage(with: URL(string: model.contents[0].poster ?? ""))
+            
+            let titleLbl = UILabel(frame: CGRect(x: DownSlideRecommendLeftGap, y: DownSlideRecommendLeftGap, width: DownSlideSingleCourseW-DownSlideRecommendLeftGap*2, height: 30))
+            titleLbl.text = model.contents[0].title ?? "婴儿课程"
+            titleLbl.font = BoldFont_21
+            titleLbl.textColor = HexColor("#FFFFFF")
+            bgImageView.addSubview(titleLbl)
+            
+            let subTitleLbl = UILabel(frame: CGRect(x: DownSlideRecommendLeftGap, y:titleLbl.bottom , width: DownSlideSingleCourseW-DownSlideRecommendLeftGap*2, height: 30))
+            subTitleLbl.text = model.contents[0].subTitle ?? "适应3-6岁"
+            subTitleLbl.font = Font_12
+            subTitleLbl.textColor = HexColor("#FFFFFF")
+            bgImageView.addSubview(subTitleLbl)
+            
+            //单节底部视图
+            let singleCourseBottomView = UIView(frame: CGRect(x: 0, y: DownSlideSingleCourseImgH, width: DownSlideSingleCourseW, height: DownSlideSingleCourseMoreH))
+            singleCourseBottomView.layer.cornerRadius = 12
+            singleCourseBottomView.layer.maskedCorners = [.layerMinXMaxYCorner, .layerMaxXMaxYCorner]
+            singleCourseBottomView.backgroundColor = .white
+            singleCourseBottomView.isUserInteractionEnabled = true
+            bgBackView.addSubview(singleCourseBottomView)
+            
+            let moreLabel = UILabel(frame: CGRect(x: DownSlideRecommendLeftGap, y: 15, width: DownSlideSingleCourseW - 50 - DownSlideRecommendLeftGap   , height: 30))
+            moreLabel.text = model.blockName ?? "更多"
+            moreLabel.font = Font_15
+            moreLabel.textColor = HexColor("#333333")
+            singleCourseBottomView.addSubview(moreLabel)
+            
+            let moreImgView = UIImageView(image: UIImage(named: "homepage_down_more"))
+            moreImgView.left = moreLabel.right
+            moreImgView.centerY = moreLabel.centerY
+            singleCourseBottomView.addSubview(moreImgView)
+        }
+    }
+    
+    //MARK: - 事件
+    @objc func enterBtnAction(_ sender: UIButton){
+        let tag = sender.tag
+        let contentMdl = self.slideModel?.contents[tag]
+        CNLiveDownSlideTool.pushWebVCWithContentsMdl(contentMdl: contentMdl!)
+    }
+}
@@ -3,7 +3,7 @@
 //  metaCode
 //
 //  Created by daojian on 2023/5/30.
-//
+//  下滑后的上面页面
 import Foundation
 import UIKit
@@ -16,10 +16,11 @@ class CNDownSlideView:UIView{
     //返回首页
     var backAction:backBlock?
+    
     //MARK: - 懒加载
     lazy var contentView:UIView = {
-        let contentView = UIView.init(frame: CGRect(x: 0, y: 0, width: self.width, height: self.height-KTabBarHeight))
+        let contentView = UIView.init(frame: CGRect(x: 0, y: 0, width: self.width, height: self.height))
         contentView.backgroundColor = UIColor.clear
 //        let path:UIBezierPath = UIBezierPath.init(roundedRect: contentView.bounds, byRoundingCorners: [.bottomLeft, .bottomRight], cornerRadii: CGSize.init(width: 20, height: 20))
@@ -47,42 +48,65 @@ class CNDownSlideView:UIView{
         return webView
     }()
-    var _url:String?
-    var url:String? {
+    var upSlideVC:CNUpSlideViewController  = {
+        let upSlideVC = CNUpSlideViewController.init()
+        upSlideVC.view.width = KSreenWidth
+        upSlideVC.view.height = KSreenHeight-DownSlideBottomViewHeight
+        return upSlideVC
+    }()
+    
+    var shopConsoleVC:CNLiveShopConsoleController  = {
+        let shopConsoleVC = CNLiveShopConsoleController.init()
+        shopConsoleVC.view.width = KSreenWidth
+        shopConsoleVC.view.height = KSreenHeight-DownSlideBottomViewHeight
+        return shopConsoleVC
+    }()
+    
+    var type:Int?
+    
+    var _downPath:String?
+    var downPath:String? {
         get{
-            return _url
+            return _downPath
         }
         set{
-            _url = newValue!
-            if (_url != ""){
-                let webUrl: URL! = URL.init(string: _url!)
-                webView.load(URLRequest.init(url:webUrl))
+            _downPath = newValue!
+            
+            if(type == UpDownTypeH5){
+                self.contentView.addSubview(self.webView)
+                if (_downPath != ""){
+                    let webUrl: URL! = URL.init(string: _downPath!)
+                    webView.load(URLRequest.init(url:webUrl))
+                }
+            }else if(type == UpDownTypePage){
+                self.addSubview(self.upSlideVC.view)
+                self.upSlideVC.downPath = _downPath
+                
+            }else if(type == UpDownTypeShopDetail){
+                
+            }else if(type == UpDownTypeShopControlConsole){
+                self.addSubview(self.shopConsoleVC.view)
             }
         }
     }
-    lazy var topView:UIView = {
-        
-        let tempTopView = UIView(frame: CGRect(x:0, y:20, width: self.width - 50, height: 70))
-        
-        return tempTopView
-    }()
-    
     lazy var bottomView:UIView = {
-        let bottomView = UIView(frame: CGRect(x:0, y:self.height - KTabBarHeight, width: self.width, height: KTabBarHeight))
-        bottomView.backgroundColor = .white
+        let bottomView = UIView(frame: CGRect(x:0, y:self.height - DownSlideBottomViewHeight, width: self.width, height: DownSlideBottomViewHeight))
+        bottomView.backgroundColor = HexColor("#FFFFFF")
         bottomView.isHidden = true
-        let path:UIBezierPath = UIBezierPath.init(roundedRect: bottomView.bounds, byRoundingCorners: [.topLeft, .topRight], cornerRadii: CGSize.init(width: 20, height: 20))
-        
+        let path:UIBezierPath = UIBezierPath.init(roundedRect: bottomView.bounds, byRoundingCorners: [.topLeft, .topRight], cornerRadii: CGSize.init(width: 50, height: 50))
         let maskLayer:CAShapeLayer = CAShapeLayer()
         maskLayer.frame = bottomView.bounds
         maskLayer.path  = path.cgPath
         bottomView.layer.mask = maskLayer
+        bottomView.clipsToBounds = true
+//        bottomView.layer.cornerRadius = 50
+//        bottomView.layer.maskedCorners = [.layerMinXMinYCorner, .layerMaxXMinYCorner]
         let backBtn: UIButton = UIButton(type: .custom)
-        backBtn.frame = CGRectMake(0, 0, 100, 30)
+        backBtn.frame = CGRectMake(0, 0, 100, DownSlideBottomViewHeight)
         backBtn.centerX = bottomView.width/2
         backBtn.centerY = bottomView.height/2
         backBtn.setImage(UIImage(named: "homePage_backhome_icon"), for: .normal)
@@ -98,9 +122,15 @@ class CNDownSlideView:UIView{
     override init(frame: CGRect) {
         super.init(frame: frame)
+        
+        let tap = UITapGestureRecognizer.init(target: self, action: #selector(slideViewTap))
+        tap.cancelsTouchesInView = false
+        self.addGestureRecognizer(tap)
         self.initUI()
     }
-    
+    @objc func slideViewTap() {
+        print("slideViewTap")
+    }
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
@@ -108,11 +138,10 @@ class CNDownSlideView:UIView{
     ///初始化UI
     func initUI(){
+        self.isUserInteractionEnabled = true
         self.addSubview(self.contentView)
-        self.contentView.addSubview(self.webView)
-//        self.addSubview(self.topView)
+
         self.addSubview(self.bottomView)
-        
     }
     @objc func backBtnAction(){
+//
+//  CNLiveDownSlideRecommendCell.swift
+//  metaCode
+//
+//  Created by zx on 2023/10/20.
+//  type:4 推荐课程 推荐活动
+
+import Foundation
+
+///推荐课程左间距
+let DownSlideRecommendLeftGap: CGFloat = 15
+///推荐课程宽高
+let DownSlideRecommendWH: CGFloat = (KSreenWidth-DownSlideRecommendLeftGap*3)*0.5
+
+
+class CNLiveDownSlideRecommendCell: UITableViewCell {
+
+    //slideModel
+    var _slideModel : CNLiveDownSlideModel?
+    var slideModel : CNLiveDownSlideModel? {
+        get{
+            _slideModel
+        }
+        set{
+            _slideModel = newValue!
+            setupNewUI(model: _slideModel!)
+        }
+    }
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        self.selectionStyle = .none
+        contentView.backgroundColor =  HexColor(kCNDownSlideBackgroundColorHex)
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    
+    func setupNewUI(model:CNLiveDownSlideModel){
+        //总块数
+        let contentsNum = model.contents.count
+        //model行数
+        let row = model.rowNum
+        //总显示块数/循环数
+        var totalNum = (contentsNum >= row*2) ? row*2 : contentsNum
+        if row == 0{//row为0 , contents全部显示
+            totalNum = contentsNum
+        }
+        //lieIndex 当前是contents的第0列还是第1列
+        var lieIndex = 0
+        //hangIndex 当前是第几行,1...n
+        var hangIndex = 1
+        for i in 0..<totalNum{//i是第几行
+            if lieIndex == 0{
+                //显示左边的块
+                let contentMdl = model.contents[(hangIndex-1)*2+(lieIndex)]
+                let imageView = UIImageView(frame: CGRectMake(DownSlideRecommendLeftGap, CGFloat(hangIndex-1)*DownSlideRecommendWH+DownSlideRecommendLeftGap*CGFloat(hangIndex-1), CGFloat(DownSlideRecommendWH), CGFloat(DownSlideRecommendWH)))
+                imageView.kf.setImage(with: URL(string:contentMdl.poster!))
+                imageView.tag = i
+                imageView.isUserInteractionEnabled = true
+                imageView.addGestureRecognizer(UITapGestureRecognizer.init(target: self, action: #selector(pushWebAction)))
+                contentView.addSubview(imageView)
+                lieIndex = 1
+            }else{
+                //lieIndex==1显示右边的块
+                let contentMdl = model.contents[(hangIndex-1)*2+(lieIndex)]
+                let imageView = UIImageView(frame: CGRectMake(CGFloat(DownSlideRecommendLeftGap*2)+CGFloat(DownSlideRecommendWH), CGFloat(hangIndex-1)*DownSlideRecommendWH+DownSlideRecommendLeftGap*CGFloat(hangIndex-1), CGFloat(DownSlideRecommendWH), CGFloat(DownSlideRecommendWH)))
+                imageView.kf.setImage(with: URL(string:contentMdl.poster!))
+                imageView.tag = i
+                imageView.isUserInteractionEnabled = true
+                imageView.addGestureRecognizer(UITapGestureRecognizer.init(target: self, action: #selector(pushWebAction)))
+                contentView.addSubview(imageView)
+                lieIndex = 0
+                hangIndex += 1
+            }
+        }
+    }
+    
+    @objc func pushWebAction(ges: UITapGestureRecognizer){
+        let imageView = ges.view as! UIImageView
+        let i = imageView.tag
+        let contentMdl = (self.slideModel?.contents[i])!
+        CNLiveDownSlideTool.pushWebVCWithContentsMdl(contentMdl: contentMdl)
+    }
+    
+}
+//
+//  CNLiveDownSlideTodayRecommendCell.swift
+//  metaCode
+//
+//  Created by zx on 2023/10/20.
+//  type:74 今日推荐
+
+import Foundation
+
+///今日推荐高度
+let DownSlideTodayRecommendH: CGFloat = 105
+///今日推荐宽度
+let DownSlideTodayRecommendW: CGFloat = KSreenWidth-DownSlideRecommendLeftGap*2
+
+class CNLiveDownSlideTodayRecommendCell: UITableViewCell {
+    //slideModel
+    var _slideModel : CNLiveDownSlideModel?
+    var slideModel : CNLiveDownSlideModel? {
+        get{
+            _slideModel
+        }
+        set{
+            _slideModel = newValue!
+            self.setupNewUI(model: _slideModel!)
+        }
+    }
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        self.selectionStyle = .none
+        contentView.backgroundColor = HexColor(kCNDownSlideBackgroundColorHex)
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    func setupNewUI(model:CNLiveDownSlideModel){
+        //总块数
+        let contentsNum = model.contents.count
+        //model行数
+        let row = model.rowNum
+        //总显示块数
+        var totalNum = (contentsNum >= row) ? row : contentsNum
+        if row == 0{//row为0 , contents全部显示
+            totalNum = contentsNum
+        }
+        for i in 0..<totalNum{//i是第几行
+            let contentMdl = model.contents[i]
+            let imageView = UIImageView(frame: CGRectMake(DownSlideRecommendLeftGap, CGFloat(i)*(DownSlideTodayRecommendH+DownSlideRecommendLeftGap), CGFloat(DownSlideTodayRecommendW), CGFloat(DownSlideTodayRecommendH)))
+            imageView.kf.setImage(with: URL(string:contentMdl.poster!))
+            imageView.tag = i
+            imageView.layer.cornerRadius = 12
+            imageView.clipsToBounds = true
+            imageView.isUserInteractionEnabled = true
+            imageView.addGestureRecognizer(UITapGestureRecognizer.init(target: self, action: #selector(pushWebAction)))
+            contentView.addSubview(imageView)
+        }
+    }
+    
+    @objc func pushWebAction(ges: UITapGestureRecognizer){
+        let imageView = ges.view as! UIImageView
+        let i = imageView.tag
+        let contentMdl = self.slideModel?.contents[i]
+        CNLiveDownSlideTool.pushWebVCWithContentsMdl(contentMdl: contentMdl!)
+    }
+}
+//
+//  CNLiveShopConsoleCell.swift
+//  metaCode
+//
+//  Created by zx on 2023/10/30.
+//
+
+import Foundation
+
+class CNLiveShopConsoleCell: UICollectionViewCell {
+    
+    var bgView = UIView()
+    var iconImageView = UIImageView()
+    var titleLbl = UILabel()
+    var subTitleLbl = UILabel()
+    
+    //slideModel
+    var _shopListContentModel : CNLiveShopConsoleListContentModel?
+    var shopListContentModel : CNLiveShopConsoleListContentModel? {
+        get{
+            _shopListContentModel
+        }
+        set{
+            _shopListContentModel = newValue!
+            self.iconImageView.image = UIImage(named: _shopListContentModel!.simg!)
+            self.titleLbl.text = _shopListContentModel?.title
+            self.subTitleLbl.text = _shopListContentModel?.subtitle
+        }
+    }
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        self.backgroundColor = .clear
+        self.setUI()
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    func setUI(){
+        self.bgView = UIView(frame: contentView.bounds)
+        self.bgView.backgroundColor = .white
+        self.bgView.layer.cornerRadius = 7
+        contentView.addSubview(self.bgView)
+        
+        self.iconImageView = UIImageView(frame: CGRectMake(15, 0, 35, 35))
+        self.iconImageView.centerY = contentView.centerY
+        self.iconImageView.clipsToBounds = true
+        self.iconImageView.contentMode = .scaleAspectFit
+        self.bgView.addSubview(self.iconImageView)
+        
+        self.titleLbl = UILabel(frame: CGRect(x: self.iconImageView.right+10, y: (contentView.height-20-15)*0.5, width: contentView.width-self.iconImageView.right-10-20, height: 20))
+        self.titleLbl.text = "创建店铺分类"
+        self.titleLbl.font = Font_14
+        self.titleLbl.textColor = HexColor("#4A4A4A")
+        self.bgView.addSubview(self.titleLbl)
+        
+        self.subTitleLbl = UILabel(frame: CGRect(x: self.titleLbl.left, y: self.titleLbl.bottom, width: self.titleLbl.width, height: 15))
+        self.subTitleLbl.text = "创建店铺分类"
+        self.subTitleLbl.font = Font_11
+        self.subTitleLbl.textColor = HexColor("#999999")
+        self.bgView.addSubview(self.subTitleLbl)
+    }
+}
+
+class CNLiveShopConsoleHeaderView:UICollectionReusableView{
+    
+    var _title:String?
+    var title:String? {
+        get{
+            return _title
+        }
+        set{
+            _title = newValue!
+            self.titleLbl.text = _title
+        }
+    }
+    
+    var titleLbl:UILabel  = {
+        let titleLbl = UILabel(frame: CGRect(x: 15, y: 0, width: 100, height:23 ))
+        titleLbl.text = "商品管理"
+        titleLbl.font = Font_16
+        titleLbl.textColor = HexColor("#B4B4B4")
+        return titleLbl
+    }()
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        self.setUI()
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    func setUI(){
+        self.addSubview(self.titleLbl)
+
+    }
+}
+//
+//  CNLliveShopDetailBannerCell.swift
+//  metaCode
+//
+//  Created by zx on 2023/11/1.
+//
+
+import Foundation
+import FSPagerView
+
+class CNLliveShopDetailBannerCell:UICollectionViewCell,FSPagerViewDataSource,FSPagerViewDelegate{
+   
+    let kCNLliveShopDetailBannerCellID = "kCNLliveShopDetailBannerCellID"
+    
+    lazy var viewPager: FSPagerView = {
+        let viewPager = FSPagerView()
+        viewPager.frame = CGRect(x: 10, y: 10, width: self.contentView.width-20, height: self.contentView.height-20)
+        viewPager.dataSource = self
+        viewPager.delegate = self
+        viewPager.register(FSPagerViewCell.self, forCellWithReuseIdentifier: kCNLliveShopDetailBannerCellID)
+        //设置自动翻页事件间隔，默认值为0 (不自动翻页)
+        viewPager.automaticSlidingInterval = 1.0
+        //设置页面之间的间隔距离
+        viewPager.interitemSpacing = 8.0
+        //设置可以无限翻页，默认值为false，false时从尾部向前滚动到头部再继续循环滚动，true时可以无限滚动
+        viewPager.isInfinite = true
+        //设置转场的模式
+        viewPager.transformer = FSPagerViewTransformer(type: FSPagerViewTransformerType.depth)
+        return viewPager
+    }()
+    
+    //shopDetailModel
+    var _shopDetailModel : CNLiveShopDetailModel?
+    var shopDetailModel : CNLiveShopDetailModel? {
+        get{
+            _shopDetailModel
+        }
+        set{
+            _shopDetailModel = newValue!
+            
+        }
+    }
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        self.backgroundColor = .clear
+        self.setUI()
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    func setUI(){
+        self.backgroundColor = .red
+        self.contentView.addSubview(self.viewPager)
+    }
+    
+    // MARK: - FSPagerViewDataSource
+    func numberOfItems(in pagerView: FSPagerView) -> Int {
+        return (self.shopDetailModel?.banner.count)!
+    }
+    func pagerView(_ pagerView: FSPagerView, cellForItemAt index: Int) -> FSPagerViewCell {
+        let cell = pagerView.dequeueReusableCell(withReuseIdentifier: kCNLliveShopDetailBannerCellID, at: index)
+        let imgUrl = self.shopDetailModel?.banner[index].simg!
+        cell.imageView?.kf.setImage(with: URL(string: imgUrl!))
+        return cell
+    }
+}
+//
+//  CNUpSlideDetailScrollView.swift
+//  metaCode
+//
+//  Created by zx on 2023/10/16.
+//
+
+import UIKit
+
+typealias enterBlock = (_ contentsMdl:CNLiveDownSlideContentsModel)->Void
+    
+class CNUpSlideDetailScrollView: UIScrollView {
+    //返回首页
+    var callBack : enterBlock?
+    
+    let bgBackView = UIView()
+    let imageView = UIImageView()
+
+    //slideModel
+    var _slideModel : CNLiveDownSlideModel?
+    var slideModel : CNLiveDownSlideModel? {
+        get{
+            _slideModel
+        }
+        set{
+            _slideModel = newValue!
+            self.setupNewUI(model: _slideModel!)
+        }
+    }
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        
+        setupUI()
+    }
+        
+    required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    private func setupUI() {
+        bgBackView.frame = CGRect(x: DownSlideRecommendLeftGap, y: 0,width:KSreenWidth , height:KSreenHeight)
+        imageView.frame = CGRect(x: 0,y: 0,width:KSreenWidth , height: KSreenWidth*DownSlideSingleCourseImgH/DownSlideSingleCourseW)
+        imageView.contentMode = .scaleAspectFill
+                        
+        bgBackView.addSubview(imageView)
+        addSubview(bgBackView)
+        
+        contentSize = CGSize(width: KSreenWidth, height: bgBackView.height)
+    }
+    
+    func setupNewUI(model:CNLiveDownSlideModel){
+        if model.type == SlideModelTypeAllCourse12 {
+            //全部课程列表
+            let topTitleLbl = UILabel(frame: CGRect(x: DownSlideRecommendLeftGap, y: KStatusBarHeight+DownSlideRecommendLeftGap, width: DownSlideSingleCourseW-DownSlideRecommendLeftGap*2, height: 30))
+            topTitleLbl.text = model.blockName ?? "全部课程"
+            topTitleLbl.font = BoldFont_21
+            topTitleLbl.textColor = HexColor("#333333")
+            bgBackView.addSubview(topTitleLbl)
+            
+            //总块数
+            let contentsNum = model.contents.count
+            //model行数
+            let row = model.rowNum
+            //总显示块数
+            var totalNum = (contentsNum >= row) ? row : contentsNum
+            if row == 0{//row为0 , contents全部显示
+                totalNum = contentsNum
+            }
+            for i in 0..<totalNum{//i是第几行
+                let contentMdl = model.contents[i]
+                
+                //小icon
+                let imageView = UIImageView(frame: CGRectMake(DownSlideRecommendLeftGap, topTitleLbl.bottom+DownSlideRecommendLeftGap+CGFloat(i)*(DownSlideAllCourseRowTopYGap+DownSlideAllCourseRowImageWH+DownSlideAllCourseRowBottomYGap), CGFloat(DownSlideAllCourseRowImageWH), CGFloat(DownSlideAllCourseRowImageWH)))
+                imageView.kf.setImage(with: URL(string:contentMdl.poster ?? ""))
+                bgBackView.addSubview(imageView)
+                
+                let titleLbl = UILabel(frame: CGRect(x: imageView.right+DownSlideRecommendLeftGap, y: imageView.top, width: DownSlideSingleCourseW-90-imageView.right, height: 21))
+                titleLbl.text = contentMdl.title ?? "婴儿课程"
+                titleLbl.font = Font_15
+                titleLbl.textColor = HexColor("#333333")
+                bgBackView.addSubview(titleLbl)
+                
+                let subTitleLbl = UILabel(frame: CGRect(x: titleLbl.left, y:titleLbl.bottom+3 , width: titleLbl.width, height: 17))
+                subTitleLbl.text = contentMdl.subTitle ?? "适应3-6岁"
+                subTitleLbl.font = Font_12
+                subTitleLbl.textColor = HexColor("#999999")
+                bgBackView.addSubview(subTitleLbl)
+                
+                let enterBtn = UIButton(type: .custom)
+                enterBtn.frame = CGRect(x: subTitleLbl.right+10, y: 0, width: 65, height: 30)
+                enterBtn.centerY = imageView.centerY
+                enterBtn.setBackgroundImage(UIImage(named: "homepage_down_enter"), for: .normal)
+                enterBtn.setTitle("进入", for: .normal)
+                enterBtn.titleLabel?.font = BoldFont_13
+                enterBtn.setTitleColor(HexColor("#FFFFFF"), for: .normal)
+                enterBtn.addTarget(self, action: #selector(enterBtnAction(_:)), for: .touchUpInside)
+                enterBtn.tag = i
+                bgBackView.addSubview(enterBtn)
+            }
+        }else if model.type == SlideModelTypeOneCourse75 {
+            //单图课程
+            
+            let topTitleLbl = UILabel(frame: CGRect(x: 0, y: KStatusBarHeight+DownSlideRecommendLeftGap, width:bgBackView.width - 50 , height: 30))
+            topTitleLbl.text = model.contents[0].title ?? "婴儿课程"
+            topTitleLbl.font = BoldFont_21
+            topTitleLbl.textColor = HexColor("#FFFFFF")
+            imageView.addSubview(topTitleLbl)
+            
+            let topSubTitleLbl = UILabel(frame: CGRect(x: topTitleLbl.left, y:topTitleLbl.bottom , width: topTitleLbl.width, height: 30))
+            topSubTitleLbl.text = model.contents[0].subTitle ?? "适应3-6岁"
+            topSubTitleLbl.font = Font_12
+            topSubTitleLbl.textColor = HexColor("#FFFFFF")
+            imageView.addSubview(topSubTitleLbl)
+            
+            //总块数
+            let contentsNum = model.contents.count
+            //model行数
+            let row = model.rowNum
+            //总显示块数
+            var totalNum = (contentsNum >= row) ? row : contentsNum
+            if row == 0{//row为0 , contents全部显示
+                totalNum = contentsNum
+            }
+            for i in 0..<totalNum{//i是第几行
+                let contentMdl = model.contents[i]
+                
+                //小icon
+                let imgView = UIImageView(frame: CGRectMake(0, imageView.height+DownSlideRecommendLeftGap+CGFloat(i)*(DownSlideAllCourseRowTopYGap+DownSlideAllCourseRowImageWH+DownSlideAllCourseRowBottomYGap), CGFloat(DownSlideAllCourseRowImageWH), CGFloat(DownSlideAllCourseRowImageWH)))
+                imgView.kf.setImage(with: URL(string:contentMdl.poster ?? ""))
+                bgBackView.addSubview(imgView)
+                
+                let titleLbl = UILabel(frame: CGRect(x: imgView.right+DownSlideRecommendLeftGap, y: imgView.top, width: DownSlideSingleCourseW-90-imgView.right, height: 21))
+                titleLbl.text = contentMdl.title ?? "婴儿课程"
+                titleLbl.font = Font_15
+                titleLbl.textColor = HexColor("#333333")
+                bgBackView.addSubview(titleLbl)
+                
+                let subTitleLbl = UILabel(frame: CGRect(x: titleLbl.left, y:titleLbl.bottom+3 , width: titleLbl.width, height: 17))
+                subTitleLbl.text = contentMdl.subTitle ?? "适应3-6岁"
+                subTitleLbl.font = Font_12
+                subTitleLbl.textColor = HexColor("#999999")
+                bgBackView.addSubview(subTitleLbl)
+                
+                let enterBtn = UIButton(type: .custom)
+                enterBtn.frame = CGRect(x: subTitleLbl.right+10, y: 0, width: 65, height: 30)
+                enterBtn.centerY = imgView.centerY-5
+                enterBtn.setBackgroundImage(UIImage(named: "homepage_down_enter"), for: .normal)
+                enterBtn.setTitle("进入", for: .normal)
+                enterBtn.titleLabel?.font = BoldFont_13
+                enterBtn.setTitleColor(HexColor("#FFFFFF"), for: .normal)
+                enterBtn.addTarget(self, action: #selector(enterBtnAction(_:)), for: .touchUpInside)
+                enterBtn.tag = i
+                bgBackView.addSubview(enterBtn)
+            }
+        }
+    }
+  
+    //闭包：函数参数
+//    func callBackBlock(_ block: @escaping enterBlock) {
+//        block(_:)
+//    }
+//    func useBlock(){
+//        if callBack != nil {
+//            callBack!("闭包传值2")
+//        }
+//    }
+    //MARK: - 事件
+    @objc func enterBtnAction(_ sender: UIButton){
+        let tag = sender.tag
+        let contentMdl = (self.slideModel?.contents[tag])!
+        if callBack != nil {
+            let contentMdl1 = contentMdl
+            callBack!(contentMdl1)
+        }
+    }
+}
@@ -3,32 +3,60 @@
 //  metaCode
 //
 //  Created by daojian on 2023/5/31.
-//
+//  上滑后的下面页面
 import Foundation
 import WebKit
+let UpDownTypeH5 = 1///h5
+let UpDownTypePage = 2///原生page页面
+let UpDownTypeShopDetail = 3///店铺详情
+let UpDownTypeShopControlConsole = 4///店铺控制台
+
 ///上滑显示的VIew
 class CNUpSlideView:UIView{
     lazy var webView: WKWebView = {
-        let webView = WKWebView.init(frame: CGRectMake(10, 20, self.width - 20, self.height - 20))
+        let webView = WKWebView.init(frame: CGRectMake(10, KNavigationHeight+KStatusBarHeight+10, self.width - 20, self.height-KNavigationHeight-KStatusBarHeight-10))
         webView.scrollView.showsVerticalScrollIndicator = false
         webView.scrollView.showsHorizontalScrollIndicator = false
         webView.backgroundColor = .clear
+        webView.layer.cornerRadius = 29
+        webView.layer.maskedCorners = [.layerMinXMinYCorner, .layerMaxXMinYCorner]
+        webView.clipsToBounds = true
         return webView
     }()
-    var _url:String?
-    var url:String? {
+    lazy var upSlideVC: CNLiveDownShopDetailController = {
+        let upSlideVC = CNLiveDownShopDetailController.init()
+        upSlideVC.view.width = KSreenWidth
+        upSlideVC.view.height = KSreenHeight
+        upSlideVC.view.backgroundColor = .white
+        return upSlideVC
+    }()
+    
+    var type:Int?
+    
+    var _downPath:String?
+    var downPath:String? {
         get{
-            return _url
+            return _downPath
         }
         set{
-            _url = newValue!
-            if (_url != ""){
-                let webUrl: URL! = URL.init(string: _url!)
-                webView.load(URLRequest.init(url:webUrl))
+            _downPath = newValue!
+            if(type == UpDownTypeH5){
+                self.addSubview(self.webView)
+                if (_downPath != ""){
+                    let webUrl: URL! = URL.init(string: _downPath!)
+                    webView.load(URLRequest.init(url:webUrl))
+                }
+            }
+            else if(type == UpDownTypePage){
+
+            }else if(type == UpDownTypeShopDetail){
+                self.addSubview(self.upSlideVC.view)
+            }else if(type == UpDownTypeShopControlConsole){
+                
             }
         }
     }
@@ -45,17 +73,8 @@ class CNUpSlideView:UIView{
     func initUI()
     {
-        self.backgroundColor = UIColor.white;
-        self.clipsToBounds = true;
-        self.layer.cornerRadius = 20;
-        self.addSubview(self.webView)
-        
-        
-//        let imageview : UIImageView = UIImageView.init(frame: CGRect(x: 20, y: 10, width: self.width - 40, height: self.height - 20))
-//        imageview.image = UIImage(named: "homePage_payMoneyImage")
-//        
-//        self.addSubview(imageview)
-        
+        self.backgroundColor = UIColor.clear
+        self.layer.cornerRadius = 20
     }
 }
+//
+//  CNLiveDownSlideViewModel.swift
+//  metaCode
+//
+//  Created by zx on 2023/10/19.
+//
+
+import Foundation
+import CNLiveRequestBastKit
+
+enum CNLiveDownSlideResponseType {
+    case success
+    case failed
+    case noNetwork
+    case unkonw
+}
+typealias downSlideResultBlock = (_ result: Any,_ status:CNLiveDownSlideResponseType) -> Void
+
+class CNLiveDownSlideViewModel:NSObject{
+    
+    /// 获取下滑页原生页面数据
+    /// - Parameters:
+    ///   - userId: 用户ID
+    ///   - pageId: 页面ID
+    static func requestGetPage(pageId:NSString, resultBlock: @escaping downSlideResultBlock) {
+        let param = NSMutableDictionary()
+        param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "userId")
+        param.setValue(pageId, forKey: "pageId")
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseCMSUrl+"/contentApi/getPage", 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")"
+                if (errorCode == "0") {
+                    let downSlideModelArr = resp["data"] as! NSArray
+                    var modelArray:[BaseModel] = []
+                    for downSlideDic in downSlideModelArr {
+                        let downSlideModel = newDictionaryToModel(downSlideDic as! [String : Any], CNLiveDownSlideModel.self)
+                        modelArray.append(downSlideModel)
+                    }
+                    resultBlock(modelArray,.success)
+                }
+                else{
+                    resultBlock(NSNull(),.failed)
+                }
+            }
+        }
+    }
+    
+}
+//
+//  CNLiveShopConsoleViewModel.swift
+//  metaCode
+//
+//  Created by zx on 2023/10/27.
+//
+
+import Foundation
+import CNLiveRequestBastKit
+
+class CNLiveShopConsoleViewModel: NSObject {
+    /// 用户信息获取
+    /// - Parameters:
+    ///   - userId: 用户ID
+    static func requestUserInfo(resultBlock: @escaping downSlideResultBlock) {
+        let param = NSMutableDictionary()
+        param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "uid")
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseShopUrl+"/api/v1/isSellerNew", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
+            hiddenLoading()
+            if (error == nil) {
+                let resp = result as! NSDictionary
+                let dataDic = resp["data"] as! NSDictionary
+                let shopUserInfoModel =  newDictionaryToModel(dataDic as! [String : Any], CNLiveShopUserInfoModel.self)
+                resultBlock(shopUserInfoModel,.success)
+            }else{
+                resultBlock(NSNull(),.failed)
+            }
+        }
+    }
+}
+//
+//  CNLiveShopDetailViewModel.swift
+//  metaCode
+//
+//  Created by zx on 2023/10/31.
+//
+
+import Foundation
+import CNLiveRequestBastKit
+
+class CNLiveShopDetailViewModel:NSObject{
+    /// 店铺详情信息获取
+    /// - Parameters:
+    ///   - userId: 用户ID
+    ///   - storeId:餐厅店铺id 不是餐厅达人不需要传
+    static func requestShopDetailInfo(storeId:String?,resultBlock: @escaping downSlideResultBlock) {
+        let param = NSMutableDictionary()
+        param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "uid")
+        param.setValue(storeId ?? "", forKey: "store_id")
+        
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseShopUrl+"/api/v1/index", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
+            hiddenLoading()
+            if (error == nil) {
+                let resp = result as! NSDictionary
+                let dataDic = resp["data"] as! NSDictionary
+                let shopDetailModel =  newDictionaryToModel(dataDic as! [String : Any], CNLiveShopDetailModel.self)
+                resultBlock(shopDetailModel,.success)
+            }else{
+                resultBlock(NSNull(),.failed)
+            }
+        }
+    }
+}
@@ -148,13 +148,15 @@ final class StandListModel: BaseModel, TableCodable {
     var descBackgroundImg: String = ""//首页文字背景图
     var cardImg: String = ""//卡片背景图
     var cardBackgroundImg: String = ""//首页卡片背景图
-    var upPath: String = ""//顶部h5
-    var downPath: String = ""//底部h5
+    var upPath: String = ""//顶部h5 或原生页面pageId
+    var upType: Int = 0//下滑类型1:h5 2:原生页面 3店铺详情 4 店铺控制台
+    var downType: Int = 0//上滑类型1:h5 2:原生页面 3店铺详情 4 店铺控制台
+    var downPath: String = ""//底部h5url 或原生页面pageId
     var auth: Bool = false//身份是否验证
     var createTimeString: String = ""
     var timeString: String = ""
-        
+    
     override func mapping(mapper: HelpingMapper) {
         mapper <<<
             self.createTime <-- TransformOf(fromJSON: { [weak self] (raw) -> Int in
+//
+//  CNLiveDownSlideModel.swift
+//  metaCode
+//
+//  Created by zx on 2023/10/19.
+//
+
+import Foundation
+
+// !!!: /contentApi/getPage 接口数据
+class CNLiveDownSlideModel: BaseModel {
+    ///大块标题id
+    var blockId: String?
+    ///大块标题
+    var blockName: String?
+    ///类型 type=4一排两个 74今日推荐 12列表全部课程 75单课程大图/
+    var type: String?
+    ///显示几行
+    var rowNum: Int = 0
+    ///具体内容 title subTitle poster thirdUrl或者shareUrl
+    var contents = [CNLiveDownSlideContentsModel]()
+    ///cell高度
+    var cellH: CGFloat = 0
+}
+
+//下滑tableview背景颜色
+let kCNDownSlideContentsModelModel1: String = "1"
+let kCNDownSlideContentsModelModel2: String = "2"
+let kCNDownSlideContentsModelModel3: String = "3"
+let kCNDownSlideContentsModelModel4: String = "4"
+let kCNDownSlideContentsModelModelAlbum: String = "album"
+let kCNDownSlideContentsModelModelAlbum_video: String = "album_video"
+let kCNDownSlideContentsModelModelAlbum_ugc: String = "album_ugc"
+
+class CNLiveDownSlideContentsModel: BaseModel {
+    ///内容id
+    var contentId: String?
+    ///主标题
+    var title: String?
+    ///副标题
+    var subTitle: String?
+    ///头像/
+    var poster: String?
+    ///videoId
+    var pid: String?
+    ///model
+    ///1,2时跳转:sharelUrl后面拼接 ?contentId=contentId&videoId=pid
+    ///3,4时跳转:thirdUrl
+    ///“album”,“album_video”,“album_ugc” -> http://wjjh5.cnlive.com/cnYmAlbumVideoList.html?aid=contentId&title=titlle
+   /// aid：专辑id，title：专辑名称(需要encode)
+    var model: String?
+    ///model为1,2时
+    var shareUrl: String?
+    ///model为3,4时跳转url
+    var thirdUrl: String?
+}
+//
+//  CNLiveShopConsoleModel.swift
+//  metaCode
+//
+//  Created by zx on 2023/10/28.
+//
+
+import Foundation
+///商城item类型
+enum CNLiveShopConsoleType:Int {
+    ///商城新增商品
+    case XZSP,
+    ///商城商品管理
+    SPGL,
+    ///新增优惠券
+    XZYHQ,
+    ///管理优惠券
+    GLYHQ,
+    ///创建店铺分类
+    CreateShopClassify,
+    ///店铺分类管理
+    ShopClassifyManager,
+    ///发布动态
+    FBDT,
+    ///动态管理
+    DTGL,
+    ///商城订单管理
+    DDGL,
+    ///商城交易记录
+    JYJL,
+    ///直播管理
+    OnManagerment
+
+    
+//    ///商城退款/售后
+//    SH,
+//    ///动态草稿箱
+//    CGX,
+//    ///餐品管理
+//    CPGL_REPAST,
+//    ///餐厅订单
+//    CTDD_REPAST,
+//    ///餐厅管理投诉/售后
+//    TSSH_REPAST,
+//    ///餐厅满减券
+//    MJQ_REPAST,
+//    ///餐厅管理
+//    CTGL_REPAST,
+//    ///餐厅商家配置
+//    SJPZ_REPAST,
+//    
+}
+    
+class CNLiveShopConsoleModel:BaseModel {
+    ///大分组
+    var list = [CNLiveShopConsoleListModel]()
+    
+    func initDataSource(){
+        var dataSource =
+        [["title":"商品管理",
+                "list":[
+                ["title":"新增商品", "subtitle":"创建新的商品", "simg":"DS_WB_XZSP", "type":0],
+                ["title":"商品管理", "subtitle":"管理现有的商品", "simg":"DS_WB_SPGL", "type":1]]],
+            ["title":"订单管理",
+                    "list":[
+                        ["title":"订单管理", "subtitle":"管理用户订单", "simg":"DS_WB_DDGL", "type":8]]],
+            ["title":"直播管理",
+                "list":[["title":"直播管理","subtitle":"申请创建直播","simg":"DS_WB_NO_Management","type":10]]]]
+        /**
+         var dataSource =
+         [["title":"商品管理",
+                 "list":[
+                 ["title":"新增商品", "subtitle":"创建新的商品", "simg":"DS_WB_XZSP", "type":0],
+                 ["title":"商品管理", "subtitle":"管理现有的商品", "simg":"DS_WB_SPGL", "type":1],
+                 ["title":"新增优惠券", "subtitle":"创建新增优惠券", "simg":"DS_WB_XZYHQ", "type":2],
+                 ["title":"优惠券管理", "subtitle":"管理现有的优惠券", "simg":"DS_WB_GLYHQ", "type":3]]],
+          ["title":"分类管理",
+                  "list":[
+                     ["title":"创建店铺分类", "subtitle":"创建店铺分类", "simg":"DS_WB_SJPZ_REPAST", "type":4],
+                     ["title":"店铺分类管理", "subtitle":"店铺分类管理", "simg":"DS_WB_DPFL", "type":5]]],
+              ["title":"动态管理",
+                     "list":[
+                         ["title":"发布动态", "subtitle":"发布新鲜动态", "simg":"DS_WB_FBDT", "type":6],
+                         ["title":"动态管理", "subtitle":"管理现有动态", "simg":"DS_WB_DTGL", "type":7]]],
+             ["title":"订单管理",
+                     "list":[
+                         ["title":"订单管理", "subtitle":"管理用户订单", "simg":"DS_WB_DDGL", "type":8]]],
+             ["title":"交易管理",
+                    "list":[
+                         ["title":"交易记录", "subtitle":"查看交易记录", "simg":"DS_WB_JYJL", "type":9]]],
+             ["title":"直播管理",
+                 "list":[["title":"直播管理","subtitle":"申请创建直播","simg":"DS_WB_NO_Management","type":10]]]]
+         */
+        for dic in dataSource{
+            let mdl = newDictionaryToModel(dic, CNLiveShopConsoleListModel.self)
+            list.append(mdl as! CNLiveShopConsoleListModel)
+            
+        }
+    }
+    
+}
+
+class CNLiveShopConsoleListModel: BaseModel {
+    /// section标题
+    var title: String?
+    /// item list内容
+    var list = [CNLiveShopConsoleListContentModel]()
+}
+
+class CNLiveShopConsoleListContentModel: BaseModel {
+    /// 图片
+    var simg: String?
+    /// 标题
+    var title: String?
+    /// 子标题
+    var subtitle: String?
+    /// 类型
+    var type:Int = 0//CNLiveShopConsoleType
+}
+//
+//  CNLiveShopDetailModel.swift
+//  metaCode
+//
+//  Created by zx on 2023/10/31.
+//
+
+import Foundation
+
+class CNLiveShopDetailModel:BaseModel{
+    ///banner
+    var banner = [CNLiveShopDetailBannerModel]()
+    ///是否显示申请入驻按钮组view
+    var is_show_btn: Bool?
+    ///是否显示用户信息view
+    var is_show_user: Bool?
+    ///是否显示退款订单推送提示红点
+    var is_show_tip: Bool?
+    ///快捷申请标题
+    var quick_title: String?
+    ///快捷申请url
+    var quick_url: String?
+    ///退款订单数
+    var order_return_num: String?
+    ///申请入驻按钮组
+    var btn = [CNLiveShopDetailBtnModel]()
+    ///用户信息
+    var user: CNLiveShopDetailUserModel?
+    ///空的话 跳转注册登录 有值的话 跳url
+    var user_btn: String?
+    ///是否为商家
+    var is_seller: Bool?
+    ///0老达人 1普通商家 2文创精品 3健康餐桌 8达人
+    var seller_type: Int = 0
+    ///商家数据
+    var seller_data: CNLiveShopDetailSellerDataModel?
+    ///达人动态
+    var dynamic = [CNLiveShopDetailDynamicModel]()
+    ///餐厅店铺信息
+    var foods_shop: CNLiveShopDetailFoodsShopModel?
+}
+
+class CNLiveShopDetailBannerModel:BaseModel{
+    ///id
+    var id: String?
+    ///标题
+    var title: String?
+    ///图片
+    var simg: String?
+    ///1跳全屏url 其他不跳
+    var type: String?
+    ///url
+    var url: String?
+}
+
+class CNLiveShopDetailBtnModel:BaseModel{
+    ///标题
+    var title: String?
+    ///图片
+    var image: String?
+    ///url
+    var url: String?
+}
+
+class CNLiveShopDetailUserModel:BaseModel{
+    ///0 未申请过 1 未提交 2 审核中 3 审核拒绝 4 审核通过
+    var state: Int = 0
+    ///头像
+    var user_img: String?
+    ///名称
+    var username: String?
+}
+
+class CNLiveShopDetailSellerDataModel:BaseModel{
+    ///每日订单数
+    var day_order: Int = 0
+    ///每日订单金额
+    var day_order_money: String?
+    ///电商剩余金额
+    var shop_money: String?
+    ///老达人余额
+    var daren_money: String?
+    ///总余额
+    var total_money: String?
+    
+}
+
+class CNLiveShopDetailDynamicModel:BaseModel{
+    ///动态id
+    var id: String?
+    ///动态内容
+    var title: String?
+    ///用户id
+    var uid: String?
+    ///发布时间
+    var addtime: Double?
+    ///经度
+    var longitude: String?
+    ///纬度
+    var latitude: String?
+    ///浏览数
+    var pv: Int = 0
+    ///点赞数
+    var upper: Int = 0
+    ///评论数
+    var comment: Int = 0
+    ///定位
+    var location: String?
+    ///视频
+    var video: String?
+    ///是否点赞 1点赞 0没点
+    var is_upper: Bool?
+    ///是否显示 1显示 0隐藏
+    var state: Bool?
+    ///商品id
+    var goods_id: String?
+    ///视频封面图
+    var video_img: String?
+    ///封面图数组
+    var img = [Array<String>]()
+    ///达人信息
+    var shop_user: CNLiveShopDetailDynamicShopUserModel?
+    ///热门评论
+    var comment_content: CNLiveShopDetailDynamicCommentModel?
+    ///商品
+    var goods: CNLiveShopDetailDynamicGoodsModel?
+}
+
+// MARK: - 达人数据
+class CNLiveShopDetailDynamicShopUserModel:BaseModel{
+    ///店铺id
+    var id: String?
+    ///达人名称
+    var title: String?
+    ///达人头像
+    var logo: String?
+    ///达人id
+    var uid: String?
+}
+
+// MARK: - 热门评论
+class CNLiveShopDetailDynamicCommentModel:BaseModel{
+    ///评论id
+    var id: String?
+    ///用户id
+    var uid: String?
+    ///评论内容
+    var content: String?
+    ///评论时间
+    var addtime: Double?
+    ///点赞数
+    var upper: Int = 0
+}
+
+// MARK: - 商品
+class CNLiveShopDetailDynamicGoodsModel:BaseModel{
+    ///商品id
+    var id: String?
+    ///商品标题
+    var title: String?
+    ///1普通商品 2文创商品
+    var shop_type: String?
+    ///
+    var type: String?
+    ///
+    var to: String?
+    ///现价
+    var price: String?
+    ///原价
+    var prices: String?
+    ///广告语
+    var ads: String?
+    ///商品封面
+    var simg: String?
+}
+
+// MARK: - 餐厅店铺信息
+class CNLiveShopDetailFoodsShopModel:BaseModel{
+    ///店铺名称
+    var title: String?
+    ///店铺id
+    var id: String?
+}
+
+
+
+//
+//  CNLiveShopUserInfoModel.swift
+//  metaCode
+//
+//  Created by zx on 2023/10/27.
+//
+
+import Foundation
+
+//获取用户信息
+class CNLiveShopUserInfoModel:BaseModel{
+    ///darenid生成付款码时用到
+    var daren_id: String?
+    ///uid 用于请求老达人信息接口
+    var daren_uid: String?
+    ///id
+    var id: String?
+    ///链接im的id  daren_XXXXX
+    var im_id: String?
+    ///0 未申请过 1 未提交 2 审核中 3 审核拒绝 4 审核通过(type==0踢出)
+    var state: String?
+    ///0 老达人 1 普通商家 2 文创精品 3 健康餐桌 8 达人
+    var type: String?
+    ///达人申请地址
+    var url: String?
+    ///链接im的token
+    var token: String?
+    ///商家是否可用 1可用 0禁用（禁用踢出）
+    var is_able: String?
+    ///商家昵称
+    var title: String?
+    ///商家logo
+    var logo: String?
+}
+/**
+ Printing description of ((__NSDictionaryI *)0x000000010884eca0):
+ {
+     "daren_id" = "daren_10505455";
+     "daren_uid" = 10505455;
+     id = 219;
+     "im_id" = "daren_10505455";
+     "is_able" = 0;
+     logo = "https://wjj.ys2.cnliveimg.com/769/shop/img/2021/01/06/5ff567b950c9a";
+     qqUid = "";
+     sinaUid = "";
+     state = 4;
+     title = "\U4e1c\U5317\U5473\U9053";
+     token = "eJxNjl1PgzAYhf9LbzXaFkqKiRcEyAZjZvNjmYlJU9dOOzJo2so6jP9dRrbo7fOc9z3nGzxXTzd8s2m-GsfcUUtwByC4HrESsnFqq6QZoOBGNgxBAklIyDnBtVaCcccCI-4dWlGzUQ0MhRBCgiJ6kdJrZSTjWzf*xSTGQ*IsO2msapsTh4ggHED4J53an*ahKKYBpRGNLnXqY8Dz-CUtct7b-atHWPr34uqQpCV9zPtliKu67H2c6WCxK99uU*jmNlF54goVrq3Pp369yFzX0VDvspmnq3oSZ*3xUE3l54wuVw8Teg9*fgGu0Fnz";
+     type = 8;
+     uid = 10505455;
+     url = "https://managemall.cnlive.com/html/preferred-library-b/1/#/pages/checkIt/checkIt?redirect=daren";
+     wxUid = "oBAMNt5Phwrb_kWID0EyxYsZU3d0";
+ }
+ */
+//
+//  CNLiveAdaptTool.swift
+//  metaCode
+//
+//  Created by zx on 2023/11/2.
+//
+
+import Foundation
+
+class CNLiveAdaptTool:NSObject{
+    class func adaptLength(length:CGFloat) -> CGFloat{
+        
+        let multiple = KSreenWidth / 375.0
+        let f_adapt_length = floor(length * multiple)
+        return f_adapt_length
+    }
+}
+//
+//  CNLiveDownSlideModelLayout.swift
+//  metaCode
+//
+//  Created by zx on 2023/10/23.
+//
+
+import Foundation
+
+
+class CNLiveDownSlideModelLayout:NSObject{
+    
+    ///cell高度
+    var cellH:CGFloat = 0.0
+    
+    //slideModel
+    var _slideModel : CNLiveDownSlideModel?
+    var slideModel : CNLiveDownSlideModel? {
+        get{
+            _slideModel
+        }
+        set{
+            _slideModel = newValue
+        }
+    }
+    
+    init(model:CNLiveDownSlideModel){
+        super.init()
+        self.slideModel = model
+        //总块数
+        let contentsNum = model.contents.count
+        //model行数
+        let row = model.rowNum
+        if(_slideModel?.type == SlideModelTypeRecommend4){//推荐活动,推荐课程
+            
+            //总显示块数/循环数
+            var totalNum = (contentsNum >= row*2) ? row*2 : contentsNum
+            if row == 0{//row为0 , contents全部显示
+                totalNum = contentsNum
+            }
+            _slideModel?.cellH = ceil(CGFloat(totalNum)*0.5)*(DownSlideRecommendWH + DownSlideRecommendLeftGap)
+        }else if(_slideModel?.type == SlideModelTypeTodayRecommend74){//今日推荐
+            //总显示块数/循环数
+            var totalNum = (contentsNum >= row) ? row : contentsNum
+            if row == 0{//row为0 , contents全部显示
+                totalNum = contentsNum
+            }
+            _slideModel?.cellH = CGFloat(totalNum)*(DownSlideTodayRecommendH + DownSlideRecommendLeftGap)
+        }else if(_slideModel?.type == SlideModelTypeAllCourse12){//全部课程
+            
+            _slideModel?.cellH = DownSlideAllCourseTitleH + DownSlideAllCourseRowH * CGFloat(_slideModel!.rowNum)+DownSlideRecommendLeftGap
+            
+        }else if(_slideModel?.type == SlideModelTypeOneCourse75){//单节课程
+            
+            _slideModel?.cellH = DownSlideSingleCourseImgH + DownSlideSingleCourseMoreH+DownSlideRecommendLeftGap
+        }else{
+            _slideModel?.cellH = 0
+        }        
+    }
+    func getCellHModel()->CNLiveDownSlideModel{
+        return _slideModel!
+    }
+    
+}
+//
+//  CNLiveDownSlideTool.swift
+//  metaCode
+//
+//  Created by zx on 2023/10/25.
+//
+
+import Foundation
+
+class CNLiveDownSlideTool:NSObject{
+    class func pushWebVCWithContentsMdl(contentMdl:CNLiveDownSlideContentsModel){
+        
+        if (contentMdl.model == kCNDownSlideContentsModelModel1) || (contentMdl.model == kCNDownSlideContentsModelModel2){
+            
+            let queryItem = URLQueryItem(name: "contentId", value: contentMdl.contentId)
+            let queryItem1 = URLQueryItem(name: "videoId", value: contentMdl.pid)
+            let urlComponents = NSURLComponents(string: (contentMdl.shareUrl)!)!
+            urlComponents.queryItems = [queryItem, queryItem1]
+            let regURL = urlComponents.url
+            let webVC = CNWebViewController()
+            webVC.url = regURL
+            currentViewController()?.navigationController?.pushViewController(webVC, animated: true)
+           
+        }else if (contentMdl.model == kCNDownSlideContentsModelModel3) || (contentMdl.model == kCNDownSlideContentsModelModel4){
+            let webVC = CNWebViewController()
+            webVC.url = URL(string: (contentMdl.thirdUrl)!)
+            currentViewController()?.navigationController?.pushViewController(webVC, animated: true)
+        }else if (contentMdl.model == kCNDownSlideContentsModelModelAlbum) || (contentMdl.model == kCNDownSlideContentsModelModelAlbum_ugc) || (contentMdl.model == kCNDownSlideContentsModelModelAlbum_video){
+            
+            let urlString = "http://wjjh5.cnlive.com/cnYmAlbumVideoList.html"
+            let queryItem = URLQueryItem(name: "aid", value: contentMdl.contentId)
+            let queryItem1 = URLQueryItem(name: "title", value: contentMdl.title)
+            let urlComponents = NSURLComponents(string: urlString)
+            urlComponents!.queryItems = [queryItem, queryItem1]
+            let regURL = urlComponents?.url
+            let webVC = CNWebViewController()
+            webVC.url = regURL
+            currentViewController()?.navigationController?.pushViewController(webVC, animated: true)
+        }else{
+            return
+        }
+    }
+    
+    class func detailPushWebVCWithContentsMdl(contentMdl:CNLiveDownSlideContentsModel,viewController:UIViewController){
+        
+        if (contentMdl.model == kCNDownSlideContentsModelModel1) || (contentMdl.model == kCNDownSlideContentsModelModel2){
+            
+            let queryItem = URLQueryItem(name: "contentId", value: contentMdl.contentId)
+            let queryItem1 = URLQueryItem(name: "videoId", value: contentMdl.pid)
+            let urlComponents = NSURLComponents(string: (contentMdl.shareUrl)!)!
+            urlComponents.queryItems = [queryItem, queryItem1]
+            let regURL = urlComponents.url
+            let webVC = CNWebViewController()
+            webVC.url = regURL
+            viewController.navigationController?.pushViewController(webVC, animated: true)
+           
+        }else if (contentMdl.model == kCNDownSlideContentsModelModel3) || (contentMdl.model == kCNDownSlideContentsModelModel4){
+            let webVC = CNWebViewController()
+            webVC.url = URL(string: (contentMdl.thirdUrl)!)
+            viewController.navigationController?.pushViewController(webVC, animated: true)
+        }else if (contentMdl.model == kCNDownSlideContentsModelModelAlbum) || (contentMdl.model == kCNDownSlideContentsModelModelAlbum_ugc) || (contentMdl.model == kCNDownSlideContentsModelModelAlbum_video){
+            
+            let urlString = "http://wjjh5.cnlive.com/cnYmAlbumVideoList.html"
+            let queryItem = URLQueryItem(name: "aid", value: contentMdl.contentId)
+            let queryItem1 = URLQueryItem(name: "title", value: contentMdl.title)
+            let urlComponents = NSURLComponents(string: urlString)
+            urlComponents!.queryItems = [queryItem, queryItem1]
+            let regURL = urlComponents?.url
+            let webVC = CNWebViewController()
+            webVC.url = regURL
+            viewController.navigationController?.pushViewController(webVC, animated: true)
+        }else{
+            return
+        }
+    }
+}
+//
+//  CNUpSlideAnimationTransition.swift
+//  metaCode
+//
+//  Created by zx on 2023/10/16.
+//
+
+import UIKit
+
+fileprivate let transitonDuration: TimeInterval = 1.0
+
+
+enum AnimationType {
+    case present
+    case dismiss
+}
+
+class CNUpSlideAnimationTransition: NSObject {
+    let animationType: AnimationType!
+    
+    init(animationType: AnimationType) {
+        self.animationType = animationType
+        super.init()
+    }
+}
+
+extension CNUpSlideAnimationTransition: UIViewControllerAnimatedTransitioning {
+    func transitionDuration(using transitionContext: UIViewControllerContextTransitioning?) -> TimeInterval {
+        return transitonDuration
+    }
+    
+    func animateTransition(using transitionContext: UIViewControllerContextTransitioning) {
+        if animationType == .present {
+            animationForPresent(using: transitionContext)
+        } else {
+            animationForDismiss(using: transitionContext)
+        }
+    }
+    
+    func animationForPresent(using transitionContext: UIViewControllerContextTransitioning) {
+        let containerView = transitionContext.containerView
+        //1.Get fromVC and toVC
+        guard let fromVC = transitionContext.viewController(forKey: .from) as? CNUpSlideViewController else { return }
+        guard let toNaviVC = transitionContext.viewController(forKey: .to) as? CNSlideBaseNavigationController else { return }
+        guard let selectedCell = fromVC.selectedCell else { return }
+        let toVC = toNaviVC.topViewController as! CNUpSlideDetailViewController
+        let frame = selectedCell.convert(selectedCell.bgBackView.frame, to: fromVC.view)
+        //2.Set presentation original size.
+        toVC.view.frame = frame
+        toVC.scrollView.imageView.frame.size.width = GlobalConstants.todayCardSize.width
+        toVC.scrollView.imageView.frame.size.height = GlobalConstants.todayCardSize.height
+        
+        containerView.addSubview(toNaviVC.view)
+        
+        //3.Change original size to final size with animation.
+        UIView.animate(withDuration: transitonDuration, delay: 0, usingSpringWithDamping: 0.5, initialSpringVelocity: 0, options: [], animations: {
+            toVC.view.frame = UIScreen.main.bounds
+            toVC.scrollView.imageView.frame.size.width = KSreenWidth
+            toVC.scrollView.imageView.frame.size.height = KSreenWidth*DownSlideSingleCourseImgH/DownSlideSingleCourseW
+            toVC.closeBtn.alpha = 1
+            
+        }) { (completed) in
+            transitionContext.completeTransition(completed)
+        }
+    }
+    
+    func animationForDismiss(using transitionContext: UIViewControllerContextTransitioning) {
+        guard let fromNaviVC = transitionContext.viewController(forKey: .from) as? CNSlideBaseNavigationController else { return }
+        guard let toVC = transitionContext.viewController(forKey: .to) as? CNUpSlideViewController else { return }
+        guard let selectedCell = toVC.selectedCell else { return }
+        let fromVC = fromNaviVC.topViewController as! CNUpSlideDetailViewController
+        
+        UIView.animate(withDuration: transitonDuration - 0.3, delay: 0, usingSpringWithDamping: 0.8, initialSpringVelocity: 0, options: [], animations: {
+            let frame = selectedCell.convert(selectedCell.bgBackView.frame, to: toVC.view)
+            fromVC.view.frame = frame
+            fromVC.view.layer.cornerRadius = GlobalConstants.toDayCardCornerRadius
+            fromVC.scrollView.imageView.frame.size.width = GlobalConstants.todayCardSize.width
+            fromVC.scrollView.imageView.frame.size.height = GlobalConstants.todayCardSize.height
+            fromVC.closeBtn.alpha = 0
+            
+        }) { (completed) in
+            transitionContext.completeTransition(completed)
+        }
+    }
+    
+}
@@ -68,7 +68,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         let ver : String = Bundle.main.infoDictionary?["CFBundleVersion"] as! String
         let p : Dictionary = ["platform_id":kAppBundleID,"uuid":uuid,"plat":"i","ver":ver,"appId":APPId,"timestamp":String(NSNumber(floatLiteral: Date().timeIntervalSince1970).intValue),"clientPlat":"i","frmId":"ios"]
         CNLiveNetworking.setupDefaultParam(p)
-        
+
         let shop_dic : Dictionary = ["Phone-Model":"iPhone","Uid":UserInfoManager.shared.userInfo.uid ,"CFBundleShortVersionString":ver,"Shop-Version":"0.6.2"]
         CNLiveNetworking.setupDSShopParam(shop_dic)
         CNLiveNetworking.setRequestTimeoutInterval(10)
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "DS_WB_DDGL@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "DS_WB_DPFL@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "DS_WB_DTGL@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "DS_WB_FBDT@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "DS_WB_GLYHQ@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "DS_WB_JYJL@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "DS_WB_NO_Management@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "DS_WB_SJPZ_REPAST@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "DS_WB_SPGL@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "DS_WB_XZSP@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "DS_WB_XZYHQ@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "close_button@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "homepage_down_enter@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "homepage_down_more@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}