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
289d532f
Commit
289d532f
authored
Jun 28, 2024
by
Steven杜宇
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
// 报名结果bug修复
parent
f6c7585b
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
3 deletions
+11
-3
YHActivityDetailViewController.swift
...y(社区)/Activity(活动)/C/YHActivityDetailViewController.swift
+3
-3
YHActivityListViewController.swift
...ity(社区)/Activity(活动)/C/YHActivityListViewController.swift
+1
-0
YHActivityTravelViewController.swift
...y(社区)/Activity(活动)/C/YHActivityTravelViewController.swift
+1
-0
YHApplyActivityResultViewController.swift
.../Activity(活动)/C/YHApplyActivityResultViewController.swift
+6
-0
No files found.
galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/C/YHActivityDetailViewController.swift
View file @
289d532f
...
@@ -10,7 +10,7 @@ import UIKit
...
@@ -10,7 +10,7 @@ import UIKit
class
YHActivityDetailViewController
:
YHBaseViewController
{
class
YHActivityDetailViewController
:
YHBaseViewController
{
var
activityId
:
String
=
""
var
activityId
:
String
=
""
var
activityName
:
String
=
""
lazy
var
viewModel
:
YHActivityViewModel
=
{
lazy
var
viewModel
:
YHActivityViewModel
=
{
let
vm
=
YHActivityViewModel
()
let
vm
=
YHActivityViewModel
()
return
vm
return
vm
...
@@ -182,7 +182,7 @@ extension YHActivityDetailViewController {
...
@@ -182,7 +182,7 @@ extension YHActivityDetailViewController {
let
vc
=
YHApplyActivityResultViewController
()
let
vc
=
YHApplyActivityResultViewController
()
vc
.
isSuccessFlag
=
true
vc
.
isSuccessFlag
=
true
vc
.
activityTravelId
=
self
.
viewModel
.
travelModel
?
.
id
??
""
vc
.
activityTravelId
=
self
.
viewModel
.
travelModel
?
.
id
??
""
vc
.
activityName
=
self
.
viewModel
.
activityDetailModel
?
.
name
??
""
vc
.
activityName
=
self
.
viewModel
.
activityDetailModel
?
.
name
??
self
.
activityName
self
.
navigationController
?
.
pushViewController
(
vc
)
self
.
navigationController
?
.
pushViewController
(
vc
)
}
}
}
else
{
}
else
{
...
@@ -190,7 +190,7 @@ extension YHActivityDetailViewController {
...
@@ -190,7 +190,7 @@ extension YHActivityDetailViewController {
let
vc
=
YHApplyActivityResultViewController
()
let
vc
=
YHApplyActivityResultViewController
()
vc
.
isSuccessFlag
=
false
vc
.
isSuccessFlag
=
false
vc
.
activityTravelId
=
self
.
viewModel
.
travelModel
?
.
id
??
""
vc
.
activityTravelId
=
self
.
viewModel
.
travelModel
?
.
id
??
""
vc
.
activityName
=
self
.
viewModel
.
activityDetailModel
?
.
name
??
""
vc
.
activityName
=
self
.
viewModel
.
activityDetailModel
?
.
name
??
self
.
activityName
self
.
navigationController
?
.
pushViewController
(
vc
)
self
.
navigationController
?
.
pushViewController
(
vc
)
}
else
{
}
else
{
let
msg
=
error
?
.
errorMsg
??
"报名失败,请重试"
let
msg
=
error
?
.
errorMsg
??
"报名失败,请重试"
...
...
galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/C/YHActivityListViewController.swift
View file @
289d532f
...
@@ -268,6 +268,7 @@ extension YHActivityListViewController: UITableViewDelegate, UITableViewDataSour
...
@@ -268,6 +268,7 @@ extension YHActivityListViewController: UITableViewDelegate, UITableViewDataSour
let
vc
=
YHActivityDetailViewController
()
let
vc
=
YHActivityDetailViewController
()
vc
.
activityId
=
String
(
model
.
id
)
vc
.
activityId
=
String
(
model
.
id
)
vc
.
activityName
=
model
.
name
navigationController
?
.
pushViewController
(
vc
)
navigationController
?
.
pushViewController
(
vc
)
}
}
}
}
...
...
galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/C/YHActivityTravelViewController.swift
View file @
289d532f
...
@@ -158,6 +158,7 @@ extension YHActivityTravelViewController {
...
@@ -158,6 +158,7 @@ extension YHActivityTravelViewController {
let
vc
=
YHActivityDetailViewController
()
let
vc
=
YHActivityDetailViewController
()
vc
.
activityId
=
String
(
self
.
viewModel
.
activityTravelModel
?
.
id
??
0
)
vc
.
activityId
=
String
(
self
.
viewModel
.
activityTravelModel
?
.
id
??
0
)
vc
.
activityName
=
self
.
viewModel
.
activityDetailModel
?
.
name
??
""
navigationController
?
.
pushViewController
(
vc
)
navigationController
?
.
pushViewController
(
vc
)
}
}
}
}
...
...
galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/C/YHApplyActivityResultViewController.swift
View file @
289d532f
...
@@ -74,6 +74,7 @@ extension YHApplyActivityResultViewController {
...
@@ -74,6 +74,7 @@ extension YHApplyActivityResultViewController {
func
setupUI
()
{
func
setupUI
()
{
gk_navigationBar
.
isHidden
=
false
gk_navigationBar
.
isHidden
=
false
gk_navigationBar
.
backgroundColor
=
.
clear
gk_navigationBar
.
backgroundColor
=
.
clear
gk_navTitle
=
"报名结果"
// view.backgroundColor = UIColor.pageBkgColor
// view.backgroundColor = UIColor.pageBkgColor
view
.
backgroundColor
=
UIColor
.
white
view
.
backgroundColor
=
UIColor
.
white
...
@@ -110,11 +111,16 @@ extension YHApplyActivityResultViewController {
...
@@ -110,11 +111,16 @@ extension YHApplyActivityResultViewController {
}
}
if
isSuccessFlag
{
if
isSuccessFlag
{
titleLabel
.
text
=
"报名成功"
statusImageV
.
image
=
UIImage
(
named
:
"activity_apply_result_success"
)
statusImageV
.
image
=
UIImage
(
named
:
"activity_apply_result_success"
)
nameLabel
.
text
=
"已报名成功活动【"
+
activityName
+
"】,记得准时参加哦"
nameLabel
.
text
=
"已报名成功活动【"
+
activityName
+
"】,记得准时参加哦"
submitButton
.
setTitle
(
"查看行程单"
,
for
:
.
normal
)
}
else
{
}
else
{
titleLabel
.
text
=
"报名失败"
statusImageV
.
image
=
UIImage
(
named
:
"activity_apply_result_fail"
)
statusImageV
.
image
=
UIImage
(
named
:
"activity_apply_result_fail"
)
nameLabel
.
text
=
"活动【"
+
activityName
+
"】,活动时间已结束,请您看看其他活动~"
nameLabel
.
text
=
"活动【"
+
activityName
+
"】,活动时间已结束,请您看看其他活动~"
submitButton
.
setTitle
(
"返回活动列表"
,
for
:
.
normal
)
}
}
}
}
...
...
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