Commit 0c068f7c authored by Steven杜宇's avatar Steven杜宇

// 赴港

parent 0273fe03
...@@ -194,6 +194,7 @@ class YHCertificateAppointViewController: YHBaseViewController { ...@@ -194,6 +194,7 @@ class YHCertificateAppointViewController: YHBaseViewController {
if self.isAllMembersGo { // 申请人统一赴港激活签证 if self.isAllMembersGo { // 申请人统一赴港激活签证
if self.waitAppointMembers.count > 0 {
let item5 = YHAppointItem(type: .confirmGoHKInfo) let item5 = YHAppointItem(type: .confirmGoHKInfo)
item5.itemIndex = 0 item5.itemIndex = 0
let group1 = YHSelectGroupMemberModel() let group1 = YHSelectGroupMemberModel()
...@@ -207,8 +208,11 @@ class YHCertificateAppointViewController: YHBaseViewController { ...@@ -207,8 +208,11 @@ class YHCertificateAppointViewController: YHBaseViewController {
item5.placeList = self.viewModel.placeList item5.placeList = self.viewModel.placeList
item5.arrHkHolidays = self.viewModel.dataModelForHkHolidays?.legaldays ?? [] item5.arrHkHolidays = self.viewModel.dataModelForHkHolidays?.legaldays ?? []
selectMemberGroupArr.append(item5) selectMemberGroupArr.append(item5)
}
} else { // 申请人不是统一赴港激活签证 } else { // 申请人不是统一赴港激活签证
if self.waitAppointMembers.count > 0 {
let item6 = YHAppointItem(type: .confirmGoHKInfo) let item6 = YHAppointItem(type: .confirmGoHKInfo)
item6.itemIndex = 0 item6.itemIndex = 0
let group1 = YHSelectGroupMemberModel() let group1 = YHSelectGroupMemberModel()
...@@ -221,7 +225,7 @@ class YHCertificateAppointViewController: YHBaseViewController { ...@@ -221,7 +225,7 @@ class YHCertificateAppointViewController: YHBaseViewController {
item6.placeList = self.viewModel.placeList item6.placeList = self.viewModel.placeList
item6.arrHkHolidays = self.viewModel.dataModelForHkHolidays?.legaldays ?? [] item6.arrHkHolidays = self.viewModel.dataModelForHkHolidays?.legaldays ?? []
selectMemberGroupArr.append(item6) selectMemberGroupArr.append(item6)
}
} }
} else { // 有预约过的人员 } else { // 有预约过的人员
...@@ -284,6 +288,7 @@ class YHCertificateAppointViewController: YHBaseViewController { ...@@ -284,6 +288,7 @@ class YHCertificateAppointViewController: YHBaseViewController {
// 不显示底部按钮 // 不显示底部按钮
self.bottomStatus = .hidden self.bottomStatus = .hidden
} }
} else { // 有预约过 } else { // 有预约过
if waitAppointMembers.count <= 0 { // 全部都预约完了 if waitAppointMembers.count <= 0 { // 全部都预约完了
self.bottomStatus = .nextStepToPay self.bottomStatus = .nextStepToPay
...@@ -748,6 +753,11 @@ extension YHCertificateAppointViewController { ...@@ -748,6 +753,11 @@ extension YHCertificateAppointViewController {
func submitAppointInfo() { func submitAppointInfo() {
if self.waitAppointMembers.count <= 0 {
YHHUD.flash(message: "无赴港人员")
return
}
// 检测各批次是否有日期或办证地点未选择 // 检测各批次是否有日期或办证地点未选择
var isOK = true var isOK = true
for item in self.selectMemberGroupArr { for item in self.selectMemberGroupArr {
......
...@@ -338,7 +338,7 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource { ...@@ -338,7 +338,7 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
if true { if true {
let vc = YHCertificateAppointViewController() let vc = YHCertificateAppointViewController()
vc.orderId = 151085 vc.orderId = 151086
// 151296 // 151296
self.navigationController?.pushViewController(vc) self.navigationController?.pushViewController(vc)
return return
......
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