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
be732cfa
Commit
be732cfa
authored
Jun 20, 2024
by
David黄金龙
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
结果页
parent
bc6df0ff
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
170 additions
and
3 deletions
+170
-3
project.pbxproj
galaxy/galaxy.xcodeproj/project.pbxproj
+4
-0
YHActivityDetailViewController.swift
...y(社区)/Activity(活动)/C/YHActivityDetailViewController.swift
+9
-3
YHApplyActivityResultViewController.swift
.../Activity(活动)/C/YHApplyActivityResultViewController.swift
+111
-0
YHApplyActivityAlert.swift
...s/Community(社区)/Activity(活动)/V/YHApplyActivityAlert.swift
+2
-0
Contents.json
...ctivity/activity_apply_result_fail.imageset/Contents.json
+22
-0
预约成功@2x.png
.../Activity/activity_apply_result_fail.imageset/预约成功@2x.png
+0
-0
预约成功@3x.png
.../Activity/activity_apply_result_fail.imageset/预约成功@3x.png
+0
-0
Contents.json
...vity/activity_apply_result_success.imageset/Contents.json
+22
-0
预约成功@2x.png
...tivity/activity_apply_result_success.imageset/预约成功@2x.png
+0
-0
预约成功@3x.png
...tivity/activity_apply_result_success.imageset/预约成功@3x.png
+0
-0
No files found.
galaxy/galaxy.xcodeproj/project.pbxproj
View file @
be732cfa
...
@@ -439,6 +439,7 @@
...
@@ -439,6 +439,7 @@
A592FE952BA6D23C0062FACA
/* YHCertificateEntryCell.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
A592FE942BA6D23C0062FACA
/* YHCertificateEntryCell.swift */
;
};
A592FE952BA6D23C0062FACA
/* YHCertificateEntryCell.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
A592FE942BA6D23C0062FACA
/* YHCertificateEntryCell.swift */
;
};
A592FE972BA6DB340062FACA
/* YHCertificateViewModel.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
A592FE962BA6DB340062FACA
/* YHCertificateViewModel.swift */
;
};
A592FE972BA6DB340062FACA
/* YHCertificateViewModel.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
A592FE962BA6DB340062FACA
/* YHCertificateViewModel.swift */
;
};
A59CCBCE2C241FCB001910FE
/* YHApplyActivityAlert.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
A59CCBCD2C241FCB001910FE
/* YHApplyActivityAlert.swift */
;
};
A59CCBCE2C241FCB001910FE
/* YHApplyActivityAlert.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
A59CCBCD2C241FCB001910FE
/* YHApplyActivityAlert.swift */
;
};
A59CCBD02C244B13001910FE
/* YHApplyActivityResultViewController.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
A59CCBCF2C244B13001910FE
/* YHApplyActivityResultViewController.swift */
;
};
A5ACE9282B4564F7002C94D2
/* YHSmsCodeView.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
A5ACE8DE2B4564F7002C94D2
/* YHSmsCodeView.swift */
;
};
A5ACE9282B4564F7002C94D2
/* YHSmsCodeView.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
A5ACE8DE2B4564F7002C94D2
/* YHSmsCodeView.swift */
;
};
A5ACE9292B4564F7002C94D2
/* YHSmsCodeInputView.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
A5ACE8E02B4564F7002C94D2
/* YHSmsCodeInputView.swift */
;
};
A5ACE9292B4564F7002C94D2
/* YHSmsCodeInputView.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
A5ACE8E02B4564F7002C94D2
/* YHSmsCodeInputView.swift */
;
};
A5ACE92C2B4564F7002C94D2
/* YHLoginStyleButton.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
A5ACE8E42B4564F7002C94D2
/* YHLoginStyleButton.swift */
;
};
A5ACE92C2B4564F7002C94D2
/* YHLoginStyleButton.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
A5ACE8E42B4564F7002C94D2
/* YHLoginStyleButton.swift */
;
};
...
@@ -988,6 +989,7 @@
...
@@ -988,6 +989,7 @@
A592FE942BA6D23C0062FACA
/* YHCertificateEntryCell.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHCertificateEntryCell.swift
;
sourceTree
=
"<group>"
;
};
A592FE942BA6D23C0062FACA
/* YHCertificateEntryCell.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHCertificateEntryCell.swift
;
sourceTree
=
"<group>"
;
};
A592FE962BA6DB340062FACA
/* YHCertificateViewModel.swift */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHCertificateViewModel.swift
;
sourceTree
=
"<group>"
;
};
A592FE962BA6DB340062FACA
/* YHCertificateViewModel.swift */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHCertificateViewModel.swift
;
sourceTree
=
"<group>"
;
};
A59CCBCD2C241FCB001910FE
/* YHApplyActivityAlert.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHApplyActivityAlert.swift
;
sourceTree
=
"<group>"
;
};
A59CCBCD2C241FCB001910FE
/* YHApplyActivityAlert.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHApplyActivityAlert.swift
;
sourceTree
=
"<group>"
;
};
A59CCBCF2C244B13001910FE
/* YHApplyActivityResultViewController.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHApplyActivityResultViewController.swift
;
sourceTree
=
"<group>"
;
};
A5ACE8DE2B4564F7002C94D2
/* YHSmsCodeView.swift */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHSmsCodeView.swift
;
sourceTree
=
"<group>"
;
};
A5ACE8DE2B4564F7002C94D2
/* YHSmsCodeView.swift */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHSmsCodeView.swift
;
sourceTree
=
"<group>"
;
};
A5ACE8E02B4564F7002C94D2
/* YHSmsCodeInputView.swift */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHSmsCodeInputView.swift
;
sourceTree
=
"<group>"
;
};
A5ACE8E02B4564F7002C94D2
/* YHSmsCodeInputView.swift */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHSmsCodeInputView.swift
;
sourceTree
=
"<group>"
;
};
A5ACE8E42B4564F7002C94D2
/* YHLoginStyleButton.swift */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHLoginStyleButton.swift
;
sourceTree
=
"<group>"
;
};
A5ACE8E42B4564F7002C94D2
/* YHLoginStyleButton.swift */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHLoginStyleButton.swift
;
sourceTree
=
"<group>"
;
};
...
@@ -2315,6 +2317,7 @@
...
@@ -2315,6 +2317,7 @@
children
=
(
children
=
(
044D0BEF2C2025FF00C5CF5E
/* YHActivityListViewController.swift */
,
044D0BEF2C2025FF00C5CF5E
/* YHActivityListViewController.swift */
,
A5787E352C23CFDA00B021D7
/* YHActivityDetailViewController.swift */
,
A5787E352C23CFDA00B021D7
/* YHActivityDetailViewController.swift */
,
A59CCBCF2C244B13001910FE
/* YHApplyActivityResultViewController.swift */
,
);
);
path
=
C
;
path
=
C
;
sourceTree
=
"<group>"
;
sourceTree
=
"<group>"
;
...
@@ -3143,6 +3146,7 @@
...
@@ -3143,6 +3146,7 @@
045EEE7A2B9F171A0022A143
/* YHPreviewForOtherInfoModel.swift in Sources */
,
045EEE7A2B9F171A0022A143
/* YHPreviewForOtherInfoModel.swift in Sources */
,
0414BDA92BC7E81500225367
/* YHMyPermissionSettingVC.swift in Sources */
,
0414BDA92BC7E81500225367
/* YHMyPermissionSettingVC.swift in Sources */
,
A567E5AA2BD7643D00D5D5A0
/* YHGestureTableView.swift in Sources */
,
A567E5AA2BD7643D00D5D5A0
/* YHGestureTableView.swift in Sources */
,
A59CCBD02C244B13001910FE
/* YHApplyActivityResultViewController.swift in Sources */
,
04F5F8642C19460D004A463C
/* YHHKLifeViewController.swift in Sources */
,
04F5F8642C19460D004A463C
/* YHHKLifeViewController.swift in Sources */
,
A5ACE94A2B4564F7002C94D2
/* YHHUDProgressView.swift in Sources */
,
A5ACE94A2B4564F7002C94D2
/* YHHUDProgressView.swift in Sources */
,
04A271232BABFF3200652B1B
/* YHCertificateUploadTypeCell.swift in Sources */
,
04A271232BABFF3200652B1B
/* YHCertificateUploadTypeCell.swift in Sources */
,
...
...
galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/C/YHActivityDetailViewController.swift
View file @
be732cfa
...
@@ -72,14 +72,20 @@ class YHActivityDetailViewController: YHBaseViewController {
...
@@ -72,14 +72,20 @@ class YHActivityDetailViewController: YHBaseViewController {
make
.
height
.
equalTo
(
YHActivityDetailBottomView
.
viewH
)
make
.
height
.
equalTo
(
YHActivityDetailBottomView
.
viewH
)
}
}
bottomView
.
block
=
{
tag
in
YHApplyActivityAlert
.
showApplyActivityAlertView
{
tag
in
let
vc
=
YHApplyActivityResultViewController
()
self
.
navigationController
?
.
pushViewController
(
vc
)
}
}
//2.
//2.
// addTopView()
// addTopView()
// topView.backgroundColor = .red
// topView.backgroundColor = .red
YHApplyActivityAlert
.
showApplyActivityAlertView
{
tag
in
}
}
}
}
}
...
...
galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/C/YHApplyActivityResultViewController.swift
0 → 100644
View file @
be732cfa
//
// YHApplyActivityResultViewController.swift
// galaxy
//
// Created by davidhuangA on 2024/6/20.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import
UIKit
/*
报名结果页
*/
class
YHApplyActivityResultViewController
:
YHBaseViewController
{
lazy
var
statusImageV
:
UIImageView
=
{
let
view
=
UIImageView
()
view
.
image
=
UIImage
(
named
:
"activity_apply_result_success"
)
view
.
contentMode
=
.
scaleAspectFill
return
view
}()
lazy
var
titleLabel
:
UILabel
=
{
let
lable
=
UILabel
()
lable
.
textColor
=
UIColor
.
mainTextColor
lable
.
textAlignment
=
.
center
lable
.
font
=
UIFont
.
PFSC_M
(
ofSize
:
18
)
lable
.
text
=
"报名成功"
lable
.
numberOfLines
=
0
return
lable
}()
lazy
var
nameLabel
:
UILabel
=
{
let
lable
=
UILabel
()
lable
.
textColor
=
UIColor
.
mainTextColor
lable
.
textAlignment
=
.
center
lable
.
font
=
UIFont
.
PFSC_R
(
ofSize
:
14
)
lable
.
text
=
"已报名成功活动【哈佛爸爸线下教育沙龙】,记得准时参加哦"
lable
.
numberOfLines
=
0
return
lable
}()
lazy
var
submitButton
:
UIButton
=
{
let
button
=
UIButton
(
type
:
.
custom
)
button
.
titleLabel
?
.
font
=
UIFont
.
PFSC_R
(
ofSize
:
16
)
button
.
contentHorizontalAlignment
=
.
center
button
.
setTitle
(
"查看行程单"
,
for
:
.
normal
)
button
.
setTitle
(
"查看行程单"
,
for
:
.
highlighted
)
button
.
setTitleColor
(
UIColor
(
hex
:
0xffffff
),
for
:
.
normal
)
button
.
setTitleColor
(
UIColor
(
hex
:
0xffffff
),
for
:
.
highlighted
)
button
.
layer
.
cornerRadius
=
kCornerRadius3
button
.
addTarget
(
self
,
action
:
#selector(
clickSubmitBtn
)
,
for
:
.
touchUpInside
)
button
.
layer
.
cornerRadius
=
kCornerRadius3
button
.
clipsToBounds
=
true
button
.
backgroundColor
=
.
brandMainColor
return
button
}()
override
func
viewDidLoad
()
{
super
.
viewDidLoad
()
setupUI
()
}
}
extension
YHApplyActivityResultViewController
{
func
setupUI
()
{
gk_navigationBar
.
isHidden
=
false
gk_navigationBar
.
backgroundColor
=
.
clear
// view.backgroundColor = UIColor.pageBkgColor
view
.
backgroundColor
=
UIColor
.
white
view
.
addSubview
(
statusImageV
)
statusImageV
.
snp
.
makeConstraints
{
make
in
make
.
top
.
equalTo
(
180
)
make
.
centerX
.
equalToSuperview
()
make
.
height
.
width
.
equalTo
(
128
)
}
view
.
addSubview
(
titleLabel
)
titleLabel
.
snp
.
makeConstraints
{
make
in
make
.
top
.
equalTo
(
statusImageV
.
snp
.
bottom
)
make
.
centerX
.
equalToSuperview
()
make
.
height
.
equalTo
(
25
)
}
view
.
addSubview
(
nameLabel
)
nameLabel
.
snp
.
makeConstraints
{
make
in
make
.
top
.
equalTo
(
titleLabel
.
snp
.
bottom
)
.
offset
(
12
)
make
.
centerX
.
equalToSuperview
()
make
.
left
.
equalTo
(
46
)
make
.
right
.
equalTo
(
-
46
)
}
view
.
addSubview
(
submitButton
)
submitButton
.
snp
.
makeConstraints
{
make
in
make
.
top
.
equalTo
(
nameLabel
.
snp
.
bottom
)
.
offset
(
42
)
make
.
centerX
.
equalToSuperview
()
make
.
width
.
equalTo
(
142
)
make
.
height
.
equalTo
(
42
)
}
}
@objc
func
clickSubmitBtn
()
{
}
}
galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/V/YHApplyActivityAlert.swift
View file @
be732cfa
...
@@ -360,6 +360,8 @@ class YHApplyActivityAlert: UIView {
...
@@ -360,6 +360,8 @@ class YHApplyActivityAlert: UIView {
}
}
@objc
func
clickSubmitBtn
()
{
@objc
func
clickSubmitBtn
()
{
block
?(
true
)
clickCloseBtn
()
clickCloseBtn
()
}
}
...
...
galaxy/galaxy/Res/Assets.xcassets/Activity/activity_apply_result_fail.imageset/Contents.json
0 → 100644
View file @
be732cfa
{
"images"
:
[
{
"idiom"
:
"universal"
,
"scale"
:
"1x"
},
{
"filename"
:
"预约成功@2x.png"
,
"idiom"
:
"universal"
,
"scale"
:
"2x"
},
{
"filename"
:
"预约成功@3x.png"
,
"idiom"
:
"universal"
,
"scale"
:
"3x"
}
],
"info"
:
{
"author"
:
"xcode"
,
"version"
:
1
}
}
galaxy/galaxy/Res/Assets.xcassets/Activity/activity_apply_result_fail.imageset/预约成功@2x.png
0 → 100644
View file @
be732cfa
15 KB
galaxy/galaxy/Res/Assets.xcassets/Activity/activity_apply_result_fail.imageset/预约成功@3x.png
0 → 100644
View file @
be732cfa
26 KB
galaxy/galaxy/Res/Assets.xcassets/Activity/activity_apply_result_success.imageset/Contents.json
0 → 100644
View file @
be732cfa
{
"images"
:
[
{
"idiom"
:
"universal"
,
"scale"
:
"1x"
},
{
"filename"
:
"预约成功@2x.png"
,
"idiom"
:
"universal"
,
"scale"
:
"2x"
},
{
"filename"
:
"预约成功@3x.png"
,
"idiom"
:
"universal"
,
"scale"
:
"3x"
}
],
"info"
:
{
"author"
:
"xcode"
,
"version"
:
1
}
}
galaxy/galaxy/Res/Assets.xcassets/Activity/activity_apply_result_success.imageset/预约成功@2x.png
0 → 100644
View file @
be732cfa
16 KB
galaxy/galaxy/Res/Assets.xcassets/Activity/activity_apply_result_success.imageset/预约成功@3x.png
0 → 100644
View file @
be732cfa
28 KB
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