1.提前加载认证

2.企业认证和个人认证逻辑 3.已认证卡片UI 4.身份列表网络缓存

1.提前加载认证
2.企业认证和个人认证逻辑 3.已认证卡片UI 4.身份列表网络缓存
“张旭”
1 parent 9aaeca12
Showing 7 changed files with 317 additions and 105 deletions
metaCode/Classes/Common/Base/CNLiveBaseTabBarViewController.swift
metaCode/Classes/Main/HomePage/Controller/AuthMainController/CNMetaCodeHomePageController.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/DownSlide/CNLiveDownSlideTodayRecommendCell.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/MainView/CNIDCardView.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/MainView/CNMainView.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineBaseModel.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineViewModel.swift
@@ -36,12 +36,6 @@ class CNLiveBaseTabBarViewController: UITabBarController
         self.setupBackgroup()
     }
  
-//    override func viewWillAppear(_ animated: Bool) {
-//        super.viewWillAppear(animated)
-//        
-//        self.selectedIndex = 0
-//        
-//    }
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
         print("获取用户用户数据=====>\(UserInfoManager.shared.userInfo.uid)")
@@ -58,9 +52,9 @@ class CNLiveBaseTabBarViewController: UITabBarController
     // MARK: - 控制器的信息
     func setUpTabBar() {
  
-        let homeVC  = CNLiveAuthViewController()
-        let authVC  = CNMetaCodeHomePageController()
-        let mineVC  = CNLiveMineViewController()
+        let homeVC  = CNLiveAuthViewController.init()
+        let authVC  = CNMetaCodeHomePageController.init()
+        let mineVC  = CNLiveMineViewController.init()
  
         creatTabbarView(viewController: homeVC, image: "tabbar_hoem_icon_default", selectImage: "tabbar_hoem_icon_selected", title: "首页")
         creatTabbarView(viewController: authVC, image: "tabbar_authentication_unSelect", selectImage: "tabbar_authentication", title: "认证")
@@ -74,6 +68,11 @@ class CNLiveBaseTabBarViewController: UITabBarController
             CNLiveBaseNavigationController(rootViewController: mineVC)
         ]
  
+        //提前加载认证的viewDidLoad,但是会走两遍
+        DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
+            authVC.viewDidLoad()
+        }
+        
     }
  
     // MARK: - Tabar 背景图
@@ -622,13 +622,30 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
                 self.NetApiStatus = .success
                 let listArray:NSArray = (result as! StandListBaseModel).list as NSArray
                 if (listArray.count > 0){
-
+                                        
                     self.dataArray = NSMutableArray.init()
                     self.dataArray.addObjects(from: listArray as! [Any])
                     self.addPageView()
  
                     self.backgroupView.updateData(idArray: listArray as! Array<StandListModel>)
  
+                    //请求身份详情,判断是企业认证还是个人认证
+                    listArray.forEach { standListModel in
+                        let listModel = standListModel as! StandListModel
+                        if listModel.auth{
+                            //已认证
+                            listModel.isPersonOrEnterprise = 3
+                        }else{
+                            //未认证
+                            self.getStandInfo(identityId: "\(listModel.id)")
+//                            if self.unStandModelArray.contains(listModel){
+//                                
+//                            }else{
+//                                self.unStandModelArray.add(listModel)
+//                            }
+                        }
+                    }
+                    
                 }else{
                     self.NetApiStatus = .apiError
 //                    self.identityStatus = .notCertified
@@ -643,25 +660,70 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
         }
     }
  
