Commit 78b5b13b3be481db5b404eb4fc57bc06358f7c29
1 parent
98b36984
* [x] 数字简历-关联证书-已关联的证书默认勾选
* [x] 数字简历页-官方认证cell 一行显示3个身份 * [x] 自我简介页-无法换行
Showing
4 changed files
with
13 additions
and
9 deletions
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/数字简历相关页面/CNLiveDigitalResumePreViewSelectRenzhengCerController.swift
| ... | ... | @@ -312,13 +312,16 @@ class CNLiveDigitalResumePreViewSelectRenzhengCerController:CNLiveBaseViewContro |
| 312 | 312 | for (_,mdl) in cerListArr.enumerated() { |
| 313 | 313 | let model = mdl |
| 314 | 314 | if cerMdl.id == model.id{ |
| 315 | - //已关联 | |
| 316 | - if cerMdl.status == 0{//审核中:不可关联 | |
| 317 | - cerMdl.selectStatus = -1 | |
| 318 | - }else{//审核成功:可关联 | |
| 319 | - cerMdl.selectStatus = 1 | |
| 320 | - } | |
| 315 | + | |
| 316 | + cerMdl.selectStatus = 1 | |
| 321 | 317 | guanlianNum = guanlianNum + 1 |
| 318 | +// //已关联 | |
| 319 | +// if cerMdl.status == 0{//审核中:不可关联 | |
| 320 | +// cerMdl.selectStatus = -1 | |
| 321 | +// }else{//审核成功:可关联 | |
| 322 | +// cerMdl.selectStatus = 1 | |
| 323 | +// } | |
| 324 | +// guanlianNum = guanlianNum + 1 | |
| 322 | 325 | }else{ |
| 323 | 326 | //未关联 |
| 324 | 327 | } | ... | ... |
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/我的简历cell/CNLiveDigitalResumePreViewSecCell.swift
| ... | ... | @@ -62,7 +62,7 @@ class CNLiveDigitalResumePreViewSecCell: UITableViewCell, UICollectionViewDelega |
| 62 | 62 | lazy var threeCollectionView: UICollectionView = { |
| 63 | 63 | let layout = UICollectionViewFlowLayout() |
| 64 | 64 | layout.itemSize = CGSizeMake(60, 60+3+17+14) |
| 65 | - layout.minimumLineSpacing = 22 | |
| 65 | + layout.minimumLineSpacing = (KSreenWidth-30-60*3-36)/2//22 | |
| 66 | 66 | layout.scrollDirection = .horizontal |
| 67 | 67 | let collectionView = UICollectionView(frame: .zero, collectionViewLayout: layout) |
| 68 | 68 | collectionView.delegate = self |
| ... | ... | @@ -169,7 +169,7 @@ class CNLiveDigitalResumePreViewSecCell: UITableViewCell, UICollectionViewDelega |
| 169 | 169 | } |
| 170 | 170 | |
| 171 | 171 | @objc func zhengshuBtnAction(){ |
| 172 | - //跳转 选择官方认证身份页面 | |
| 172 | + //跳转 选择证书页面 | |
| 173 | 173 | let vc = CNLiveDigitalResumePreViewSelectRenzhengCerController() |
| 174 | 174 | vc.renzhengCerType = .renzheng |
| 175 | 175 | vc.digitalListModels = self.digitalListModels | ... | ... |
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/我的简历cell/CNLiveDigitalResumePreviewThreeCell.swift
| ... | ... | @@ -163,6 +163,7 @@ class CNLiveDigitalResumePreviewThreeCell: UITableViewCell { |
| 163 | 163 | //跳转 选择证书页面 |
| 164 | 164 | let vc = CNLiveDigitalResumePreViewSelectRenzhengCerController() |
| 165 | 165 | vc.renzhengCerType = .cer |
| 166 | + vc.cerListModels = self.threeCerDataArray | |
| 166 | 167 | navigationViewController().pushViewController(vc, animated: true) |
| 167 | 168 | } |
| 168 | 169 | ... | ... |
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/数字资产cell/CNLiveDigitalSecCell.swift
| ... | ... | @@ -32,7 +32,7 @@ class CNLiveDigitalSecCell: UITableViewCell, UICollectionViewDelegate, UICollect |
| 32 | 32 | lazy var threeCollectionView: UICollectionView = { |
| 33 | 33 | let layout = UICollectionViewFlowLayout() |
| 34 | 34 | layout.itemSize = CGSizeMake(adapt_length(length: 60), adapt_length(length: 60+3+17)) |
| 35 | - layout.minimumLineSpacing = 22 | |
| 35 | + layout.minimumLineSpacing = (KSreenWidth-30-adapt_length(length: 60)*3-36)/2//22 | |
| 36 | 36 | layout.scrollDirection = .horizontal |
| 37 | 37 | let collectionView = UICollectionView(frame: .zero, collectionViewLayout: layout) |
| 38 | 38 | collectionView.delegate = self | ... | ... |