diff --git a/.env.dev b/.env.dev index 0596118..45831e1 100644 --- a/.env.dev +++ b/.env.dev @@ -1,4 +1,6 @@ VUE_APP_BASE_API='https://market.cebg.games' VUE_APP_BASE_API2='https://invitation.counterfire.games' //VUE_APP_BASE_API2='http://192.168.100.83:3000/' -VUE_APP_GPAL_API='https://gacha.counterfire.games' \ No newline at end of file +VUE_APP_GPAL_API='https://gacha.counterfire.games' + +VUE_APP_GPAL_API3='https://webapi.cebggame.com' \ No newline at end of file diff --git a/.env.production b/.env.production index d29fe98..7694c62 100644 --- a/.env.production +++ b/.env.production @@ -1,3 +1,4 @@ VUE_APP_BASE_API='https://market.cebg.games' VUE_APP_BASE_API2='https://invitation.counterfire.games' -VUE_APP_GPAL_API='https://gacha.counterfire.games' \ No newline at end of file +VUE_APP_GPAL_API='https://gacha.counterfire.games' +VUE_APP_GPAL_API3='https://webapi.cebggame.com' \ No newline at end of file diff --git a/dist-pc.rar b/dist.rar similarity index 65% rename from dist-pc.rar rename to dist.rar index 4ca2a9c..2c73be8 100644 Binary files a/dist-pc.rar and b/dist.rar differ diff --git a/src/api/User.js b/src/api/User.js index 29740ec..a3ca9af 100644 --- a/src/api/User.js +++ b/src/api/User.js @@ -1,6 +1,6 @@ import request from '@/utils/request' import request2 from '@/utils/requestduplicate' - +import request3 from '@/utils/requests' const GPAL_URL = import.meta.env.VUE_APP_GPAL_API; @@ -87,6 +87,13 @@ export const logout = () => data }) } + +export const getBasic=(params)=>{ + return request3({ + url: `/api/claim/result/${params}`, + method: 'get', + }) +} // // export const changePass = (params: any) => // request({ diff --git a/src/assets/img/task/Badge_icon1.png b/src/assets/img/task/Badge_icon1.png new file mode 100644 index 0000000..f88aa5e Binary files /dev/null and b/src/assets/img/task/Badge_icon1.png differ diff --git a/src/assets/img/task/Badge_icon2.png b/src/assets/img/task/Badge_icon2.png new file mode 100644 index 0000000..74d111b Binary files /dev/null and b/src/assets/img/task/Badge_icon2.png differ diff --git a/src/assets/img/task/Logo_Discard.png b/src/assets/img/task/Logo_Discard.png new file mode 100644 index 0000000..72c3302 Binary files /dev/null and b/src/assets/img/task/Logo_Discard.png differ diff --git a/src/assets/img/task/Logo_Twitter.png b/src/assets/img/task/Logo_Twitter.png new file mode 100644 index 0000000..ac82f7b Binary files /dev/null and b/src/assets/img/task/Logo_Twitter.png differ diff --git a/src/assets/img/task/Yoyo.png b/src/assets/img/task/Yoyo.png new file mode 100644 index 0000000..da8f372 Binary files /dev/null and b/src/assets/img/task/Yoyo.png differ diff --git a/src/assets/img/task/bg-c.png b/src/assets/img/task/bg-c.png deleted file mode 100644 index 06ddc3a..0000000 Binary files a/src/assets/img/task/bg-c.png and /dev/null differ diff --git a/src/assets/img/task/bg.jpg b/src/assets/img/task/bg.jpg index 6f65061..1005013 100644 Binary files a/src/assets/img/task/bg.jpg and b/src/assets/img/task/bg.jpg differ diff --git a/src/assets/img/task/bg.png b/src/assets/img/task/bg.png deleted file mode 100644 index 06ddc3a..0000000 Binary files a/src/assets/img/task/bg.png and /dev/null differ diff --git a/src/assets/img/task/boders.png b/src/assets/img/task/boders.png new file mode 100644 index 0000000..4c5346e Binary files /dev/null and b/src/assets/img/task/boders.png differ diff --git a/src/assets/img/task/boderstow.png b/src/assets/img/task/boderstow.png new file mode 100644 index 0000000..842ca85 Binary files /dev/null and b/src/assets/img/task/boderstow.png differ diff --git a/src/assets/img/task/event_tagBtn01.png b/src/assets/img/task/event_tagBtn01.png new file mode 100644 index 0000000..aeb54fd Binary files /dev/null and b/src/assets/img/task/event_tagBtn01.png differ diff --git a/src/assets/img/task/event_tagBtn02.png b/src/assets/img/task/event_tagBtn02.png new file mode 100644 index 0000000..a5eee3d Binary files /dev/null and b/src/assets/img/task/event_tagBtn02.png differ diff --git a/src/assets/img/task/gacha_icon1.png b/src/assets/img/task/gacha_icon1.png new file mode 100644 index 0000000..2b993bf Binary files /dev/null and b/src/assets/img/task/gacha_icon1.png differ diff --git a/src/assets/img/task/gacha_icon2.png b/src/assets/img/task/gacha_icon2.png new file mode 100644 index 0000000..52013cb Binary files /dev/null and b/src/assets/img/task/gacha_icon2.png differ diff --git a/src/assets/img/task/icon_star.png b/src/assets/img/task/icon_star.png new file mode 100644 index 0000000..0a965ca Binary files /dev/null and b/src/assets/img/task/icon_star.png differ diff --git a/src/assets/img/task/title.png b/src/assets/img/task/title.png index bb21c19..dd06e95 100644 Binary files a/src/assets/img/task/title.png and b/src/assets/img/task/title.png differ diff --git a/src/assets/img/task/triangle.png b/src/assets/img/task/triangle.png new file mode 100644 index 0000000..2ed7a67 Binary files /dev/null and b/src/assets/img/task/triangle.png differ diff --git a/src/assets/img/task/ts_main_zuanshi.png b/src/assets/img/task/ts_main_zuanshi.png new file mode 100644 index 0000000..d44e1d6 Binary files /dev/null and b/src/assets/img/task/ts_main_zuanshi.png differ diff --git a/src/components/task/TaskTwo.vue b/src/components/task/TaskTwo.vue index aab96eb..938147c 100644 --- a/src/components/task/TaskTwo.vue +++ b/src/components/task/TaskTwo.vue @@ -16,13 +16,13 @@ target="_blank" rel="noopener noreferrer" > - Invite Quest
- +
@@ -73,8 +73,131 @@
+ + +
You got
+ +
+
+
Points :
+
{{ userInfo.point }}
+
+
+
Ranking :
+
{{ userInfo.rank }}
+
+
+ + +
+
+
+ +
+
+ + + +
Basic Rewards
+
+ +
+
CEC
+
+ {{ parseFloat((userInfo.point / 3).toFixed(2)) }} +
+
+
+
+
+
+ +
+
+ + + +
Rank Rewards
+
+ +
+
CEC
+
{{ cecRankShow }}
+
+
+
+
+ +
+
+
+ +
+
Total Rewards CEC
+
+ +
+
+
+ {{ + parseFloat( + parseFloat((userInfo.point / 3).toFixed(2)) + + Number(cecRankShow) + ).toFixed(2) + }} +
+
+
Claim
+
Claim time to be announced
+
+ +
+
+
+
+ Your Yoyo {{ userInfo.tickets }} +
+
Yoyo event coming soon
+
+
+ +
+
+
+
+
+ +
+
+ Gacha&Star rewards are not displayed on this page for the time + being, and will be announced after the snapshot. +
+
+
-
+ +
Rank {{ userInfo.rank ? userInfo.rank : "0" }}
- - +