+    // MARK: - 获取身份信息是个人认证还是企业认证
+    func getStandInfo(identityId:String){
+        CNLiveMineViewModel.requestsStandInfo(identityId: identityId, type: .effect, authType: .person) { result, respStatue in
+            hiddenLoading()
+            if respStatue == .success{
+                let standInfoBaseModel = result as! MineStandInfoBaseModel
+                if standInfoBaseModel.authInfos.count > 0{
+                    //个人认证有值
+                    if standInfoBaseModel.enterpriseAuthInfos.count > 0{
+                        //企业认证有值
+                        self.dataArray.forEach { standListModel in
+                            let listModel = standListModel as! StandListModel
+                            if listModel.id == standInfoBaseModel.identityId{
+                                //目标model,企业+个人
+                                listModel.isPersonOrEnterprise = 0
+                            }
+                        }
+                        
+                    }else{
+                        //企业认证没值
+                        //只显示个人
+                        self.dataArray.forEach { standListModel in
+                            let listModel = standListModel as! StandListModel
+                            if listModel.id == standInfoBaseModel.identityId{
+                                //目标model ,个人
+                                listModel.isPersonOrEnterprise = 1
+                            }
+                        }
+                    }
+                    
+                }else if standInfoBaseModel.enterpriseAuthInfos.count > 0{
+                    //企业认证有值,个人没值
+                    //只显示企业
+                    self.dataArray.forEach { standListModel in
+                        let listModel = standListModel as! StandListModel
+                        if listModel.id == standInfoBaseModel.identityId{
+                            //目标model ,企业
+                            listModel.isPersonOrEnterprise = 2
+                        }
+                    }
+                    
+                }else{
+                    //企业个人都没值
+                    self.dataArray.forEach { standListModel in
+                        let listModel = standListModel as! StandListModel
+                        if listModel.id == standInfoBaseModel.identityId{
+                            //目标model ,已认证/无企业和个人
+                            listModel.isPersonOrEnterprise = 3
+                        }
+                    }
+                }
+                self.pageFlowView.reloadData()
+            }else{
+                //网络请求失败
+            }
+        }
+    }
+    
+    // MARK: - 获取电商状态
     func getApplyShopInfo(){
         //获取当前店铺审核状态
         CNLiveMineViewModel.requestApplyShopInfo { [weak self] result, respStatue in
             if respStatue == .success{
                 let shopModel = result as! MineApplyShopInfoModel
-//                            if shopModel.state == "0" || shopModel.state == "4"{
-//                                //0未申请 //4闭店
-//                                //未认证->店铺认证
-//
-//                            }else if shopModel.state == "1"{
-//                                //开店
-//                                //已认证->显示卡片
-//                            }else if shopModel.state == "2"{
-//                                //申请中
-//                                //"资料审核中"
-//                            }else if shopModel.state == "3"{
-//                                //已拒绝
-//                                //"重新修改提交"
-//                            }
                 self!.dataArray.forEach {listModel in
                     let model = listModel as! StandListModel
                     model.shopStatus = shopModel.state
@@ -51,7 +51,7 @@ class CNLiveDownSlideTodayRecommendCell: UITableViewCell {
         for i in 0..<totalNum{//i是第几行
             let contentMdl = model.contents[i]
             let imageView = UIImageView(frame: CGRectMake(DownSlideRecommendLeftGap, CGFloat(i)*(DownSlideTodayRecommendH+DownSlideRecommendLeftGap), CGFloat(DownSlideTodayRecommendW), CGFloat(DownSlideTodayRecommendH)))
-            imageView.kf.setImage(with: URL(string:contentMdl.poster!))
+            imageView.kf.setImage(with: URL(string:contentMdl.poster ?? ""))
             imageView.tag = i
             imageView.layer.cornerRadius = 12
             imageView.clipsToBounds = true
@@ -17,7 +17,7 @@ class CNIDCardView: UIView{
         }
         set{
             _idModel = newValue
-            iDCardBGView.kf.setImage(with: URL(string: _idModel!.cardImg), placeholder: UIImage(named: "homePage_idCardBG"))
+            self.iDCardBGView.kf.setImage(with: URL(string: _idModel!.cardImg), placeholder: UIImage(named: "homePage_idCardBG"))
             nameLabel.textColor = HexColor("\(_idModel!.backgroundColor)")
             sexLabel.textColor = HexColor("\(_idModel!.backgroundColor)")
             dateLabel.textColor = HexColor("\(_idModel!.backgroundColor)")
@@ -34,7 +34,7 @@ class CNIDCardView: UIView{
     override init(frame: CGRect) {
         super.init(frame: frame)
         self.initUI()
-        self.makeConstraints()
+//        self.makeConstraints()
     }
  
     required init?(coder: NSCoder) {
@@ -44,51 +44,94 @@ class CNIDCardView: UIView{
     func initUI()
     {
         self.addSubview(self.contentView)
-        self.contentView.addSubview(self.iDCardBGView)
-        self.contentView.addSubview(self.nameLabel)
-        self.contentView.addSubview(self.sexLabel)
-        self.contentView.addSubview(self.dateLabel)
-        self.contentView.addSubview(self.IDLabel)
-        self.contentView.addSubview(self.nameValueLabel)
-        self.contentView.addSubview(self.sexValueLabel)
-        self.contentView.addSubview(self.dateValueLabel)
-        self.contentView.addSubview(self.IDValueLabel)
-        self.contentView.addSubview(self.iDIconImgView)
+        self.contentView.snp.makeConstraints { make in
+            make.centerX.equalToSuperview()
+            make.centerY.equalToSuperview()
+            make.width.equalToSuperview()
+            make.height.equalToSuperview()
+        }
+        self.addSubview(self.iDCardBGView)
+        self.iDCardBGView.snp.makeConstraints { make in
+            make.centerX.equalToSuperview()
+            make.centerY.equalToSuperview()
+            make.width.equalToSuperview()
+            make.height.equalToSuperview()
+        }
+//        self.contentView.addSubview(self.nameLabel)
+//        self.contentView.addSubview(self.sexLabel)
+//        self.contentView.addSubview(self.dateLabel)
+//        self.contentView.addSubview(self.IDLabel)
+//        self.contentView.addSubview(self.nameValueLabel)
+//        self.contentView.addSubview(self.sexValueLabel)
+//        self.contentView.addSubview(self.dateValueLabel)
+//        self.contentView.addSubview(self.IDValueLabel)
+//        self.contentView.addSubview(self.iDIconImgView)
  
     }
  
     func loadIDDetailData(){
 //        showLoading(message: "")
-        CNLiveMineViewModel.requestsStandInfo(identityId: "\(_idModel!.id)", type: .havedate, authType: .person) { result, respStatue in
+        self.subviews.forEach { view in
+            if view.tag >= 10000{
+                view.removeFromSuperview()
+            }
+        }
+        CNLiveMineViewModel.requestsStandInfo(identityId: "\(_idModel!.id)", type: .havedate, authType: .person) { [self] result, respStatue in
             hiddenLoading()
             if respStatue == .success {
                 let cardArray = result as! NSMutableArray
+                let count = cardArray.count
                 if cardArray.count > 0{
                     for i in (0..<cardArray.count){
                         let idCardModel = cardArray[i] as! MineStandInfoModel
-                        switch idCardModel.name {
-                        case "姓名":
-                            self.nameValueLabel.text =  idCardModel.userInfo
-                        case "性别":
-                            self.sexValueLabel.text = idCardModel.userInfo
-                        case "认证时间":
-                            self.dateValueLabel.text = idCardModel.userInfo
-                        case "编号":
-                            self.IDValueLabel.text =  idCardModel.userInfo
-                        case "证件照":
-                            let str:String = idCardModel.userInfo!
-                            if(str.isEmpty){
-                                self.iDIconImgView.isHidden = true
-                            }else
-                            {
-                                self.iDIconImgView.isHidden = false
-                                self.iDIconImgView.kf.setImage(with: URL(string: str))
-                            }
-                            
-                            self.iDCardBGView.kf.setImage(with: URL(string: self._idModel!.cardImg), placeholder: UIImage(named: "homePage_idCardBG"))
-                        default:
-                            break
-                        }
+                        let siBianGap:CGFloat = 17
+                        let labelsGap:CGFloat = 10
+                        
+                        let keyLabel = UILabel.init()
+                        keyLabel.textColor = HexColor(_idModel?.backgroundColor ?? "")
+                        keyLabel.textAlignment = .left
+                        keyLabel.font = Font(15)
+                        keyLabel.backgroundColor = .clear
+                        keyLabel.text = idCardModel.name ?? ""
+                        keyLabel.frame = CGRect(x: siBianGap, y: siBianGap+CGFloat(i)*21+CGFloat(i)*labelsGap, width: 70, height: 21)
+                        keyLabel.adjustsFontSizeToFitWidth = true
+                        keyLabel.tag = 10000+i
+                        self.addSubview(keyLabel)
+                        
+                        let valueLabel = UILabel.init()
+                        valueLabel.textColor = HexColor(_idModel?.backgroundColor ?? "")
+                        valueLabel.textAlignment = .left
+                        valueLabel.font = Font(15)
+                        valueLabel.backgroundColor = .clear
+                        valueLabel.text = idCardModel.userInfo ?? ""
+                        valueLabel.frame = CGRect(x: keyLabel.right+labelsGap+siBianGap, y: siBianGap+CGFloat(i)*21+CGFloat(i)*labelsGap, width: self.width-keyLabel.right-labelsGap-siBianGap-5, height: 21)
+                        valueLabel.adjustsFontSizeToFitWidth = true
+                        valueLabel.tag = 20000+i
+                        self.addSubview(valueLabel)
+                                                
+//                        switch idCardModel.name {
+//                        case "姓名":
+//                            self.nameValueLabel.text =  idCardModel.userInfo
+//                        case "性别":
+//                            self.sexValueLabel.text = idCardModel.userInfo
+//                        case "认证时间":
+//                            self.dateValueLabel.text = idCardModel.userInfo
+//                        case "编号":
+//                            self.IDValueLabel.text =  idCardModel.userInfo
+//                        case "证件照":
+//                            let str:String = idCardModel.userInfo!
+//                            if(str.isEmpty){
+//                                self.iDIconImgView.isHidden = true
+//                            }else
+//                            {
+//                                self.iDIconImgView.isHidden = false
+//                                self.iDIconImgView.kf.setImage(with: URL(string: str))
+//                            }
+//                            
+//                            self.iDCardBGView.kf.setImage(with: URL(string: self._idModel!.cardImg), placeholder: UIImage(named: "homePage_idCardBG"))
+//                        default:
+//                            break
+//                        }
                     }
                 }else{
                     //没数据
@@ -154,15 +197,15 @@ class CNIDCardView: UIView{
     ///视图总容器
     lazy var contentView : UIView = {
  
-        let contentView = UIView.init(frame: CGRect(x: 0, y: 0, width: self.width, height: self.height ))
-        contentView.backgroundColor = UIColor.white
+        let contentView = UIView.init(frame: CGRect(x: 0, y: 0, width: 0, height: 0 ))
+        contentView.backgroundColor = UIColor.clear
         return contentView
     }()
  
     /// 身份卡片-背景图
     lazy var iDCardBGView:UIImageView = {
  
-        let iDCardBGView:UIImageView = UIImageView(frame: CGRect(x: 20, y: 25, width: self.width-40, height: (self.width-40) * 0.64))
+        let iDCardBGView:UIImageView = UIImageView(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
         iDCardBGView.backgroundColor = UIColor.clear
         return iDCardBGView
     }()
@@ -53,14 +53,6 @@ class CNFrontMainView : UIView{
             make.bottom.equalToSuperview()
         }
  
-        frontDescContentView.addSubview(self.upMoreGIF)
-        upMoreGIF.snp.makeConstraints { make in
-            make.top.equalToSuperview().offset(5)
-            make.right.equalToSuperview().offset(-self.width/2+24)
-            make.width.equalTo(48)
-            make.height.equalTo(30)
-        }
-        
         frontDescContentView.addSubview(self.addStandBtn)
         addStandBtn.snp.makeConstraints { make in
             make.centerX.equalToSuperview()
@@ -84,13 +76,6 @@ class CNFrontMainView : UIView{
             make.height.equalTo(36)
         }
  
-        frontDescContentView.addSubview(self.downMoreGIF)
-        downMoreGIF.snp.makeConstraints { make in
-            make.top.equalTo(self.personalStandBtn.snp.bottom).offset((45-30)/2.0)
-            make.centerX.equalTo(self.personalStandBtn.snp.right)
-            make.width.equalTo(96)
-            make.height.equalTo(30)
-        }
  
         frontDescContentView.addSubview(self.textView)
         textView.snp.makeConstraints { make in
@@ -120,7 +105,7 @@ class CNFrontMainView : UIView{
         return textView
     }()
  
-    ///未认证-点击添加身份 按钮
+    ///未认证-店铺认证 按钮
     lazy var addStandBtn: UIButton = {
         let addStandBtn = UIButton(type: .custom)
         addStandBtn.clipsToBounds = true
@@ -187,9 +172,9 @@ class CNFrontMainView : UIView{
         frontCardContentView.addSubview(self.iDCardView)
         iDCardView.snp.makeConstraints { make in
             make.centerX.equalToSuperview()
-            make.top.equalToSuperview().offset(25)
-            make.width.equalTo(self.width-40)
-            make.height.equalTo((self.width-40) * 0.64)
+            make.bottom.equalToSuperview().offset(-(45-30)/2.0-30-10)
+            make.width.equalTo(262*KSreenWidth/375)
+            make.height.equalTo(0.52*262*KSreenWidth/375)
         }
         return frontCardContentView
  
@@ -197,7 +182,7 @@ class CNFrontMainView : UIView{
     /// 已认证-身份卡片
     lazy var iDCardView:CNIDCardView = {
  
-        let iDCardView:CNIDCardView = CNIDCardView(frame: CGRect(x: 20, y: 25, width: self.width-40, height: (self.width-40) * 0.64))
+        let iDCardView:CNIDCardView = CNIDCardView(frame: CGRect(x: 0, y: 0, width: 262*KSreenWidth/375, height: 0.52*262*KSreenWidth/375))
         return iDCardView
     }()
  
@@ -232,16 +217,34 @@ class CNFrontMainView : UIView{
             //已认证身份
                 //显示证件View
                 frontCardContentView.isHidden = false
-                iDCardView.idModel = newValue!
-                frontDescContentView.isHidden = true
+                self.addStandBtn.isHidden = true
+                self.iDCardView.idModel = newValue!
                 cardViewBgImgView.kf.setImage(with: URL(string: _idModel!.cardBackgroundImg), placeholder: UIImage(named: "homepage_cardBGImg"))
-            }else
-            {//未认证身份
-                frontCardContentView.isHidden = true
-                //显示textview 添加身份
-                frontDescContentView.isHidden = false
-                textView.text = newValue!.description
  
+                
+                //隐藏textview
+                textView.isHidden = true
+                
+                if frontCardContentView.contains(self.upMoreGIF){
+                    self.upMoreGIF.removeFromSuperview()
+                }
+                frontCardContentView.addSubview(self.upMoreGIF)
+                upMoreGIF.snp.makeConstraints { make in
+                    make.top.equalToSuperview().offset(5)
+                    make.right.equalToSuperview().offset(-self.width/2+24)
+                    make.width.equalTo(48)
+                    make.height.equalTo(30)
+                }
+                if frontCardContentView.contains(self.downMoreGIF){
+                    self.downMoreGIF.removeFromSuperview()
+                }
+                frontCardContentView.addSubview(self.downMoreGIF)
+                downMoreGIF.snp.makeConstraints { make in
+                    make.top.equalTo(self.iDCardView.snp.bottom).offset((45-30)/2.0)
+                    make.centerX.equalToSuperview()
+                    make.width.equalTo(96)
+                    make.height.equalTo(30)
+                }
                 //上滑 下滑引导gif
                 upMoreGIF.kf.setImage(with: URL(string: newValue!.upGuideImg))
                 downMoreGIF.kf.setImage(with: URL(string: newValue!.downGuideImg))
@@ -249,18 +252,102 @@ class CNFrontMainView : UIView{
                     //电商 ,隐藏上滑下滑gif
                     upMoreGIF.isHidden = true
                     downMoreGIF.isHidden = true
-                    self.addStandBtn.backgroundColor = HexColor(newValue!.backgroundColor)
+                }else{
+                    //非电商 ,显示上滑下滑gif
+                    upMoreGIF.isHidden = false
+                    downMoreGIF.isHidden = false
+                }
+            }else
+            {//未认证身份
+                textView.isHidden = false
+
+                if idModel?.id == 9{
+                    //电商
+                    //隐藏上滑下滑gif
+                    upMoreGIF.isHidden = true
+                    downMoreGIF.isHidden = true
                     self.addStandBtn.isHidden = false
                     self.personalStandBtn.isHidden = true
                     self.enterpriseStandBtn.isHidden = true
+                    self.addStandBtn.isUserInteractionEnabled = true
+                    if idModel?.shopStatus == "0" || idModel?.shopStatus == "4"{
+                        //0未申请 //4闭店
+                        //未认证->店铺认证
+                        self.addStandBtn.setTitle("店铺认证", for: .normal)
+                    }else if idModel?.shopStatus == "1"{
+                        //开店
+                        //已认证->显示卡片
+                    }else if idModel?.shopStatus == "2"{
+                        //申请中
+                        //"资料审核中"
+                        self.addStandBtn.setTitle("资料审核中", for: .normal)
+                        self.addStandBtn.isUserInteractionEnabled = false
+                    }else if idModel?.shopStatus == "3"{
+                        //已拒绝
+                        //"重新修改提交"
+                        addStandBtn.setTitle("重新修改提交", for: .normal)
+                    }
                 }else{
-                    //非电商 ,显示上滑下滑gif
+                    //非电商
+                    //显示上滑下滑gif
                     upMoreGIF.isHidden = false
                     downMoreGIF.isHidden = false
-                    self.addStandBtn.isHidden = true
-                    self.personalStandBtn.isHidden = false
-                    self.enterpriseStandBtn.isHidden = false
+                    
+                    if idModel?.isPersonOrEnterprise == 0{//企业+个人
+                        self.addStandBtn.isHidden = true
+                        self.personalStandBtn.isHidden = false
+                        self.enterpriseStandBtn.isHidden = false
+                    }else if idModel?.isPersonOrEnterprise == 1{//个人
+                        self.addStandBtn.isHidden = false
+                        self.addStandBtn.setTitle("个人认证", for: .normal)
+                        self.personalStandBtn.isHidden = true
+                        self.enterpriseStandBtn.isHidden = true
+                    }else if idModel?.isPersonOrEnterprise == 2{//企业
+                        self.addStandBtn.isHidden = false
+                        self.addStandBtn.setTitle("企业认证", for: .normal)
+                        self.personalStandBtn.isHidden = true
+                        self.enterpriseStandBtn.isHidden = true
+                    }else if idModel?.isPersonOrEnterprise == 3{//已认证/无企业和个人
+                        //不显示认证按钮
+                        self.addStandBtn.isHidden = true
+                        self.personalStandBtn.isHidden = true
+                        self.enterpriseStandBtn.isHidden = true
+                    }else{
+                        //不显示认证按钮
+                        self.addStandBtn.isHidden = true
+                        self.personalStandBtn.isHidden = false
+                        self.enterpriseStandBtn.isHidden = false
+                    }
+                }
+                
+                self.addStandBtn.backgroundColor = HexColor(newValue!.backgroundColor)
+                frontCardContentView.isHidden = true
+                //显示textview 添加身份
+                textView.text = newValue!.description
+                
+                if frontDescContentView.contains(self.upMoreGIF){
+                    self.upMoreGIF.removeFromSuperview()
+                }
+                frontDescContentView.addSubview(self.upMoreGIF)
+                upMoreGIF.snp.makeConstraints { make in
+                    make.top.equalToSuperview().offset(5)
+                    make.right.equalToSuperview().offset(-self.width/2+24)
+                    make.width.equalTo(48)
+                    make.height.equalTo(30)
+                }
+                if frontDescContentView.contains(self.downMoreGIF){
+                    self.downMoreGIF.removeFromSuperview()
                 }
+                frontDescContentView.addSubview(self.downMoreGIF)
+                downMoreGIF.snp.makeConstraints { make in
+                    make.top.equalTo(self.personalStandBtn.snp.bottom).offset((45-30)/2.0)
+                    make.centerX.equalTo(self.personalStandBtn.snp.right)
+                    make.width.equalTo(96)
+                    make.height.equalTo(30)
+                }
+                //上滑 下滑引导gif
+                upMoreGIF.kf.setImage(with: URL(string: newValue!.upGuideImg))
+                downMoreGIF.kf.setImage(with: URL(string: newValue!.downGuideImg))
  
                 //个人认证,企业认证
                 personalStandBtn.backgroundColor = HexColor(newValue!.atPersonageColour)
@@ -279,7 +366,7 @@ class CNFrontMainView : UIView{
         self.makeConstraints()
     }
     func makeConstraints(){
-        
+
     }
  
     // MARK: -按钮点击事件
@@ -288,19 +375,19 @@ class CNFrontMainView : UIView{
     }
  
     @objc func addStandBtnAction() {
-        //跳转到电商认证页面
-        self.pushStandVC()
+        //跳转到 电商认证 / 个人 / 企业
+        self.pushStandVC(isPersonOrEnterprise: 3)
     }
     @objc func personalStandBtnAction() {
         //跳转到 个人认证页面
-        self.pushStandVC()
+        self.pushStandVC(isPersonOrEnterprise: 1)
     }
     @objc func enterpriseStandBtnAction() {
         //跳转到 企业认证页面
-        self.pushStandVC()
+        self.pushStandVC(isPersonOrEnterprise: 2)
     }
  
-    func pushStandVC(){
+    func pushStandVC(isPersonOrEnterprise:Int){
         //跳转到 个人认证&企业认证 页面
         if _idModel!.id == 9 {
             showLoading(message: "")
@@ -311,7 +398,23 @@ class CNFrontMainView : UIView{
                 }
             }
         }else{
-            navigationViewController().pushViewController(CNLiveMineInputViewController.init(listModel: self._idModel!, authType: .person), animated: pushAnimated)
+            if self._idModel!.isPersonOrEnterprise == 1{
+                //个人
+                navigationViewController().pushViewController(CNLiveMineInputViewController.init(listModel: self._idModel!, authType: .person), animated: pushAnimated)
+            }else if self._idModel!.isPersonOrEnterprise == 2{
+                //企业
+                navigationViewController().pushViewController(CNLiveMineInputViewController.init(listModel: self._idModel!, authType: .enterprise), animated: pushAnimated)
+
+            }else{
+                if isPersonOrEnterprise == 1{
+                    navigationViewController().pushViewController(CNLiveMineInputViewController.init(listModel: self._idModel!, authType: .person), animated: pushAnimated)
+
+                }else if isPersonOrEnterprise == 2{
+                    navigationViewController().pushViewController(CNLiveMineInputViewController.init(listModel: self._idModel!, authType: .enterprise), animated: pushAnimated)
+                }else{
+                    navigationViewController().pushViewController(CNLiveMineInputViewController.init(listModel: self._idModel!, authType: .person), animated: pushAnimated)
+                }
+            }
         }
     }
 }
@@ -131,6 +131,7 @@ class StandListBaseModel: BaseModel {
     var navigatePages: Int = 0
     var pageNum: Int = 0
     var pages: Int = 0
+    
 }
  
 final class StandListModel: BaseModel {//, TableCodable {
@@ -161,6 +162,10 @@ final class StandListModel: BaseModel {//, TableCodable {
  
     var shopStatus: String = "0"//电商身份专用状态 0未申请 1开店 2申请中 3已拒绝 4闭店
  
+    
+    ///自定义 判断是 0个人+企业 , 1个人, 2企业 3已认证/无企业和个人
+    var isPersonOrEnterprise: Int = 0
+    
     override func mapping(mapper: HelpingMapper) {
         mapper <<<
             self.createTime <-- TransformOf(fromJSON: { [weak self] (raw) -> Int in
@@ -284,7 +284,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+"/identityApi/allList", param: param as! [String : String], cacheType: .cacheNetwork) { task, result, error in
             hiddenLoading()
             if (error == nil) {
                 let resp = result as! NSDictionary