Skip to content

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

Merge commit 'c7be0525' into xiezhaolin

parents a4a50f0b c7be0525
Hide whitespace changes
Inline Side-by-side
Showing with 603 additions and 752 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ 5e5d8f72
...@@ -172,6 +172,7 @@ ...@@ -172,6 +172,7 @@
A554A50A2B9701F300EA5973 /* YHPreviewInfoWorkExpView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A554A5092B9701F300EA5973 /* YHPreviewInfoWorkExpView.swift */; }; A554A50A2B9701F300EA5973 /* YHPreviewInfoWorkExpView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A554A5092B9701F300EA5973 /* YHPreviewInfoWorkExpView.swift */; };
A554A50C2B9715EC00EA5973 /* YHPreviewInfoProjectItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A554A50B2B9715EC00EA5973 /* YHPreviewInfoProjectItemView.swift */; }; A554A50C2B9715EC00EA5973 /* YHPreviewInfoProjectItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A554A50B2B9715EC00EA5973 /* YHPreviewInfoProjectItemView.swift */; };
A554A5102B97389300EA5973 /* YHPreviewInfoWorkSummaryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A554A50F2B97389300EA5973 /* YHPreviewInfoWorkSummaryView.swift */; }; A554A5102B97389300EA5973 /* YHPreviewInfoWorkSummaryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A554A50F2B97389300EA5973 /* YHPreviewInfoWorkSummaryView.swift */; };
A554A5122B99715000EA5973 /* YHConstantArrayData.swift in Sources */ = {isa = PBXBuildFile; fileRef = A554A5112B99715000EA5973 /* YHConstantArrayData.swift */; };
A5551FFE2B4C26CE00510980 /* YHBaseViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5551FFD2B4C26CE00510980 /* YHBaseViewModel.swift */; }; A5551FFE2B4C26CE00510980 /* YHBaseViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5551FFD2B4C26CE00510980 /* YHBaseViewModel.swift */; };
A5573ED22B317BFF00D98EC0 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5573ED12B317BFF00D98EC0 /* AppDelegate.swift */; }; A5573ED22B317BFF00D98EC0 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5573ED12B317BFF00D98EC0 /* AppDelegate.swift */; };
A5573EDB2B317C0000D98EC0 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A5573EDA2B317C0000D98EC0 /* Assets.xcassets */; }; A5573EDB2B317C0000D98EC0 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A5573EDA2B317C0000D98EC0 /* Assets.xcassets */; };
...@@ -492,6 +493,7 @@ ...@@ -492,6 +493,7 @@
A554A5092B9701F300EA5973 /* YHPreviewInfoWorkExpView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPreviewInfoWorkExpView.swift; sourceTree = "<group>"; }; A554A5092B9701F300EA5973 /* YHPreviewInfoWorkExpView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPreviewInfoWorkExpView.swift; sourceTree = "<group>"; };
A554A50B2B9715EC00EA5973 /* YHPreviewInfoProjectItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPreviewInfoProjectItemView.swift; sourceTree = "<group>"; }; A554A50B2B9715EC00EA5973 /* YHPreviewInfoProjectItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPreviewInfoProjectItemView.swift; sourceTree = "<group>"; };
A554A50F2B97389300EA5973 /* YHPreviewInfoWorkSummaryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPreviewInfoWorkSummaryView.swift; sourceTree = "<group>"; }; A554A50F2B97389300EA5973 /* YHPreviewInfoWorkSummaryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPreviewInfoWorkSummaryView.swift; sourceTree = "<group>"; };
A554A5112B99715000EA5973 /* YHConstantArrayData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHConstantArrayData.swift; sourceTree = "<group>"; };
A5551FFD2B4C26CE00510980 /* YHBaseViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHBaseViewModel.swift; sourceTree = "<group>"; }; A5551FFD2B4C26CE00510980 /* YHBaseViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHBaseViewModel.swift; sourceTree = "<group>"; };
A5573ECE2B317BFF00D98EC0 /* galaxy.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = galaxy.app; sourceTree = BUILT_PRODUCTS_DIR; }; A5573ECE2B317BFF00D98EC0 /* galaxy.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = galaxy.app; sourceTree = BUILT_PRODUCTS_DIR; };
A5573ED12B317BFF00D98EC0 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; }; A5573ED12B317BFF00D98EC0 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
...@@ -1403,6 +1405,7 @@ ...@@ -1403,6 +1405,7 @@
A5ACE8F42B4564F7002C94D2 /* YHNetRequest.swift */, A5ACE8F42B4564F7002C94D2 /* YHNetRequest.swift */,
A5ACE8F52B4564F7002C94D2 /* YHNetworkStatusManager.swift */, A5ACE8F52B4564F7002C94D2 /* YHNetworkStatusManager.swift */,
A5ACE8F62B4564F7002C94D2 /* YHBaseUrlManager.swift */, A5ACE8F62B4564F7002C94D2 /* YHBaseUrlManager.swift */,
A554A5112B99715000EA5973 /* YHConstantArrayData.swift */,
); );
path = NetWork; path = NetWork;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -2080,6 +2083,7 @@ ...@@ -2080,6 +2083,7 @@
042FBBCB2B65058000F9DE23 /* YHChildBasicInfoVC.swift in Sources */, 042FBBCB2B65058000F9DE23 /* YHChildBasicInfoVC.swift in Sources */,
04E86E6A2B87352700A35F4B /* YHCompanySelectViewController.swift in Sources */, 04E86E6A2B87352700A35F4B /* YHCompanySelectViewController.swift in Sources */,
A5191F602B89E6FA001069F7 /* YHPreviewInfoQuestionAndAnswerItemView.swift in Sources */, A5191F602B89E6FA001069F7 /* YHPreviewInfoQuestionAndAnswerItemView.swift in Sources */,
A554A5122B99715000EA5973 /* YHConstantArrayData.swift in Sources */,
04B0239E2B92C27C00B83629 /* YHFamilyMemberViewModel.swift in Sources */, 04B0239E2B92C27C00B83629 /* YHFamilyMemberViewModel.swift in Sources */,
04E86E452B8357EC00A35F4B /* YHItemModel.swift in Sources */, 04E86E452B8357EC00A35F4B /* YHItemModel.swift in Sources */,
A5B4A5852B9455F7003EFF8F /* YHPreviewForOtherInfoModel.swift in Sources */, A5B4A5852B9455F7003EFF8F /* YHPreviewForOtherInfoModel.swift in Sources */,
...@@ -2268,7 +2272,7 @@ ...@@ -2268,7 +2272,7 @@
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual; CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1; CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = ""; DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO;
...@@ -2310,7 +2314,7 @@ ...@@ -2310,7 +2314,7 @@
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual; CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1; CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = ""; DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO;
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHInformationPerfectListVC.swift
View file @ 5e5d8f72
...@@ -180,7 +180,10 @@ extension YHInformationPerfectListVC { ...@@ -180,7 +180,10 @@ extension YHInformationPerfectListVC {
return return
} }
YHHUD.show(.progress(message: "数据提交中...."))
serviceCenterMainReqVM.submitAllInfoOp(params: ["orderId" : orderId]) { [weak self] success, error in serviceCenterMainReqVM.submitAllInfoOp(params: ["orderId" : orderId]) { [weak self] success, error in
YHHUD.hide()
if success == true { if success == true {
let model = self?.serviceCenterMainReqVM.allInfoScoreModel let model = self?.serviceCenterMainReqVM.allInfoScoreModel
YHSubmintAllInfoSuccessTipView.showCheckView(model: model) { agree in YHSubmintAllInfoSuccessTipView.showCheckView(model: model) { agree in
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Certificates(证书上传和证书信息)/YHCertificateInfoController.swift
View file @ 5e5d8f72
...@@ -44,6 +44,7 @@ class YHCertificateInfoController: YHBaseViewController, YHFamilyMemberProtol { ...@@ -44,6 +44,7 @@ class YHCertificateInfoController: YHBaseViewController, YHFamilyMemberProtol {
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
gk_navigationBar.isHidden = true
createUI() createUI()
loadInfo() loadInfo()
} }
...@@ -242,7 +243,7 @@ extension YHCertificateInfoController : UITableViewDelegate, UITableViewDataSour ...@@ -242,7 +243,7 @@ extension YHCertificateInfoController : UITableViewDelegate, UITableViewDataSour
cell.isMust = detailItem.isNeed cell.isMust = detailItem.isNeed
cell.title = detailItem.getTitle() cell.title = detailItem.getTitle()
cell.detail = detailItem.value cell.detail = detailItem.value
cell.setTips(detailItem.tips, isShow: isNeedShowError && detailItem.isShowTips) cell.setTips(detailItem.tips, isShow: isNeedShowError && detailItem.isNeed && detailItem.isShowTips)
return cell return cell
} }
} }
...@@ -392,7 +393,6 @@ extension YHCertificateInfoController : UITableViewDelegate, UITableViewDataSour ...@@ -392,7 +393,6 @@ extension YHCertificateInfoController : UITableViewDelegate, UITableViewDataSour
|| familyMember.certificates.hkMacaoPass.issueAt.count <= 0 || familyMember.certificates.hkMacaoPass.issueAt.count <= 0
|| familyMember.certificates.hkMacaoPass.issueDateStartAt.count <= 0 || familyMember.certificates.hkMacaoPass.issueDateStartAt.count <= 0
|| familyMember.certificates.hkMacaoPass.issueDateEndAt.count <= 0 || familyMember.certificates.hkMacaoPass.issueDateEndAt.count <= 0
|| familyMember.certificates.hkMacaoPass.passPortType == -1
{ {
return false return false
} }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Certificates(证书上传和证书信息)/YHCertificateUploadVC.swift
View file @ 5e5d8f72
...@@ -23,6 +23,7 @@ class YHCertificateUploadVC: YHBaseViewController, YHFamilyMemberProtol { ...@@ -23,6 +23,7 @@ class YHCertificateUploadVC: YHBaseViewController, YHFamilyMemberProtol {
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
view.backgroundColor = UIColor(hexString:"#F8F8F8") view.backgroundColor = UIColor(hexString:"#F8F8F8")
gk_navigationBar.isHidden = true
createUI() createUI()
} }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Child(子女)/YHChildBasicInfoVC.swift
View file @ 5e5d8f72
...@@ -43,6 +43,7 @@ class YHChildBasicInfoVC: YHBaseViewController, YHFamilyMemberProtol { ...@@ -43,6 +43,7 @@ class YHChildBasicInfoVC: YHBaseViewController, YHFamilyMemberProtol {
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
gk_navigationBar.isHidden = true
createUI() createUI()
loadInfo() loadInfo()
} }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Child(子女)/YHChildPrimaryInfoVC.swift
View file @ 5e5d8f72
...@@ -46,6 +46,7 @@ class YHChildPrimaryInfoVC: YHBaseViewController, YHFamilyMemberProtol { ...@@ -46,6 +46,7 @@ class YHChildPrimaryInfoVC: YHBaseViewController, YHFamilyMemberProtol {
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
gk_navigationBar.isHidden = true
createUI() createUI()
loadInfo() loadInfo()
} }
...@@ -212,7 +213,8 @@ extension YHChildPrimaryInfoVC : UITableViewDelegate, UITableViewDataSource { ...@@ -212,7 +213,8 @@ extension YHChildPrimaryInfoVC : UITableViewDelegate, UITableViewDataSource {
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemDoubleChoiceCell.cellReuseIdentifier, for: indexPath) as! YHFormItemDoubleChoiceCell let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemDoubleChoiceCell.cellReuseIdentifier, for: indexPath) as! YHFormItemDoubleChoiceCell
cell.isMust = detailItem.isNeed cell.isMust = detailItem.isNeed
cell.title = detailItem.getTitle() cell.title = detailItem.getTitle()
cell.isCanEdit = true cell.enableEdit = true
cell.disableEditTips = nil
var select = false var select = false
if let value = detailItem.value { if let value = detailItem.value {
...@@ -221,7 +223,8 @@ extension YHChildPrimaryInfoVC : UITableViewDelegate, UITableViewDataSource { ...@@ -221,7 +223,8 @@ extension YHChildPrimaryInfoVC : UITableViewDelegate, UITableViewDataSource {
if detailItem.type == .isAccompanyToHK, let child = child, child.is18YearsOld() { // 是否随行至香港 if detailItem.type == .isAccompanyToHK, let child = child, child.is18YearsOld() { // 是否随行至香港
// 年满18岁不能随行 随行按钮不可编辑固定为否 // 年满18岁不能随行 随行按钮不可编辑固定为否
cell.isCanEdit = isFollowCanEdit cell.enableEdit = isFollowCanEdit
cell.disableEditTips = "年满十八岁的子女不能随行至香港"
} }
let answers = [YHFormChoiceItem(title: "是".local, isSelect: select),YHFormChoiceItem(title: "否".local, isSelect: !select)] let answers = [YHFormChoiceItem(title: "是".local, isSelect: select),YHFormChoiceItem(title: "否".local, isSelect: !select)]
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Spouse(配偶)/YHSpouseBasicInfoVC.swift
View file @ 5e5d8f72
...@@ -59,6 +59,7 @@ class YHSpouseBasicInfoVC: YHBaseViewController, YHFamilyMemberProtol { ...@@ -59,6 +59,7 @@ class YHSpouseBasicInfoVC: YHBaseViewController, YHFamilyMemberProtol {
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
gk_navigationBar.isHidden = true
createUI() createUI()
loadInfo() loadInfo()
} }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Spouse(配偶)/YHSpousePrimaryInfoVC.swift
View file @ 5e5d8f72
...@@ -45,6 +45,7 @@ class YHSpousePrimaryInfoVC: YHBaseViewController, YHFamilyMemberProtol { ...@@ -45,6 +45,7 @@ class YHSpousePrimaryInfoVC: YHBaseViewController, YHFamilyMemberProtol {
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
gk_navigationBar.isHidden = true
createUI() createUI()
loadInfo() loadInfo()
} }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/M/YHFamilyInitialInfo.swift
View file @ 5e5d8f72
...@@ -550,7 +550,23 @@ class YHFamilyMemberGroupInfo: SmartCodable { ...@@ -550,7 +550,23 @@ class YHFamilyMemberGroupInfo: SmartCodable {
case brother = "brother" case brother = "brother"
case child = "child" case child = "child"
} }
func checkDefaultValue() -> Self {
_ = father?.checkDefaultValue()
_ = mother?.checkDefaultValue()
_ = spouse?.checkDefaultValue()
if let child = child {
for item in child {
_ = item.checkDefaultValue()
}
}
if let brother = brother {
for item in brother {
_ = item.checkDefaultValue()
}
}
return self
}
required init() { required init() {
} }
...@@ -567,362 +583,95 @@ enum YHFamilyMemberType: Int { ...@@ -567,362 +583,95 @@ enum YHFamilyMemberType: Int {
case brother = 5 case brother = 5
} }
//class YHFamilyMember: SmartCodable, YHFormItemProtocol {
//
// var id: Int = 0
// // 是否已故
// var deceased: Int = 0
// // 主申请人和现配偶是否拥有孩子抚养权
// var custody: Int = 0
// // 国籍
// var nationality: String?
// var orderId: Int = 0
// // 关系 1父亲 2母亲 3配偶 4子女 5兄弟姐妹
// var relation: String?
// // 是否拥有学位
// var hasDegree: String?
// // 学历数组
// var hasDegreeJson: [YHHasDegreeJson]?
//
// // 是否随行至香港
// var follow: Int = 0
// var statement: Int = 0
// // 姓名
// var subsetName: String?
//
// // mark any
//// var subsetNamePinyin: YHSubsetNamePinyin?
// var subsetNamePinyin: SmartAny?
// // 曾用名
// var usedName: String?
// // 出生日期
// var birthday: String?
// // 出生国家地区 (国内/国外)
// var birthPlaceAboard: Int = 0
//
// // 出生地址信息
// var birthPlace: YHAddress?
//
// // 职业
// var occupation: String?
// // 职业名称
// var occupationName: String?
//
// // mark any
// var operatorAme: SmartAny?
// // 香港身份证号
// var hkIdentityCard: String?
// // 性别 男：1 女：2
// var sex: Int = 0
// // 婚姻状况
// var married: String?
// // 是否与主申请人同住
// var nows: Int = 0
// // 居住地址
// var address: YHAddress?
//
// // 香港身份证信息
// var childHasHkId: YHChildStepchildClass?
// // 是否前次婚姻子女
// var childStepchild: YHChildStepchildClass?
// // 在港信息
// var childInHk: YHChildStepchildClass?
// // 证件数组 (中国身份证、香港身份证、护照等)
// var certificates: YHCertificates?
//
// // mark any
// var countryIdentity: SmartAny?
//
// // 在港身份
// var hkIdentity: String?
// var hkIdentityOther: String?
// // 现居住国家
// var liveCountry: String?
// // 是否要办理港澳通行证
// var isHandled: Int = 0
// var finishFollow: Int = 0
// var step: Int = 0
// // 未填写项数
// var notFillNum: Int = 0
// // 是否在海外居住满1年及以上
// var isLiveOverseaYear: Int = 0
// // 婚前姓氏
// var surname: String?
//
// enum CodingKeys: String, CodingKey {
// case id = "id"
// case deceased = "deceased"
// case custody = "custody"
// case nationality = "nationality"
// case orderId = "order_id"
// case relation = "relation"
// case hasDegree = "has_degree"
// case hasDegreeJson = "has_degree_json"
// case follow = "follow"
// case statement = "statement"
// case subsetName = "subset_name"
// case subsetNamePinyin = "subset_name_pinyin"
// case usedName = "used_name"
// case birthday = "birthday"
// case birthPlaceAboard = "birth_place_aboard"
// case birthPlace = "birth_place"
// case occupation = "occupation"
// case occupationName = "occupation_name"
// case operatorAme = "operator_ame"
// case childHasHkId = "child_has_hk_id"
// case hkIdentityCard = "hk_identity_card"
// case sex = "sex"
// case married = "married"
// case nows = "nows"
// case address = "address"
// case childStepchild = "child_stepchild"
// case childInHk = "child_in_hk"
// case countryIdentity = "country_identity"
// case hkIdentity = "hk_identity"
// case hkIdentityOther = "hk_identity_other"
// case liveCountry = "live_country"
// case isHandled = "is_handled"
// case finishFollow = "finish_follow"
// case step = "step"
// case notFillNum = "not_fill_num"
// case isLiveOverseaYear = "is_live_oversea_year"
// case surname = "surname"
// case certificates = "certificates"
// }
//
// required init() {
//
// }
//
// // 是否随行
// func isFollow() -> Bool {
// return follow == 1
// }
//
// func setFollow(_ value:Bool) {
// self.follow = (value ? 1 : 0)
// }
//
// // 是否要办理港澳通行证
// func isNeedHandleHKPassPort() -> Bool {
// return self.isHandled == 1
// }
//
// func setNeedHandleHKPassPort(_ value:Bool) {
// self.isHandled = (value ? 1 : 0)
// }
//
// // 是否与主申请人同住
// func isLiveTother() -> Bool {
// return self.nows == 1
// }
//
// func setLiveTother(_ value:Bool) {
// self.nows = (value ? 1 : 0)
// }
//
// // 是否在海外居住满1年及以上
// func isOverSeasOver1Year() -> Bool {
// return self.isLiveOverseaYear == 1
// }
//
// func setOverSearsOver1Year(_ value:Bool) {
// self.isLiveOverseaYear = value ? 1 : 0
// }
//
// // 是否出生国外
// func isBirthOverSeas() -> Bool {
// return self.birthPlaceAboard == 1
// }
//
// func setBirthOverSeas(_ value:Bool) {
// return self.birthPlaceAboard = value ? 1 : 0
// }
//
// // 目前是否在港
// func isNowInHK() -> Bool {
// if let inHK = self.childInHk {
// if inHK.has == "Y" {
// return true
// } else if inHK.has == "N" {
// return false
// }
// }
// return false
// }
//
// func setNowIsInHK(_ value:Bool) {
// self.childInHk?.has = value ? "Y" : "N"
// }
//
// // 是否办理过香港身份证
// func isHaveHKIdentityCard() -> Bool {
// if let hasHkId = self.childHasHkId {
// if hasHkId.has == "Y" {
// return true
// } else if hasHkId.has == "N" {
// return false
// }
// }
// return false
// }
//
// func setHaveHKIdentityCard(_ value:Bool) {
// self.childHasHkId?.has = value ? "Y" : "N"
// }
//
// // 是否拥有学位
// func haveDegreeName() -> String? {
// if hasDegree == "1" {
// return "有学位"
// } else {
// return "无学位"
// }
// }
//
// func isHaveDegree() ->Bool {
// return self.hasDegree == "1"
// }
//
// func setHaveDegree(_ val:Bool) {
// self.hasDegree = val ? "1" : "0"
// }
//
// // 是否已故
// func isDead() -> Bool {
// return self.deceased == 1
// }
//
// func setIsDead(_ val:Bool) {
// self.deceased = (val ? 1 : 0)
// }
//
// // 是否在职
// func isNowHaveJob() -> Bool {
// return self.occupation == "在职"
// }
//
// // 主申请人和现配偶是否拥有孩子抚养权
// func isOwnCustody() -> Bool {
// return self.custody == 1
// }
//
// func setOwnCustody(_ val:Bool) {
// self.custody = val ? 1 : 0
// }
//
// // 是否是男性
// func isMale() -> Bool {
// return self.sex == 1
// }
//
// func setMale(_ val: Bool) {
// self.sex = (val ? 1 : 2)
// }
//
// func sexName() -> String? {
// if self.sex == 1 {
// return "男".local
// } else if self.sex == 2 {
// return "女".local
// }
// return ""
// }
//
// // 是否前一次婚姻子女
// func isPreviousMarriageChild() -> Bool {
// return self.childStepchild?.has == "Y"
// }
//
// func setPreviousMarriageChild(_ val: Bool) {
// self.childStepchild?.has = (val ? "Y" : "N")
// }
//
//
// var relationType:YHFamilyMemberType {
//
// if relation == "1" {
// return .father
// } else if relation == "2" {
// return .mother
// } else if relation == "3" {
// return .spouse
// } else if relation == "4" {
// return .child
// } else if relation == "5" {
// return .brother
// }
//
// return .none
// }
//
// // YHFamilyMemberProtocol
// func getTitle() -> String {
// // 1父亲 2 母亲 3 配偶 4子女 5兄弟姐妹
// if let relation = relation {
// if relation == "1" {
// return "父亲".local
// } else if relation == "2" {
// return "母亲".local
// } else if relation == "3" {
// return "配偶".local
// } else if relation == "4" {
// return "子女".local
// } else if relation == "5" {
// return "兄弟姐妹".local
// }
// }
// return ""
// }
//
// func getSubTitle() -> String {
// return ""
// }
//}
class YHFamilyMember: SmartCodable, YHFormItemProtocol { class YHFamilyMember: SmartCodable, YHFormItemProtocol {
var id: Int = 0 var id: Int = 0
var deceased: Int = 0
var custody: Int = 0
var nationality: String = "" var nationality: String = ""
var orderId: Int = 0 var orderId: Int = 0
var relation: String = "" var relation: String = ""
var hasDegree: String = "" var hasDegree: String = ""
var hasDegreeJson: [YHHasDegreeJson] = [] var hasDegreeJson: [YHHasDegreeJson] = []
var follow: Int = 1
var statement: Int = 0 var statement: Int = 0
var subsetName: String = "" var subsetName: String = ""
var subsetNamePinyin: YHSubsetNamePinyin = YHSubsetNamePinyin() var subsetNamePinyin: YHSubsetNamePinyin = YHSubsetNamePinyin()
var birthday: String = "" var birthday: String = ""
var birthPlaceAboard: Int = 0
var birthPlace: YHAddress = YHAddress() var birthPlace: YHAddress = YHAddress()
var occupation: String = "" var occupation: String = ""
var occupationName: String = "" var occupationName: String = ""
var operatorName: String = "" var operatorName: String = ""
var childHasHkId: YHChildStepchildClass = YHChildStepchildClass()
var hkIdentityCard: String? var hkIdentityCard: String?
var sex: Int = 0
var married: String = "" var married: String = ""
var nows: Int = 0
var address: YHAddress = YHAddress() var address: YHAddress = YHAddress()
var childStepchild: YHChildStepchildClass = YHChildStepchildClass()
var childInHk: YHChildStepchildClass = YHChildStepchildClass()
var countryIdentity: YHChildStepchildClass = YHChildStepchildClass()
var hkIdentity: String = "" var hkIdentity: String = ""
var liveCountry: String = "" var liveCountry: String = ""
var finishFollow: Int = 0 var finishFollow: Int = 0
var step: Int = 0 var step: Int = 0
var isHandled: Int = 0
// notFillNumber = -1 表示还没开始填写任意数据项
var notFillNumber: Int = -1
var certificates: YHCertificates = YHCertificates() var certificates: YHCertificates = YHCertificates()
var usedName: String = "" var usedName: String = ""
var hkIdentityOther: String = "" var hkIdentityOther: String = ""
var isHkHandled: Int = 0 var isHkHandled: Int = 0
var isInHk: Int = 0 var isInHk: Int = 0
var isLiveOverseaYear: Int = 0
var surname: String = "" var surname: String = ""
// 是否办理过香港身份证
var childHasHkId: YHChildStepchildClass = YHChildStepchildClass()
// 是否前一次婚姻子女
var childStepchild: YHChildStepchildClass = YHChildStepchildClass()
// 目前是否在港
var childInHk: YHChildStepchildClass = YHChildStepchildClass(has:"N")
var countryIdentity: YHChildStepchildClass = YHChildStepchildClass()
// 是否已故 1:是 0：否
var deceased: Int = 0
// 主申请人和现配偶是否拥有孩子抚养权 1:是 0：否
var custody: Int = 0
// 是否出生国外 1:是 0：否
var birthPlaceAboard: Int = 0
// 是否与主申请人同住 1：是 0：否
var nows: Int = 0
// 是否要办理港澳通行证 1：是 0：否
var isHandled: Int = 0
// notFillNumber = -1 表示还没开始填写任意数据项
var notFillNumber: Int = -1
// 是否随行 1：是 2：否
var follow: Int = 1
// 是否在海外居住满1年及以上 1:是 2：否
var isLiveOverseaYear: Int = 2
// 性别 1:男 2：女
var sex: Int = 1
func checkDefaultValue() -> Self {
if hasDegree.isEmpty { // 默认无学位
hasDegree = "0"
}
if childHasHkId.has.isEmpty { // 默认未办理过香港身份证
childHasHkId.has = "N"
}
if childStepchild.has.isEmpty { // 默认不是前一次婚姻子女
childStepchild.has = "N"
}
if childInHk.has.isEmpty { // // 默认目前不在香港港
childInHk.has = "N"
}
if follow != 1 && follow != 2 { // 默认随行
follow = 1
}
if isLiveOverseaYear != 1 && isLiveOverseaYear != 2 { // 默认在海外未居住满一年以上
isLiveOverseaYear = 2
}
if sex != 1 && sex != 2 { // 默认为男性
sex = 1
}
return self
}
enum CodingKeys: String, CodingKey { enum CodingKeys: String, CodingKey {
case id = "id" case id = "id"
...@@ -982,7 +731,7 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol { ...@@ -982,7 +731,7 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
} }
func setFollow(_ value:Bool) { func setFollow(_ value:Bool) {
self.follow = (value ? 1 : 0) self.follow = (value ? 1 : 2)
} }
// 是否要办理港澳通行证 // 是否要办理港澳通行证
...@@ -1009,7 +758,7 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol { ...@@ -1009,7 +758,7 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
} }
func setOverSearsOver1Year(_ value:Bool) { func setOverSearsOver1Year(_ value:Bool) {
self.isLiveOverseaYear = value ? 1 : 0 self.isLiveOverseaYear = value ? 1 : 2
} }
// 是否出生国外 // 是否出生国外
...@@ -1275,6 +1024,13 @@ class YHChildStepchildClass: SmartCodable { ...@@ -1275,6 +1024,13 @@ class YHChildStepchildClass: SmartCodable {
required init() { required init() {
} }
init(has:String = "", info:String = "", year:String = "", month:String = "") {
self.has = has
self.info = info
self.year = year
self.month = month
}
} }
// MARK: - YHSubsetNamePinyin // MARK: - YHSubsetNamePinyin
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/M/YHFamilyMemberViewModel.swift
View file @ 5e5d8f72
...@@ -79,16 +79,16 @@ class YHFamilyMemberViewModel : YHBaseViewModel{ ...@@ -79,16 +79,16 @@ class YHFamilyMemberViewModel : YHBaseViewModel{
} }
} }
if model.term_begins.count != 0 { if model.term_begins.count != 0 {
mainModel.certificates.hkMacaoPass.issueDateStartAt = model.term_begins.toTimeString() mainModel.certificates.cnIdentityCard.issueDateStartAt = model.term_begins.toTimeString()
} }
if model.end_of_term.count != 0 { if model.end_of_term.count != 0 {
mainModel.certificates.hkMacaoPass.issueDateEndAt = model.end_of_term.toTimeString() mainModel.certificates.cnIdentityCard.issueDateEndAt = model.end_of_term.toTimeString()
} }
if model.issuing_authority.count != 0 { if model.issuing_authority.count != 0 {
mainModel.certificates.hkMacaoPass.issueAt = model.issuing_authority mainModel.certificates.cnIdentityCard.issueAt = model.issuing_authority
} }
if model.card_num.count != 0 { if model.card_num.count != 0 {
mainModel.certificates.hkMacaoPass.number = model.card_num mainModel.certificates.cnIdentityCard.number = model.card_num
} }
} }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/M/YHFamilyRequestViewModel.swift
View file @ 5e5d8f72
...@@ -32,7 +32,7 @@ class YHFamilyRequestViewModel { ...@@ -32,7 +32,7 @@ class YHFamilyRequestViewModel {
callBackBlock(false,nil) callBackBlock(false,nil)
return return
} }
familyInfo = resultModel familyInfo = resultModel.checkDefaultValue()
callBackBlock(true,nil) callBackBlock(true,nil)
} failBlock: { err in } failBlock: { err in
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/V/PickerView/YHSheetPickerView.swift
View file @ 5e5d8f72
...@@ -230,8 +230,8 @@ class YHSheetPickerView: UIView { ...@@ -230,8 +230,8 @@ class YHSheetPickerView: UIView {
// 是否拥有学位 // 是否拥有学位
.ownDegree: .ownDegree:
[YHSheetPickerViewItem(title:"有学位".local, index:0), [YHSheetPickerViewItem(title:"无学位".local, index:0),
YHSheetPickerViewItem(title:"无学位".local, index:1), YHSheetPickerViewItem(title:"有学位".local, index:1),
], ],
// 学位颁发地区 // 学位颁发地区
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/V/YHFormItemDoubleChoiceCell.swift
View file @ 5e5d8f72
...@@ -39,12 +39,9 @@ class YHFormItemDoubleChoiceCell: UITableViewCell { ...@@ -39,12 +39,9 @@ class YHFormItemDoubleChoiceCell: UITableViewCell {
var isMust:Bool = false var isMust:Bool = false
var answerBlock:(([YHFormChoiceItem], Int)->Void)? var answerBlock:(([YHFormChoiceItem], Int)->Void)?
// 是否能点击两个按钮 // 是否能点击两个按钮
var isCanEdit:Bool = true { var enableEdit:Bool = true
didSet { // 不能编辑时的提示语
answer1Btn.isUserInteractionEnabled = isCanEdit var disableEditTips:String?
answer2Btn.isUserInteractionEnabled = isCanEdit
}
}
var title:String? { var title:String? {
didSet { didSet {
...@@ -222,6 +219,15 @@ class YHFormItemDoubleChoiceCell: UITableViewCell { ...@@ -222,6 +219,15 @@ class YHFormItemDoubleChoiceCell: UITableViewCell {
@objc func didClickResponseBtn(btn: UIButton) { @objc func didClickResponseBtn(btn: UIButton) {
if !enableEdit {
if let tips = disableEditTips, !tips.isEmpty {
YHHUD.flash(message: tips)
} else {
YHHUD.flash(message: "不可点击")
}
return
}
let selectIndex = btn.tag-answerBaseTag let selectIndex = btn.tag-answerBaseTag
if let resultArr = answerArr, resultArr.count == 2 { if let resultArr = answerArr, resultArr.count == 2 {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MainApplicantInformation(主申请人信息)/V/YHItemView.swift
View file @ 5e5d8f72
...@@ -213,7 +213,7 @@ class YHItemView: UIView { ...@@ -213,7 +213,7 @@ class YHItemView: UIView {
if dataSource.message == "0" { if dataSource.message == "0" {
messageTextField.text = "" messageTextField.text = ""
} }
let arr = YHOtherInfoFillViewModel.arrIdType let arr = YHConstantArrayData.arrIdType
arr.forEach { item in arr.forEach { item in
if item["id"] == dataSource.message { if item["id"] == dataSource.message {
messageTextField.text = item["title"] messageTextField.text = item["title"]
...@@ -224,7 +224,7 @@ class YHItemView: UIView { ...@@ -224,7 +224,7 @@ class YHItemView: UIView {
if dataSource.message == "0" { if dataSource.message == "0" {
messageTextField.text = "" messageTextField.text = ""
} }
let arr = YHOtherInfoFillViewModel.arrSex let arr = YHConstantArrayData.arrSex
arr.forEach { item in arr.forEach { item in
if item["id"] == dataSource.message { if item["id"] == dataSource.message {
messageTextField.text = item["title"] messageTextField.text = item["title"]
...@@ -234,7 +234,7 @@ class YHItemView: UIView { ...@@ -234,7 +234,7 @@ class YHItemView: UIView {
if dataSource.message == "0" { if dataSource.message == "0" {
messageTextField.text = "" messageTextField.text = ""
} }
let arr = YHOtherInfoFillViewModel.arrMarry let arr = YHConstantArrayData.arrMarry
arr.forEach { item in arr.forEach { item in
if item["id"] == dataSource.message { if item["id"] == dataSource.message {
messageTextField.text = item["title"] messageTextField.text = item["title"]
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MainApplicantInformation(主申请人信息)/VM/YHMainApplicantInformationViewModel.swift
View file @ 5e5d8f72
...@@ -272,16 +272,16 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel { ...@@ -272,16 +272,16 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
} }
} }
if model.term_begins.count != 0 { if model.term_begins.count != 0 {
mainModel.certificates.hk_macao_pass.issue_date_start_at = model.term_begins.toTimeString() mainModel.certificates.cn_identity_card.issue_date_start_at = model.term_begins.toTimeString()
} }
if model.end_of_term.count != 0 { if model.end_of_term.count != 0 {
mainModel.certificates.hk_macao_pass.issue_date_end_at = model.end_of_term.toTimeString() mainModel.certificates.cn_identity_card.issue_date_end_at = model.end_of_term.toTimeString()
} }
if model.issuing_authority.count != 0 { if model.issuing_authority.count != 0 {
mainModel.certificates.hk_macao_pass.issue_at = model.issuing_authority mainModel.certificates.cn_identity_card.issue_at = model.issuing_authority
} }
if model.card_num.count != 0 { if model.card_num.count != 0 {
mainModel.certificates.hk_macao_pass.number = model.card_num mainModel.certificates.cn_identity_card.number = model.card_num
} }
} }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/OtherInformation(其他信息)/M/YHOtherInfoFillModel.swift
View file @ 5e5d8f72
...@@ -34,7 +34,7 @@ class Residence : SmartCodable { ...@@ -34,7 +34,7 @@ class Residence : SmartCodable {
var end_time: String = "" var end_time: String = ""
var order_id: Int = -1 var order_id: Int = -1
var end_time_checked: Bool = false //是否勾选 至今 var end_time_checked: Bool = false //是否勾选 长期
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/OtherInformation(其他信息)/V/YHOtherInfoFillCell.swift
View file @ 5e5d8f72
...@@ -109,7 +109,9 @@ extension YHOtherInfoFillCell { ...@@ -109,7 +109,9 @@ extension YHOtherInfoFillCell {
lastTargetView = residenceView lastTargetView = residenceView
} else { } else {
let sessionView = YHOtherInfoSessionView(frame: .zero) let sessionView = YHOtherInfoSessionView(frame: .zero)
let title = "居住信息" + String(index + 1)
let addationIndex = dataModel.residences.count > 1 ? String(index + 1) : ""
let title = "居住信息" + addationIndex
sessionView.updateTitle(title: title) sessionView.updateTitle(title: title)
sessionView.type = 1 sessionView.type = 1
sessionView.tag = index sessionView.tag = index
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/OtherInformation(其他信息)/V/YHOtherPickerView.swift
View file @ 5e5d8f72
...@@ -9,32 +9,6 @@ ...@@ -9,32 +9,6 @@
import UIKit import UIKit
import AttributedString import AttributedString
enum YHOtherPickerViewType: Int {
// 按自然顺序递增
case none = 0
// 语言能力
case language
// 专业技能行业
case professionalSkill
// 用人单位性质
case nature
// 工作证明文件
case certificate
// 行政架构层级
case structure
// 职位水平类别
case level
// 高管证明文件
case prove
// 证件类别
case idType
// 性别
case sex
// 婚姻状况
case marry
}
struct YHOtherPickerViewItemData { struct YHOtherPickerViewItemData {
let title : String let title : String
let subTitle : String let subTitle : String
...@@ -356,7 +330,7 @@ extension YHOtherPickerView { ...@@ -356,7 +330,7 @@ extension YHOtherPickerView {
//根据type 构建对应的数据源 //根据type 构建对应的数据源
switch type { switch type {
case .language: case .language:
let arr = YHOtherInfoFillViewModel.arrLanguage let arr = YHConstantArrayData.arrLanguage
arrData.removeAll() arrData.removeAll()
arr.forEach { item in arr.forEach { item in
let model = YHOtherPickerViewItemData(title: item["title"] ?? "-", subTitle: item["dec"] ?? "-", index: item["id"] ?? "-") let model = YHOtherPickerViewItemData(title: item["title"] ?? "-", subTitle: item["dec"] ?? "-", index: item["id"] ?? "-")
...@@ -366,7 +340,7 @@ extension YHOtherPickerView { ...@@ -366,7 +340,7 @@ extension YHOtherPickerView {
return return
case .professionalSkill: case .professionalSkill:
let arr = YHOtherInfoFillViewModel.arrSkill let arr = YHConstantArrayData.arrSkill
arrData.removeAll() arrData.removeAll()
arr.forEach { item in arr.forEach { item in
let model = YHOtherPickerViewItemData(title: item["title"] ?? "-", subTitle: item["dec"] ?? "-", index: item["value"] ?? "-") let model = YHOtherPickerViewItemData(title: item["title"] ?? "-", subTitle: item["dec"] ?? "-", index: item["value"] ?? "-")
...@@ -376,7 +350,7 @@ extension YHOtherPickerView { ...@@ -376,7 +350,7 @@ extension YHOtherPickerView {
return return
case .nature: case .nature:
let arr = YHOtherInfoFillViewModel.arrNature let arr = YHConstantArrayData.arrNature
arrData.removeAll() arrData.removeAll()
arr.forEach { item in arr.forEach { item in
let model = YHOtherPickerViewItemData(title: item["title"] ?? "-", subTitle: "", index: item["id"] ?? "-") let model = YHOtherPickerViewItemData(title: item["title"] ?? "-", subTitle: "", index: item["id"] ?? "-")
...@@ -384,7 +358,7 @@ extension YHOtherPickerView { ...@@ -384,7 +358,7 @@ extension YHOtherPickerView {
} }
title = getTitle(type: type) title = getTitle(type: type)
case .certificate: case .certificate:
let arr = YHOtherInfoFillViewModel.arrCertificate let arr = YHConstantArrayData.arrCertificate
arrData.removeAll() arrData.removeAll()
arr.forEach { item in arr.forEach { item in
let model = YHOtherPickerViewItemData(title: item["title"] ?? "-", subTitle: "", index: item["id"] ?? "-") let model = YHOtherPickerViewItemData(title: item["title"] ?? "-", subTitle: "", index: item["id"] ?? "-")
...@@ -392,7 +366,7 @@ extension YHOtherPickerView { ...@@ -392,7 +366,7 @@ extension YHOtherPickerView {
} }
title = getTitle(type: type) title = getTitle(type: type)
case .structure: case .structure:
let arr = YHOtherInfoFillViewModel.arrStructure let arr = YHConstantArrayData.arrStructure
arrData.removeAll() arrData.removeAll()
arr.forEach { item in arr.forEach { item in
let model = YHOtherPickerViewItemData(title: item["title"] ?? "-", subTitle: "", index: item["id"] ?? "-") let model = YHOtherPickerViewItemData(title: item["title"] ?? "-", subTitle: "", index: item["id"] ?? "-")
...@@ -400,7 +374,7 @@ extension YHOtherPickerView { ...@@ -400,7 +374,7 @@ extension YHOtherPickerView {
} }
title = getTitle(type: type) title = getTitle(type: type)
case .level: case .level:
let arr = YHOtherInfoFillViewModel.arrLevel let arr = YHConstantArrayData.arrLevel
arrData.removeAll() arrData.removeAll()
arr.forEach { item in arr.forEach { item in
let model = YHOtherPickerViewItemData(title: item["title"] ?? "-", subTitle: "", index: item["id"] ?? "-") let model = YHOtherPickerViewItemData(title: item["title"] ?? "-", subTitle: "", index: item["id"] ?? "-")
...@@ -408,7 +382,7 @@ extension YHOtherPickerView { ...@@ -408,7 +382,7 @@ extension YHOtherPickerView {
} }
title = getTitle(type: type) title = getTitle(type: type)
case .prove: case .prove:
let arr = YHOtherInfoFillViewModel.arrProve let arr = YHConstantArrayData.arrProve
arrData.removeAll() arrData.removeAll()
arr.forEach { item in arr.forEach { item in
let model = YHOtherPickerViewItemData(title: item["title"] ?? "-", subTitle: "", index: item["id"] ?? "-") let model = YHOtherPickerViewItemData(title: item["title"] ?? "-", subTitle: "", index: item["id"] ?? "-")
...@@ -416,7 +390,7 @@ extension YHOtherPickerView { ...@@ -416,7 +390,7 @@ extension YHOtherPickerView {
} }
title = getTitle(type: type) title = getTitle(type: type)
case .idType: case .idType:
let arr = YHOtherInfoFillViewModel.arrIdType let arr = YHConstantArrayData.arrIdType
arrData.removeAll() arrData.removeAll()
arr.forEach { item in arr.forEach { item in
let model = YHOtherPickerViewItemData(title: item["title"] ?? "-", subTitle: "", index: item["id"] ?? "-") let model = YHOtherPickerViewItemData(title: item["title"] ?? "-", subTitle: "", index: item["id"] ?? "-")
...@@ -424,7 +398,7 @@ extension YHOtherPickerView { ...@@ -424,7 +398,7 @@ extension YHOtherPickerView {
} }
title = getTitle(type: type) title = getTitle(type: type)
case .sex: case .sex:
let arr = YHOtherInfoFillViewModel.arrSex let arr = YHConstantArrayData.arrSex
arrData.removeAll() arrData.removeAll()
arr.forEach { item in arr.forEach { item in
let model = YHOtherPickerViewItemData(title: item["title"] ?? "-", subTitle: "", index: item["id"] ?? "-") let model = YHOtherPickerViewItemData(title: item["title"] ?? "-", subTitle: "", index: item["id"] ?? "-")
...@@ -432,7 +406,7 @@ extension YHOtherPickerView { ...@@ -432,7 +406,7 @@ extension YHOtherPickerView {
} }
title = getTitle(type: type) title = getTitle(type: type)
case .marry: case .marry:
let arr = YHOtherInfoFillViewModel.arrMarry let arr = YHConstantArrayData.arrMarry
arrData.removeAll() arrData.removeAll()
arr.forEach { item in arr.forEach { item in
let model = YHOtherPickerViewItemData(title: item["title"] ?? "-", subTitle: "", index: item["id"] ?? "-") let model = YHOtherPickerViewItemData(title: item["title"] ?? "-", subTitle: "", index: item["id"] ?? "-")
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/OtherInformation(其他信息)/VM/YHOtherInfoFillViewModel.swift
View file @ 5e5d8f72
...@@ -10,312 +10,6 @@ import UIKit ...@@ -10,312 +10,6 @@ import UIKit
class YHOtherInfoFillViewModel: YHBaseViewModel { class YHOtherInfoFillViewModel: YHBaseViewModel {
var otherInfoFillData : YHOtherInfoFillModel? var otherInfoFillData : YHOtherInfoFillModel?
static let arrLanguage : [[String : String]] = [
[
"id":"1",
"title": "中文及英文",
"dec": "国外大学（英语国家）毕业，英文授课，获得学位证。（如为中外联合办学，在中国上课的，不算）",
],
[
"id": "2",
"title": "中文及英文",
"dec": " 有近两年的雅思或托福成绩单（雅思考试G类或A类总分达6分；托福笔试达550分，计算机达213分，网考达80分）",
],
[
"id": "4",
"title": "中文及另一种外语",
"dec": "非英文的外语，如：法文、日文等（需提供相关证书）",
],
[
"id": "5",
"title": "仅中文",
"dec": "",
],
[
"id": "6",
"title": "仅英文",
"dec": "",
],
]
static let arrSkill : [[String : String]] = [
[
"title": "学术研究及教育",
"dec": "幼儿教育、高等教育、学术研究",
"val": "",
"value": "1",
],
[
"title": "建筑、测量、工程及建造",
"dec": "园景设计、建筑、测量、土木/电机/机器/机构/环境工程",
"val": "",
"value": "2",
],
[
"title": "艺术及文化",
"dec": "表演艺术、美术、博物馆、图书馆、摄影",
"val": "",
"value": "3",
],
[
"title": "广播及娱乐",
"dec": "广播及节目制作、电影、录像及电视制作、唱片及音乐出版",
"val": "",
"value": "4",
],
[
"title": "业务支援及人力资源",
"dec": "业务咨询顾问、公司秘书、行政支援、人事管理、招聘服务、公关关系服务、广告、信息服务",
"val": "",
"value": "5",
],
[
"title": "餐饮服务及旅游",
"dec": "酒吧、餐厅、酒店、旅行代理",
"val": "",
"value": "6",
],
[
"title": "商业及贸易",
"dec": "进出口、零售、批发",
"val": "",
"value": "7",
],
[
"title": "金融及会计服务",
"dec": "会计、银行、保险、证券、投资银行",
"val": "",
"value": "8",
],
[
"title": "医疗保健及兽医服务",
"dec": "西医药、中医药、牙科服务、医学科技、职业治疗、护理、兽医服务",
"val": "",
"value": "9",
],
[
"title": "资讯科技及电讯",
"dec": "资讯科技顾问、固网及无线通信",
"val": "",
"value": "10",
],
[
"title": "法律服务",
"dec": "法律事务",
"val": "",
"value": "11",
],
[
"title": "物流运输",
"dec": "物流、空运、海运、陆运",
"val": "",
"value": "12",
],
[
"title": "工业制造",
"dec": "电机、电子、食物及饮料、化工、金属、玩具、纺织、钟表、珠宝、印刷及出版",
"val": "",
"value": "13",
],
[
"title": "体育运动",
"dec": "体育运动",
"val": "",
"value": "14",
],
[
"title": "其他",
"example": "",
"val": "",
"value": "15",
"dec": ""
],
]
static let arrNature : [[String : String]] = [
[
"title": "有限责任公司",
"id": "有限责任公司"
],
[
"title": "股份有限公司",
"id": "股份有限公司"
],
[
"title": "跨国有限责任公司",
"id": "跨国有限责任公司"
],
[
"title": "跨国股份有限公司",
"id": "跨国股份有限公司"
],
[
"title": "上市公司",
"id": "上市公司"
],
[
"title": "上市跨国公司",
"id": "上市跨国公司"
],
[
"title": "教育机构",
"id": "教育机构"
],
[
"title": "半公营企业",
"id": "半公营企业"
],
[
"title": "政府机构",
"id": "政府机构"
],
[
"title": "跨国合伙企业",
"id": "跨国合伙企业"
],
[
"title": "跨国个人独资企业",
"id": "跨国个人独资企业"
],
[
"title": "个人独资企业",
"id": "个人独资企业"
],
[
"title": "国家/政府间组织",
"id": "国家/政府间组织"
],
[
"title": "志愿/慈善/宗教团体",
"id": "志愿/慈善/宗教团体"
],
[
"title": "其他（请备注）",
"id": "其他（请备注）"
]
]
static let arrCertificate : [[String : String]] = [
["id": "盖章并签字的推荐信 (证明效果最强)",
"title": "盖章并签字的推荐信 (证明效果最强)"
],
["id": "签字的推荐信+盖章的工作证明",
"title": "签字的推荐信+盖章的工作证明"
],
["id": "仅有签字的推荐信",
"title": "仅有签字的推荐信"
],
["id": "仅有社保记录/劳动合同/工牌等",
"title": "仅有社保记录/劳动合同/工牌等"
],
["id": "仅提供声明书解释",
"title": "仅提供声明书解释"
],
["id": "仅有工作证明",
"title": "仅有工作证明"
]
]
static let arrStructure : [[String : String]] = [
["title": "组织架构最顶级",
"id": "1"
],
["title": "组织架构第二层级",
"id": "2"
],
["title": "组织架构第三层级",
"id": "3"
],
["title": "组织架构第四层级",
"id": "4"
],
["title": "以上都不是",
"id": "5"
]
]
static let arrLevel : [[String : String]] = [
["title": "高级经理人",
"id": "1"
],
["title": "中级经理人",
"id": "2"
],
["title": "初级经理人",
"id": "3"
],
["title": "专业人士",
"id": "4"
],
["title": "半专业人士",
"id": "5"
],
["title": "其他",
"id": "6"
]
]
static let arrProve : [[String : String]] = [
["title": "盖章且签字的组织架构图和审计报告",
"id": "盖章且签字的组织架构图和审计报告"
]
]
static let arrIdType : [[String : String]] = [
["title": "护照",
"id": "3"
],
["title": "外交护照",
"id": "4"
],
["title": "公务护照",
"id": "5"
],
["title": "中国发无国籍旅游证件",
"id": "6"
],
["title": "旅游通行证",
"id": "7"
],
["title": "联合国通行证",
"id": "8"
],
["title": "其他无国籍旅行证件",
"id": "9"
],
["title": "其他",
"id": "10"
]
]
static let arrSex : [[String : String]] = [
["title": "男",
"id": "1"
],
["title": "女",
"id": "2"
]
]
static let arrMarry : [[String : String]] = [
["title": "已婚",
"id": "1"
],
["title": "未婚",
"id": "2"
],
["title": "离婚",
"id": "3"
],
["title": "分居",
"id": "4"
],
["title": "丧偶",
"id": "5"
]
]
} }
extension YHOtherInfoFillViewModel { extension YHOtherInfoFillViewModel {
...@@ -384,7 +78,7 @@ extension YHOtherInfoFillViewModel { ...@@ -384,7 +78,7 @@ extension YHOtherInfoFillViewModel {
if let language = self.otherInfoFillData?.language_detail { if let language = self.otherInfoFillData?.language_detail {
if language.level > 0 { if language.level > 0 {
let target = String(language.level) let target = String(language.level)
for(_,item) in YHOtherInfoFillViewModel.arrLanguage.enumerated() { for(_,item) in YHConstantArrayData.arrLanguage.enumerated() {
if target == item["id"] { if target == item["id"] {
language.levelDes = item["title"] ?? "" language.levelDes = item["title"] ?? ""
...@@ -394,12 +88,10 @@ extension YHOtherInfoFillViewModel { ...@@ -394,12 +88,10 @@ extension YHOtherInfoFillViewModel {
} }
} }
if let profession = self.otherInfoFillData?.profession { if let profession = self.otherInfoFillData?.profession {
if profession.option > 0 { if profession.option > 0 {
let target = String(profession.option) let target = String(profession.option)
for(_,item) in YHOtherInfoFillViewModel.arrSkill.enumerated() { for(_,item) in YHConstantArrayData.arrSkill.enumerated() {
if target == item["value"] { if target == item["value"] {
profession.optionDes = item["title"] ?? "" profession.optionDes = item["title"] ?? ""
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/M/YHMainInfoPreviewModel.swift
View file @ 5e5d8f72
...@@ -75,7 +75,7 @@ class YHCNIdentityCardPreviewModel: SmartCodable { ...@@ -75,7 +75,7 @@ class YHCNIdentityCardPreviewModel: SmartCodable {
case issueDateEndAt = "issue_date_end_at" case issueDateEndAt = "issue_date_end_at"
case imgFront = "img_front" case imgFront = "img_front"
case imgBack = "img_back" case imgBack = "img_back"
case passport_type = "passport_type" case passport_type = "pass_port_type"
case type = "type" case type = "type"
} }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/VM/YHPreviewViewModel.swift
View file @ 5e5d8f72
...@@ -131,6 +131,8 @@ extension YHPreviewViewModel { ...@@ -131,6 +131,8 @@ extension YHPreviewViewModel {
let _ = YHNetRequest.getRequest(url: strUrl,params: params) { [weak self] json, code in let _ = YHNetRequest.getRequest(url: strUrl,params: params) { [weak self] json, code in
//1. json字符串 转 对象 //1. json字符串 转 对象
guard let self = self else { return } guard let self = self else { return }
arrDataForMainApplicationInfo.removeAll()
if json.code == 200 { if json.code == 200 {
let dic = json.data as? [AnyHashable : Any] let dic = json.data as? [AnyHashable : Any]
guard let result = YHMainInfoPreviewModel.deserialize(dict: dic) else { guard let result = YHMainInfoPreviewModel.deserialize(dict: dic) else {
...@@ -141,12 +143,10 @@ extension YHPreviewViewModel { ...@@ -141,12 +143,10 @@ extension YHPreviewViewModel {
installDataForMainApplicationInfo() installDataForMainApplicationInfo()
callBackBlock(true, nil) callBackBlock(true, nil)
} else { } else {
installDataForMainApplicationInfo() //for test hjl
let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg) let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
callBackBlock(false, error) callBackBlock(false, error)
} }
} failBlock: { err in } failBlock: { err in
self.installDataForMainApplicationInfo()//for test hjl
callBackBlock(false,err) callBackBlock(false,err)
} }
} }
...@@ -240,10 +240,14 @@ private extension YHPreviewViewModel { ...@@ -240,10 +240,14 @@ private extension YHPreviewViewModel {
title = model.international_work_experience == 0 ? "否" : "是" title = model.international_work_experience == 0 ? "否" : "是"
let tmp11 = YHPreviewQuestionAndAnswerModel(question: "相关工作是否属国际工作经验：", answer:title) let tmp11 = YHPreviewQuestionAndAnswerModel(question: "相关工作是否属国际工作经验：", answer:title)
let tmp12 = YHPreviewQuestionAndAnswerModel(question: "企业人数规模：", answer:String(model.company_member_total)) let tmp12 = YHPreviewQuestionAndAnswerModel(question: "企业人数规模：", answer:String(model.company_member_total))
let tmp13 = YHPreviewQuestionAndAnswerModel(question: "行政架构层级：", answer:String(model.administrative_level))
let tempppp = YHConstantArrayData.getShowNameBy(indexStr: String(model.administrative_level), type: .structure)
let tmp13 = YHPreviewQuestionAndAnswerModel(question: "行政架构层级：", answer:tempppp)
let tmp14 = YHPreviewQuestionAndAnswerModel(question: "下属管理人数：", answer:String(model.company_manage_total)) let tmp14 = YHPreviewQuestionAndAnswerModel(question: "下属管理人数：", answer:String(model.company_manage_total))
let tmp15 = YHPreviewQuestionAndAnswerModel(question: "公司营业额/港元(近一年)：", answer:String(model.turnover)) let tmp15 = YHPreviewQuestionAndAnswerModel(question: "公司营业额/港元(近一年)：", answer:String(model.turnover))
let tmp16 = YHPreviewQuestionAndAnswerModel(question: "职业水平类别：", answer:String(model.professional_level))
let tempppp0 = YHConstantArrayData.getShowNameBy(indexStr: String(model.administrative_level), type: .level)
let tmp16 = YHPreviewQuestionAndAnswerModel(question: "职业水平类别：", answer:tempppp0)
arr1.append(contentsOf: [tmp1,tmp2,tmp3,tmp4,tmp5,tmp6,tmp7,tmp8,tmp9,tmp10,tmp11,tmp12,tmp13,tmp14,tmp15,tmp16]) arr1.append(contentsOf: [tmp1,tmp2,tmp3,tmp4,tmp5,tmp6,tmp7,tmp8,tmp9,tmp10,tmp11,tmp12,tmp13,tmp14,tmp15,tmp16])
} }
...@@ -271,7 +275,9 @@ private extension YHPreviewViewModel { ...@@ -271,7 +275,9 @@ private extension YHPreviewViewModel {
let tmp3 = YHPreviewQuestionAndAnswerModel(question: "项目业绩/亮点", answer:item.project_highlights) let tmp3 = YHPreviewQuestionAndAnswerModel(question: "项目业绩/亮点", answer:item.project_highlights)
let arrT : [YHPreviewQuestionAndAnswerModel] = [tmp1,tmp2,tmp3] let arrT : [YHPreviewQuestionAndAnswerModel] = [tmp1,tmp2,tmp3]
let dataModelTemp = YHWorkExpDataModel(title: "项目介绍" + String(index + 1), data: arrT)
let addationIndex = list.count > 1 ? String(index + 1) : ""
let dataModelTemp = YHWorkExpDataModel(title: "项目介绍" + addationIndex, data: arrT)
arr3.append(dataModelTemp) arr3.append(dataModelTemp)
} }
} }
...@@ -293,8 +299,8 @@ private extension YHPreviewViewModel { ...@@ -293,8 +299,8 @@ private extension YHPreviewViewModel {
let dataModel4 = YHWorkExpDataModel(title: "", data: arr4) let dataModel4 = YHWorkExpDataModel(title: "", data: arr4)
let addationIndex = list.count > 1 ? String(index + 1) : ""
let mmmm = YHPreviewInfoSessionModel(cellType: .workExp, cellTitle: "主申请人工作经历" + String(index + 1), cellData4: [dataModel1,dataModel2,dataModel3,dataModel4]) let mmmm = YHPreviewInfoSessionModel(cellType: .workExp, cellTitle: "主申请人工作经历" + addationIndex, cellData4: [dataModel1,dataModel2,dataModel3,dataModel4])
arrDataForWorkExpInfo.append(mmmm) arrDataForWorkExpInfo.append(mmmm)
} }
} }
...@@ -305,8 +311,8 @@ private extension YHPreviewViewModel { ...@@ -305,8 +311,8 @@ private extension YHPreviewViewModel {
arrDataForAcademicInfo.removeAll() arrDataForAcademicInfo.removeAll()
guard let model0 = academicInfoPreviewModel else { return} guard let model0 = academicInfoPreviewModel else { return}
do { do {
if let arr = model0.edu_list { if let arr0 = model0.edu_list {
for(index,model) in arr.enumerated() { for(index,model) in arr0.enumerated() {
//主申请人学历 //主申请人学历
let tmp0 = YHPreviewQuestionAndAnswerModel(question: "学校全称：", answer:model.college) let tmp0 = YHPreviewQuestionAndAnswerModel(question: "学校全称：", answer:model.college)
let tmp1 = YHPreviewQuestionAndAnswerModel(question: "授课形式：", answer:model.type) let tmp1 = YHPreviewQuestionAndAnswerModel(question: "授课形式：", answer:model.type)
...@@ -333,7 +339,9 @@ private extension YHPreviewViewModel { ...@@ -333,7 +339,9 @@ private extension YHPreviewViewModel {
let tmp7 = YHPreviewQuestionAndAnswerModel(question: "上课地点：", answer:title) let tmp7 = YHPreviewQuestionAndAnswerModel(question: "上课地点：", answer:title)
let arr = [tmp0,tmp1,tmp2,tmp3,tmp4,tmp5,tmp6,tmp7] let arr = [tmp0,tmp1,tmp2,tmp3,tmp4,tmp5,tmp6,tmp7]
let model2 = YHPreviewInfoSessionModel(cellType: .countryInfoType, cellTitle: "主申请人学历" + String(index + 1), cellData0: arr)
let addationIndex = arr0.count > 1 ? String(index + 1) : ""
let model2 = YHPreviewInfoSessionModel(cellType: .countryInfoType, cellTitle: "主申请人学历" + addationIndex, cellData0: arr)
arrDataForAcademicInfo.append(model2) arrDataForAcademicInfo.append(model2)
} }
} }
...@@ -361,8 +369,11 @@ private extension YHPreviewViewModel { ...@@ -361,8 +369,11 @@ private extension YHPreviewViewModel {
title = "--" title = "--"
} }
let tmp3 = YHPreviewQuestionAndAnswerModel(question: "颁授城市：", answer:title) let tmp3 = YHPreviewQuestionAndAnswerModel(question: "颁授城市：", answer:title)
let arr = [tmp0,tmp1,tmp2,tmp3] let arr000 = [tmp0,tmp1,tmp2,tmp3]
let model2 = YHPreviewInfoSessionModel(cellType: .countryInfoType, cellTitle: "主申请人专业资格及会员资格" + String(index + 1), cellData0: arr)
let addationIndex = arr.count > 1 ? String(index + 1) : ""
let model2 = YHPreviewInfoSessionModel(cellType: .countryInfoType, cellTitle: "主申请人专业资格及会员资格" + addationIndex, cellData0: arr000)
arrDataForAcademicInfo.append(model2) arrDataForAcademicInfo.append(model2)
} }
} }
...@@ -402,8 +413,13 @@ private extension YHPreviewViewModel { ...@@ -402,8 +413,13 @@ private extension YHPreviewViewModel {
let tmp2 = YHPreviewQuestionAndAnswerModel(question: "婚前姓氏：", answer: model.surname.isEmpty ? "--" : model.surname) let tmp2 = YHPreviewQuestionAndAnswerModel(question: "婚前姓氏：", answer: model.surname.isEmpty ? "--" : model.surname)
let tmp3 = YHPreviewQuestionAndAnswerModel(question: "出生日期：", answer: model.birthday) let tmp3 = YHPreviewQuestionAndAnswerModel(question: "出生日期：", answer: model.birthday)
let tmp4 = YHPreviewQuestionAndAnswerModel(question: "出生城市：", answer: model.birth_place) let tmp4 = YHPreviewQuestionAndAnswerModel(question: "出生城市：", answer: model.birth_place)
let tmp5 = YHPreviewQuestionAndAnswerModel(question: "性别：", answer: model.sex)//for test hjl todo
let tmp6 = YHPreviewQuestionAndAnswerModel(question: "婚姻状况：", answer: model.married)//for test hjl todo var msg = YHConstantArrayData.getShowNameBy(indexStr: model.sex, type: .sex)
let tmp5 = YHPreviewQuestionAndAnswerModel(question: "性别：", answer: msg)
msg = YHConstantArrayData.getShowNameBy(indexStr: model.married, type: .marry)
let tmp6 = YHPreviewQuestionAndAnswerModel(question: "婚姻状况：", answer: msg)
let tmp7 = YHPreviewQuestionAndAnswerModel(question: "手机号：", answer: model.mobile) let tmp7 = YHPreviewQuestionAndAnswerModel(question: "手机号：", answer: model.mobile)
let tmp8 = YHPreviewQuestionAndAnswerModel(question: "邮箱：", answer: model.email) let tmp8 = YHPreviewQuestionAndAnswerModel(question: "邮箱：", answer: model.email)
let tmp9 = YHPreviewQuestionAndAnswerModel(question: "现居住地址：", answer:model.live_address) let tmp9 = YHPreviewQuestionAndAnswerModel(question: "现居住地址：", answer:model.live_address)
...@@ -458,7 +474,7 @@ private extension YHPreviewViewModel { ...@@ -458,7 +474,7 @@ private extension YHPreviewViewModel {
str = "无" str = "无"
} else { } else {
if str == "8888-01-01" { if str == "8888-01-01" {
str = "至今" str = "长期"
} }
} }
let tmp3 = YHPreviewQuestionAndAnswerModel(question: "届满日期：", answer: str) let tmp3 = YHPreviewQuestionAndAnswerModel(question: "届满日期：", answer: str)
...@@ -491,7 +507,7 @@ private extension YHPreviewViewModel { ...@@ -491,7 +507,7 @@ private extension YHPreviewViewModel {
str = "无" str = "无"
} else { } else {
if str == "8888-01-01" { if str == "8888-01-01" {
str = "至今" str = "长期"
} }
} }
let tmp7 = YHPreviewQuestionAndAnswerModel(question: "届满日期：", answer: str) let tmp7 = YHPreviewQuestionAndAnswerModel(question: "届满日期：", answer: str)
...@@ -502,7 +518,7 @@ private extension YHPreviewViewModel { ...@@ -502,7 +518,7 @@ private extension YHPreviewViewModel {
if model.nationality != "中国-China" { if model.nationality != "中国-China" {
//护照及其他旅行证件 //护照及其他旅行证件
var str = String(model2.passport.passport_type)//for test hjl todo var str = YHConstantArrayData.getShowNameBy(indexStr: String(model2.passport.passport_type), type: .idType)
let tmp8 = YHPreviewQuestionAndAnswerModel(question: "证件类别：", answer: str) let tmp8 = YHPreviewQuestionAndAnswerModel(question: "证件类别：", answer: str)
str = model2.passport.number str = model2.passport.number
...@@ -528,7 +544,7 @@ private extension YHPreviewViewModel { ...@@ -528,7 +544,7 @@ private extension YHPreviewViewModel {
str = "无" str = "无"
} else { } else {
if str == "8888-01-01" { if str == "8888-01-01" {
str = "至今" str = "长期"
} }
} }
let tmp12 = YHPreviewQuestionAndAnswerModel(question: "届满日期：", answer: str) let tmp12 = YHPreviewQuestionAndAnswerModel(question: "届满日期：", answer: str)
...@@ -667,7 +683,10 @@ private extension YHPreviewViewModel { ...@@ -667,7 +683,10 @@ private extension YHPreviewViewModel {
//居住信息 //居住信息
let tmp0 = YHPreviewQuestionAndAnswerModel(question: "开始时间：", answer: item.start_time) let tmp0 = YHPreviewQuestionAndAnswerModel(question: "开始时间：", answer: item.start_time)
let tmp1 = YHPreviewQuestionAndAnswerModel(question: "结束时间：", answer: item.end_time) let tmp1 = YHPreviewQuestionAndAnswerModel(question: "结束时间：", answer: item.end_time)
let title = "国家" + String(index + 1) + ":" + item.country
let addationIndex = arr1.count > 1 ? String(index + 1) : ""
let title = "国家" + addationIndex + ":" + item.country
let model0 = YHPersonInfoCellModel1(cellTitle: title, cellData: [tmp0,tmp1]) let model0 = YHPersonInfoCellModel1(cellTitle: title, cellData: [tmp0,tmp1])
arr.append(model0) arr.append(model0)
...@@ -726,7 +745,7 @@ private extension YHPreviewViewModel { ...@@ -726,7 +745,7 @@ private extension YHPreviewViewModel {
if let language = otherInfoPreviewModel?.language { if let language = otherInfoPreviewModel?.language {
if language.level > 0 { if language.level > 0 {
let target = String(language.level) let target = String(language.level)
for(_,item) in YHOtherInfoFillViewModel.arrLanguage.enumerated() { for(_,item) in YHConstantArrayData.arrLanguage.enumerated() {
if target == item["id"] { if target == item["id"] {
language.levelDes = item["title"] ?? "--" language.levelDes = item["title"] ?? "--"
...@@ -742,7 +761,7 @@ private extension YHPreviewViewModel { ...@@ -742,7 +761,7 @@ private extension YHPreviewViewModel {
if let profession = otherInfoPreviewModel?.profession { if let profession = otherInfoPreviewModel?.profession {
if profession.option > 0 { if profession.option > 0 {
let target = String(profession.option) let target = String(profession.option)
for(_,item) in YHOtherInfoFillViewModel.arrSkill.enumerated() { for(_,item) in YHConstantArrayData.arrSkill.enumerated() {
if target == item["value"] { if target == item["value"] {
profession.optionDes = item["title"] ?? "--" profession.optionDes = item["title"] ?? "--"
...@@ -1001,7 +1020,9 @@ private extension YHPreviewViewModel { ...@@ -1001,7 +1020,9 @@ private extension YHPreviewViewModel {
var arr = [tmp0,tmp1,tmp2,tmp3,tmp4,tmp5,tmp6,tmp7] var arr = [tmp0,tmp1,tmp2,tmp3,tmp4,tmp5,tmp6,tmp7]
if model.hasDegree == "1" { if model.hasDegree == "1" {
for(index,item) in model.hasDegreeJson.enumerated() { for(index,item) in model.hasDegreeJson.enumerated() {
let title = "学位证" + String(index + 1) + "："
let addationIndex = model.hasDegreeJson.count > 1 ? String(index + 1) : ""
let title = "学位证" + addationIndex + "："
let tmp8 = YHPreviewQuestionAndAnswerModel(question: title, answer: item.degree) let tmp8 = YHPreviewQuestionAndAnswerModel(question: title, answer: item.degree)
arr.append(tmp8) arr.append(tmp8)
let tmp9 = YHPreviewQuestionAndAnswerModel(question: "学位证颁发地区：", answer: item.address) let tmp9 = YHPreviewQuestionAndAnswerModel(question: "学位证颁发地区：", answer: item.address)
...@@ -1097,7 +1118,7 @@ private extension YHPreviewViewModel { ...@@ -1097,7 +1118,7 @@ private extension YHPreviewViewModel {
str = "无" str = "无"
} else { } else {
if str == "8888-01-01" { if str == "8888-01-01" {
str = "至今" str = "长期"
} }
} }
let tmp3 = YHPreviewQuestionAndAnswerModel(question: "届满日期：", answer: str) let tmp3 = YHPreviewQuestionAndAnswerModel(question: "届满日期：", answer: str)
...@@ -1130,7 +1151,7 @@ private extension YHPreviewViewModel { ...@@ -1130,7 +1151,7 @@ private extension YHPreviewViewModel {
str = "无" str = "无"
} else { } else {
if str == "8888-01-01" { if str == "8888-01-01" {
str = "至今" str = "长期"
} }
} }
let tmp7 = YHPreviewQuestionAndAnswerModel(question: "届满日期：", answer: str) let tmp7 = YHPreviewQuestionAndAnswerModel(question: "届满日期：", answer: str)
...@@ -1141,7 +1162,7 @@ private extension YHPreviewViewModel { ...@@ -1141,7 +1162,7 @@ private extension YHPreviewViewModel {
if model.nationality != "中国-China" { if model.nationality != "中国-China" {
//护照及其他旅行证件 //护照及其他旅行证件
var str = String(model.certificates.passport.passPortType)//for test hjl todo var str = YHConstantArrayData.getShowNameBy(indexStr: String(model.certificates.passport.passPortType), type: .idType)
let tmp8 = YHPreviewQuestionAndAnswerModel(question: "证件类别：", answer: str) let tmp8 = YHPreviewQuestionAndAnswerModel(question: "证件类别：", answer: str)
str = model.certificates.passport.number str = model.certificates.passport.number
...@@ -1167,7 +1188,7 @@ private extension YHPreviewViewModel { ...@@ -1167,7 +1188,7 @@ private extension YHPreviewViewModel {
str = "无" str = "无"
} else { } else {
if str == "8888-01-01" { if str == "8888-01-01" {
str = "至今" str = "长期"
} }
} }
let tmp12 = YHPreviewQuestionAndAnswerModel(question: "届满日期：", answer: str) let tmp12 = YHPreviewQuestionAndAnswerModel(question: "届满日期：", answer: str)
...@@ -1229,7 +1250,8 @@ private extension YHPreviewViewModel { ...@@ -1229,7 +1250,8 @@ private extension YHPreviewViewModel {
let tmp0 = YHPreviewQuestionAndAnswerModel(question: "配偶姓名：", answer: model.subsetName) let tmp0 = YHPreviewQuestionAndAnswerModel(question: "配偶姓名：", answer: model.subsetName)
let tmp1 = YHPreviewQuestionAndAnswerModel(question: "曾用名：", answer: model.usedName.isEmpty ? "--" : model.usedName) let tmp1 = YHPreviewQuestionAndAnswerModel(question: "曾用名：", answer: model.usedName.isEmpty ? "--" : model.usedName)
let tmp2 = YHPreviewQuestionAndAnswerModel(question: "婚前姓氏：", answer: model.surname.isEmpty ? "--" : model.surname) let tmp2 = YHPreviewQuestionAndAnswerModel(question: "婚前姓氏：", answer: model.surname.isEmpty ? "--" : model.surname)
let tmp22 = YHPreviewQuestionAndAnswerModel(question: "性别：", answer: String(model.sex))//for test hjl todo let sexStr = YHConstantArrayData.getShowNameBy(indexStr: String(model.sex), type: .sex)
let tmp22 = YHPreviewQuestionAndAnswerModel(question: "性别：", answer: sexStr)
let tmp3 = YHPreviewQuestionAndAnswerModel(question: "出生日期：", answer: model.birthday) let tmp3 = YHPreviewQuestionAndAnswerModel(question: "出生日期：", answer: model.birthday)
var city = "" var city = ""
if model.birthPlaceAboard == 0 { if model.birthPlaceAboard == 0 {
...@@ -1281,11 +1303,13 @@ private extension YHPreviewViewModel { ...@@ -1281,11 +1303,13 @@ private extension YHPreviewViewModel {
do { do {
//配偶信息 //子女信息
let tmp0 = YHPreviewQuestionAndAnswerModel(question: "子女姓名：", answer: model.subsetName) let tmp0 = YHPreviewQuestionAndAnswerModel(question: "子女姓名：", answer: model.subsetName)
let tmp1 = YHPreviewQuestionAndAnswerModel(question: "曾用名：", answer: model.usedName) let tmp1 = YHPreviewQuestionAndAnswerModel(question: "曾用名：", answer: model.usedName)
let tmp2 = YHPreviewQuestionAndAnswerModel(question: "婚前姓氏：", answer: model.surname) let tmp2 = YHPreviewQuestionAndAnswerModel(question: "婚前姓氏：", answer: model.surname)
let tmp22 = YHPreviewQuestionAndAnswerModel(question: "性别：", answer: String(model.sex)) //for test hjl todo
let sexStr = YHConstantArrayData.getShowNameBy(indexStr: String(model.sex), type: .sex)
let tmp22 = YHPreviewQuestionAndAnswerModel(question: "性别：", answer: sexStr)
let tmp3 = YHPreviewQuestionAndAnswerModel(question: "出生日期：", answer: model.birthday) let tmp3 = YHPreviewQuestionAndAnswerModel(question: "出生日期：", answer: model.birthday)
var city = "" var city = ""
if model.birthPlaceAboard == 0 { if model.birthPlaceAboard == 0 {
...@@ -1316,7 +1340,9 @@ private extension YHPreviewViewModel { ...@@ -1316,7 +1340,9 @@ private extension YHPreviewViewModel {
if model.hasDegree == "1" { if model.hasDegree == "1" {
for(index,item) in model.hasDegreeJson.enumerated() { for(index,item) in model.hasDegreeJson.enumerated() {
let title = "学位证" + String(index + 1) + "："
let addationIndex = model.hasDegreeJson.count > 1 ? String(index + 1) : ""
let title = "学位证" + addationIndex + "："
let tmp8 = YHPreviewQuestionAndAnswerModel(question: title, answer: item.degree) let tmp8 = YHPreviewQuestionAndAnswerModel(question: title, answer: item.degree)
arr.append(tmp8) arr.append(tmp8)
let tmp9 = YHPreviewQuestionAndAnswerModel(question: "学位证颁发地区：", answer: item.address) let tmp9 = YHPreviewQuestionAndAnswerModel(question: "学位证颁发地区：", answer: item.address)
...@@ -1415,7 +1441,7 @@ private extension YHPreviewViewModel { ...@@ -1415,7 +1441,7 @@ private extension YHPreviewViewModel {
str = "无" str = "无"
} else { } else {
if str == "8888-01-01" { if str == "8888-01-01" {
str = "至今" str = "长期"
} }
} }
let tmp3 = YHPreviewQuestionAndAnswerModel(question: "届满日期：", answer: str) let tmp3 = YHPreviewQuestionAndAnswerModel(question: "届满日期：", answer: str)
...@@ -1448,7 +1474,7 @@ private extension YHPreviewViewModel { ...@@ -1448,7 +1474,7 @@ private extension YHPreviewViewModel {
str = "无" str = "无"
} else { } else {
if str == "8888-01-01" { if str == "8888-01-01" {
str = "至今" str = "长期"
} }
} }
let tmp7 = YHPreviewQuestionAndAnswerModel(question: "届满日期：", answer: str) let tmp7 = YHPreviewQuestionAndAnswerModel(question: "届满日期：", answer: str)
...@@ -1485,7 +1511,7 @@ private extension YHPreviewViewModel { ...@@ -1485,7 +1511,7 @@ private extension YHPreviewViewModel {
str = "无" str = "无"
} else { } else {
if str == "8888-01-01" { if str == "8888-01-01" {
str = "至今" str = "长期"
} }
} }
let tmp12 = YHPreviewQuestionAndAnswerModel(question: "届满日期：", answer: str) let tmp12 = YHPreviewQuestionAndAnswerModel(question: "届满日期：", answer: str)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience(工作经验)/V/YHWorkExperienceItemView.swift
View file @ 5e5d8f72
...@@ -142,7 +142,7 @@ class YHWorkExperienceItemView: UIView { ...@@ -142,7 +142,7 @@ class YHWorkExperienceItemView: UIView {
button.setImage(UIImage(named: "main_time_normal"), for: .normal) button.setImage(UIImage(named: "main_time_normal"), for: .normal)
button.setImage(UIImage(named: "main_time_select"), for: .selected) button.setImage(UIImage(named: "main_time_select"), for: .selected)
button.setTitleColor(UIColor.mainTextColor, for: .normal) button.setTitleColor(UIColor.mainTextColor, for: .normal)
button.setTitle("至今", for: .normal) button.setTitle("长期", for: .normal)
button.titleLabel?.font = UIFont.PFSC_M(ofSize: 14) button.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
button.contentHorizontalAlignment = .right button.contentHorizontalAlignment = .right
button.addTarget(self, action: #selector(longTimeButtonClick), for: .touchUpInside) button.addTarget(self, action: #selector(longTimeButtonClick), for: .touchUpInside)
...@@ -162,7 +162,7 @@ class YHWorkExperienceItemView: UIView { ...@@ -162,7 +162,7 @@ class YHWorkExperienceItemView: UIView {
@objc func longTimeButtonClick() { @objc func longTimeButtonClick() {
longTimeButton.isSelected = !longTimeButton.isSelected longTimeButton.isSelected = !longTimeButton.isSelected
if longTimeButton.isSelected { if longTimeButton.isSelected {
self.dataSource?.message = "至今" self.dataSource?.message = "长期"
self.updateAllViews() self.updateAllViews()
if let block = self.block { if let block = self.block {
block(self.dataSource ?? YHWorkExperienceModel()) block(self.dataSource ?? YHWorkExperienceModel())
...@@ -227,14 +227,14 @@ class YHWorkExperienceItemView: UIView { ...@@ -227,14 +227,14 @@ class YHWorkExperienceItemView: UIView {
case .certificate: case .certificate:
break break
case .structure: case .structure:
let arr = YHOtherInfoFillViewModel.arrStructure let arr = YHConstantArrayData.arrStructure
arr.forEach { item in arr.forEach { item in
if item["id"] == dataSource.message { if item["id"] == dataSource.message {
messageTextField.text = item["title"] messageTextField.text = item["title"]
} }
} }
case .level: case .level:
let arr = YHOtherInfoFillViewModel.arrLevel let arr = YHConstantArrayData.arrLevel
arr.forEach { item in arr.forEach { item in
if item["id"] == dataSource.message { if item["id"] == dataSource.message {
messageTextField.text = item["title"] messageTextField.text = item["title"]
...@@ -284,7 +284,7 @@ class YHWorkExperienceItemView: UIView { ...@@ -284,7 +284,7 @@ class YHWorkExperienceItemView: UIView {
if dataSource.id == .id10 || dataSource.id == .id22{ if dataSource.id == .id10 || dataSource.id == .id22{
longTimeButton.isHidden = false longTimeButton.isHidden = false
nextStepImageView.isHidden = true nextStepImageView.isHidden = true
if dataSource.message == "至今" { if dataSource.message == "长期" {
longTimeButton.isSelected = true longTimeButton.isSelected = true
longTimeButton.snp.remakeConstraints { make in longTimeButton.snp.remakeConstraints { make in
make.left.equalTo(messageTextField.snp.left) make.left.equalTo(messageTextField.snp.left)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/VM/YHServiceCenterMainViewModel.swift
View file @ 5e5d8f72
...@@ -128,7 +128,8 @@ extension YHServiceCenterMainViewModel { ...@@ -128,7 +128,8 @@ extension YHServiceCenterMainViewModel {
return return
} }
if resultModel.fill_info_step >= 6 { if resultModel.fill_info_step > 6 {
//resultModel.fill_info_step == 7的时候表示 我的信息填写完成
let model = YHContactMainItemStatusModel() let model = YHContactMainItemStatusModel()
model.type = 1 model.type = 1
model.isFinished = true model.isFinished = true
......
galaxy/galaxy/Classes/Tools/NetWork/YHAllApiName.swift
View file @ 5e5d8f72
...@@ -54,7 +54,7 @@ class YHAllApiName { ...@@ -54,7 +54,7 @@ class YHAllApiName {
// 删除家庭成员信息 // 删除家庭成员信息
static let deleteFamilyMemberApi = "infoflow/family/delete" static let deleteFamilyMemberApi = "infoflow/family/delete"
// 提交家庭成员信息 // 提交家庭成员信息
static let submitAllFamilyInfoApi = "/infoflow/family/submit" static let submitAllFamilyInfoApi = "infoflow/family/submit"
} }
struct Education { struct Education {
......
galaxy/galaxy/Classes/Tools/NetWork/YHBaseUrlManager.swift
View file @ 5e5d8f72
...@@ -15,17 +15,18 @@ class YHBaseUrlManager { ...@@ -15,17 +15,18 @@ class YHBaseUrlManager {
// static let baseUrlTest : String = "https://test-private-sphere.galaxy-immi.com/" // static let baseUrlTest : String = "https://test-private-sphere.galaxy-immi.com/"
// static let baseUrlTest : String = "https://test.api.gateway.galaxy-immi.com/" // static let baseUrlTest : String = "https://test.api.gateway.galaxy-immi.com/"
// static let baseUrlTest : String = "https://test-api-gateway.galaxy-immi.com/" //智汇银河 - 微信小程序 // static let baseUrlTest : String = "https://test-api-gateway.galaxy-immi.com/" //智汇银河 - 微信小程序
//测试环境
static let baseUrlTest : String = "http://test.api.diymanager.galaxy-immi.com/" //APP 使用域名 static let baseUrlTest : String = "http://test.api.diymanager.galaxy-immi.com/" //APP 使用域名
static let baseOOSUrlTest : String = "https://test-comserver.galaxy-immi.com/"
static let baseOOSUrlRelease : String = "http://comserver.galaxy-immi.com" //APP 使用域名
//正式环境 //正式环境
static let baseUrlRelease : String = "http://test.api.diymanager.galaxy-immi.com/" static let baseUrlRelease : String = "http://test.api.diymanager.galaxy-immi.com/"
static let baseOSSUrlTest : String = "https://test-comserver.galaxy-immi.com/"
static let baseOSSUrlRelease : String = "https://test-comserver.galaxy-immi.com/"
// static let baseOSSUrlRelease : String = "http://comserver.galaxy-immi.com/" //正式环境
//h5开发环境 //h5开发环境
static let h5UrlDev : String = "" static let h5UrlDev : String = ""
//h5正式环境 //h5正式环境
static let h5UrlRelease : String = "" static let h5UrlRelease : String = ""
...@@ -45,9 +46,9 @@ class YHBaseUrlManager { ...@@ -45,9 +46,9 @@ class YHBaseUrlManager {
func curOssURL() -> String { func curOssURL() -> String {
#if DEBUG #if DEBUG
return urlForEditing ?? YHBaseUrlManager.baseOOSUrlTest return urlForEditing ?? YHBaseUrlManager.baseOSSUrlTest
#else #else
return YHBaseUrlManager.baseOOSUrlRelease return YHBaseUrlManager.baseOSSUrlRelease
#endif #endif
} }
......
galaxy/galaxy/Classes/Tools/NetWork/YHConstantArrayData.swift 0 → 100644
View file @ 5e5d8f72
//
// YHConstantArrayData.swift
// galaxy
//
// Created by davidhuangA on 2024/3/7.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
enum YHOtherPickerViewType: Int {
// 按自然顺序递增
case none = 0
// 语言能力
case language
// 专业技能行业
case professionalSkill
// 用人单位性质
case nature
// 工作证明文件
case certificate
// 行政架构层级
case structure
// 职位水平类别
case level
// 高管证明文件
case prove
// 证件类别
case idType
// 性别
case sex
// 婚姻状况
case marry
}
class YHConstantArrayData {
static let arrLanguage : [[String : String]] = [
[
"id":"1",
"title": "中文及英文",
"dec": "国外大学（英语国家）毕业，英文授课，获得学位证。（如为中外联合办学，在中国上课的，不算）",
],
[
"id": "2",
"title": "中文及英文",
"dec": " 有近两年的雅思或托福成绩单（雅思考试G类或A类总分达6分；托福笔试达550分，计算机达213分，网考达80分）",
],
[
"id": "4",
"title": "中文及另一种外语",
"dec": "非英文的外语，如：法文、日文等（需提供相关证书）",
],
[
"id": "5",
"title": "仅中文",
"dec": "",
],
[
"id": "6",
"title": "仅英文",
"dec": "",
],
]
static let arrSkill : [[String : String]] = [
[
"title": "学术研究及教育",
"dec": "幼儿教育、高等教育、学术研究",
"val": "",
"value": "1",
],
[
"title": "建筑、测量、工程及建造",
"dec": "园景设计、建筑、测量、土木/电机/机器/机构/环境工程",
"val": "",
"value": "2",
],
[
"title": "艺术及文化",
"dec": "表演艺术、美术、博物馆、图书馆、摄影",
"val": "",
"value": "3",
],
[
"title": "广播及娱乐",
"dec": "广播及节目制作、电影、录像及电视制作、唱片及音乐出版",
"val": "",
"value": "4",
],
[
"title": "业务支援及人力资源",
"dec": "业务咨询顾问、公司秘书、行政支援、人事管理、招聘服务、公关关系服务、广告、信息服务",
"val": "",
"value": "5",
],
[
"title": "餐饮服务及旅游",
"dec": "酒吧、餐厅、酒店、旅行代理",
"val": "",
"value": "6",
],
[
"title": "商业及贸易",
"dec": "进出口、零售、批发",
"val": "",
"value": "7",
],
[
"title": "金融及会计服务",
"dec": "会计、银行、保险、证券、投资银行",
"val": "",
"value": "8",
],
[
"title": "医疗保健及兽医服务",
"dec": "西医药、中医药、牙科服务、医学科技、职业治疗、护理、兽医服务",
"val": "",
"value": "9",
],
[
"title": "资讯科技及电讯",
"dec": "资讯科技顾问、固网及无线通信",
"val": "",
"value": "10",
],
[
"title": "法律服务",
"dec": "法律事务",
"val": "",
"value": "11",
],
[
"title": "物流运输",
"dec": "物流、空运、海运、陆运",
"val": "",
"value": "12",
],
[
"title": "工业制造",
"dec": "电机、电子、食物及饮料、化工、金属、玩具、纺织、钟表、珠宝、印刷及出版",
"val": "",
"value": "13",
],
[
"title": "体育运动",
"dec": "体育运动",
"val": "",
"value": "14",
],
[
"title": "其他",
"example": "",
"val": "",
"value": "15",
"dec": ""
],
]
static let arrNature : [[String : String]] = [
[
"title": "有限责任公司",
"id": "有限责任公司"
],
[
"title": "股份有限公司",
"id": "股份有限公司"
],
[
"title": "跨国有限责任公司",
"id": "跨国有限责任公司"
],
[
"title": "跨国股份有限公司",
"id": "跨国股份有限公司"
],
[
"title": "上市公司",
"id": "上市公司"
],
[
"title": "上市跨国公司",
"id": "上市跨国公司"
],
[
"title": "教育机构",
"id": "教育机构"
],
[
"title": "半公营企业",
"id": "半公营企业"
],
[
"title": "政府机构",
"id": "政府机构"
],
[
"title": "跨国合伙企业",
"id": "跨国合伙企业"
],
[
"title": "跨国个人独资企业",
"id": "跨国个人独资企业"
],
[
"title": "个人独资企业",
"id": "个人独资企业"
],
[
"title": "国家/政府间组织",
"id": "国家/政府间组织"
],
[
"title": "志愿/慈善/宗教团体",
"id": "志愿/慈善/宗教团体"
],
[
"title": "其他（请备注）",
"id": "其他（请备注）"
]
]
static let arrCertificate : [[String : String]] = [
["id": "盖章并签字的推荐信 (证明效果最强)",
"title": "盖章并签字的推荐信 (证明效果最强)"
],
["id": "签字的推荐信+盖章的工作证明",
"title": "签字的推荐信+盖章的工作证明"
],
["id": "仅有签字的推荐信",
"title": "仅有签字的推荐信"
],
["id": "仅有社保记录/劳动合同/工牌等",
"title": "仅有社保记录/劳动合同/工牌等"
],
["id": "仅提供声明书解释",
"title": "仅提供声明书解释"
],
["id": "仅有工作证明",
"title": "仅有工作证明"
]
]
static let arrStructure : [[String : String]] = [
["title": "组织架构最顶级",
"id": "1"
],
["title": "组织架构第二层级",
"id": "2"
],
["title": "组织架构第三层级",
"id": "3"
],
["title": "组织架构第四层级",
"id": "4"
],
["title": "以上都不是",
"id": "5"
]
]
static let arrLevel : [[String : String]] = [
["title": "高级经理人",
"id": "1"
],
["title": "中级经理人",
"id": "2"
],
["title": "初级经理人",
"id": "3"
],
["title": "专业人士",
"id": "4"
],
["title": "半专业人士",
"id": "5"
],
["title": "其他",
"id": "6"
]
]
static let arrProve : [[String : String]] = [
["title": "盖章且签字的组织架构图和审计报告",
"id": "盖章且签字的组织架构图和审计报告"
]
]
static let arrIdType : [[String : String]] = [
["title": "护照",
"id": "3"
],
["title": "外交护照",
"id": "4"
],
["title": "公务护照",
"id": "5"
],
["title": "中国发无国籍旅游证件",
"id": "6"
],
["title": "旅游通行证",
"id": "7"
],
["title": "联合国通行证",
"id": "8"
],
["title": "其他无国籍旅行证件",
"id": "9"
],
["title": "其他",
"id": "10"
]
]
// static func getIdTypeBy(index : Int) -> String {
// for item in YHConstantArrayData.arrIdType {
// if let target = item["id"],index == Int(target) {
// return item["title"] ?? "未知"
// }
// }
// return "未知"
// }
static let arrSex : [[String : String]] = [
["title": "男",
"id": "1"
],
["title": "女",
"id": "2"
]
]
static let arrMarry : [[String : String]] = [
["title": "已婚",
"id": "1"
],
["title": "未婚",
"id": "2"
],
["title": "离婚",
"id": "3"
],
["title": "分居",
"id": "4"
],
["title": "丧偶",
"id": "5"
]
]
//通过 id 获取 title
static func getShowNameBy(indexStr:String,type : YHOtherPickerViewType) -> String {
if indexStr.isEmpty {
return "未知"
}
var arrData : [[String : String]] = [[:]]
switch type {
case .marry:
arrData = YHConstantArrayData.arrMarry
case .sex:
arrData = YHConstantArrayData.arrSex
case .idType:
arrData = YHConstantArrayData.arrIdType
case .structure:
arrData = YHConstantArrayData.arrStructure
case .level:
arrData = YHConstantArrayData.arrLevel
default:
arrData = [[:]]
}
for item in arrData {
if let target = item["id"],indexStr == target {
return item["title"] ?? "未知"
}
}
return "未知"
}
}
galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift
View file @ 5e5d8f72
...@@ -102,7 +102,6 @@ class YHNetRequest: NSObject { ...@@ -102,7 +102,6 @@ class YHNetRequest: NSObject {
private func testToken(_ requestHeader:inout HTTPHeaders) { private func testToken(_ requestHeader:inout HTTPHeaders) {
//金龙的账号 //金龙的账号
requestHeader.add(name: "token", value: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MTE2MDcwNjQsImkiOjE0NDg0MTczMjc0MjE2LCJ1Ijoi6ZO25rKz6ZuG5ZuiIiwiciI6InN1cGVyX2FwcCJ9.KwTWdaLy5UG4LLs6i-D9ne0RflRTT5v4zvu-66yihDE") requestHeader.add(name: "token", value: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MTE2MDcwNjQsImkiOjE0NDg0MTczMjc0MjE2LCJ1Ijoi6ZO25rKz6ZuG5ZuiIiwiciI6InN1cGVyX2FwcCJ9.KwTWdaLy5UG4LLs6i-D9ne0RflRTT5v4zvu-66yihDE")
// requestHeader.add(name: "token", value:"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MTE3ODI1OTUsImkiOjEyNDMwMTA1MTY0OTA0LCJ1Ijoi6ZO25rKz6ZuG5ZuiIiwiciI6InN1cGVyX2FwcCJ9.jqWpIf3SmbetApdErmBIYh-YEhX1zF_WqgqgOq5oI2A")
} }
///  链式语法 ///  链式语法
......
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