Commit 0872481f authored by David黄金龙's avatar David黄金龙

Merge branch 'qmas-1130' into yinhe-live-1212

parents 41a6625f b8365805
......@@ -61,6 +61,8 @@ class YHHKPlanItemView: UIView {
let view = UILabel()
view.text = "所属专业名称(如有):资深数据科学家"
view.font = UIFont.PFSC_R(ofSize: 14)
view.numberOfLines = 0
view.lineBreakMode = .byWordWrapping
view.textColor = .init(hex: 0x6D788A)
return view
}()
......@@ -160,7 +162,7 @@ private extension YHHKPlanItemView {
iconImageV.snp.makeConstraints { make in
make.left.equalTo(nameLable.snp.right).offset(4)
make.centerY.equalTo(nameLable)
make.height.width.equalTo(16)
make.height.width.equalTo(18)
}
iconImageV.isHidden = true
......
......@@ -174,9 +174,10 @@ extension YHImproveSchemeTemplateListView : UITableViewDelegate, UITableViewData
vc.url = model.url
vc.isFullScreenFlag = false
UIViewController.current?.navigationController?.pushViewController(vc)
self.dismiss()
}
}
self.dismiss()
}
return cell
}
......
......@@ -577,8 +577,11 @@ private extension YHPreviewViewModel {
do {
//国家信息
let tmp0 = YHPreviewQuestionAndAnswerModel(question: "国家/国籍:", answer: model.nationality)
let tmp1 = YHPreviewQuestionAndAnswerModel(question: "港澳通行证:", answer: model.is_handled == 0 ? "未办理" : "已办理")
let arr = [tmp0,tmp1]
var arr = [tmp0]
if model.nationality.contains("中国") {
let tmp1 = YHPreviewQuestionAndAnswerModel(question: "港澳通行证:", answer: model.is_handled == 0 ? "未办理" : "已办理")
arr.append(tmp1)
}
let model1 = YHPreviewInfoSessionModel(cellType: .countryInfoType, cellTitle: "国籍信息", cellData0: arr)
arrDataForMainApplicationInfo.append(model1)
}
......
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