Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
ShenghuoquanBusiness
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
bp
ShenghuoquanBusiness
Commits
500ce91d
Commit
500ce91d
authored
Aug 11, 2021
by
yinjiacheng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update C端从开店赚钱进入管理中心直接跳转认证首页
parent
5ccd6d30
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
1 deletion
+9
-1
LifeAccountAuthActivity.kt
...huoquan/bmanagercenter/ui/auth/LifeAccountAuthActivity.kt
+3
-0
MerchantCenterActivity.kt
...uoquan/bmanagercenter/ui/center/MerchantCenterActivity.kt
+6
-1
No files found.
Components/BManagerCenter/src/main/java/com/yidian/shenghuoquan/bmanagercenter/ui/auth/LifeAccountAuthActivity.kt
View file @
500ce91d
...
@@ -32,6 +32,9 @@ class LifeAccountAuthActivity : BaseActivity<ActivityLifeAccountAuthBinding>(),
...
@@ -32,6 +32,9 @@ class LifeAccountAuthActivity : BaseActivity<ActivityLifeAccountAuthBinding>(),
// 由B端管理中心跳转
// 由B端管理中心跳转
const
val
FROM_B_MANAGER_CENTER
=
"fromBManagerCenter"
const
val
FROM_B_MANAGER_CENTER
=
"fromBManagerCenter"
// 由C端跳转
const
val
FROM_C
=
"fromC"
// 生活号id
// 生活号id
const
val
PARAMS_LIFE_ACCOUNT_ID
=
"life_account_id"
const
val
PARAMS_LIFE_ACCOUNT_ID
=
"life_account_id"
}
}
...
...
Components/BManagerCenter/src/main/java/com/yidian/shenghuoquan/bmanagercenter/ui/center/MerchantCenterActivity.kt
View file @
500ce91d
...
@@ -76,6 +76,11 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(), Me
...
@@ -76,6 +76,11 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(), Me
private
lateinit
var
functionPermissionList
:
ArrayList
<
Int
>
private
lateinit
var
functionPermissionList
:
ArrayList
<
Int
>
private
val
gson
by
lazy
{
Gson
()
}
private
val
gson
by
lazy
{
Gson
()
}
private
val
params
by
lazy
{
intent
.
getSerializableExtra
(
XRouterPathConstants
.
ParamsKey
)
?.
let
{
it
as
HashMap
<*,
*>
}
}
override
fun
createViewBinding
():
ActivityMerchantCenterBinding
{
override
fun
createViewBinding
():
ActivityMerchantCenterBinding
{
return
ActivityMerchantCenterBinding
.
inflate
(
layoutInflater
)
return
ActivityMerchantCenterBinding
.
inflate
(
layoutInflater
)
...
@@ -389,7 +394,7 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(), Me
...
@@ -389,7 +394,7 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(), Me
// 刷新数据
// 刷新数据
configResult
?.
data
?.
let
{
refreshMerchantCenterData
(
lifeAccountResult
[
0
],
it
)
}
configResult
?.
data
?.
let
{
refreshMerchantCenterData
(
lifeAccountResult
[
0
],
it
)
}
// C端开店赚钱直接跳转认证首页
// C端开店赚钱直接跳转认证首页
if
(
JudgeClientUtils
.
judgeClient
(
packageName
)
==
ClientType
.
MERCHANT
_C
)
{
if
(
params
?.
let
{
it
[
IntentConstants
.
KEY_EXTRA_LIFE_ACCOUNT_AUTH_FROM
]
as
String
}
==
LifeAccountAuthActivity
.
FROM
_C
)
{
XPageManager
.
push
(
XPageManager
.
push
(
XRouterPathConstants
.
LIFE_ACCOUNT_AUTH
,
XRouterPathConstants
.
LIFE_ACCOUNT_AUTH
,
hashMapOf
(
hashMapOf
(
...
...
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