Commit 4093f714 authored by Steven杜宇's avatar Steven杜宇

// 参数修改

parent f21193ab
...@@ -250,13 +250,19 @@ extension YHFamilyMemberInfoListVC { ...@@ -250,13 +250,19 @@ extension YHFamilyMemberInfoListVC {
// 添加兄弟姐妹子女 // 添加兄弟姐妹子女
func addFamilyMember(_ type:YHFamilyMemberType) { func addFamilyMember(_ type:YHFamilyMemberType) {
var custody = 0
if type == .child {
custody = 2
}
let dict:[String: Any] = ["order_id":self.orderId, let dict:[String: Any] = ["order_id":self.orderId,
"relation":String(type.rawValue), "relation":String(type.rawValue),
"step":0, "step":0,
"next":false, "next":false,
"info":["subset_name":"", "info":["subset_name":"",
"not_fill_number":-1, "not_fill_number":-1,
"follow":0]] "follow":0,
"custody":2]]
self.familyRequest.addOrSaveFamilyMember(params: dict) { [weak self] success, error in self.familyRequest.addOrSaveFamilyMember(params: dict) { [weak self] success, error in
guard let self = self else { return } guard let self = self else { return }
......
...@@ -660,8 +660,8 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol { ...@@ -660,8 +660,8 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
// 是否已故 1:是 0:否 // 是否已故 1:是 0:否
var deceased: Int = 0 var deceased: Int = 0
// 主申请人和现配偶是否拥有孩子抚养权 1:是 0:否 // 主申请人和现配偶是否拥有孩子抚养权 1:是 2:否
var custody: Int = 0 var custody: Int = 2
// 是否出生国外 1:是 0:否 // 是否出生国外 1:是 0:否
var birthPlaceAboard: Int = 0 var birthPlaceAboard: Int = 0
// 是否与主申请人同住 1:是 0:否 // 是否与主申请人同住 1:是 0:否
...@@ -698,7 +698,6 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol { ...@@ -698,7 +698,6 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
} }
if follow != 1 && follow != 2 { // 默认随行 if follow != 1 && follow != 2 { // 默认随行
follow = 1 follow = 1
} }
...@@ -708,7 +707,6 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol { ...@@ -708,7 +707,6 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
follow = 0 follow = 0
} }
if isLiveOverseaYear != 1 && isLiveOverseaYear != 2 { // 默认在海外未居住满一年以上 if isLiveOverseaYear != 1 && isLiveOverseaYear != 2 { // 默认在海外未居住满一年以上
isLiveOverseaYear = 2 isLiveOverseaYear = 2
} }
......
...@@ -245,6 +245,11 @@ extension YHGCFamilyMemberInfoListVC { ...@@ -245,6 +245,11 @@ extension YHGCFamilyMemberInfoListVC {
// 添加兄弟姐妹子女 // 添加兄弟姐妹子女
func addFamilyMember(_ type:YHFamilyMemberType) { func addFamilyMember(_ type:YHFamilyMemberType) {
var custody = 0
if type == .child {
custody = 2
}
let dict:[String: Any] = ["order_id":self.orderId, let dict:[String: Any] = ["order_id":self.orderId,
"relation":String(type.rawValue), "relation":String(type.rawValue),
"step":0, "step":0,
...@@ -253,7 +258,8 @@ extension YHGCFamilyMemberInfoListVC { ...@@ -253,7 +258,8 @@ extension YHGCFamilyMemberInfoListVC {
"not_fill_number":-1, "not_fill_number":-1,
"have_permanent_residency":2, "have_permanent_residency":2,
"nows":1, "nows":1,
"follow":0]] "follow":0,
"custody":custody]]
self.familyRequest.addOrSaveFamilyMember(params: dict) { [weak self] success, error in self.familyRequest.addOrSaveFamilyMember(params: dict) { [weak self] success, error in
guard let self = self else { return } guard let self = self else { return }
......
...@@ -349,8 +349,9 @@ extension YHGCPreviewFamilyMemberViewController { ...@@ -349,8 +349,9 @@ extension YHGCPreviewFamilyMemberViewController {
override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withClass: YHPreviewInfoCell.self) let cell = tableView.dequeueReusableCell(withClass: YHPreviewInfoCell.self)
cell.selectionStyle = .none cell.selectionStyle = .none
cell.model = previewVM.arrDataForMainApplicationInfo[indexPath.row] var model = previewVM.arrDataForMainApplicationInfo[indexPath.row]
cell.updateTopMargin = (indexPath.row == 0 ? 0.0 : 14.0) model.index = indexPath.row
cell.model = model
return cell return cell
} }
} }
......
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