数字简历页面-官方认证-数字资产页-其他证书-改为一排三个多少排都展示

“张旭”
1 parent e74826eb
Showing 12 changed files with 236 additions and 108 deletions
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/数字简历相关页面/CNLiveDigitalResumeController.swift
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/数字简历相关页面/CNLiveDigitalResumePreViewSelectRenzhengCerController.swift
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/数字认证身份相关页面/CNLiveDigitalAssetsController.swift
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/证书相关页面/CNLiveVitaeVocationalCertificateController.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/Vitae/Certificate/CNLiveCertificateCollectionCell.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/Vitae/Certificate/CNLiveVocationalCertificateFirCell.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/我的简历cell/关联官方认证或证书cell/CNLiveDigitalResumeSelectCerCell.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/数字资产cell/CNLiveDigitalThreeCell.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/数字资产cell/CNLiveDigitalThreeCerCollectCell .swift
metaCode/Classes/Main/HomePage/ViewModel/Vitae/CNLiveVitaeViewModel.swift
metaCode/Classes/Main/Model/Vitae/CNLiveVitaeCertificateModel.swift
metaCode/Classes/Main/Model/Vitae/CNLiveVitaeModel.swift
@@ -168,7 +168,7 @@ class CNLiveDigitalResumeController:CNLiveBaseViewController,UITableViewDataSour
         let vsid = UserInfoManager.shared.userInfo.currentUser?.vsid ?? ""
         CNLiveVitaeViewModel.getCerList(vsid: vsid, page: 1, pageSize: 100){ result, respStatue in
             if respStatue == .success{
-                if let res = result as? [CNLiveVitaeCertificateModel]{
+                if let res = result as? [CNLiveVitaeCertificatesModel]{
                     self.certificatesCount = res.count
                     self.tableView.reloadData()
                 }
@@ -205,7 +205,7 @@ class CNLiveDigitalResumePreViewSelectRenzhengCerController:CNLiveBaseViewContro
                 let cell = CNLiveDigitalResumeSelectCerCell()
                 return cell
             }
-            let cerListMdl = self.totalDataArray[indexPath.row] as! CNLiveVitaeCertificateModel
+            let cerListMdl = self.totalDataArray[indexPath.row] as! CNLiveVitaeCertificatesModel
             cell.cerListMdl = cerListMdl
             return cell
         }
@@ -268,7 +268,7 @@ class CNLiveDigitalResumePreViewSelectRenzhengCerController:CNLiveBaseViewContro
         }else{
             var idsArrStr = ""
             for (idx,obj) in self.totalDataArray.enumerated() {
-                let model = obj as! CNLiveVitaeCertificateModel
+                let model = obj as! CNLiveVitaeCertificatesModel
                 let cell = self.tableView.cellForRow(at: IndexPath(row: idx, section: 0)) as! CNLiveDigitalResumeSelectCerCell
                 if cell.selectBtn.isSelected{
                     idsArrStr = idsArrStr + "\(model.id),"
@@ -304,8 +304,8 @@ class CNLiveDigitalResumePreViewSelectRenzhengCerController:CNLiveBaseViewContro
         let vsid = UserInfoManager.shared.userInfo.currentUser?.vsid ?? ""
         CNLiveVitaeViewModel.getCerList(vsid: vsid, page: 1, pageSize: 100){ result, respStatue in
             if respStatue == .success{
-                if let res = result as? [CNLiveVitaeCertificateModel]{
-                    var arr = Array<CNLiveVitaeCertificateModel>()
+                if let res = result as? [CNLiveVitaeCertificatesModel]{
+                    var arr = Array<CNLiveVitaeCertificatesModel>()
                     var guanlianNum = 0
                     res.forEach { cerMdl in
                         if let cerListArr = self.cerListModels{
@@ -9,7 +9,7 @@ import Foundation
 class CNLiveDigitalAssetsController:CNLiveBaseViewController, UITableViewDataSource, UITableViewDelegate{
-    var certificatesArr =  [CNLiveVitaeCertificateModel]()
+    var certificatesArr =  [CNLiveVitaeCertificatesModel]()
     lazy var nextBtn: UIButton = {
         let  nextBtn = UIButton(type: .custom)
@@ -162,7 +162,15 @@ class CNLiveDigitalAssetsController:CNLiveBaseViewController, UITableViewDataSou
                 return adapt_length(length: 53)+100*hang+15
             }
         }else{
-            return 317+15
+            var cellH:CGFloat = 317+15+72+15
+            if self.certificatesArr.count > 0{
+                let hang:CGFloat = CGFloat((self.certificatesArr.count-1)/3+1)
+                let imgW:CGFloat = CGFloat((KSreenWidth-80-30)/3.0)
+                let imgH:CGFloat = 101*imgW/85.0
+                return 15+125+(imgH+10)*hang-10+92
+            }else{
+                return cellH
+            }
         }
     }
     deinit {
@@ -177,7 +185,7 @@ class CNLiveDigitalAssetsController:CNLiveBaseViewController, UITableViewDataSou
         let vsid = UserInfoManager.shared.userInfo.currentUser?.vsid ?? ""
         CNLiveVitaeViewModel.getCerList(vsid: vsid, page: 1, pageSize: 100){ result, respStatue in
             if respStatue == .success{
-                if let res = result as? [CNLiveVitaeCertificateModel]{
+                if let res = result as? [CNLiveVitaeCertificatesModel]{
                     self.certificatesArr = res
                     self.tableView.reloadData()
                 }
@@ -42,8 +42,8 @@ class CNLiveVitaeVocationalCertificateController:CNLiveBaseViewController,UITabl
         nextBtn.addTarget(self, action: #selector(addCertificateBtnAction), for: .touchUpInside)
         return nextBtn
     }()
-    lazy var cerListArr :Array<CNLiveVitaeCertificateModel> = {
-        let dataArray = Array<CNLiveVitaeCertificateModel>()
+    lazy var cerListArr :Array<CNLiveVitaeCertificatesModel> = {
+        let dataArray = Array<CNLiveVitaeCertificatesModel>()
         return dataArray
     }()
@@ -116,7 +116,7 @@ class CNLiveVitaeVocationalCertificateController:CNLiveBaseViewController,UITabl
         let vsid = UserInfoManager.shared.userInfo.currentUser?.vsid ?? ""
         CNLiveVitaeViewModel.getCerList(vsid: vsid, page: 1, pageSize: 100){ result, respStatue in
             if respStatue == .success{
-                if let res = result as? [CNLiveVitaeCertificateModel]{
+                if let res = result as? [CNLiveVitaeCertificatesModel]{
                     self.cerListArr = res
                     self.tableView.reloadData()
                 }
@@ -11,8 +11,8 @@ import Kingfisher
 class CNLiveCertificateCollectionCell: UICollectionViewCell {
     //cerModel
-    var _cerModel : CNLiveVitaeCertificateModel?
-    var cerModel : CNLiveVitaeCertificateModel? {
+    var _cerModel : CNLiveVitaeCertificatesModel?
+    var cerModel : CNLiveVitaeCertificatesModel? {
         get{
             _cerModel
         }
@@ -64,7 +64,7 @@ class CNLiveCertificateCollectionCell: UICollectionViewCell {
         fatalError("init(coder:) has not been implemented")
     }
-    func setupNewUI(model:CNLiveVitaeCertificateModel){
+    func setupNewUI(model:CNLiveVitaeCertificatesModel){
         self.iconImgView.subviews.forEach { view in
             if view.tag >= 1000{
                 view.removeFromSuperview()
@@ -16,8 +16,8 @@ class CNLiveVocationalCertificateFirCell: UITableViewCell, UICollectionViewDataS
     var pageNum: NSInteger! = 1
     //cerListArr
-    var _cerListArr : Array<CNLiveVitaeCertificateModel>?
-    var cerListArr : Array<CNLiveVitaeCertificateModel>? {
+    var _cerListArr : Array<CNLiveVitaeCertificatesModel>?
+    var cerListArr : Array<CNLiveVitaeCertificatesModel>? {
         get{
             _cerListArr
         }
@@ -292,11 +292,11 @@ class CNLiveVocationalCertificateFirCell: UITableViewCell, UICollectionViewDataS
         fatalError("init(coder:) has not been implemented")
     }
-    func setupNewUI(cerListArr : Array<CNLiveVitaeCertificateModel>){
+    func setupNewUI(cerListArr : Array<CNLiveVitaeCertificatesModel>){
         self.yuanmaDescLabel.text = "共 \(cerListArr.count) 条"
         self.collectionView.reloadData()
     }
-    func setupCerDetailNewUI(cerModel : CNLiveVitaeCertificateModel){
+    func setupCerDetailNewUI(cerModel : CNLiveVitaeCertificatesModel){
         self.cerNameDetailTitleLabel.text = (cerModel.title.count > 0) ? cerModel.title : "无"
         self.cerLevelDetailTitleLabel.text =  (cerModel.lv.count > 0) ? cerModel.lv : "无"
         self.cerNumberDetailTitleLabel.text = (cerModel.number.count > 0) ? cerModel.number : "无"
@@ -10,8 +10,8 @@ import SnapKit
 class CNLiveDigitalResumeSelectCerCell:UITableViewCell{
-    var _cerListMdl : CNLiveVitaeCertificateModel?
-    var cerListMdl : CNLiveVitaeCertificateModel? {
+    var _cerListMdl : CNLiveVitaeCertificatesModel?
+    var cerListMdl : CNLiveVitaeCertificatesModel? {
         get{
             _cerListMdl
         }
@@ -192,7 +192,7 @@ class CNLiveDigitalResumeSelectCerCell:UITableViewCell{
     }
-    func setupNewUI(model:CNLiveVitaeCertificateModel){
+    func setupNewUI(model:CNLiveVitaeCertificatesModel){
         self.authNameTitleLabel.text = model.title
         self.nameLevelRightTitleLabel.text = model.lv.count > 0 ? model.lv : "无等级"
@@ -9,16 +9,16 @@ import Foundation
 import Kingfisher
 import SnapKit
-class CNLiveDigitalThreeCell: UITableViewCell, UICollectionViewDelegate, UICollectionViewDataSource {
+class CNLiveDigitalThreeCell: UITableViewCell{//, UICollectionViewDelegate, UICollectionViewDataSource {
-    var _certificatesArr : [CNLiveVitaeCertificateModel]?
-    var certificatesArr : [CNLiveVitaeCertificateModel]? {
+    var _certificatesArr : [CNLiveVitaeCertificatesModel]?
+    var certificatesArr : [CNLiveVitaeCertificatesModel]? {
         get{
             _certificatesArr
         }
         set{
             _certificatesArr = newValue!
-            setupNewUI(models: _certificatesArr!)
+            setupNewUI(modelsArr: newValue!)
         }
     }
@@ -63,19 +63,19 @@ class CNLiveDigitalThreeCell: UITableViewCell, UICollectionViewDelegate, UIColle
         return titleLabel
     }()
-    let kCNLiveDigitalThreeCerCollectCellID = "kCNLiveDigitalThreeCerCollectCellID"
-    lazy var threeCollectionView: UICollectionView = {
-        let layout = UICollectionViewFlowLayout()
-        layout.itemSize = CGSizeMake(85, 101)
-        layout.minimumLineSpacing = 20
-        layout.scrollDirection = .horizontal
-        let collectionView = UICollectionView(frame: .zero, collectionViewLayout: layout)
-        collectionView.delegate = self
-        collectionView.dataSource = self
-        collectionView.backgroundColor = .clear
-        collectionView.register(CNLiveDigitalThreeCerCollectCell.self, forCellWithReuseIdentifier: kCNLiveDigitalThreeCerCollectCellID)
-        return collectionView
-    }()
+//    let kCNLiveDigitalThreeCerCollectCellID = "kCNLiveDigitalThreeCerCollectCellID"
+//    lazy var threeCollectionView: UICollectionView = {
+//        let layout = UICollectionViewFlowLayout()
+//        layout.itemSize = CGSizeMake(85, 101)
+//        layout.minimumLineSpacing = 20
+//        layout.scrollDirection = .horizontal
+//        let collectionView = UICollectionView(frame: .zero, collectionViewLayout: layout)
+//        collectionView.delegate = self
+//        collectionView.dataSource = self
+//        collectionView.backgroundColor = .clear
+//        collectionView.register(CNLiveDigitalThreeCerCollectCell.self, forCellWithReuseIdentifier: kCNLiveDigitalThreeCerCollectCellID)
+//        return collectionView
+//    }()
     lazy var zhengshuNoDescTitleLabel: UILabel = {
         let titleLabel = UILabel()
@@ -112,18 +112,23 @@ class CNLiveDigitalThreeCell: UITableViewCell, UICollectionViewDelegate, UIColle
         self.selectionStyle = .none
         self.contentView.addSubview(self.whiteView)
+        self.whiteView.snp.makeConstraints { make in
+            make.top.equalTo(15)
+            make.bottom.equalToSuperview()
+            make.left.equalTo(15)
+            make.right.equalToSuperview().offset(-15)
+        }
         self.whiteView.addSubview(self.authNameTitleLabel)
         self.authNameTitleLabel.snp.makeConstraints { make in
+            make.top.equalToSuperview().offset(adapt_length(length: 15))
             make.left.equalTo(adapt_length(length: 15))
-            make.top.equalTo(adapt_length(length: 15))
         }
-        
         self.whiteView.addSubview(self.zhengshuView)
         self.zhengshuView.snp.makeConstraints { make in
             make.left.equalToSuperview().offset(adapt_length(length: 15))
             make.right.equalToSuperview().offset(adapt_length(length: -15))
             make.top.equalTo(self.authNameTitleLabel.snp.bottom).offset(adapt_length(length: 15))
-            make.height.equalTo(249)
+            make.bottom.equalToSuperview().offset(-54-15)
         }
         self.zhengshuView.addSubview(self.zhengshuTitleLabel)
         self.zhengshuTitleLabel.snp.makeConstraints { make in
@@ -135,33 +140,82 @@ class CNLiveDigitalThreeCell: UITableViewCell, UICollectionViewDelegate, UIColle
             make.left.equalToSuperview().offset(adapt_length(length: 15))
             make.top.equalTo(self.zhengshuTitleLabel.snp.bottom).offset(adapt_length(length: 3))
         }
-        self.zhengshuView.addSubview(self.threeCollectionView)
-        self.threeCollectionView.snp.makeConstraints { make in
-            make.left.right.equalToSuperview()
-            make.top.equalTo(self.zhengshuDescTitleLabel.snp.bottom).offset(15)
-            make.height.equalTo(101)
-            make.width.equalToSuperview().offset(-20)
-        }
-        self.zhengshuView.addSubview(self.zhengshuBtn)
+
+        self.whiteView.addSubview(self.zhengshuBtn)
         self.zhengshuBtn.snp.makeConstraints { make in
             make.centerX.equalToSuperview()
-            make.bottom.equalToSuperview().offset(adapt_length(length: -20))
-            make.width.equalTo(adapt_length(length: 86))
+            make.bottom.equalToSuperview().offset(-20)
+            make.width.equalTo(86)
             make.height.equalTo(34)
         }
-        self.zhengshuView.addSubview(self.zhengshuNoDescTitleLabel)
+        self.whiteView.addSubview(self.zhengshuNoDescTitleLabel)
         self.zhengshuNoDescTitleLabel.snp.makeConstraints { make in
             make.centerX.equalToSuperview()
             make.bottom.equalTo(self.zhengshuBtn.snp.top).offset(-10)
         }
-        self.zhengshuView.addSubview(self.zhengshuNoIconImgView)
+        self.whiteView.addSubview(self.zhengshuNoIconImgView)
         self.zhengshuNoIconImgView.snp.makeConstraints { make in
             make.centerX.equalToSuperview()
             make.bottom.equalTo(self.zhengshuNoDescTitleLabel.snp.top).offset(-10)
             make.width.equalTo(60)
             make.height.equalTo(45)
         }
+//        self.contentView.backgroundColor = .clear
+//        self.backgroundColor = .clear
+//        self.selectionStyle = .none
+//        
+//        self.contentView.addSubview(self.whiteView)
+//        self.whiteView.addSubview(self.authNameTitleLabel)
+//        self.authNameTitleLabel.snp.makeConstraints { make in
+//            make.left.equalTo(adapt_length(length: 15))
+//            make.top.equalTo(adapt_length(length: 15))
+//        }
+//        
+//        self.whiteView.addSubview(self.zhengshuView)
+//        self.zhengshuView.snp.makeConstraints { make in
+//            make.left.equalToSuperview().offset(adapt_length(length: 15))
+//            make.right.equalToSuperview().offset(adapt_length(length: -15))
+//            make.top.equalTo(self.authNameTitleLabel.snp.bottom).offset(adapt_length(length: 15))
+//            make.height.equalTo(249)
+//        }
+//        self.zhengshuView.addSubview(self.zhengshuTitleLabel)
+//        self.zhengshuTitleLabel.snp.makeConstraints { make in
+//            make.left.equalToSuperview().offset(adapt_length(length: 15))
+//            make.top.equalToSuperview().offset(adapt_length(length: 15))
+//        }
+//        self.zhengshuView.addSubview(self.zhengshuDescTitleLabel)
+//        self.zhengshuDescTitleLabel.snp.makeConstraints { make in
+//            make.left.equalToSuperview().offset(adapt_length(length: 15))
+//            make.top.equalTo(self.zhengshuTitleLabel.snp.bottom).offset(adapt_length(length: 3))
+//        }
+//        self.zhengshuView.addSubview(self.threeCollectionView)
+//        self.threeCollectionView.snp.makeConstraints { make in
+//            make.left.right.equalToSuperview()
+//            make.top.equalTo(self.zhengshuDescTitleLabel.snp.bottom).offset(15)
+//            make.height.equalTo(101)
+//            make.width.equalToSuperview().offset(-20)
+//        }
+//        self.zhengshuView.addSubview(self.zhengshuBtn)
+//        self.zhengshuBtn.snp.makeConstraints { make in
+//            make.centerX.equalToSuperview()
+//            make.bottom.equalToSuperview().offset(adapt_length(length: -20))
+//            make.width.equalTo(adapt_length(length: 86))
+//            make.height.equalTo(34)
+//        }
+//        
+//        self.zhengshuView.addSubview(self.zhengshuNoDescTitleLabel)
+//        self.zhengshuNoDescTitleLabel.snp.makeConstraints { make in
+//            make.centerX.equalToSuperview()
+//            make.bottom.equalTo(self.zhengshuBtn.snp.top).offset(-10)
+//        }
+//        self.zhengshuView.addSubview(self.zhengshuNoIconImgView)
+//        self.zhengshuNoIconImgView.snp.makeConstraints { make in
+//            make.centerX.equalToSuperview()
+//            make.bottom.equalTo(self.zhengshuNoDescTitleLabel.snp.top).offset(-10)
+//            make.width.equalTo(60)
+//            make.height.equalTo(45)
+//        }
     }
@@ -169,36 +223,97 @@ class CNLiveDigitalThreeCell: UITableViewCell, UICollectionViewDelegate, UIColle
         fatalError("init(coder:) has not been implemented")
     }
-    func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
-        self.certificatesArr?.count ?? 0
-    }
-    
-    func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
-        let cell = collectionView.dequeueReusableCell(withReuseIdentifier: kCNLiveDigitalThreeCerCollectCellID, for: indexPath) as! CNLiveDigitalThreeCerCollectCell
-        cell.cerModel = self.certificatesArr?[indexPath.row]
-        return cell
-    }
-    
-    func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
-        navigationViewController().pushViewController(CNLiveVitaeVocationalCertificateController(), animated: true)
-    }
+//    func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
+//        self.certificatesArr?.count ?? 0
+//    }
+//    
+//    func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
+//        let cell = collectionView.dequeueReusableCell(withReuseIdentifier: kCNLiveDigitalThreeCerCollectCellID, for: indexPath) as! CNLiveDigitalThreeCerCollectCell
+//        cell.cerModel = self.certificatesArr?[indexPath.row]
+//        return cell
+//    }
+//    
+//    func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
+//        navigationViewController().pushViewController(CNLiveVitaeVocationalCertificateController(), animated: true)
+//    }
     @objc func zhengshuBtnAction(){
         //跳转 证书列表页面
         navigationViewController().pushViewController(CNLiveVitaeVocationalCertificateController(), animated: true)
     }
-    func setupNewUI(models:[CNLiveVitaeCertificateModel]){
-        if models.count > 0{
-            self.threeCollectionView.reloadData()
-            self.threeCollectionView.isHidden = false
-            self.zhengshuNoDescTitleLabel.isHidden = true
+//    func setupNewUI(models:[CNLiveVitaeCertificateModel]){
+//        if models.count > 0{
+//            self.threeCollectionView.reloadData()
+//            self.threeCollectionView.isHidden = false
+//            self.zhengshuNoDescTitleLabel.isHidden = true
+//            self.zhengshuNoIconImgView.isHidden = true
+//
+//        }else{
+//            self.threeCollectionView.isHidden = true
+//            self.zhengshuNoDescTitleLabel.isHidden = false
+//            self.zhengshuNoIconImgView.isHidden = false
+//        }
+//    }
+    func setupNewUI(modelsArr:[CNLiveVitaeCertificatesModel]){
+        self.whiteView.subviews.forEach { view in
+            if view.tag >= 1000{
+                view.removeFromSuperview()
+            }
+        }
+        if modelsArr.count > 0{
+            //有 证书
+            //计算几行 ,1行3个
+            let totalHang:Int = modelsArr.count / 3
+            if totalHang == 0{
+                self.whiteView.height = CerHaveDataPreViewCellHeight
+            }else{
+                self.whiteView.height = CerHaveDataPreViewCellHeight+72+15+CGFloat(totalHang*115)
+            }
             self.zhengshuNoIconImgView.isHidden = true
-
+            self.zhengshuNoDescTitleLabel.isHidden = true
+            
+            for i in 0..<modelsArr.count {
+                let imgW:Float = Float((KSreenWidth-80-30)/3.0)
+                let imgH:Float = 101*imgW/85.0
+                let imgGap:Float = 20
+                let imgLeftGap:Float = 20
+                let lie = i%3
+                let hang = i/3
+                let imgView = UIImageView(frame: CGRect(x: CGFloat(imgLeftGap+(imgGap+imgW)*Float(lie)), y: CGFloat((imgH+10)*Float(hang))+125, width: CGFloat(imgW), height: CGFloat(imgH)))
+                imgView.contentMode = .scaleAspectFit
+                imgView.tag = 1000+i
+                let cerModel = modelsArr[i]//CNLiveVitaeCertificateModel
+//                let imgUrl = cerModel.img
+//                imgView.kf.setImage(with: URL(string: imgUrl))
+                if cerModel.status == 1{
+                    imgView.image = UIImage(named: "mine_jianli_cerBg_authed")
+                }else{
+                    imgView.image = UIImage(named: "mine_jianli_cerBg_unauthed")
+                }
+                imgView.clipsToBounds = true
+                imgView.layer.cornerRadius = 5
+                self.whiteView.addSubview(imgView)
+                
+                let titleX:Float = 15*imgW/85
+                let titleY:Float = 19*imgW/85
+                let titleW:Float = 55*imgW/85
+                let titleH:Float = 30
+                let titleLbl = UILabel()
+                titleLbl.frame = CGRect(x: CGFloat(titleX), y: CGFloat(titleY), width: CGFloat(titleW), height: CGFloat(titleH))
+                titleLbl.numberOfLines = 2
+                titleLbl.font = BoldFont_11
+                titleLbl.textColor = HexColor("#333333")
+                titleLbl.textAlignment = .center
+                imgView.addSubview(titleLbl)
+                titleLbl.text = cerModel.title
+            }
+             
         }else{
-            self.threeCollectionView.isHidden = true
-            self.zhengshuNoDescTitleLabel.isHidden = false
+            //没有 证书
+            self.whiteView.height = DefaultPreViewCellHeight
             self.zhengshuNoIconImgView.isHidden = false
+            self.zhengshuNoDescTitleLabel.isHidden = false
         }
     }
 }
@@ -10,8 +10,8 @@ import Kingfisher
 class CNLiveDigitalThreeCerCollectCell: UICollectionViewCell {
-    var _cerModel : CNLiveVitaeCertificateModel?
-    var cerModel : CNLiveVitaeCertificateModel? {
+    var _cerModel : CNLiveVitaeCertificatesModel?
+    var cerModel : CNLiveVitaeCertificatesModel? {
         get{
             _cerModel
         }
@@ -54,7 +54,7 @@ class CNLiveDigitalThreeCerCollectCell: UICollectionViewCell {
         fatalError("init(coder:) has not been implemented")
     }
-    func setupNewUI(model:CNLiveVitaeCertificateModel){
+    func setupNewUI(model:CNLiveVitaeCertificatesModel){
         if model.status == 1{
             self.iconImgView.image = UIImage(named: "mine_jianli_cerBg_authed")
         }else{
@@ -263,7 +263,7 @@ class CNLiveVitaeViewModel:NSObject{
                 if resp["errorCode"] as! Int == 0{
                     let dataDic = resp["data"] as! NSDictionary
                     let shopDetailModel =  newDictionaryToModel(dataDic as! [String : Any], CNLiveVitaeCertificateListModel.self) as! CNLiveVitaeCertificateListModel
-                    resultBlock(shopDetailModel.list ?? [CNLiveVitaeCertificateModel](),.success)
+                    resultBlock(shopDetailModel.list ?? [CNLiveVitaeCertificatesModel](),.success)
                 }else{
                     resultBlock(NSNull(),.failed)
                 }
@@ -8,37 +8,37 @@
 import Foundation
 class CNLiveVitaeCertificateListModel:BaseModel{
-    var list:[CNLiveVitaeCertificateModel]?
-}
-class CNLiveVitaeCertificateModel:BaseModel{
-    ///id
-    var id:String = ""
-    ///
-    var vsid:String = ""
-    ///
-    var img:String = ""
-    ///
-    var title:String = ""
-    ///
-    var uploadTime:String = ""
-    ///
-    var status:Int = 0//0审核中 1审核成功
-    ///
-    var number:String = ""
-    ///
-    var lv:String = ""
-    ///
-    var time:String = ""
-    ///
-    var organization:String = ""
-    ///
-    var validity:String = ""
-    
-    
-    //预览简历-关联认证时 判断 0未关联 1已关联 -1不可选中
-    var selectStatus: Int = 0//0未关联 1已关联 -1不可选中
-
+    var list:[CNLiveVitaeCertificatesModel]?
 }
+//class CNLiveVitaeCertificateModel:BaseModel{
+//    ///id
+//    var id:String = ""
+//    ///
+//    var vsid:String = ""
+//    ///
+//    var img:String = ""
+//    ///
+//    var title:String = ""
+//    ///
+//    var uploadTime:String = ""
+//    ///
+//    var status:Int = 0//0审核中 1审核成功
+//    ///
+//    var number:String = ""
+//    ///
+//    var lv:String = ""
+//    ///
+//    var time:String = ""
+//    ///
+//    var organization:String = ""
+//    ///
+//    var validity:String = ""
+//    
+//    
+//    //预览简历-关联认证时 判断 0未关联 1已关联 -1不可选中
+//    var selectStatus: Int = 0//0未关联 1已关联 -1不可选中
+//
+//}
 /**
  {
          "id": 26,
@@ -113,6 +113,7 @@ class CNLiveVitaeWorksModel:BaseModel{
 }
+
 //简历证书模块
 class CNLiveVitaeCertificatesModel:BaseModel{
     ///
@@ -137,6 +138,10 @@ class CNLiveVitaeCertificatesModel:BaseModel{
     var organization:String = ""
     ///
     var validity:String = ""
+    
+    //预览简历-关联认证时 判断 0未关联 1已关联 -1不可选中
+    var selectStatus: Int = 0//0未
+
 }
 //简历奖模块