Commit e56616bd authored by Steven杜宇's avatar Steven杜宇

// 续签

parent 2eeb2175
...@@ -476,7 +476,8 @@ extension YHCertificateUploadSheetView: (UIImagePickerControllerDelegate & UINav ...@@ -476,7 +476,8 @@ extension YHCertificateUploadSheetView: (UIImagePickerControllerDelegate & UINav
if imageName.isEmpty { if imageName.isEmpty {
let timestamp = Date().timeIntervalSince1970 let timestamp = Date().timeIntervalSince1970
imageName = "\(timestamp).jpg" var timestampString = "\(timestamp)".replacingOccurrences(of: ".", with: "")
imageName = "\(timestampString).jpg"
} }
let item = YHSelectImageItem(name: imageName, data: image) let item = YHSelectImageItem(name: imageName, data: image)
......
...@@ -103,7 +103,9 @@ class YHResignMaterialCell: UITableViewCell { ...@@ -103,7 +103,9 @@ class YHResignMaterialCell: UITableViewCell {
var result:ASAttributedString = .init(string:"", .font(UIFont.PFSC_M(ofSize: 16)), .foreground(UIColor.mainTextColor)) var result:ASAttributedString = .init(string:"", .font(UIFont.PFSC_M(ofSize: 16)), .foreground(UIColor.mainTextColor))
let mustTag: ASAttributedString = .init("*", .font(UIFont.PFSC_M(ofSize: 16)),.foreground(UIColor.failColor)) let mustTag: ASAttributedString = .init("*", .font(UIFont.PFSC_M(ofSize: 16)),.foreground(UIColor.failColor))
let name = model.name var name = model.name.trimmingCharacters(in: .whitespaces)
name = name.replacingOccurrences(of: "\n", with: "")
name = name.replacingOccurrences(of: "\r", with: "")
let cerName: ASAttributedString = .init(string:name , .font(UIFont.PFSC_M(ofSize: 16)), .foreground(UIColor.mainTextColor)) let cerName: ASAttributedString = .init(string:name , .font(UIFont.PFSC_M(ofSize: 16)), .foreground(UIColor.mainTextColor))
let template: ASAttributedString = " \(.view(templateButton, .original(.center)))" let template: ASAttributedString = " \(.view(templateButton, .original(.center)))"
...@@ -114,7 +116,7 @@ class YHResignMaterialCell: UITableViewCell { ...@@ -114,7 +116,7 @@ class YHResignMaterialCell: UITableViewCell {
result += cerName result += cerName
// 是否展示右边的模版按钮 // 是否展示右边的模版按钮
var showTemplateBtn = true let showTemplateBtn = true
if showTemplateBtn { if showTemplateBtn {
result += template result += template
} }
...@@ -163,7 +165,7 @@ class YHResignMaterialCell: UITableViewCell { ...@@ -163,7 +165,7 @@ class YHResignMaterialCell: UITableViewCell {
nameTextView.snp.makeConstraints { make in nameTextView.snp.makeConstraints { make in
make.left.equalToSuperview().offset(20) make.left.equalToSuperview().offset(20)
make.top.equalToSuperview().offset(12) make.top.equalToSuperview().offset(12)
make.right.equalTo(statusLabel.snp.left).offset(-14) make.right.equalTo(statusLabel.snp.left).offset(-4)
make.bottom.equalTo(-12) make.bottom.equalTo(-12)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment