diff --git a/src/components/errorDialog/index.js b/src/components/errorDialog/index.js index 5035fc5..e510a6f 100644 --- a/src/components/errorDialog/index.js +++ b/src/components/errorDialog/index.js @@ -34,10 +34,8 @@ let errmsg = err errmsg = 'Redemption Code is required' } else if(errmsg.indexOf('need connect discord first') > -1) { errmsg = `Discord account unlinked. Please ensure the 'Connect Your Discord' quest is complete.` - } else if(errmsg.indexOf("You do not hold the required role in the 'Ink' Discord server") > -1) { - errmsg = `You do not hold the required role in the 'Ink' Discord server` - } else if(errmsg.indexOf("You do not hold the required role in the 'Counter Fire' Discord server") > -1) { - errmsg = `"You do not hold the required role in the 'Counter Fire' Discord server"` + } else if(errmsg.indexOf("You do not hold the required role in the") > -1) { + errmsg = errmsg } else if(errmsg.indexOf('Invalid Voucher Code') > -1) { errmsg = 'Invalid Redemption Code' } else if(errmsg.indexOf('voucher already used') > -1) { @@ -58,8 +56,6 @@ let errmsg = err errmsg = "Please complete the 'Connect Your Discord' quest first" } else if(errmsg.indexOf("maintance now, please try later") > -1) { errmsg = "maintance now, please try later" - } else if(errmsg.indexOf("Delabs Game") > -1) { - errmsg = "You do not hold the required role in the 'Delabs Game' Discord server" } else if(errmsg.indexOf('Please try again') > -1) { errmsg = "Verification failed due to high traffic. Please attempt to verify again or try later" } else if(errmsg.indexOf('already claimed') > -1) { diff --git a/src/components/userImg.vue b/src/components/userImg.vue index 28f11b3..b356275 100644 --- a/src/components/userImg.vue +++ b/src/components/userImg.vue @@ -1,6 +1,6 @@ @@ -10,7 +10,11 @@ export default { props: { imgSrc: String, }, - + data() { + return { + defalutUrl: 'this.src="' + require('@/assets/common/head_default.jpg') + '"', + } + }, } diff --git a/src/views/home/index.vue b/src/views/home/index.vue index c75172d..b1d4507 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -1137,8 +1137,12 @@ export default { toReconnection(val) { if(val.task == "DiscordConnect" || val.task == "TwitterConnect") { this.activeList.forEach(item => { - if(item.task == "DiscordConnect" || val.task == "TwitterConnect") { + if(item.task == "DiscordConnect") { item.status = 0 + } else if(val.task == "TwitterConnect") { + item.status = 0 + } else { + return } }); } diff --git a/src/views/home/nftPartner.vue b/src/views/home/nftPartner.vue index 5f01077..5ad4a0b 100644 --- a/src/views/home/nftPartner.vue +++ b/src/views/home/nftPartner.vue @@ -191,24 +191,19 @@ export default { } else if(errcode == 13) { this.$showErr(`${errmsg}`) } else if(errcode == 14) { - if(itemData.contract == 'INK') { - this.$showErr("You do not hold the required role in the 'Ink' Discord server") - } else if(itemData.projectName == "Delabs Games") { - this.$showErr(`${itemData.projectName}`) + if(itemData.guild !== '930002266868555827') { + this.$showErr(`You do not hold the required role in the '${itemData.projectName}' Discord server`) } else { - this.$showErr("had no role") + this.$showErr(`You do not hold the required role in the 'Counter Fire' Discord server`) } } else if(errcode == 20) { this.$showErr(errmsg) } else if(errcode == 21) { // this.$showErr(errmsg, nextAction) - if(itemData.contract == 'INK') { - this.$showErr("You do not hold the required role in the 'Ink' Discord server") - } else if(itemData.projectName == "Delabs Games") { - this.$showErr(`${itemData.projectName}`) + if(itemData.guild !== '930002266868555827') { + this.$showErr(`You do not hold the required role in the '${itemData.projectName}' Discord server`) } else { - this.$showErr("You do not hold the required role in the 'Counter Fire' Discord server") - this.$emit('toNavIndex') + this.$showErr(`You do not hold the required role in the 'Counter Fire' Discord server`) } } } catch (err) {