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

// 方案

parent 4929e229
...@@ -82,7 +82,7 @@ class YHComprehensiveEvaluationCell: UITableViewCell { ...@@ -82,7 +82,7 @@ class YHComprehensiveEvaluationCell: UITableViewCell {
let bb: ASAttributedString = .init("最新适用的申请资格门槛:符合12项评核准备的其中6个。\n", .font(UIFont.PFSC_B(ofSize: 14)),.foreground(UIColor.init(hex: 0xD48638))) let bb: ASAttributedString = .init("最新适用的申请资格门槛:符合12项评核准备的其中6个。\n", .font(UIFont.PFSC_B(ofSize: 14)),.foreground(UIColor.init(hex: 0xD48638)))
let cc: ASAttributedString = .init(" 经初步评估,", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor)) let cc: ASAttributedString = .init(" 经初步评估,", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor))
let dd: ASAttributedString = .init("您目前符合【优秀人才入境计划 - 综合计分制】的以下甄选条件!", .font(UIFont.PFSC_B(ofSize: 14)),.foreground(UIColor.init(hex: 0xD48638))) let dd: ASAttributedString = .init("您目前符合【优秀人才入境计划 - 综合计分制】的以下甄选条件!", .font(UIFont.PFSC_B(ofSize: 14)),.foreground(UIColor.mainTextColor))
let ee: ASAttributedString = .init("考虑到您目前已经具备的良好基础,建议您进一步孵化其他条件。", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor)) let ee: ASAttributedString = .init("考虑到您目前已经具备的良好基础,建议您进一步孵化其他条件。", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor))
return aa+bb+cc+dd+ee return aa+bb+cc+dd+ee
......
...@@ -61,7 +61,7 @@ class YHChildPrimaryInfoVC: YHBaseViewController, YHFamilyMemberProtol { ...@@ -61,7 +61,7 @@ class YHChildPrimaryInfoVC: YHBaseViewController, YHFamilyMemberProtol {
isFollowCanEdit = !child.is18YearsOld() isFollowCanEdit = !child.is18YearsOld()
// 随行 // 随行
let title0 = YHFormTitleItem(type: .accompany) let title0 = YHFormTitleItem(type: .E)
let item00 = YHFormDetailItem(type: .ownCustody, value:String(child.isOwnCustody())) let item00 = YHFormDetailItem(type: .ownCustody, value:String(child.isOwnCustody()))
let item01 = YHFormDetailItem(type: .birthday, value:child.birthday, tips:"请选择出生日期".local) let item01 = YHFormDetailItem(type: .birthday, value:child.birthday, tips:"请选择出生日期".local)
let item02 = YHFormDetailItem(type: .isAccompanyToHK, value:String(child.isFollow())) let item02 = YHFormDetailItem(type: .isAccompanyToHK, value:String(child.isFollow()))
......
...@@ -60,7 +60,7 @@ class YHSpousePrimaryInfoVC: YHBaseViewController, YHFamilyMemberProtol { ...@@ -60,7 +60,7 @@ class YHSpousePrimaryInfoVC: YHBaseViewController, YHFamilyMemberProtol {
items.removeAll() items.removeAll()
// 随行 // 随行
let title0 = YHFormTitleItem(type: .accompany) let title0 = YHFormTitleItem(type: .E)
let item0 = YHFormDetailItem(type: .isAccompanyToHK) let item0 = YHFormDetailItem(type: .isAccompanyToHK)
item0.value = String(spouse.isFollow()) item0.value = String(spouse.isFollow())
let arr0:[YHFormItemProtocol] = [title0, item0] let arr0:[YHFormItemProtocol] = [title0, item0]
......
...@@ -22,9 +22,7 @@ enum YHFormTitleItemType:Int, CaseIterable { ...@@ -22,9 +22,7 @@ enum YHFormTitleItemType:Int, CaseIterable {
case B case B
case C case C
case D case D
case E
// 随行
case accompany
// 国籍 // 国籍
case nationality case nationality
// 居住信息 // 居住信息
...@@ -257,7 +255,7 @@ class YHFormTitleItem : YHFormItemProtocol { ...@@ -257,7 +255,7 @@ class YHFormTitleItem : YHFormItemProtocol {
return "兄弟姐妹".local return "兄弟姐妹".local
case .C: case .C:
return "子女".local return "子女".local
case .accompany: case .E:
return "随行".local return "随行".local
case .nationality: case .nationality:
return "国籍".local return "国籍".local
...@@ -319,7 +317,7 @@ class YHFormTitleItem : YHFormItemProtocol { ...@@ -319,7 +317,7 @@ class YHFormTitleItem : YHFormItemProtocol {
return "".local return "".local
case .isPreviousMarriageChild: case .isPreviousMarriageChild:
return "".local return "".local
case .accompany: case .E:
return "".local return "".local
case .nationality: case .nationality:
return "".local return "".local
......
...@@ -59,7 +59,7 @@ class YHGCChildPrimaryInfoVC: YHBaseViewController, YHFamilyMemberProtol { ...@@ -59,7 +59,7 @@ class YHGCChildPrimaryInfoVC: YHBaseViewController, YHFamilyMemberProtol {
isFollowCanEdit = !child.is18YearsOld() isFollowCanEdit = !child.is18YearsOld()
// 随行 // 随行
let title0 = YHFormTitleItem(type: .accompany) let title0 = YHFormTitleItem(type: .E)
let item00 = YHFormDetailItem(type: .ownCustody, value:String(child.isOwnCustody())) let item00 = YHFormDetailItem(type: .ownCustody, value:String(child.isOwnCustody()))
let item01 = YHFormDetailItem(type: .birthday, value:child.birthday, tips:"请选择出生日期".local) let item01 = YHFormDetailItem(type: .birthday, value:child.birthday, tips:"请选择出生日期".local)
let item02 = YHFormDetailItem(type: .isAccompanyToHK, value:String(child.isFollow())) let item02 = YHFormDetailItem(type: .isAccompanyToHK, value:String(child.isFollow()))
......
...@@ -60,7 +60,7 @@ class YHGCSpousePrimaryInfoVC: YHBaseViewController, YHFamilyMemberProtol { ...@@ -60,7 +60,7 @@ class YHGCSpousePrimaryInfoVC: YHBaseViewController, YHFamilyMemberProtol {
items.removeAll() items.removeAll()
// 随行 // 随行
let title0 = YHFormTitleItem(type: .accompany) let title0 = YHFormTitleItem(type: .E)
let item0 = YHFormDetailItem(type: .isAccompanyToHK) let item0 = YHFormDetailItem(type: .isAccompanyToHK)
item0.value = String(spouse.isFollow()) item0.value = String(spouse.isFollow())
let arr0:[YHFormItemProtocol] = [title0, item0] let arr0:[YHFormItemProtocol] = [title0, item0]
......
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