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

liushiyu
2 parents 340fbb99 29260fdd
Showing 34 changed files with 1114 additions and 181 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Config/CNLiveConfigManager.swift
metaCode/Classes/Main/HomePage/Controller/AuthMainController/CNMetaCodeHomePageController.swift
metaCode/Classes/Main/HomePage/Controller/DownSlideController/CNUpSlideDetailViewController.swift
metaCode/Classes/Main/HomePage/Controller/DownSlideController/CNUpSlideViewController.swift
metaCode/Classes/Main/HomePage/Controller/ShopUpConsole/CNLiveShopConsoleController.swift → metaCode/Classes/Main/HomePage/Controller/ShopDownConsole/CNLiveShopConsoleController.swift
metaCode/Classes/Main/HomePage/Controller/ShopPayController/CNLiveShopPayController.swift
metaCode/Classes/Main/HomePage/Controller/ShopDownDetail/CNLiveDownShopDetailController.swift → metaCode/Classes/Main/HomePage/Controller/ShopUpDetail/CNLiveDownShopDetailController.swift
metaCode/Classes/Main/HomePage/Controller/WebController/CNWebView.swift
metaCode/Classes/Main/HomePage/Controller/WebController/CNWebViewController.swift
metaCode/Classes/Main/HomePage/View/Shop/GoodsManager/CNLiveShopClassifySectionHeaderView.swift
metaCode/Classes/Main/HomePage/View/Shop/ShopDetail/CNLliveShopDetailCloseCell.swift
metaCode/Classes/Main/HomePage/View/Shop/Shoph5Pay/CNLiveShopPayNeedPaymentCell.swift
metaCode/Classes/Main/HomePage/View/Shop/Shoph5Pay/CNLiveShopPayWeChatAlipayCell.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/DownSlide/CNDownSlideSingleCourseCell.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/DownSlide/CNDownSlideView.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/UpSlide/CNUpSlideView.swift
metaCode/Classes/Main/HomePage/ViewModel/CNLiveShoph5ViewModel.swift
metaCode/Classes/Main/Model/CNLiveDownSlideModel.swift
metaCode/Classes/Main/Model/CNLivePayOrderInfoModel.swift
@@ -110,6 +110,11 @@
 		19AD65AA2BA041210045A444 /* CNLiveGoodsDetailsTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19AD65A92BA041210045A444 /* CNLiveGoodsDetailsTableViewCell.swift */; };
 		19AD65AC2BA16CF20045A444 /* CNLiveShopCommentRequestShareModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19AD65AB2BA16CF20045A444 /* CNLiveShopCommentRequestShareModel.swift */; };
 		19AD65AE2BA177C20045A444 /* CNLiveShopGoodsDetailsTableHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19AD65AD2BA177C20045A444 /* CNLiveShopGoodsDetailsTableHeaderView.swift */; };
+		19B153CB2BC3E1870018906C /* CNLiveShopPayController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19B153CA2BC3E1870018906C /* CNLiveShopPayController.swift */; };
+		19B153CD2BC3EB690018906C /* CNLiveShoph5ViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19B153CC2BC3EB690018906C /* CNLiveShoph5ViewModel.swift */; };
+		19B153CF2BC540FF0018906C /* CNLivePayOrderInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19B153CE2BC540FF0018906C /* CNLivePayOrderInfoModel.swift */; };
+		19B153D22BC623980018906C /* CNLiveShopPayNeedPaymentCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19B153D12BC623980018906C /* CNLiveShopPayNeedPaymentCell.swift */; };
+		19B153D42BC623BE0018906C /* CNLiveShopPayWeChatAlipayCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19B153D32BC623BE0018906C /* CNLiveShopPayWeChatAlipayCell.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 */; };
@@ -129,6 +134,7 @@
 		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 */; };
+		19E302672BC8FEBC00F6B8BD /* CNLliveShopDetailCloseCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19E302662BC8FEBC00F6B8BD /* CNLliveShopDetailCloseCell.swift */; };
 		19E9D1602B3A98C200D0FB30 /* CNLiveShopAssociatedGoodsTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19E9D15F2B3A98C200D0FB30 /* CNLiveShopAssociatedGoodsTableViewCell.swift */; };
 		19E9D1622B3BBB2E00D0FB30 /* CNLiveFileManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19E9D1612B3BBB2E00D0FB30 /* CNLiveFileManager.swift */; };
 		19F1C2332AB5728B0083D06C /* CNIDCardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19F1C2322AB5728B0083D06C /* CNIDCardView.swift */; };
