iOS Team / CNLiveMateCode · Commits

Commit 468d0bf4b50aa54045c33f0f90242cfb81c1ba09

Authored by “张旭”
1 parent c504e0ff

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

Inline Side-by-side
Showing 5 changed files with 111 additions and 188 deletions
metaCode.xcodeproj/project.pbxproj
  View file @468d0bf
... ... @@ -2070,7 +2070,7 @@
2070 2070 CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
2071 2071 CODE_SIGN_IDENTITY = "Apple Development";
2072 2072 CODE_SIGN_STYLE = Automatic;
2073   - CURRENT_PROJECT_VERSION = 1.0.4.24.01.26.17;
  2073 + CURRENT_PROJECT_VERSION = 1.0.4.24.01.27.15;
2074 2074 DEVELOPMENT_TEAM = 94X49GG3ZW;
2075 2075 ENABLE_BITCODE = NO;
2076 2076 ENABLE_MODULE_VERIFIER = NO;
... ... @@ -2324,7 +2324,7 @@
2324 2324 CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
2325 2325 CODE_SIGN_IDENTITY = "Apple Development";
2326 2326 CODE_SIGN_STYLE = Automatic;
2327   - CURRENT_PROJECT_VERSION = 1.0.4.24.01.26.17;
  2327 + CURRENT_PROJECT_VERSION = 1.0.4.24.01.27.15;
2328 2328 DEVELOPMENT_TEAM = 94X49GG3ZW;
2329 2329 ENABLE_BITCODE = NO;
2330 2330 ENABLE_MODULE_VERIFIER = NO;
... ...
metaCode/Classes/Main/HomePage/Controller/AuthMainController/CNMetaCodeHomePageController.swift
  View file @468d0bf
