Commit ce91365ab101db5928b841457cbfa6707cd561f6
1 parent
0aa68377
预览简历页管理证书和获奖 跳转工作记录列表页面 , 获奖情况列表页
Showing
3 changed files
with
26 additions
and
7 deletions
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/数字简历相关页面/CNLiveDigitalResumeController.swift
| @@ -78,7 +78,7 @@ class CNLiveDigitalResumeController:CNLiveBaseViewController,UITableViewDataSour | @@ -78,7 +78,7 @@ class CNLiveDigitalResumeController:CNLiveBaseViewController,UITableViewDataSour | ||
| 78 | navigationBarHidden = false | 78 | navigationBarHidden = false |
| 79 | self.view.backgroundColor = HexColor("#F5F6FB") | 79 | self.view.backgroundColor = HexColor("#F5F6FB") |
| 80 | 80 | ||
| 81 | -// self.rightNavBtns = [self.moreNavBtn] | 81 | + self.rightNavBtns = [self.moreNavBtn] |
| 82 | 82 | ||
| 83 | self.view.addSubview(self.tableView) | 83 | self.view.addSubview(self.tableView) |
| 84 | self.tableView.snp.makeConstraints { make in | 84 | self.tableView.snp.makeConstraints { make in |
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/数字简历相关页面/CNLiveDigitalResumePreViewController.swift
| @@ -97,6 +97,15 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD | @@ -97,6 +97,15 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD | ||
| 97 | tableView.backgroundColor = .clear | 97 | tableView.backgroundColor = .clear |
| 98 | return tableView | 98 | return tableView |
| 99 | }() | 99 | }() |
| 100 | + lazy var moreNavBtn: UIButton = { | ||
| 101 | + let moreNavBtn = UIButton(type: .custom) | ||
| 102 | + moreNavBtn.frame = CGRect(x: 0, y: KStatusBarHeight, width: KNavigationHeight-KStatusBarHeight, height: KNavigationHeight-KStatusBarHeight) | ||
| 103 | + moreNavBtn.backgroundColor = .clear | ||
| 104 | + moreNavBtn.setImage(UIImage(named: "web_more"), for: .normal) | ||
| 105 | + moreNavBtn.addTarget(self, action: #selector(moreNavBtnAction), for: .touchUpInside) | ||
| 106 | + return moreNavBtn | ||
| 107 | + }() | ||
| 108 | + | ||
| 100 | lazy var bottomZhiNanWhiteView :UIView = { | 109 | lazy var bottomZhiNanWhiteView :UIView = { |
| 101 | let bottomNavView = UIView() | 110 | let bottomNavView = UIView() |
| 102 | bottomNavView.backgroundColor = .white | 111 | bottomNavView.backgroundColor = .white |
| @@ -133,6 +142,8 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD | @@ -133,6 +142,8 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD | ||
| 133 | navigationBarHidden = false | 142 | navigationBarHidden = false |
| 134 | self.view.backgroundColor = HexColor("#F5F6FB") | 143 | self.view.backgroundColor = HexColor("#F5F6FB") |
| 135 | 144 | ||
| 145 | + self.rightNavBtns = [self.moreNavBtn] | ||
| 146 | + | ||
| 136 | self.view.addSubview(self.bgImgView) | 147 | self.view.addSubview(self.bgImgView) |
| 137 | self.bgImgView.snp.makeConstraints { make in | 148 | self.bgImgView.snp.makeConstraints { make in |
| 138 | make.top.equalTo(KNavigationHeight) | 149 | make.top.equalTo(KNavigationHeight) |
| @@ -349,12 +360,16 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD | @@ -349,12 +360,16 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD | ||
| 349 | } | 360 | } |
| 350 | 361 | ||
| 351 | @objc func settingBtnAction(){ | 362 | @objc func settingBtnAction(){ |
| 352 | - | 363 | + let vc = CNLiveDigitalResumeInfoController() |
| 364 | + currentViewController()?.navigationController?.pushViewController(vc, animated: true) | ||
| 353 | } | 365 | } |
| 354 | @objc func previewBtnAction(){ | 366 | @objc func previewBtnAction(){ |
| 355 | 367 | ||
| 356 | } | 368 | } |
| 357 | 369 | ||
| 370 | + @objc func moreNavBtnAction(){ | ||
| 371 | + print("moreNavBtnAction") | ||
| 372 | + } | ||
| 358 | 373 | ||
| 359 | // MARK: - 获取证书数量 | 374 | // MARK: - 获取证书数量 |
| 360 | func getCetList(){ | 375 | func getCetList(){ |
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/我的简历cell/CNLiveDigitalResumePreviewFourCell.swift
| @@ -178,7 +178,7 @@ class CNLiveDigitalResumePreviewFourCell: UITableViewCell { | @@ -178,7 +178,7 @@ class CNLiveDigitalResumePreviewFourCell: UITableViewCell { | ||
| 178 | 178 | ||
| 179 | lazy var zhengshuBtn: UIButton = { | 179 | lazy var zhengshuBtn: UIButton = { |
| 180 | let closeBtn = UIButton(type: .custom) | 180 | let closeBtn = UIButton(type: .custom) |
| 181 | - closeBtn.setTitle("关联工作", for: .normal) | 181 | + closeBtn.setTitle("管理工作记录", for: .normal) |
| 182 | closeBtn.setTitleColor(HexColor("#1961FE"), for: .normal) | 182 | closeBtn.setTitleColor(HexColor("#1961FE"), for: .normal) |
| 183 | closeBtn.titleLabel?.font = BoldFont_14 | 183 | closeBtn.titleLabel?.font = BoldFont_14 |
| 184 | closeBtn.layer.borderColor = HexColor("#1961FE")?.cgColor | 184 | closeBtn.layer.borderColor = HexColor("#1961FE")?.cgColor |
| @@ -287,7 +287,7 @@ class CNLiveDigitalResumePreviewFourCell: UITableViewCell { | @@ -287,7 +287,7 @@ class CNLiveDigitalResumePreviewFourCell: UITableViewCell { | ||
| 287 | self.zhengshuBtn.snp.makeConstraints { make in | 287 | self.zhengshuBtn.snp.makeConstraints { make in |
| 288 | make.centerX.equalToSuperview() | 288 | make.centerX.equalToSuperview() |
| 289 | make.bottom.equalToSuperview().offset(-20) | 289 | make.bottom.equalToSuperview().offset(-20) |
| 290 | - make.width.equalTo(86) | 290 | + make.width.equalTo(110) |
| 291 | make.height.equalTo(34) | 291 | make.height.equalTo(34) |
| 292 | } | 292 | } |
| 293 | 293 | ||
| @@ -416,7 +416,7 @@ class CNLiveDigitalResumePreviewFourCell: UITableViewCell { | @@ -416,7 +416,7 @@ class CNLiveDigitalResumePreviewFourCell: UITableViewCell { | ||
| 416 | 416 | ||
| 417 | self.workDingWeiTitleLabel.isHidden = true | 417 | self.workDingWeiTitleLabel.isHidden = true |
| 418 | self.dingweiImgView.isHidden = true | 418 | self.dingweiImgView.isHidden = true |
| 419 | - self.zhengshuBtn.setTitle("关联获奖", for: .normal) | 419 | + self.zhengshuBtn.setTitle("管理获奖情况", for: .normal) |
| 420 | self.nameIconImgView.image = UIImage(named: "mine_jianli_preview_award") | 420 | self.nameIconImgView.image = UIImage(named: "mine_jianli_preview_award") |
| 421 | } | 421 | } |
| 422 | func setupNewUI(model:CNLiveVitaeWorksModel){ | 422 | func setupNewUI(model:CNLiveVitaeWorksModel){ |
| @@ -583,10 +583,14 @@ class CNLiveDigitalResumePreviewFourCell: UITableViewCell { | @@ -583,10 +583,14 @@ class CNLiveDigitalResumePreviewFourCell: UITableViewCell { | ||
| 583 | @objc func zhengshuBtnAction(){ | 583 | @objc func zhengshuBtnAction(){ |
| 584 | if self.workMdl != nil{ | 584 | if self.workMdl != nil{ |
| 585 | //跳转 选择工作记录页面 | 585 | //跳转 选择工作记录页面 |
| 586 | - | 586 | + let vc = CNLiveVitaeWorkDetailController() |
| 587 | + vc.workAwardType = .work | ||
| 588 | + navigationViewController().pushViewController(vc, animated: true) | ||
| 587 | }else if self.awardModel != nil{ | 589 | }else if self.awardModel != nil{ |
| 588 | //跳转 选择获奖情况页面 | 590 | //跳转 选择获奖情况页面 |
| 589 | - | 591 | + let vc = CNLiveVitaeWorkDetailController() |
| 592 | + vc.workAwardType = .award | ||
| 593 | + navigationViewController().pushViewController(vc, animated: true) | ||
| 590 | }else{ | 594 | }else{ |
| 591 | 595 | ||
| 592 | } | 596 | } |