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
5f478c06
Commit
5f478c06
authored
Jul 09, 2024
by
David黄金龙
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1、处理 已下架 逻辑 及UI
2、处理一处bug
parent
c4d57a39
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
16 additions
and
57 deletions
+16
-57
galaxyForUat.xcscheme
...xy.xcodeproj/xcshareddata/xcschemes/galaxyForUat.xcscheme
+1
-1
YHActivityDetailViewController.swift
...y(社区)/Activity(活动)/C/YHActivityDetailViewController.swift
+2
-0
YHActivityListViewController.swift
...ity(社区)/Activity(活动)/C/YHActivityListViewController.swift
+3
-1
YHActivityTravelViewController.swift
...y(社区)/Activity(活动)/C/YHActivityTravelViewController.swift
+0
-52
YHActivityListCell.swift
...les/Community(社区)/Activity(活动)/V/YHActivityListCell.swift
+1
-1
YHActivityTravelCell.swift
...s/Community(社区)/Activity(活动)/V/YHActivityTravelCell.swift
+4
-0
YHApplyActivityAlert.swift
...s/Community(社区)/Activity(活动)/V/YHApplyActivityAlert.swift
+5
-2
No files found.
galaxy/galaxy.xcodeproj/xcshareddata/xcschemes/galaxyForUat.xcscheme
View file @
5f478c06
...
@@ -71,7 +71,7 @@
...
@@ -71,7 +71,7 @@
buildConfiguration =
"Debug"
>
buildConfiguration =
"Debug"
>
</AnalyzeAction>
</AnalyzeAction>
<ArchiveAction
<ArchiveAction
buildConfiguration =
"Release"
buildConfiguration =
"
Uat
Release"
revealArchiveInOrganizer =
"YES"
>
revealArchiveInOrganizer =
"YES"
>
</ArchiveAction>
</ArchiveAction>
</Scheme>
</Scheme>
galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/C/YHActivityDetailViewController.swift
View file @
5f478c06
...
@@ -87,6 +87,8 @@ extension YHActivityDetailViewController {
...
@@ -87,6 +87,8 @@ extension YHActivityDetailViewController {
case
.
end
:
case
.
end
:
printLog
(
"活动已结束"
)
printLog
(
"活动已结束"
)
// YHHUD.flash(message: "活动已结束")
// YHHUD.flash(message: "活动已结束")
case
.
soldout
:
printLog
(
"已下架"
)
default
:
default
:
printLog
(
""
)
printLog
(
""
)
}
}
...
...
galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/C/YHActivityListViewController.swift
View file @
5f478c06
...
@@ -39,7 +39,7 @@ enum YHActivityStatus: Int {
...
@@ -39,7 +39,7 @@ enum YHActivityStatus: Int {
}
}
}
}
var
titleForMyApplyList
:
String
{
var
titleForMyApplyList
:
String
{
switch
self
{
switch
self
{
case
.
notApply
:
case
.
notApply
:
return
"立即报名"
return
"立即报名"
...
@@ -67,6 +67,8 @@ enum YHActivityStatus: Int {
...
@@ -67,6 +67,8 @@ enum YHActivityStatus: Int {
return
"活动结束"
return
"活动结束"
case
.
canceled
:
case
.
canceled
:
return
"立即报名"
return
"立即报名"
case
.
soldout
:
return
"已下架"
default
:
default
:
return
""
return
""
}
}
...
...
galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/C/YHActivityTravelViewController.swift
View file @
5f478c06
...
@@ -46,17 +46,6 @@ class YHActivityTravelViewController: YHBaseViewController {
...
@@ -46,17 +46,6 @@ class YHActivityTravelViewController: YHBaseViewController {
}()
}()
lazy
var
topView
:
UIView
=
{
let
view
=
UIView
()
return
view
}()
lazy
var
bottomView
:
YHActivityDetailBottomView
=
{
let
view
=
YHActivityDetailBottomView
()
return
view
}()
// MARK: - 生命周期方法
// MARK: - 生命周期方法
override
func
viewDidLoad
()
{
override
func
viewDidLoad
()
{
super
.
viewDidLoad
()
super
.
viewDidLoad
()
...
@@ -163,47 +152,6 @@ extension YHActivityTravelViewController {
...
@@ -163,47 +152,6 @@ extension YHActivityTravelViewController {
navigationController
?
.
pushViewController
(
vc
)
navigationController
?
.
pushViewController
(
vc
)
}
}
}
}
// func showApplyUI() {
// YHApplyActivityAlert.showApplyActivityAlertView { (tag,name,number,phone) in
// if tag {
// printLog(tag)
// printLog(name)
// printLog(number)
// printLog(phone)
// if tag {
// if let model = self.viewModel.activityTravelModel,model.id > 0 {
// let param = ["id" : model.id,
// "name":name,
// "mobile":phone,
// "number":number]
// self.applyActivity(param: param)
// }
// }
// }
// }
// }
// func applyActivity(param : [String : Any]) {
//
// viewModel.applyActivity(param: param) { success, error in
// if success {
// YHHUD.flash(message: "报名成功")
// self.loadData()
// DispatchQueue.main.async {
// let vc = YHApplyActivityResultViewController()
// vc.activityTravelId = String(self.viewModel.activityTravelModel?.id ?? 0)
//
// self.navigationController?.pushViewController(vc)
// }
// } else {
// let msg = error?.errorMsg ?? "报名失败,请重试"
// YHHUD.flash(message: msg)
// }
// }
// }
}
}
extension
YHActivityTravelViewController
:
UITableViewDelegate
,
UITableViewDataSource
{
extension
YHActivityTravelViewController
:
UITableViewDelegate
,
UITableViewDataSource
{
...
...
galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/V/YHActivityListCell.swift
View file @
5f478c06
...
@@ -18,7 +18,7 @@ class YHActivityListCell: UITableViewCell {
...
@@ -18,7 +18,7 @@ class YHActivityListCell: UITableViewCell {
}
}
}
}
var
type
:
Int
=
0
var
type
:
Int
=
0
//0-活动列表 1-我的报名活动
var
sessionIndex
:
Int
=
0
{
var
sessionIndex
:
Int
=
0
{
...
...
galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/V/YHActivityTravelCell.swift
View file @
5f478c06
...
@@ -121,9 +121,13 @@ extension YHActivityTravelCell {
...
@@ -121,9 +121,13 @@ extension YHActivityTravelCell {
cancelButton
.
isHidden
=
true
cancelButton
.
isHidden
=
true
statusLable
.
text
=
"活动结束"
statusLable
.
text
=
"活动结束"
}
else
if
model
.
status
.
int
==
5
{
cancelButton
.
isHidden
=
true
statusLable
.
text
=
"活动已下架"
}
}
else
{
else
{
cancelButton
.
isHidden
=
true
cancelButton
.
isHidden
=
true
statusLable
.
text
=
""
}
}
...
...
galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/V/YHApplyActivityAlert.swift
View file @
5f478c06
...
@@ -140,8 +140,11 @@ class YHApplyActivityAlert: UIView {
...
@@ -140,8 +140,11 @@ class YHApplyActivityAlert: UIView {
//类方法 - 展示
//类方法 - 展示
static
func
showApplyActivityAlertView
(
name
:
String
=
""
,
callBack
:
@escaping
Block
)
{
static
func
showApplyActivityAlertView
(
name
:
String
=
""
,
callBack
:
@escaping
Block
)
{
let
view
=
YHApplyActivityAlert
(
frame
:
CGRect
(
x
:
0
,
y
:
0
,
width
:
KScreenWidth
,
height
:
KScreenHeight
))
let
view
=
YHApplyActivityAlert
(
frame
:
CGRect
(
x
:
0
,
y
:
0
,
width
:
KScreenWidth
,
height
:
KScreenHeight
))
view
.
applyName
=
name
view
.
nameTextField
.
text
=
name
var
ttt
=
name
let
tName
=
ttt
.
slice
(
from
:
0
,
length
:
10
)
view
.
applyName
=
tName
view
.
nameTextField
.
text
=
tName
view
.
block
=
callBack
view
.
block
=
callBack
let
window
=
UIApplication
.
shared
.
yhKeyWindow
()
let
window
=
UIApplication
.
shared
.
yhKeyWindow
()
window
?
.
addSubview
(
view
)
window
?
.
addSubview
(
view
)
...
...
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