diff --git a/src/components/errorDialog/index.js b/src/components/errorDialog/index.js index f02b0b0..840bf7d 100644 --- a/src/components/errorDialog/index.js +++ b/src/components/errorDialog/index.js @@ -34,13 +34,14 @@ let errmsg = err errmsg = 'Can not be empty' } else if(errmsg.indexOf('need connect discord first') > -1) { errmsg = 'need connect discord first' - } else if(errmsg.indexOf('Invalid Voucher Code' > -1)) { + } else if(errmsg.indexOf('Invalid Voucher Code') > -1) { + console.log(errmsg,'errmsg') errmsg = 'Invalid Voucher Code' } else if(errmsg.indexOf('already claimed') > -1) { errmsg = 'already claimed' - } else if(errmsg.indexOf('had no role')) { + } else if(errmsg.indexOf('had no role') > -1) { errmsg = 'had no role' - } else if(errmsg.indexOf('have not join guild')) { + } else if(errmsg.indexOf('have not join guild') > -1) { errmsg = 'have not join guild' } diff --git a/src/views/home/boxBtm.vue b/src/views/home/boxBtm.vue index c6838da..14feb61 100644 --- a/src/views/home/boxBtm.vue +++ b/src/views/home/boxBtm.vue @@ -95,7 +95,7 @@
-
Copy Chest Link
+
{{ boxData.bounsCount }}/{{ boxData.maxBounsCount }} Copy Chest Link
@@ -262,9 +262,7 @@ export default { pageBoxList: [], boxData: {}, userData: {}, - boostingList: [ - - ], + boostingList: [], pageSize: 6, currentPage: 1, recordsDialogVisible: false, @@ -272,87 +270,6 @@ export default { recordsPageSize: 8, recordsCurrentPage: 1, boostingDialogVisible: false, - - // myRecordsList: [ - // { - // username: 'username', - // name: 'username', - // points: '12', - // address: 'addressaddress', - // post: '0000', - // }, - // { - // username: 'username', - // name: 'username', - // points: '12', - // address: 'addressaddress', - // post: '0000', - // }, - // { - // username: 'username', - // name: 'username', - // points: '12', - // address: 'addressaddress', - // post: '0000', - // }, - // { - // username: 'username', - // name: 'username', - // points: '12', - // address: 'addressaddress', - // post: '0000', - // }, - // { - // username: 'username', - // name: 'username', - // points: '12', - // address: 'addressaddress', - // post: '0000', - // }, - // { - // username: 'username', - // name: 'username', - // points: '12', - // address: 'addressaddress', - // post: '0000', - // }, - // { - // username: 'username', - // name: 'username', - // points: '12', - // address: 'addressaddress', - // post: '0000', - // }, - // { - // username: 'username', - // name: 'username', - // points: '12', - // address: 'addressaddress', - // post: '0000', - // }, - // { - // username: 'username', - // name: 'username', - // points: '12', - // address: 'addressaddress', - // post: '0000', - // }, - // { - // username: 'username', - // name: 'username', - // points: '12', - // address: 'addressaddress', - // post: '0000', - // }, - // { - // username: 'username', - // name: 'username', - // points: '12', - // address: 'addressaddress', - // post: '0000', - // } - // ], - myRecordsList: [], boostingPageSize: 6, boostingCurrentPage: 1, @@ -485,6 +402,7 @@ export default { // alert(`领取成功,显示奖励: ${JSON.stringify(data)}`) this.getMyBoxList() this.openBoxLog() + this.boostingList = [] this.isLoading = false this.$emit('awardDialog', data) localStorage.removeItem(storeageKey) @@ -823,7 +741,7 @@ export default { justify-content: center; align-items: center; padding: 20px 0px; - font-size: 12px; + font-size: 14px; background: url('@/assets/box/button_copy.png') no-repeat; background-size: 100% 100%; border-radius: 20px; diff --git a/src/views/home/index.vue b/src/views/home/index.vue index eafc27c..00038da 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -280,7 +280,7 @@
-

Consecutive Check-in Rewards

+

Accumulative Check-in Rewards

  • @@ -364,7 +364,7 @@
  • -

    Accumulative Check-in Rewards

    +

    Consecutive Check-in Rewards

  • diff --git a/src/views/home/nftPartner.vue b/src/views/home/nftPartner.vue index de1cc1c..3ff9cec 100644 --- a/src/views/home/nftPartner.vue +++ b/src/views/home/nftPartner.vue @@ -31,7 +31,7 @@
    @@ -41,18 +41,20 @@
    - +
    -
    Chick
    -
    +
    + Verify +
    +
    @@ -161,32 +163,40 @@ export default { }, // 领取NFT holder 奖励 - async chickNftClaim(contract) { + async chickNftClaim(contract, step) { let discordId = JSON.parse(localStorage.getItem("userData")).discordId if(discordId) { try { let { errcode, errmsg, data } = await apiClaimNft(contract); + console.log(errcode, errmsg, data) if (!errcode) { - this.getNftList() + this.nftsList = [] + this.getNftList(step) this.$emit('awardDialog',data) } else if(errcode == 10 || errcode == 20) { + this.beginCountdown(step) this.$showErr(errmsg) } else if(errcode == 13) { - this.$showErr(errmsg) + this.beginCountdown(step) + this.$showErr(`${errmsg}`) } else if(errcode == 14) { + this.beginCountdown(step) this.$showErr(errmsg) } else if(errcode == 21) { + this.beginCountdown(step) this.$showErr(errmsg) } } catch (err) { + this.beginCountdown(step) this.$message.error(`claim partner reward error: ${err}`); } } else { + this.beginCountdown(step) this.$showErr('need connect discord first') } }, - beginCountdown() { - this.timeLeft = parseInt(this.time); + beginCountdown(step) { + this.timeLeft = parseInt(step); let timer = setInterval(() => { this.timeLeft--; if (this.timeLeft <= 0) { diff --git a/src/views/home/ranking.vue b/src/views/home/ranking.vue index c9d6977..620504e 100644 --- a/src/views/home/ranking.vue +++ b/src/views/home/ranking.vue @@ -30,7 +30,7 @@
    {{ usesRank }}
    -
    Outside the Top 100
    +
    Outside the Top 100+
    {{ usesRank+1 }}