Skip to content

G
galaxy-iOS
Commit d9d7a12e authored by pete谢兆麟's avatar pete谢兆麟
Browse files
Options

Merge commit '7576d227' into xiezhaolin

parents 7af7826c 7576d227
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 236 additions and 110 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ d9d7a12e
......@@ -149,7 +149,6 @@
045EEEF82B9F171A0022A143 /* YHFormItemOnlyDoubleChoiceCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045EEE3F2B9F171A0022A143 /* YHFormItemOnlyDoubleChoiceCell.swift */; };
045EEEF92B9F171A0022A143 /* YHFormItemTitleCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045EEE402B9F171A0022A143 /* YHFormItemTitleCell.swift */; };
045EEEFA2B9F171A0022A143 /* YHFormPickerViewType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045EEE422B9F171A0022A143 /* YHFormPickerViewType.swift */; };
045EEEFB2B9F171A0022A143 /* YHFormPickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045EEE432B9F171A0022A143 /* YHFormPickerView.swift */; };
045EEEFC2B9F171A0022A143 /* YHSheetPickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045EEE442B9F171A0022A143 /* YHSheetPickerView.swift */; };
045EEEFD2B9F171A0022A143 /* YHSheetPickerViewType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045EEE452B9F171A0022A143 /* YHSheetPickerViewType.swift */; };
045EEEFE2B9F171A0022A143 /* YHFormItemInputTextCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045EEE462B9F171A0022A143 /* YHFormItemInputTextCell.swift */; };
......@@ -523,7 +522,6 @@
045EEE3F2B9F171A0022A143 /* YHFormItemOnlyDoubleChoiceCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHFormItemOnlyDoubleChoiceCell.swift; sourceTree = "<group>"; };
045EEE402B9F171A0022A143 /* YHFormItemTitleCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHFormItemTitleCell.swift; sourceTree = "<group>"; };
045EEE422B9F171A0022A143 /* YHFormPickerViewType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHFormPickerViewType.swift; sourceTree = "<group>"; };
045EEE432B9F171A0022A143 /* YHFormPickerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHFormPickerView.swift; sourceTree = "<group>"; };
045EEE442B9F171A0022A143 /* YHSheetPickerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHSheetPickerView.swift; sourceTree = "<group>"; };
045EEE452B9F171A0022A143 /* YHSheetPickerViewType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHSheetPickerViewType.swift; sourceTree = "<group>"; };
045EEE462B9F171A0022A143 /* YHFormItemInputTextCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHFormItemInputTextCell.swift; sourceTree = "<group>"; };
......@@ -1245,7 +1243,6 @@
isa = PBXGroup;
children = (
045EEE422B9F171A0022A143 /* YHFormPickerViewType.swift */,
045EEE432B9F171A0022A143 /* YHFormPickerView.swift */,
045EEE442B9F171A0022A143 /* YHSheetPickerView.swift */,
045EEE452B9F171A0022A143 /* YHSheetPickerViewType.swift */,
);
......@@ -2324,7 +2321,6 @@
045EEF152B9F171A0022A143 /* YHHKIDCardModel.swift in Sources */,
0477E17E2BA4362A00436346 /* YHCustomNavigationBar.swift in Sources */,
045EEEC42B9F171A0022A143 /* YHOtherInfoFillCell.swift in Sources */,
045EEEFB2B9F171A0022A143 /* YHFormPickerView.swift in Sources */,
045EEE9F2B9F171A0022A143 /* YHWorkExperienceModel.swift in Sources */,
045EEF232B9F171A0022A143 /* YHItemView.swift in Sources */,
04754A952B96FF3D00F8ADCA /* UITextField+Extension.swift in Sources */,
......@@ -2663,7 +2659,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1;
CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
......@@ -2705,7 +2701,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1;
CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceCenterSecondViewController.swift
View file @ d9d7a12e
......@@ -42,16 +42,24 @@ class YHServiceCenterSecondViewController: YHBaseViewController {
override func viewDidLoad() {
super.viewDidLoad()
setupUI()
loadData2()
loadData()
}
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
loadData2()
loadData()
}
}
extension YHServiceCenterSecondViewController {
func loadData2() {
guard let orderId = orderId else { return}
self.serviceCenterMainReqVM.getPersonInfoFillStep(params: ["orderId":orderId]) { success, error in
}
}
func loadData() {
guard let orderId = orderId else { return}
self.serviceCenterMainReqVM.getContactStatus(params: ["orderId":orderId]) { success, error in
......@@ -171,6 +179,11 @@ extension YHServiceCenterSecondViewController : UITableViewDelegate,UITableViewD
if model.type == 1 {
if self.serviceCenterMainReqVM.informationFillStepModel?.sweet_notify_status == 0 {
self.showTipsAlert()
return
}
let vc = YHInformationPerfectListVC()
vc.orderId = orderId
navigationController?.pushViewController(vc)
......@@ -202,3 +215,29 @@ extension YHServiceCenterSecondViewController : UITableViewDelegate,UITableViewD
}
}
}
private extension YHServiceCenterSecondViewController {
func showTipsAlert() {
YHInformationFillTipsAlertView.showCheckView { agree in
if agree == true {
printLog("点击了 确认 按钮")
self.submitSweetNotify()
} else {
printLog("点击了 取消 按钮")
}
}
}
func submitSweetNotify() {
let params = ["option":1,"order_id":orderId]
serviceCenterMainReqVM.submitSweetNotifyOp(params: params as [String : Any]) { success, error in
if success == true {
YHInformationFillTipsAlertView.hideCheckView()
} else {
YHHUD.flash(message: error?.errorMsg ?? "发生错误,请重试")
}
}
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/FileList(文件清单)/C/YHFileListViewController.swift
View file @ d9d7a12e
......@@ -119,7 +119,6 @@ extension YHFileListViewController {
make.left.equalTo(kMargin)
make.width.equalTo(KScreenWidth - 2*kMargin)
make.height.equalTo(1700) //for test hjl
// make.bottom.equalToSuperview().offset(-50)
}
let footLable = UILabel()
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/BaseInformation(基本资料)/V/YHBasicInfoFillCell.swift
View file @ d9d7a12e
......@@ -11,13 +11,6 @@ import UIKit
class YHBasicInfoFillCell: UITableViewCell {
static let cellReuseIdentifier = "YHBasicInfoFillCell"
// var arrData : [YHBasicInfoSessionModel]? {
// didSet {
// updateUI()
// }
// }
var dataModel: YHBasicInfoSessionModel? {
didSet {
updateUI()
......@@ -46,6 +39,10 @@ extension YHBasicInfoFillCell {
contentView.removeSubviews()
backgroundColor = .clear
contentView.backgroundColor = .clear
//主申请人
let holdView1 = UIView()
holdView1.backgroundColor = .white
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/Education&Qualification(学历专业资格填写)/C/YHEducationDetailVC.swift
View file @ d9d7a12e
......@@ -107,43 +107,35 @@ class YHEducationDetailVC: YHBaseViewController {
let title0 = YHFormTitleItem(type: .mainApplicantEducation)
let item00 = YHFormDetailItem(type: .universityFullName)
item00.placeHolder = "请选择学校".local
item00.tips = "请选择学校".local
item00.value = detailInfo.college
let item01 = YHFormDetailItem(type: .educationStyle)
item01.placeHolder = "请选择授课形式".local
item01.tips = "请选择授课形式".local
item01.value = detailInfo.teachingFormat
let item02 = YHFormDetailItem(type: .educationTime)
item02.placeHolder = "请选择年月".local
item02.tips = "请选择年月".local
item02.value = detailInfo.admissionTime
let item03 = YHFormDetailItem(type: .graduateTime)
item03.placeHolder = "请选择年月".local
item03.tips = "请选择年月".local
item03.value = detailInfo.graduateTime
let item04 = YHFormDetailItem(type: .educationMajor)
item04.placeHolder = "请输入专业".local
item04.tips = "请输入专业".local
item04.value = detailInfo.major
let item05 = YHFormDetailItem(type: .educationDegree)
item05.placeHolder = "请选择学位".local
item05.tips = "请选择学位".local
item05.value = detailInfo.degree
let item06 = YHFormDetailItem(type: .degreeType)
item06.placeHolder = "请选择学位类型".local
item06.tips = "请选择学位类型".local
item06.value = detailInfo.degreeType
let item07 = YHFormDetailItem(type: .educationCountry)
item07.placeHolder = "请输入国家及地区".local
item07.tips = "请输入国家及地区".local
item07.value = detailInfo.schoolAddress.country
......@@ -152,14 +144,10 @@ class YHEducationDetailVC: YHBaseViewController {
if detailInfo.isSchoolInAboard() {
item08.value = detailInfo.schoolAddress.foreign
item08.tips = "请输入城市".local
item08.placeHolder = "请输入城市".local
item08.tips = "请输入城市".local
} else {
item08.value = detailInfo.schoolAddress.area.joined(separator: ",")
item08.tips = "请选择城市".local
item08.placeHolder = "请选择城市".local
item08.tips = "请选择城市".local
}
let arr0:[YHFormItemProtocol] = [title0, item00, item01, item02, item03, item04, item05, item06, item07, item08]
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/Education&Qualification(学历专业资格填写)/C/YHEducationInfoListVC.swift
View file @ d9d7a12e
......@@ -315,11 +315,15 @@ extension YHEducationInfoListVC : UITableViewDelegate, UITableViewDataSource {
} else {
cell.title = "学历标题".local
}
cell.detailLabel.text = String(format: "有%d项未填", eduInfo.vacantNum)
let tips = String(format: "有%d项未填", eduInfo.vacantNum)
cell.detailLabel.text = tips
cell.isShowDeleteBtn = (isDegreeEditMode == .canCancel)
cell.detailLabel.textColor = (isNeedShowError && eduInfo.vacantNum > 0 ? .failColor : .labelTextColor2)
cell.setTips(tips, isShow:(isNeedShowError && eduInfo.vacantNum > 0))
cell.deleteBlock = {
var title = "确定要删除该学历吗?"
var title = "确定删除该学历吗?"
if let collegeName = eduInfo.college, !collegeName.isEmpty {
title = "确定删除学历\(collegeName)吗"
}
YHTwoOptionAlertView.showAlertView(message:title) {
[weak self] sure in
guard let self = self else { return }
......@@ -344,7 +348,10 @@ extension YHEducationInfoListVC : UITableViewDelegate, UITableViewDataSource {
}
cell.isShowDeleteBtn = (isDegreeEditMode == .canCancel)
cell.deleteBlock = {
var title = "确定要删除该学历吗?"
var title = "确定删除该学历吗?"
if let collegeName = eduInfo.college, !collegeName.isEmpty {
title = "确定删除学历\(collegeName)吗"
}
YHTwoOptionAlertView.showAlertView(message:title) {
[weak self] sure in
guard let self = self else { return }
......@@ -366,16 +373,23 @@ extension YHEducationInfoListVC : UITableViewDelegate, UITableViewDataSource {
if let qualification = quaInfo.qualification, !qualification.isEmpty {
cell.title = qualification
}
var tips = ""
if quaInfo.vacantNum > 0 {
cell.detailLabel.text = String(format: "有%d项未填", quaInfo.vacantNum)
tips = String(format: "有%d项未填", quaInfo.vacantNum)
cell.detailLabel.text = tips
} else {
cell.detailLabel.text = "已填完".local
}
cell.detailLabel.textColor = (isNeedShowError && quaInfo.vacantNum > 0 ? .failColor : .labelTextColor2)
cell.setTips(tips, isShow:(isNeedShowError && quaInfo.vacantNum > 0))
cell.isShowDeleteBtn = (isQualificationEditMode == .canCancel)
cell.deleteBlock = {
var title = "确定要删除该证书吗?"
YHTwoOptionAlertView.showAlertView(message:title) {
if let qualification = quaInfo.qualification, !qualification.isEmpty {
title = "确定删除证书\(qualification)吗"
}
YHTwoOptionAlertView.showAlertView(message:title) {
[weak self] sure in
guard let self = self else { return }
if !sure { return }
......@@ -508,6 +522,7 @@ extension YHEducationInfoListVC {
[weak self] success, error in
guard let self = self else { return }
if success {
YHHUD.flash(message: "删除成功")
requestEducationInfo()
} else {
var errorMsg = "删除失败"
......@@ -526,6 +541,7 @@ extension YHEducationInfoListVC {
[weak self] success, error in
guard let self = self else { return }
if success {
YHHUD.flash(message: "删除成功")
requestEducationInfo()
} else {
var errorMsg = "删除失败"
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/Education&Qualification(学历专业资格填写)/C/YHQualificationDetailVC.swift
View file @ d9d7a12e
......@@ -49,6 +49,7 @@ class YHQualificationDetailVC: YHBaseViewController {
var bottomView: YHSaveAndSubmitView = {
let view = YHSaveAndSubmitView.createView()
view.changeRightBtnTitle("下一步".local)
return view
}()
......@@ -104,34 +105,28 @@ class YHQualificationDetailVC: YHBaseViewController {
let title0 = YHFormTitleItem(type: .mainApplicantProfessionalQualification)
let item00 = YHFormDetailItem(type: .qualificationCertificateName)
item00.placeHolder = "请选择资格证书名称".local
item00.tips = "请选择资格证书名称".local
item00.value = detailInfo.certName
let item01 = YHFormDetailItem(type: .conferAgencyFullName)
item01.placeHolder = "请输入颁授机构".local
item01.tips = "请输入颁授机构".local
item01.value = detailInfo.issuingAgent
let item02 = YHFormDetailItem(type: .conferTime)
item02.placeHolder = "请选择颁授年份".local
item02.tips = "请选择颁授年份".local
if detailInfo.issuingYear > 0 {
item02.value = String(detailInfo.issuingYear)
}
let item03 = YHFormDetailItem(type: .conferCountry)
item03.placeHolder = "请选择颁授国家/地区".local
item03.tips = "请选择颁授国家/地区".local
item03.value = detailInfo.issuingAddr.country
let item04 = YHFormDetailItem(type: .conferCity)
if detailInfo.isCollegeInAboard() {
item04.placeHolder = "请输入颁授城市".local
item04.tips = "请输入颁授城市".local
item04.value = detailInfo.issuingAddr.foreign
} else {
item04.placeHolder = "请选择颁授城市".local
item04.tips = "请选择颁授城市".local
item04.value = detailInfo.issuingAddr.area.joined(separator: ",")
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/Education&Qualification(学历专业资格填写)/V/YHEducationInfoCell.swift
View file @ d9d7a12e
......@@ -25,6 +25,7 @@ class YHEducationInfoCell: UITableViewCell {
let label = UILabel()
label.textColor = .mainTextColor
label.textAlignment = .left
label.numberOfLines = 0
label.font = UIFont.PFSC_B(ofSize: 14)
return label
}()
......@@ -112,19 +113,21 @@ class YHEducationInfoCell: UITableViewCell {
}
timeLabel.snp.makeConstraints { make in
make.width.equalTo(108)
make.height.equalTo(20)
make.right.equalTo(arrowImgView.snp.left)
make.centerY.equalTo(titleLabel)
make.top.equalTo(titleLabel)
}
deleteButton.snp.makeConstraints { make in
make.size.equalTo(CGSizeMake(64, 40))
make.centerY.equalTo(titleLabel)
make.centerY.equalTo(timeLabel)
make.right.equalToSuperview()
}
arrowImgView.snp.makeConstraints { make in
make.width.height.equalTo(20.0)
make.centerY.equalTo(titleLabel)
make.centerY.equalTo(timeLabel)
make.right.equalToSuperview().offset(-horizonalGap)
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/C/Child(子女)/YHChildBasicInfoVC.swift
View file @ d9d7a12e
......@@ -71,14 +71,11 @@ class YHChildBasicInfoVC: YHBaseViewController, YHFamilyMemberProtol {
let title0 = YHFormTitleItem(type: .childInfo)
let item00 = YHFormDetailItem(type: .childName)
item00.value = child.subsetName
item00.placeHolder = "请输入子女姓名".local
item00.tips = "请输入子女姓名".local
let item01 = YHFormDetailItem(type: .everName, isNeed: false)
item01.value = child.usedName
item01.placeHolder = "请输入曾用名".local
let item02 = YHFormDetailItem(type: .befourMarryFirstName, isNeed: false)
item02.value = child.surname
item02.placeHolder = "请输入婚前姓氏".local
let item03 = YHFormDetailItem(type: .gender)
item03.value = child.sexName()
item03.tips = "请选择性别".local
......@@ -92,12 +89,10 @@ class YHChildBasicInfoVC: YHBaseViewController, YHFamilyMemberProtol {
if child.isBirthOverSeas() {
item07.value = child.birthPlace.foreign
item07.placeHolder = "请输入".local
item07.tips = "请输入出生城市".local
} else {
item07.value = child.birthPlace.area.joined(separator: ",")
item07.placeHolder = "请选择出生城市".local
item07.tips = "请选择出生城市".local
}
......@@ -108,14 +103,12 @@ class YHChildBasicInfoVC: YHBaseViewController, YHFamilyMemberProtol {
let item10 = YHFormDetailItem(type: .occupation)
item10.value = child.occupation
item10.tips = "请选择职业".local
item10.placeHolder = "请选择职业".local
var arr1:[YHFormItemProtocol] = [title1, item10]
if child.isNowHaveJob() {
let item11 = YHFormDetailItem(type: .occupationName)
item11.value = child.occupationName
item11.tips = "请输入职业名称".local
item11.placeHolder = "请输入职业名称".local
arr1.append(item11)
}
items.append(contentsOf: [arr0, arr1])
......@@ -141,12 +134,10 @@ class YHChildBasicInfoVC: YHBaseViewController, YHFamilyMemberProtol {
if child.isNowInHK() { // 目前在港才显示 逗留期限和在港身份
let item31 = YHFormDetailItem(type: .stayHKDate)
item31.placeHolder = "请选择".local
item31.tips = "请选择获准逗留期限".local
item31.value = child.childInHk.info
let item32 = YHFormDetailItem(type: .roleInHK)
item32.placeHolder = "请选择".local
item32.tips = "请选择在港身份".local
item32.value = child.hkIdentity
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/C/Child(子女)/YHChildInfoContainerVC.swift
View file @ d9d7a12e
......@@ -116,7 +116,7 @@ class YHChildInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
bottomView.saveBlock = {
[weak self] in
guard let self = self else { return }
self.saveInfo(isSubmit: false, isShowLoading: true, callBack:nil)
self.saveInfo(isSubmit: false, isShowSubmitMsg:false, isShowLoading: true, callBack:nil)
}
stepView.snp.makeConstraints { make in
......@@ -188,7 +188,15 @@ class YHChildInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
func submit() {
if let targetVC = getCurrentStepViewController() {
if targetVC.nextStep() {
saveInfo(isSubmit: true, isShowLoading: true) {
var isShowSubmitMsg = false
let index = getArrayIndexOfCurrentStep()
if let index = index, index == stepVCs.count-1 {
// 最后一步
isShowSubmitMsg = true
}
saveInfo(isSubmit: true, isShowSubmitMsg:isShowSubmitMsg, isShowLoading: true) {
[weak self] success in
guard let self = self else { return }
if success {
......@@ -244,7 +252,8 @@ extension YHChildInfoContainerVC {
// @param isSubmit:是否为提交 false为保存 true为提交
// @param isShowLoading: 是否展示loading和toast
func saveInfo(isSubmit:Bool, isShowLoading:Bool, callBack:((Bool)->Void)?) {
//
func saveInfo(isSubmit:Bool, isShowSubmitMsg:Bool, isShowLoading:Bool, callBack:((Bool)->Void)?) {
guard let child = child else { return }
guard let info = child.toDictionary() else { return }
......@@ -260,9 +269,9 @@ extension YHChildInfoContainerVC {
guard let self = self else { return }
if isShowLoading {
if success {
YHHUD.flash(message:isSubmit ? "提交成功" : "保存成功")
YHHUD.flash(message:isSubmit && isShowSubmitMsg ? "提交成功" : "保存成功")
} else {
var msg = isSubmit ? "提交失败" : "保存失败"
var msg = isSubmit && isShowSubmitMsg ? "提交失败" : "保存失败"
if let errorMsg = error?.errorMsg, errorMsg.count > 0 {
msg = errorMsg
}
......@@ -295,6 +304,6 @@ extension YHChildInfoContainerVC {
}
func saveInfoSilent() {
saveInfo(isSubmit:false, isShowLoading:false, callBack:nil)
saveInfo(isSubmit:false, isShowSubmitMsg:false, isShowLoading:false, callBack:nil)
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/C/Child(子女)/YHChildPrimaryInfoVC.swift
View file @ d9d7a12e
......@@ -165,12 +165,14 @@ class YHChildPrimaryInfoVC: YHBaseViewController, YHFamilyMemberProtol {
}
if detailItem.type == .isAccompanyToHK
|| detailItem.type == .isHandleHKPassPort
|| detailItem.type == .isLiveTother
|| detailItem.type == .isLiveOverSeasMore1Year
|| detailItem.type == .ownCustody
{
return .twoChoice
}
if detailItem.type == .ownCustody
|| detailItem.type == .isLiveTother
|| detailItem.type == .isLiveOverSeasMore1Year{
return .question
}
}
return .defaultType
}
......@@ -249,17 +251,6 @@ extension YHChildPrimaryInfoVC : UITableViewDelegate, UITableViewDataSource {
} else if detailItem.type == .isHandleHKPassPort { // 是否办理港澳通行证
self.child?.setNeedHandleHKPassPort(option)
} else if detailItem.type == .isLiveTother { // 是否与主申请人同住
self.child?.setLiveTother(option)
if option {
self.child?.address.clearAddress()
}
} else if detailItem.type == .isLiveOverSeasMore1Year { // 是否在海外居住满1年及以上
self.child?.setOverSearsOver1Year(option)
} else if detailItem.type == .ownCustody { // 抚养权
self.child?.setOwnCustody(option)
}
self.loadInfo()
save()
......@@ -308,7 +299,43 @@ extension YHChildPrimaryInfoVC : UITableViewDelegate, UITableViewDataSource {
}
}
return cell
} else if cellType == .question {
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemQuestionsCell.cellReuseIdentifier, for: indexPath) as! YHFormItemQuestionsCell
cell.isMust = detailItem.isNeed
cell.title = detailItem.getTitle()
var select = false
if let value = detailItem.value {
select = Bool(value)!
}
let answers = [YHFormChoiceItem(title: "是".local, isSelect: select),YHFormChoiceItem(title: "否".local, isSelect: !select)]
cell.answerArr = answers
cell.answerBlock = {
[weak self] (arr, selectIndex) in
let selectItem:YHFormChoiceItem = arr[selectIndex]
let option = (selectItem.title == "是".local ? true : false)
guard let self = self else { return }
if detailItem.type == .isLiveTother { // 是否与主申请人同住
self.child?.setLiveTother(option)
if option {
self.child?.address.clearAddress()
}
} else if detailItem.type == .isLiveOverSeasMore1Year { // 是否在海外居住满1年及以上
self.child?.setOverSearsOver1Year(option)
} else if detailItem.type == .ownCustody { // 抚养权
self.child?.setOwnCustody(option)
}
self.loadInfo()
save()
}
return cell
}
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/C/Spouse(配偶)/YHSpouseBasicInfoVC.swift
View file @ d9d7a12e
......@@ -19,6 +19,7 @@ enum HKFormItemCellType: Int {
case addItem = 6
case degreeDetailInfo = 7
case onlyTwoChoice = 8
case question = 9
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/C/Spouse(配偶)/YHSpouseInfoContainerVC.swift
View file @ d9d7a12e
......@@ -131,7 +131,7 @@ class YHSpouseInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
bottomView.saveBlock = {
[weak self] in
guard let self = self else { return }
saveInfo(isSubmit: false, isLoading: true, callBack: nil)
saveInfo(isSubmit: false, isShowSubmitMsg:false, isLoading: true, callBack: nil)
}
stepView.snp.makeConstraints { make in
......@@ -206,7 +206,7 @@ class YHSpouseInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
extension YHSpouseInfoContainerVC {
// isSubmit:是否为提交 false为保存 true为提交
func saveInfo(isSubmit:Bool, isLoading:Bool, callBack:((Bool)->Void)?) {
func saveInfo(isSubmit:Bool, isShowSubmitMsg:Bool, isLoading:Bool, callBack:((Bool)->Void)?) {
guard let spouse = spouse else { return }
guard let info = spouse.toDictionary() else { return }
......@@ -221,9 +221,9 @@ extension YHSpouseInfoContainerVC {
success, error in
if isLoading {
if success {
YHHUD.flash(message:isSubmit ? "提交成功" : "保存成功")
YHHUD.flash(message:isSubmit && isShowSubmitMsg ? "提交成功" : "保存成功")
} else {
var msg = isSubmit ? "提交失败" : "保存失败"
var msg = isSubmit && isShowSubmitMsg ? "提交失败" : "保存失败"
if let errorMsg = error?.errorMsg, errorMsg.count > 0 {
msg = errorMsg
}
......@@ -237,7 +237,7 @@ extension YHSpouseInfoContainerVC {
}
func saveInfoSilent() {
saveInfo(isSubmit: false, isLoading: false) {
saveInfo(isSubmit: false,isShowSubmitMsg:false, isLoading: false) {
[weak self] success in
}
......@@ -247,7 +247,15 @@ extension YHSpouseInfoContainerVC {
func submit() {
if let targetVC = getCurrentStepViewController() {
if targetVC.nextStep() {
saveInfo(isSubmit: true, isLoading: true) {
var isShowSubmitMsg = false
let index = getArrayIndexOfCurrentStep()
if let index = index, index == stepVCs.count-1 {
// 最后一步
isShowSubmitMsg = true
}
saveInfo(isSubmit: true, isShowSubmitMsg:isShowSubmitMsg, isLoading: true) {
[weak self] success in
guard let self = self else { return }
if success {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/C/Spouse(配偶)/YHSpousePrimaryInfoVC.swift
View file @ d9d7a12e
......@@ -38,6 +38,7 @@ class YHSpousePrimaryInfoVC: YHBaseViewController, YHFamilyMemberProtol {
tableView.register(YHFormItemDoubleChoiceCell.self, forCellReuseIdentifier: YHFormItemDoubleChoiceCell.cellReuseIdentifier)
tableView.register(YHFormItemInputTextCell.self, forCellReuseIdentifier: YHFormItemInputTextCell.cellReuseIdentifier)
tableView.register(YHFormItemSelectSheetCell.self, forCellReuseIdentifier: YHFormItemSelectSheetCell.cellReuseIdentifier)
tableView.register(YHFormItemQuestionsCell.self, forCellReuseIdentifier: YHFormItemQuestionsCell.cellReuseIdentifier)
tableView.register(YHFormItemTitleCell.self, forCellReuseIdentifier: YHFormItemTitleCell.cellReuseIdentifier)
tableView.register(YHFormItemAddCell.self, forCellReuseIdentifier: YHFormItemAddCell.cellReuseIdentifier)
return tableView
......@@ -167,7 +168,7 @@ extension YHSpousePrimaryInfoVC : UITableViewDelegate, UITableViewDataSource {
let detailItem = item as! YHFormDetailItem
// 是否随行到香港 / 是否办理港澳通行证 / // 是否与主申请人同住 均用双项按钮cell
if detailItem.type == .isAccompanyToHK || detailItem.type == .isHandleHKPassPort || detailItem.type == .isLiveTother || detailItem.type == .isLiveOverSeasMore1Year {
if detailItem.type == .isAccompanyToHK || detailItem.type == .isHandleHKPassPort || detailItem.type == .isLiveTother {
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemDoubleChoiceCell.cellReuseIdentifier, for: indexPath) as! YHFormItemDoubleChoiceCell
cell.isMust = detailItem.isNeed
......@@ -215,7 +216,34 @@ extension YHSpousePrimaryInfoVC : UITableViewDelegate, UITableViewDataSource {
save()
}
return cell
}
if detailItem.type == .isLiveOverSeasMore1Year {
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemQuestionsCell.cellReuseIdentifier, for: indexPath) as! YHFormItemQuestionsCell
cell.isMust = detailItem.isNeed
cell.title = detailItem.getTitle()
cell.setTips(detailItem.tips, isShow: isNeedShowError && detailItem.isShowTips)
var select = false
if let value = detailItem.value {
select = Bool(value)!
}
let answers = [YHFormChoiceItem(title: "是".local, isSelect: select),YHFormChoiceItem(title: "否".local, isSelect: !select)]
cell.answerArr = answers
cell.answerBlock = {
[weak self] (arr, selectIndex) in
guard let self = self else { return }
let selectItem:YHFormChoiceItem = arr[selectIndex]
let option = (selectItem.title == "是".local ? true : false)
if detailItem.type == .isLiveOverSeasMore1Year { // 是否在海外居住满1年及以上
self.spouse?.setOverSearsOver1Year(option)
self.loadInfo()
}
save()
}
return cell
}
if detailItem.type == .nationOrArea || detailItem.type == .liveCity {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/V/YHFormItemEnterDetailCell.swift
View file @ d9d7a12e
......@@ -138,7 +138,6 @@ class YHFormItemEnterDetailCell: UITableViewCell {
make.top.equalToSuperview().offset(16)
make.left.equalToSuperview().offset(horizonalGap)
make.right.equalTo(detailLabel.snp.left).offset(-8)
make.height.equalTo(20)
}
detailLabel.snp.makeConstraints { make in
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/V/YHFormItemSelectSheetCell.swift
View file @ d9d7a12e
......@@ -84,6 +84,7 @@ class YHFormItemSelectSheetCell: UITableViewCell {
let label = UILabel()
label.textColor = detailColor
label.textAlignment = .left
label.numberOfLines = 0
label.font = UIFont.PFSC_M(ofSize: 14)
return label
}()
......@@ -105,7 +106,6 @@ class YHFormItemSelectSheetCell: UITableViewCell {
let label = UILabel()
label.textColor = .failColor
label.textAlignment = .left
label.numberOfLines = 0
label.font = UIFont.PFSC_R(ofSize: 12)
label.isHidden = true
return label
......@@ -185,14 +185,14 @@ class YHFormItemSelectSheetCell: UITableViewCell {
tipsLabel.snp.remakeConstraints { make in
make.left.equalToSuperview().offset(horizonalGap)
make.right.equalToSuperview().offset(-horizonalGap)
make.top.equalTo(titleLabel.snp.bottom).offset(6)
make.top.equalTo(detailLabel.snp.bottom).offset(6)
make.bottom.equalToSuperview().offset(-16)
}
} else {
tipsLabel.snp.remakeConstraints { make in
make.left.equalToSuperview().offset(horizonalGap)
make.right.equalToSuperview().offset(-horizonalGap)
make.top.equalTo(titleLabel.snp.bottom)
make.top.equalTo(detailLabel.snp.bottom)
make.height.equalTo(0)
make.bottom.equalToSuperview().offset(-16)
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/V/YHAddressPicker/YHAddressPickView.swift
View file @ d9d7a12e
......@@ -114,7 +114,7 @@ class YHAddressPickView: UIView {
private let titleLabel: UILabel = {
let label = UILabel(frame: CGRect(x: (UIScreen.main.bounds.width - 150) / 2, y: 16, width: 150, height: 24))
label.textColor = UIColor.mainTextColor
label.text = "选择国家地区"
label.text = "选择省市地区"
label.textAlignment = .center
label.font = UIFont.PFSC_M(ofSize: 17)
return label
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/V/YHDatePickView.swift
View file @ d9d7a12e
......@@ -75,7 +75,6 @@ class YHDatePickView: UIView {
centerView = {
let view = UIView()
view.backgroundColor = .white
view.layer.cornerRadius = 16
return view
}()
addSubview(centerView)
......@@ -163,6 +162,16 @@ class YHDatePickView: UIView {
make.right.equalTo(-16)
}
pickerView.selectRow(100, inComponent: 0, animated: true)
centerView.layoutIfNeeded()
let corner = UIRectCorner(rawValue: UIRectCorner.topLeft.rawValue | UIRectCorner.topRight.rawValue)
let path = UIBezierPath(roundedRect:bounds,byRoundingCorners: corner,cornerRadii:CGSizeMake(8, 8));
let layer = CAShapeLayer();
layer.frame = centerView.bounds;
layer.path = path.cgPath;
centerView.layer.mask = layer;
}
@objc private func handleTap(_ sender: AnyObject?) {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/OtherInformation(其他信息)/V/YHOtherPickerView.swift
View file @ d9d7a12e
......@@ -47,6 +47,7 @@ class YHOtherPickerView: UIView {
lazy var whiteContentView: UIView = {
let view = UIView()
view.backgroundColor = .white
view
return view
}()
......@@ -151,12 +152,8 @@ class YHOtherPickerView: UIView {
whiteContentView.addSubview(topView)
whiteContentView.addSubview(pickerView)
let corner = UIRectCorner(rawValue: UIRectCorner.topLeft.rawValue | UIRectCorner.topRight.rawValue)
let path = UIBezierPath(roundedRect:bounds,byRoundingCorners: corner,cornerRadii:CGSizeMake(16.0, 16.0));
let layer = CAShapeLayer();
layer.frame = whiteContentView.bounds;
layer.path = path.cgPath;
whiteContentView.layer.mask = layer;
if let title = title {
titleLabel.text = title
......@@ -182,6 +179,15 @@ class YHOtherPickerView: UIView {
make.top.equalTo(topView.snp.bottom)
make.left.right.bottom.equalToSuperview()
}
whiteContentView.layoutIfNeeded()
let corner = UIRectCorner(rawValue: UIRectCorner.topLeft.rawValue | UIRectCorner.topRight.rawValue)
let path = UIBezierPath(roundedRect:bounds,byRoundingCorners: corner,cornerRadii:CGSizeMake(8, 8));
let layer = CAShapeLayer();
layer.frame = whiteContentView.bounds;
layer.path = path.cgPath;
whiteContentView.layer.mask = layer;
}
@objc func didClickCancelButton() {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/PersonInfoList(个人信息预览)/VM/YHPreviewViewModel.swift
View file @ d9d7a12e
......@@ -1283,20 +1283,20 @@ private extension YHPreviewViewModel {
arr.append(tmp5)
}
let tmp7 = YHPreviewQuestionAndAnswerModel(question: "是否拥有学位：", answer: model.hasDegree == "1" ? "有学位" : "无学位")
arr.append(tmp7)
if model.hasDegree == "1" {
for(index,item) in model.hasDegreeJson.enumerated() {
let addationIndex = model.hasDegreeJson.count > 1 ? String(index + 1) : ""
let title = "学位证" + addationIndex + "："
let tmp8 = YHPreviewQuestionAndAnswerModel(question: title, answer: item.degree)
arr.append(tmp8)
let tmp9 = YHPreviewQuestionAndAnswerModel(question: "学位证颁发地区：", answer: item.address)
arr.append(tmp9)
}
}
// let tmp7 = YHPreviewQuestionAndAnswerModel(question: "是否拥有学位：", answer: model.hasDegree == "1" ? "有学位" : "无学位")
// arr.append(tmp7)
//
// if model.hasDegree == "1" {
// for(index,item) in model.hasDegreeJson.enumerated() {
//
// let addationIndex = model.hasDegreeJson.count > 1 ? String(index + 1) : ""
// let title = "学位证" + addationIndex + "："
// let tmp8 = YHPreviewQuestionAndAnswerModel(question: title, answer: item.degree)
// arr.append(tmp8)
// let tmp9 = YHPreviewQuestionAndAnswerModel(question: "学位证颁发地区：", answer: item.address)
// arr.append(tmp9)
// }
// }
let tmp10 = YHPreviewQuestionAndAnswerModel(question: "是否和主申请人同住：", answer: model.nows == 1 ? "是" : "否")
arr.append(tmp10)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/C/YHWorkExperienceListViewController.swift
View file @ d9d7a12e
......@@ -21,6 +21,9 @@ class YHWorkExperienceListViewController: YHBaseViewController {
super.viewDidLoad()
viewModel = YHWorkItemListViewModel()
gk_navTitle = "工作经验信息填写"
gk_navBackgroundColor = .white
gk_navBarAlpha = 1.0
setView()
// Do any additional setup after loading the view.
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/C/YHWorkExperienceViewController.swift
View file @ d9d7a12e
......@@ -26,6 +26,10 @@ class YHWorkExperienceViewController: YHBaseViewController {
super.viewDidLoad()
viewModel = YHWorkExperienceViewModel()
gk_navTitle = "工作经验信息填写"
gk_navBackgroundColor = .white
gk_navBarAlpha = 1.0
setView()
getData()
NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillShow(_:)), name: UIResponder.keyboardDidShowNotification, object: nil)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/C/YHWorkIntroductionViewController.swift
View file @ d9d7a12e
......@@ -26,6 +26,9 @@ class YHWorkIntroductionViewController: YHBaseViewController {
override func viewDidLoad() {
super.viewDidLoad()
gk_navTitle = "工作经验信息填写"
gk_navBackgroundColor = .white
gk_navBarAlpha = 1.0
viewModel = YHWorkIntroductionViewModel()
setView()
getData()
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHInformationFillTipsAlertView.swift
View file @ d9d7a12e
......@@ -83,6 +83,7 @@ class YHInformationFillTipsAlertView: UIView {
let view = UIView()
view.backgroundColor = .white
view.layer.cornerRadius = kCornerRadius8
view.clipsToBounds = true
return view
}()
addSubview(centerView)
......@@ -181,9 +182,11 @@ class YHInformationFillTipsAlertView: UIView {
closeBtn.snp.makeConstraints { make in
make.centerY.equalTo(lable01.snp.centerY)
make.right.equalTo(-25)
make.width.height.equalTo(20)
make.width.height.equalTo(24)
}
closeBtn.YH_clickEdgeInsets = UIEdgeInsets(top: 10, left: 10, bottom: 10, right: 10)
let line = UIView()
line.backgroundColor = UIColor.separatorColor
topView.addSubview(line)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/VM/YHServiceCenterMainViewModel.swift
View file @ d9d7a12e
......@@ -14,6 +14,7 @@ class YHServiceCenterMainViewModel: YHBaseViewModel {
//合同对应的状态
var arrContactStausItmes: [YHContactMainItemStatusModel] = []
var contactDetailData: YHContactMainItemStatusModel2?
//信息完善列表
var arrInfoFillStep : [YHInformationPerfectModel] = []
......@@ -128,6 +129,7 @@ extension YHServiceCenterMainViewModel {
return
}
self.contactDetailData = resultModel
if resultModel.fill_info_step > 6 {
//resultModel.fill_info_step == 7的时候表示 我的信息填写完成
let model = YHContactMainItemStatusModel()
......@@ -137,7 +139,7 @@ extension YHServiceCenterMainViewModel {
if true || resultModel.supplement_not_submit_num > 0 { //for test hjl 方便测试
if resultModel.supplement_not_submit_num > 0 {
let model2 = YHContactMainItemStatusModel()
model2.type = 2
model2.isFinished = false
......
galaxy/galaxy/Classes/Tools/Helper/YHConstantArrayData.swift
View file @ d9d7a12e
......@@ -364,8 +364,8 @@ class YHConstantArrayData {
//学位颁发地
static let arrDegreeAddress = [
[ "id": "0", "title": "国内（颁发）" ],
[ "id": "1", "title": "国外（颁发）" ],
[ "id": "1", "title": "国内（颁发）" ],
[ "id": "2", "title": "国外（颁发）" ],
]
//通过 id 获取 title
......
galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/个人信息表/person_info_close_btn.imageset/Contents.json
View file @ d9d7a12e
......@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
"filename" : "Frame 33332868@2x.png",
"filename" : "Group 2849@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "Frame 33332868@3x.png",
"filename" : "Group 2849@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
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