... ... @@ -57,7 +57,7 @@ enum VNumPage {
57 57 class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDelegate, NewPagedFlowViewDataSource, CNCustomIndexViewDelegate,UIGestureRecognizerDelegate,WKNavigationDelegate{
58 58  
59 59 //获取身份信息接口总次数,为0时刷新左右轮播
60   - var reloadNum:Int = 0
  60 +// var reloadNum:Int = 0
61 61 var reloadShopNum:Int = 1
62 62  
63 63 ///NewPagedFlowView 开始滑动时的偏移量
... ... @@ -638,27 +638,8 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
638 638 self.dataArray = NSMutableArray.init()
639 639 self.dataArray.addObjects(from: listArray as! [Any])
640 640  
641   - //全部已认证
642   - var isAllAuthed = true
643   - //请求身份详情,判断是企业认证还是个人认证
644   - listArray.forEach { standListModel in
645   - let listModel = standListModel as! StandListModel
646   - if listModel.auth{
647   - //已认证
648   - listModel.isPersonOrEnterprise = 3
649   - }else{
650   - //未认证
651   - isAllAuthed = false
652   - self.getStandInfo(identityId: "\(listModel.id)")
653   - reloadNum = reloadNum + 1
654   - }
655   - }
656   - if isAllAuthed{
657   - self.addPageView()
658   -
659   - self.backgroupView.updateData(idArray: listArray as! Array<StandListModel>)
660   - }
661   -
  641 + self.addPageView()
  642 + self.backgroupView.updateData(idArray: listArray as! Array<StandListModel>)
662 643 }else{
663 644 self.NetApiStatus = .apiError
664 645 }
... ... @@ -672,75 +653,6 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
672 653 }
673 654 }
674 655  
675   - // MARK: - 获取身份信息是个人认证还是企业认证,机构认证
676   - func getStandInfo(identityId:String){
677   - CNLiveMineViewModel.requestsStandInfo(identityId: identityId, type: .effect, authType: .person) { [self] result, respStatue in
678   - hiddenLoading()
679   - if respStatue == .success{
680   - let standInfoBaseModel = result as! MineStandInfoBaseModel
681   - self.dataArray.forEach { standListModel in
682   - let listModel = standListModel as! StandListModel
683   - if listModel.id == standInfoBaseModel.identityId{
684   - listModel.standInfoBaseModel = standInfoBaseModel
685   - if standInfoBaseModel.authInfos.count > 0{
686   - //个人认证有值
687   - if standInfoBaseModel.enterpriseAuthInfos.count > 0{
688   - //个人有值,企业认证有值
689   - if standInfoBaseModel.agencyAuthInfos.count > 0{
690   - //个人有值,企业有值,机构认证有值
691   - listModel.isPersonOrEnterprise = 4
692   - }else{
693   - //个人有值,企业有值,机构认证没值
694   - listModel.isPersonOrEnterprise = 0
695   - }
696   -
697   - }else{
698   - //个人有值,企业认证没值
699   - if standInfoBaseModel.agencyAuthInfos.count > 0{
700   - //个人有值,企业没值,机构有值
701   - listModel.isPersonOrEnterprise = 0
702   - }else{
703   - //个人有值,企业没值,机构没值
704   - listModel.isPersonOrEnterprise = 1
705   - }
706   - }
707   -
708   - }else if standInfoBaseModel.enterpriseAuthInfos.count > 0{
709   - //企业认证有值,个人没值
710   - if standInfoBaseModel.agencyAuthInfos.count > 0{
711   - ///企业有值,个人没值,机构有值
712   - listModel.isPersonOrEnterprise = 0
713   - }else{
714   - ///企业有值,个人没值,机构没值
715   - listModel.isPersonOrEnterprise = 2
716   - }
717   -
718   -
719   - }else{
720   - //企业个人都没值
721   - if standInfoBaseModel.agencyAuthInfos.count > 0{
722   - //企业没值,个人没值,机构有值
723   - listModel.isPersonOrEnterprise = 5
724   - }else{
725   - //企业没值,个人没值,机构没值
726   - listModel.isPersonOrEnterprise = 3
727   - }
728   - }
729   - }
730   - }
731   - //已请求全部身份详情,开始刷新
732   - reloadNum = reloadNum - 1
733   - if reloadNum == 0{
734   - self.addPageView()
735   - let arr = Array(self.dataArray)
736   - self.backgroupView.updateData(idArray: arr as! Array<StandListModel>)
737   - }
738   - }else{
739   - //网络请求失败
740   - }
741   - }
742   - }
743   -
744 656 // MARK: - 获取电商状态
745 657 func getApplyShopInfo(){
746 658 //获取当前店铺审核状态
... ...
metaCode/Classes/Main/HomePage/View/VerticalViews/MainView/CNMainView.swift
  View file @468d0bf
... ... @@ -18,6 +18,7 @@ class CNFrontMainView : UIView{
18 18 var tapTransformAciton:closureBlock?
19 19 let delegate = UIApplication.shared.delegate as! AppDelegate
20 20 var standInfoSubTitleModel:MineStandInfoSubTitleModel?//17时弹窗的跳转model
  21 + var btnClickAuthType:CNLiveMineInputAuthType = .person
21 22  
22 23 override init(frame: CGRect) {
23 24 super.init(frame: frame)
... ... @@ -416,62 +417,64 @@ class CNFrontMainView : UIView{
416 417 upMoreGIF.isHidden = false
417 418 downMoreGIF.isHidden = false
418 419  
419   - if idModel?.isPersonOrEnterprise == 0{//企业+个人等 2个按钮
  420 + if idModel!.userAuth && idModel!.enterpriseAuth && !idModel!.agencyAuth{
420 421 self.addStandBtn.isHidden = true
421 422 self.personalStandBtn.isHidden = false
422 423 self.enterpriseStandBtn.isHidden = false
423 424 unStandBtnBgView.isHidden = true
424   - let presonInfoCount = self.idModel?.standInfoBaseModel?.authInfos.count ?? 0
425   - let enterInfoCount = self.idModel?.standInfoBaseModel?.enterpriseAuthInfos.count ?? 0
426   - let agencyInfoCount = self.idModel?.standInfoBaseModel?.agencyAuthInfos.count ?? 0
427   - if presonInfoCount > 0 && enterInfoCount > 0{
428   - //个人+企业
429   - self.personalStandBtn.setTitle("个人认证", for: .normal)
430   - self.enterpriseStandBtn.setTitle("企业认证", for: .normal)
431   - }else if presonInfoCount > 0 && agencyInfoCount > 0{
432   - //个人+机构
433   - self.personalStandBtn.setTitle("个人认证", for: .normal)
434   - self.enterpriseStandBtn.setTitle("机构认证", for: .normal)
435   - }else if enterInfoCount > 0 && agencyInfoCount > 0{
436   - //企业+机构
437   - self.personalStandBtn.setTitle("企业认证", for: .normal)
438   - self.enterpriseStandBtn.setTitle("机构认证", for: .normal)
439   - }
440   - }else if idModel?.isPersonOrEnterprise == 1{//个人
  425 + //个人+企业
  426 + self.personalStandBtn.setTitle("个人认证", for: .normal)
  427 + self.enterpriseStandBtn.setTitle("企业认证", for: .normal)
  428 + }else if idModel!.userAuth && idModel!.agencyAuth && !idModel!.enterpriseAuth{
  429 + self.addStandBtn.isHidden = true
  430 + self.personalStandBtn.isHidden = false
  431 + self.enterpriseStandBtn.isHidden = false
  432 + unStandBtnBgView.isHidden = true
  433 + //个人+机构
  434 + self.personalStandBtn.setTitle("个人认证", for: .normal)
  435 + self.enterpriseStandBtn.setTitle("机构认证", for: .normal)
  436 + }else if idModel!.enterpriseAuth && idModel!.agencyAuth && !idModel!.userAuth{
  437 + self.addStandBtn.isHidden = true
  438 + self.personalStandBtn.isHidden = false
  439 + self.enterpriseStandBtn.isHidden = false
  440 + unStandBtnBgView.isHidden = true
  441 + //企业+机构
  442 + self.personalStandBtn.setTitle("企业认证", for: .normal)
  443 + self.enterpriseStandBtn.setTitle("机构认证", for: .normal)
  444 + }else if idModel!.userAuth && !idModel!.enterpriseAuth && !idModel!.agencyAuth{
  445 + //个人
441 446 self.addStandBtn.isHidden = false
442 447 self.addStandBtn.setTitle("个人认证", for: .normal)
443 448 self.personalStandBtn.isHidden = true
444 449 self.enterpriseStandBtn.isHidden = true
445 450 self.unStandBtnBgView.isHidden = true
446   - }else if idModel?.isPersonOrEnterprise == 2{//企业
  451 + }else if !idModel!.userAuth && idModel!.enterpriseAuth && !idModel!.agencyAuth{
  452 + //企业
447 453 self.addStandBtn.isHidden = false
448 454 self.addStandBtn.setTitle("企业认证", for: .normal)
449 455 self.personalStandBtn.isHidden = true
450 456 self.enterpriseStandBtn.isHidden = true
451 457 self.unStandBtnBgView.isHidden = true
452   - }else if idModel?.isPersonOrEnterprise == 3{//已认证/无企业和个人
453   - //不显示认证按钮
454   - self.addStandBtn.isHidden = true
  458 + }else if !idModel!.userAuth && !idModel!.enterpriseAuth && idModel!.agencyAuth{
  459 + //机构
  460 + self.addStandBtn.isHidden = false
  461 + self.addStandBtn.setTitle("机构认证", for: .normal)
455 462 self.personalStandBtn.isHidden = true
456 463 self.enterpriseStandBtn.isHidden = true
457 464 self.unStandBtnBgView.isHidden = true
458   - }else if idModel?.isPersonOrEnterprise == 4{//个人+企业+机构
  465 + }else if idModel!.userAuth && idModel!.enterpriseAuth && idModel!.agencyAuth{
  466 + //个人+企业+机构
459 467 self.addStandBtn.isHidden = true
460 468 self.personalStandBtn.isHidden = true
461 469 self.enterpriseStandBtn.isHidden = true
462 470 self.unStandBtnBgView.isHidden = false
463 471 self.setUnStandBtnBgViewLayer(startHex: newValue!.atPersonageColour, endHex: newValue!.backgroundColor)
464   - }else if idModel?.isPersonOrEnterprise == 5{//机构
465   - self.addStandBtn.isHidden = false
466   - self.addStandBtn.setTitle("机构认证", for: .normal)
467   - self.personalStandBtn.isHidden = true
468   - self.enterpriseStandBtn.isHidden = true
469   - self.unStandBtnBgView.isHidden = true
470   - }else{
  472 + }else if !idModel!.userAuth && !idModel!.enterpriseAuth && !idModel!.agencyAuth{
  473 + //无企业和个人
471 474 //不显示认证按钮
472 475 self.addStandBtn.isHidden = true
473   - self.personalStandBtn.isHidden = false
474   - self.enterpriseStandBtn.isHidden = false
  476 + self.personalStandBtn.isHidden = true
  477 + self.enterpriseStandBtn.isHidden = true
475 478 self.unStandBtnBgView.isHidden = true
476 479 }
477 480 }
... ... @@ -561,29 +564,61 @@ class CNFrontMainView : UIView{
561 564 }
562 565  
563 566 @objc func addStandBtnAction() {
564   - //跳转到 电商认证 / 个人 / 企业 / 机构
565   - self.pushStandVC(isPersonOrEnterprise: 3)
  567 + //跳转到 1按钮时认证页面 电商 / 个人 / 企业 / 机构
  568 + if _idModel!.id == 9 {
  569 + self.pushStandVC(authType: .person)
  570 + }else{
  571 + var type: CNLiveMineInputAuthType = .person
  572 + if self.idModel!.userAuth{
  573 + type = .person
  574 + }else if self.idModel!.enterpriseAuth{
  575 + type = .enterprise
  576 + }else if self.idModel!.agencyAuth{
  577 + type = .agency
  578 + }
  579 + self.btnClickAuthType = type
  580 + self.getStandInfo(identityId:String(self.idModel!.id))
  581 + }
566 582 }
567 583 @objc func personalStandBtnAction() {
568   - //跳转到 个人认证页面
569   - self.pushStandVC(isPersonOrEnterprise: 1)
  584 + //跳转到 2个按钮时 第一个认证页面
  585 + //个人+企业 个人+机构 企业+机构
  586 + var type: CNLiveMineInputAuthType = .person
  587 + if self.idModel!.userAuth{
  588 + type = .person
  589 + }else if self.idModel!.enterpriseAuth{
  590 + type = .enterprise
  591 + }
  592 + self.btnClickAuthType = type
  593 + self.getStandInfo(identityId:String(self.idModel!.id))
570 594 }
571 595 @objc func enterpriseStandBtnAction() {
572   - //跳转到 企业认证页面
573   - self.pushStandVC(isPersonOrEnterprise: 2)
  596 + //跳转到 2个按钮时 第二个认证页面
  597 + //个人+企业 个人+机构 企业+机构
  598 + var type: CNLiveMineInputAuthType = .enterprise
  599 + if self.idModel!.enterpriseAuth{
  600 + type = .enterprise
  601 + }else if self.idModel!.agencyAuth{
  602 + type = .agency
  603 + }
  604 + self.btnClickAuthType = type
  605 + self.getStandInfo(identityId:String(self.idModel!.id))
574 606 }
575 607  
576 608 @objc func StandBtn1Action() {
577 609 //跳转到 个人认证页面
578   - self.pushStandVC(isPersonOrEnterprise: 1)
  610 + self.btnClickAuthType = .person
  611 + self.getStandInfo(identityId:String(self.idModel!.id))
579 612 }
580 613 @objc func StandBtn2Action() {
581 614 //跳转到 企业认证页面
582   - self.pushStandVC(isPersonOrEnterprise: 2)
  615 + self.btnClickAuthType = .enterprise
  616 + self.getStandInfo(identityId:String(self.idModel!.id))
583 617 }
584 618 @objc func StandBtn3Action() {
585 619 //跳转到 机构认证页面
586   - self.pushStandVC(isPersonOrEnterprise: 3)
  620 + self.btnClickAuthType = .agency
  621 + self.getStandInfo(identityId:String(self.idModel!.id))
587 622 }
588 623  
589 624 // MARK: - 点击弹窗,按类型跳转
... ... @@ -638,8 +673,9 @@ class CNFrontMainView : UIView{
638 673 }
639 674  
640 675 // MARK: - 通用跳转认证页面 isPersonOrEnterprise 1个人 2企业 3机构
641   - func pushStandVC(isPersonOrEnterprise:Int){
  676 + func pushStandVC(authType:CNLiveMineInputAuthType){
642 677 //跳转到 个人认证&企业认证 页面
  678 +
643 679 if _idModel!.id == 9 {
644 680 showLoading(message: "")
645 681 CNLiveMineViewModel.requestApplyShopInfo { [weak self] result, respStatue in
... ... @@ -649,65 +685,41 @@ class CNFrontMainView : UIView{
649 685 }
650 686 }
651 687 }else{
652   - if self._idModel!.isPersonOrEnterprise == 1{
  688 +
  689 + if authType == .person{
653 690 //个人
654 691 navigationViewController().pushViewController(CNLiveMineInputViewController.init(listModel: self._idModel!, authType: .person), animated: pushAnimated)
655   - }else if self._idModel!.isPersonOrEnterprise == 2{
  692 + }else if authType == .enterprise{
656 693 //企业
657 694 navigationViewController().pushViewController(CNLiveMineInputViewController.init(listModel: self._idModel!, authType: .enterprise), animated: pushAnimated)
658   -
659   - }else if self._idModel!.isPersonOrEnterprise == 5{
  695 + }else if authType == .agency{
660 696 //机构
661 697 navigationViewController().pushViewController(CNLiveMineInputViewController.init(listModel: self._idModel!, authType: .agency), animated: pushAnimated)
662   -
663   - }else if self._idModel!.isPersonOrEnterprise == 0{
664   - //2个按钮
665   - if isPersonOrEnterprise == 1{
666   - //第1个按钮
667   - var authType:CNLiveMineInputAuthType = .person
668   - if self._idModel?.standInfoBaseModel?.authInfos.count ?? 0 > 0{
669   - //点击个人
670   - authType = .person
671   - }else if self._idModel?.standInfoBaseModel?.enterpriseAuthInfos.count ?? 0 > 0{
672   - //点击企业
673   - authType = .enterprise
674   - }else{
675   -
676   - }
677   - navigationViewController().pushViewController(CNLiveMineInputViewController.init(listModel: self._idModel!, authType: authType), animated: pushAnimated)
678   -
679   - }else if isPersonOrEnterprise == 2{
680   - //第二个按钮
681   - var authType:CNLiveMineInputAuthType = .enterprise
682   - if self._idModel?.standInfoBaseModel?.enterpriseAuthInfos.count ?? 0 > 0{
683   - //点击企业
684   - authType = .enterprise
685   - }else if self._idModel?.standInfoBaseModel?.agencyAuthInfos.count ?? 0 > 0{
686   - //点击机构
687   - authType = .agency
688   - }else{
689   -
690   - }
691   - navigationViewController().pushViewController(CNLiveMineInputViewController.init(listModel: self._idModel!, authType: authType), animated: pushAnimated)
692   - }else{
693   - navigationViewController().pushViewController(CNLiveMineInputViewController.init(listModel: self._idModel!, authType: .person), animated: pushAnimated)
694   - }
695   - }else if self._idModel!.isPersonOrEnterprise == 4{
696   - //个人+企业+机构
697   - 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){
  698 + }
  699 + }
  700 + }
  701 + // MARK: - 获取身份信息是个人认证还是企业认证,机构认证
  702 + func getStandInfo(identityId:String){
  703 + showLoading(message: "")
  704 + CNLiveMineViewModel.requestsStandInfo(identityId: identityId, type: .effect, authType: .person) { [self] result, respStatue in
  705 + hiddenLoading()
  706 + if respStatue == .success{
  707 + let standInfoBaseModel = result as! MineStandInfoBaseModel
  708 + self.idModel?.standInfoBaseModel = standInfoBaseModel
  709 + if standInfoBaseModel.authInfos.first?.inputType == 17 && self.btnClickAuthType == .person{
698 710 //弹窗
699   - self.show17Alert(index: isPersonOrEnterprise)
700   - return
701   - }
702   - var authType:CNLiveMineInputAuthType = .person
703   - if isPersonOrEnterprise == 1{
704   - authType = .person
705   - }else if isPersonOrEnterprise == 2{
706   - authType = .enterprise
707   - }else if isPersonOrEnterprise == 3{
708   - authType = .agency
  711 + self.show17Alert(index: 1)
  712 + }else if standInfoBaseModel.enterpriseAuthInfos.first?.inputType == 17 && self.btnClickAuthType == .enterprise{
  713 + self.show17Alert(index: 2)
  714 + }else if standInfoBaseModel.agencyAuthInfos.first?.inputType == 17 && self.btnClickAuthType == .agency{
  715 + self.show17Alert(index: 3)
  716 + }else{
  717 + //没有弹窗类型,跳转身份认证
  718 + self.pushStandVC(authType: self.btnClickAuthType)
709 719 }
710   - navigationViewController().pushViewController(CNLiveMineInputViewController.init(listModel: self._idModel!, authType: authType), animated: pushAnimated)
  720 + }else{
  721 + //网络请求失败
  722 + showMessage(message: "请求失败")
711 723 }
712 724 }
713 725 }
... ...
metaCode/Classes/Main/HomePages/Controller/AuthController/CNLiveAuthViewController.swift
  View file @468d0bf
... ... @@ -56,6 +56,7 @@ class CNLiveAuthViewController:CNLiveBaseViewController,UITableViewDelegate,UITa
56 56  
57 57 override func viewWillAppear(_ animated: Bool) {
58 58 super.viewWillAppear(animated)
  59 + self.tabBarController?.tabBar.isHidden = false
59 60 self.updateStatusBarAndTabbarFrame(visible: true)
60 61 self.getMyAlbumCollection(page: 1)
61 62 }
... ...
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineBaseModel.swift
  View file @468d0bf
... ... @@ -167,8 +167,6 @@ final class StandListModel: BaseModel {//, TableCodable {
167 167 //电商身份专用
168 168 var shopInfoModel: MineApplyShopInfoModel?
169 169  
170   - ///自定义 判断是 0个人+企业(两个组合) , 1个人, 2企业 3已认证/无企业和个人 , 4个人+企业+机构 5机构
171   - var isPersonOrEnterprise: Int = 0
172 170 //身份详情model
173 171 var standInfoBaseModel:MineStandInfoBaseModel?
174 172  
... ...