* [x] 数字简历页面-证书列表页-本人承诺底部icon没有

* [x] 获奖情况-删除成功没有刷新 * [x] 数字简历页面-默认进入-姓名和性别刚开始重叠 * [x] 数字简历页面-默认进入-设置经验后才会显示 * [x] 数字简历页面-默认进入-设置没有输入手机号,开关不展示手机号但是简历页面显示手机号

* [x] 数字简历页面-证书列表页-本人承诺底部icon没有
* [x] 获奖情况-删除成功没有刷新 * [x] 数字简历页面-默认进入-姓名和性别刚开始重叠 * [x] 数字简历页面-默认进入-设置经验后才会显示 * [x] 数字简历页面-默认进入-设置没有输入手机号,开关不展示手机号但是简历页面显示手机号
“张旭”
1 parent a57fb0db
Showing 5 changed files with 26 additions and 6 deletions
metaCode/Classes/Common/Util/CNLiveCommonQiniuTool.swift
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/证书相关页面/CNLiveVitaeVocationalCertificateController.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/DigitalResume/CNLiveDigitalResumeCell.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/Vitae/Certificate/CNLiveVocationalCertificateFirCell.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/Vitae/Work/CNLiveVitaeWorkCell.swift
@@ -8,6 +8,7 @@
 import Foundation
 import Qiniu
 import CNLiveRequestBastKit
+import CNLiveBaseTools
 typealias ProgressBlcok = (_ key: String,_ percent: CGFloat) -> Void
 typealias SuccessBlock = (_ key: String,_ url: String) -> Void
@@ -116,6 +117,8 @@ class UploadManager: NSObject {
         param.setValue("POST", forKey: "verb")
         param.setValue("2", forKey: "storageType")
         param.setValue(kBucketName_QN, forKey: "bucket")
+        param.setValue("\(CNLiveTimeTools.getNow10NumTimestamp())", forKey: "timestamp")
+        
         let custom_param = NSMutableDictionary()
         custom_param.setValue("802_li40qhp922", forKey: "appId")//CNLiveMCEnvironmentManager.shared.appId
         custom_param.setValue("ae3a7ad3e4b9beb7cfe2078db648ebb89aa249ca2e82ac", forKey: "appKey")//CNLiveMCEnvironmentManager.shared.appKey
@@ -104,7 +104,7 @@ class CNLiveVitaeVocationalCertificateController:CNLiveBaseViewController,UITabl
     }
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        return adapt_length(length: 277)+346
+        return adapt_length(length: 277)+326
     }
@@ -422,14 +422,15 @@ class CNLiveDigitalResumeCell: UITableViewCell {
         self.whiteBgView.addSubview(self.phoneTitleLabel)
         let (gender, age) = self.extractGenderAndAge(fromIDCardNumber: UserInfoManager.shared.userInfo.currentUser?.idNo ?? "")
         let ageStr = String(format: "%d", age ?? 0)
-        self.phoneTitleLabel.text = gender+" | "+ageStr+"岁"+" | "+UserInfoManager.shared.userInfo.mobile
+        self.phoneTitleLabel.text = gender+" | "+ageStr+"岁"//+" | "+UserInfoManager.shared.userInfo.mobile
         self.phoneTitleLabel.sizeToFit()
         self.phoneTitleLabel.snp.makeConstraints { make in
             make.left.equalTo(15)
-            make.top.equalTo(self.jianliIconBgView.snp.bottom).offset(1)
+            make.top.equalTo(self.authNameTitleLabel.snp.bottom).offset(adapt_length(length: 8))
             make.width.equalTo(self.phoneTitleLabel.size.width)
             make.height.equalTo(self.phoneTitleLabel.size.height)
         }
+
         self.whiteBgView.addSubview(self.weizhiTitleLabel)
         self.weizhiTitleLabel.snp.makeConstraints { make in
@@ -167,7 +167,6 @@ class CNLiveVocationalCertificateFirCell: UITableViewCell, UICollectionViewDataS
     lazy var authGuanfangIconImgView :UIImageView = {
         let iconImgView = UIImageView()
         iconImgView.image = UIImage(named: "mine_jianli_guanfnagAuth")
-        iconImgView.isHidden = true
         return iconImgView
     }()
@@ -285,6 +284,8 @@ class CNLiveVocationalCertificateFirCell: UITableViewCell, UICollectionViewDataS
         self.authGuanfangIconImgView.snp.makeConstraints { make in
             make.bottom.equalToSuperview().offset(-20)
             make.left.equalTo(15)
+            make.width.equalTo(83)
+            make.height.equalTo(16)
         }
     }
@@ -310,7 +311,22 @@ class CNLiveVocationalCertificateFirCell: UITableViewCell, UICollectionViewDataS
         }
         self.cerStatusDetailTitleLabel.text =  isAuthed ? "已验证" : "未验证"
         self.authIconImgView.isHidden =  isAuthed ? false : true
-        self.authGuanfangIconImgView.isHidden =  isAuthed ? false : true
+        self.authGuanfangIconImgView.image = isAuthed ? UIImage(named: "mine_jianli_guanfnagAuth") : UIImage(named: "mine_jianli_zhenshi")
+        if isAuthed{
+            self.authGuanfangIconImgView.snp.remakeConstraints { make in
+                make.bottom.equalToSuperview().offset(-20)
+                make.left.equalTo(15)
+                make.width.equalTo(68)
+                make.height.equalTo(19)
+            }
+        }else{
+            self.authGuanfangIconImgView.snp.remakeConstraints { make in
+                make.bottom.equalToSuperview().offset(-20)
+                make.left.equalTo(15)
+                make.width.equalTo(83)
+                make.height.equalTo(16)
+            }
+        }
     }
     func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
@@ -636,7 +636,7 @@ class CNLiveVitaeWorkCell: UITableViewCell{
         }else{
             type = "5"
             id = self.awardModel?.id ?? ""
-            vsid = self.workModel?.vsid ?? ""
+            vsid = self.awardModel?.vsid ?? ""
         }
         CNLiveVitaeViewModel.deleteVitae(id: id, vsid: vsid, type: type) { result, status in
             if status == .success{