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
c26756ba
Commit
c26756ba
authored
Apr 03, 2025
by
pete谢兆麟
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'plan' of
http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS
into plan
parents
473e6fae
1ed82272
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
2 deletions
+22
-2
YHCustomerInformationQuestionnaireVC.swift
...les/Plan(方案)/C/YHCustomerInformationQuestionnaireVC.swift
+21
-0
YHPlanViewController.swift
...axy/Classes/Modules/Plan(方案)/C/YHPlanViewController.swift
+1
-2
No files found.
galaxy/galaxy/Classes/Modules/Plan(方案)/C/YHCustomerInformationQuestionnaireVC.swift
View file @
c26756ba
...
@@ -254,6 +254,7 @@ class YHCustomerInformationQuestionnaireVC: YHBaseViewController {
...
@@ -254,6 +254,7 @@ class YHCustomerInformationQuestionnaireVC: YHBaseViewController {
if
let
first
=
questions
.
first
,
surveyContainerModel
.
defaultAnswers
.
contains
(
where
:
{
answer
in
if
let
first
=
questions
.
first
,
surveyContainerModel
.
defaultAnswers
.
contains
(
where
:
{
answer
in
answer
.
questionKey
==
first
.
businessKey
answer
.
questionKey
==
first
.
businessKey
})
{
})
{
/*
for answer in surveyContainerModel.defaultAnswers {
for answer in surveyContainerModel.defaultAnswers {
if let question = questions.first(where: { item in
if let question = questions.first(where: { item in
item.businessKey == answer.questionKey
item.businessKey == answer.questionKey
...
@@ -268,6 +269,26 @@ class YHCustomerInformationQuestionnaireVC: YHBaseViewController {
...
@@ -268,6 +269,26 @@ class YHCustomerInformationQuestionnaireVC: YHBaseViewController {
self.answerDic[question.id] = options
self.answerDic[question.id] = options
}
}
}
}
*/
for
(
index
,
answer
)
in
surveyContainerModel
.
defaultAnswers
.
enumerated
()
{
if
let
question
=
questions
.
first
(
where
:
{
item
in
item
.
businessKey
==
answer
.
questionKey
})
{
displayedQuestions
.
append
(
question
)
let
options
=
answer
.
optionKey
.
compactMap
{
optionKey
in
let
option
=
question
.
options
.
first
{
optionItem
in
optionItem
.
businessKey
==
optionKey
}
return
YHSurveyConditionOptionExtra
(
extra
:
""
,
optionId
:
option
?
.
id
??
""
,
title
:
option
?
.
title
??
""
,
optionKey
:
answer
.
questionKey
)
}
self
.
answerDic
[
question
.
id
]
=
options
}
if
surveyContainerModel
.
defaultAnswers
.
count
>
index
+
1
,
let
lastModel
=
displayedQuestions
.
last
,
let
nextQuestion
=
self
.
findNextQuestion
(
allQuestions
:
self
.
allQuestions
,
displayedQuestions
:
self
.
displayedQuestions
,
answerDic
:
self
.
answerDic
,
currentIndex
:
displayedQuestions
.
count
-
1
,
currentOptionId
:
lastModel
.
id
),
nextQuestion
.
businessKey
!=
surveyContainerModel
.
defaultAnswers
[
index
+
1
]
.
questionKey
{
self
.
displayedQuestions
.
append
(
nextQuestion
)
break
}
}
if
let
lastModel
=
displayedQuestions
.
last
,
let
nextQuestion
=
self
.
findNextQuestion
(
allQuestions
:
self
.
allQuestions
,
displayedQuestions
:
self
.
displayedQuestions
,
answerDic
:
self
.
answerDic
,
currentIndex
:
displayedQuestions
.
count
-
1
,
currentOptionId
:
lastModel
.
id
)
{
if
let
lastModel
=
displayedQuestions
.
last
,
let
nextQuestion
=
self
.
findNextQuestion
(
allQuestions
:
self
.
allQuestions
,
displayedQuestions
:
self
.
displayedQuestions
,
answerDic
:
self
.
answerDic
,
currentIndex
:
displayedQuestions
.
count
-
1
,
currentOptionId
:
lastModel
.
id
)
{
self
.
displayedQuestions
.
append
(
nextQuestion
)
self
.
displayedQuestions
.
append
(
nextQuestion
)
...
...
galaxy/galaxy/Classes/Modules/Plan(方案)/C/YHPlanViewController.swift
View file @
c26756ba
...
@@ -445,8 +445,7 @@ extension YHPlanViewController: UITableViewDelegate, UITableViewDataSource {
...
@@ -445,8 +445,7 @@ extension YHPlanViewController: UITableViewDelegate, UITableViewDataSource {
return
UITableViewCell
()
return
UITableViewCell
()
}
}
cell3
.
cases
=
self
.
caseArr
cell3
.
cases
=
self
.
caseArr
cell3
.
clickBlock
=
{
cell3
.
clickBlock
=
{
[
weak
self
]
arr
,
index
in
[
weak
self
]
arr
,
index
in
guard
let
self
=
self
else
{
return
}
guard
let
self
=
self
else
{
return
}
let
vc
=
YHPlanPolicyDetailViewController
()
let
vc
=
YHPlanPolicyDetailViewController
()
vc
.
arr
=
arr
vc
.
arr
=
arr
...
...
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