Skip to content

G
galaxy-iOS
Commit b2df442e authored by David黄金龙's avatar David黄金龙
Browse files
Options

1、其他资料的展示问题 

2、另一个文案展示的问题
parent 924debce
Hide whitespace changes
Inline Side-by-side
Showing with 57 additions and 12 deletions
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MyScore(我的评分)/V/YHScoreOptionsView.swift
View file @ b2df442e
......@@ -60,6 +60,8 @@ class YHScoreOptionsView: UIView {
private extension YHScoreOptionsView {
func setupUI() {
backgroundColor = .white
addSubview(bottomLine)
bottomLine.snp.makeConstraints { make in
make.bottom.left.right.equalToSuperview()
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/OtherInformation(其他信息)/M/YHOtherInfoFillModel.swift
View file @ b2df442e
......@@ -52,6 +52,7 @@ class LanguageDetail : SmartCodable {
var levelDes : String = ""
var name: String = ""
var remark: String = ""
var localRemark : String = ""
//以下为本地使用的参数
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/OtherInformation(其他信息)/V/YHOtherInfoFillCell.swift
View file @ b2df442e
......@@ -385,7 +385,7 @@ extension YHOtherInfoFillCell {
//7、其他奖励
let fzView7 = YHOtherTextViewItemView(frame: .zero)
fzView7.updateUI(title: "7、其他奖励", value: dataModel.question?.other_information ?? "",type: .otherAwards)
fzView7.updateUI(title: "7、其他资料", value: dataModel.question?.other_information ?? "",type: .otherAwards)
fzView7.block = { txt in
dataModel.question?.other_information = txt
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/VM/YHPreviewViewModel.swift
View file @ b2df442e
......@@ -692,7 +692,12 @@ private extension YHPreviewViewModel {
//语言能力
if let model = otherInfoPreviewModel?.language {
let tmp0 = YHPreviewQuestionAndAnswerModel(question: model.levelDes, answer: model.remark)
var title = ""
if model.level == 4 {
title = model.name.defaultStringIfEmpty() + "\n" + model.remark.defaultStringIfEmpty()
}
let tmp0 = YHPreviewQuestionAndAnswerModel(question: model.levelDes, answer: model.localRemark,remark: title)
let arr = [tmp0]
let model1 = YHPreviewInfoSessionModel(cellType: .questionAndAnswer, cellTitle: "语言能力", cellData0: arr)
arrDataForOtherInfo.append(model1)
......@@ -739,7 +744,7 @@ private extension YHPreviewViewModel {
if target == item["id"] {
language.levelDes = item["title"] ?? "--"
language.remark = item["dec"] ?? "--"
language.localRemark = item["dec"] ?? "--"
break
}
}
......@@ -1212,7 +1217,7 @@ private extension YHPreviewViewModel {
installDataForSpouseOp(model: model)
}
private func installDataForChildOp(model : YHFamilyMember,childIndex : Int) {
private func installDataForChildOp(model : YHFamilyMember,childIndex : Int, totalChild : Int = 0) {
var arrTemp : [YHPreviewInfoSessionModel] = []
do {
if model.follow != 1 {
......@@ -1221,7 +1226,13 @@ private extension YHPreviewViewModel {
let tmp0 = YHPreviewQuestionAndAnswerModel(question: "是否随行至香港：", answer: "否")
let arr = [tmp0]
let model1 = YHPreviewInfoSessionModel(cellType: .countryInfoType, cellTitle: "随行信息" + String(childIndex + 1), cellData0: arr)
var title = ""
if totalChild > 1 {
title = String(childIndex + 1)
}
let model1 = YHPreviewInfoSessionModel(cellType: .countryInfoType, cellTitle: "随行信息" + title, cellData0: arr)
arrTemp.append(model1)
}
......@@ -1265,7 +1276,12 @@ private extension YHPreviewViewModel {
arr.append(tmp5)
}
let model1 = YHPreviewInfoSessionModel(cellType: .countryInfoType, cellTitle: "子女信息" + String(childIndex + 1), cellData0: arr)
var title = ""
if totalChild > 1 {
title = String(childIndex + 1)
}
let model1 = YHPreviewInfoSessionModel(cellType: .countryInfoType, cellTitle: "子女信息" + title, cellData0: arr)
arrTemp.append(model1)
}
......@@ -1277,7 +1293,12 @@ private extension YHPreviewViewModel {
let tmp1 = YHPreviewQuestionAndAnswerModel(question: "国家/国籍：", answer: model.nationality)
let tmp2 = YHPreviewQuestionAndAnswerModel(question: "港澳通行证：", answer: model.isHandled == 1 ? "已办理" : "未办理")
let arr = [tmp00,tmp0,tmp1,tmp2]
let model1 = YHPreviewInfoSessionModel(cellType: .countryInfoType, cellTitle: "随行信息" + String(childIndex + 1), cellData0: arr)
var title = ""
if totalChild > 1 {
title = String(childIndex + 1)
}
let model1 = YHPreviewInfoSessionModel(cellType: .countryInfoType, cellTitle: "随行信息" + title, cellData0: arr)
arrTemp.append(model1)
}
......@@ -1389,7 +1410,13 @@ private extension YHPreviewViewModel {
let tmp16 = YHPreviewQuestionAndAnswerModel(question: "是否办理过香港身份证：", answer: "否")
arr.append(tmp16)
}
let model2 = YHPreviewInfoSessionModel(cellType: .countryInfoType, cellTitle: "子女信息" + String(childIndex + 1), cellData0: arr)
var title = ""
if totalChild > 1 {
title = String(childIndex + 1)
}
let model2 = YHPreviewInfoSessionModel(cellType: .countryInfoType, cellTitle: "子女信息" + title, cellData0: arr)
arrTemp.append(model2)
}
}
......@@ -1474,7 +1501,12 @@ private extension YHPreviewViewModel {
arr.append(model2)
}
let model3 = YHPreviewInfoSessionModel(cellType: .idCardInfoType, cellTitle: "证件信息" + String(childIndex + 1), cellData1: arr)
var title = ""
if totalChild > 1 {
title = String(childIndex + 1)
}
let model3 = YHPreviewInfoSessionModel(cellType: .idCardInfoType, cellTitle: "证件信息" + title, cellData1: arr)
arrTemp.append(model3)
}
......@@ -1493,7 +1525,12 @@ private extension YHPreviewViewModel {
arr.append(model2)
}
let model4 = YHPreviewInfoSessionModel(cellType: .idPictureType, cellTitle: "证件照片" + String(childIndex + 1), cellData2: arr)
var title = ""
if totalChild > 1 {
title = String(childIndex + 1)
}
let model4 = YHPreviewInfoSessionModel(cellType: .idPictureType, cellTitle: "证件照片" + title, cellData2: arr)
arrTemp.append(model4)
}
}
......@@ -1508,7 +1545,7 @@ private extension YHPreviewViewModel {
}
arrDataForChildren.removeAll()
for(index,model) in model1.enumerated() {
installDataForChildOp(model: model, childIndex:index)
installDataForChildOp(model: model, childIndex:index,totalChild: model1.count)
}
}
......
galaxy/galaxy/Classes/Modules/Login(登录)/C/YHPhoneLoginViewController.swift
View file @ b2df442e
......@@ -9,7 +9,7 @@
import UIKit
class YHPhoneLoginViewController: YHBaseViewController {
var bgImageView: UIImageView!
var closeButton: UIButton!
var logImageView: UIImageView!
......@@ -186,6 +186,11 @@ class YHPhoneLoginViewController: YHBaseViewController {
self.navigationController?.pushViewController(vc)
} else {
YHHUD.flash(message: error?.errorMsg ?? "")
#if DEBUG
let vc = YHCodeSueecssViewController()
vc.phoneNumber = self.phoneMessageView.phoneTextField.text
self.navigationController?.pushViewController(vc)
#endif
}
})
} else {
......
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