Skip to content

G
galaxy-iOS
Commit 13556cef authored by Steven杜宇's avatar Steven杜宇
Browse files
Options

// 旅行

parent 20f74502
Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 20 deletions
galaxy/galaxy/Classes/Base/C/YHBaseViewModel.swift
View file @ 13556cef
......@@ -65,7 +65,6 @@ class YHBaseViewModel {
callBackBlock(false, nil)
return
}
self.hkMacoCardOcrInfo = result
callBackBlock(true, nil)
} else {
let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
......@@ -88,14 +87,18 @@ class YHBaseViewModel {
let dic = json.data
guard let result = YHCardOcrModel.deserialize(dict:dic as? [AnyHashable: Any]) else {
callBackBlock(false, nil)
self.hkMacoCardOcrInfo = nil
return
}
self.hkMacoCardOcrInfo = result
callBackBlock(true, nil)
} else {
let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
self.hkMacoCardOcrInfo = nil
callBackBlock(false, error)
}
} failBlock: { err in
self.hkMacoCardOcrInfo = nil
callBackBlock(false,err)
}
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/TravelDocumentsPreparation(6 旅行证件准备)/C/YHTravelDocsPreparationDetailVC.swift
View file @ 13556cef
......@@ -169,24 +169,33 @@ class YHTravelDocsPreparationDetailVC: YHBaseViewController {
}
func checkInfo() -> Bool {
var hasError = false
for item in sectionItems {
if item.type == .certificate {
if item.cerDetailModel.img_front.isEmpty || item.cerDetailModel.img_back.isEmpty {
item.cerDetailModel.isNeedCheck = true
hasError = true
item.cerDetailModel.isNeedCheckCer = true
if item.cerDetailModel.type == 3 {
item.cerDetailModel.checkTips = "请上港澳通行证"
item.cerDetailModel.checkTips = "请上传港澳通行证"
}
self.tableView.reloadData()
return false
} else {
item.cerDetailModel.isNeedCheck = false
item.cerDetailModel.checkTips = ""
self.tableView.reloadData()
return true
}
if item.cerDetailModel.issue_start.isEmpty || item.cerDetailModel.issue_end.isEmpty {
hasError = true
item.cerDetailModel.isNeedCheckDate = true
}
if !hasError {
item.cerDetailModel.isNeedCheckCer = false
item.cerDetailModel.isNeedCheckDate = false
}
}
}
self.tableView.reloadData()
if hasError {
return false
}
return true
}
}
......@@ -285,6 +294,13 @@ extension YHTravelDocsPreparationDetailVC: UITableViewDelegate, UITableViewDataS
guard let self = self else { return }
self.tableView.reloadData()
}
cell.templateClick = {
// 证件类型 1-护照 2-中国旅行证 3-港澳通行证 4-存款证明 5-其他
[weak self] type in
guard let self = self else { return }
}
}
return cell
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/TravelDocumentsPreparation(6 旅行证件准备)/M/YHTravelDocsPreparationDetailModel.swift
View file @ 13556cef
......@@ -35,13 +35,15 @@ class YHTravelDocsPreparationDetailItemModel: SmartCodable {
var nationality : String = ""//国籍 1-中国 2-国外
// 自定义
var isNeedCheck: Bool = false
var isNeedCheckCer: Bool = false
var checkTips: String = ""
var isNeedShowRejectReason: Bool = false
var rejectReason: String = ""
var latest_validaty_date : String = ""
var isNeedCheckDate: Bool = false
required init() {
}
init(type: Int, order_id: Int, order_sn: String, img_back: String, img_front: String, status: Int, issue_start: String, issue_end: String, user_id: Int, user_type: String, remark: String, nationality: String) {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/TravelDocumentsPreparation(6 旅行证件准备)/V/YHTravelCertificateUploadCell.swift
View file @ 13556cef
......@@ -45,6 +45,9 @@ class YHTravelCertificateUploadCell: UITableViewCell {
var updateBlock: (()->())?
// type :Int 证件类型 1-护照 2-中国旅行证 3-港澳通行证 4-存款证明 5-其他
var templateClick: ((_ type:Int)->())?
lazy var whiteConentView: UIView = {
let view = UIView()
view.backgroundColor = .white
......@@ -146,6 +149,7 @@ class YHTravelCertificateUploadCell: UITableViewCell {
@objc func didTemplateBtnClicked() {
templateClick?(self.dataModel.type)
}
func updateArr(_ arr: [YHCertificateDateItem]) {
......@@ -163,6 +167,21 @@ class YHTravelCertificateUploadCell: UITableViewCell {
[weak self] in
guard let self = self else { return }
if item.id == .signDate || item.id == .deadDate {
YHDatePickView.show(type: .yyyymmdd) {
time in
if item.id == .signDate {
self.dataModel.issue_start = time
} else if item.id == .deadDate {
self.dataModel.issue_end = time
}
}
} else if item.id == .kind {
}
}
selectPanelContentView.addSubview(itemView)
itemView.snp.makeConstraints { make in
......@@ -207,7 +226,7 @@ class YHTravelCertificateUploadCell: UITableViewCell {
titleStr = mustTag + titleStr
}
if isShowTemplate {
title += template
titleStr += template
}
titleView.attributed.text = titleStr
......@@ -232,7 +251,7 @@ class YHTravelCertificateUploadCell: UITableViewCell {
}
}
let isShowCheck = (model.isNeedCheck && !model.checkTips.isEmpty)
let isShowCheck = (model.isNeedCheckCer && !model.checkTips.isEmpty)
unvalidLabel.snp.remakeConstraints { make in
make.top.equalTo(certificateFrontView.snp.bottom).offset(isShowCheck ? 8 : 0)
......@@ -266,8 +285,8 @@ class YHTravelCertificateUploadCell: UITableViewCell {
} else {
let item1 = YHCertificateDateItem(id: .signDate, title: "签发日期", value: model.issue_start, placeHolder: "请选择", errorTips: "请选择签发日期", isShowErrorTips: false)
let item2 = YHCertificateDateItem(id: .deadDate, title: "届满日期", value: model.issue_end, placeHolder: "请选择", errorTips: "请选择届满日期", isShowErrorTips: false)
let item1 = YHCertificateDateItem(id: .signDate, title: "签发日期", value: model.issue_start, placeHolder: "请选择", errorTips: "请选择签发日期", isShowErrorTips: self.dataModel.isNeedCheckDate && model.issue_start.isEmpty)
let item2 = YHCertificateDateItem(id: .deadDate, title: "届满日期", value: model.issue_end, placeHolder: "请选择", errorTips: "请选择届满日期", isShowErrorTips: self.dataModel.isNeedCheckDate && model.issue_end.isEmpty)
let arr:[YHCertificateDateItem] = [item1, item2]
updateArr(arr)
}
......@@ -372,13 +391,13 @@ extension YHTravelCertificateUploadCell {
self.viewModel.getHKCardInfoByOcr(url, isBack: isBack) { success, error in
YHHUD.hide()
if success {
if let tmpModel = self.viewModel.smallWhiteBarInfo {
self.dataModel.issue_start = tmpModel.start_time
self.dataModel.issue_end = tmpModel.end_time
if let tmpModel = self.viewModel.hkMacoCardOcrInfo {
self.dataModel.issue_start = tmpModel.term_begins
self.dataModel.issue_end = tmpModel.end_of_term
let latestDate = self.dataModel.latest_validaty_date
let isValid = self.compareDates(dateString1: latestDate, dateString2: tmpModel.end_time)
let isValid = self.compareDates(dateString1: latestDate, dateString2: tmpModel.end_of_term)
if !isValid {
self.dataModel.isNeedCheck = true
self.dataModel.isNeedCheckCer = true
self.dataModel.checkTips = "有效期不足，请核查文件"
}
self.updateBlock?()
......
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