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
4974c92f
Commit
4974c92f
authored
Oct 17, 2024
by
David黄金龙
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
处理 bug
parent
84a9f6c7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
6 deletions
+10
-6
YHServiceOrderListViewController.swift
...entService(服务中心)/C/YHServiceOrderListViewController.swift
+1
-1
YHJsApi.swift
...galaxy/Classes/Modules/InteractionH5(与H5交互)/YHJsApi.swift
+0
-1
YHMessageDetailListVC.swift
...Classes/Modules/Message(消息)/C/YHMessageDetailListVC.swift
+9
-4
No files found.
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceOrderListViewController.swift
View file @
4974c92f
...
@@ -158,7 +158,7 @@ class YHServiceOrderListView: YHBaseViewController {
...
@@ -158,7 +158,7 @@ class YHServiceOrderListView: YHBaseViewController {
alert
.
show
()
alert
.
show
()
}
else
{
// 已预约过直接进入赴港行程指引
}
else
{
// 已预约过直接进入赴港行程指引
if
var
token
=
YHLoginManager
.
shared
.
userModel
?
.
token
,
token
.
count
>
5
{
if
let
token
=
YHLoginManager
.
shared
.
userModel
?
.
token
,
token
.
count
>
5
{
var
url
=
YHBaseUrlManager
.
shared
.
curH5URL
()
+
"superAppBridge.html#/tohkList"
var
url
=
YHBaseUrlManager
.
shared
.
curH5URL
()
+
"superAppBridge.html#/tohkList"
url
=
url
+
"?paramO=
\(
orderId
)
"
+
"¶m="
+
YHLoginManager
.
shared
.
h5Token
url
=
url
+
"?paramO=
\(
orderId
)
"
+
"¶m="
+
YHLoginManager
.
shared
.
h5Token
url
=
url
+
"&app_platform=ios"
+
"&app_version="
+
UIDevice
.
appVersion
()
url
=
url
+
"&app_platform=ios"
+
"&app_version="
+
UIDevice
.
appVersion
()
...
...
galaxy/galaxy/Classes/Modules/InteractionH5(与H5交互)/YHJsApi.swift
View file @
4974c92f
...
@@ -161,7 +161,6 @@ extension YHJsApi {
...
@@ -161,7 +161,6 @@ extension YHJsApi {
// 转换成功,jsonObject 是一个字典
// 转换成功,jsonObject 是一个字典
print
(
"JSON字符串转换为字典成功:
\(
jsonObject
)
"
)
print
(
"JSON字符串转换为字典成功:
\(
jsonObject
)
"
)
/*
/*
{
{
id:1,
id:1,
name:"教学升学",
name:"教学升学",
...
...
galaxy/galaxy/Classes/Modules/Message(消息)/C/YHMessageDetailListVC.swift
View file @
4974c92f
...
@@ -404,10 +404,15 @@ extension YHMessageDetailListVC: UITableViewDelegate, UITableViewDataSource {
...
@@ -404,10 +404,15 @@ extension YHMessageDetailListVC: UITableViewDelegate, UITableViewDataSource {
if
self
.
type
==
YHMessageType
.
infoSubmit
.
rawValue
{
// 资料递交
if
self
.
type
==
YHMessageType
.
infoSubmit
.
rawValue
{
// 资料递交
if
!
message
.
url
.
isEmpty
{
if
!
message
.
url
.
isEmpty
{
if
let
url
=
URL
(
string
:
message
.
url
)
{
if
let
url
=
URL
(
string
:
message
.
url
)
{
let
safariViewController
=
SFSafariViewController
(
url
:
url
)
if
message
.
url
.
contains
(
"signatureQrcode/"
)
{
safariViewController
.
dismissButtonStyle
=
.
close
safariViewController
.
modalPresentationStyle
=
.
fullScreen
}
else
{
present
(
safariViewController
,
animated
:
true
,
completion
:
nil
)
let
safariViewController
=
SFSafariViewController
(
url
:
url
)
safariViewController
.
dismissButtonStyle
=
.
close
safariViewController
.
modalPresentationStyle
=
.
fullScreen
present
(
safariViewController
,
animated
:
true
,
completion
:
nil
)
}
}
else
{
}
else
{
YHHUD
.
flash
(
message
:
"url无效"
)
YHHUD
.
flash
(
message
:
"url无效"
)
}
}
...
...
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