提交 0d126160 编写于 作者: C chenruilong

增加 注册管理员时存在多个管理员的提示文案

上级 f2ded96c
...@@ -35,7 +35,8 @@ const sentence = { ...@@ -35,7 +35,8 @@ const sentence = {
'uni-id-set-invite-code-failed': 'Set invite code failed', 'uni-id-set-invite-code-failed': 'Set invite code failed',
'uni-id-invalid-invite-code': 'Invalid invite code', 'uni-id-invalid-invite-code': 'Invalid invite code',
'uni-id-change-inviter-forbidden': 'Change inviter is not allowed', 'uni-id-change-inviter-forbidden': 'Change inviter is not allowed',
'uni-id-bind-conflict': 'This account has been bound' 'uni-id-bind-conflict': 'This account has been bound',
'uni-id-admin-exist-in-other-apps': 'Administrator is registered in other consoles'
} }
module.exports = { module.exports = {
......
...@@ -35,7 +35,8 @@ const sentence = { ...@@ -35,7 +35,8 @@ const sentence = {
'uni-id-set-invite-code-failed': '设置邀请码失败', 'uni-id-set-invite-code-failed': '设置邀请码失败',
'uni-id-invalid-invite-code': '邀请码不可用', 'uni-id-invalid-invite-code': '邀请码不可用',
'uni-id-change-inviter-forbidden': '禁止修改邀请人', 'uni-id-change-inviter-forbidden': '禁止修改邀请人',
'uni-id-bind-conflict': '此账号已被绑定' 'uni-id-bind-conflict': '此账号已被绑定',
'uni-id-admin-exist-in-other-apps': '超级管理员已在其他控制台注册'
} }
module.exports = { module.exports = {
......
...@@ -37,9 +37,19 @@ module.exports = async function (params = {}) { ...@@ -37,9 +37,19 @@ module.exports = async function (params = {}) {
role: 'admin' role: 'admin'
}).limit(1).get() }).limit(1).get()
if (getAdminRes.data.length > 0) { if (getAdminRes.data.length > 0) {
return { const [admin] = getAdminRes.data
errCode: ERROR.ADMIN_EXISTS, const appId = this.getClientInfo().appId
errMsg: this.t('uni-id-admin-exists')
if (!admin.dcloud_appid || (admin.dcloud_appid && admin.dcloud_appid.includes(appId))) {
return {
errCode: ERROR.ADMIN_EXISTS,
errMsg: this.t('uni-id-admin-exists')
}
} else {
return {
errCode: ERROR.ADMIN_EXISTS,
errMsg: this.t('uni-id-admin-exist-in-other-apps')
}
} }
} }
const { const {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册