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
7cd88f31
Commit
7cd88f31
authored
Oct 13, 2024
by
David黄金龙
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加 我的订单 入口
parent
61f94bde
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
57 additions
and
4 deletions
+57
-4
YHConfigModel.swift
galaxy/galaxy/Classes/Modules/Home(首页)/M/YHConfigModel.swift
+1
-0
YHH5WebViewVC.swift
.../Classes/Modules/InteractionH5(与H5交互)/YHH5WebViewVC.swift
+5
-0
YHMyViewController.swift
...alaxy/Classes/Modules/Mine(我的)/C/YHMyViewController.swift
+29
-4
Contents.json
...ts.xcassets/Mine/mine_item_myOrder.imageset/Contents.json
+22
-0
wode_dingdan@2x.png
...ssets/Mine/mine_item_myOrder.imageset/wode_dingdan@2x.png
+0
-0
wode_dingdan@3x.png
...ssets/Mine/mine_item_myOrder.imageset/wode_dingdan@3x.png
+0
-0
No files found.
galaxy/galaxy/Classes/Modules/Home(首页)/M/YHConfigModel.swift
View file @
7cd88f31
...
@@ -22,6 +22,7 @@ class YHConfigModel : SmartCodable {
...
@@ -22,6 +22,7 @@ class YHConfigModel : SmartCodable {
var
suggest_updating_msg
:
String
=
""
var
suggest_updating_msg
:
String
=
""
var
is_integral_open
:
Bool
=
false
//条件控制哈
var
is_integral_open
:
Bool
=
false
//条件控制哈
var
is_recharge_order_open
:
Bool
=
false
//双十一banner开关 //`is_recharge_order_open` int NOT NULL DEFAULT '0' COMMENT '1 开启 0关闭',
required
init
()
{
required
init
()
{
}
}
...
...
galaxy/galaxy/Classes/Modules/InteractionH5(与H5交互)/YHH5WebViewVC.swift
View file @
7cd88f31
...
@@ -119,6 +119,11 @@ class YHH5WebViewVC: YHBaseViewController, WKUIDelegate, WKNavigationDelegate {
...
@@ -119,6 +119,11 @@ class YHH5WebViewVC: YHBaseViewController, WKUIDelegate, WKNavigationDelegate {
}
}
self
.
navigationController
?
.
popViewController
()
self
.
navigationController
?
.
popViewController
()
}
}
//for test hjl
// var customHeaders:[String:String] = ["Referer":"/AppleApp/app/iOS"]
}
}
// MARK: - 内部方法
// MARK: - 内部方法
...
...
galaxy/galaxy/Classes/Modules/Mine(我的)/C/YHMyViewController.swift
View file @
7cd88f31
...
@@ -33,6 +33,7 @@ enum YHPersonalModuleItemType: Int {
...
@@ -33,6 +33,7 @@ enum YHPersonalModuleItemType: Int {
case
version
case
version
case
userItems
//用户条款
case
userItems
//用户条款
case
privaceAgreement
//隐私协议
case
privaceAgreement
//隐私协议
case
myOrder
//我的订单 双十一订单入口
}
}
class
PersonalModuleItem
{
class
PersonalModuleItem
{
...
@@ -280,6 +281,12 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
...
@@ -280,6 +281,12 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
items
.
append
(
item
)
items
.
append
(
item
)
}
}
if
let
configModel
=
YHConfigManager
.
shared
.
reqVM
.
configModel
,
configModel
.
is_recharge_order_open
{
// if true { //for test hjl
let
item
=
PersonalModuleItem
(
icon
:
"mine_item_myOrder"
,
title
:
"我的订单"
.
local
,
type
:
.
myOrder
)
items
.
append
(
item
)
}
do
{
do
{
let
item
=
PersonalModuleItem
(
icon
:
"mine_item_msg"
,
title
:
"我的消息"
.
local
,
type
:
.
myMessage
)
let
item
=
PersonalModuleItem
(
icon
:
"mine_item_msg"
,
title
:
"我的消息"
.
local
,
type
:
.
myMessage
)
items
.
append
(
item
)
items
.
append
(
item
)
...
@@ -292,6 +299,8 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
...
@@ -292,6 +299,8 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
}
}
}
}
if
YHUatHelper
.
shared
.
getUatModuleStatusBy
(
module
:
.
Mine_EvaluationCode
)
==
1
{
if
YHUatHelper
.
shared
.
getUatModuleStatusBy
(
module
:
.
Mine_EvaluationCode
)
==
1
{
let
item
=
PersonalModuleItem
(
icon
:
"mine_item_code"
,
title
:
"我的测评码"
.
local
,
type
:
.
myTestCode
)
let
item
=
PersonalModuleItem
(
icon
:
"mine_item_code"
,
title
:
"我的测评码"
.
local
,
type
:
.
myTestCode
)
items
.
append
(
item
)
items
.
append
(
item
)
...
@@ -399,9 +408,9 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
...
@@ -399,9 +408,9 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
//vc.url = ""//测试环境
//vc.url = ""//测试环境
let
tUrl
=
"https://test-sign.galaxy-immi.com/webPayConfirm?id=dXlHS3RRQUV4QmZ2KzRwM0phRTVyMXdWUnVjUjJvRHdmQmNWVDV0UW1Zbz0="
//测试环境
//
let tUrl = "https://test-sign.galaxy-immi.com/webPayConfirm?id=dXlHS3RRQUV4QmZ2KzRwM0phRTVyMXdWUnVjUjJvRHdmQmNWVDV0UW1Zbz0="//测试环境
//
let tUrl = "https://beta-sign.galaxy-immi.com/webPayConfirm?id=Qk9sbUlzenp0OGFOdVZ4ekphQXJGWnJ0ODdBS3gxdWNJcURrOHBLbm4xND0%3D"//正式环境
let
tUrl
=
"https://beta-sign.galaxy-immi.com/webPayConfirm?id=Qk9sbUlzenp0OGFOdVZ4ekphQXJGWnJ0ODdBS3gxdWNJcURrOHBLbm4xND0%3D"
//正式环境
if
let
url
=
URL
(
string
:
tUrl
)
{
if
let
url
=
URL
(
string
:
tUrl
)
{
let
safariViewController
=
SFSafariViewController
(
url
:
url
)
let
safariViewController
=
SFSafariViewController
(
url
:
url
)
safariViewController
.
dismissButtonStyle
=
.
close
safariViewController
.
dismissButtonStyle
=
.
close
...
@@ -413,11 +422,27 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
...
@@ -413,11 +422,27 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
// self.navigationController?.pushViewController(vc)
// self.navigationController?.pushViewController(vc)
let
vc
=
YHH5WebViewVC
()
let
vc
=
YHH5WebViewVC
()
//
vc.url = "https://beta-sign.galaxy-immi.com/webPayConfirm?id=Qk9sbUlzenp0OGFOdVZ4ekphQXJGWnJ0ODdBS3gxdWNJcURrOHBLbm4xND0%3D"//正式环境
vc
.
url
=
"https://beta-sign.galaxy-immi.com/webPayConfirm?id=Qk9sbUlzenp0OGFOdVZ4ekphQXJGWnJ0ODdBS3gxdWNJcURrOHBLbm4xND0%3D"
//正式环境
vc
.
url
=
"https://test-sign.galaxy-immi.com/webPayConfirm?id=dXlHS3RRQUV4QmZ2KzRwM0phRTVyMXdWUnVjUjJvRHdmQmNWVDV0UW1Zbz0="
//测试环境
//
vc.url = "https://test-sign.galaxy-immi.com/webPayConfirm?id=dXlHS3RRQUV4QmZ2KzRwM0phRTVyMXdWUnVjUjJvRHdmQmNWVDV0UW1Zbz0="//测试环境
vc
.
isFullScreenFlag
=
false
vc
.
isFullScreenFlag
=
false
vc
.
isSupportWebviewInterBackFlag
=
true
vc
.
isSupportWebviewInterBackFlag
=
true
UIViewController
.
current
?
.
navigationController
?
.
pushViewController
(
vc
)
//for test hjl
UIViewController
.
current
?
.
navigationController
?
.
pushViewController
(
vc
)
//for test hjl
case
.
myOrder
:
//我的订单
if
let
token
=
YHLoginManager
.
shared
.
userModel
?
.
token
,
token
.
count
>
5
{
var
url
=
YHBaseUrlManager
.
shared
.
curH5URL
()
+
"superAppBridge.html#/tohkList"
// url = "¶m=" + YHLoginManager.shared.h5Token
url
=
"https://www.baidu.com"
printLog
(
"UURL:
\(
url
)
"
)
let
vc
=
YHH5WebViewVC
()
vc
.
url
=
url
vc
.
isFullScreenFlag
=
false
vc
.
navTitle
=
"我的订单"
vc
.
navTitle
=
"需要替换URL"
//for test hjl
vc
.
isNeedRefreshDataFlag
=
true
vc
.
isSupportWebviewInterBackFlag
=
true
UIViewController
.
current
?
.
navigationController
?
.
pushViewController
(
vc
)
}
default
:
default
:
printLog
(
"不需要响应"
)
printLog
(
"不需要响应"
)
}
}
...
...
galaxy/galaxy/Res/Assets.xcassets/Mine/mine_item_myOrder.imageset/Contents.json
0 → 100644
View file @
7cd88f31
{
"images"
:
[
{
"idiom"
:
"universal"
,
"scale"
:
"1x"
},
{
"filename"
:
"wode_dingdan@2x.png"
,
"idiom"
:
"universal"
,
"scale"
:
"2x"
},
{
"filename"
:
"wode_dingdan@3x.png"
,
"idiom"
:
"universal"
,
"scale"
:
"3x"
}
],
"info"
:
{
"author"
:
"xcode"
,
"version"
:
1
}
}
galaxy/galaxy/Res/Assets.xcassets/Mine/mine_item_myOrder.imageset/wode_dingdan@2x.png
0 → 100644
View file @
7cd88f31
546 Bytes
galaxy/galaxy/Res/Assets.xcassets/Mine/mine_item_myOrder.imageset/wode_dingdan@3x.png
0 → 100644
View file @
7cd88f31
739 Bytes
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