商家上滑页搭建

张旭
1 parent 81b032f8
Showing 26 changed files with 697 additions and 86 deletions
Podfile
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Common/Util/CNLiveCommonBaseModel.swift
metaCode/Classes/Config/CNLiveConfigUserInfo.swift
metaCode/Classes/Main/HomePage/Controller/CNLiveDownShopDetailController.swift
metaCode/Classes/Main/HomePage/Controller/CNLiveShopConsoleController.swift
metaCode/Classes/Main/HomePage/Controller/CNWebViewController.swift
metaCode/Classes/Main/HomePage/Controller/商品管理/CNLiveShopNewProductController.swift
metaCode/Classes/Main/HomePage/Controller/商品管理/CNLiveShopProductManagerController.swift
metaCode/Classes/Main/HomePage/View/CNLiveShopDetailBtnsCell.swift
metaCode/Classes/Main/HomePage/View/CNLiveShopDetailOrderAssetCell.swift
metaCode/Classes/Main/HomePage/View/CNLliveShopDetailBannerCell.swift
metaCode/Classes/Main/HomePage/View/CNUpSlideView.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineViewModel.swift
metaCode/Classes/Main/Model/CNLiveShopDetailModel.swift
metaCode/Classes/Main/Model/CNLiveShopUserInfoModel.swift
metaCode/Supporting Files/Assets.xcassets/Home/ds_Up_Btn.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/Home/ds_Up_Btn.imageset/ds_Up_Btn@2x.png
metaCode/Supporting Files/Assets.xcassets/Home/homepage_detail.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/Home/homepage_detail.imageset/homepage_detail@2x.png
@@ -43,7 +43,9 @@ target &#39;metaCode&#39; do
   pod 'JXSegmentedView', :git => 'https://gitee.com/mirrors/JXSegmentedView.git'
   pod 'JXPagingView/Paging'
   #轮播图
-  pod 'FSPagerView', '~> 0.8.3'
+  pod 'FSPagerView', '0.8.3'
+#  pod 'SDCycleScrollView', '~> 1.82'
+  
   #应用调试工具
 #  pod 'FWDebug', :configurations => ['Debug']
@@ -12,6 +12,10 @@
 		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 */; };
+		19565EC02AF4DE0E007D6727 /* CNLiveShopDetailBtnsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19565EBF2AF4DE0E007D6727 /* CNLiveShopDetailBtnsCell.swift */; };
+		19565EC22AF616CA007D6727 /* CNLiveShopDetailOrderAssetCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19565EC12AF616CA007D6727 /* CNLiveShopDetailOrderAssetCell.swift */; };
+		19565EC52AF8AD1F007D6727 /* CNLiveShopProductManagerController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19565EC42AF8AD1F007D6727 /* CNLiveShopProductManagerController.swift */; };
+		19565EC72AF8AD38007D6727 /* CNLiveShopNewProductController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19565EC62AF8AD38007D6727 /* CNLiveShopNewProductController.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 */; };
@@ -146,6 +150,10 @@
 		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>"; };
+		19565EBF2AF4DE0E007D6727 /* CNLiveShopDetailBtnsCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopDetailBtnsCell.swift; sourceTree = "<group>"; };
+		19565EC12AF616CA007D6727 /* CNLiveShopDetailOrderAssetCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopDetailOrderAssetCell.swift; sourceTree = "<group>"; };
+		19565EC42AF8AD1F007D6727 /* CNLiveShopProductManagerController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopProductManagerController.swift; sourceTree = "<group>"; };
+		19565EC62AF8AD38007D6727 /* CNLiveShopNewProductController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopNewProductController.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>"; };
@@ -295,6 +303,15 @@
 /* End PBXFrameworksBuildPhase section */
 /* Begin PBXGroup section */
+		19565EC32AF8ACC2007D6727 /* 商品管理 */ = {
+			isa = PBXGroup;
+			children = (
+				19565EC42AF8AD1F007D6727 /* CNLiveShopProductManagerController.swift */,
+				19565EC62AF8AD38007D6727 /* CNLiveShopNewProductController.swift */,
+			);
+			path = "商品管理";
+			sourceTree = "<group>";
+		};
 		19BB1FE42AEB93850094D962 /* Model */ = {
 			isa = PBXGroup;
 			children = (
@@ -641,10 +658,12 @@
 				19F1C2322AB5728B0083D06C /* CNIDCardView.swift */,
 				19FA20162AE22D3C001F7186 /* CNLiveDownSlideRecommendCell.swift */,
 				19FA20182AE22D98001F7186 /* CNLiveDownSlideTodayRecommendCell.swift */,
-				19CC4D462ADD006600308E2A /* CNDownSlideSingleCourseCell.swift */,
 				19CC4D4E2ADD0FC200308E2A /* CNUpSlideDetailScrollView.swift */,
 				19BB1FE92AEF7B4A0094D962 /* CNLiveShopConsoleCell.swift */,
 				19BB1FF12AF21A950094D962 /* CNLliveShopDetailBannerCell.swift */,
+				19CC4D462ADD006600308E2A /* CNDownSlideSingleCourseCell.swift */,
+				19565EBF2AF4DE0E007D6727 /* CNLiveShopDetailBtnsCell.swift */,
+				19565EC12AF616CA007D6727 /* CNLiveShopDetailOrderAssetCell.swift */,
 			);
 			name = View;
 			path = HomePage/View;
@@ -653,6 +672,7 @@
 		7CD6754D2A2840B9008354C1 /* Controller */ = {
 			isa = PBXGroup;
 			children = (
+				19565EC32AF8ACC2007D6727 /* 商品管理 */,
 				19BB1FDE2AEA3A450094D962 /* CNSlideBaseNavigationController.swift */,
 				7CD6754E2A2840B9008354C1 /* CNMetaCodeHomePageController.swift */,
 				19123FC02ABC11170075C883 /* CNWebViewController.swift */,
@@ -980,6 +1000,7 @@
 				192336EB2AD9224300D47CD4 /* CNUpSlideViewController.swift in Sources */,
 				7963989D2A260E6200D045EB /* CNLiveBaseViewController.swift in Sources */,
 				798A44FB2A30999900815935 /* CNLiveAlertTool.swift in Sources */,
+				19565EC02AF4DE0E007D6727 /* CNLiveShopDetailBtnsCell.swift in Sources */,
 				790D01A52A2DF65E00C5978D /* CNLiveLoginPickerView.swift in Sources */,
 				79BA085D2AB18E8300D01875 /* CNLiveSaveAuthDB.swift in Sources */,
 				79282A3C2A2EDC2500B5F8CF /* NSString+CNLiveExtensions.swift in Sources */,
@@ -1012,6 +1033,7 @@
 				19CC4D472ADD006600308E2A /* CNDownSlideSingleCourseCell.swift in Sources */,
 				79E496E32AB9357000127BF8 /* UITableViewCell+CNLiveExtension.swift in Sources */,
 				7C83B4422A541EBF004BF4A4 /* CALayer+CNLiveExtensions.swift in Sources */,
+				19565EC72AF8AD38007D6727 /* CNLiveShopNewProductController.swift in Sources */,
 				798A44F72A3077ED00815935 /* CNLiveHotButton.swift in Sources */,
 				7CD6753D2A2740B0008354C1 /* CNMainView.swift in Sources */,
 				793CAF522A58FCA200882EF4 /* CNLiveMineExchangeViewController.swift in Sources */,
@@ -1042,6 +1064,7 @@
 				7C2703302A36CBE30061EC50 /* CNCertificationView.swift in Sources */,
 				19CC4D542ADD163D00308E2A /* CNUpSlideCardPresentationController.swift in Sources */,
 				790D01A32A2DDBA300C5978D /* CNLiveConfigManager.swift in Sources */,
+				19565EC52AF8AD1F007D6727 /* CNLiveShopProductManagerController.swift in Sources */,
 				19CC4D492ADD06C500308E2A /* UITableView+Extension.swift in Sources */,
 				7C2703332A36CC660061EC50 /* CNLiveGlobalBlock.swift in Sources */,
 				7987BF3D2A497644000A1ABC /* CNLiveMineQuestViewController.swift in Sources */,
@@ -1056,6 +1079,7 @@
 				790D018B2A2D8B3300C5978D /* CNLiveLoginViewController.swift in Sources */,
 				19CC4D562ADD19C200308E2A /* String+Extension.swift in Sources */,
 				7905BB492AB0588B0089BC50 /* CNLiveMineAuthResultViewController.swift in Sources */,
+				19565EC22AF616CA007D6727 /* CNLiveShopDetailOrderAssetCell.swift in Sources */,
 				798A44EC2A302DBE00815935 /* CNLiveMineAddInfoViewController.swift in Sources */,
 				7CD675422A2740F8008354C1 /* CNCustomIndexView.swift in Sources */,
 				790D01912A2DAC5E00C5978D /* CNLiveConfigFontMacro.swift in Sources */,
@@ -12,12 +12,12 @@ import WCDBSwift
 class BaseModel: HandyJSON {
-    var database:Database
+//    var database:Database
     required init() {
         //数据库地址
-        let filePath = NSHomeDirectory() + "/Documents/DB/CNLiveBaseModel.db"
-        database = Database(at: filePath)
+//        let filePath = NSHomeDirectory() + "/Documents/DB/CNLiveBaseModel.db"
+//        database = Database(at: filePath)
 //        super.init()
@@ -11,7 +11,7 @@ import HandyJSON
 class UserInfoModel: BaseModel {
-    required init() {}
+//    required init() {}
     var appId:String = ""
     var appleUid:String = ""
@@ -120,6 +120,63 @@ class UserInfoManager: NSObject {
     }
 }
+class DSUserInfoManager: NSObject{
+    static let shared = DSUserInfoManager()
+    
+    fileprivate var _dsUserInfo : CNLiveShopUserInfoModel?
+    private(set) var dsUserInfo: CNLiveShopUserInfoModel {
+        
+        set {
+            _dsUserInfo = newValue
+        }
+        
+        get {
+            if _dsUserInfo != nil && _dsUserInfo?.id != nil {
+                return _dsUserInfo!
+            }
+            return DSUserInfoManager.readDSUserInfo()
+        }
+    }
+    
+    private override init() {}
+
+    /// 缓存电商用户数据
+    /// - Parameter dsuserInfo: 用户数据 存储字符串
+    static public func cacheDSUserInfo(dsUserInfo: CNLiveShopUserInfoModel) {
+        DSUserInfoManager.clearDSUserInfo()
+        DSUserInfoManager.shared._dsUserInfo = dsUserInfo
+        UserDefaults.standard.set(dsUserInfo.toJSONString(), forKey: "mateCode_dsUserInfo")
+        if UserDefaults.standard.synchronize() {
+            print("电商用户信息存储成功")
+        }
+    }
+    
+    /// 读取用户数据
+    /// - Returns: 用户数据
+    static public func readDSUserInfo() -> CNLiveShopUserInfoModel {
+        let dsUser_info = UserDefaults.standard.object(forKey: "mateCode_dsUserInfo")
+        if dsUser_info == nil {
+            print("获取电商用户信息失败")
+            return CNLiveShopUserInfoModel()
+        }
+        if (dsUser_info as! String).count == 0 {
+            print("获取电商用户信息失败")
+            return CNLiveShopUserInfoModel()
+        }
+        let dsUserInfo = jsonToModel(dsUser_info as! String, CNLiveShopUserInfoModel.self) as! CNLiveShopUserInfoModel
+        DSUserInfoManager.shared._dsUserInfo = dsUserInfo
+        return dsUserInfo
+    }
+    
+    static public func clearDSUserInfo() {
+        UserDefaults.standard.removeObject(forKey: "mateCode_dsUserInfo")
+        DSUserInfoManager.shared._dsUserInfo = nil
+        if UserDefaults.standard.synchronize() {
+            print("电商用户信息删除成功")
+        }
+    }
+}
+
 class StandSortManager: NSObject {
     static let shared = StandSortManager()
@@ -13,12 +13,47 @@ class CNLiveDownShopDetailController:CNLiveBaseViewController, UICollectionViewD
     let kCNLiveShopDetailHeaderViewID = "kCNLiveShopDetailHeaderViewID"
     let kCNLiveShopDetailBannerCellID = "kCNLiveShopDetailBannerCellID"
+    let kCNLiveShopDetailBtnsCellID = "kCNLiveShopDetailBtnsCellID"
+    let kCNLiveShopDetailOrderAssetCellID = "kCNLiveShopDetailOrderAssetCellID"
     lazy var shopDetailModel: CNLiveShopDetailModel = {
         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)
+        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()
@@ -29,6 +64,8 @@ class CNLiveDownShopDetailController:CNLiveBaseViewController, UICollectionViewD
 //        collectionView.register(CNLiveShopConsoleHeaderView.self, forSupplementaryViewOfKind: UICollectionView.elementKindSectionHeader, withReuseIdentifier: kCNLiveShopConsoleCollectionReusableHeaderViewID)
         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
     }()
@@ -36,12 +73,29 @@ class CNLiveDownShopDetailController:CNLiveBaseViewController, UICollectionViewD
     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()
         }
+        self.view.addSubview(closeBtn)
+//        self.view.addSubview(navView)
+        
+    }
+        
+    // MARK: BtnAction
+    @objc func closeBtnAction(){
+        let upSlideView = self.view.superview as! CNUpSlideView
+        let scrollView = upSlideView.superview as! UIScrollView
+        scrollView.setContentOffset(CGPoint(x: 0, y: scrollView.height), animated: true)
+        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
+//        customIndexView.baseScrollView.setContentOffset(CGPoint(x: 0, y: customIndexView.baseScrollView.height), animated: true)
+//        currentViewController()?.tabBarController?.tabBar.isHidden = false
     }
     // MARK: - UICollectionViewDelegate
@@ -82,15 +136,40 @@ class CNLiveDownShopDetailController:CNLiveBaseViewController, UICollectionViewD
 //    }
     func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
         switch indexPath.section {
-        case 0:
+        case 0://banner轮播图
             let cell = collectionView.dequeueReusableCell(withReuseIdentifier: kCNLiveShopDetailBannerCellID, for: indexPath) as! CNLliveShopDetailBannerCell
-
+            
             cell.shopDetailModel = self.shopDetailModel
             return cell
-//        case 1:
-//            
-//        case 2:
-//        case 3:
+        case 1://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
+                return cell
+            }else{ 
+                let cell = collectionView.dequeueReusableCell(withReuseIdentifier: kCNLiveShopDetailDefaultCellID, for: indexPath)
+                return cell
+            }
+        case 2://我的订单
+            if (self.shopDetailModel.is_seller != nil && self.shopDetailModel.is_seller == true) {
+                let cell = collectionView.dequeueReusableCell(withReuseIdentifier: kCNLiveShopDetailOrderAssetCellID, for: indexPath) as! CNLiveShopDetailOrderAssetCell
+                cell.displayType = .CNLiveShopDetailDisplayTypeOrder
+                cell.shopDetailModel = self.shopDetailModel
+                return cell
+            }else{
+                let cell = collectionView.dequeueReusableCell(withReuseIdentifier: kCNLiveShopDetailDefaultCellID, for: indexPath)
+                return cell
+            }
+        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 = .CNLiveShopDetailDisplayTypeAsset
+                cell.shopDetailModel = self.shopDetailModel
+                return cell
+            }else{
+                let cell = collectionView.dequeueReusableCell(withReuseIdentifier: kCNLiveShopDetailDefaultCellID, for: indexPath)
+                return cell
+            }
 //        case 4:
         default:
             let cell = collectionView.dequeueReusableCell(withReuseIdentifier: kCNLiveShopDetailDefaultCellID, for: indexPath)
@@ -103,15 +182,15 @@ class CNLiveDownShopDetailController:CNLiveBaseViewController, UICollectionViewD
     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:
+                case 0://banner
                     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:
+                case 1://btn
+                    return CGSize(width: KSreenWidth, height: 10+45+5+17+15)
+                case 2://我的订单
+                    return CGSize(width: KSreenWidth, height: 10+25+15+CNLiveAdaptTool.adaptLength(length: 128-55)+15)
+                case 3://我的资产
+                    return CGSize(width: KSreenWidth, height: 10+25+15+CNLiveAdaptTool.adaptLength(length: 128-55)+15)
+                case 4://
                     return CGSize(width: KSreenWidth, height: 50)
                 default:
                     return CGSizeZero
@@ -88,9 +88,10 @@ class CNLiveShopConsoleController: CNLiveBaseViewController, UICollectionViewDel
         if itemModel.type == CNLiveShopConsoleType.XZSP.rawValue{
             //商城新增商品
+            
         }else if itemModel.type == CNLiveShopConsoleType.SPGL.rawValue{
             //商城商品管理
-            
+            currentViewController()?.navigationController?.pushViewController(CNLiveShopProductManagerController.init(), animated: true)
         }else if itemModel.type == CNLiveShopConsoleType.XZYHQ.rawValue{
             //新增优惠券
@@ -122,7 +123,9 @@ class CNLiveShopConsoleController: CNLiveBaseViewController, UICollectionViewDel
         }else if itemModel.type == CNLiveShopConsoleType.OnManagerment.rawValue{
             //直播管理
-            
+            let webVC =  CNWebViewController()
+            webVC.url = URL(string: "http://wjjh5.cnlive.com/apkdownloadShop.php")
+            currentViewController()?.navigationController?.pushViewController(webVC, animated: true)
         }
     }
@@ -135,6 +138,8 @@ class CNLiveShopConsoleController: CNLiveBaseViewController, UICollectionViewDel
             if status == .success{
                 let shopUserModel = result as! CNLiveShopUserInfoModel
+                DSUserInfoManager.cacheDSUserInfo(dsUserInfo: shopUserModel)
+                
                 if shopUserModel.type != "3"{
                     //type 1商家或者8达人
                     let shopConsoleModel = CNLiveShopConsoleModel()
@@ -86,6 +86,14 @@ class CNWebViewController:CNLiveBaseViewController ,WKNavigationDelegate{
     @available(iOS 13.0, *)
     func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, preferences: WKWebpagePreferences, decisionHandler: @escaping (WKNavigationActionPolicy, WKWebpagePreferences) -> Void) {
+        if navigationAction.navigationType == .other{
+            //跳转Appstore
+            let url = URL(string: "https://apps.apple.com/cn/app/%E7%BD%91%E5%AE%B6%E5%AE%B6%E5%95%86%E5%AE%B6%E7%89%88/id1337575497")
+            if url == navigationAction.request.url {
+                if UIApplication.shared.canOpenURL(url!) { UIApplication.shared.open(url!, options: [:], completionHandler: nil)
+                }
+            }
+        }
         decisionHandler(.allow, preferences)
     }
 }
+//
+//  CNLiveShopNewProductController.swift
+//  metaCode
+//
+//  Created by zx on 2023/11/6.
+//  新增商品
+
+import Foundation
+
+class CNLiveShopNewProductController:CNLiveBaseViewController{
+    
+}
+//
+//  CNLiveShopProductManagerController.swift
+//  metaCode
+//
+//  Created by zx on 2023/11/6.
+//  商品管理
+
+import Foundation
+
+class CNLiveShopProductManagerController:CNLiveBaseViewController{
+    
+//    lazy var navView: UIView = {
+//        let navView = UIView(frame: CGRect(x: 0, y: 0, width: KSreenWidth, height: KNavigationHeight))
+//        navView.backgroundColor = .white
+//        return navView
+//    }()
+//    lazy var titleLbl: UILabel = {
+//        let titleLbl = UILabel(frame: CGRect(x: KSreenWidth*0.5-100, y: KStatusBarHeight, width: 200, height: KNavigationHeight-KStatusBarHeight))
+//        titleLbl.text = "商品管理"
+//        titleLbl.font = Font_18
+//        titleLbl.textAlignment = .center
+//        titleLbl.textColor = HexColor("#333333")
+//        return titleLbl
+//    }()
+    
+    lazy var addBtn: UIButton = {
+        let addBtn = UIButton(type: .custom)
+        addBtn.frame = CGRect(x: 0, y: 0, width: 100, height:KNavigationHeight-KStatusBarHeight )
+        addBtn.addTarget(self, action: #selector(addBtnAction), for: .touchUpInside)
+        addBtn.setTitle("新增商品", for: .normal)
+        addBtn.setTitleColor(HexColor("#666666"), for: .normal)
+        return addBtn
+    }()
+        
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        self.setUI()
+    }
+    func setUI(){
+        navigationBarHidden = false
+        titleName = "商品管理"
+        rightNavBtns = [self.addBtn]
+    }
+    
+    // MARK: - BtnAction
+    @objc func addBtnAction(){
+        
+    }
+}
+//
+//  CNLiveShopDetailBtnsCell.swift
+//  metaCode
+//
+//  Created by zx on 2023/11/3.
+//
+
+import Foundation
+
+class CNLiveShopDetailBtnsCell: UICollectionViewCell {
+    
+    //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 = .white
+        var titlesArr:Array<String> = []
+        if DSUserInfoManager.shared.dsUserInfo.type != "3" {
+            titlesArr = ["发布动态", "商品管理", "订单管理", "交易记录"]
+        }else{
+            //健康餐桌 不处理
+        }
+        //替换icon
+        let icons = ["ds_Up_Btn", "ds_Up_Btn", "ds_Up_Btn", "ds_Up_Btn"]
+        if titlesArr.count > 0 {
+            for i in 0..<titlesArr.count {
+                let titleStr = titlesArr[i]
+                let iconStr = icons[i]
+                //icon
+                let imgWH = 45
+                let imgGap = (Int(KSreenWidth)-4*imgWH)/5
+                
+                let iconBtn = UIButton(type: .custom)
+                iconBtn.frame = CGRect(x: imgGap*(i+1)+imgWH*i, y: 10, width: imgWH, height: imgWH)
+                iconBtn.setBackgroundImage(UIImage(named: iconStr), for: .normal)
+                iconBtn.addTarget(self, action: #selector(iconBtnAction(_:)), for: .touchUpInside)
+                iconBtn.tag = i+100
+                iconBtn.layer.cornerRadius = 11.5
+                self.contentView.addSubview(iconBtn)
+                
+                let titleLbl = UILabel(frame: CGRect(x: iconBtn.left-5, y: iconBtn.bottom+5, width: iconBtn.width+10, height: 17))
+                titleLbl.text = titleStr
+                titleLbl.textAlignment = .center
+                titleLbl.font = Font_12
+                titleLbl.textColor = HexColor("#4A4A4A")
+                self.contentView.addSubview(titleLbl)
+            }
+        }
+    }
+    
+    @objc func iconBtnAction(_ sender: UIButton){
+        let tag = sender.tag
+        ///push VC
+        if tag == 100 {
+            //发布动态
+        }else if tag == 101 {
+            //商品管理
+            let webVC = CNWebViewController()
+            webVC.url = URL(string:"https://www.baidu.com")
+            currentViewController()?.navigationController?.pushViewController(webVC, animated: true)
+
+        }else if tag == 102 {
+            //订单管理
+        }else if tag == 103 {
+            //交易记录
+        }
+        
+    }
+}
+//
+//  CNLiveShopDetailOrderAssetCell.swift
+//  metaCode
+//
+//  Created by zx on 2023/11/4.
+//  我的订单,我的资产
+
+import Foundation
+enum CNLiveShopDetailDisplayType {
+    case CNLiveShopDetailDisplayTypeOrder
+    case CNLiveShopDetailDisplayTypeAsset
+}
+class CNLiveShopDetailOrderAssetCell:UICollectionViewCell{
+    
+    //订单,资产
+    var displayType: CNLiveShopDetailDisplayType?
+    
+    //shopDetailModel
+    var _shopDetailModel : CNLiveShopDetailModel?
+    var shopDetailModel : CNLiveShopDetailModel? {
+        get{
+            _shopDetailModel
+        }
+        set{
+            _shopDetailModel = newValue!
+            self.setNewUI()
+        }
+    }
+    
+    var navTitle = UILabel()
+    var navsubBtn = UIButton()
+    var bgImageView = UIImageView()
+    
+    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 = .white
+    }
+    func setNewUI(){
+        self.navTitle = UILabel(frame: CGRect(x: 15, y: 10, width: 80, height: 25))
+        var navTitleText = ""
+        if self.displayType == .CNLiveShopDetailDisplayTypeOrder{
+            navTitleText = "我的订单"
+        }else if self.displayType == .CNLiveShopDetailDisplayTypeAsset{
+            navTitleText = "我的资产"
+        }
+        self.navTitle.text = navTitleText
+        self.navTitle.textAlignment = .left
+        self.navTitle.font = Font_18
+        self.navTitle.textColor = HexColor("#4A4A4A")
+        self.contentView.addSubview(self.navTitle)
+        
+        self.navsubBtn = UIButton(type: .custom)
+        self.navsubBtn.frame = CGRect(x: 0, y: 10, width: 80, height: 19)
+        self.navsubBtn.right = self.contentView.width - 15
+        self.navsubBtn.setImage(UIImage(named: "homepage_detail"), for: .normal)
+        self.navsubBtn.addTarget(self, action: #selector(navsubBtnAction(_:)), for: .touchUpInside)
+        self.navsubBtn.setTitleColor(HexColor("#999999"), for: .normal)
+        self.navsubBtn.titleLabel?.font = Font_13
+        self.navsubBtn.setTitle("订单明细", for: .normal)
+        self.navsubBtn.setupButtonImageAndTitlePossitionWith(padding: 4, style:.right)
+        self.contentView.addSubview(self.navsubBtn)
+        
+        var imgName = ""
+        if self.displayType == .CNLiveShopDetailDisplayTypeOrder{
+            imgName = "homepage_detail_order_bg"
+        }else if self.displayType == .CNLiveShopDetailDisplayTypeAsset{
+            imgName = "homepage_detail_asset_bg"
+        }
+        let imageView = UIImageView(frame: CGRect(x: 15, y: self.navTitle.bottom + 15, width: self.contentView.width - 30, height: CNLiveAdaptTool.adaptLength(length: 128)))
+        imageView.image = UIImage(named: imgName)
+        self.bgImageView = imageView
+        self.contentView.addSubview(self.bgImageView)
+        
+        var numbers:Array<String> = []
+        var titles:Array<String> = []
+        if self.displayType == .CNLiveShopDetailDisplayTypeOrder{
+            numbers = [_shopDetailModel?.seller_data?.day_order ?? "0", _shopDetailModel?.seller_data?.day_order_money ?? "0","0","0"]
+            titles = ["今日订单数", "今日订单金额", "店铺访客", "商品浏览量"]
+        }else if self.displayType == .CNLiveShopDetailDisplayTypeAsset{
+            numbers = [_shopDetailModel?.seller_data?.total_money ?? "0", _shopDetailModel?.seller_data?.shop_money ?? "0",_shopDetailModel?.seller_data?.daren_money ?? "0","0"]
+            titles = ["余额总计/¥", "电商余额/¥", "扫码余额/¥", "可结算金额/¥"]
+        }
+        let titleW = 70
+        let gap = Int((Int(self.contentView.width)-titleW*4)/5)
+        for i in 0..<4 {
+            
+            let titleLabel = UILabel(frame: CGRect(x: gap*(i+1)+i*titleW, y: Int(self.bgImageView.top)+15, width: titleW, height: 25))
+            titleLabel.text = numbers[i]
+            titleLabel.textAlignment = .center
+            titleLabel.font = Font_18
+            titleLabel.textColor = HexColor("#7A574A")
+            self.contentView.addSubview(titleLabel)
+            
+            let subTitleLabel = UILabel(frame: CGRect(x: gap*(i+1)+i*titleW, y: Int(titleLabel.bottom)+5, width: titleW, height: 14))
+            subTitleLabel.text = titles[i]
+            subTitleLabel.textAlignment = .center
+            subTitleLabel.font = Font_10
+            subTitleLabel.textColor = HexColor("#7A574A")
+            self.contentView.addSubview(subTitleLabel)
+
+            let clickBtn = UIButton(type: .custom)
+            clickBtn.frame = CGRect(x: titleLabel.left, y: titleLabel.top, width: titleLabel.width, height: subTitleLabel.bottom-titleLabel.top)
+            clickBtn.addTarget(self, action: #selector(clickBtnAction(_:)), for: .touchUpInside)
+            clickBtn.tag = i+100
+            self.contentView.addSubview(clickBtn)
+            
+        }
+        
+    }
+    
+    @objc func navsubBtnAction(_ sender: UIButton){
+        if self.displayType == .CNLiveShopDetailDisplayTypeOrder{
+            //push订单VC
+        }else if self.displayType == .CNLiveShopDetailDisplayTypeAsset{
+            //push余额VC
+        }
+    }
+    @objc func clickBtnAction(_ sender: UIButton){
+        let tag = sender.tag
+        if tag == 100 {
+            
+        }else if tag == 101 {
+            print(tag)
+        }else if tag == 102 {
+            
+        }else if tag == 103 {
+            
+        }
+    }
+}
@@ -19,7 +19,7 @@ class CNLliveShopDetailBannerCell:UICollectionViewCell,FSPagerViewDataSource,FSP
         viewPager.delegate = self
         viewPager.register(FSPagerViewCell.self, forCellWithReuseIdentifier: kCNLliveShopDetailBannerCellID)
         //设置自动翻页事件间隔，默认值为0 (不自动翻页)
-        viewPager.automaticSlidingInterval = 1.0
+        viewPager.automaticSlidingInterval = 0
         //设置页面之间的间隔距离
         viewPager.interitemSpacing = 8.0
         //设置可以无限翻页，默认值为false，false时从尾部向前滚动到头部再继续循环滚动，true时可以无限滚动
@@ -29,6 +29,22 @@ class CNLliveShopDetailBannerCell:UICollectionViewCell,FSPagerViewDataSource,FSP
         return viewPager
     }()
+    // 懒加载滚动图片浏下标
+    lazy var pagerControl:FSPageControl = {
+        let pageControl = FSPageControl(frame: CGRect(x: 20, y: self.contentView.height-24, width: self.contentView.width-40, height: 4))
+        //设置下标位置
+        pageControl.contentHorizontalAlignment = .right
+        //设置下标指示器颜色（选中状态和普通状态）
+        pageControl.setFillColor(HexColor("#FFFFFF"), for: .normal)
+        pageControl.setFillColor(HexColor("#65C368"), for: .selected)
+        
+        //绘制下标指示器的形状 (roundedRect绘制绘制圆角或者圆形)
+        pageControl.setPath(UIBezierPath.init(roundedRect: CGRect.init(x: 0, y: 0, width: 8, height: 4),cornerRadius: 2.0), for: .selected)
+        pageControl.setPath(UIBezierPath(ovalIn: CGRect(x: 0, y: 0, width: 4, height: 4)), for: .normal)
+        return pageControl
+
+    }()
+    
     //shopDetailModel
     var _shopDetailModel : CNLiveShopDetailModel?
     var shopDetailModel : CNLiveShopDetailModel? {
@@ -37,7 +53,11 @@ class CNLliveShopDetailBannerCell:UICollectionViewCell,FSPagerViewDataSource,FSP
         }
         set{
             _shopDetailModel = newValue!
-            
+            //设置下标的个数
+            self.pagerControl.numberOfPages = (_shopDetailModel?.banner.count)!
+            if _shopDetailModel?.banner.count == 1 {
+                self.viewPager.isInfinite = false
+            }
         }
     }
@@ -52,10 +72,13 @@ class CNLliveShopDetailBannerCell:UICollectionViewCell,FSPagerViewDataSource,FSP
     }
     func setUI(){
-        self.backgroundColor = .red
+        self.backgroundColor = .white
         self.contentView.addSubview(self.viewPager)
+        self.contentView.addSubview(self.pagerControl)
+        
     }
