身份详情改为点击每个按钮请求

“张旭”
1 parent c504e0ff
Showing 5 changed files with 111 additions and 188 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Main/HomePage/Controller/AuthMainController/CNMetaCodeHomePageController.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/MainView/CNMainView.swift
metaCode/Classes/Main/HomePages/Controller/AuthController/CNLiveAuthViewController.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineBaseModel.swift
@@ -2070,7 +2070,7 @@
 				CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.0.4.24.01.26.17;
+				CURRENT_PROJECT_VERSION = 1.0.4.24.01.27.15;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = NO;
@@ -2324,7 +2324,7 @@
 				CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.0.4.24.01.26.17;
+				CURRENT_PROJECT_VERSION = 1.0.4.24.01.27.15;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = NO;
@@ -57,7 +57,7 @@ enum VNumPage {
 class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDelegate, NewPagedFlowViewDataSource, CNCustomIndexViewDelegate,UIGestureRecognizerDelegate,WKNavigationDelegate{
     //获取身份信息接口总次数,为0时刷新左右轮播
-    var reloadNum:Int = 0
+//    var reloadNum:Int = 0
     var reloadShopNum:Int = 1
     ///NewPagedFlowView 开始滑动时的偏移量
@@ -638,27 +638,8 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
                     self.dataArray = NSMutableArray.init()
                     self.dataArray.addObjects(from: listArray as! [Any])
-                    //全部已认证
-                    var isAllAuthed = true
-                    //请求身份详情,判断是企业认证还是个人认证
-                    listArray.forEach { standListModel in
-                        let listModel = standListModel as! StandListModel
-                        if listModel.auth{
-                            //已认证
-                            listModel.isPersonOrEnterprise = 3
-                        }else{
-                            //未认证
-                            isAllAuthed = false
-                            self.getStandInfo(identityId: "\(listModel.id)")
-                            reloadNum = reloadNum + 1
-                        }
-                    }
-                    if isAllAuthed{
-                        self.addPageView()
-                        
-                        self.backgroupView.updateData(idArray: listArray as! Array<StandListModel>)
-                    }
-                    
+                    self.addPageView()
+                    self.backgroupView.updateData(idArray: listArray as! Array<StandListModel>)
                 }else{
                     self.NetApiStatus = .apiError
                 }
@@ -672,75 +653,6 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
         }
     }