@@ -379,6 +385,11 @@
 		19AD65A92BA041210045A444 /* CNLiveGoodsDetailsTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveGoodsDetailsTableViewCell.swift; sourceTree = "<group>"; };
 		19AD65AB2BA16CF20045A444 /* CNLiveShopCommentRequestShareModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopCommentRequestShareModel.swift; sourceTree = "<group>"; };
 		19AD65AD2BA177C20045A444 /* CNLiveShopGoodsDetailsTableHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopGoodsDetailsTableHeaderView.swift; sourceTree = "<group>"; };
+		19B153CA2BC3E1870018906C /* CNLiveShopPayController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopPayController.swift; sourceTree = "<group>"; };
+		19B153CC2BC3EB690018906C /* CNLiveShoph5ViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShoph5ViewModel.swift; sourceTree = "<group>"; };
+		19B153CE2BC540FF0018906C /* CNLivePayOrderInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLivePayOrderInfoModel.swift; sourceTree = "<group>"; };
+		19B153D12BC623980018906C /* CNLiveShopPayNeedPaymentCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopPayNeedPaymentCell.swift; sourceTree = "<group>"; };
+		19B153D32BC623BE0018906C /* CNLiveShopPayWeChatAlipayCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopPayWeChatAlipayCell.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>"; };
@@ -398,6 +409,7 @@
 		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>"; };
+		19E302662BC8FEBC00F6B8BD /* CNLliveShopDetailCloseCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLliveShopDetailCloseCell.swift; sourceTree = "<group>"; };
 		19E9D15F2B3A98C200D0FB30 /* CNLiveShopAssociatedGoodsTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopAssociatedGoodsTableViewCell.swift; sourceTree = "<group>"; };
 		19E9D1612B3BBB2E00D0FB30 /* CNLiveFileManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveFileManager.swift; sourceTree = "<group>"; };
 		19F1C2322AB5728B0083D06C /* CNIDCardView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNIDCardView.swift; sourceTree = "<group>"; };
@@ -711,20 +723,20 @@
 			path = Controller;
 			sourceTree = "<group>";
 		};
-		1938BD182B454DB100390A34 /* ShopUpConsole */ = {
+		1938BD182B454DB100390A34 /* ShopDownConsole */ = {
 			isa = PBXGroup;
 			children = (
 				19BB1FE02AEB5C220094D962 /* CNLiveShopConsoleController.swift */,
 			);
-			path = ShopUpConsole;
+			path = ShopDownConsole;
 			sourceTree = "<group>";
 		};
-		1938BD192B454E1500390A34 /* ShopDownDetail */ = {
+		1938BD192B454E1500390A34 /* ShopUpDetail */ = {
 			isa = PBXGroup;
 			children = (
 				19BB1FEB2AF0AB8E0094D962 /* CNLiveDownShopDetailController.swift */,
 			);
-			path = ShopDownDetail;
+			path = ShopUpDetail;
 			sourceTree = "<group>";
 		};
 		1938BD1A2B4554A800390A34 /* AuthMainController */ = {
@@ -851,6 +863,7 @@
 				191733402B284D4A007BCC04 /* ShopCoupon */,
 				19565ED02AF8D904007D6727 /* GoodsManager */,
 				1938BD4D2B512F4600390A34 /* ShopDetail */,
+				19B153D02BC623780018906C /* Shoph5Pay */,
 			);
 			path = Shop;
 			sourceTree = "<group>";
@@ -866,6 +879,7 @@
 		1938BD4D2B512F4600390A34 /* ShopDetail */ = {
 			isa = PBXGroup;
 			children = (
+				19E302662BC8FEBC00F6B8BD /* CNLliveShopDetailCloseCell.swift */,
 				19BB1FF12AF21A950094D962 /* CNLliveShopDetailBannerCell.swift */,
 				19565EBF2AF4DE0E007D6727 /* CNLiveShopDetailBtnsCell.swift */,
 				19565EC12AF616CA007D6727 /* CNLiveShopDetailOrderAssetCell.swift */,
@@ -961,6 +975,23 @@
 			path = CNLiveDownslideOperationManager;
 			sourceTree = "<group>";
 		};
+		19B153C92BC3E1550018906C /* ShopPayController */ = {
+			isa = PBXGroup;
+			children = (
+				19B153CA2BC3E1870018906C /* CNLiveShopPayController.swift */,
+			);
+			path = ShopPayController;
+			sourceTree = "<group>";
+		};
+		19B153D02BC623780018906C /* Shoph5Pay */ = {
+			isa = PBXGroup;
+			children = (
+				19B153D12BC623980018906C /* CNLiveShopPayNeedPaymentCell.swift */,
+				19B153D32BC623BE0018906C /* CNLiveShopPayWeChatAlipayCell.swift */,
+			);
+			path = Shoph5Pay;
+			sourceTree = "<group>";
+		};
 		19BB1FE42AEB93850094D962 /* Model */ = {
 			isa = PBXGroup;
 			children = (
@@ -972,6 +1003,7 @@
 				19BB1FE52AEB93B80094D962 /* CNLiveShopUserInfoModel.swift */,
 				19BB1FE72AECAD060094D962 /* CNLiveShopConsoleModel.swift */,
 				19BB1FEF2AF0E5B30094D962 /* CNLiveShopDetailModel.swift */,
+				19B153CE2BC540FF0018906C /* CNLivePayOrderInfoModel.swift */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -1406,6 +1438,7 @@
 				1926C28E2AE0D76C00C71DC3 /* CNLiveDownSlideViewModel.swift */,
 				19BB1FE22AEB8B7C0094D962 /* CNLiveShopConsoleViewModel.swift */,
 				19BB1FED2AF0E1EC0094D962 /* CNLiveShopDetailViewModel.swift */,
+				19B153CC2BC3EB690018906C /* CNLiveShoph5ViewModel.swift */,
 			);
 			name = ViewModel;
 			path = HomePage/ViewModel;
@@ -1439,11 +1472,12 @@
 				1938BD1A2B4554A800390A34 /* AuthMainController */,
 				1938BD1C2B4555A000390A34 /* WebController */,
 				1938BD1B2B45557700390A34 /* DownSlideController */,
-				1938BD192B454E1500390A34 /* ShopDownDetail */,
-				1938BD182B454DB100390A34 /* ShopUpConsole */,
+				1938BD192B454E1500390A34 /* ShopUpDetail */,
+				1938BD182B454DB100390A34 /* ShopDownConsole */,
 				1917333D2B284C6B007BCC04 /* ShopCoupon */,
 				191732FC2B0B3EB4007BCC04 /* GoodsDetail */,
 				19565EC32AF8ACC2007D6727 /* GoodsManager */,
+				19B153C92BC3E1550018906C /* ShopPayController */,
 			);
 			name = Controller;
 			path = HomePage/Controller;
@@ -1755,6 +1789,7 @@
 				19BB202B2AF382150094D962 /* CNLiveAdaptTool.swift in Sources */,
 				79E672032AFDFA9C00F2F768 /* CNLiveMineSignOutViewController.swift in Sources */,
 				19565ECD2AF8D256007D6727 /* CNLiveShopGoodsListClassifyView.swift in Sources */,
+				19E302672BC8FEBC00F6B8BD /* CNLliveShopDetailCloseCell.swift in Sources */,
 				1938BD322B4B8F0400390A34 /* CNLiveHomePageModel.swift in Sources */,
 				191732EF2B075C3A007BCC04 /* CNLiveCreateShopClassifyViewController.swift in Sources */,
 				1938BD302B4B8A3500390A34 /* CNLiveHomePageViewModel.swift in Sources */,
@@ -1788,10 +1823,12 @@
 				79BB1C162B05C62900C5720C /* CNLiveShopBodyCouponView.swift in Sources */,
 				798916E92B04532D00D08302 /* CNLiveSavePointDB.swift in Sources */,
 				1938BD242B468AC900390A34 /* CNLivePlayletHomePageHeaderCell.swift in Sources */,
+				19B153D42BC623BE0018906C /* CNLiveShopPayWeChatAlipayCell.swift in Sources */,
 				19FA20172AE22D3C001F7186 /* CNLiveDownSlideRecommendCell.swift in Sources */,
 				19123FC12ABC11170075C883 /* CNWebViewController.swift in Sources */,
 				1926C28F2AE0D76C00C71DC3 /* CNLiveDownSlideViewModel.swift in Sources */,
 				790D019D2A2DCBD000C5978D /* UIView+CNLiveExtensions.swift in Sources */,
+				19B153CF2BC540FF0018906C /* CNLivePayOrderInfoModel.swift in Sources */,
 				7C7C62F62A4D72E9007A912E /* CNLiveIdentityDB.swift in Sources */,
 				191732E52B05FFE8007BCC04 /* CNLiveModalPresentationViewController.swift in Sources */,
 				799172342AF08D3200DC01A8 /* CNLiveShopViewModel.swift in Sources */,
@@ -1811,6 +1848,7 @@
 				19565EC72AF8AD38007D6727 /* CNLiveShopNewProductController.swift in Sources */,
 				798A44F72A3077ED00815935 /* CNLiveHotButton.swift in Sources */,
 				7CD6753D2A2740B0008354C1 /* CNMainView.swift in Sources */,
+				19B153CB2BC3E1870018906C /* CNLiveShopPayController.swift in Sources */,
 				191733662B39237D007BCC04 /* CNLiveShopGoodsManageListTableViewCell.swift in Sources */,
 				793CAF522A58FCA200882EF4 /* CNLiveMineExchangeViewController.swift in Sources */,
 				1917334E2B2C1A08007BCC04 /* CNLiveSelectCouponTapView.swift in Sources */,
@@ -1861,7 +1899,9 @@
 				1938BD222B467C1700390A34 /* CNLivePlayletHomePageCell.swift in Sources */,
 				1938BD3F2B4BE7C500390A34 /* CNLiveAlbumMsgModel.swift in Sources */,
 				798A44FF2A30A0A800815935 /* CNLiveInputFeedBackViewController.swift in Sources */,
+				19B153D22BC623980018906C /* CNLiveShopPayNeedPaymentCell.swift in Sources */,
 				79282A442A2F1C1E00B5F8CF /* CNLiveLoginAuthView.swift in Sources */,
+				19B153CD2BC3EB690018906C /* CNLiveShoph5ViewModel.swift in Sources */,
 				79BB96A62AF21E2800AEA4AC /* CNLiveShopOrderDetailViewController.swift in Sources */,
 				194455A12B6B3310006C5A2A /* CNWebView.swift in Sources */,
 				1938BD2C2B4801A700390A34 /* CNHomePageAnimationTransition.swift in Sources */,
@@ -2132,7 +2172,7 @@
 				CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.0.9.24.03.29.15;
+				CURRENT_PROJECT_VERSION = 1.1.0.24.04.15.12;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				ENABLE_BITCODE = NO;
@@ -2205,7 +2245,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.9;
+				MARKETING_VERSION = 1.1.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-all_load",
@@ -2388,7 +2428,7 @@
 				CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.0.9.24.03.29.15;
+				CURRENT_PROJECT_VERSION = 1.1.0.24.04.15.12;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = NO;
@@ -2460,7 +2500,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.9;
+				MARKETING_VERSION = 1.1.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-all_load",
@@ -95,4 +95,9 @@ extension Notification.Name {
         //认证页垂直方向是哪个页面的通知 1上面页 2中间页 3下面页
         public static let kAuthVNumPageChangedNotification = Notification.Name("kAuthVNumPageChangedNotification")
     }
+    struct ShopOrderManage{
+        //电商h5订单支付成功通知
+        public static let kDSSuccessPayOrderNotification = Notification.Name("kDSSuccessPayOrderNotification")
+    }
+    
 }
@@ -245,6 +245,7 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
         super.viewWillAppear(animated)
         self.view.height = KSreenHeight
         self.topNavView.isHidden = true
+        self.hiddenLeftRightView()
 //        print("22222222currentPageIndex:\(self.pageFlowView.currentPageIndex)")
         switch vNumPage {
         case .VNumPageMain://中间主页
@@ -263,10 +264,16 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
     override func viewDidLayoutSubviews() {
         super.viewDidLayoutSubviews()
         //解决self.view变成KSreenHeight-KTabBarHeight的问题
-        if self.view.height == KSreenHeight-KTabBarHeight{
+        switch vNumPage {
+        case .VNumPageMain://中间主页
+            break
+        case .VNumPageUp://上滑页
+            self.view.height = KSreenHeight
+        case .VNumPageDown://下滑页
             self.view.height = KSreenHeight
         }
     }
+    
     deinit {
         /// 移除通知
         NotificationCenter.default.removeObserver(self)
@@ -505,6 +512,7 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
         let identityModel = dataArray[toIndex] as! StandListModel
         if let toBannerView =  self.pageFlowView.cells[toIndex] as? CNCustomIndexView{
+            self.pageFlowView.scrollView.bringSubviewToFront(toBannerView)
             UIView.animate(withDuration: 0.2) {
                 toBannerView.downSlideView.frame = CGRectMake(-LeftGap, 0, KSreenWidth, KSreenHeight)
                 toBannerView.downSlideView.upSlideVC.view.height = KSreenHeight-DownSlideBottomViewHeight
@@ -515,32 +523,22 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
             }
         }
-        if let toBannerViewLeftView =  self.pageFlowView.cells[toIndex-1] as? CNCustomIndexView{
-            UIView.animate(withDuration: 0.2) {
-                toBannerViewLeftView.downSlideView.frame = CGRectMake(-LeftGap, 0, 0, 0)
-                toBannerViewLeftView.upSlideView.frame = CGRectMake(-LeftGap, KSreenHeight*2,0, 0)
+        if toIndex-1 >= 0{
+            if let toBannerViewLeftView =  self.pageFlowView.cells[toIndex-1] as? CNCustomIndexView{
+                UIView.animate(withDuration: 0.2) {
+                    toBannerViewLeftView.downSlideView.frame = CGRectMake(-LeftGap, 0, 0, 0)
+                    toBannerViewLeftView.upSlideView.frame = CGRectMake(-LeftGap, KSreenHeight*2,0, 0)
+                }
             }
         }
-        if let toBannerViewRightView =  self.pageFlowView.cells[toIndex+1] as? CNCustomIndexView{
-            UIView.animate(withDuration: 0.2) {
-                toBannerViewRightView.downSlideView.frame = CGRectMake(-LeftGap, 0, 0, 0)
-                toBannerViewRightView.upSlideView.frame = CGRectMake(-LeftGap, KSreenHeight*2,0, 0)
+        if toIndex+1 < self.pageFlowView.cells.count{
+            if let toBannerViewRightView =  self.pageFlowView.cells[toIndex+1] as? CNCustomIndexView{
+                UIView.animate(withDuration: 0.2) {
+                    toBannerViewRightView.downSlideView.frame = CGRectMake(-LeftGap, 0, 0, 0)
+                    toBannerViewRightView.upSlideView.frame = CGRectMake(-LeftGap, KSreenHeight*2,0, 0)
+                }
             }
         }
-        
-//        for (idx,obj) in self.pageFlowView.cells.enumerated(){
-//            let bannerView = obj as? CNCustomIndexView
-//            if idx == toIndex{
-//                bannerView?.downSlideView.frame = CGRectMake(-LeftGap, 0, KSreenWidth, KSreenHeight)
-//                bannerView?.downSlideView.upSlideVC.view.height = KSreenHeight-DownSlideBottomViewHeight
-//                bannerView?.downSlideView.shopConsoleVC.view.height = KSreenHeight-DownSlideBottomViewHeight
-//                
-//                bannerView?.upSlideView.frame = CGRectMake(-LeftGap, KSreenHeight*2,KSreenWidth, KSreenHeight)
-//            }else{
-//                bannerView?.downSlideView.frame = CGRectMake(-LeftGap, 0, 0, 0)
-//                bannerView?.upSlideView.frame = CGRectMake(-LeftGap, KSreenHeight*2,0, 0)
-//            }
-//        }
     }
@@ -611,6 +609,9 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
             vNumPage = .VNumPageUp
         }
+        //左右上角遮盖的视图 宽高设为0
+        self.hiddenLeftRightView()
+        
         if scrollView.contentOffset.y == KSreenHeight {
             self.view.height = self.tabBarY
@@ -626,6 +627,42 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
 //            }
         }
     }
+    // MARK: - 左右上角遮盖的视图 宽高设为0
+    func hiddenLeftRightView(){
+        let toIndex:Int = self.pageFlowView.currentPageIndex
+        if dataArray.count > toIndex{
+            if let identityModel = dataArray[toIndex] as? StandListModel{
+                if let toBannerView =  self.pageFlowView.cells[toIndex] as? CNCustomIndexView{
+                    self.pageFlowView.scrollView.bringSubviewToFront(toBannerView)
+                    UIView.animate(withDuration: 0.2) {
+                        toBannerView.downSlideView.frame = CGRectMake(-LeftGap, 0, KSreenWidth, KSreenHeight)
+                        toBannerView.downSlideView.upSlideVC.view.height = KSreenHeight-DownSlideBottomViewHeight
+                        if identityModel.id == 9{
+                            toBannerView.downSlideView.shopConsoleVC.view.height = KSreenHeight-DownSlideBottomViewHeight
+                        }
+                        toBannerView.upSlideView.frame = CGRectMake(-LeftGap, KSreenHeight*2,KSreenWidth, KSreenHeight)
+                    }
+                    
+                }
+            }
+        }
+        if toIndex-1 >= 0{
+            if let toBannerViewLeftView =  self.pageFlowView.cells[toIndex-1] as? CNCustomIndexView{
+                UIView.animate(withDuration: 0.2) {
+                    toBannerViewLeftView.downSlideView.frame = CGRectMake(-LeftGap, 0, 0, 0)
+                    toBannerViewLeftView.upSlideView.frame = CGRectMake(-LeftGap, KSreenHeight*2,0, 0)
+                }
+            }
+        }
+        if toIndex+1 < self.pageFlowView.cells.count{
+            if let toBannerViewRightView =  self.pageFlowView.cells[toIndex+1] as? CNCustomIndexView{
+                UIView.animate(withDuration: 0.2) {
+                    toBannerViewRightView.downSlideView.frame = CGRectMake(-LeftGap, 0, 0, 0)
+                    toBannerViewRightView.upSlideView.frame = CGRectMake(-LeftGap, KSreenHeight*2,0, 0)
+                }
+            }
+        }
+    }
     //MARK: - 网络请求获取身份列表
     func getUserIdentityApi()
@@ -230,54 +230,41 @@ class CNUpSlideDetailViewController: CNLiveBaseViewController,UITableViewDataSou
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         if indexPath.section == 0{
-            if self.cellType == .playlet{
-                //短剧大图
-                guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveAlbumImageCellIdentifier) as? CNLiveAlbumImageCell
+            if self.cellType == .courseToMyCurriculum{
+                //我的课程
+                guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveCourseTitleCellIdentifier) as? CNLiveDuanjuTitleCell
                 else {
-                    let cell = CNLiveAlbumImageCell()
+                    let cell = CNLiveDuanjuTitleCell()
                     return cell
                 }
-                cell.iconImgView.image = self.cell.bgImageView.image
-                cell.titleLabel.text = self.cell.slideModel?.contents[0].title ?? ""
+                cell.cellType = .courseToMyCurriculum
+                cell.blockName = "我的课程"
                 return cell
-            }else if self.cellType == .course || self.cellType == .playletToCourse || self.cellType == .courseToMyCurriculum{
-                if self.cellType == .courseToMyCurriculum{
-                    //我的课程
+            }else{
+                if self.slideModel?.type == SlideModelTypeAllCourse12{
+                    //全部课程
                     guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveCourseTitleCellIdentifier) as? CNLiveDuanjuTitleCell
                     else {
                         let cell = CNLiveDuanjuTitleCell()
                         return cell
                     }
-                    cell.cellType = .courseToMyCurriculum
-                    cell.blockName = "我的课程"
+                    cell.cellType = .course
+                    cell.blockName = self.slideModel?.blockName
                     return cell
-                }else{
-                    if self.slideModel?.type == SlideModelTypeAllCourse12{
-                        //全部课程
-                        guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveCourseTitleCellIdentifier) as? CNLiveDuanjuTitleCell
-                        else {
-                            let cell = CNLiveDuanjuTitleCell()
-                            return cell
-                        }
-                        cell.cellType = .course
-                        cell.blockName = self.slideModel?.blockName
-                        return cell
-                        
-                    }else if self.slideModel?.type == SlideModelTypeOneCourse75{
-                        //大图课程
-                        guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveAlbumImageCellIdentifier) as? CNLiveAlbumImageCell
-                        else {
-                            let cell = CNLiveAlbumImageCell()
-                            return cell
-                        }
-                        cell.iconImgView.image = self.cell.bgImageView.image
-                        cell.titleLabel.text = self.cell.slideModel?.contents[0].title ?? ""
+                    
+                }else if self.slideModel?.type == SlideModelTypeOneCourse75{
+                    //大图课程
+                    guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveAlbumImageCellIdentifier) as? CNLiveAlbumImageCell
+                    else {
+                        let cell = CNLiveAlbumImageCell()
                         return cell
-                        
                     }
+                    cell.iconImgView.image = self.cell.bgImageView.image
+                    cell.titleLabel.text = self.cell.slideModel?.contents[0].title ?? ""
+                    return cell
+                    
                 }
             }
-            
         }else{
             //列表cell
             let albumModel = self.dataArray[indexPath.row] as! CNLiveAlbumModel
@@ -297,17 +284,12 @@ class CNUpSlideDetailViewController: CNLiveBaseViewController,UITableViewDataSou
     }
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         if indexPath.section == 0{
-            if self.cellType == .playlet{
-                //短剧大图
+            if self.slideModel?.type == SlideModelTypeAllCourse12{
+                //全部课程
+                return allCourseCellHeight+get_system_statusBar_height()
+            }else if self.slideModel?.type == SlideModelTypeOneCourse75{
+                //大图课程
                 return KSreenWidth
-            }else if self.cellType == .course || self.cellType == .playletToCourse{
-                if self.slideModel?.type == SlideModelTypeAllCourse12{
-                    //全部课程
-                    return allCourseCellHeight+get_system_statusBar_height()
-                }else if self.slideModel?.type == SlideModelTypeOneCourse75{
-                    //大图课程
-                    return KSreenWidth
-                }
             }
         }else{
             return 75
@@ -319,16 +301,11 @@ class CNUpSlideDetailViewController: CNLiveBaseViewController,UITableViewDataSou
         let albumModel = self.dataArray[indexPath.row] as! CNLiveAlbumModel
         if indexPath.section == 0{
             //大图统一不能点击跳转
-            if self.cellType == .playlet{
-                //短剧大图,跳转播放页
-//                navigationViewController().visibleViewController?.navigationController?.pushViewController(CNLiveShortVideoViewController(aid: albumModel.contentId), animated: pushAnimated)
-            }else if self.cellType == .course || self.cellType == .playletToCourse{
-                if self.slideModel?.type == SlideModelTypeAllCourse12{
-                    //全部课程,跳转h5
+            if self.slideModel?.type == SlideModelTypeAllCourse12{
+                //全部课程,跳转h5
-                }else if self.slideModel?.type == SlideModelTypeOneCourse75{
-                    //大图课程,跳转h5
-                }
+            }else if self.slideModel?.type == SlideModelTypeOneCourse75{
+                //大图课程,跳转h5
             }
         }else{
             CNLiveDownSlideTool.pushWebVCWithContentsMdl(model: albumModel.model, contentId: albumModel.contentId, pid: albumModel.pid, shareUrl: albumModel.shareUrl, thirdUrl: albumModel.thirdUrl, title: albumModel.title, s_to: albumModel.s_to, trailerId: albumModel.trailerId, controller: self)
@@ -380,7 +380,9 @@ class CNUpSlideViewController: CNLiveBaseViewController,UITableViewDelegate,UITa
             if status == .success{
                 self.myCurriculumDataArray.removeAllObjects()
                 let albumBaseModel = result as! CNLiveAlbumBaseModel
-                self.myCurriculumDataArray.addObjects(from: [albumBaseModel])
+                if albumBaseModel.list.count > 0{
+                    self.myCurriculumDataArray.addObjects(from: [albumBaseModel])
+                }
                 self.myCurriculumIndex = -1
                 if self.myCurriculumDataArray.count>0{
                     //有我的课程
@@ -395,7 +397,9 @@ class CNUpSlideViewController: CNLiveBaseViewController,UITableViewDelegate,UITa
                     //没有我的课程
                     self.myCurriculumIndex = -1
                 }
-                self.dataArray.insert(albumBaseModel, at: self.myCurriculumIndex)
+                if self.myCurriculumIndex > -1{
+                    self.dataArray.insert(albumBaseModel, at: self.myCurriculumIndex)
+                }
                 self.tableView.reloadData()
             }else if (status == .failed){
 //                self.NetApiStatus = .apiError
+//
+//  CNLiveShopPayController.swift
+//  metaCode
+//
+//  Created by zx on 2024/4/8.
+//  支付页面
+
+import Foundation
+import CNLivePayCostModule
+
+///支付类型
+enum CNLivePayType {
+    //支付宝
+    case alipay
+    //微信
+    case weChat
+}
+//支付状态
+enum CNLivePayResult {
+    //成功
+    case success
+    //失败
+    case failure
+    //取消支付
+    case cancel
+}
+
+//支付完成回调
+typealias FinishPayCallBack = (_ orderInfoModel:CNLivePayOrderInfoModel,_ payType:CNLivePayType,_ payResult:CNLivePayResult)->Void
+
+class CNLiveShopPayController:CNLiveBaseViewController,UITableViewDelegate,UITableViewDataSource{
+    
+    var finishPayCallBack:FinishPayCallBack?
+    var orderNumber:String
+    var orderInfoModel:CNLivePayOrderInfoModel?
+    var currentSeleWechat = true
+    var wechatIsInstall = true //微信是否安装
+    var alipayIsInstall = true //支付宝是否安装
+    var payType:CNLivePayType?
+    
+    let kCNLiveShopPayNeedPaymentCellIdentifier = "kCNLiveShopPayNeedPaymentCellIdentifier"
+    let kCNLiveShopPayWeChatAlipayCellIdentifier = "kCNLiveShopPayWeChatAlipayCellIdentifier"
+    
+    // MARK: - 懒加载
+    lazy var tableView : UITableView = {
+        let tableView = UITableView(frame: CGRect(x: 0, y: KNavigationHeight, width: KSreenWidth, height: KSreenHeight-KNavigationHeight-KTabBarHeight), style: .plain)
+        tableView.dataSource = self
+        tableView.delegate = self
+        tableView.separatorStyle = .singleLine
+        tableView.tableFooterView = UIView.init()
+        tableView.register(CNLiveShopPayNeedPaymentCell.self, forCellReuseIdentifier: kCNLiveShopPayNeedPaymentCellIdentifier)
+        tableView.register(CNLiveShopPayWeChatAlipayCell.self, forCellReuseIdentifier: kCNLiveShopPayWeChatAlipayCellIdentifier)
+        return tableView
+    }()
+    
+    lazy var payBtn: UIButton = {
+        let  payBtn = UIButton(type: .custom)
+        payBtn.frame = CGRect(x: 0, y: self.tableView.bottom, width: KSreenWidth, height: KTabBarHeight)
+        payBtn.backgroundColor = UIColor(red:0.29, green:0.64, blue:0.25, alpha:1.00)
+        payBtn.setTitleColor(.white, for: .normal)
+        payBtn.setTitle("支付", for: .normal)
+        payBtn.addTarget(self, action: #selector(payBtnAction), for: .touchUpInside)
+        return payBtn
+    }()
+
+    
+    init(orderNumber:String) {
+        self.orderNumber = orderNumber
+        super.init(nibName: nil, bundle: nil)
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    deinit {
+        NotificationCenter.default.removeObserver(self, name: UIApplication.didBecomeActiveNotification, object: nil)
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        navigationBarHidden = false
+        titleName = "收银台"
+        self.view.backgroundColor = .white
+        NotificationCenter.default.addObserver(self, selector: #selector(didBecomeActiveNotification(_:)), name: UIApplication.didBecomeActiveNotification, object: nil)
+        self.getOrderInfoMessage()
+        self.initUI()
+        
+        if WXApi.isWXAppInstalled(){
+            self.wechatIsInstall = true
+        }else{
+            self.wechatIsInstall = false
+        }
+        
+        let urlScheme = "alipay://"
+        if UIApplication.shared.canOpenURL(URL(string: urlScheme)!) {
+            self.alipayIsInstall = true
+        } else {
+            self.alipayIsInstall = false
+        }
+        
+    }
+    // MARK: - 获取订单信息 并且进行检测
+    func getOrderInfoMessage(){
+        if self.orderNumber.count == 0{
+            return
+        }
+        showLoading(message: "")
+        CNLiveShoph5ViewModel.postOrderPayWithParams(orderId: self.orderNumber) { result, status in
+            hiddenLoading()
+            if status == .success{
+                let orderInfoModel = result as! CNLivePayOrderInfoModel
+                self.orderInfoModel = orderInfoModel
+                self.tableView.reloadData()
+            }else{
+            }
+        }
+        
+    }
+    
+    func initUI(){
+        self.view.addSubview(self.tableView)
+        self.view.addSubview(self.payBtn)
+    }
+    
+    @objc func payBtnAction(){
+        
+        if self.currentSeleWechat == true && self.wechatIsInstall == false{
+            showMessage(message: "请安装微信")
+            return
+        }
+        if self.currentSeleWechat == false && self.alipayIsInstall == false{
+            showMessage(message: "请安装支付宝")
+            return
+        }
+        showLoading(message: "")
+        let orderId = self.orderInfoModel?.orderId
+        var userId = self.orderInfoModel?.user_id
+        if userId?.count == 0{
+            userId = UserInfoManager.shared.userInfo.uid
+        }
+        let descStr = self.orderInfoModel?.body
+        let price = self.orderInfoModel?.totalMoney
+        let body = self.orderInfoModel?.body
+        let coupon_fee = self.orderInfoModel?.couponMoney
+        let notifyUrl = self.orderInfoModel?.notify_url
+        
+        let paramDict = NSMutableDictionary()
+        paramDict.setValue(orderId, forKey: "orderId")
+        paramDict.setValue(userId, forKey: "user_id")
+        paramDict.setValue(descStr, forKey: "descStr")
+        paramDict.setValue(price, forKey: "price")
+        paramDict.setValue("1", forKey: "orderType")
+        paramDict.setValue("1", forKey: "type")
+        paramDict.setValue(body, forKey: "body")
+        paramDict.setValue(coupon_fee, forKey: "coupon_fee")
+        paramDict.setValue(notifyUrl, forKey: "notifyUrl")
+        paramDict.setValue("", forKey: "password")
+        
+        var payCostType:CNLivePayCostPayType?
+        if self.currentSeleWechat == true{
+            self.payType = .weChat
+            payCostType = CNLivePayCostPayTypeWeChatPay
+        }else{
+            self.payType = .alipay
+            payCostType = CNLivePayCostPayTypeAliPay
+        }
+        
+        CNLivePayCostModule.showShopPayViw(withParamDict: paramDict as! [String : Any], payType: payCostType!) { resultCode in
+            hiddenLoading()
+            if resultCode == 0{
+                self.checkPayIsSuccessful(lastCount: 5)
+            }else if resultCode == 3{
+                showMessage(message: "取消支付")
+            }else {
+                showMessage(message: "支付失败")
+            }
+        }
+        
+    }
+    
+    @objc func didBecomeActiveNotification(_ notification: Notification) {
+        // 处理应用变得活跃的逻辑
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
+            // 这里写你想要在 0.5 秒后执行的代码
+            self.checkPayIsSuccessful(lastCount: 0)
+        }
+        
+    }
+    
+    // MARK: - 检测是否支付成功
+    /// 检测是否支付成功
+    /// @param lastCount 剩余检测次数
+    func checkPayIsSuccessful(lastCount:NSInteger){
+        showLoading(message: "")
+        CNLiveShoph5ViewModel.postIsOrderPayWithOrderId(orderId: self.orderNumber) { result, status in
+            hiddenLoading()
+            if status == .success{
+                self.finishPayCallBack?(self.orderInfoModel!, self.payType!, .success)
+//                NotificationCenter.default.post(name: Notification.Name.ShopOrderManage.kDSSuccessPayOrderNotification, object: nil)
+                self.navigationController?.popViewController(animated: true)
+            }else{
+                if lastCount > 0{
+                    DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
+                        // 这里写你想要在 0.5 秒后执行的代码
+                        self.checkPayIsSuccessful(lastCount: lastCount-1)
+                    }
+                }
+            }
+        }
+        
+    }
+    
+    // MARK: - UITableViewDelegate
+    func numberOfSections(in tableView: UITableView) -> Int {
+        2
+    }
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        if section == 0{
+            return 1
+        }else{
+            return 2
+        }
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        if indexPath.section == 0{
+            guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveShopPayNeedPaymentCellIdentifier) as? CNLiveShopPayNeedPaymentCell
+            else {
+                let cell = CNLiveShopPayNeedPaymentCell()
+                return cell
+            }
+            let monStr = String(format: "需要付款: ¥%.2f", (Double(self.orderInfoModel?.totalMoney ?? "0.00") ?? 0.00) / 100)
+            let attribute = NSMutableAttributedString.init(string:monStr)
+            let attIndex = 6
+            attribute.addAttributes([NSAttributedString.Key.foregroundColor: HexColor("#222222")!], range: NSRange.init(location: 0, length: attIndex))
+            attribute.addAttributes([NSAttributedString.Key.foregroundColor: UIColor(red:0.29, green:0.64, blue:0.25, alpha:1.00)], range: NSRange.init(location: attIndex, length: monStr.count-attIndex))
+            cell.titleLabel.attributedText = attribute
+            return cell
+        }else{
+            guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveShopPayWeChatAlipayCellIdentifier) as? CNLiveShopPayWeChatAlipayCell
+            else {
+                let cell = CNLiveShopPayWeChatAlipayCell()
+                return cell
+            }
+            if indexPath.row == 0{
+                //微信支付
+                
+                cell.iconImgView.image = UIImage(named: "dd_weixin")
+                if self.currentSeleWechat == true{
+                    cell.selectImgView.isHidden = false
+                }else{
+                    cell.selectImgView.isHidden = true
+                }
+                if self.wechatIsInstall{
+                    cell.titleLabel.text = "微信支付"
+                }else{
+                    cell.titleLabel.text = "微信未安装,无法使用微信支付"
+                }
+            }else{
+                //支付宝支付
+                cell.iconImgView.image = UIImage(named: "dd_zhifubao")
+                if self.currentSeleWechat == true{
+                    cell.selectImgView.isHidden = true
+                }else{
+                    cell.selectImgView.isHidden = false
+                }
+                if self.alipayIsInstall{
+                    cell.titleLabel.text = "支付宝支付"
+                }else{
+                    cell.titleLabel.text = "支付宝未安装,无法使用支付宝支付"
+                }
+            }
+            return cell
+        }
+    }
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        if indexPath.section == 1{
+            if indexPath.row == 0{
+                if self.wechatIsInstall == false{
+                    showMessage(message: "请安装微信")
+                    return
+                }
+                if self.currentSeleWechat == true{
+                    return
+                }
+                self.currentSeleWechat = true
+            }else{
+                if self.alipayIsInstall == false{
+                    showMessage(message: "请安装支付宝")
+                    return
+                }
+                if self.currentSeleWechat == false{
+                    return
+                }
+                self.currentSeleWechat = false
+            }
+            self.tableView.reloadData()
+        }
+    }
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        return 60
+    }
+    
+}
@@ -13,6 +13,7 @@ class CNLiveDownShopDetailController:CNLiveBaseViewController, UICollectionViewD
     let kCNLiveShopDetailDefaultCellID = "kCNLiveShopDetailDefaultCellID"
     let kCNLiveShopDetailHeaderViewID = "kCNLiveShopDetailHeaderViewID"
+    let kCNLiveShopDetailCloseCellID = "kCNLiveShopDetailCloseCellID"
     let kCNLiveShopDetailBannerCellID = "kCNLiveShopDetailBannerCellID"
     let kCNLiveShopDetailBtnsCellID = "kCNLiveShopDetailBtnsCellID"
     let kCNLiveShopDetailOrderAssetCellID = "kCNLiveShopDetailOrderAssetCellID"
@@ -22,56 +23,21 @@ class CNLiveDownShopDetailController:CNLiveBaseViewController, UICollectionViewD
         let shopDetailModel = CNLiveShopDetailModel()
         return shopDetailModel
     }()
-    override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {
-        let upSlideView = self.view.superview as! CNUpSlideView
-        let scrollView = upSlideView.superview as! UIScrollView
-        scrollView.setContentOffset(CGPoint(x: 0, y: scrollView.height), animated: true)
-        
-        let result:Dictionary = ["AuthVNumPage":2]
-        NotificationCenter.default.post(name:  Notification.Name.AuthVNumPageManage.kAuthVNumPageChangedNotification, object: nil, userInfo: result)
-        
-        currentViewController()?.tabBarController?.tabBar.isHidden = false
-        
-        let metaVC = currentViewController() as! CNMetaCodeHomePageController
-        let index = metaVC.pageFlowView.currentPageIndex
-        let customIndexView = metaVC.pageFlowView.viewWithTag(100+index) as! CNCustomIndexView
-        customIndexView.superScrollView?.isScrollEnabled = true
-    }
-//    lazy var closeBtn: UIButton = {
-//        let closeBtn = UIButton(type: .custom)
-//        closeBtn.frame = CGRect(x: KSreenWidth-50, y: KStatusBarHeight, width: 50, height: KNavigationHeight-KStatusBarHeight)
-//        closeBtn.setImage(UIImage(named: "mine_header_icon_close"), for: .normal)
-//        closeBtn.addTarget(self, action: #selector(closeBtnAction), for: .touchUpInside)
-//        closeBtn.isUserInteractionEnabled = false
-//        return closeBtn
-//    }()
-    
-//    lazy var navView: UIView = {
-//        let closeBtn = UIView(frame: CGRect(x: 0, y: KStatusBarHeight, width: KSreenWidth-50, height: KNavigationHeight-KStatusBarHeight))
-//        closeBtn.backgroundColor = .yellow
-//        return closeBtn
-//    }()
-    lazy var closeBtn: UIImageView = {
-        let closeBtn = UIImageView(frame: CGRect(x: KSreenWidth-35, y: KStatusBarHeight+(KNavigationHeight-KStatusBarHeight-20)*0.5, width: 20, height: 20))
-        closeBtn.image = UIImage(named: "mine_header_icon_close")
-//        closeBtn.isUserInteractionEnabled = true
-//        let tap = UITapGestureRecognizer.init(target: self, action: #selector(closeBtnAction))
-//        closeBtn.addGestureRecognizer(tap)
-        return closeBtn
-        }()
-    
     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(CNLliveShopDetailCloseCell.self, forCellWithReuseIdentifier: kCNLiveShopDetailCloseCellID)
+
         collectionView.register(CNLliveShopDetailBannerCell.self, forCellWithReuseIdentifier: kCNLiveShopDetailBannerCellID)
         collectionView.register(UICollectionViewCell.self, forCellWithReuseIdentifier: kCNLiveShopDetailDefaultCellID)
         collectionView.register(CNLiveShopDetailBtnsCell.self, forCellWithReuseIdentifier: kCNLiveShopDetailBtnsCellID)
         collectionView.register(CNLiveShopDetailOrderAssetCell.self, forCellWithReuseIdentifier: kCNLiveShopDetailOrderAssetCellID)
+        
         return collectionView
     }()
@@ -80,12 +46,8 @@ class CNLiveDownShopDetailController:CNLiveBaseViewController, UICollectionViewD
         self.getShopDetailApi()
         self.view.addSubview(collectionView)
         collectionView.snp.makeConstraints { make in
-            make.top.equalToSuperview().offset(KNavigationHeight)
-            make.left.bottom.right.equalToSuperview()
+            make.top.left.bottom.right.equalToSuperview()
         }
-        self.view.addSubview(self.closeBtn)
-//        self.view.addSubview(navView)
-        
     }
     // MARK: BtnAction
@@ -102,15 +64,13 @@ class CNLiveDownShopDetailController:CNLiveBaseViewController, UICollectionViewD
         let index = metaVC.pageFlowView.currentPageIndex
         let customIndexView = metaVC.pageFlowView.viewWithTag(100+index) as! CNCustomIndexView
         customIndexView.superScrollView?.isScrollEnabled = true
-//        customIndexView.baseScrollView.setContentOffset(CGPoint(x: 0, y: customIndexView.baseScrollView.height), animated: true)
-//        currentViewController()?.tabBarController?.tabBar.isHidden = false
     }
