Commit 172e1c66 authored by Steven杜宇's avatar Steven杜宇

// 默认值错误

parent 3795bad5
...@@ -74,6 +74,10 @@ class YHCertificateInfoCell: UITableViewCell { ...@@ -74,6 +74,10 @@ class YHCertificateInfoCell: UITableViewCell {
.foregroundColor: UIColor.labelTextColor2 .foregroundColor: UIColor.labelTextColor2
] ]
let attrString = NSMutableAttributedString(string: infoStr, attributes: attributes) let attrString = NSMutableAttributedString(string: infoStr, attributes: attributes)
let paragraphStyle = NSMutableParagraphStyle()
paragraphStyle.lineSpacing = 4.0 // 设置行间距为 8 点
attrString.addAttribute(.paragraphStyle, value: paragraphStyle, range: NSRange(location: 0, length: infoStr.count))
infoLabel.attributedText = attrString infoLabel.attributedText = attrString
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))
......
...@@ -555,6 +555,7 @@ class YHFamilyMemberGroupInfo: SmartCodable { ...@@ -555,6 +555,7 @@ class YHFamilyMemberGroupInfo: SmartCodable {
_ = father?.checkDefaultValue() _ = father?.checkDefaultValue()
_ = mother?.checkDefaultValue() _ = mother?.checkDefaultValue()
_ = spouse?.checkDefaultValue() _ = spouse?.checkDefaultValue()
if let child = child { if let child = child {
for item in child { for item in child {
_ = item.checkDefaultValue() _ = item.checkDefaultValue()
...@@ -659,13 +660,19 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol { ...@@ -659,13 +660,19 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
} }
if follow != 1 && follow != 2 { // 默认随行 if follow != 1 && follow != 2 { // 默认随行
if self.relationType == .father || self.relationType == .mother || self.relationType == .brother {
follow = 0
} else {
follow = 1 follow = 1
} }
}
if isLiveOverseaYear != 1 && isLiveOverseaYear != 2 { // 默认在海外未居住满一年以上 if isLiveOverseaYear != 1 && isLiveOverseaYear != 2 { // 默认在海外未居住满一年以上
isLiveOverseaYear = 2 isLiveOverseaYear = 2
} }
return self return self
} }
......
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