-    
+
+
     // MARK: - FSPagerViewDataSource
     func numberOfItems(in pagerView: FSPagerView) -> Int {
         return (self.shopDetailModel?.banner.count)!
@@ -64,6 +87,18 @@ class CNLliveShopDetailBannerCell:UICollectionViewCell,FSPagerViewDataSource,FSP
         let cell = pagerView.dequeueReusableCell(withReuseIdentifier: kCNLliveShopDetailBannerCellID, at: index)
         let imgUrl = self.shopDetailModel?.banner[index].simg!
         cell.imageView?.kf.setImage(with: URL(string: imgUrl!))
+        cell.imageView?.layer.cornerRadius = 9
         return cell
     }
+    func pagerView(_ pagerView: FSPagerView, willDisplay cell: FSPagerViewCell, forItemAt index: Int) {
+        self.pagerControl.currentPage = index
+
+    }
+    
+    func pagerView(_ pagerView: FSPagerView, didSelectItemAt index: Int) {
+        let bannerMdl = self.shopDetailModel?.banner[index]
+        let webVC =  CNWebViewController()
+        webVC.url = URL(string: bannerMdl?.url ?? "")
+        currentViewController()?.navigationController?.pushViewController(webVC, animated: true)
+    }
 }
@@ -63,9 +63,15 @@ class CNUpSlideView:UIView{
     override init(frame: CGRect) {
         super.init(frame: frame)
+        let tap = UITapGestureRecognizer.init(target: self, action: #selector(upSlideViewTap))
+        tap.cancelsTouchesInView = false
+        self.addGestureRecognizer(tap)
         self.initUI()
     }
+    @objc func upSlideViewTap() {
+        print("upSlideViewTap")
+    }
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
@@ -73,6 +79,7 @@ class CNUpSlideView:UIView{
     func initUI()
     {
+        self.isUserInteractionEnabled = true
         self.backgroundColor = UIColor.clear
         self.layer.cornerRadius = 20
     }
@@ -267,40 +267,40 @@ class CNLiveMineViewModel: NSObject {
                 if (errorCode == "0") {
                     let listModel = dictionaryToModel(resp as! [String : Any], StandListBaseModel.self,"data") as! StandListBaseModel
                     if page == 1 && listModel.list.count > 0 {
-                        CNLiveSaveStandDB.shared.insertObjects(objects: listModel.list)
+//                        CNLiveSaveStandDB.shared.insertObjects(objects: listModel.list)
                     }
                     listModel.list = StandSortManager.sortAllListData(stands: listModel.list as NSArray) as! [StandListModel]
                     resultBlock(listModel,.success)
                 } else {
-                    let tempArray = CNLiveSaveStandDB.shared.searchAllObject()
-                    if tempArray.count > 0 {
-                        let listModel = StandListBaseModel.init()
-                        listModel.pageNum = page
-                        listModel.total = page
-                        listModel.list = StandSortManager.sortAllListData(stands: tempArray as NSArray) as! [StandListModel]
-                        resultBlock(listModel,.success)
-                    }else{
-                        showMessage(message: resp["errorMessage"] as! String)
-                        resultBlock(NSNull(),.failed)
-                    }
+//                    let tempArray = CNLiveSaveStandDB.shared.searchAllObject()
+//                    if tempArray.count > 0 {
+//                        let listModel = StandListBaseModel.init()
+//                        listModel.pageNum = page
+//                        listModel.total = page
+//                        listModel.list = StandSortManager.sortAllListData(stands: tempArray as NSArray) as! [StandListModel]
+//                        resultBlock(listModel,.success)
+//                    }else{
+//                        showMessage(message: resp["errorMessage"] as! String)
+//                        resultBlock(NSNull(),.failed)
+//                    }
                 }
             } else {
-                let tempArray = CNLiveSaveStandDB.shared.searchAllObject()
-                if tempArray.count > 0 {
-                    let listModel = StandListBaseModel.init()
-                    listModel.pageNum = page
-                    listModel.total = page
-                    listModel.list = StandSortManager.sortAllListData(stands: tempArray as NSArray) as! [StandListModel]
-                    resultBlock(listModel,.success)
-                }else{
-                    if CNLiveNetworking.isNetworking() {
-                        showMessage(message: "获取失败")
-                        resultBlock(NSNull(),.failed)
-                    } else {
-                        showMessage(message: "似乎与网络断开链接")
-                        resultBlock(NSNull(),.noNetwork)
-                    }
-                }
+//                let tempArray = CNLiveSaveStandDB.shared.searchAllObject()
+//                if tempArray.count > 0 {
+//                    let listModel = StandListBaseModel.init()
+//                    listModel.pageNum = page
+//                    listModel.total = page
+//                    listModel.list = StandSortManager.sortAllListData(stands: tempArray as NSArray) as! [StandListModel]
+//                    resultBlock(listModel,.success)
+//                }else{
+//                    if CNLiveNetworking.isNetworking() {
+//                        showMessage(message: "获取失败")
+//                        resultBlock(NSNull(),.failed)
+//                    } else {
+//                        showMessage(message: "似乎与网络断开链接")
+//                        resultBlock(NSNull(),.noNetwork)
+//                    }
+//                }
             }
         }
     }
@@ -325,40 +325,40 @@ class CNLiveMineViewModel: NSObject {
                 if (errorCode == "0" && !(resp["data"] is NSNull)) {
                     let listModel = dictionaryToModel(resp as! [String : Any], MineAuthListBaseModel.self,"data") as! MineAuthListBaseModel
                     if page == 1 && listModel.list.count > 0 {
-                        CNLiveSaveAuthDB.shared.insertObjects(objects: listModel.list)
+//                        CNLiveSaveAuthDB.shared.insertObjects(objects: listModel.list)
                     }
                     listModel.list = StandSortManager.sortMyListData(auths: listModel.list as NSArray) as! [MineAuthListModel]
                     resultBlock(listModel,.success)
                 } else {
-                    let tempArray = CNLiveSaveAuthDB.shared.searchAllObject()
-                    if tempArray.count > 0 {
-                        let listModel = MineAuthListBaseModel.init()
-                        listModel.pageNum = page
-                        listModel.total = page
-                        listModel.list = StandSortManager.sortMyListData(auths: tempArray as NSArray) as! [MineAuthListModel]
-                        resultBlock(listModel,.success)
-                    }else{
-                        showMessage(message: resp["errorMessage"] as! String)
-                        resultBlock(NSNull(),.failed)
-                    }
+//                    let tempArray = CNLiveSaveAuthDB.shared.searchAllObject()
+//                    if tempArray.count > 0 {
+//                        let listModel = MineAuthListBaseModel.init()
+//                        listModel.pageNum = page
+//                        listModel.total = page
+//                        listModel.list = StandSortManager.sortMyListData(auths: tempArray as NSArray) as! [MineAuthListModel]
+//                        resultBlock(listModel,.success)
+//                    }else{
+//                        showMessage(message: resp["errorMessage"] as! String)
+//                        resultBlock(NSNull(),.failed)
+//                    }
                 }
             } else {
-                let tempArray = CNLiveSaveAuthDB.shared.searchAllObject()
-                if tempArray.count > 0 {
-                    let listModel = MineAuthListBaseModel.init()
-                    listModel.pageNum = page
-                    listModel.total = page
-                    listModel.list = StandSortManager.sortMyListData(auths: tempArray as NSArray) as! [MineAuthListModel]
-                    resultBlock(listModel,.success)
-                }else{
-                    if CNLiveNetworking.isNetworking() {
-                        showMessage(message: "获取失败")
-                        resultBlock(NSNull(),.failed)
-                    } else {
-                        showMessage(message: "似乎与网络断开链接")
-                        resultBlock(NSNull(),.noNetwork)
-                    }
-                }
+//                let tempArray = CNLiveSaveAuthDB.shared.searchAllObject()
+//                if tempArray.count > 0 {
+//                    let listModel = MineAuthListBaseModel.init()
+//                    listModel.pageNum = page
+//                    listModel.total = page
+//                    listModel.list = StandSortManager.sortMyListData(auths: tempArray as NSArray) as! [MineAuthListModel]
+//                    resultBlock(listModel,.success)
+//                }else{
+//                    if CNLiveNetworking.isNetworking() {
+//                        showMessage(message: "获取失败")
+//                        resultBlock(NSNull(),.failed)
+//                    } else {
+//                        showMessage(message: "似乎与网络断开链接")
+//                        resultBlock(NSNull(),.noNetwork)
+//                    }
+//                }
             }
         }
     }
