Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
galaxy-iOS
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
mobile-group
galaxy-iOS
Commits
467f1796
Commit
467f1796
authored
Aug 20, 2024
by
Steven杜宇
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
// 家庭
parent
e66c0eb5
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
84 additions
and
32 deletions
+84
-32
YHFamilyInfoUpdateViewController.swift
...onfirm(1 家庭信息确认)/C/YHFamilyInfoUpdateViewController.swift
+45
-30
YHApproverInfoVerifyCell.swift
...ilyInfoConfirm(1 家庭信息确认)/V/YHApproverInfoVerifyCell.swift
+2
-2
YHInfoItemView.swift
...e(办证段)/FamilyInfoConfirm(1 家庭信息确认)/V/YHInfoItemView.swift
+13
-0
YHFamilyInfoConfirmViewModel.swift
...foConfirm(1 家庭信息确认)/VM/YHFamilyInfoConfirmViewModel.swift
+22
-0
YHAllApiName.swift
galaxy/galaxy/Classes/Tools/NetWork/YHAllApiName.swift
+2
-0
No files found.
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/FamilyInfoConfirm(1 家庭信息确认)/C/YHFamilyInfoUpdateViewController.swift
View file @
467f1796
...
...
@@ -18,11 +18,11 @@ enum YHFamilyMemberRelationType: Int {
class
YHFamilyInfoUpdateViewController
:
YHBaseViewController
{
var
memberId
:
Int
=
0
var
familyGroupModel
:
YHFamilyGroupModel
=
YHFamilyGroupModel
()
var
orderId
:
Int
=
0
var
detailMember
:
YHApplicantInfoModel
=
YHApplicantInfoModel
()
let
viewModel
=
YHFamilyInfoConfirmViewModel
()
private
var
detailMember
:
YHApplicantInfoModel
=
YHApplicantInfoModel
()
var
relation
:
YHFamilyMemberRelationType
=
.
mainApplicant
var
isInfoEditing
:
Bool
=
false
...
...
@@ -100,37 +100,59 @@ class YHFamilyInfoUpdateViewController: YHBaseViewController {
make
.
left
.
right
.
bottom
.
equalToSuperview
()
make
.
height
.
equalTo
(
98
)
}
self
.
getDetail
()
self
.
updateData
()
}
@objc
func
didCancelBtnClicked
()
{
self
.
detailMember
.
info
.
isCheck
=
false
self
.
isInfoEditing
=
false
self
.
updateData
()
}
@objc
func
didConfirmBtnClicked
()
{
self
.
detailMember
.
info
.
isCheck
=
true
self
.
tableView
.
reloadData
()
if
let
arr1
=
items
.
first
{
for
item
in
arr1
{
if
!
item
.
tips
.
isEmpty
{
return
}
}
}
if
let
detaiParams
=
self
.
detailMember
.
info
.
toDictionary
()
{
func
getDetail
()
{
if
self
.
familyGroupModel
.
main
.
info
.
id
==
memberId
{
self
.
detailMember
=
self
.
familyGroupModel
.
main
var
relation
=
""
if
self
.
detailMember
.
info
.
relation
==
YHFamilyMemberRelationType
.
mainApplicant
.
rawValue
{
relation
=
"main"
}
else
if
self
.
familyGroupModel
.
spouse
.
info
.
id
==
memberId
{
self
.
detailMember
=
self
.
familyGroupModel
.
spouse
}
else
if
self
.
detailMember
.
info
.
relation
==
YHFamilyMemberRelationType
.
spouse
.
rawValue
{
relation
=
"spouse"
}
else
{
for
child
in
self
.
familyGroupModel
.
children
{
if
child
.
info
.
id
==
memberId
{
self
.
detailMember
=
child
break
}
else
if
self
.
detailMember
.
info
.
relation
==
YHFamilyMemberRelationType
.
child
.
rawValue
{
relation
=
"child"
}
let
param
:[
String
:
Any
]
=
[
"orderId"
:
orderId
,
relation
:
detaiParams
]
YHHUD
.
show
(
.
progress
(
message
:
"提交中..."
))
viewModel
.
submitFamilyUpdate
(
param
:
param
)
{
[
weak
self
]
success
,
error
in
YHHUD
.
hide
()
guard
let
self
=
self
else
{
return
}
if
success
{
YHHUD
.
flash
(
message
:
"提交成功"
)
return
}
let
msg
=
error
?
.
errorMsg
??
"提交失败"
YHHUD
.
flash
(
message
:
msg
)
}
}
self
.
getData
()
}
func
get
Data
()
{
func
update
Data
()
{
items
.
removeAll
()
...
...
@@ -147,16 +169,6 @@ class YHFamilyInfoUpdateViewController: YHBaseViewController {
self
.
tableView
.
reloadData
()
}
func
updateData
()
{
if
let
arr1
=
items
.
first
{
for
item
in
arr1
{
item
.
isEditMode
=
self
.
isInfoEditing
item
.
isShowPreviousInfo
=
(
!
self
.
isInfoEditing
&&
!
item
.
previousValue
.
isEmpty
)
}
}
self
.
tableView
.
reloadData
()
}
}
extension
YHFamilyInfoUpdateViewController
:
UITableViewDelegate
,
UITableViewDataSource
{
...
...
@@ -176,21 +188,24 @@ extension YHFamilyInfoUpdateViewController: UITableViewDelegate, UITableViewData
cell
.
modifyBtn
.
isHidden
=
false
cell
.
isEditState
=
self
.
isInfoEditing
cell
.
familyInfo
=
self
.
detailMember
.
info
// 更改编辑状态
cell
.
editBlock
=
{
[
weak
self
]
isEdit
in
guard
let
self
=
self
else
{
return
}
self
.
isInfoEditing
=
isEdit
self
.
get
Data
()
self
.
update
Data
()
}
// 选择出生国家/地区
cell
.
selectBirthNation
=
{
[
weak
self
]
isInChina
in
guard
let
self
=
self
else
{
return
}
self
.
get
Data
()
self
.
update
Data
()
}
// 更改姓名
cell
.
updateName
=
{
[
weak
self
]
text
in
guard
let
self
=
self
else
{
return
}
self
.
get
Data
()
self
.
update
Data
()
}
}
else
{
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/FamilyInfoConfirm(1 家庭信息确认)/V/YHApproverInfoVerifyCell.swift
View file @
467f1796
...
...
@@ -132,8 +132,8 @@ extension YHApproverInfoVerifyCell: UITableViewDelegate, UITableViewDataSource {
if
0
<=
indexPath
.
row
&&
indexPath
.
row
<
familyArr
.
count
{
let
model
=
familyArr
[
indexPath
.
row
]
let
vc
=
YHFamilyInfoUpdateViewController
()
vc
.
memberId
=
model
.
info
.
id
vc
.
familyGroupModel
=
self
.
familyGroupInfo
vc
.
detailMember
=
model
vc
.
orderId
=
self
.
familyGroupInfo
.
orderid
UIViewController
.
current
?
.
navigationController
?
.
pushViewController
(
vc
)
}
}
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/FamilyInfoConfirm(1 家庭信息确认)/V/YHInfoItemView.swift
View file @
467f1796
...
...
@@ -13,6 +13,8 @@ import AttributedString
// 文字编辑和选择弹窗时使用
class
YHInfoItemView
:
UIView
{
private
var
debounceTimer
:
Timer
?
var
item
:
YHFamilyInfoItem
=
YHFamilyInfoItem
()
var
faimilyInfo
:
YHFamilyMemberInfoModel
=
YHFamilyMemberInfoModel
()
// 姓名更改
...
...
@@ -324,6 +326,14 @@ extension YHInfoItemView: UITextFieldDelegate {
// return false
// }
printLog
(
"
\(
newText
)
"
)
if
self
.
item
.
id
==
.
mainApplicantName
||
self
.
item
.
id
==
.
spouseName
||
self
.
item
.
id
==
.
childName
{
// 名称编辑时需防抖请求拼音
debounceTimer
?
.
invalidate
()
debounceTimer
=
Timer
.
scheduledTimer
(
withTimeInterval
:
1.0
,
repeats
:
false
)
{
[
weak
self
]
_
in
self
?
.
updateNamePinYin
()
}
}
return
true
}
...
...
@@ -338,6 +348,9 @@ extension YHInfoItemView: UITextFieldDelegate {
self
.
item
.
tips
=
self
.
getRedTips
()
self
.
updateItem
(
self
.
item
,
familyInfo
:
self
.
faimilyInfo
)
}
func
updateNamePinYin
()
{
// 编辑姓名
if
self
.
item
.
id
==
.
mainApplicantName
||
self
.
item
.
id
==
.
spouseName
||
self
.
item
.
id
==
.
childName
{
if
let
text
=
textField
.
text
,
!
text
.
isEmpty
{
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/FamilyInfoConfirm(1 家庭信息确认)/VM/YHFamilyInfoConfirmViewModel.swift
View file @
467f1796
...
...
@@ -77,6 +77,28 @@ class YHFamilyInfoConfirmViewModel: NSObject {
callback
?(
""
,
""
)
}
}
func
submitFamilyUpdate
(
param
:[
String
:
Any
],
callback
:((
_
success
:
Bool
,
_
error
:
YHErrorModel
?)
->
())?)
{
let
strUrl
=
YHBaseUrlManager
.
shared
.
curURL
()
+
YHAllApiName
.
FamilyInfoConfirm
.
submitFamilyUpdate
let
_
=
YHNetRequest
.
postRequest
(
url
:
strUrl
,
params
:
param
)
{
[
weak
self
]
json
,
code
in
//1. json字符串 转 对象
guard
let
self
=
self
else
{
return
}
printLog
(
"model 是 ==>
\(
json
)
"
)
if
json
.
code
==
200
{
callback
?(
true
,
nil
)
}
else
{
let
err
=
YHErrorModel
(
errorCode
:
Int32
(
json
.
code
),
errorMsg
:
json
.
msg
.
isEmpty
?
""
:
json
.
msg
)
callback
?(
false
,
err
)
}
}
failBlock
:
{
err
in
callback
?(
false
,
err
)
}
}
}
...
...
galaxy/galaxy/Classes/Tools/NetWork/YHAllApiName.swift
View file @
467f1796
...
...
@@ -415,6 +415,8 @@ class YHAllApiName {
static
let
familyInfo
=
"super-app/order/family/information/obtain"
// 通过姓名获取拼音
static
let
pinyinInfo
=
"super-app/order/information/pinyin"
// 家庭信息-提交修改
static
let
submitFamilyUpdate
=
"super-app/order/family/information/check"
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment