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
2fee75ff
Commit
2fee75ff
authored
Dec 10, 2024
by
pete谢兆麟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
服务中心相关需求修改
parent
a59adcac
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
43 additions
and
12 deletions
+43
-12
YHOrderDetailViewController.swift
...elligentService(服务中心)/C/YHOrderDetailViewController.swift
+1
-1
YHServiceCenterViewController.swift
...ligentService(服务中心)/C/YHServiceCenterViewController.swift
+6
-6
YHServiceSelectAlertView.swift
...intCertificate(3 赴港办证预约)/V/YHServiceSelectAlertView.swift
+1
-1
YHServiceNoOrderView.swift
...les/IntelligentService(服务中心)/V/YHServiceNoOrderView.swift
+4
-2
YHServiceStepAlertView.swift
...s/IntelligentService(服务中心)/V/YHServiceStepAlertView.swift
+1
-1
YHMyViewController.swift
...alaxy/Classes/Modules/Mine(我的)/C/YHMyViewController.swift
+8
-1
Contents.json
...sets/Mine/mine_item_service_center.imageset/Contents.json
+22
-0
mine_item_service_center@2x.png
...m_service_center.imageset/mine_item_service_center@2x.png
+0
-0
mine_item_service_center@3x.png
...m_service_center.imageset/mine_item_service_center@3x.png
+0
-0
No files found.
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHOrderDetailViewController.swift
View file @
2fee75ff
...
@@ -81,7 +81,7 @@ class YHOrderDetailViewController: YHBaseViewController {
...
@@ -81,7 +81,7 @@ class YHOrderDetailViewController: YHBaseViewController {
}
}
func
setView
()
{
func
setView
()
{
gk_navTitle
=
"
我的订单
"
gk_navTitle
=
"
服务进度
"
gk_navBackgroundColor
=
UIColor
.
white
gk_navBackgroundColor
=
UIColor
.
white
gk_navBarAlpha
=
1
gk_navBarAlpha
=
1
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceCenterViewController.swift
View file @
2fee75ff
...
@@ -238,10 +238,10 @@ extension YHServiceCenterViewController {
...
@@ -238,10 +238,10 @@ extension YHServiceCenterViewController {
}
}
@objc
func
pushOrderView
()
{
@objc
func
pushOrderView
()
{
var
flag
=
true
//
var flag = true
if
self
.
state
==
1
||
self
.
state
==
3
{
//
if self.state == 1 || self.state == 3 {
flag
=
false
let
flag
=
false
}
//
}
YHServiceMoreAlertView
.
show
(
flag
)
{[
weak
self
]
index
in
YHServiceMoreAlertView
.
show
(
flag
)
{[
weak
self
]
index
in
guard
let
self
=
self
else
{
return
}
guard
let
self
=
self
else
{
return
}
if
index
==
1
{
if
index
==
1
{
...
@@ -282,7 +282,7 @@ extension YHServiceCenterViewController {
...
@@ -282,7 +282,7 @@ extension YHServiceCenterViewController {
if
self
.
state
==
2
{
if
self
.
state
==
2
{
self
.
arrDataForSeviceCenterProgress
=
self
.
serviceCenterMainReqVM
.
mainModel
.
certificateSection
.
list
self
.
arrDataForSeviceCenterProgress
=
self
.
serviceCenterMainReqVM
.
mainModel
.
certificateSection
.
list
self
.
homeTableView
.
tableHeaderView
=
UIView
()
self
.
homeTableView
.
tableHeaderView
=
UIView
()
self
.
titleLabel
.
setTitle
(
"
办证
阶段"
,
for
:
.
normal
)
self
.
titleLabel
.
setTitle
(
"
审批
阶段"
,
for
:
.
normal
)
self
.
titleLabel
.
setImage
(
UIImage
(
named
:
"service_center_select_step"
),
for
:
.
normal
)
self
.
titleLabel
.
setImage
(
UIImage
(
named
:
"service_center_select_step"
),
for
:
.
normal
)
}
}
if
self
.
state
==
3
{
if
self
.
state
==
3
{
...
@@ -353,7 +353,7 @@ extension YHServiceCenterViewController {
...
@@ -353,7 +353,7 @@ extension YHServiceCenterViewController {
if
self
.
state
==
2
{
if
self
.
state
==
2
{
self
.
arrDataForSeviceCenterProgress
=
self
.
serviceCenterMainReqVM
.
mainModel
.
certificateSection
.
list
self
.
arrDataForSeviceCenterProgress
=
self
.
serviceCenterMainReqVM
.
mainModel
.
certificateSection
.
list
self
.
homeTableView
.
tableHeaderView
=
UIView
()
self
.
homeTableView
.
tableHeaderView
=
UIView
()
self
.
titleLabel
.
setTitle
(
"
办证
阶段"
,
for
:
.
normal
)
self
.
titleLabel
.
setTitle
(
"
审批
阶段"
,
for
:
.
normal
)
if
isCanSelectStep
{
if
isCanSelectStep
{
self
.
titleLabel
.
setImage
(
UIImage
(
named
:
"service_center_select_step"
),
for
:
.
normal
)
self
.
titleLabel
.
setImage
(
UIImage
(
named
:
"service_center_select_step"
),
for
:
.
normal
)
}
else
{
}
else
{
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/CustomerService(客服段)/Certificate(办证段)/AppointCertificate(3 赴港办证预约)/V/YHServiceSelectAlertView.swift
View file @
2fee75ff
...
@@ -74,7 +74,7 @@ class YHServiceSelectAlertView: UICollectionViewCell {
...
@@ -74,7 +74,7 @@ class YHServiceSelectAlertView: UICollectionViewCell {
let
label
=
UILabel
()
let
label
=
UILabel
()
label
.
numberOfLines
=
0
label
.
numberOfLines
=
0
let
a
:
ASAttributedString
=
.
init
(
"期望银河在"
,
.
font
(
UIFont
.
PFSC_B
(
ofSize
:
18
)),
.
foreground
(
UIColor
.
mainTextColor
))
let
a
:
ASAttributedString
=
.
init
(
"期望银河在"
,
.
font
(
UIFont
.
PFSC_B
(
ofSize
:
18
)),
.
foreground
(
UIColor
.
mainTextColor
))
let
b
:
ASAttributedString
=
.
init
(
"
办证
阶段"
,
.
font
(
UIFont
.
PFSC_B
(
ofSize
:
18
)),
.
foreground
(
UIColor
.
brandMainColor
))
let
b
:
ASAttributedString
=
.
init
(
"
审批
阶段"
,
.
font
(
UIFont
.
PFSC_B
(
ofSize
:
18
)),
.
foreground
(
UIColor
.
brandMainColor
))
let
c
:
ASAttributedString
=
.
init
(
"
\n
提供哪些服务"
,
.
font
(
UIFont
.
PFSC_B
(
ofSize
:
18
)),
.
foreground
(
UIColor
.
mainTextColor
))
let
c
:
ASAttributedString
=
.
init
(
"
\n
提供哪些服务"
,
.
font
(
UIFont
.
PFSC_B
(
ofSize
:
18
)),
.
foreground
(
UIColor
.
mainTextColor
))
label
.
attributed
.
text
=
a
+
b
+
c
label
.
attributed
.
text
=
a
+
b
+
c
return
label
return
label
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHServiceNoOrderView.swift
View file @
2fee75ff
...
@@ -24,7 +24,8 @@ class YHServiceNoOrderView: UIView {
...
@@ -24,7 +24,8 @@ class YHServiceNoOrderView: UIView {
lable
.
textColor
=
UIColor
.
mainTextColor
lable
.
textColor
=
UIColor
.
mainTextColor
lable
.
font
=
UIFont
.
PFSC_M
(
ofSize
:
14
)
lable
.
font
=
UIFont
.
PFSC_M
(
ofSize
:
14
)
lable
.
textAlignment
=
.
center
lable
.
textAlignment
=
.
center
lable
.
text
=
"您还没有相关订单"
lable
.
numberOfLines
=
0
lable
.
text
=
"暂未识别到与您登录手机号相关联的签约订单,如您已签约银河服务,请改用签约手机号重新登录"
return
lable
return
lable
}()
}()
...
@@ -71,7 +72,8 @@ class YHServiceNoOrderView: UIView {
...
@@ -71,7 +72,8 @@ class YHServiceNoOrderView: UIView {
tipsLab
.
snp
.
makeConstraints
{
make
in
tipsLab
.
snp
.
makeConstraints
{
make
in
make
.
top
.
equalTo
(
iconImgV
.
snp
.
bottom
)
.
offset
(
12
)
make
.
top
.
equalTo
(
iconImgV
.
snp
.
bottom
)
.
offset
(
12
)
make
.
centerX
.
equalToSuperview
()
make
.
centerX
.
equalToSuperview
()
make
.
left
.
right
.
equalToSuperview
()
make
.
left
.
equalToSuperview
()
.
offset
(
20
)
make
.
right
.
equalToSuperview
()
.
offset
(
-
20
)
}
}
addSubview
(
noFindLab
)
addSubview
(
noFindLab
)
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHServiceStepAlertView.swift
View file @
2fee75ff
...
@@ -93,7 +93,7 @@ class YHServiceStepAlertView: UIView {
...
@@ -93,7 +93,7 @@ class YHServiceStepAlertView: UIView {
guideButton
=
{
guideButton
=
{
let
button
=
UIButton
(
type
:
.
custom
)
let
button
=
UIButton
(
type
:
.
custom
)
button
.
setImage
(
UIImage
(
named
:
"service_step_select"
),
for
:
.
selected
)
button
.
setImage
(
UIImage
(
named
:
"service_step_select"
),
for
:
.
selected
)
button
.
setTitle
(
"
办证
阶段"
,
for
:
.
normal
)
button
.
setTitle
(
"
审批
阶段"
,
for
:
.
normal
)
button
.
setImage
(
UIImage
.
init
(
color
:
UIColor
.
white
,
size
:
CGSize
(
width
:
15
,
height
:
15
)),
for
:
.
normal
)
button
.
setImage
(
UIImage
.
init
(
color
:
UIColor
.
white
,
size
:
CGSize
(
width
:
15
,
height
:
15
)),
for
:
.
normal
)
button
.
setTitleColor
(
UIColor
.
mainTextColor
,
for
:
.
normal
)
button
.
setTitleColor
(
UIColor
.
mainTextColor
,
for
:
.
normal
)
button
.
setTitleColor
(
UIColor
.
brandMainColor
,
for
:
.
selected
)
button
.
setTitleColor
(
UIColor
.
brandMainColor
,
for
:
.
selected
)
...
...
galaxy/galaxy/Classes/Modules/Mine(我的)/C/YHMyViewController.swift
View file @
2fee75ff
...
@@ -35,7 +35,7 @@ enum YHPersonalModuleItemType: Int {
...
@@ -35,7 +35,7 @@ enum YHPersonalModuleItemType: Int {
case
privaceAgreement
//隐私协议
case
privaceAgreement
//隐私协议
case
myOrder
//我的订单 双十一订单入口
case
myOrder
//我的订单 双十一订单入口
case
mycart
//我的订单 双十一订单入口
case
mycart
//我的订单 双十一订单入口
case
serviceStep
//case liveEntryTest //直播入口
//case liveEntryTest //直播入口
}
}
...
@@ -289,6 +289,11 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
...
@@ -289,6 +289,11 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
items
.
append
(
item
)
items
.
append
(
item
)
}
}
if
let
configModel
=
YHConfigManager
.
shared
.
reqVM
.
configModel
,
configModel
.
is_recharge_order_open
{
let
item
=
PersonalModuleItem
(
icon
:
"mine_item_service_center"
,
title
:
"服务进度"
.
local
,
type
:
.
serviceStep
)
items
.
append
(
item
)
}
if
let
configModel
=
YHConfigManager
.
shared
.
reqVM
.
configModel
,
configModel
.
is_recharge_order_open
{
if
let
configModel
=
YHConfigManager
.
shared
.
reqVM
.
configModel
,
configModel
.
is_recharge_order_open
{
let
item
=
PersonalModuleItem
(
icon
:
"mine_item_card"
,
title
:
"购物车"
.
local
,
type
:
.
mycart
)
let
item
=
PersonalModuleItem
(
icon
:
"mine_item_card"
,
title
:
"购物车"
.
local
,
type
:
.
mycart
)
items
.
append
(
item
)
items
.
append
(
item
)
...
@@ -461,6 +466,8 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
...
@@ -461,6 +466,8 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
vc
.
isSupportWebviewInterBackFlag
=
true
vc
.
isSupportWebviewInterBackFlag
=
true
UIViewController
.
current
?
.
navigationController
?
.
pushViewController
(
vc
)
UIViewController
.
current
?
.
navigationController
?
.
pushViewController
(
vc
)
}
}
case
.
serviceStep
:
UIViewController
.
current
?
.
tabBarController
?
.
selectedIndex
=
1
default
:
default
:
printLog
(
"不需要响应"
)
printLog
(
"不需要响应"
)
}
}
...
...
galaxy/galaxy/Res/Assets.xcassets/Mine/mine_item_service_center.imageset/Contents.json
0 → 100644
View file @
2fee75ff
{
"images"
:
[
{
"idiom"
:
"universal"
,
"scale"
:
"1x"
},
{
"filename"
:
"mine_item_service_center@2x.png"
,
"idiom"
:
"universal"
,
"scale"
:
"2x"
},
{
"filename"
:
"mine_item_service_center@3x.png"
,
"idiom"
:
"universal"
,
"scale"
:
"3x"
}
],
"info"
:
{
"author"
:
"xcode"
,
"version"
:
1
}
}
galaxy/galaxy/Res/Assets.xcassets/Mine/mine_item_service_center.imageset/mine_item_service_center@2x.png
0 → 100644
View file @
2fee75ff
1.02 KB
galaxy/galaxy/Res/Assets.xcassets/Mine/mine_item_service_center.imageset/mine_item_service_center@3x.png
0 → 100644
View file @
2fee75ff
1.5 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