From b40eddf251b5fec8b27bd441582f7e12e6b8b4b7 Mon Sep 17 00:00:00 2001 From: yuyongdong Date: Tue, 14 May 2024 20:35:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BB=91=E5=AE=9A=E9=82=AE?= =?UTF-8?q?=E7=AE=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/common/Google-icon.png | Bin 0 -> 2764 bytes src/assets/common/close.png | Bin 0 -> 2242 bytes src/components/emailDialog.vue | 404 ++++++++++++++++++++++++++++ src/components/errorDialog/index.js | 6 + src/utils/webapi.js | 12 + src/views/home/gameCheckBtn.vue | 4 +- src/views/home/gameQuest.vue | 7 +- src/views/home/index.vue | 38 ++- 8 files changed, 464 insertions(+), 7 deletions(-) create mode 100644 src/assets/common/Google-icon.png create mode 100644 src/assets/common/close.png create mode 100644 src/components/emailDialog.vue diff --git a/src/assets/common/Google-icon.png b/src/assets/common/Google-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..2c2ecf841ed467f860217c99d65c30f068c8deae GIT binary patch literal 2764 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 Q3jhEB07*qoM6N<$f{da%;{X5v literal 0 HcmV?d00001 diff --git a/src/components/emailDialog.vue b/src/components/emailDialog.vue new file mode 100644 index 0000000..29024aa --- /dev/null +++ b/src/components/emailDialog.vue @@ -0,0 +1,404 @@ + + + + + \ No newline at end of file diff --git a/src/components/errorDialog/index.js b/src/components/errorDialog/index.js index d0438a2..8fd38fe 100644 --- a/src/components/errorDialog/index.js +++ b/src/components/errorDialog/index.js @@ -80,6 +80,12 @@ let errmsg = err errmsg = `You don't have enough Spins.` } else if(errmsg.indexOf('no ticket') > -1) { errmsg = `You don't have enough Spins.` + } else if(errmsg.indexOf('Email address is required. Please enter your email to proceed.') > -1) { + errmsg = `Email address is required. Please enter your email to proceed.` + } else if(errmsg.indexOf('code expired') > -1) { + errmsg = `Your verification code has expired. Please request a new code.` + } else if(errmsg.indexOf('code error') > -1) { + errmsg = `Verification code is incorrect. Please verify and try again.` } else if(errmsg.indexOf('You have already boosted the chest') > -1 || errmsg.indexOf('The chest’s boost count has reached the upper limit') > -1 || errmsg.indexOf('Today’s boost count has been exhausted') > -1) { diff --git a/src/utils/webapi.js b/src/utils/webapi.js index e986431..bc02e3c 100644 --- a/src/utils/webapi.js +++ b/src/utils/webapi.js @@ -322,3 +322,15 @@ export const apiDrawHistory = async () => { const url = `${API_BASE}/api/ingame/draw_history`; return httpGet(url, {}) } + +// 发送邮件验证码 +export const apiSendCode = async (email) => { + const url = `${API_BASE}/api/email/send_code`; + return httpPost(url, {email}) +} + +// 发送邮件验证码 +export const apiVerifyEmail = async (email, code) => { + const url = `${API_BASE}/api/user/verify_email`; + return httpPost(url, {email, code}) +} diff --git a/src/views/home/gameCheckBtn.vue b/src/views/home/gameCheckBtn.vue index 0ccc56f..d542b7c 100644 --- a/src/views/home/gameCheckBtn.vue +++ b/src/views/home/gameCheckBtn.vue @@ -53,7 +53,9 @@ bonusCount: 2, // 已助力次数 async checkBtn(){ this.isShow = false let googleId = this.$store.state.user.userData?.googleId || undefined - if(googleId) { + let usesEmailId = this.$store.state.user.userData?.emailId || undefined + console.log(googleId, usesEmailId) + if(usesEmailId || googleId) { try { let { errcode, errmsg, data } = await apiGameClaim(this.itemData.id); if (!errcode) { diff --git a/src/views/home/gameQuest.vue b/src/views/home/gameQuest.vue index f97e504..d3e30fe 100644 --- a/src/views/home/gameQuest.vue +++ b/src/views/home/gameQuest.vue @@ -53,7 +53,7 @@
-
+
Verify
@@ -127,7 +127,7 @@
Verify
-
+
Verify
@@ -178,6 +178,9 @@ export default { usesGoogleId() { return this.$store.state.user.userData?.googleId || undefined; }, + usesEmailId() { + return this.$store.state.user.userData?.emailId || undefined; + }, getTime() { var now = new Date().getTime(); if(this.activityData.drawTime < now) { diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 96a72f1..1d3c231 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -126,14 +126,18 @@
Connect Game Account
-
Connect
-
+ +
-
+
+ {{ usesEmail.slice(0,6) }}***{{usesEmail.substr(-6)}} +
+
{{ usesGoogleMail.slice(0,6) }}***{{usesGoogleMail.substr(-6)}}
+
Connect

@@ -884,6 +888,8 @@ @closeDialog="closeDialog" /> + +