diff --git a/.env.development b/.env.development index 419a9f5..b8abc9c 100644 --- a/.env.development +++ b/.env.development @@ -1,6 +1,6 @@ # API -# VUE_APP_API_URL = 'https://oauth-svr.cebggame.com/task' -VUE_APP_API_URL = 'http://192.168.100.22:3006' +VUE_APP_API_URL = 'https://oauth-svr.cebggame.com/task' +# VUE_APP_API_URL = 'http://192.168.100.22:3006' # VUE_APP_API_URL = 'http://127.0.0.1:3006/api' VUE_APP_WL_URL = 'https://nftwl.counterfire.games/wl_test' VUE_APP_CONFIG_URL = 'https://sepolia.infura.io/v3/b6bf7d3508c941499b10025c0776eaf8' diff --git a/src/assets/username/Asterix.jpg b/src/assets/username/Asterix.jpg new file mode 100644 index 0000000..09a370e Binary files /dev/null and b/src/assets/username/Asterix.jpg differ diff --git a/src/assets/username/Cheers Up.jpg b/src/assets/username/Cheers Up.jpg new file mode 100644 index 0000000..bdef93c Binary files /dev/null and b/src/assets/username/Cheers Up.jpg differ diff --git a/src/assets/username/Cyberkongz.jpg b/src/assets/username/Cyberkongz.jpg new file mode 100644 index 0000000..4cd3be2 Binary files /dev/null and b/src/assets/username/Cyberkongz.jpg differ diff --git a/src/assets/username/Delabs Games.jpg b/src/assets/username/Delabs Games.jpg new file mode 100644 index 0000000..90ac573 Binary files /dev/null and b/src/assets/username/Delabs Games.jpg differ diff --git a/src/assets/username/Ink .jpg b/src/assets/username/Ink .jpg new file mode 100644 index 0000000..20a7ebc Binary files /dev/null and b/src/assets/username/Ink .jpg differ diff --git a/src/assets/username/L3E7.jpg b/src/assets/username/L3E7.jpg new file mode 100644 index 0000000..b86c3a9 Binary files /dev/null and b/src/assets/username/L3E7.jpg differ diff --git a/src/assets/username/Llamaverse.jpg b/src/assets/username/Llamaverse.jpg new file mode 100644 index 0000000..6d8c36c Binary files /dev/null and b/src/assets/username/Llamaverse.jpg differ diff --git a/src/assets/username/Matr1x.jpg b/src/assets/username/Matr1x.jpg new file mode 100644 index 0000000..b85a87e Binary files /dev/null and b/src/assets/username/Matr1x.jpg differ diff --git a/src/assets/username/Memeland.jpg b/src/assets/username/Memeland.jpg new file mode 100644 index 0000000..19e9685 Binary files /dev/null and b/src/assets/username/Memeland.jpg differ diff --git a/src/assets/username/Metacene.jpg b/src/assets/username/Metacene.jpg new file mode 100644 index 0000000..9ebe2ac Binary files /dev/null and b/src/assets/username/Metacene.jpg differ diff --git a/src/assets/username/Mofu Mofu.jpg b/src/assets/username/Mofu Mofu.jpg new file mode 100644 index 0000000..041a62d Binary files /dev/null and b/src/assets/username/Mofu Mofu.jpg differ diff --git a/src/assets/username/Neo Tokyo.jpg b/src/assets/username/Neo Tokyo.jpg new file mode 100644 index 0000000..19b546e Binary files /dev/null and b/src/assets/username/Neo Tokyo.jpg differ diff --git a/src/assets/username/PG.jpg b/src/assets/username/PG.jpg new file mode 100644 index 0000000..8353007 Binary files /dev/null and b/src/assets/username/PG.jpg differ diff --git a/src/assets/username/Pirate Nation.jpg b/src/assets/username/Pirate Nation.jpg new file mode 100644 index 0000000..3bb82b0 Binary files /dev/null and b/src/assets/username/Pirate Nation.jpg differ diff --git a/src/assets/username/Pixelmon.jpg b/src/assets/username/Pixelmon.jpg new file mode 100644 index 0000000..6d4024d Binary files /dev/null and b/src/assets/username/Pixelmon.jpg differ diff --git a/src/assets/username/Space Nation.jpg b/src/assets/username/Space Nation.jpg new file mode 100644 index 0000000..3627a93 Binary files /dev/null and b/src/assets/username/Space Nation.jpg differ diff --git a/src/assets/username/Test.jpg b/src/assets/username/Test.jpg new file mode 100644 index 0000000..bb86ed8 Binary files /dev/null and b/src/assets/username/Test.jpg differ diff --git a/src/assets/username/Today.jpg b/src/assets/username/Today.jpg new file mode 100644 index 0000000..477c2cb Binary files /dev/null and b/src/assets/username/Today.jpg differ diff --git a/src/assets/username/Ultiverse.jpg b/src/assets/username/Ultiverse.jpg new file mode 100644 index 0000000..1ec6bd7 Binary files /dev/null and b/src/assets/username/Ultiverse.jpg differ diff --git a/src/assets/username/Weirdo Ghost Gang.jpg b/src/assets/username/Weirdo Ghost Gang.jpg new file mode 100644 index 0000000..2b195a0 Binary files /dev/null and b/src/assets/username/Weirdo Ghost Gang.jpg differ diff --git a/src/assets/username/WolvesDAO.jpg b/src/assets/username/WolvesDAO.jpg new file mode 100644 index 0000000..bb1fc8d Binary files /dev/null and b/src/assets/username/WolvesDAO.jpg differ diff --git a/src/assets/username/ZooVerse.jpg b/src/assets/username/ZooVerse.jpg new file mode 100644 index 0000000..ea0b263 Binary files /dev/null and b/src/assets/username/ZooVerse.jpg differ diff --git a/src/components/checkBtn.vue b/src/components/checkBtn.vue index 8099b1c..f92721b 100644 --- a/src/components/checkBtn.vue +++ b/src/components/checkBtn.vue @@ -20,9 +20,16 @@ export default { methods: { async beginAction() { try { - let { errcode, data } = await apiCheckActivity(this.dataid); + let { errcode, errmsg, data } = await apiCheckActivity(this.dataid); if (errcode !== 0) { - this.beginCountdown(); + if(errmsg == 'twitter already binded') { + this.$showErr('twitter already binded') + } else if(errmsg == 'discord already binded to another account') { + this.$showErr('discord already binded to another account') + } else { + this.beginCountdown(); + this.$showErr('Please try again') + } return; } if (data.status === 2) { diff --git a/src/components/errorDialog/index.js b/src/components/errorDialog/index.js index 262017d..011d819 100644 --- a/src/components/errorDialog/index.js +++ b/src/components/errorDialog/index.js @@ -21,7 +21,7 @@ let errmsg = err } else if(errmsg.indexOf('Hash: not available') > -1) { errmsg = `Operation timed out. Please retry.` } else if(errmsg.indexOf('chest already opened') > -1) { - errmsg = 'chest already opened' + errmsg = 'This chest has been opened already' } else if(errmsg.indexOf('check error: not found guild') > -1) { errmsg = 'Transaction failed please try again' } else if(errmsg.indexOf('execution reverted: TreasureHunt: paused') > -1) { @@ -29,19 +29,32 @@ let errmsg = err } else if(errmsg.indexOf('waiting for chain confirm') > -1) { errmsg = 'waiting for chain confirm' } else if(errmsg.indexOf('voucher not found') > -1) { - errmsg = 'Code invalid or already redeemed' + errmsg = 'Invalid Redemption Code' } else if(errmsg.indexOf('Can not be empty') > -1) { 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('Invalid Voucher Code') > -1) { errmsg = 'Invalid Redemption Code' + } else if(errmsg.indexOf('voucher already used') > -1) { + errmsg = 'Redemption Code has already been used' } else if(errmsg.indexOf('already claimed') > -1) { errmsg = 'This reward chest has been claimed already' } else if(errmsg.indexOf('had no role') > -1) { errmsg = 'You do not hold the required role in the "Counter Fire" Discord server' } else if(errmsg.indexOf('have not join guild') > -1) { errmsg = 'You do not hold the required role in the "Counter Fire" Discord server' + } else if(errmsg.indexOf('twitter already binded') > -1) { + errmsg = 'This X account has already been linked' + } else if(errmsg.indexOf('discord already binded to another account') > -1) { + errmsg = 'This Discord account has already been linked' + } else { + // 请重试 + errmsg = 'Please try again' } const _confirm = new iErrorMessage({ diff --git a/src/views/home/boxBtm.vue b/src/views/home/boxBtm.vue index 48f097c..db1469e 100644 --- a/src/views/home/boxBtm.vue +++ b/src/views/home/boxBtm.vue @@ -42,7 +42,7 @@
-
History Records
+
Historical Records
@@ -216,7 +216,7 @@ >
- {{ scope.row.nickname }} + {{ scope.row.nickname }}
@@ -340,7 +340,7 @@ export default { }) this.boxList = res.data.data this.boxData = res.data.data[0] - if(this.boxList == undefined || this.boxList.length <= 0) { + if(this.boxList !== undefined && this.boxList.length > 0) { await this.getHistorical(this.boxData.id) } }, @@ -1038,7 +1038,12 @@ export default { align-items: center; justify-content: center; .userImg { - margin-right: 10px; + margin-right: 20px; + } + span { + display: inline-block; + width: 136px; + text-align: left; } } } diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 5964075..009cdaf 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -60,12 +60,15 @@
-
+
Complete Social Quests
Check In  & Explore
+
+
Claim  Chests
+
@@ -86,7 +89,7 @@ @awardDialog="exploreAwardDialog" />
-
+
@@ -95,7 +98,7 @@ class="desc" >Complete Social Quests, Embark on Explorations, Open/Boost Chests to earn Airdrop Points, which will eventually be converted to $CEC.

Read here for more details.

-
+
  • EXPLORE