-    // MARK: - 获取身份信息是个人认证还是企业认证,机构认证
-    func getStandInfo(identityId:String){
-        CNLiveMineViewModel.requestsStandInfo(identityId: identityId, type: .effect, authType: .person) { [self] result, respStatue in
-            hiddenLoading()
-            if respStatue == .success{
-                let standInfoBaseModel = result as! MineStandInfoBaseModel
-                self.dataArray.forEach { standListModel in
-                    let listModel = standListModel as! StandListModel
-                    if listModel.id == standInfoBaseModel.identityId{
-                        listModel.standInfoBaseModel = standInfoBaseModel
-                        if standInfoBaseModel.authInfos.count > 0{
-                            //个人认证有值
-                            if standInfoBaseModel.enterpriseAuthInfos.count > 0{
-                                //个人有值,企业认证有值
-                                if standInfoBaseModel.agencyAuthInfos.count > 0{
-                                    //个人有值,企业有值,机构认证有值
-                                    listModel.isPersonOrEnterprise = 4
-                                }else{
-                                    //个人有值,企业有值,机构认证没值
-                                    listModel.isPersonOrEnterprise = 0
-                                }
-                                
-                            }else{
-                                //个人有值,企业认证没值
-                                if standInfoBaseModel.agencyAuthInfos.count > 0{
-                                    //个人有值,企业没值,机构有值
-                                    listModel.isPersonOrEnterprise = 0
-                                }else{
-                                    //个人有值,企业没值,机构没值
-                                    listModel.isPersonOrEnterprise = 1
-                                }
-                            }
-                            
-                        }else if standInfoBaseModel.enterpriseAuthInfos.count > 0{
-                            //企业认证有值,个人没值
-                            if standInfoBaseModel.agencyAuthInfos.count > 0{
-                                ///企业有值,个人没值,机构有值
-                                listModel.isPersonOrEnterprise = 0
-                            }else{
-                                ///企业有值,个人没值,机构没值
-                                listModel.isPersonOrEnterprise = 2
-                            }
-                            
-                            
-                        }else{
-                            //企业个人都没值
-                            if standInfoBaseModel.agencyAuthInfos.count > 0{
-                                //企业没值,个人没值,机构有值
-                                listModel.isPersonOrEnterprise = 5
-                            }else{
-                                //企业没值,个人没值,机构没值
-                                listModel.isPersonOrEnterprise = 3
-                            }
-                        }
-                    }
-                }
-                //已请求全部身份详情,开始刷新
-                reloadNum = reloadNum - 1
-                if reloadNum == 0{
-                    self.addPageView()
-                    let arr = Array(self.dataArray)
-                    self.backgroupView.updateData(idArray: arr as! Array<StandListModel>)
-                }
-            }else{
-                //网络请求失败
-            }
-        }
-    }
-    
     // MARK: - 获取电商状态
     func getApplyShopInfo(){
         //获取当前店铺审核状态
@@ -18,6 +18,7 @@ class CNFrontMainView : UIView{
     var tapTransformAciton:closureBlock?
     let delegate = UIApplication.shared.delegate as! AppDelegate
     var standInfoSubTitleModel:MineStandInfoSubTitleModel?//17时弹窗的跳转model
+    var btnClickAuthType:CNLiveMineInputAuthType = .person
     override init(frame: CGRect) {
         super.init(frame: frame)
@@ -416,62 +417,64 @@ class CNFrontMainView : UIView{
                     upMoreGIF.isHidden = false
                     downMoreGIF.isHidden = false
-                    if idModel?.isPersonOrEnterprise == 0{//企业+个人等 2个按钮
+                    if idModel!.userAuth && idModel!.enterpriseAuth && !idModel!.agencyAuth{
                         self.addStandBtn.isHidden = true
                         self.personalStandBtn.isHidden = false
                         self.enterpriseStandBtn.isHidden = false
                         unStandBtnBgView.isHidden = true
-                        let presonInfoCount = self.idModel?.standInfoBaseModel?.authInfos.count ?? 0
-                        let enterInfoCount = self.idModel?.standInfoBaseModel?.enterpriseAuthInfos.count ?? 0
-                        let agencyInfoCount = self.idModel?.standInfoBaseModel?.agencyAuthInfos.count ?? 0
-                        if presonInfoCount > 0 && enterInfoCount > 0{
-                            //个人+企业
-                            self.personalStandBtn.setTitle("个人认证", for: .normal)
-                            self.enterpriseStandBtn.setTitle("企业认证", for: .normal)
-                        }else if presonInfoCount > 0 && agencyInfoCount > 0{
-                            //个人+机构
-                            self.personalStandBtn.setTitle("个人认证", for: .normal)
-                            self.enterpriseStandBtn.setTitle("机构认证", for: .normal)
-                        }else if enterInfoCount > 0 && agencyInfoCount > 0{
-                            //企业+机构
-                            self.personalStandBtn.setTitle("企业认证", for: .normal)
-                            self.enterpriseStandBtn.setTitle("机构认证", for: .normal)
-                        }
-                    }else if idModel?.isPersonOrEnterprise == 1{//个人
+                        //个人+企业
+                        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?.isPersonOrEnterprise == 2{//企业
+                    }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?.isPersonOrEnterprise == 3{//已认证/无企业和个人
-                        //不显示认证按钮
-                        self.addStandBtn.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?.isPersonOrEnterprise == 4{//个人+企业+机构
+                    }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?.isPersonOrEnterprise == 5{//机构
-                        self.addStandBtn.isHidden = false
-                        self.addStandBtn.setTitle("机构认证", for: .normal)
-                        self.personalStandBtn.isHidden = true
-                        self.enterpriseStandBtn.isHidden = true
-                        self.unStandBtnBgView.isHidden = true
-                    }else{
+                    }else if !idModel!.userAuth && !idModel!.enterpriseAuth && !idModel!.agencyAuth{
+                        //无企业和个人
                         //不显示认证按钮
                         self.addStandBtn.isHidden = true
-                        self.personalStandBtn.isHidden = false
-                        self.enterpriseStandBtn.isHidden = false
+                        self.personalStandBtn.isHidden = true
+                        self.enterpriseStandBtn.isHidden = true
                         self.unStandBtnBgView.isHidden = true
                     }
                 }
@@ -561,29 +564,61 @@ class CNFrontMainView : UIView{
     }
     @objc func addStandBtnAction() {
-        //跳转到 电商认证 / 个人 / 企业 / 机构
-        self.pushStandVC(isPersonOrEnterprise: 3)
+        //跳转到 1按钮时认证页面 电商 / 个人 / 企业 / 机构
+        if _idModel!.id == 9 {
+            self.pushStandVC(authType: .person)
+        }else{
+            var type: CNLiveMineInputAuthType = .person
+            if self.idModel!.userAuth{
+                type = .person
+            }else if self.idModel!.enterpriseAuth{
+                type = .enterprise
+            }else if self.idModel!.agencyAuth{
+                type = .agency
+            }
+            self.btnClickAuthType = type
+            self.getStandInfo(identityId:String(self.idModel!.id))
+        }
     }
     @objc func personalStandBtnAction() {
-        //跳转到 个人认证页面
-        self.pushStandVC(isPersonOrEnterprise: 1)
+        //跳转到 2个按钮时 第一个认证页面
+        //个人+企业  个人+机构  企业+机构
+        var type: CNLiveMineInputAuthType = .person
+        if self.idModel!.userAuth{
+            type = .person
+        }else if self.idModel!.enterpriseAuth{
+            type = .enterprise
+        }
+        self.btnClickAuthType = type
+        self.getStandInfo(identityId:String(self.idModel!.id))
     }
     @objc func enterpriseStandBtnAction() {
-        //跳转到 企业认证页面
-        self.pushStandVC(isPersonOrEnterprise: 2)
+        //跳转到 2个按钮时 第二个认证页面
+        //个人+企业  个人+机构  企业+机构
+        var type: CNLiveMineInputAuthType = .enterprise
+        if self.idModel!.enterpriseAuth{
+            type = .enterprise
+        }else if self.idModel!.agencyAuth{
+            type = .agency
+        }
+        self.btnClickAuthType = type
+        self.getStandInfo(identityId:String(self.idModel!.id))
     }
     @objc func StandBtn1Action() {
         //跳转到 个人认证页面
-        self.pushStandVC(isPersonOrEnterprise: 1)
+        self.btnClickAuthType = .person
+        self.getStandInfo(identityId:String(self.idModel!.id))
     }
     @objc func StandBtn2Action() {
         //跳转到 企业认证页面
-        self.pushStandVC(isPersonOrEnterprise: 2)
+        self.btnClickAuthType = .enterprise
+        self.getStandInfo(identityId:String(self.idModel!.id))
     }
     @objc func StandBtn3Action() {
         //跳转到 机构认证页面
-        self.pushStandVC(isPersonOrEnterprise: 3)
+        self.btnClickAuthType = .agency
+        self.getStandInfo(identityId:String(self.idModel!.id))
     }
     // MARK: - 点击弹窗,按类型跳转
@@ -638,8 +673,9 @@ class CNFrontMainView : UIView{
     }
     // MARK: - 通用跳转认证页面 isPersonOrEnterprise 1个人 2企业 3机构
-    func pushStandVC(isPersonOrEnterprise:Int){
+    func pushStandVC(authType:CNLiveMineInputAuthType){
         //跳转到 个人认证&企业认证 页面
+        
         if _idModel!.id == 9 {
             showLoading(message: "")
             CNLiveMineViewModel.requestApplyShopInfo { [weak self] result, respStatue in
@@ -649,65 +685,41 @@ class CNFrontMainView : UIView{
                 }
             }
         }else{
-            if self._idModel!.isPersonOrEnterprise == 1{
+            
+            if authType == .person{
                 //个人
                 navigationViewController().pushViewController(CNLiveMineInputViewController.init(listModel: self._idModel!, authType: .person), animated: pushAnimated)
-            }else if self._idModel!.isPersonOrEnterprise == 2{
+            }else if authType == .enterprise{
                 //企业
                 navigationViewController().pushViewController(CNLiveMineInputViewController.init(listModel: self._idModel!, authType: .enterprise), animated: pushAnimated)
-
-            }else if self._idModel!.isPersonOrEnterprise == 5{
+            }else if authType == .agency{
                 //机构
                 navigationViewController().pushViewController(CNLiveMineInputViewController.init(listModel: self._idModel!, authType: .agency), animated: pushAnimated)
-
-            }else if self._idModel!.isPersonOrEnterprise == 0{
-                //2个按钮
-                if isPersonOrEnterprise == 1{
-                    //第1个按钮
-                    var authType:CNLiveMineInputAuthType = .person
-                    if self._idModel?.standInfoBaseModel?.authInfos.count ?? 0 > 0{
-                        //点击个人
-                        authType = .person
-                    }else if self._idModel?.standInfoBaseModel?.enterpriseAuthInfos.count ?? 0 > 0{
-                        //点击企业
-                        authType = .enterprise
-                    }else{
-                        
-                    }
-                    navigationViewController().pushViewController(CNLiveMineInputViewController.init(listModel: self._idModel!, authType: authType), animated: pushAnimated)
-
-                }else if isPersonOrEnterprise == 2{
-                    //第二个按钮
-                    var authType:CNLiveMineInputAuthType = .enterprise
-                    if self._idModel?.standInfoBaseModel?.enterpriseAuthInfos.count ?? 0 > 0{
-                        //点击企业
-                        authType = .enterprise
-                    }else if self._idModel?.standInfoBaseModel?.agencyAuthInfos.count ?? 0 > 0{
-                        //点击机构
-                        authType = .agency
-                    }else{
-                        
-                    }
-                    navigationViewController().pushViewController(CNLiveMineInputViewController.init(listModel: self._idModel!, authType: authType), animated: pushAnimated)
-                }else{
-                    navigationViewController().pushViewController(CNLiveMineInputViewController.init(listModel: self._idModel!, authType: .person), animated: pushAnimated)
-                }
-            }else if self._idModel!.isPersonOrEnterprise == 4{
-                //个人+企业+机构
-                if (self._idModel?.standInfoBaseModel?.authInfos.first?.inputType == 17 && isPersonOrEnterprise == 1) || (self._idModel?.standInfoBaseModel?.enterpriseAuthInfos.first?.inputType == 17 && isPersonOrEnterprise == 2) || (self._idModel?.standInfoBaseModel?.agencyAuthInfos.first?.inputType == 17 && isPersonOrEnterprise == 3){
+            }
+        }
+    }
+    // MARK: - 获取身份信息是个人认证还是企业认证,机构认证
+    func getStandInfo(identityId:String){
+        showLoading(message: "")
+        CNLiveMineViewModel.requestsStandInfo(identityId: identityId, type: .effect, authType: .person) { [self] result, respStatue in
+            hiddenLoading()
+            if respStatue == .success{
+                let standInfoBaseModel = result as! MineStandInfoBaseModel
+                self.idModel?.standInfoBaseModel = standInfoBaseModel
+                if standInfoBaseModel.authInfos.first?.inputType == 17 && self.btnClickAuthType == .person{
                     //弹窗
-                    self.show17Alert(index: isPersonOrEnterprise)
-                    return
-                }
-                var authType:CNLiveMineInputAuthType = .person
-                if isPersonOrEnterprise == 1{
-                    authType = .person
-                }else if isPersonOrEnterprise == 2{
-                    authType = .enterprise
-                }else if isPersonOrEnterprise == 3{
-                    authType = .agency
+                    self.show17Alert(index: 1)
+                }else if standInfoBaseModel.enterpriseAuthInfos.first?.inputType == 17 && self.btnClickAuthType == .enterprise{
+                    self.show17Alert(index: 2)
+                }else if standInfoBaseModel.agencyAuthInfos.first?.inputType == 17 && self.btnClickAuthType == .agency{
+                    self.show17Alert(index: 3)
+                }else{
+                    //没有弹窗类型,跳转身份认证
+                    self.pushStandVC(authType: self.btnClickAuthType)
                 }
-                navigationViewController().pushViewController(CNLiveMineInputViewController.init(listModel: self._idModel!, authType: authType), animated: pushAnimated)
+            }else{
+                //网络请求失败
+                showMessage(message: "请求失败")
             }
         }
     }
@@ -56,6 +56,7 @@ class CNLiveAuthViewController:CNLiveBaseViewController,UITableViewDelegate,UITa
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
+        self.tabBarController?.tabBar.isHidden = false
         self.updateStatusBarAndTabbarFrame(visible: true)
         self.getMyAlbumCollection(page: 1)
     }
@@ -167,8 +167,6 @@ final class StandListModel: BaseModel {//, TableCodable {
     //电商身份专用
     var shopInfoModel: MineApplyShopInfoModel?
-    ///自定义 判断是 0个人+企业(两个组合) , 1个人, 2企业 3已认证/无企业和个人 , 4个人+企业+机构 5机构
-    var isPersonOrEnterprise: Int = 0
     //身份详情model
     var standInfoBaseModel:MineStandInfoBaseModel?