Commit 2b984c03 authored by David黄金龙's avatar David黄金龙

处理2处bug

parent 05b22711
...@@ -88,7 +88,7 @@ class YHOtherInfoFillViewModel: YHBaseViewModel { ...@@ -88,7 +88,7 @@ class YHOtherInfoFillViewModel: YHBaseViewModel {
"highlight" : ""], "highlight" : ""],
["id" : 4, ["id" : 4,
"name" : "其他证", "name" : "其他证",
"select" : 0, "select" : 0,
"subname" : "(仅可尝试加分,此类文件加分以港府审批为准)", "subname" : "(仅可尝试加分,此类文件加分以港府审批为准)",
"highlight" : ""], "highlight" : ""],
...@@ -187,15 +187,15 @@ class YHOtherInfoFillViewModel: YHBaseViewModel { ...@@ -187,15 +187,15 @@ class YHOtherInfoFillViewModel: YHBaseViewModel {
"highlight" : ""], "highlight" : ""],
["id" : 4, ["id" : 4,
"name" : "其他证件", "name" : "该语言相关专业学位证 、 毕业证、 学位认证报告",
"select" : 0, "select" : 0,
"subname" : "该语言相关专业学位证 、 毕业证、 学位认证报告", "subname" : "",
"highlight" : ""], "highlight" : ""],
["id" : 5, ["id" : 5,
"name" : "其他证件", "name" : "官方语言成绩单",
"select" : 0, "select" : 0,
"subname" : "官方语言成绩单", "subname" : "",
"highlight" : ""], "highlight" : ""],
......
...@@ -970,13 +970,17 @@ private extension YHPreviewViewModel { ...@@ -970,13 +970,17 @@ private extension YHPreviewViewModel {
var findFirstFlag : Bool = false var findFirstFlag : Bool = false
for(i,t) in arrCompare.enumerated() { for(_,t) in arrCompare.enumerated() {
if t.id == firstID { if t.id == firstID {
firstName = t.name + (t.other_instructions.isEmpty ? "" : ("=" + t.other_instructions)) firstName = t.name + (t.other_instructions.isEmpty ? "" : ("=" + t.other_instructions))
findFirstFlag = true findFirstFlag = true
if t.id == 3 {
firstName = firstName + "-" + item.other_instructions
}
var findSecondFlag : Bool = false var findSecondFlag : Bool = false
for(ii,tt) in t.options.enumerated() { for(_,tt) in t.options.enumerated() {
if tt.id == secondID { if tt.id == secondID {
secondName = tt.name secondName = tt.name
findSecondFlag = true findSecondFlag = true
......
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