Skip to content

G
galaxy-iOS
Commit 6884d28c authored by David黄金龙's avatar David黄金龙
Browse files
Options

基本信息 保存逻辑

parent a9c42df9
Hide whitespace changes
Inline Side-by-side
Showing with 181 additions and 32 deletions
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/BaseInformation(基本资料)/C/YHBasicInfoFillViewController.swift
View file @ 6884d28c
...@@ -55,10 +55,15 @@ extension YHBasicInfoFillViewController { ...@@ -55,10 +55,15 @@ extension YHBasicInfoFillViewController {
bottomView.block = { tag in bottomView.block = { tag in
if tag == 0 { if tag == 0 {
//点击了保存按钮 //点击了保存按钮
// let arr = self.basicInfoVM.arrBasicInfoSessionDataForEdit
// printLog(arr)
printLog("点击了保存按钮") printLog("点击了保存按钮")
self.saveData()
} else { } else {
//点击了提交按钮 //点击了提交按钮
printLog("点击了提交按钮") printLog("点击了提交按钮")
self.submitData()
} }
} }
...@@ -74,7 +79,6 @@ extension YHBasicInfoFillViewController { ...@@ -74,7 +79,6 @@ extension YHBasicInfoFillViewController {
} }
} }
private func loadData() { private func loadData() {
guard let orderId = orderId else { return} guard let orderId = orderId else { return}
let param = ["order_id":orderId] let param = ["order_id":orderId]
...@@ -87,6 +91,117 @@ extension YHBasicInfoFillViewController { ...@@ -87,6 +91,117 @@ extension YHBasicInfoFillViewController {
self.homeTableView.reloadData() self.homeTableView.reloadData()
} }
} }
private func saveData() {
//保存
let arr = basicInfoVM.arrBasicInfoSessionDataForEdit
var param : [String : Any] = ["order_id":orderId as Any,"save_type": "save"]
for item in arr {
if item.sessionTitle == "主申请人" {
var applicant : [String : Any] = [:]
for (index0,item0) in item.arrQuestionItem.enumerated() {
if index0 == 0 {
let value = ["answer":item0.answer,"info":item0.answer == "Y" ? item0.info : ""]
applicant.updateValue(value, forKey: "has_breaking_law")
} else if index0 == 1 {
let value = ["answer":item0.answer,"info":item0.answer == "Y" ? item0.info : ""]
applicant.updateValue(value, forKey: "has_conviction")
} else if index0 == 2 {
let value = ["answer":item0.answer,"info":item0.answer == "Y" ? item0.info : ""]
applicant.updateValue(value, forKey: "has_deny")
} else if index0 == 3 {
let value = ["answer":item0.answer,"info":item0.answer == "Y" ? item0.info : ""]
applicant.updateValue(value, forKey: "has_departure")
} else if index0 == 4 {
let value = ["answer":item0.answer,"info":item0.answer == "Y" ? item0.info : ""]
applicant.updateValue(value, forKey: "has_other_id")
} else {
printLog("其他数据没有处理")
}
}
applicant.updateValue(basicInfoVM.dataModelForBasicInfo?.applicant?.id ?? 0, forKey: "id")
param.updateValue(applicant, forKey: "applicant")
} else if item.sessionTitle == "配偶" {
var applicant : [String : Any] = [:]
for (index0,item0) in item.arrQuestionItem.enumerated() {
if index0 == 0 {
let value = ["answer":item0.answer,"info":item0.answer == "Y" ? item0.info : ""]
applicant.updateValue(value, forKey: "child_deny")
} else if index0 == 1 {
let value = ["answer":item0.answer,"info":item0.answer == "Y" ? item0.info : ""]
applicant.updateValue(value, forKey: "child_departure")
} else {
printLog("其他数据没有处理")
}
}
applicant.updateValue(basicInfoVM.dataModelForBasicInfo?.spouse?.id ?? 0, forKey: "id")
applicant.updateValue(basicInfoVM.dataModelForBasicInfo?.spouse?.subset_name ?? 0, forKey: "subset_name")
param.updateValue(applicant, forKey: "spouse")
} else if item.sessionTitle.hasPrefix("子女") {
var arr : [[String:Any]] = []
if let tArr = param["child"] as? [[String : Any]] {
arr = tArr
}
var applicant : [String : Any] = [:]
for (index0,item0) in item.arrQuestionItem.enumerated() {
if index0 == 0 {
let value = ["answer":item0.answer,"info":item0.answer == "Y" ? item0.info : ""]
applicant.updateValue(value, forKey: "child_deny")
} else if index0 == 1 {
let value = ["answer":item0.answer,"info":item0.answer == "Y" ? item0.info : ""]
applicant.updateValue(value, forKey: "child_departure")
} else {
printLog("其他数据没有处理")
}
}
applicant.updateValue(item.model?.id ?? 0, forKey: "id")
applicant.updateValue(item.model?.subset_name ?? "", forKey: "subset_name")
arr.append(applicant)
param.updateValue(arr, forKey: "child")
} else if item.sessionTitle == "家庭背景" {
var applicant : [String : Any] = [:]
for (index0,item0) in item.arrQuestionItem.enumerated() {
if index0 == 0 {
let value = ["answer":item0.answer,"info":item0.answer == "Y" ? item0.info : ""]
applicant.updateValue(value, forKey: "background_member")
} else {
printLog("其他数据没有处理")
}
}
applicant.updateValue(basicInfoVM.dataModelForBasicInfo?.spouse?.id ?? 0, forKey: "id")
applicant.updateValue(basicInfoVM.dataModelForBasicInfo?.spouse?.subset_name ?? 0, forKey: "subset_name")
param.updateValue(applicant, forKey: "background")
} else {
}
}
printLog(param)
basicInfoVM.saveBasicInfo(params: param) { success, error in
if success == true {
YHHUD.flash(message: "保存成功")
} else {
let msg = error?.errorMsg ?? "保存失败"
YHHUD.flash(message: msg)
}
}
}
private func submitData() {
//提交
}
} }
// MARK: - delegates // MARK: - delegates
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/BaseInformation(基本资料)/M/YHBasicInfoCellModel.swift
View file @ 6884d28c
...@@ -11,14 +11,14 @@ import UIKit ...@@ -11,14 +11,14 @@ import UIKit
class YHBasicInfoCellModel { class YHBasicInfoCellModel {
var question : String = "" var question : String = ""
var answer : String = "" var answer : String = ""
var additionDes : String = "" var info : String = ""
var model : backgroundModel? var model : backgroundModel?
var type : Int = 0 //0- 输入型 1-选择型 var type : Int = 0 //0- 输入型 1-选择型
init(question: String, answer: String, additionDes: String, type : Int = 0) { init(question: String, answer: String, info: String, type : Int = 0) {
self.question = question self.question = question
self.answer = answer self.answer = answer
self.additionDes = additionDes self.info = info
self.type = type self.type = type
} }
} }
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/BaseInformation(基本资料)/M/YHBasicInfoSessionModel.swift
View file @ 6884d28c
...@@ -11,6 +11,8 @@ import UIKit ...@@ -11,6 +11,8 @@ import UIKit
class YHBasicInfoSessionModel { class YHBasicInfoSessionModel {
var sessionTitle : String = "" var sessionTitle : String = ""
var arrQuestionItem : [YHBasicInfoCellModel] = [] var arrQuestionItem : [YHBasicInfoCellModel] = []
var model : SpouseModel?
init(sessionTitle: String, arrQuestionItem: [YHBasicInfoCellModel]) { init(sessionTitle: String, arrQuestionItem: [YHBasicInfoCellModel]) {
self.sessionTitle = sessionTitle self.sessionTitle = sessionTitle
self.arrQuestionItem = arrQuestionItem self.arrQuestionItem = arrQuestionItem
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/BaseInformation(基本资料)/V/YHBasicInfoFillView.swift
View file @ 6884d28c
...@@ -374,7 +374,7 @@ private extension YHBasicInfoFillView { ...@@ -374,7 +374,7 @@ private extension YHBasicInfoFillView {
title = model.question title = model.question
if model.answer == "Y" { if model.answer == "Y" {
didClickResponseBtn(btn: answer2Btn) didClickResponseBtn(btn: answer2Btn)
myTextView.text = model.additionDes.count > 0 ? model.additionDes : kTipsString myTextView.text = model.info.count > 0 ? model.info : kTipsString
} else { } else {
if model.answer == "N" { if model.answer == "N" {
didClickResponseBtn(btn: answer1Btn) didClickResponseBtn(btn: answer1Btn)
...@@ -392,7 +392,7 @@ private extension YHBasicInfoFillView { ...@@ -392,7 +392,7 @@ private extension YHBasicInfoFillView {
title = model.question title = model.question
if model.answer == "Y" { if model.answer == "Y" {
didClickResponseBtn(btn: answer2Btn) didClickResponseBtn(btn: answer2Btn)
myTextView.text = model.additionDes.count > 0 ? model.additionDes : kTipsString myTextView.text = model.info.count > 0 ? model.info : kTipsString
} else { } else {
if model.answer == "N" { if model.answer == "N" {
didClickResponseBtn(btn: answer1Btn) didClickResponseBtn(btn: answer1Btn)
...@@ -436,9 +436,9 @@ extension YHBasicInfoFillView : UITextFieldDelegate { ...@@ -436,9 +436,9 @@ extension YHBasicInfoFillView : UITextFieldDelegate {
internal func textViewDidChange(_ textView: UITextView) { internal func textViewDidChange(_ textView: UITextView) {
if textView.text == kTipsString { if textView.text == kTipsString {
model?.additionDes = "" model?.info = ""
} else { } else {
model?.additionDes = textView.text model?.info = textView.text
} }
textView.textColor = UIColor.mainTextColor textView.textColor = UIColor.mainTextColor
...@@ -453,6 +453,7 @@ extension YHBasicInfoFillView : UITextFieldDelegate { ...@@ -453,6 +453,7 @@ extension YHBasicInfoFillView : UITextFieldDelegate {
item.isSelected = false item.isSelected = false
} }
sender.isSelected = true sender.isSelected = true
model?.info = String(sender.tag)
} }
} }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/BaseInformation(基本资料)/VM/YHBasicInfoFillViewModel.swift
View file @ 6884d28c
...@@ -13,7 +13,7 @@ class YHBasicInfoFillViewModel : YHBaseViewModel { ...@@ -13,7 +13,7 @@ class YHBasicInfoFillViewModel : YHBaseViewModel {
var arrBasicInfoSessionDataForEdit : [YHBasicInfoSessionModel] = [] var arrBasicInfoSessionDataForEdit : [YHBasicInfoSessionModel] = []
//从网络请求的数据源 //从网络请求的数据源
private var dataModelForBasicInfo : YHBasicInfoFillModel? { var dataModelForBasicInfo : YHBasicInfoFillModel? {
didSet { didSet {
assembleBasicInfoData() assembleBasicInfoData()
} }
...@@ -26,11 +26,11 @@ extension YHBasicInfoFillViewModel { ...@@ -26,11 +26,11 @@ extension YHBasicInfoFillViewModel {
var arrData : [YHBasicInfoSessionModel] = [] var arrData : [YHBasicInfoSessionModel] = []
do { do {
//主申请人 //主申请人
let model1 = YHBasicInfoCellModel(question: "1、是否曾在香港或其他地方因任何罪行或违法行为被定罪？", answer: "", additionDes: "") let model1 = YHBasicInfoCellModel(question: "1、是否曾在香港或其他地方因任何罪行或违法行为被定罪？", answer: "", info: "")
let model2 = YHBasicInfoCellModel(question: "2、是否曾在香港或其他地方被拒入境／递解／遣送或要求离境？", answer: "", additionDes: "") let model2 = YHBasicInfoCellModel(question: "2、是否曾在香港或其他地方被拒入境／递解／遣送或要求离境？", answer: "", info: "")
let model3 = YHBasicInfoCellModel(question: "3、是否曾被拒绝签发香港或其他地方的签证／进入许可？", answer: "", additionDes: "") let model3 = YHBasicInfoCellModel(question: "3、是否曾被拒绝签发香港或其他地方的签证／进入许可？", answer: "", info: "")
let model4 = YHBasicInfoCellModel(question: "4、是否曾触犯香港或任何地方的入境法例？", answer: "", additionDes: "N") let model4 = YHBasicInfoCellModel(question: "4、是否曾触犯香港或任何地方的入境法例？", answer: "", info: "")
let model5 = YHBasicInfoCellModel(question: "5、是否曾经使用另一个姓名或身份申请香港入境签证/进入许可或进入香港？", answer: "", additionDes: "") let model5 = YHBasicInfoCellModel(question: "5、是否曾经使用另一个姓名或身份申请香港入境签证/进入许可或进入香港？", answer: "", info: "")
let arr = [model1,model2,model3,model4,model5] let arr = [model1,model2,model3,model4,model5]
let sessionModel = YHBasicInfoSessionModel(sessionTitle: "主申请人", arrQuestionItem: arr) let sessionModel = YHBasicInfoSessionModel(sessionTitle: "主申请人", arrQuestionItem: arr)
...@@ -39,8 +39,8 @@ extension YHBasicInfoFillViewModel { ...@@ -39,8 +39,8 @@ extension YHBasicInfoFillViewModel {
do { do {
//配偶 //配偶
let model1 = YHBasicInfoCellModel(question: "1、是否曾被拒绝入境/递解/遣送或要求离开香港?", answer: "", additionDes: "") let model1 = YHBasicInfoCellModel(question: "1、是否曾被拒绝入境/递解/遣送或要求离开香港?", answer: "", info: "")
let model2 = YHBasicInfoCellModel(question: "2、是否曾被拒绝签发签证／进入许可以入境香港？", answer: "", additionDes: "") let model2 = YHBasicInfoCellModel(question: "2、是否曾被拒绝签发签证／进入许可以入境香港？", answer: "", info: "")
let arr = [model1,model2] let arr = [model1,model2]
let sessionModel = YHBasicInfoSessionModel(sessionTitle: "配偶", arrQuestionItem: arr) let sessionModel = YHBasicInfoSessionModel(sessionTitle: "配偶", arrQuestionItem: arr)
...@@ -51,8 +51,8 @@ extension YHBasicInfoFillViewModel { ...@@ -51,8 +51,8 @@ extension YHBasicInfoFillViewModel {
do { do {
//子女 - xxx //子女 - xxx
let model1 = YHBasicInfoCellModel(question: "1、是否曾被拒绝入境/递解/遣送或要求离开香港?", answer: "", additionDes: "") let model1 = YHBasicInfoCellModel(question: "1、是否曾被拒绝入境/递解/遣送或要求离开香港?", answer: "", info: "")
let model2 = YHBasicInfoCellModel(question: "2、是否曾被拒绝签发签证／进入许可以入境香港？", answer: "", additionDes: "") let model2 = YHBasicInfoCellModel(question: "2、是否曾被拒绝签发签证／进入许可以入境香港？", answer: "", info: "")
let arr = [model1,model2] let arr = [model1,model2]
let sessionModel = YHBasicInfoSessionModel(sessionTitle: "子女 - xxx", arrQuestionItem: arr) let sessionModel = YHBasicInfoSessionModel(sessionTitle: "子女 - xxx", arrQuestionItem: arr)
...@@ -62,7 +62,7 @@ extension YHBasicInfoFillViewModel { ...@@ -62,7 +62,7 @@ extension YHBasicInfoFillViewModel {
do { do {
//家庭背景 //家庭背景
let model1 = YHBasicInfoCellModel(question:"1、至少一名直系家庭成员（已婚配偶、父母、兄弟姊妹、子女）是现居于香港的香港永久性居民", answer: "", additionDes: "") let model1 = YHBasicInfoCellModel(question:"1、至少一名直系家庭成员（已婚配偶、父母、兄弟姊妹、子女）是现居于香港的香港永久性居民", answer: "", info: "")
let arr = [model1] let arr = [model1]
let sessionModel = YHBasicInfoSessionModel(sessionTitle: "家庭背景", arrQuestionItem: arr) let sessionModel = YHBasicInfoSessionModel(sessionTitle: "家庭背景", arrQuestionItem: arr)
...@@ -82,15 +82,15 @@ extension YHBasicInfoFillViewModel { ...@@ -82,15 +82,15 @@ extension YHBasicInfoFillViewModel {
var arrData : [YHBasicInfoSessionModel] = [] var arrData : [YHBasicInfoSessionModel] = []
do { do {
//主申请人 //主申请人
let model1 = YHBasicInfoCellModel(question: "1、是否曾在香港或其他地方因任何罪行或违法行为被定罪？", answer: dataModelForBasicInfo.applicant?.has_conviction?.has ?? "", additionDes: dataModelForBasicInfo.applicant?.has_conviction?.info ?? "") let model1 = YHBasicInfoCellModel(question: "1、是否曾在香港或其他地方因任何罪行或违法行为被定罪？", answer: dataModelForBasicInfo.applicant?.has_conviction?.has ?? "", info: dataModelForBasicInfo.applicant?.has_conviction?.info ?? "")
let model2 = YHBasicInfoCellModel(question: "2、是否曾在香港或其他地方被拒入境／递解／遣送或要求离境？", answer: dataModelForBasicInfo.applicant?.has_departure?.has ?? "", additionDes: dataModelForBasicInfo.applicant?.has_departure?.has ?? "") let model2 = YHBasicInfoCellModel(question: "2、是否曾在香港或其他地方被拒入境／递解／遣送或要求离境？", answer: dataModelForBasicInfo.applicant?.has_departure?.has ?? "", info: dataModelForBasicInfo.applicant?.has_departure?.has ?? "")
let model3 = YHBasicInfoCellModel(question: "3、是否曾被拒绝签发香港或其他地方的签证／进入许可？", answer: dataModelForBasicInfo.applicant?.has_deny?.has ?? "", additionDes: dataModelForBasicInfo.applicant?.has_deny?.has ?? "") let model3 = YHBasicInfoCellModel(question: "3、是否曾被拒绝签发香港或其他地方的签证／进入许可？", answer: dataModelForBasicInfo.applicant?.has_deny?.has ?? "", info: dataModelForBasicInfo.applicant?.has_deny?.has ?? "")
let model4 = YHBasicInfoCellModel(question: "4、是否曾触犯香港或任何地方的入境法例？", answer: dataModelForBasicInfo.applicant?.has_breaking_law?.has ?? "", additionDes: dataModelForBasicInfo.applicant?.has_breaking_law?.has ?? "") let model4 = YHBasicInfoCellModel(question: "4、是否曾触犯香港或任何地方的入境法例？", answer: dataModelForBasicInfo.applicant?.has_breaking_law?.has ?? "", info: dataModelForBasicInfo.applicant?.has_breaking_law?.has ?? "")
let model5 = YHBasicInfoCellModel(question: "5、是否曾经使用另一个姓名或身份申请香港入境签证/进入许可或进入香港？", answer: dataModelForBasicInfo.applicant?.has_other_id?.has ?? "", additionDes: dataModelForBasicInfo.applicant?.has_other_id?.has ?? "") let model5 = YHBasicInfoCellModel(question: "5、是否曾经使用另一个姓名或身份申请香港入境签证/进入许可或进入香港？", answer: dataModelForBasicInfo.applicant?.has_other_id?.has ?? "", info: dataModelForBasicInfo.applicant?.has_other_id?.has ?? "")
let arr = [model1,model2,model3,model4,model5] let arr = [model1,model2,model3,model4,model5]
let sessionModel = YHBasicInfoSessionModel(sessionTitle: "主申请人", arrQuestionItem: arr) let sessionModel = YHBasicInfoSessionModel(sessionTitle: "主申请人", arrQuestionItem: arr)
...@@ -99,8 +99,8 @@ extension YHBasicInfoFillViewModel { ...@@ -99,8 +99,8 @@ extension YHBasicInfoFillViewModel {
do { do {
//配偶 //配偶
let model1 = YHBasicInfoCellModel(question: "1、是否曾被拒绝入境/递解/遣送或要求离开香港?", answer: dataModelForBasicInfo.spouse?.child_departure?.has ?? "", additionDes: dataModelForBasicInfo.spouse?.child_departure?.has ?? "") let model1 = YHBasicInfoCellModel(question: "1、是否曾被拒绝入境/递解/遣送或要求离开香港?", answer: dataModelForBasicInfo.spouse?.child_departure?.has ?? "", info: dataModelForBasicInfo.spouse?.child_departure?.has ?? "")
let model2 = YHBasicInfoCellModel(question: "2、是否曾被拒绝签发签证／进入许可以入境香港？", answer: dataModelForBasicInfo.spouse?.child_deny?.has ?? "", additionDes: dataModelForBasicInfo.spouse?.child_deny?.has ?? "") let model2 = YHBasicInfoCellModel(question: "2、是否曾被拒绝签发签证／进入许可以入境香港？", answer: dataModelForBasicInfo.spouse?.child_deny?.has ?? "", info: dataModelForBasicInfo.spouse?.child_deny?.has ?? "")
let arr = [model1,model2] let arr = [model1,model2]
let sessionModel = YHBasicInfoSessionModel(sessionTitle: "配偶", arrQuestionItem: arr) let sessionModel = YHBasicInfoSessionModel(sessionTitle: "配偶", arrQuestionItem: arr)
...@@ -113,13 +113,14 @@ extension YHBasicInfoFillViewModel { ...@@ -113,13 +113,14 @@ extension YHBasicInfoFillViewModel {
//子女 - xxx //子女 - xxx
if let arrChild = dataModelForBasicInfo.child { if let arrChild = dataModelForBasicInfo.child {
for item in arrChild { for item in arrChild {
let model1 = YHBasicInfoCellModel(question: "1、是否曾被拒绝入境/递解/遣送或要求离开香港?", answer: item.child_departure?.has ?? "", additionDes: item.child_departure?.info ?? "") let model1 = YHBasicInfoCellModel(question: "1、是否曾被拒绝入境/递解/遣送或要求离开香港?", answer: item.child_departure?.has ?? "", info: item.child_departure?.info ?? "")
let model2 = YHBasicInfoCellModel(question: "2、是否曾被拒绝签发签证／进入许可以入境香港？", answer: item.child_deny?.has ?? "", additionDes: item.child_deny?.info ?? "") let model2 = YHBasicInfoCellModel(question: "2、是否曾被拒绝签发签证／进入许可以入境香港？", answer: item.child_deny?.has ?? "", info: item.child_deny?.info ?? "")
let arr = [model1,model2] let arr = [model1,model2]
let title = "子女" + "-" + item.subset_name let title = "子女" + "-" + item.subset_name
let sessionModel = YHBasicInfoSessionModel(sessionTitle: title, arrQuestionItem: arr) let sessionModel = YHBasicInfoSessionModel(sessionTitle: title, arrQuestionItem: arr)
sessionModel.model = item
arrData.append(sessionModel) arrData.append(sessionModel)
} }
} }
...@@ -127,7 +128,7 @@ extension YHBasicInfoFillViewModel { ...@@ -127,7 +128,7 @@ extension YHBasicInfoFillViewModel {
do { do {
//家庭背景 //家庭背景
let model1 = YHBasicInfoCellModel(question:"1、至少一名直系家庭成员（已婚配偶、父母、兄弟姊妹、子女）是现居于香港的香港永久性居民", answer: dataModelForBasicInfo.background?.background_member?.has ?? "", additionDes: dataModelForBasicInfo.background?.background_member?.info ?? "",type: 1) let model1 = YHBasicInfoCellModel(question:"1、至少一名直系家庭成员（已婚配偶、父母、兄弟姊妹、子女）是现居于香港的香港永久性居民", answer: dataModelForBasicInfo.background?.background_member?.has ?? "", info: dataModelForBasicInfo.background?.background_member?.info ?? "",type: 1)
model1.model = dataModelForBasicInfo.background model1.model = dataModelForBasicInfo.background
let arr = [model1] let arr = [model1]
...@@ -140,7 +141,7 @@ extension YHBasicInfoFillViewModel { ...@@ -140,7 +141,7 @@ extension YHBasicInfoFillViewModel {
} }
extension YHBasicInfoFillViewModel { extension YHBasicInfoFillViewModel {
//获取我的评分结果 //获取基本资料信息
func getBasicInfo( params:[String : Any],callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) { func getBasicInfo( params:[String : Any],callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
// createOrgBasiceInfoData() // createOrgBasiceInfoData()
// callBackBlock(true,nil)//先返回数据 让界面展示相关的UI // callBackBlock(true,nil)//先返回数据 让界面展示相关的UI
...@@ -169,5 +170,32 @@ extension YHBasicInfoFillViewModel { ...@@ -169,5 +170,32 @@ extension YHBasicInfoFillViewModel {
callBackBlock(false,err) callBackBlock(false,err)
} }
} }
//保存基本资料信息
func saveBasicInfo( params:[String : Any],callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Basics.updateBasicInfoApi
let _ = YHNetRequest.getRequest(url: strUrl,params: params) { [weak self] json, code in
//1. json字符串 转 对象
guard let self = self else { return }
guard let model = NetBaseModel.deserialize(dict: json) else {
let error : YHErrorModel = YHErrorModel(errorCode:YHErrorCode.dictParseError.rawValue,errorMsg: YHErrorCode.dictParseError.description())
callBackBlock(false,error)
return
}
printLog("model 是 ==> \(model)")
// let dic = model.data?.peel
// guard let resultModel = YHBasicInfoFillModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
// callBackBlock(false,nil)
// return
// }
//
// self.dataModelForBasicInfo = resultModel
//根据返回值 组装 真实的数据
callBackBlock(true,nil)
} failBlock: { err in
callBackBlock(false,err)
}
}
} }
galaxy/galaxy/Classes/Tools/NetWork/YHAllApiName.swift
View file @ 6884d28c
...@@ -48,7 +48,10 @@ class YHAllApiName { ...@@ -48,7 +48,10 @@ class YHAllApiName {
//Basics //Basics
struct Basics { struct Basics {
//提交 温馨提示信息 //获取 基本资料信息
static let basicInfoApi = "frontend/basics/get_basics" static let basicInfoApi = "frontend/basics/get_basics"
//保存基本资料信息
static let updateBasicInfoApi = "frontend/basics/update_basics"
} }
} }
galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift
View file @ 6884d28c
...@@ -93,7 +93,7 @@ class YHNetRequest: NSObject { ...@@ -93,7 +93,7 @@ class YHNetRequest: NSObject {
print("sign = \(sign)") print("sign = \(sign)")
requestHeader.add(name:"sign",value:sign) requestHeader.add(name:"sign",value:sign)
requestHeader.add(name: "token", value: "eyJpdiI6Ik1yM1RTNkVqUEJBd0J3OVNEb2FNeWc9PSIsInZhbHVlIjoiQzNZMkxmTldHbXdtU0lFdkNYenNxRXIwYTM0ak5Ec0JCTTJlNnhTcGFqMUx6ZWVwb25aS281WFRxMUhvUFFqOEtEV1RZbmFPMHliUlRvQ0dEY3g4Vzg0QklmcGRmeXFYRlwvcSt0SE83SE8za0VSandjdlV2TENFT05GMlUrRXNVM3hSTzFIa29YU3dKRStaUGpsV1h4OXcwUDZpb1czZTk5RUE3ZFlvSTQ4QkhNS2JURExWY1puRjZZYmxqVFB2Ync2XC9RaDRwWHlXWmdTdlZVWTR5bXpYVG4zRFg0dnlCSFZuOURQSjgyaEE2WndERUV2STRqcmM3bkphRFwvWVhQMFwvQ1o2aEI0YmRpV1JmeDZ2bDJBQ0pXWkZ1a3d5Zm04RU0za21USnlGZUdld053enVvZ25CXC9lKzNVSkhFSHg3dGdyQm9HWDJJcXZqZGdoekUrNEZFSzljWDRjQk9WMGdGaGVjdjNRV09ieFJoZ3gzSjN1ckhzdHhpNStyam4xVjB0QjVJZDk2aDJkNnhPODJON3dHY2J6RWpqNDRGNk9uU0pKV05GQ0o5MnBHcVhabVc3VVNTdXRORE5lT1hXVGdGS1d2bEhPNkdCc1hNbk00a0R3UUJjblJoU1ZWb09PMDBaMkhFYU5hTGE5a1I5V1RNRld5UGIyY0owS3BYVlRmUStmMXl0MWhjV2tMZzJjRXlkY1p3OVJ5cFlEdWVsN1M5YUNpRzIxUlIyc3d6VVpQMmswYzBxY2xyS1d1YkZyb2RzY3pXdGdaMU5JenEzMmhBQ1RwcWFoVHpSVnZXemhiZ1B5eEJKd1I2UVh2eHFZZVZka0VwXC9xanFZU0M2U3Q0dlAybmk0NlJhZ05BdlVMVFNZM3FcL1RYS1pUdHRYU3pmR1ZNbUhXWGNENFA3MEpJeDdrbFZUWmdacERhT2ZxOVVFM0drZHZHc1NUemNnOThGUkxxSHJsOFZ2akxqT1VHaDlkdVFXT0hKZ0w2cSthb1plaTl3VHhObElcL1wvR2RIbVdoQndJNEdcLzByRlpzMDlIbjI5R2FqYldzTmNxRHJwZVJsTFpjWmpqNno4S0Q4cHNCcFcyNXY4SmJnUlVpRlwvY0RIVzRBdFpQMEM0Q25sM1NjbUpIZHZPZ1U2dXZvSkx6Y1BaSWFXZnJQakRTNVlVMFNwUDg3NlJnNW5cL0lISWpYTVlKU1htYjVmQWZUXC82UjlmWkREd0RoU3FWYksyUFwvRnpJWjh5VVhnRFp5VGxHOTE2UGUwVTN5RWlUUlwvWEw0eDFrUGtKWkRCdWFXYkM5SFwvaHc5RFdWZDdmSmJyVlN3Q01ZdkJQQ2JScCs1UFA2QjVhNWE5cCtWbVwvYTZ1dmZBVWlweU4wYXJPblVcL0VtdTN6c2JVamRoTmM1WW0yXC95S3N3UTR0Rm12VmNKU3QyN0JsVjUwVUt2a0hhM0I2SUhiRUxzMU9RbkxIQVNkVTVpTmJwYWFyMWpWbnNJaGljZlRyVm5TZ2t0S2k3ckp1VEdGd2hjYSt3azFLN1wvUFA2eGJuOUFRbHByUmE0VjA2dmVidmdTQkY5UWpDQlg0QVVsZ1RvTE5RUEZTbkxFVWRKcEQ5aDI0XC9JdXNjOCtDVjRnWERcL2ZqXC82RGhMdVZBT3dMd3VLTWhIQXZDanlpVW54RUxlUDFxZjZLMjVsckRuRjlZbmxORENoVHU5MXhhRitBYyt5MmV4WFwvWitlUTZ6VG5aYlh5MW42VkRzY0hcL0ZrVUNrNXVxNVVXYjhnZnRFaWhlUWdXc2Z4NmpEaGplYXFjSUlHNFYra3BvUmt3WGxONjF4bCtaQVFnSmxrT2I2TjhkYndoTE13YWFWNEZNRENMMkEwS1habjhSUWRwd3ZkeGNuNUhMOFhzdkpKRzdnUnBzT2orWGh6WWpRPT0iLCJtYWMiOiIwNTIzOTU3MGIxODIzZjA1YTViZDBmM2Y5ZWZhMDAyZWQ4ZWY4MmQzNGJjY2FmNTFmOTNlZGY5ODA3NTBkZDgxIn0=") requestHeader.add(name: "token", value: "eyJpdiI6IlwvQVwvWnQ5N2lnbkx6WDVvVU8yUkFBUT09IiwidmFsdWUiOiJZVmVhV0hsTnFjYUlrUzBPOHRDcHh5eTE0RUEzVXVnSE00c1RkSmpjcENhK05nRkZHdWxLbzNSNXhJM1gwVzdySlJybTF2Q3VVelwvQ0N5YWxjcVgwNVR6eHFHd1hGRUE2eE9sUnlPbExZaTRWUDk0R3gxUGhDRFdTWmtPWUc4YWVcL0o2akdqODJRTFdLTkRvUmprbm5pdlo1Vm1keE5vdVwvc3lyRG5waHhTTGdWckZsUWNFaURtUFJyOHZ4SlwvVFd0VUloVEVvZDN6VHJQQklkbVwvZzBBb1wvM2VZXC9PampiYWx1YzRGQSs4OVBlTjgwYk4yaEFFSFNxUktiVkVieElVU283aHZwdkFuNHNJN0hoQWJLWm1tVEdHV0NOWGtxeWRjWHR4SGdHMytUbEh1S0FYbmNZUmtxWVYzUFdtc214amJHUGFNRW9iRHI4MEdwdlpiYlZRUmhIMWE0V2ZOcnJNNno0bGd4bGp1azZDSXVtcld6bFdLb0VmWVpOU25JUm8rUU0xMVlYWlZxUGQyS2xjUzJrR21VaExhdG5zbGM3cjZzRmlHbW4zZFNrTllOXC9OWWsxKzcyM3Vrdko3eFlYem5HWDkySnFVRGZKajBEVzRwZXcwRFpaWDJpMDVZQk1vSG8wTDJxazBWdWFJZXFEWUtIRU81aFFtZGtXRzZGdVZsQ1BZbDBKb2IzRkRwT2tPcVA5cXp4TTk1ZzJaTGUreStteUVDWldvc0RDXC9GWjJObytGblR3dVhVdzF6dE51b3NMTlMxYVNhVVp0MTk4aGFSVE9vYUp5OEl5SWo2TFlydElvRUhlbGFLU1U1RjFESVwvTFwvaE1ubWhid0RJd3NzVmRBeEd5ZytPam5kUFlqdnpQVCswNVk4SVdDZ21CODFETG1PemduR3g5cW5mNU5WOU56Mzhxalk2bUFCVld2eDZhSE5EUlI2NnIxRkhmOU94dmQrYXZzRU9UNFJBZWVCcmVwMGQ1dlRsSmdvbGpPa1dPVVwvTWIrd2ZlVURiZ3NOMnhQR1RZYk5Hc25OQWlIcEVQXC80YllpSnlsSEZDVWdERVdQS1RoRzBpSTB4Rjh4Y1hscmZBUUhCdm5pc0ZOa0NxVjd1S3VBRUVMeDU0aWNMc1FzZ0JWeWlDTWZVK2dHOG81czBCanFBekdCYTFWRzBic3AyVmMycDZRNGhjVGcxZEEzMllYZ2oyQ0MrXC9IRFU3UHFUeUhzNFQwTmkrbW9EK0dST2M0RFF0Nk5CbkN0RjdNemc4TEt0cDgwbVRsUlwvQkp5N3RDR01OQURSUXc3OWNCWjY4bU93ZmtyaDI2SmtRV3YwdVBJTFBCRkJHZVl6ODJnbE41VnpYZVBoZXd6b0lcL2NIQVpqZEhLNktSZDRXS2VtbEZWTUk2TFpDK0grV1lsNGJ0ekVuU1hcLzh3bUdOTWo0REx5SXBcL3JueGxENUM1eFRXQ0J5VTkyQUJrZ1hZUFJZeE0xRTRDNER6V2tjN0FmckExanZJWHg3cHFWRWowdTJGS2hPdUtrWk9DZTdsYzhha3ZRSGY1MDNIeGE2WWRrK1RZQU1uUXUxR09kZ1ExbjNZc3dXb00zVDRTa2R5Y1hYRXRDRmhlZnV0RVQxRzRzNWxhOVBsVmZrSlZzakhaMkVkcmttMkU2RXVaTmpBS2c4RkVQR3JlVDcxNWJoR3prTzlsZXRrRWR2c1pIaWx4MFIrMm5scXZ4T2JcL0lzK29PYzc4MDBaRVg3c2ZJdUJPWjRHOTA3cjg4eDNzXC8xUkVIY3VQWmpxVmUyY1BDRGFNYlVXY3BvT1Q1cXZCXC9wXC9rMGllXC81MkxUaG1QXC85ZjhER1M0aDREVlpuaVdqOTd0clpwSUY3cWdvV3FiN3pUbTVmMHlhXC85WnNPS1JJdm5vc05CMEtXdVE9PSIsIm1hYyI6ImViMTE5NmQyMjVmOTgxMmYzMjQ5NGI0M2I2NDAwNWQ2OWE5YTNlMzVhODcyMzAxZTU1NzVkNWU3Y2M5YTU3ZjgifQ==")
headers = requestHeader headers = requestHeader
} }
......
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