1.频道列表接口 2.行业认证列表接口 3.认证首页整体逻辑修改

“张旭”
1 parent da99994c
Showing 9 changed files with 415 additions and 178 deletions
metaCode/Classes/Config/CNLiveConfigUserInfo.swift
metaCode/Classes/Main/HomePage/Controller/AuthMainController/CNMetaCodeHomePageController.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/MainView/CNIDCardView.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/MainView/CNMainView.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineAddInfoViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineAuthFormViewController.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineBaseModel.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineViewModel.swift
metaCode/Classes/Other/AppDelegate.swift
@@ -39,6 +39,9 @@ class UserInfoModel: BaseModel {
     var wxUid:String = ""
     var access_token:String = ""
     var expires_in:String = ""//过期时间
+
+    var userMsgUsers: MineGetUserMsgUsersModel?
+    var currentUser:MineGetUserMsgVerifyUsersModel?
     override func mapping(mapper: HelpingMapper) {
@@ -245,7 +248,7 @@ class StandSortManager: NSObject {
             var haveArray = Array<Any>()
             for item in stands {
                 let listModel = item as! StandListModel
-                if listModel.auth {
+                if listModel.userAuth {
                     //2.21 需求把已经认证的第一次展示的时候再通过认证的时间先后顺序进行排序
 //                    tempArray.insert(listModel, at: 0)
                     haveArray.append(listModel)
@@ -427,10 +427,11 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
         let identityModel = dataArray[index] as! StandListModel
         bannerView?.idModel = identityModel
-        if (identityModel.auth == true){
+        if (identityModel.userAuth == true){
+            //已有数字认证
             bannerView?.baseScrollView.isScrollEnabled = true
         }else{
-            //未认证
+            //未数字认证,显示个人 企业 机构
             if (identityModel.downType == 3 || identityModel.downType == 4 || identityModel.upType == 3 || identityModel.upType == 4)
             {//电商工作台和详情页 禁止滑动
                 bannerView?.baseScrollView.isScrollEnabled = false
@@ -664,10 +665,12 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
         }
     }
-    //MARK: - 网络请求获取身份列表
+    let group = DispatchGroup()
+    let queue = DispatchQueue.global(qos: .default)
+    //MARK: - 网络请求获取频道列表
     func getUserIdentityApi()
     {
-//        showLoading(message: "")
+        showLoading(message: "")
         CNLiveMineViewModel.requestAuthStandList(page: 1)
         { [self] result, respStatue in
@@ -675,13 +678,37 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
             if respStatue == .success{
                 self.NetApiStatus = .success
                 let listArray:NSArray = (result as! StandListBaseModel).list as NSArray
+                self.dataArray = NSMutableArray.init()
+                self.dataArray.addObjects(from: listArray as! [Any])
+
                 if (listArray.count > 0){
-                                        
-                    self.dataArray = NSMutableArray.init()
-                    self.dataArray.addObjects(from: listArray as! [Any])
+
+                    listArray.forEach { list in
+                        if let listModel = list as? StandListModel{
+                            
+                            listModel.authenticationsModel.forEach({ childModel in
+                                childModel.child.forEach { childChildModel in
+                                    childChildModel.identities.forEach { identities in
+                                        if identities.userAuth == 1{
+                                            listModel.userAuth = true//是否已经身份认证
+                                        }
+                                    }
+                                }
+                            })
+                            
+                            group.enter()
+                            
+                            self.getAuthenticationsApi(channelId: String(format: "%d", listModel.id), listModel: listModel)
+                        }
+                    }
+                    
+                    group.notify(queue: .main) {
+                        // 所有网络请求都已完成，在这里执行你的任务
+                        
+                        self.addPageView()
+                        self.backgroupView.updateData(idArray: listArray as! Array<StandListModel>)
+                    }
-                    self.addPageView()
-                    self.backgroupView.updateData(idArray: listArray as! Array<StandListModel>)
                 }else{
                     self.NetApiStatus = .apiError
                 }
@@ -695,6 +722,29 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
         }
     }
+    //行业认证列表
+    func getAuthenticationsApi(channelId:String , listModel:StandListModel)
+    {
+        showLoading(message: "")
+        let vsid = UserInfoManager.shared.userInfo.currentUser?.vsid ?? ""
+        CNLiveMineViewModel.requestsIndustryInfo(channelId: channelId, sid: UserInfoManager.shared.userInfo.uid, vsid: vsid) { result, respStatue in
+            if respStatue == .success{//UserInfoManager.shared.userInfo.uid   vsid  "1342671"  "2"
+                if let res = result as? [MineAuthenticationsChildModel]{
+                    //添加每个MineAuthenticationsBaseModel到self.dataArray对应的 频道列表model里
+                    if self.dataArray.contains(listModel){
+                        let index = self.dataArray.index(of: listModel)
+                        let listMdl = listModel
+                        listMdl.authenticationsModel = res
+                        self.dataArray.replaceObject(at: index, with: listMdl)
+                        self.group.leave()
+                    }
+                }
+            }else{
+                self.group.leave()
+            }
+        }
+    }
+    
     // MARK: - 获取电商状态
     func getApplyShopInfo(){
         //获取当前店铺审核状态
@@ -17,7 +17,7 @@ class CNIDCardView: UIView{
         }
         set{
             _idModel = newValue
-            self.iDCardBGView.kf.setImage(with: URL(string: _idModel!.cardImg))
+//            self.iDCardBGView.kf.setImage(with: URL(string: _idModel!.cardImg))
             if _idModel?.id == 9{
                 //电商 , 拼接数据
                 let nameArr = ["公司名称","认证时间","编号"]
@@ -319,36 +319,36 @@ class CNFrontMainView : UIView{
     }()
     ///已认证-前置视图卡片容器
-    lazy var frontCardContentView : UIView = {
-
-        let frontCardContentView = UIView.init(frame: CGRect(x: 0, y: 0, width: self.width, height: self.height ))
-        frontCardContentView.backgroundColor = UIColor.white
-        frontCardContentView.clipsToBounds = true
-        frontCardContentView.layer.cornerRadius = 20
-        frontCardContentView.addSubview(self.cardViewBgImgView)
-        cardViewBgImgView.snp.makeConstraints { make in
-            make.top.equalToSuperview()
-            make.left.equalToSuperview()
-            make.right.equalToSuperview()
-            make.bottom.equalToSuperview()
-        }
-        
-        frontCardContentView.addSubview(self.iDCardView)
-        iDCardView.snp.makeConstraints { make in
-            make.centerX.equalToSuperview()
-            make.bottom.equalToSuperview().offset(-62)
-            make.width.equalTo(262*KSreenWidth/375)
-            make.height.equalTo(0.52*262*KSreenWidth/375)
-        }
-        return frontCardContentView
-        
-    }()
-    /// 已认证-身份卡片
-    lazy var iDCardView:CNIDCardView = {
-
-        let iDCardView:CNIDCardView = CNIDCardView(frame: CGRect(x: 0, y: 0, width: 262*KSreenWidth/375, height: 0.52*262*KSreenWidth/375))
-        return iDCardView
-    }()
+//    lazy var frontCardContentView : UIView = {
+//
+//        let frontCardContentView = UIView.init(frame: CGRect(x: 0, y: 0, width: self.width, height: self.height ))
+//        frontCardContentView.backgroundColor = UIColor.white
+//        frontCardContentView.clipsToBounds = true
+//        frontCardContentView.layer.cornerRadius = 20
+////        frontCardContentView.addSubview(self.cardViewBgImgView)
+////        cardViewBgImgView.snp.makeConstraints { make in
+////            make.top.equalToSuperview()
+////            make.left.equalToSuperview()
+////            make.right.equalToSuperview()
+////            make.bottom.equalToSuperview()
+////        }
+//        
+////        frontCardContentView.addSubview(self.iDCardView)
+////        iDCardView.snp.makeConstraints { make in
+////            make.centerX.equalToSuperview()
+////            make.bottom.equalToSuperview().offset(-62)
+////            make.width.equalTo(262*KSreenWidth/375)
+////            make.height.equalTo(0.52*262*KSreenWidth/375)
+////        }
+//        return frontCardContentView
+//        
+//    }()
+//    /// 已认证-身份卡片
+//    lazy var iDCardView:CNIDCardView = {
+//
+//        let iDCardView:CNIDCardView = CNIDCardView(frame: CGRect(x: 0, y: 0, width: 262*KSreenWidth/375, height: 0.52*262*KSreenWidth/375))
+//        return iDCardView
+//    }()
     /// 已认证-身份卡片
     lazy var textViewBgImgView:UIImageView = {
@@ -360,13 +360,13 @@ class CNFrontMainView : UIView{
     }()
     /// 已认证-卡片后的背景图
-    lazy var cardViewBgImgView:UIImageView = {
-
-        let cardViewBgImgView:UIImageView = UIImageView()
-        cardViewBgImgView.clipsToBounds = true
-        cardViewBgImgView.layer.cornerRadius = 20
-        return cardViewBgImgView
-    }()
+//    lazy var cardViewBgImgView:UIImageView = {
+//
+//        let cardViewBgImgView:UIImageView = UIImageView()
+//        cardViewBgImgView.clipsToBounds = true
+//        cardViewBgImgView.layer.cornerRadius = 20
+//        return cardViewBgImgView
+//    }()
     //IDmodel
     var _idModel : StandListModel?
@@ -376,26 +376,38 @@ class CNFrontMainView : UIView{
         }
         set{
             _idModel = newValue
-            let auth = newValue!.auth
-            if(auth == true){
-            //已认证身份
+            let auth = newValue!.userAuth
+            if(auth == false){//true
+            //已认证身份 //显示数字认证
                 //显示证件View
-                frontCardContentView.isHidden = false
-                self.addStandBtn.isHidden = true
-                self.iDCardView.idModel = newValue!
-                cardViewBgImgView.kf.setImage(with: URL(string: _idModel!.cardBackgroundImg), placeholder: UIImage(named: "homepage_cardBGImg"))
+//                frontCardContentView.isHidden = false
+                self.addStandBtn.isHidden = false
+                self.addStandBtn.setTitle("我的数字认证", for: .normal)
+                self.addStandBtn.backgroundColor = HexColor(_idModel?.backgroundColor ?? "#004FE0")//
+
+
+//                self.iDCardView.idModel = newValue!
+//                cardViewBgImgView.kf.setImage(with: URL(string: _idModel!.cardBackgroundImg), placeholder: UIImage(named: "homepage_cardBGImg"))
                 //隐藏textview
                 textView.isHidden = true
                 unStandBtnBgView.isHidden = true
-                if frontCardContentView.contains(self.upMoreGIF){
+//                if frontCardContentView.contains(self.upMoreGIF){
+//                    self.upMoreGIF.removeFromSuperview()
+//                }
+//                frontCardContentView.addSubview(self.upMoreGIF)
+//                if frontCardContentView.contains(self.downMoreGIF){
+//                    self.downMoreGIF.removeFromSuperview()
+//                }
+//                frontCardContentView.addSubview(self.downMoreGIF)
+                if frontDescContentView.contains(self.upMoreGIF){
                     self.upMoreGIF.removeFromSuperview()
                 }
-                frontCardContentView.addSubview(self.upMoreGIF)
-                if frontCardContentView.contains(self.downMoreGIF){
+                frontDescContentView.addSubview(self.upMoreGIF)
+                if frontDescContentView.contains(self.downMoreGIF){
                     self.downMoreGIF.removeFromSuperview()
                 }
-                frontCardContentView.addSubview(self.downMoreGIF)
+                frontDescContentView.addSubview(self.downMoreGIF)
                 self.setUpMoreGIFAndDownMoreGIF()
                 //上滑 下滑引导gif
                 upMoreGIF.kf.setImage(with: URL(string: newValue!.upGuideImg))
@@ -409,6 +421,7 @@ class CNFrontMainView : UIView{
                     upMoreGIF.isHidden = false
                     downMoreGIF.isHidden = false
                 }
+                textViewBgImgView.kf.setImage(with: URL(string: _idModel!.descBackgroundImg), placeholder: UIImage(named: "homepage_desc_bgImg"))
             }else
             {//未认证身份
                 textView.isHidden = false
@@ -425,6 +438,7 @@ class CNFrontMainView : UIView{
                     self.enterpriseStandBtn.isHidden = true
                     self.unStandBtnBgView.isHidden = true
                     self.addStandBtn.isUserInteractionEnabled = true
+                    textViewBgImgView.kf.setImage(with: URL(string: _idModel!.descBackgroundImg), placeholder: UIImage(named: "homepage_desc_bgImg"))
                     if idModel?.shopInfoModel?.state == "0" || idModel?.shopInfoModel?.state == "4"{
                         //0未申请 //4闭店
                         //未认证->店铺认证
@@ -448,86 +462,97 @@ class CNFrontMainView : UIView{
                     upMoreGIF.isHidden = false
                     downMoreGIF.isHidden = false
-                    if idModel!.userAuth && idModel!.enterpriseAuth && !idModel!.agencyAuth{
-                        self.addStandBtn.isHidden = true
-                        self.personalStandBtn.isHidden = false
-                        self.enterpriseStandBtn.isHidden = false
-                        unStandBtnBgView.isHidden = true
-                        //个人+企业
-                        self.personalStandBtn.setTitle("个人认证", for: .normal)
-                        self.enterpriseStandBtn.setTitle("企业认证", for: .normal)
-                    }else if idModel!.userAuth && idModel!.agencyAuth && !idModel!.enterpriseAuth{
-                        self.addStandBtn.isHidden = true
-                        self.personalStandBtn.isHidden = false
-                        self.enterpriseStandBtn.isHidden = false
-                        unStandBtnBgView.isHidden = true
-                        //个人+机构
-                        self.personalStandBtn.setTitle("个人认证", for: .normal)
-                        self.enterpriseStandBtn.setTitle("机构认证", for: .normal)
-                    }else if idModel!.enterpriseAuth && idModel!.agencyAuth && !idModel!.userAuth{
-                        self.addStandBtn.isHidden = true
-                        self.personalStandBtn.isHidden = false
-                        self.enterpriseStandBtn.isHidden = false
-                        unStandBtnBgView.isHidden = true
-                        //企业+机构
-                        self.personalStandBtn.setTitle("企业认证", for: .normal)
-                        self.enterpriseStandBtn.setTitle("机构认证", for: .normal)
-                    }else if idModel!.userAuth && !idModel!.enterpriseAuth && !idModel!.agencyAuth{
-                        //个人
-                        self.addStandBtn.isHidden = false
-                        self.addStandBtn.setTitle("个人认证", for: .normal)
-                        self.personalStandBtn.isHidden = true
-                        self.enterpriseStandBtn.isHidden = true
-                        self.unStandBtnBgView.isHidden = true
-                    }else if !idModel!.userAuth && idModel!.enterpriseAuth && !idModel!.agencyAuth{
-                        //企业
-                        self.addStandBtn.isHidden = false
-                        self.addStandBtn.setTitle("企业认证", for: .normal)
-                        self.personalStandBtn.isHidden = true
-                        self.enterpriseStandBtn.isHidden = true
-                        self.unStandBtnBgView.isHidden = true
-                    }else if !idModel!.userAuth && !idModel!.enterpriseAuth && idModel!.agencyAuth{
-                        //机构
-                        self.addStandBtn.isHidden = false
-                        self.addStandBtn.setTitle("机构认证", for: .normal)
-                        self.personalStandBtn.isHidden = true
-                        self.enterpriseStandBtn.isHidden = true
-                        self.unStandBtnBgView.isHidden = true
-                    }else if idModel!.userAuth && idModel!.enterpriseAuth && idModel!.agencyAuth{
-                        //个人+企业+机构
-                        self.addStandBtn.isHidden = true
-                        self.personalStandBtn.isHidden = true
-                        self.enterpriseStandBtn.isHidden = true
-                        self.unStandBtnBgView.isHidden = false
-                        self.setUnStandBtnBgViewLayer(startHex: newValue!.atPersonageColour, endHex: newValue!.backgroundColor)
-                    }else if !idModel!.userAuth && !idModel!.enterpriseAuth && !idModel!.agencyAuth{
-                        //无企业和个人
-                        //不显示认证按钮
-                        self.addStandBtn.isHidden = true
-                        self.personalStandBtn.isHidden = true
-                        self.enterpriseStandBtn.isHidden = true
-                        self.unStandBtnBgView.isHidden = true
-                    }
+                    //显示 个人 企业 机构
+                    self.addStandBtn.isHidden = true
+                    self.personalStandBtn.isHidden = true
+                    self.enterpriseStandBtn.isHidden = true
+                    self.unStandBtnBgView.isHidden = false
+                    self.setUnStandBtnBgViewLayer(startHex: newValue!.atPersonageColour, endHex: newValue!.backgroundColor)
+                        
+                    textViewBgImgView.kf.setImage(with: URL(string: _idModel!.descBackgroundImg), placeholder: UIImage(named: "homepage_desc_bgImg"))
+                    
+//                    if idModel!.userAuth{
+//                        //显示数字认证
+//                        
+//                        self.addStandBtn.isHidden = true
+//                        self.personalStandBtn.isHidden = false
+//                        self.enterpriseStandBtn.isHidden = false
+//                        unStandBtnBgView.isHidden = true
+//                        //个人+企业
+//                        self.personalStandBtn.setTitle("个人认证", for: .normal)
+//                        self.enterpriseStandBtn.setTitle("企业认证", for: .normal)
+//                    }else if idModel!.userAuth && idModel!.agencyAuth && !idModel!.enterpriseAuth{
+//                        self.addStandBtn.isHidden = true
+//                        self.personalStandBtn.isHidden = false
+//                        self.enterpriseStandBtn.isHidden = false
+//                        unStandBtnBgView.isHidden = true
+//                        //个人+机构
+//                        self.personalStandBtn.setTitle("个人认证", for: .normal)
+//                        self.enterpriseStandBtn.setTitle("机构认证", for: .normal)
+//                    }else if idModel!.enterpriseAuth && idModel!.agencyAuth && !idModel!.userAuth{
+//                        self.addStandBtn.isHidden = true
+//                        self.personalStandBtn.isHidden = false
+//                        self.enterpriseStandBtn.isHidden = false
+//                        unStandBtnBgView.isHidden = true
+//                        //企业+机构
+//                        self.personalStandBtn.setTitle("企业认证", for: .normal)
+//                        self.enterpriseStandBtn.setTitle("机构认证", for: .normal)
+//                    }else if idModel!.userAuth && !idModel!.enterpriseAuth && !idModel!.agencyAuth{
+//                        //个人
+//                        self.addStandBtn.isHidden = false
+//                        self.addStandBtn.setTitle("个人认证", for: .normal)
+//                        self.personalStandBtn.isHidden = true
+//                        self.enterpriseStandBtn.isHidden = true
+//                        self.unStandBtnBgView.isHidden = true
+//                    }else if !idModel!.userAuth && idModel!.enterpriseAuth && !idModel!.agencyAuth{
+//                        //企业
+//                        self.addStandBtn.isHidden = false
+//                        self.addStandBtn.setTitle("企业认证", for: .normal)
+//                        self.personalStandBtn.isHidden = true
+//                        self.enterpriseStandBtn.isHidden = true
+//                        self.unStandBtnBgView.isHidden = true
+//                    }else if !idModel!.userAuth && !idModel!.enterpriseAuth && idModel!.agencyAuth{
+//                        //机构
+//                        self.addStandBtn.isHidden = false
+//                        self.addStandBtn.setTitle("机构认证", for: .normal)
+//                        self.personalStandBtn.isHidden = true
+//                        self.enterpriseStandBtn.isHidden = true
+//                        self.unStandBtnBgView.isHidden = true
+//                    }else if idModel!.userAuth && idModel!.enterpriseAuth && idModel!.agencyAuth{
+//                        //个人+企业+机构
+//                        self.addStandBtn.isHidden = true
+//                        self.personalStandBtn.isHidden = true
+//                        self.enterpriseStandBtn.isHidden = true
+//                        self.unStandBtnBgView.isHidden = false
+//                        self.setUnStandBtnBgViewLayer(startHex: newValue!.atPersonageColour, endHex: newValue!.backgroundColor)
+//                    }else if !idModel!.userAuth && !idModel!.enterpriseAuth && !idModel!.agencyAuth{
+//                        //无企业和个人
+//                        //不显示认证按钮
+//                        self.addStandBtn.isHidden = true
+//                        self.personalStandBtn.isHidden = true
+//                        self.enterpriseStandBtn.isHidden = true
+//                        self.unStandBtnBgView.isHidden = true
+//                    }
                     //有企业认证显示提示lbl
-                    if idModel!.enterpriseAuth{
-                        self.enterpriseTipsLabel.isHidden = false
-                        self.enterpriseTipsLabel.textColor = HexColor(newValue!.tipsColour)
-                    }else{
-                        self.enterpriseTipsLabel.isHidden = true
-                    }
-                    //有机构认证显示提示lbl
-                    if idModel!.agencyAuth{
-                        self.agencyTipsLabel.isHidden = false
-                        self.agencyTipsLabel.textColor = HexColor(newValue!.tipsColour)
-                    }else{
-                        self.agencyTipsLabel.isHidden = false
-                    }
+//                    if idModel!.enterpriseAuth{
+//                        self.enterpriseTipsLabel.isHidden = false
+//                        self.enterpriseTipsLabel.textColor = HexColor(newValue!.tipsColour)
+//                    }else{
+//                        self.enterpriseTipsLabel.isHidden = true
+//                    }
+//                    //有机构认证显示提示lbl
+//                    if idModel!.agencyAuth{
+//                        self.agencyTipsLabel.isHidden = false
+//                        self.agencyTipsLabel.textColor = HexColor(newValue!.tipsColour)
+//                    }else{
+//                        self.agencyTipsLabel.isHidden = false
+//                    }
                 }
                 self.addStandBtn.backgroundColor = HexColor(newValue!.backgroundColor)
-                frontCardContentView.isHidden = true
+//                frontCardContentView.isHidden = true
                 //显示textview 添加身份
                 textView.text = newValue!.description
@@ -546,9 +571,9 @@ class CNFrontMainView : UIView{
                 downMoreGIF.kf.setImage(with: URL(string: newValue!.downGuideImg))
                 //个人认证,企业认证
-                personalStandBtn.backgroundColor = HexColor(newValue!.atPersonageColour)
+//                personalStandBtn.backgroundColor = HexColor(newValue!.atPersonageColour)
                 enterpriseStandBtn.backgroundColor = HexColor(newValue!.backgroundColor)
-                textViewBgImgView.kf.setImage(with: URL(string: _idModel!.descBackgroundImg), placeholder: UIImage(named: "homepage_desc_bgImg"))
+//                textViewBgImgView.kf.setImage(with: URL(string: _idModel!.descBackgroundImg), placeholder: UIImage(named: "homepage_desc_bgImg"))
             }
         } 
     }
@@ -602,7 +627,7 @@ class CNFrontMainView : UIView{
     {
         self.addSubview(self.frontTotolContentView)
         self.frontTotolContentView.addSubview(self.frontDescContentView)
-        self.frontTotolContentView.addSubview(self.frontCardContentView)
+//        self.frontTotolContentView.addSubview(self.frontCardContentView)
         self.makeConstraints()
     }
@@ -624,11 +649,14 @@ class CNFrontMainView : UIView{
             var type: CNLiveMineInputAuthType = .person
             if self.idModel!.userAuth{
                 type = .person
-            }else if self.idModel!.enterpriseAuth{
+            }else{
                 type = .enterprise
-            }else if self.idModel!.agencyAuth{
-                type = .agency
             }
+//            else if self.idModel!.enterpriseAuth{
+//                type = .enterprise
+//            }else if self.idModel!.agencyAuth{
+//                type = .agency
+//            }
             self.btnClickAuthType = type
             self.getStandInfo(identityId:String(self.idModel!.id))
         }
@@ -639,9 +667,12 @@ class CNFrontMainView : UIView{
         var type: CNLiveMineInputAuthType = .person
         if self.idModel!.userAuth{
             type = .person
-        }else if self.idModel!.enterpriseAuth{
+        }else{
             type = .enterprise
         }
+//        else if self.idModel!.enterpriseAuth{
+//            type = .enterprise
+//        }
         self.btnClickAuthType = type
         self.getStandInfo(identityId:String(self.idModel!.id))
     }
@@ -649,11 +680,12 @@ class CNFrontMainView : UIView{
         //跳转到 2个按钮时 第二个认证页面
         //个人+企业  个人+机构  企业+机构
         var type: CNLiveMineInputAuthType = .enterprise
-        if self.idModel!.enterpriseAuth{
-            type = .enterprise
-        }else if self.idModel!.agencyAuth{
-            type = .agency
-        }
+        type = .enterprise
+//        if self.idModel!.enterpriseAuth{
+//            type = .enterprise
+//        }else if self.idModel!.agencyAuth{
+//            type = .agency
+//        }
         self.btnClickAuthType = type
         self.getStandInfo(identityId:String(self.idModel!.id))
     }
@@ -204,7 +204,7 @@ class CNLiveMineAddInfoViewController : CNLiveBaseViewController, UITableViewDel
     func checkAlreadyAuthStatue() {
         for item in self.dataArray {
             let authModel = item as! StandListModel
-            if authModel.auth {
+            if authModel.userAuth {
                 NotificationCenter.default.post(name: Notification.Name.StandAuth.StandAuthSortNotificationResult, object: nil)
                 break
             }
@@ -290,7 +290,9 @@ extension CNLiveMineAddInfoViewController {
                 return MineInfoLListTableViewCell()
             }
             let listModel = dataArray[indexPath.row] as! StandListModel
-            cell.setupWithDataSource(icon: listModel.icon!, name: listModel.name!, is_auth: listModel.auth)
+            cell.setupWithDataSource(icon: "", name: listModel.name!, is_auth: listModel.userAuth)
+
+//            cell.setupWithDataSource(icon: listModel.icon!, name: listModel.name!, is_auth: listModel.auth)
             cell.userInteractionEnabledWhileDragging = true
             return cell
@@ -319,7 +321,7 @@ extension CNLiveMineAddInfoViewController {
         }
         if _show_type == .add {
             let listModel = dataArray[indexPath.row] as! StandListModel
-            if listModel.auth {
+            if listModel.userAuth {
                 showMessage(message: "您已添加此身份,请直接使用")
                 return
             }
@@ -29,21 +29,16 @@ class CNLiveMineAuthFormViewController: CNLiveBaseViewController, UITableViewDel
     lazy var dataArray: NSMutableArray = {
         let array = NSMutableArray.init()
         if _listModel.userAuth {
-            array.add(["back":"mine_form_auth_btn_persion","icon":"mine_form_auth_btn_persion_icon","name":"个人认证","desc":"适合个人创作者、行业专家、自媒体领域"])
-        }
-        if _listModel.enterpriseAuth && _listModel.agencyAuth {
+            
+        }else{
+            let dict03 = ["back":"mine_form_auth_btn_persion","icon":"mine_form_auth_btn_persion_icon","name":"个人认证","desc":"适合个人创作者、行业专家、自媒体领域"]
             let dict01 = ["back":"mine_form_auth_btn_formal_larg","icon":"mine_form_auth_btn_enterprise_icon","name":"企业认证","desc":"适合企业、个体工商户"]
             let dict02 = ["back":"mine_form_auth_btn_formal_larg","icon":"mine_form_auth_btn_agency_icon","name":"机构认证","desc":"适合国家机构、社会组织、高校等"]
             let temp_array = NSMutableArray()
             temp_array.add(dict01)
             temp_array.add(dict02)
+            temp_array.add(dict03)
             array.add(temp_array as! [Dictionary<String,String>])
-        } else {
-            if _listModel.enterpriseAuth  {
-                array.add(["back":"mine_form_auth_btn_formal","icon":"mine_form_auth_btn_enterprise_icon","name":"企业认证","desc":"适合企业、个体工商户"])
-            }else if _listModel.agencyAuth {
-                array.add(["back":"mine_form_auth_btn_formal","icon":"mine_form_auth_btn_agency_icon","name":"机构认证","desc":"适合国家机构、社会组织、高校等"])
-            }
         }
         return array
     }()
@@ -137,29 +137,39 @@ class StandListBaseModel: BaseModel {
 final class StandListModel: BaseModel {//, TableCodable {
     var id: Int = 0//ID号- 9:电商,其他非电商
-    var name: String?//名称-
-    var icon: String?//小圆图标-
-    var createTime: Int = 0//注册时间-
-    var enable: Bool = false//没用-
+    var description: String = ""//首页身份说明描述-
     var backgroundImg: String = ""//首页背景图-
-    var upGuideImg: String = ""//顶部引导图GiF url-
     var downGuideImg: String = ""//底部引导图GiF url-
-    var backgroundColor: String = kCNDownSlideBackgroundColorHex//企业认证按钮背景色&&认证背景颜色
-    var atPersonageColour: String = kCNDownSlideBackgroundColorHex//个人认证按钮背景色-
-    var backgroundColour: String = ""//-
     var tipsColour: String = ""//-企业,机构 提醒文本颜色
-    var description: String = ""//首页身份说明描述-
+    var backgroundColour: String = ""//-
+    var backgroundColor: String = kCNDownSlideBackgroundColorHex//企业认证按钮背景色&&认证背景颜色
+    var upGuideImg: String = ""//顶部引导图GiF url-
     var descBackgroundImg: String = ""//首页文字背景图
-    var cardImg: String = ""//卡片背景图-
-    var cardBackgroundImg: String = ""//首页卡片背景图
-    var upPath: String = ""//顶部h5 或原生页面pageId
+    var createTime: Int = 0//注册时间-
     var upType: Int = 0//下滑类型1:h5 2:原生页面 3店铺详情 4 店铺控制台
-    var downType: Int = 0//上滑类型1:h5 2:原生页面 3店铺详情 4 店铺控制台
+    var upPath: String = ""//顶部h5 或原生页面pageId
     var downPath: String = ""//底部h5url 或原生页面pageId-
-    var userAuth: Bool = true//是否显示个人认证
-    var enterpriseAuth: Bool = false//是否显示企业认证
-    var agencyAuth: Bool = false//是否显示机构认证
-    var auth: Bool = false//身份是否验证
+    var downType: Int = 0//上滑类型1:h5 2:原生页面 3店铺详情 4 店铺控制台
+    var name: String?//名称-
+
+    var status:Int = 0//
+    var sort:Int = 0//
+    var industryIds:String = ""
+    var industries: String = ""//
+    
+    //行业认证model
+    var authenticationsModel = [MineAuthenticationsChildModel]()
+    var userAuth:Bool = false//是否有 数字认证
+    
+//    var icon: String?//小圆图标-
+//    var enable: Bool = false//没用-
+    var atPersonageColour: String = kCNDownSlideBackgroundColorHex//个人认证按钮背景色-
+//    var cardImg: String = ""//卡片背景图-
+//    var cardBackgroundImg: String = ""//首页卡片背景图
+//    var userAuth: Bool = true//是否显示个人认证
+//    var enterpriseAuth: Bool = false//是否显示企业认证
+//    var agencyAuth: Bool = false//是否显示机构认证
+//    var auth: Bool = false//身份是否验证
     var createTimeString: String = ""//-
     var timeString: String = ""
@@ -176,9 +186,7 @@ final class StandListModel: BaseModel {//, TableCodable {
         if lhs.id == rhs.id &&
             lhs.name == rhs.name &&
-            lhs.icon == rhs.icon &&
             lhs.createTime == rhs.createTime &&
-            lhs.enable == rhs.enable &&
             lhs.backgroundImg == rhs.backgroundImg &&
             lhs.upGuideImg == rhs.upGuideImg &&
             lhs.downGuideImg == rhs.downGuideImg &&
@@ -251,6 +259,47 @@ final class StandListModel: BaseModel {//, TableCodable {
 //    }
 }
+// !!!: /api/contentApi/authentications 接口标记
+class MineAuthenticationsBaseModel: BaseModel {
+    var data = [MineAuthenticationsChildModel]()//
+}
+class MineAuthenticationsChildModel: BaseModel {
+    var industryId: Int = 0
+    var name: String = ""
+    var child = [MineAuthenticationsChildModel]()//卡片标签
+    var identities =  [MineAuthenticationsChildIdentitiesModel]()//报名项说明
+}
+class MineAuthenticationsChildIdentitiesModel: BaseModel {
+    var id: Int = 0
+    var industryId: Int = 0
+    var name: String = ""
+    var icon: String = ""
+    var createTime: Int = 0
+    var auth: Bool = false
+    var status: Int = 0
+    var sort: Int = 0
+    var type: Int = 0
+    var userAuth: Int = 0
+}
+
+// !!!: /api/identityApi/getUserMsg 接口标记
+class MineGetUserMsgUsersModel: BaseModel {
+    var id: Int = 0
+    var nick: String = ""
+    var icon: String = ""
+    var phone: String = ""
+    var createTime:String = ""
+    var verifySid:String = ""
+    var verifyUsers = [MineGetUserMsgVerifyUsersModel]()
+    
+}
+class MineGetUserMsgVerifyUsersModel: BaseModel {
+    var vsid: String = ""
+    var name: String = ""
+    var idNo: String = ""
+    var createTime: String = ""
+}
+
 // !!!: /api/identityApi/getIdentity 接口标记
 class MineStandInfoBaseModel: BaseModel {
     var authInfos = [MineStandInfoModel]()//个人认证
@@ -477,7 +477,7 @@ class CNLiveMineViewModel: NSObject {
         }
     }
-    /// 获取身份信息列表数据
+    /// 获取频道列表数据
     /// - Parameters:
     ///   - page: 页数
     ///   - resultBlock: 返回
@@ -492,7 +492,7 @@ class CNLiveMineViewModel: NSObject {
         CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
-        CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseMCUrl+"/identityApi/allList", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
+        CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseMCUrl+"/contentApi/channels", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
             if (error == nil) {
                 let resp = result as! NSDictionary
@@ -538,6 +538,43 @@ class CNLiveMineViewModel: NSObject {
         }
     }
+    /// 获取用户信息
+    /// - Parameters:
+    ///   - page: 页数
+    ///   - resultBlock: 返回
+    static func requestGetUserMsg(sid: String, resultBlock: @escaping resultNewsBlock) {
+        let param = NSMutableDictionary()
+        param.setValue(sid, forKey: "sid")
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(CNLiveMCEnvironmentManager.shared.appId, forKey: "appId")
+        custom_param.setValue(CNLiveMCEnvironmentManager.shared.appKey, forKey: "appKey")
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseMCUrl+"/identityApi/getUserMsg", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
+            hiddenLoading()
+            if (error == nil) {
+                let resp = result as! NSDictionary
+                let errorCode = "\(resp["errorCode"] ?? "0")"
+                if (errorCode == "0") {
+                    let listModel = dictionaryToModel(resp as! [String : Any], MineGetUserMsgUsersModel.self,"data") as! MineGetUserMsgUsersModel
+                    resultBlock(listModel,.success)
+                } else {
+                    showMessage(message: resp["errorMessage"] as! String)
+                    resultBlock(NSNull(),.failed)
+                }
+            } else {
+                if CNLiveNetworking.isNetworking() {
+                    showMessage(message: "获取失败")
+                    resultBlock(NSNull(),.failed)
+                } else {
+                    showMessage(message: "似乎与网络断开链接")
+                    resultBlock(NSNull(),.noNetwork)
+                }
+            }
+        }
+    }
+    
     /// 获取已认证身份列表
     /// - Parameters:
     ///   - page: 页数
@@ -669,6 +706,58 @@ class CNLiveMineViewModel: NSObject {
         }
     }
+    /// 获取行业认证列表
+    /// - Parameters:
+    ///   - channelId: 频道 channelId
+    ///   - sid: 用户id
+    ///   - vsid: 实名id
+    ///   - resultBlock: 返回
+    static func requestsIndustryInfo(channelId: String, sid: String, vsid: String,resultBlock: @escaping resultNewsBlock) {
+        let param = NSMutableDictionary()
+//        param.setValue("1342671", forKey: "sid")//
+//        param.setValue("2", forKey: "vsid")
+        param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")
+        param.setValue(vsid, forKey: "vsid")
+        param.setValue(channelId, forKey: "channelId")
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(CNLiveMCEnvironmentManager.shared.appId, forKey: "appId")
+        custom_param.setValue(CNLiveMCEnvironmentManager.shared.appKey, forKey: "appKey")
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.setupShowResult(true)
+        CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseMCUrl+"/contentApi/authentications", param: param as! [String: String], cacheType: .networkOnly) { task, result, error in
+            hiddenLoading()
+            if (error == nil) {
+                let resp = result as! NSDictionary
+                let errorCode = "\(resp["errorCode"] ?? "0")"
+                if (errorCode == "0") {
+                    if resp["data"] is NSNull {
+                        resultBlock(NSNull(),.failed)
+                    } else {
+                        var resultArr = Array<MineAuthenticationsChildModel>()
+                        let resArr = resp["data"] as! Array<[String:Any]>
+                        resArr.forEach { dic in
+                            let newsModel = newDictionaryToModel(dic, MineAuthenticationsChildModel.self) as! MineAuthenticationsChildModel
+                            resultArr.append(newsModel)
+                        }
+                        resultBlock(resultArr,.success)
+                    }
+                } else {
+                    showMessage(message: resp["errorMessage"] as! String)
+                    resultBlock(NSNull(),.failed)
+                }
+            } else {
+                if CNLiveNetworking.isNetworking() {
+                    showMessage(message: "获取失败")
+                    resultBlock(NSNull(),.failed)
+                } else {
+                    showMessage(message: "似乎与网络断开链接")
+                    resultBlock(NSNull(),.noNetwork)
+                }
+            }
+        }
+    }
     /// 获取身份信息数据
     /// - Parameters:
@@ -51,6 +51,23 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         let is_login = UserDefaults.standard.bool(forKey: "is_login")
         window?.rootViewController = is_login ? CNLiveBaseTabBarViewController.init() : UINavigationController(rootViewController: CNLiveLoginViewController.init()) 
         window?.makeKeyAndVisible()
+        if is_login{
+            //获取用户信息 /api/identityApi/getUserMsg
+            CNLiveMineViewModel.requestGetUserMsg(sid: UserInfoManager.shared.userInfo.uid) { result, respStatue in
+                if respStatue == .success{
+                    if let res = result as? MineGetUserMsgUsersModel{
+                        let userInfo = UserInfoManager.shared.userInfo
+                        userInfo.userMsgUsers = res
+                        userInfo.currentUser = res.verifyUsers.first
+                        UserInfoManager.cacheUserInfo(userInfo: userInfo)
+                    }
+                }
+            }
+            
+
+        }
+        
+        
         ///设置APM监控SDK
 //        let apmConfig = RangersAPMConfig.init(appID: "591048", appToken: "8dcc7f8b0a3a4aee8ef698311ef89a62")