@@ -614,9 +614,8 @@ class CNLiveMineViewModel: NSObject {
         custom_param.setValue(APPKey_wjj, forKey: "appKey")
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
-        CNLiveNetworking.setupDSRequest(true)
         CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
-        CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseWjjShopUrl+"/Api/Index3/myOrderCount", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
+        CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseWjjBUrl+"/Api/Index3/myOrderCount", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
             if (error == nil) {
                 let resp = result as! NSDictionary
@@ -73,7 +73,7 @@ class CNLiveShopDetailUserModel:BaseModel{
 class CNLiveShopDetailSellerDataModel:BaseModel{
     ///每日订单数
-    var day_order: Int = 0
+    var day_order: String?
     ///每日订单金额
     var day_order_money: String?
     ///电商剩余金额
@@ -9,6 +9,7 @@ import Foundation
 //获取用户信息
 class CNLiveShopUserInfoModel:BaseModel{
+   
     ///darenid生成付款码时用到
     var daren_id: String?
     ///uid 用于请求老达人信息接口
@@ -31,6 +32,7 @@ class CNLiveShopUserInfoModel:BaseModel{
     var title: String?
     ///商家logo
     var logo: String?
+    
 }
 /**
  Printing description of ((__NSDictionaryI *)0x000000010884eca0):
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "ds_Up_Btn@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "homepage_detail@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "homepage_detail_asset_bg@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "homepage_detail_dongtai_bg@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "homepage_detail_order_bg@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}