-    
+        
     // MARK: - UICollectionViewDelegate
     func numberOfSections(in collectionView: UICollectionView) -> Int {
         if self.shopDetailModel.is_seller != nil{
             if self.shopDetailModel.is_seller == true{
-                return 5
+                return 6
             }else{//非商家,不处理
                 return 3
             }
@@ -121,7 +81,7 @@ class CNLiveDownShopDetailController:CNLiveBaseViewController, UICollectionViewD
     func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
         if self.shopDetailModel.is_seller != nil {
             if (self.shopDetailModel.is_seller == true) {
-                if (section == 4) {
+                if (section == 5) {
                     let count = self.shopDetailModel.dynamic.count
                     return count == 0 ? 1 : count
                 }else {
@@ -144,12 +104,15 @@ class CNLiveDownShopDetailController:CNLiveBaseViewController, UICollectionViewD
 //    }
     func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
         switch indexPath.section {
-        case 0://banner轮播图
+        case 0://close关闭
+            let cell = collectionView.dequeueReusableCell(withReuseIdentifier: kCNLiveShopDetailCloseCellID, for: indexPath) as! CNLliveShopDetailCloseCell
+            return cell
+        case 1://banner轮播图
             let cell = collectionView.dequeueReusableCell(withReuseIdentifier: kCNLiveShopDetailBannerCellID, for: indexPath) as! CNLliveShopDetailBannerCell
             cell.shopDetailModel = self.shopDetailModel
             return cell
-        case 1://btn
+        case 2://btn
             if (self.shopDetailModel.is_seller != nil && self.shopDetailModel.is_seller == true) {
                 let cell = collectionView.dequeueReusableCell(withReuseIdentifier: kCNLiveShopDetailBtnsCellID, for: indexPath) as! CNLiveShopDetailBtnsCell
                 cell.shopDetailModel = self.shopDetailModel
@@ -158,7 +121,7 @@ class CNLiveDownShopDetailController:CNLiveBaseViewController, UICollectionViewD
                 let cell = collectionView.dequeueReusableCell(withReuseIdentifier: kCNLiveShopDetailDefaultCellID, for: indexPath)
                 return cell
             }
-        case 2://我的订单
+        case 3://我的订单
             if (self.shopDetailModel.is_seller != nil && self.shopDetailModel.is_seller == true) {
                 let cell = collectionView.dequeueReusableCell(withReuseIdentifier: kCNLiveShopDetailOrderAssetCellID, for: indexPath) as! CNLiveShopDetailOrderAssetCell
                 cell.displayType = .CNLiveShopDetailDisplayTypeOrder
@@ -168,7 +131,7 @@ class CNLiveDownShopDetailController:CNLiveBaseViewController, UICollectionViewD
                 let cell = collectionView.dequeueReusableCell(withReuseIdentifier: kCNLiveShopDetailDefaultCellID, for: indexPath)
                 return cell
             }
-        case 3://我的资产
+        case 4://我的资产
             if (self.shopDetailModel.is_seller != nil && self.shopDetailModel.is_seller == true) {
                 let cell = collectionView.dequeueReusableCell(withReuseIdentifier: kCNLiveShopDetailOrderAssetCellID, for: indexPath) as! CNLiveShopDetailOrderAssetCell
                 cell.displayType = .CNLiveShopDetailDisplayTypeAsset
@@ -178,7 +141,6 @@ class CNLiveDownShopDetailController:CNLiveBaseViewController, UICollectionViewD
                 let cell = collectionView.dequeueReusableCell(withReuseIdentifier: kCNLiveShopDetailDefaultCellID, for: indexPath)
                 return cell
             }
-//        case 4:
         default:
             let cell = collectionView.dequeueReusableCell(withReuseIdentifier: kCNLiveShopDetailDefaultCellID, for: indexPath)
             return cell
@@ -186,19 +148,27 @@ class CNLiveDownShopDetailController:CNLiveBaseViewController, UICollectionViewD
     }
+    func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
+        if indexPath.section == 0{
+            self.closeBtnAction()
+        }
+    }
+    
     // 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://banner
+                case 0://close
+                    return CGSize(width: KSreenWidth, height: KNavigationHeight)
+                case 1://banner
                     return CGSize(width: KSreenWidth, height: CNLiveAdaptTool.adaptLength(length: 210))
-                case 1://btn
+                case 2://btn
                     return CGSize(width: KSreenWidth, height: 10+45+5+17+15)
-                case 2://我的订单
+                case 3://我的订单
                     return CGSize(width: KSreenWidth, height: 10+25+15+CNLiveAdaptTool.adaptLength(length: tempOrderZiChanHeight)+15)
-                case 3://我的资产
+                case 4://我的资产
                     return CGSize(width: KSreenWidth, height: 10+25+15+CNLiveAdaptTool.adaptLength(length: tempOrderZiChanHeight)+15)
-                case 4://
+                case 5://
                     return CGSize(width: KSreenWidth, height: 50)
                 default:
                     return CGSizeZero
@@ -13,13 +13,16 @@ import CommonCrypto
 import CNLiveBusinessTools
 import SKPhotoBrowser
+//返回 Web控制器回调
+typealias cnWebControllerBackNavBlock = ()->Void
+
 //更新Web控制器导航回调
 typealias cnWebControllerUpdateNavBlock = (_ isFinish:Bool , _ titleName:String ,_ isDecidePolicy:Bool , _ urlStr:String)->Void
 //更新Web控制器 currentUrl
 typealias cnWebControllerUpdateCurrentUrlBlock = (_ currentUrl:String)->Void
-class CNWebView:UIView,WKNavigationDelegate{
+class CNWebView:UIView,WKNavigationDelegate, WKScriptMessageHandler{
     var configuration:WKWebViewConfiguration?
@@ -28,15 +31,35 @@ class CNWebView:UIView,WKNavigationDelegate{
         return cnWebView
     }()
-    var webUrl:URL?//初始URL
+    var _webUrl:URL?//初始URL
+    var webUrl:URL?{
+        get{
+            _webUrl
+        }set{
+            _webUrl = newValue!
+        }
+    }
+    
     var currentUrl:String = ""//当前网页的url
     var bridge:WKWebViewJavascriptBridge?
+    var customUserAgent:String = ""
     //CNWebController
     var isCNWebController:Bool = false//是否网页控制器
-    var webControllerUpdateNavBlock:cnWebControllerUpdateNavBlock?
+    var webControllerBackNavBlock:cnWebControllerBackNavBlock?//back返回
+
+    var webControllerUpdateNavBlock:cnWebControllerUpdateNavBlock?//刷新
     var webControllerUpdateCurrentUrlBlock:cnWebControllerUpdateCurrentUrlBlock?
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    func loadUrl(url:String){
+        let urlStr = self.checkURLWithStr(urlStr: url)
+        self.currentUrl = urlStr
+        self.cnWebView.load(URLRequest.init(url:URL(string: urlStr)!))
+    }
     init(frame: CGRect, configuration: WKWebViewConfiguration ,url:URL?) {
         super.init(frame: frame)
@@ -49,26 +72,154 @@ class CNWebView:UIView,WKNavigationDelegate{
                 if !userAgent.contains(CNLiveMCEnvironmentManager.shared.base_web_UA) {
                     let newUserAgent = userAgent + CNLiveMCEnvironmentManager.shared.base_web_UA
                     self.cnWebView.customUserAgent = newUserAgent
+                    self.customUserAgent = newUserAgent
                     if (self.webUrl != nil){
                         let urlStr = self.checkURLWithStr(urlStr: self.webUrl!.absoluteString)
                         self.currentUrl = urlStr
                         self.cnWebView.load(URLRequest.init(url:URL(string: urlStr)!))
+                        self.configBridge()
+                        self.configBridgeRegister()
+                        self.webViewAddScriptMessageHandler()
                     }
-                    self.configBridge()
-                    self.configBridgeRegister()
                 }
             }
         }
     }
+    // MARK: - 电商h5的交互回调调用
+    //电商 js 交互原生
+    func webViewAddScriptMessageHandler(){
+        self.cnWebView.configuration.userContentController.add(self, name: "pop")
+        self.cnWebView.configuration.userContentController.add(self, name: "toShare")
+        self.cnWebView.configuration.userContentController.add(self, name: "openAppPayment")
+    }
+    
+    func webViewRemoveScriptMessageHandler(){
+        self.cnWebView.configuration.userContentController.removeScriptMessageHandler(forName: "pop")
+        self.cnWebView.configuration.userContentController.removeScriptMessageHandler(forName: "toShare")
+        self.cnWebView.configuration.userContentController.removeScriptMessageHandler(forName: "openAppPayment")
+    }
+    //电商h5的回调
+    func userContentController(_ userContentController: WKUserContentController, didReceive message: WKScriptMessage) {
+        // 初始化 body 为 nil
+        var body: Any? = nil
+        // 检查 message.body 是否不是 NSNull 并且是 NSDictionary 的实例
+        if let dictionary = message.body as? [String: Any], !dictionary.isEmpty {
+            // 获取所有的键
+            let allKeys = dictionary.keys
+            // 检查是否包含 "body" 键
+            if allKeys.contains("body") {
+                // 取出 "body" 键对应的值
+                body = dictionary["body"]
+            }
+        }
+        if message.name == "openAppPayment" {
+            // 跳转支付页面
+            if let json = body as? [String: Any] {
+                // 检查 json 是否非空
+                guard !json.isEmpty else {
+                    print("json 字典是空的")
+                    return
+                }
+                // 使用可选链获取 orderNumber，如果不存在则返回空字符串
+                let orderNumber = json["orderNumber"] as? String ?? ""
+                let vc = CNLiveShopPayController(orderNumber: orderNumber)
+                vc.finishPayCallBack = { [weak self]  orderInfoModel ,payType ,payResult in
+                    let params = NSMutableDictionary()
+                    let jsonStr = orderInfoModel.toJSONString() ?? ""
+                    params.setValue(jsonStr, forKey: "orderInfo")
+                    params.setValue(payType.hashValue, forKey: "payType")
+                    params.setValue(payResult.hashValue, forKey: "payResult")
+                    
+                    let sparams = self!.stringByJson(params as? [String : Any])
+                    let appPaymentCallbackJS = String(format: "appPaymentCallback('%@')", sparams ?? "")
+                    self?.cnWebView.evaluateJavaScript(appPaymentCallbackJS, completionHandler: { result, error in
+//                        print("error \(error)")
+                    })
+                }
+                // 跳转支付页面
+                navigationViewController().pushViewController(vc, animated: pushAnimated)
+            }
+        }else if message.name == "pop" {
+            //返回上一级控制器
+            if self.cnWebView.canGoBack{
+                self.cnWebView.goBack()
+            }else{
+                self.webControllerBackNavBlock?()
+            }
+        }else if message.name == "toShare" {
+            //拉起分享
+            if let json = body as? [String: Any] {
+                // 检查 json 是否非空
+                guard !json.isEmpty else {
+                    print("json 字典是空的")
+                    return
+                }
+                // 使用可选链和条件绑定获取 type，如果不存在或不是数字，则使用默认值 0
+                let type: UInt = (json["type"] as? NSNumber)?.uintValue ?? 0
+                // 使用可选链获取 id 和 ext，如果不存在则返回空字符串
+                let targetId = json["id"] as? String ?? ""
+                let ext = json["ext"] as? String ?? ""
+                //请求分享参数
+                showLoading(message: "")
+                CNLiveShoph5ViewModel.postGetShareDataWithType(type: NSInteger(type), targetId: targetId, ext: ext) { result, status in
+                    let shareModel = result as! CNLiveShopCommentRequestShareModel
+                    
+                    let shareTitle = shareModel.share_title
+                    let shareUrl = shareModel.url
+                    let shareDesc = shareModel.share_desc
+                    let shareImage = shareModel.share_img
+                    CNLiveShareManager.showShareViewWithParam(forShareTitle: shareTitle, shareUrl: shareUrl, shareDesc: shareDesc, shareImage: shareImage, screenFull: false, hiddenWjj: true, hiddenQQ: false, hiddenWB: true, hiddenLifeCircle: true, hiddenWechatCircle: false, hiddenWechat: false, hiddenSafari: true, formVC: currentViewController(), topImage: [], topTitles: [], platformType: .all) { title in
+                        
+                    } completerBlock: { resultType, platformType, typeString in
+                        if resultType == .succ{
+                            
+                        }
+                    }
+
+                }
+                
+            }
+        }
+    }
+    // MARK: - 字典转字符串
+    func stringByJson(_ json: [String: Any]?) -> String? {
+        guard let json = json else {
+            return nil
+        }
+          
+        do {
+            let data = try JSONSerialization.data(withJSONObject: json, options: .prettyPrinted)
+            if let string = String(data: data, encoding: .utf8) {
+                // 去掉字符串中的空格
+                let stringWithoutSpaces = string.replacingOccurrences(of: " ", with: "", options: .literal, range: nil)
+                  
+                // 去掉字符串中的换行符
+                let stringWithoutNewlines = stringWithoutSpaces.replacingOccurrences(of: "\n", with: "", options: .literal, range: nil)
+                  
+                // 去掉字符串中的转义字符 "\"
+                // 注意：在标准的JSON字符串中，转义字符 "\" 是必要的，因此通常不会移除它们。
+                // 如果你确实需要移除它们，请确保这样做不会导致JSON字符串格式错误。
+                let stringWithoutEscapes = stringWithoutNewlines.replacingOccurrences(of: "\\", with: "", options: .literal, range: nil)
+                  
+                return stringWithoutEscapes
+            }
+        } catch {
+            // 处理JSONSerialization的错误
+            return nil
+        }
+          
+        return nil
+    }
+    // MARK: - wjjh5的交互回调调用
     func configBridge(){
         WKWebViewJavascriptBridge.enableLogging()
         self.bridge = WKWebViewJavascriptBridge(for: self.cnWebView)
         self.bridge?.setWebViewDelegate(self)
     }
-    //h5拉起原生
+    //wjjh5拉起原生
     func configBridgeRegister() -> Void {
         //h5拉起原生分享 js call oc
         self.bridge?.registerHandler("wjjylzgVideoShare", handler: { data, responseCallback in
@@ -90,7 +241,7 @@ class CNWebView:UIView,WKNavigationDelegate{
             let dic = data as! Dictionary<String, Any>
             let index = (dic["index"] as! NSString).integerValue
             let imageArray = dic["imgArr"] as! NSArray
-            var imgArray = NSMutableArray()
+            let imgArray = NSMutableArray()
             for dict in imageArray {
                 var imgUrl = ""
                 if let dictemp = dict as? String{
@@ -124,15 +275,83 @@ class CNWebView:UIView,WKNavigationDelegate{
                 CNLiveShareImageManager.pushWeChatMiniProgrem(withMiniAppId: miniAppId, path: miniPath, extMsg: "", extDic: [:])
             }
         })
+        
+        //h5拉起原生跳转苹果内购
+        self.bridge?.registerHandler("wjjHtmlPullApplePay", handler: { data, responseCallback in
+//            print("js call oc\(data)")
+//            let dataDic = data as! Dictionary<String, Any>
+//            let body = dataDic["body"] as? String
+//            let notify_url = dataDic["notify_url"] as? String
+//            let orderId = dataDic["orderId"] as? String
+//            let prdId = dataDic["prdId"] as? String
+//            let total_fee = dataDic["total_fee"] as? Int
+//            print("拉起苹果内购")
+            
+        })
+        
+        //h5拉起原生支付(iOS不加,虚拟付费视频都内购)
+//        self.bridge?.registerHandler("wjjHtmlPullAppPay", handler: { data, responseCallback in
+//            print("js call oc\(data)")
+//            let dic = data as! Dictionary<String, Any>
+//            
+////            [CNLivePayCostModule showDefaultPayViwWithParamDict:htmlDict PayCostType:CNLivePayCostTypeHtml FromVC:formVC ResultBlock:^(CNLivePayCostTypeResult resultType) {
+////                if (resultType == CNLivePayCostTypeResultSucc) {
+////            NSString * orderId = [resultParam stringValueForKey:@"orderId" default:@""];
+////            [weakSelf.bridge callHandler:@"wjjHtmlPullAppPayCallback" data:@{@"orderId":orderId,@"payStatus":payResult == CNLiveContentPayResultSucc?@"0":@"1"} responseCallback:^(id responseData) {
+////                NSLog(@"成功");
+////            }];
+//            //                }
+////            }];
+//            
+//        })
+        
     }
-    required init?(coder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-    
+    // MARK: - 检查url
     func checkURLWithStr(urlStr:String) -> String{
         if URL(string: urlStr)?.host != WjjH5 {
-            return urlStr//不是wjjh5不作处理
+            if URL(string: urlStr)?.host == ManageshopH5 || URL(string: urlStr)?.host == ManagemallshopH5{
+                //是电商url,拼接uid
+                var str = urlStr
+                let sourceArray = str.components(separatedBy: "?")
+                if sourceArray.count == 1{
+                    //是电商h5且无参数
+                    str = String(format: "%@?uid=%@", str,UserInfoManager.shared.userInfo.uid)
+                    return str
+                }
+                //是电商h5且有参数
+                let paraArr = NSMutableArray(array: ["uid="])
+                let valueArr = NSMutableArray(array:[UserInfoManager.shared.userInfo.uid])
+                var i = 0
+                for paraStr in paraArr{
+                    let tempStr = paraStr as! String
+                    let paramStr = "&".appending(tempStr)
+                    let paramStr2 = "?".appending(tempStr)
+
+                    if str.contains(paramStr){
+                        //包含则替换 &sid=
+                        let lastStr = str.components(separatedBy: tempStr).last
+                        let lastSeparatedStr = (lastStr?.components(separatedBy: "&").first)!
+                        let oldStr = tempStr.appending(lastSeparatedStr)
+                        let tempValueStr = tempStr.appending(valueArr[i] as! String)
+                        str = str.replacingOccurrences(of: oldStr, with: tempValueStr)
+                    }else if str.contains(paramStr2){
+                        //包含则替换 &sid=
+                        let lastStr = str.components(separatedBy: tempStr).last
+                        let lastSeparatedStr = (lastStr?.components(separatedBy: "&").first)!
+                        let oldStr = tempStr.appending(lastSeparatedStr)
+                        let tempValueStr = tempStr.appending(valueArr[i] as! String)
+                        str = str.replacingOccurrences(of: oldStr, with: tempValueStr)
+                    }else{
+                        //不包含则拼接
+                        str = String(format: "%@&%@%@", str,tempStr,valueArr[i] as! String)
+                    }
+                    i = i + 1
+                }
+                return str
+            }else{
+                return urlStr//不是wjjh5且不是电商h5不作处理
+            }
         }
         var str = urlStr
         let date = Date()
@@ -16,6 +16,7 @@ import SKPhotoBrowser
 let WjjH5 = "wjjh5.cnlive.com"
 let ManageshopH5 = "manageshop.cnlive.com"
+let ManagemallshopH5 = "managemall.cnlive.com"
 class CNWebViewController:CNLiveBaseViewController ,WKNavigationDelegate{
@@ -46,7 +47,6 @@ class CNWebViewController:CNLiveBaseViewController ,WKNavigationDelegate{
         moreNavBtn.addTarget(self, action: #selector(moreNavBtnAction), for: .touchUpInside)
         return moreNavBtn
     }()
-
     var _url:URL?
     var url:URL? {
@@ -62,6 +62,7 @@ class CNWebViewController:CNLiveBaseViewController ,WKNavigationDelegate{
         self.webView.cnWebView.stopLoading()
         self.webView.cnWebView.navigationDelegate = nil
         self.webView.cnWebView.uiDelegate = nil
+        self.webView.webViewRemoveScriptMessageHandler()
         print("WKWebView dealloc")
     }
@@ -70,7 +71,6 @@ class CNWebViewController:CNLiveBaseViewController ,WKNavigationDelegate{
         self.h5StopVideoPlayer()
     }
-    
     override func viewDidLoad() {
         super.viewDidLoad()
         navigationBarHidden = false
@@ -87,6 +87,9 @@ class CNWebViewController:CNLiveBaseViewController ,WKNavigationDelegate{
                 }
             }
         }
+        self.webView.webControllerBackNavBlock = { [weak self] in
+            self?.navigationController?.popViewController(animated: true)
+        }
         self.webView.webControllerUpdateCurrentUrlBlock = { [weak self] currentUrlStr in
             self!.currentUrl = currentUrlStr
         }
@@ -98,9 +101,9 @@ class CNWebViewController:CNLiveBaseViewController ,WKNavigationDelegate{
     func h5StopVideoPlayer(){
         // call h5停止播放视频
-        let data = ["stop": true]
+        let data: [String: Any] = ["stop": true]
         self.bridge?.callHandler("wjjStopVideoPlayer", data: data, responseCallback: { responseData in
-            print("\(responseData ?? "")")
+            print("wjjStopVideoPlayer:\(responseData ?? "")")
         })
     }
@@ -26,6 +26,8 @@ class CNLiveShopClassifySectionHeaderView:UITableViewHeaderFooterView{
             _classifyModel = newValue
             self.classifyNameBtn.isSelected = _classifyModel!.showChild
             self.classifyNameBtn.setTitle(_classifyModel!.title, for: .normal)
+            self.classifyNameBtn.setupButtonImageAndTitlePossitionWith(padding: 5, style: .right)
+
             self.sortLab.text = _classifyModel!.ord
             if Int(_classifyModel!.state ?? "") == 2{
                 self.showSwitch.isOn = true
+//
+//  CNLliveShopDetailCloseCell.swift
+//  metaCode
+//
+//  Created by zx on 2024/4/12.
+//  电商上滑页-close cell
+
+import Foundation
+
+class CNLliveShopDetailCloseCell: UICollectionViewCell {
+    lazy var closeBtn: UIImageView = {
+        let closeBtn = UIImageView(frame: CGRect(x: KSreenWidth-35, y: KStatusBarHeight+(KNavigationHeight-KStatusBarHeight-20)*0.5, width: 20, height: 20))
+        closeBtn.image = UIImage(named: "mine_header_icon_close")
+        return closeBtn
+        }()
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        self.setUI()
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    func setUI(){
+        self.backgroundColor = .white
+        self.contentView.addSubview(self.closeBtn)
+    }
+
+}
+//
+//  CNLiveShopPayNeedPaymentCell.swift
+//  metaCode
+//
+//  Created by zx on 2024/4/10.
+//  电商h5支付 需要付款cell
+
+import Foundation
+
+class CNLiveShopPayNeedPaymentCell:UITableViewCell{
+    
+    lazy var titleLabel: UILabel = {
+        let titleLabel = UILabel.init(frame: CGRectMake(10, 0, KSreenWidth-20, 60))
+        titleLabel.textColor = UIColor(red:0.25, green:0.23, blue:0.28, alpha:1.00)
+        titleLabel.textAlignment = .left
+        titleLabel.font = Font_16
+        titleLabel.adjustsFontSizeToFitWidth=true
+        return titleLabel
+    }()
+
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        self.selectionStyle = .none
+        self.initUI()
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    // MARK: - initUI
+    func initUI(){
+        self.contentView.addSubview(self.titleLabel)
+    }
+}
+
+//
+//  CNLiveShopPayWeChatAlipayCell.swift
+//  metaCode
+//
+//  Created by zx on 2024/4/10.
+//  电商h5支付 微信支付宝cell
+
+import Foundation
+import SnapKit
+
+class CNLiveShopPayWeChatAlipayCell:UITableViewCell{
+    
+    lazy var selectImgView :UIImageView = {
+        let selectImgView = UIImageView(image: UIImage(named: "tsq_xz"))
+        return selectImgView
+    }()
+    
+    lazy var iconImgView :UIImageView = {
+        let iconImgView = UIImageView()
+        return iconImgView
+    }()
+
+    lazy var titleLabel: UILabel = {
+        let titleLabel = UILabel.init(frame: CGRectZero)
+        titleLabel.textColor = UIColor(red:0.04, green:0.02, blue:0.07, alpha:1.00)
+        titleLabel.textAlignment = .left
+        titleLabel.font = BoldFont_16
+        titleLabel.adjustsFontSizeToFitWidth=true
+        return titleLabel
+    }()
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        self.selectionStyle = .none
+        self.initUI()
+        self.layout()
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    // MARK: - initUI
+    func initUI(){
+        self.contentView.addSubview(self.titleLabel)
+        self.contentView.addSubview(self.iconImgView)
+        self.contentView.addSubview(self.selectImgView)
+        self.selectImgView.isHidden = true
+    }
+    func layout(){
+        self.iconImgView.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(10)
+            make.centerY.equalToSuperview()
+        }
+        self.titleLabel.snp.makeConstraints { make in
+            make.left.equalTo(self.iconImgView.snp.right).offset(20)
+            make.centerY.equalToSuperview()
+        }
+        self.selectImgView.snp.makeConstraints { make in
+            make.right.equalToSuperview().offset(-30)
+            make.centerY.equalToSuperview()
+        }
+    }
+}
@@ -120,7 +120,7 @@ class CNDownSlideSingleCourseCell: UITableViewCell {
             bgBackView.backgroundColor = .white
             var titleTop:CGFloat = DownSlideRecommendLeftGap
-            if model.blockSubTitle.count ?? 0 > 0{
+            if model.blockSubTitle.count > 0{
                 let subtitleLbl = UILabel(frame: CGRect(x: DownSlideRecommendLeftGap, y: DownSlideRecommendLeftGap, width: DownSlideSingleCourseW-DownSlideRecommendLeftGap*2, height: 17))
                 subtitleLbl.text = model.blockSubTitle
                 subtitleLbl.font = Font_12
@@ -148,20 +148,20 @@ class CNDownSlideSingleCourseCell: UITableViewCell {
                 //小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 ?? ""))
+                imageView.kf.setImage(with: URL(string:contentMdl.poster ))
                 imageView.layer.cornerRadius = 12
                 imageView.clipsToBounds = true
                 imageView.contentMode = .scaleAspectFill
                 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.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 ?? ""
+                subTitleLbl.text =  contentMdl.subTitle 
                 subTitleLbl.font = Font_12
                 subTitleLbl.textColor = HexColor("#999999")
                 bgBackView.addSubview(subTitleLbl)
@@ -170,7 +170,12 @@ class CNDownSlideSingleCourseCell: UITableViewCell {
                 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)
+                if contentMdl.model == kCNDownSlideContentsModelModelAlbum_ugc{
+                    enterBtn.setTitle("播放", for: .normal)
+                }else{
+                    enterBtn.setTitle("进入", for: .normal)
+                }
+                
                 enterBtn.titleLabel?.font = BoldFont_13
                 enterBtn.setTitleColor(HexColor("#FFFFFF"), for: .normal)
                 enterBtn.addTarget(self, action: #selector(enterBtnAction(_:)), for: .touchUpInside)
@@ -255,6 +260,9 @@ class CNDownSlideSingleCourseCell: UITableViewCell {
         contentView.addSubview(bgBackView)
         let contentsNum = model.list.count
+        if contentsNum == 0{
+            return
+        }
         //总显示块数/循环数
         var totalNum = (contentsNum >= 4) ? 4 : contentsNum
         var cellH = DownSlideAllCourseTitleH + DownSlideAllCourseRowH * CGFloat(totalNum)+DownSlideRecommendLeftGap
@@ -39,7 +39,7 @@ class CNDownSlideView:UIView{
         var url:URL?
         if (_downPath != ""){
-            url = URL.init(string: _downPath!)
+            url = URL.init(string:_downPath!)//"https://managemall.cnlive.com/html/mall/1/#/pages/main/goodsList/goodsList?scene=app"cn)//_downPath!)//
         }else{
             url = nil
         }
@@ -96,6 +96,9 @@ class CNDownSlideView:UIView{
             if(type == UpDownTypeH5){
                 if _downPath?.count ?? 0 > 0{
                     self.addSubview(self.webView)
+                    if self.webView.cnWebView.url?.absoluteString.contains(_downPath) == false && self.webView.cnWebView.url != nil{
+                        self.webView.loadUrl(url: _downPath!)
+                    }
                 }
             }else if(type == UpDownTypePage){
                 self.addSubview(self.upSlideVC.view)
@@ -29,13 +29,13 @@ class CNUpSlideView:UIView{
         configuration.userContentController = WKUserContentController()
         var url:URL?
-        if (_downPath != ""){
-            url = URL.init(string: _downPath!)
+        if (self.downPath != ""){
+            url = URL.init(string: _downPath!)//"https://managemall.cnlive.com/html/mall/1/#/pages/main/goodsList/goodsList?scene=app")//
         }else{
             url = nil
         }
-        let webView = CNWebView(frame: CGRectMake(10, KNavigationHeight+KStatusBarHeight+10, self.width - 20, self.height-KNavigationHeight-KStatusBarHeight-10), configuration: configuration,url: url)
+        let webView = CNWebView(frame: CGRectMake(10, KNavigationHeight+KStatusBarHeight+10, KSreenWidth - 20, KSreenHeight-KNavigationHeight-KStatusBarHeight-10), configuration: configuration,url: url)
         webView.cnWebView.scrollView.showsVerticalScrollIndicator = false
         webView.cnWebView.scrollView.showsHorizontalScrollIndicator = false
         webView.cnWebView.backgroundColor = .clear
@@ -78,9 +78,13 @@ class CNUpSlideView:UIView{
                 view.removeFromSuperview()
             }
             if(type == UpDownTypeH5){
-                self.addSubview(self.webView)
-            }
-            else if(type == UpDownTypePage){
+                if _downPath?.count ?? 0 > 0{
+                    self.addSubview(self.webView)
+                    if self.webView.cnWebView.url?.absoluteString.contains(_downPath) == false && self.webView.cnWebView.url != nil{
+                        self.webView.loadUrl(url: _downPath!)
+                    }
+                }
+            }else if(type == UpDownTypePage){
             }else if(type == UpDownTypeShopDetail){
                 currentViewController()?.addChild(self.upSlideVC)//看行不行
+//
+//  CNLiveShoph5ViewModel.swift
+//  metaCode
+//
+//  Created by zx on 2024/4/8.
+//  电商h5请求
+
+import Foundation
+import CNLiveRequestBastKit
+
+class CNLiveShoph5ViewModel:NSObject{
+    /// 获取分享数据
+    /// @param type 分享类型 1 文创商品详情 2普通商品详情 3主题活动列表 4店铺首页 5达人详情 6动态详情 7达人列表 8礼物详情 9优选库首页 10电影作品详情 11电影作品列表 12 服务号详情 13 抽奖详情 14 电影作品活动 15电影作品个人中心 16 新店铺首页 17 大众体育活动列表 18 活动首页分享 19 抽奖活动 20抽奖活动列表 21开箱子活动 22崇学向善活动页面 23获取大众体育类型列表 24活动首页 25折扣活动列表分享 26折扣活动分享商品 27崇学向善活动页面2 28领头雁首页 29领头雁成绩查询 30领头雁证书分享 31武汉活动小家音响 32抗议扶贫活动 33领头雁新闻分享 34领头雁招募 35美食中国 36公共加载页面 37领头雁电商活动 38活动专区 39成长活动 40成长商品详情 41成长活动订单列表
+    /// @param targetId 目标id
+    /// @param ext 后台要求的附加参数
+    /// @param result 结果
+    static func postGetShareDataWithType(type:NSInteger,targetId:String,ext:String,resultBlock: @escaping downSlideResultBlock) {
+        let param = NSMutableDictionary()
+        param.setValue("\(type)", forKey: "type")
+        param.setValue(targetId, forKey: "id")
+        param.setValue(ext, forKey: "ext")
+        
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.setupDSRequest(true)
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(CNLiveMCEnvironmentManager.shared.appId_wjj, forKey: "appId")
+        custom_param.setValue(CNLiveMCEnvironmentManager.shared.appKey_wjj, forKey: "appKey")
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
+        CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseWjjShopUrl+"/Api/Index3/getShareData", 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], CNLiveShopCommentRequestShareModel.self)
+                resultBlock(shopDetailModel,.success)
+            }else{
+                resultBlock(NSNull(),.failed)
+            }
+        }
+    }
+    
+    /*
+     支付订单信息
+     参数 orderId 订单号
+     */
+    static func postOrderPayWithParams(orderId:String,resultBlock: @escaping downSlideResultBlock) {
+        let param = NSMutableDictionary()
+        param.setValue(orderId, forKey: "orderId")
+        
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.setupDSRequest(true)
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(CNLiveMCEnvironmentManager.shared.appId_wjj, forKey: "appId")
+        custom_param.setValue(CNLiveMCEnvironmentManager.shared.appKey_wjj, forKey: "appKey")
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
+        CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseWjjShopUrl+"/Api/Index3/orderPay", 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 orderModel =  newDictionaryToModel(dataDic as! [String : Any], CNLivePayOrderInfoModel.self)
+                resultBlock(orderModel,.success)
+            }else{
+                resultBlock(NSNull(),.failed)
+            }
+        }
+    }
+    
+    /**
+     请求订单是否支付成功
+     
+     @param orderId 订单号
+     @param result 结果 //dic: NSString * score, NSString * desc
+     */
+    static func postIsOrderPayWithOrderId(orderId:String,resultBlock: @escaping downSlideResultBlock) {
+        
+        let param = NSMutableDictionary()
+        param.setValue(orderId, forKey: "orderId")
+        
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.setupDSRequest(true)
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(CNLiveMCEnvironmentManager.shared.appId_wjj, forKey: "appId")
+        custom_param.setValue(CNLiveMCEnvironmentManager.shared.appKey_wjj, forKey: "appKey")
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
+        CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseWjjShopUrl+"/Api/Index3/isOrderPay", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
+            hiddenLoading()
+            let resp = result as! NSDictionary
+            let dataDic = resp["data"] as! NSDictionary
+            let code = resp["code"] as? String
+            if (code == "200") {
+                resultBlock(dataDic,.success)
+            }else{
+                resultBlock(NSNull(),.failed)
+            }
+        }
+    }
+}
@@ -39,14 +39,13 @@ class CNLiveDownSlideModel: BaseModel {
 }
-//下滑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"
+let kCNDownSlideContentsModelModelAlbum_ugc: String = "album_ugc"//短剧
 let kCNDownSlideContentsModelModelServing: String = "serving"//微信小程序
+//
+//  CNLivePayOrderInfoModel.swift
+//  metaCode
+//
+//  Created by zx on 2024/4/9.
+//  电商h5支付订单model
+
+import Foundation
+
+class CNLivePayOrderInfoModel:BaseModel{
+    ///订单id
+    var id: String = ""
+    ///订单号
+    var orderId: String = ""
+    ///订单信息
+    var body: String = ""
+    ///总价(分)
+    var totalMoney: String = ""
+    ///回调地址
+    var notify_url: String = ""
+    ///优惠金额（分）
+    var couponMoney: String = ""
+    ///用户id
+    var user_id: String = ""
+    ///收款人id
+    var toId: String = ""
+    ///收款人类型(1个人 2群组 3达人)
+    var toType: String = ""
+    ///支付人类型(1个人 2群组 3达人)
+    var fromType: String = ""
+    ///支付类型 foods_order餐厅订单 mall_order商城订单
+    var sourceType: String = ""
+    ///是否为公会限购订单(1:是  0:不是)
+    var is_limit: String = ""
+    ///integral > 0 为积分订单
+    var integral: String = ""
+}
@@ -43,6 +43,7 @@ class CNLiveDownSlideTool:NSObject{
             }
         }else if (model == kCNDownSlideContentsModelModel3) || (model == kCNDownSlideContentsModelModel4){
             let webVC = CNWebViewController()
+//            webVC.url = URL(string: "http://wjjh5.cnlive.com/cnBlockMore.html?channelName=yjzg&pageId=&isShowTitle=true&blockType=28&contentType=13&title=%E5%9B%AD%E9%95%BF%E8%AF%BE%E7%A8%8B&pageName=&moreUrl=https%3A%2F%2Fcmsapi.cnlive.com%2FcontentApi%2FgetBlockContents%3FblockId%3D12165")//"https://managemall.cnlive.com/html/mall/1/#/pages/main/goodsList/goodsList?scene=app")
             webVC.url = URL(string: thirdUrl)
             if controller != nil{
                 controller!.navigationController?.pushViewController(webVC, animated: pushAnimated)
@@ -105,7 +105,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         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(20)
+        CNLiveNetworking.setRequestTimeoutInterval(60)
         CNLiveNetworking.setupShowDataResult(false)
         CNLiveNetworking.setupSignKey(APPKey)
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
@@ -557,6 +557,22 @@ static NSString *subviewClassName;
         newPoint.y = point.y - _scrollView.frame.origin.y + _scrollView.contentOffset.y;
         if ([_scrollView pointInside:newPoint withEvent:event]) {
             return [_scrollView hitTest:newPoint withEvent:event];
+        }else{
+            //24年4-12,多层的子视图超过了父视图,如果有子视图内点击,传递给子视图点击事件
+            PGIndexBannerSubiew *cell = [_cells objectAtIndex:self.currentPageIndex];
+            for (UIView *view in cell.subviews) {
+                if ([view isKindOfClass:[UIScrollView class]]){
+                    UIScrollView *scrollView = (UIScrollView *)view;
+                    for (UIView *subView in [scrollView subviews]) {
+                        // 将父类point点转换成子类坐标系下的点
+                        CGPoint convertedPoint = [subView convertPoint:point fromView:self];
+                        UIView *targetView = [subView hitTest:convertedPoint withEvent:event];
+                        if (targetView != nil) {
+                            return targetView;
+                        }
+                    }
+                }
+            }
         }
         return _scrollView;
@@ -54,6 +54,8 @@
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>wechat</string>
+		<string>alipay</string>
+		<string>alipays</string>
 		<string>weixin</string>
 		<string>weixinULAPI</string>
 		<string>mqqOpensdkSSoLogin</string>
@@ -74,9 +76,6 @@
 		<string>mqqwpa</string>
 		<string>mqzone</string>
 		<string>mqqopensdkminiapp</string>
-        
-<!--        <string>sinaweibo</string>-->
-<!--        <string>sinaweibohd</string>-->
 	</array>
 	<key>NSAppTransportSecurity</key>
 	<dict>
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "dd_weixin@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "dd_weixin@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "dd_zhifubao@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "dd_zhifubao@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "tsq_xz@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "tsq_xz@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}