Skip to content

G
galaxy-iOS
Commit 4061f109 authored by Steven杜宇's avatar Steven杜宇
Browse files
Options

// 家庭成员

parent f4a5934e
Show whitespace changes
Inline Side-by-side
Showing with 64 additions and 16 deletions
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Child(子女)/YHChildInfoContainerVC.swift
View file @ 4061f109
......@@ -254,7 +254,15 @@ extension YHChildInfoContainerVC {
[weak self] success, error in
guard let self = self else { return }
if isShowLoading {
YHHUD.flash(message: success ? "保存成功" : "保存失败")
if success {
YHHUD.flash(message:isSubmit ? "提交成功" : "保存成功")
} else {
var msg = isSubmit ? "提交失败" : "保存失败"
if let errorMsg = error?.errorMsg, errorMsg.count > 0 {
msg = errorMsg
}
YHHUD.flash(message:msg)
}
}
if let callBack = callBack {
callBack(success, error?.errorMsg)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Parents&Brothers(父母和兄弟姐妹)/YHBrotherInfoVC.swift
View file @ 4061f109
......@@ -64,7 +64,7 @@ class YHBrotherInfoVC: YHBaseViewController {
[weak self] in
guard let self = self else { return }
self.saveInfo(isSubmit: true, isLoading: true) {
[weak self] success, msg in
[weak self] success in
if success {
self?.navigationController?.popViewController(animated: true)
}
......@@ -544,7 +544,7 @@ extension YHBrotherInfoVC {
}
// isSubmit 是否是提交 isSilent:是否显示toast
func saveInfo(isSubmit:Bool, isLoading:Bool, callBack:((Bool, String?)->Void)?) {
func saveInfo(isSubmit:Bool, isLoading:Bool, callBack:((Bool)->Void)?) {
if isSubmit {
let isChecked = checkIntegrity()
......@@ -569,10 +569,18 @@ extension YHBrotherInfoVC {
self.familyRequest.addOrSaveFamilyMember(params:dict, isShowLoading: isLoading) { success, error in
if isLoading {
YHHUD.flash(message: success ? "保存成功" : "保存失败")
if success {
YHHUD.flash(message:"保存成功")
} else {
var msg = "保存失败"
if let errorMsg = error?.errorMsg, errorMsg.count > 0 {
msg = errorMsg
}
YHHUD.flash(message:msg)
}
}
if let callBack = callBack {
callBack(success, error?.errorMsg)
callBack(success)
}
}
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Parents&Brothers(父母和兄弟姐妹)/YHParentInfoVC.swift
View file @ 4061f109
......@@ -66,7 +66,7 @@ class YHParentInfoVC: YHBaseViewController {
[weak self] in
guard let self = self else { return }
self.saveInfo(isSubmit: true, isLoading: true) {
[weak self] success, msg in
[weak self] success in
if success {
self?.navigationController?.popViewController(animated: true)
}
......@@ -583,7 +583,7 @@ extension YHParentInfoVC {
}
// isSubmit 是否是提交 isSilent:是否显示toast
func saveInfo(isSubmit:Bool, isLoading:Bool, callBack:((Bool, String?)->Void)?) {
func saveInfo(isSubmit:Bool, isLoading:Bool, callBack:((Bool)->Void)?) {
if isSubmit {
let isChecked = checkIntegrity()
......@@ -608,10 +608,18 @@ extension YHParentInfoVC {
self.familyRequest.addOrSaveFamilyMember(params:dict, isShowLoading: isLoading) { success, error in
if isLoading {
YHHUD.flash(message: success ? "保存成功" : "保存失败")
if success {
YHHUD.flash(message:"保存成功")
} else {
var msg = "保存失败"
if let errorMsg = error?.errorMsg, errorMsg.count > 0 {
msg = errorMsg
}
YHHUD.flash(message:msg)
}
}
if let callBack = callBack {
callBack(success, error?.errorMsg)
callBack(success)
}
}
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Spouse(配偶)/YHSpouseInfoContainerVC.swift
View file @ 4061f109
......@@ -202,7 +202,7 @@ class YHSpouseInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
extension YHSpouseInfoContainerVC {
// isSubmit:是否为提交 false为保存 true为提交
func saveInfo(isSubmit:Bool, isLoading:Bool, callBack:((Bool, String?)->Void)?) {
func saveInfo(isSubmit:Bool, isLoading:Bool, callBack:((Bool)->Void)?) {
guard let spouse = spouse else { return }
guard let info = spouse.toDictionary() else { return }
......@@ -214,12 +214,20 @@ extension YHSpouseInfoContainerVC {
"info":info]
self.familyRequest.addOrSaveFamilyMember(params:dict, isShowLoading: isLoading) {
[weak self] success, error in
success, error in
if isLoading {
YHHUD.flash(message: success ? "保存成功" : "保存失败")
if success {
YHHUD.flash(message:isSubmit ? "提交成功" : "保存成功")
} else {
var msg = isSubmit ? "提交失败" : "保存失败"
if let errorMsg = error?.errorMsg, errorMsg.count > 0 {
msg = errorMsg
}
YHHUD.flash(message:msg)
}
}
if let callBack = callBack {
callBack(success, error?.errorMsg)
callBack(success)
}
}
}
......@@ -233,7 +241,7 @@ extension YHSpouseInfoContainerVC {
if let targetVC = getCurrentStepViewController() {
if targetVC.nextStep() {
saveInfo(isSubmit: true, isLoading: true) {
[weak self] success, tips in
[weak self] success in
guard let self = self else { return }
if success {
// 当前步骤已是最后一步
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/YHFamilyMemberInfoListVC.swift
View file @ 4061f109
......@@ -259,6 +259,12 @@ extension YHFamilyMemberInfoListVC {
guard let self = self else { return }
if success {
self.requestFamilyInfo()
} else {
var errorMsg = "添加失败"
if let errMsg = error?.errorMsg, errMsg.count > 0 {
errorMsg = errMsg
}
YHHUD.flash(message: errorMsg)
}
}
}
......@@ -272,7 +278,11 @@ extension YHFamilyMemberInfoListVC {
if success {
YHHUD.flash(message: "删除成功".local)
} else {
YHHUD.flash(message: "删除失败".local)
var errorMsg = "删除失败"
if let errMsg = error?.errorMsg, errMsg.count > 0 {
errorMsg = errMsg
}
YHHUD.flash(message: errorMsg)
}
if let callBack = callBack {
callBack(success)
......@@ -286,8 +296,14 @@ extension YHFamilyMemberInfoListVC {
success, error in
if success {
YHHUD.flash(message: "保存成功")
self.navigationController?.popViewController()
} else {
YHHUD.flash(message: "保存失败")
var errorMsg = "保存失败"
if let errMsg = error?.errorMsg, errMsg.count > 0 {
errorMsg = errMsg
}
YHHUD.flash(message: errorMsg)
}
}
}
......
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