diff --git a/dist.rar b/dist-pc.rar similarity index 71% rename from dist.rar rename to dist-pc.rar index 313a17f..38ffe03 100644 Binary files a/dist.rar and b/dist-pc.rar differ diff --git a/src/components/layout/navber.vue b/src/components/layout/navber.vue index a2d0ce0..48bffa9 100644 --- a/src/components/layout/navber.vue +++ b/src/components/layout/navber.vue @@ -43,6 +43,7 @@ import { ref, reactive, onMounted, computed, watchEffect } from "vue"; import { useChainStore } from "@/store/chain"; import { useAppStore } from "@/store/app"; import { useRouter, useRoute } from "vue-router"; +import { UserStatus } from "@/api/User"; import ChainModel from "@/components/home/ChainModel.vue"; import { useCopyToClipboard } from "./../../hooks/useCopyToClipboard"; import { hasMetamask } from "@/utils/chain.util"; @@ -64,6 +65,7 @@ const formatAddress = computed(() => { return accountId; }); async function login(event) { + var next = window.location.href; if (!hasMetamask()) { var url = `https://metamask.app.link/dapp/${next}`; @@ -75,6 +77,9 @@ async function login(event) { await chain.chainManager.login(); // console.log("logined:", chain.chainManager.isLogined); chain.logined = chain.chainManager.isLogined; + const resq = await UserStatus({ + account: AppModule.accountId,invite_code: route.query.code + }); emit("login-success"); } } diff --git a/src/components/task/TaskOne.vue b/src/components/task/TaskOne.vue index 6e52544..7c56b82 100644 --- a/src/components/task/TaskOne.vue +++ b/src/components/task/TaskOne.vue @@ -395,8 +395,13 @@ const updateLogin = async () => { currentTask.value = 2; }; const handTaskHome = () => { - router.push("/quest"); - console.log(router, "-=-=-"); + //router.push("/quest"); + const code = route.query.code; + if (code) { + router.push({ path: "/quest", query: { code: code } }); + } else { + router.push("/quest"); + } }; const formatAddress = (address) => { if (address.length >= 10) { diff --git a/src/components/task/TaskTwo.vue b/src/components/task/TaskTwo.vue index 7979877..aab96eb 100644 --- a/src/components/task/TaskTwo.vue +++ b/src/components/task/TaskTwo.vue @@ -306,8 +306,12 @@ const totalRegularPoints = computed(() => userInfo.regular.reduce((total, item) => total + item.point, 0) ); const handTaskHome = () => { - router.push("/quest"); - console.log(router, "-=-=-"); + const code = route.query.code; + if (code) { + router.push({ path: "/quest", query: { code: code } }); + } else { + router.push("/quest"); + } }; const handTaskOne = () => { const code = route.query.code; diff --git a/src/views/TaskView.vue b/src/views/TaskView.vue index 762980c..926c9db 100644 --- a/src/views/TaskView.vue +++ b/src/views/TaskView.vue @@ -79,7 +79,13 @@ const handTaskOne = () => { console.log(router, "-=-=-"); }; const handTaskTwo = () => { - router.push("/taskTwo"); + /// router.push("/taskTwo"); + const code = route.query.code; + if (code) { + router.push({ path: "/taskTwo", query: { code: code } }); + } else { + router.push("/taskTwo"); + } console.log(router, "-=-=-"); };