Commit a84388cd authored by yinjiacheng's avatar yinjiacheng

fix SHQBD-257 商户管理中心个人未认证生活号展示底部浮窗

parent 61236dfd
...@@ -13,7 +13,8 @@ class LifeAccountItemBean(var response: Response) { ...@@ -13,7 +13,8 @@ class LifeAccountItemBean(var response: Response) {
val life_account_status: Int, val life_account_status: Int,
val life_account_type: Int, val life_account_type: Int,
val role_type: Int, val role_type: Int,
val tag: Tag val tag: Tag,
val enterprise_auth_record_id: Int
) : Serializable ) : Serializable
data class Tag( data class Tag(
......
...@@ -153,10 +153,7 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(), ...@@ -153,10 +153,7 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(),
* @param data 当前生活号数据 * @param data 当前生活号数据
*/ */
private fun showMerchantCenterBottomHint(data: LifeAccountItemBean.Response) { private fun showMerchantCenterBottomHint(data: LifeAccountItemBean.Response) {
if (data.life_account_type == Constant.TYPE_LIFE_ACCOUNT_PERSONAL if (data.life_account_auth_status == Constant.STATUS_AUTH_NOT && data.enterprise_auth_record_id == 0) {
&& data.life_account_auth_status == Constant.STATUS_AUTH_NOT
&& data.enterprise_audit_status == 0
) {
// 当前是个人未认证生活号 提示认证升级 // 当前是个人未认证生活号 提示认证升级
MerchantCenterBottomHintDialog( MerchantCenterBottomHintDialog(
this, this,
......
...@@ -100,8 +100,8 @@ class MerchantInfoActivity : BaseActivity<ActivityMerchantInfoBinding>(), Mercha ...@@ -100,8 +100,8 @@ class MerchantInfoActivity : BaseActivity<ActivityMerchantInfoBinding>(), Mercha
return return
} }
// 认证状态 // 认证状态
if (lifeAccountInfo?.life_account_auth_status == Constant.STATUS_AUTH_NOT && lifeAccountInfo?.enterprise_auth_record_id == null) { if (lifeAccountInfo?.life_account_auth_status == Constant.STATUS_AUTH_NOT && lifeAccountInfo?.enterprise_auth_record_id == 0) {
// 个人未认证生活号 无企业审核记录id // 个人未认证生活号 企业审核记录id为0
viewBind.ivLifeAccountAuth.fillContent(resources.getString(R.string.not_auth)) viewBind.ivLifeAccountAuth.fillContent(resources.getString(R.string.not_auth))
viewBind.ivLifeAccountAuth.showAuthEntry(MerchantInfoView.LifeAccountAuthStatus.NOT_AUTH) viewBind.ivLifeAccountAuth.showAuthEntry(MerchantInfoView.LifeAccountAuthStatus.NOT_AUTH)
return return
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment