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
a84388cd
Commit
a84388cd
authored
Jun 25, 2021
by
yinjiacheng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix SHQBD-257 商户管理中心个人未认证生活号展示底部浮窗
parent
61236dfd
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
7 deletions
+5
-7
LifeAccountItemBean.kt
...ghuoquan/newscontent/http/httpbean/LifeAccountItemBean.kt
+2
-1
MerchantCenterActivity.kt
...nghuoquan/newscontent/ui/center/MerchantCenterActivity.kt
+1
-4
MerchantInfoActivity.kt
...henghuoquan/newscontent/ui/center/MerchantInfoActivity.kt
+2
-2
No files found.
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/http/httpbean/LifeAccountItemBean.kt
View file @
a84388cd
...
...
@@ -13,7 +13,8 @@ class LifeAccountItemBean(var response: Response) {
val
life_account_status
:
Int
,
val
life_account_type
:
Int
,
val
role_type
:
Int
,
val
tag
:
Tag
val
tag
:
Tag
,
val
enterprise_auth_record_id
:
Int
)
:
Serializable
data class
Tag
(
...
...
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/center/MerchantCenterActivity.kt
View file @
a84388cd
...
...
@@ -153,10 +153,7 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(),
* @param data 当前生活号数据
*/
private
fun
showMerchantCenterBottomHint
(
data
:
LifeAccountItemBean
.
Response
)
{
if
(
data
.
life_account_type
==
Constant
.
TYPE_LIFE_ACCOUNT_PERSONAL
&&
data
.
life_account_auth_status
==
Constant
.
STATUS_AUTH_NOT
&&
data
.
enterprise_audit_status
==
0
)
{
if
(
data
.
life_account_auth_status
==
Constant
.
STATUS_AUTH_NOT
&&
data
.
enterprise_auth_record_id
==
0
)
{
// 当前是个人未认证生活号 提示认证升级
MerchantCenterBottomHintDialog
(
this
,
...
...
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/center/MerchantInfoActivity.kt
View file @
a84388cd
...
...
@@ -100,8 +100,8 @@ class MerchantInfoActivity : BaseActivity<ActivityMerchantInfoBinding>(), Mercha
return
}
// 认证状态
if
(
lifeAccountInfo
?.
life_account_auth_status
==
Constant
.
STATUS_AUTH_NOT
&&
lifeAccountInfo
?.
enterprise_auth_record_id
==
null
)
{
// 个人未认证生活号
无企业审核记录id
if
(
lifeAccountInfo
?.
life_account_auth_status
==
Constant
.
STATUS_AUTH_NOT
&&
lifeAccountInfo
?.
enterprise_auth_record_id
==
0
)
{
// 个人未认证生活号
企业审核记录id为0
viewBind
.
ivLifeAccountAuth
.
fillContent
(
resources
.
getString
(
R
.
string
.
not_auth
))
viewBind
.
ivLifeAccountAuth
.
showAuthEntry
(
MerchantInfoView
.
LifeAccountAuthStatus
.
NOT_AUTH
)
return
...
...
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