-
- {Array.from({ length: 20 }).map((v, i) => (
-
-
-
-
- ))}
-
-
-
-
-
-
- -
-
-
- -
-
-
-
-
- {issueRecords?.map((v, i) => (
-
-
-
-
- ))}
- {issueRecords?.length == 0 &&
-
- {receiveRecord?.map((v, i) => (
-
-
-
-
- ))}
- {receiveRecord?.length == 0 &&
-
-
- 
+ {
+ await getHomeData();
+ }}
+ renderText={(status) => {
+ return
{statusRecord[status]}
;
+ }}
+ disabled={!Token}
+ >
+
+
-
+
-
+
- {address ? (
-
+
-
+
+ )}
+
- {shortenString(address, 6, 4)}
- {
- const { connector } = getAccount(config);
- await disconnect(config, { connector });
- loginOut();
+ {address ? (
+
- ) : (
- <>
-
+
+ ) : (
+ <>
+
+ {shortenString(address, 6, 4)}
+ {
+ loginOut();
+ setUserData(undefined);
+ }}
+ name="tuichu"
+ className={classes.userinfo_top_right_wallet_disconnect}
+ color={"#fff"}
+ />
+
+
+ {userData && (
+ <>
+
+
+ {getLevelName(userData.level)}
+
+
+ )}
+ {
+ open();
}}
- name="tuichu"
- className={classes.userinfo_top_right_wallet_disconnect}
- color={"#fff"}
- />
-
-
- {userData && (
- <>
-
-
- {userData.level == 0 && (
- <>
-
-
- {
- navigate("/levelup");
- }}
- >
- {t("升级")}
-
-
- )}
- {
- open();
- }}
- >
- {t("链接钱包")}
-
-
- )}
+ >
+ {t("链接钱包")}
+ -
+
- + + {userData?.directPushNode || 0} + + + {t("Direct Node")} + + +
- + + {userData?.teamNode || 0} + + + {t("Team Node")} + + +
-
+
+ {userData?.revenueUsdt || 0}
+
USDT
+ + + {t("Push income")} + +
+
-
-
- - - {userData?.mintNumber || 0} - - {t("邀请铸造")} - -
- - - {userData?.presidentNumber || 0} - - {t("团队社长")} - -
- - - {userData?.airdropNumber || 0} - - {t("邀请空投")} - -
-
-
-
- setTabIndex(0)} - > - NFT - -
- setTabIndex(1)} - > - {t("收益")} - -
+
- {tokenName.toUpperCase() == "USDT" && 
}
-
- );
-}
diff --git a/src/pages/InvitationList.tsx b/src/pages/InvitationList.tsx
index afbe7a3..8689cee 100644
--- a/src/pages/InvitationList.tsx
+++ b/src/pages/InvitationList.tsx
@@ -1,54 +1,50 @@
/*
* @LastEditors: John
* @Date: 2024-06-19 11:03:01
- * @LastEditTime: 2024-06-25 18:17:18
+ * @LastEditTime: 2024-06-27 15:33:01
* @Author: John
*/
-import { api_preprelion_list } from "@/server/api";
-import { PreprelionListItem } from "@/server/module";
-import { getLevelName } from "@/utils";
-import { Empty } from "antd-mobile";
-import { useEffect, useState } from "react";
+import usePagination from "@/hook/usePagination";
+import { api_recommended_list } from "@/server/api";
+import { RecommendedListItem } from "@/server/module";
+import { Empty, InfiniteScroll } from "antd-mobile";
import DataTable, { TableColumn } from "react-data-table-component";
import { useTranslation } from "react-i18next";
export default function () {
const { t } = useTranslation();
- const [data, setData] = useState([]);
- const columns: TableColumn[] = [
+ const columns: TableColumn[] = [
{
name: t("地址"),
- selector: (row) => row.address,
- grow: 4,
+ selector: (row) => row.walletAddress,
+ grow: 9,
},
{
- name: t("级别"),
- grow: 4,
- cell(row, rowIndex, column, id) {
- return ({
+ service({ pageNum, pageSize }) {
+ return new Promise(async (reslove) => {
+ const { data } = await api_recommended_list().send({
+ queryParams: { pageNum, pageSize },
+ });
+ reslove(data?.data.records || []);
+ });
+ },
+ });
return (
<>
-
+ no more data
+
);
}
diff --git a/src/pages/LevelUp.module.css b/src/pages/LevelUp.module.css
deleted file mode 100644
index 139a96c..0000000
--- a/src/pages/LevelUp.module.css
+++ /dev/null
@@ -1,303 +0,0 @@
-.container {
- padding: 0 14px;
-}
-
-.LevelUp {
- padding-bottom: 32px;
- .content {
- margin-top: 16px;
- .content_box {
- display: flex;
- justify-content: space-between;
- align-items: center;
-
- .box_item {
- /* 自动布局子元素 */
- width: 153px;
- height: 90px;
- border-radius: 12px;
- opacity: 1;
-
- /* 自动布局 */
- display: flex;
- flex-direction: column;
- align-items: center;
- gap: 7px;
- padding: 26px 23px;
-
- background: #171719;
-
- box-shadow: 0px 4px 10px 0px rgba(138, 29, 19, 0.3),
- inset 0px 0px 6px 0px #8a1d13;
-
- z-index: 0;
-
- box-sizing: border-box;
- span {
- white-space: nowrap;
- &:nth-of-type(1) {
- /* 自动布局子元素 */
- opacity: 1;
-
- font-family: DM Sans;
- font-size: 10px;
- font-weight: 500;
- line-height: normal;
- letter-spacing: 0em;
-
- font-variation-settings: "opsz" auto;
- font-feature-settings: "kern" on;
- color: #4d4d4d;
-
- z-index: 0;
- }
- &:nth-of-type(2) {
- /* 自动布局子元素 */
- opacity: 1;
-
- font-family: DM Sans;
- font-size: 14px;
- font-weight: bold;
- line-height: normal;
- letter-spacing: 0em;
-
- font-variation-settings: "opsz" auto;
- font-feature-settings: "kern" on;
- color: #ffffff;
-
- z-index: 1;
- }
- }
- }
-
- .box_arrow {
- width: 24px;
- height: 24px;
- }
- }
-
- .content_price {
- display: flex;
- align-items: center;
- gap: 4px;
- margin-top: 16px;
- padding: 0 10px;
- span {
- &:nth-of-type(1) {
- /* 自动布局子元素 */
- opacity: 1;
-
- font-family: DM Sans;
- font-size: 10px;
- font-weight: 500;
- line-height: normal;
- letter-spacing: 0em;
-
- font-variation-settings: "opsz" auto;
- font-feature-settings: "kern" on;
- color: #ffffff;
-
- z-index: 0;
- }
- &:nth-of-type(2) {
- /* 自动布局子元素 */
- opacity: 1;
-
- font-family: DM Sans;
- font-size: 10px;
- font-weight: bold;
- line-height: normal;
- letter-spacing: 0em;
-
- font-variation-settings: "opsz" auto;
- font-feature-settings: "kern" on;
- color: #fc872b;
-
- z-index: 1;
- }
- }
- }
-
- .content_price_des {
- display: flex;
- flex-direction: column;
- gap: 4px;
- margin-top: 10px;
- padding: 0 10px;
- span {
- /* 自动布局子元素 */
- opacity: 1;
-
- font-family: DM Sans;
- font-size: 10px;
- font-weight: 500;
- line-height: normal;
- letter-spacing: 0em;
-
- font-variation-settings: "opsz" auto;
- font-feature-settings: "kern" on;
- color: #4d4d4d;
-
- z-index: 1;
- }
- }
-
- .content_btn {
- /* 自动布局子元素 */
- width: 331px;
- height: 40px;
- border-radius: 10px;
- opacity: 1;
-
- /* 自动布局 */
- display: flex;
- flex-direction: row;
- justify-content: center;
- align-items: center;
- padding: 11px 40px;
- gap: 10px;
-
- background: #fc872b;
-
- z-index: 3;
-
- box-sizing: border-box;
-
- margin: 0 auto;
-
- margin-top: 14px;
-
- span {
- /* 自动布局子元素 */
- opacity: 1;
-
- font-family: DM Sans;
- font-size: 14px;
- font-weight: 500;
- line-height: normal;
- text-align: center;
- letter-spacing: 0em;
-
- font-variation-settings: "opsz" auto;
- font-feature-settings: "kern" on;
- color: #ffffff;
-
- z-index: 0;
- }
-
- .icon {
- width: 16px;
- height: 16px;
- }
-
- &[disabled] {
- /* 自动布局子元素 */
- background: #666666;
- }
- }
- }
-
- .upgrade_conditions {
- margin-top: 26px;
- > span {
- /* 自动布局子元素 */
- opacity: 1;
-
- font-family: DM Sans;
- font-size: 14px;
- font-weight: bold;
- line-height: normal;
- letter-spacing: 0em;
-
- font-variation-settings: "opsz" auto;
- font-feature-settings: "kern" on;
- color: #ffffff;
-
- z-index: 0;
- }
- > ul {
- display: flex;
- flex-direction: column;
- gap: 14px;
-
- margin-top: 16px;
- > li {
- /* 自动布局子元素 */
- width: 344px;
- border-radius: 16px;
- opacity: 1;
-
- /* 自动布局 */
- display: flex;
- flex-direction: column;
- padding: 15px 10px;
-
- background: #171719;
-
- z-index: 0;
-
- gap: 10px;
- box-sizing: border-box;
- div {
- display: flex;
- align-items: center;
- gap: 6px;
- span {
- &:nth-of-type(1) {
- /* 自动布局子元素 */
- opacity: 1;
-
- font-family: DM Sans;
- font-size: 12px;
- font-weight: bold;
- line-height: normal;
- letter-spacing: 0em;
-
- font-variation-settings: "opsz" auto;
- color: #fc872b;
-
- z-index: 0;
- }
- &:nth-of-type(2) {
- /* 自动布局子元素 */
- opacity: 1;
-
- font-family: DM Sans;
- font-size: 12px;
- font-weight: 500;
- line-height: normal;
- letter-spacing: 0em;
-
- font-variation-settings: "opsz" auto;
- color: #ffffff;
-
- z-index: 1;
- }
- }
- }
-
- > ul {
- display: flex;
- flex-direction: column;
- gap: 4px;
- li {
- /* 自动布局子元素 */
- opacity: 1;
-
- font-family: DM Sans;
- font-size: 12px;
- font-weight: 500;
- line-height: normal;
- letter-spacing: 0em;
-
- font-variation-settings: "opsz" auto;
- font-feature-settings: "kern" on;
- color: #eaeaea;
-
- z-index: 0;
- }
- }
- }
- }
- }
-}
diff --git a/src/pages/LevelUp.tsx b/src/pages/LevelUp.tsx
deleted file mode 100644
index 98a2930..0000000
--- a/src/pages/LevelUp.tsx
+++ /dev/null
@@ -1,275 +0,0 @@
-import IconFont from "@/components/iconfont";
-import classes from "./LevelUp.module.css";
-import { cn, getLevelName } from "@/utils";
-import Button from "antd-mobile/es/components/button";
-import Space from "antd-mobile/es/components/space";
-import { PropsWithChildren, useEffect, useMemo, useRef, useState } from "react";
-import { useTranslation } from "react-i18next";
-import {
- api_get_user_upgrade_information,
- api_upgrade,
- api_users_cancel_orders,
-} from "@/server/api";
-import { UpgradeOrder, UserUpgradeInformation } from "@/server/module";
-import Toast, { ToastHandler } from "antd-mobile/es/components/toast";
-import {
- authorizedU,
- getApproveUsdt,
- getBalance,
- upGradeByContract,
-} from "@/contract/utils";
-import { toWei } from "web3-utils";
-import usePollingCheckBuyStatus from "@/hook/usePollingCheckBuyStatus";
-import { BaseError } from "wagmi";
-import { Dialog } from "antd-mobile";
-import { useNavigate } from "react-router-dom";
-export default function () {
- const { t } = useTranslation();
- const navigate = useNavigate();
- const [userUpgradeInfo, setUserUpgradeInfo] =
- useState();
- const [approveUsdt, setApproveUsdt] = useState(0n);
- const [balance, setBalance] = useState(0n);
- const approveLoadingToast = useRef();
- const approvePrice = useMemo(
- () => BigInt(toWei(userUpgradeInfo?.price || "0", "ether")),
- [userUpgradeInfo?.price]
- );
- const upgradeLoadingtoast = useRef();
- const orderInfo = useRef();
-
- const {
- transcationStatus,
- startPollingCheckBuyStatus,
- stopPollingCheckBuyStatus,
- } = usePollingCheckBuyStatus("NORMAL");
- useEffect(() => {
- updateUserUpgrdeInfo();
- return () => {};
- }, []);
-
- useEffect(() => {
- (async () => {
- if (userUpgradeInfo?.status != 1) return;
- Toast.show({ icon: "loading", content: t("正在获取已授权金额") });
- setBalance(await getBalance());
- setApproveUsdt(await getApproveUsdt());
- Toast.clear();
- })();
-
- return () => {};
- }, [userUpgradeInfo?.status]);
-
- useEffect(() => {
- console.log("approvePrice:", approvePrice);
-
- return () => {};
- }, [approvePrice]);
-
- useEffect(() => {
- if (transcationStatus == "success") {
- upgradeLoadingtoast.current?.close();
- stopPollingCheckBuyStatus();
- Dialog.alert({
- content: `${t("升级成功，返回首页查看")}`,
- confirmText: "OK",
- onConfirm() {
- navigate("/");
- },
- });
- }
-
- return () => {};
- }, [transcationStatus]);
-
- async function updateUserUpgrdeInfo() {
- const { data } = await api_get_user_upgrade_information().send({});
- // setUserUpgradeInfo({ ...data!.data, ...{ status: 1 } });
- setUserUpgradeInfo(data?.data);
- }
-
- return (
- <>
-
-
- );
-}
diff --git a/src/pages/Mint.module.css b/src/pages/Mint.module.css
index 55660bb..3f8b9e1 100644
--- a/src/pages/Mint.module.css
+++ b/src/pages/Mint.module.css
@@ -16,7 +16,6 @@
padding: 8px;
box-sizing: border-box;
- margin-top: 17px;
img {
width: 100%;
height: 100%;
@@ -42,7 +41,7 @@
/* 自动布局子元素 */
opacity: 1;
- font-family: DM Sans;
+ font-family: Space Grotesk;
font-size: 14px;
font-weight: 500;
line-height: normal;
@@ -59,7 +58,7 @@
/* 自动布局子元素 */
opacity: 1;
- font-family: DM Sans;
+ font-family: Space Grotesk;
font-size: 16px;
font-weight: bold;
line-height: normal;
@@ -81,12 +80,55 @@
gap: 6px;
padding: 0 7px;
+ margin-top: 20px;
span {
&:nth-of-type(1) {
/* 自动布局子元素 */
opacity: 1;
- font-family: DM Sans;
+ font-family: Space Grotesk;
+ font-size: 14px;
+ font-weight: 500;
+ line-height: normal;
+ letter-spacing: 0em;
+
+ font-variation-settings: "opsz" auto;
+ font-feature-settings: "kern" on;
+ color: #9e9e9e;
+
+ z-index: 0;
+ }
+
+ &:nth-of-type(2) {
+ /* 自动布局子元素 */
+ opacity: 1;
+
+ font-family: Space Grotesk;
+ font-size: 14px;
+ font-weight: 500;
+ line-height: normal;
+ letter-spacing: 0em;
+
+ font-variation-settings: "opsz" auto;
+ font-feature-settings: "kern" on;
+ color: #eaeaea;
+
+ z-index: 1;
+ }
+ }
+ }
+
+ .price {
+ display: flex;
+ align-items: center;
+ gap: 8px;
+
+ /* 自动布局子元素 */
+ > span {
+ &:nth-of-type(1) {
+ opacity: 1;
+
+ font-family: Space Grotesk;
font-size: 14px;
font-weight: 500;
line-height: normal;
@@ -103,15 +145,55 @@
/* 自动布局子元素 */
opacity: 1;
- font-family: DM Sans;
- font-size: 14px;
+ font-family: Space Grotesk;
+ font-size: 16px;
+ font-weight: bold;
+ line-height: normal;
+ letter-spacing: 0em;
+
+ font-variation-settings: "opsz" auto;
+ font-feature-settings: "kern" on;
+ color: #ffffff;
+
+ z-index: 1;
+ }
+ }
+ }
+
+ .cost_price {
+ /* 自动布局子元素 */
+ display: flex;
+ align-items: center;
+ gap: 8px;
+ margin-left: auto;
+
+ span {
+ &:nth-of-type(1) {
+ font-family: Space Grotesk;
+ font-size: 10px;
font-weight: 500;
line-height: normal;
letter-spacing: 0em;
font-variation-settings: "opsz" auto;
font-feature-settings: "kern" on;
- color: #eaeaea;
+ color: #ffffff;
+
+ z-index: 0;
+ }
+
+ &:nth-of-type(2) {
+ /* 自动布局子元素 */
+
+ font-family: Space Grotesk;
+ font-size: 10px;
+ font-weight: bold;
+ line-height: normal;
+ letter-spacing: 0em;
+
+ font-variation-settings: "opsz" auto;
+ font-feature-settings: "kern" on;
+ color: #ffffff;
z-index: 1;
}
@@ -120,7 +202,6 @@
.btn {
/* 自动布局子元素 */
- width: 331px;
height: 40px;
border-radius: 10px;
opacity: 1;
@@ -133,7 +214,7 @@
padding: 11px 40px;
gap: 10px;
- background: #fc872b;
+ background: #2dfcfc;
z-index: 3;
@@ -145,7 +226,7 @@
/* 自动布局子元素 */
opacity: 1;
- font-family: DM Sans;
+ font-family: Space Grotesk;
font-size: 14px;
font-weight: 500;
line-height: normal;
@@ -154,7 +235,7 @@
font-variation-settings: "opsz" auto;
font-feature-settings: "kern" on;
- color: #ffffff;
+ color: #101010;
z-index: 0;
}
diff --git a/src/pages/Mint.tsx b/src/pages/Mint.tsx
index e591a33..923f1f5 100644
--- a/src/pages/Mint.tsx
+++ b/src/pages/Mint.tsx
@@ -1,10 +1,10 @@
/*
* @LastEditors: John
* @Date: 2024-06-18 15:28:03
- * @LastEditTime: 2024-06-24 18:28:07
+ * @LastEditTime: 2024-06-27 14:35:27
* @Author: John
*/
-import { cn } from "@/utils";
+import { cn, filterAddressBeforeZero, filterAmountBeforeZero } from "@/utils";
import classes from "./Mint.module.css";
import nft_bg from "@/assets/nft_bg.svg";
import Button from "antd-mobile/es/components/button";
@@ -12,18 +12,24 @@ import Space from "antd-mobile/es/components/space";
import { useTranslation } from "react-i18next";
import { useEffect, useMemo, useRef, useState } from "react";
import {
+ api_get_homepage_user_data,
api_get_nft_configuration_data,
- api_nft_order,
+ api_node_order,
api_users_cancel_orders,
} from "@/server/api";
-import { NftConfigurationData, NftOrder } from "@/server/module";
+import {
+ NftConfigurationData,
+ NftOrder,
+ NodeOrder,
+ UserHomeData,
+} from "@/server/module";
import {
authorizedU,
getApproveUsdt,
getBalance,
payByContract,
} from "@/contract/utils";
-import { Dialog, Modal, Toast } from "antd-mobile";
+import { Dialog, Modal, Stepper, Toast } from "antd-mobile";
import useUserStore from "@/store/User";
import usePollingCheckBuyStatus from "@/hook/usePollingCheckBuyStatus";
import { ToastHandler } from "antd-mobile/es/components/toast";
@@ -33,24 +39,31 @@ import { toWei } from "web3-utils";
export default function () {
const { t } = useTranslation();
const { Token } = useUserStore();
- const [nftConfig, setNftConfig] = useState();
+ const [nodeConfig, setNodeConfig] = useState();
const [approveUsdt, setApproveUsdt] = useState(0n);
const [balance, setBalance] = useState(0n);
- const orderInfo = useRef();
+ const orderInfo = useRef();
const navigate = useNavigate();
+ const [num, setNum] = useState(1);
const buyLoadingToast = useRef();
const approveLoadingToast = useRef();
- const { buyNftIds, startPollingCheckBuyStatus, stopPollingCheckBuyStatus } =
- usePollingCheckBuyStatus("NFT");
+ const {
+ transcationStatus,
+ startPollingCheckBuyStatus,
+ stopPollingCheckBuyStatus,
+ } = usePollingCheckBuyStatus("NORMAL");
- const approvePrice = useMemo(
- () => BigInt(toWei(nftConfig?.nftPrice || "0", "ether")),
- [nftConfig?.nftPrice]
+ const costNum = useMemo(
+ () =>
+ BigInt(
+ toWei(`${parseFloat(`${nodeConfig?.nodePrice || "0"}`) * num}`, "ether")
+ ),
+ [nodeConfig?.nodePrice, num]
);
useEffect(() => {
- updateNftConfig();
+ updateNodeConfig();
return () => {};
}, []);
@@ -66,16 +79,18 @@ export default function () {
return () => {};
}, [Token]);
- async function updateNftConfig() {
- const { data } = await api_get_nft_configuration_data().send({});
- setNftConfig(data?.data);
+ async function updateNodeConfig() {
+ const { data } = await api_get_homepage_user_data().send({});
+ setNodeConfig(data?.data);
}
useEffect(() => {
- if (buyNftIds) {
+ if (transcationStatus == "success") {
buyLoadingToast.current?.close();
stopPollingCheckBuyStatus();
Dialog.alert({
- content: `${t("MINT成功，返回首页查看")}`,
+ content: `${t(
+ "Buy successful. Please return to the homepage to view."
+ )}`,
confirmText: "OK",
onConfirm() {
navigate("/");
@@ -84,7 +99,7 @@ export default function () {
}
return () => {};
- }, [buyNftIds]);
+ }, [transcationStatus]);
useEffect(() => {
return () => {};
@@ -93,48 +108,41 @@ export default function () {
return (
<>
-
+
- setTabIndex(0)} + > + NODE + +
- {tabIndex == 0 && (
- <>
- {address ? (
- <>
- {userData?.nftId ? (
-
+
);
}
-
-function ReceiveCom({
- tokenName,
- tokenNum,
- toReceive,
- onAssetRec,
- onReceive,
-}: {
- tokenName: string;
- tokenNum: number;
- toReceive: number;
- onAssetRec: () => void;
- onReceive: () => void;
-}) {
- const { t } = useTranslation();
- return (
-
-
-
- # {userData?.nftId}
-
+ {tabIndex == 0 && (
+ <>
+ {address ? (
+ <>
+ {userData?.nodeNumber && userData?.nodeNumber > 0 ? (
+ 
-
- {t("Min结束后按照规则进行空投。")}
+ )}
+
+ ) : (
+ <>
+
+
+
+
+
+ {t("Start mining after node subscription ends.")}
+
+
+ ) : (
+
+ You own {userData.nodeNumber} nodes
+ {
+ navigate("/mint");
+ }}
+ >
+ {t("Buy Node")}
+
+
+
- {
navigate("/mint");
}}
>
- {t("铸造 NFT")}
+ {t("Buy Node")}
+ {t("Buy Edge AI Node.")}
+
+ {t(
+ "The wallet is not linked and cannot show you the Node."
+ )}
- ) : (
-
-
+ )}
+
+ )}
+
+
+
-
+ {t("邀请")}
+ {address && (
+ {
+ navigate("/invitationlist");
+ }}
+ >
+ {t("邀请列表")}{" "}
+
+
+
+ {t("邀请链接")}
+
+ className={classes.invite_content_icon}
+ name="fuzhi"
+ color={"#fff"}
+ />{" "}
+
+ ) : (
+ <>
+
+ {t("Buy Edge AI Node to get invitation link")}
+
+
)}
) : (
<>
-
+ {address ? (
+ <>
+ {userData?.nodeNumber && userData?.nodeNumber > 0 ? (
+ <>
+ {shortenString(userInviteLink, 15, 15)}
+ {
- navigate("/mint");
+ copyText(userInviteLink);
}}
- >
- {t("铸造 NFT")}
-
- {t("铸造 NFT 获得代币空投")}
-
- {t("钱包未链接，无法向您显示 NFT")}
-
+ {t("Link wallet to get invitation link")}
)}
-
- )}
- {tabIndex == 1 && (
-
-
- )}
-
- {t("总收益= 已领取 + 待领取")}
-
-
- -
- {userData?.userIncomes.map((v, i) => (
-
-
-
-
- {t("邀请")}
- {address && (
- {
- navigate("/invitationlist");
- }}
- >
- {t("邀请列表")}{" "}
-
-
-
- {t("邀请链接")}
-
- {address ? (
- <>
- {userData?.nftId ? (
- <>
- {shortenString(userInviteLink, 15, 15)}
- {
- copyText(userInviteLink);
- }}
- className={classes.invite_content_icon}
- name="fuzhi"
- color={"#fff"}
- />{" "}
-
- ) : (
- <>
- {t("MINT Nft 获取邀请链接")}
-
- )}
-
- ) : (
- <>
- {t("链接钱包获取邀请链接")}
-
- )}
-
-
- {t(
- "普通会员每邀请铸造一个NFT可获得一份空投福利；推荐铸造20个NFT的可升级为会长；团队中拥有20位会长可升级为基金会社长；邀请越多级别越高福利越多。"
- )}
-
- {t("数据披露")}
-
- -
-
- - {t("资金池")} - {userData?.pools || 0} - -
- - {t("社长席位")} - {userData?.president || 0} - -
- - {t("基金会社长席位")} - {userData?.foundation || 0} - -
-
- {tokenName}
-
-
- {tokenNum}
-
- {
- onAssetRec();
- }}
- >
- {t("收益记录")}{" "}
-
-
-
-
-
- {t("待领取")}
- {tokenNum + toReceive}
-
-
- {getLevelName(row.level)}
;
- },
- },
- {
- name: t("直推NFT"),
- selector: (row) => row.mintNumber,
+ name: "Node",
+ selector: (row) => row.nodeNumber,
+ grow: 1,
// @ts-ignore
right: "true",
- grow: 2,
},
];
- useEffect(() => {
- (async () => {
- const { data } = await api_preprelion_list().send({});
- setData(data?.data || []);
- })();
-
- return () => {};
- }, []);
+ const { list, hasMore, loadMore } = usePagination
-
-
- );
-}
-
-function ConItem({
- memberName,
- limitText,
- conList,
-}: PropsWithChildren<{
- memberName: string;
- limitText: string;
- conList: string[];
-}>) {
- return (
-
-
-
-
-
-
-
- {t("当前级别")}
- {getLevelName(userUpgradeInfo?.level || 0)}
-
-
- {t("提升级别")}
- {userUpgradeInfo?.level == 1 ? t("社长") : t("无")}
-
-
- {t("当前升级价格：")}
- {userUpgradeInfo?.price || 0} USDT
-
-
-
- {t("价格说明：")}
-
- {t(
- "升级费用xxx USDT起，其中gas费2USDT，剩余部分50%进入资金池，另外50%平均分给所有升级成功的社长和基金会社长。自第二个社长升级开始，每升级一名社长所需铸造费用增加xxx，既第二位社长升级铸造费用为xxxu+xxx*xxx=xxx USDT，以此类推。",
- {
- value1: userUpgradeInfo?.upgradeFees || 0,
- value2: userUpgradeInfo?.proportion || "0%",
- value3:
- parseFloat(userUpgradeInfo?.upgradeFees || "0") +
- (parseFloat(userUpgradeInfo?.upgradeFees || "0") *
- parseFloat(
- (userUpgradeInfo?.proportion || "0%").replace("%", "")
- )) /
- 100,
- }
- )}
-
-
-
-
-
- {t("升级条件")}
-
- -
-
- {memberName}
- {limitText}
-
- -
- {conList.map((v, i) => (
-
- {v} - ))} -
+
-
+
+ Introduction to the node Introduction to the node Inion to the node
+ Introduction to the node Introduction to the node Introduction to
+ the node Introduction to the node Introduction to the node
+ Introduction to the node Introduction to the node Introduction to
+ the node Introduction to the node Introduction to the node
+ Introduction to the node
+
+
-
-
- - {t("NFT总量：")} - {nftConfig?.nftCount || 0} - +
- - {t("MINT余量：")} - {nftConfig?.nftRemainder || 0} - +
- - {t("当前MINT价格：")} - {nftConfig?.nftPrice || 0} USDT - -
+ Price:
+ {nodeConfig?.nodePrice} USDT
+
-
- {t("价格说明：")}
+
- {approveUsdt > 0n && MINT}
+ {approveUsdt > 0n && Buy}
{approveUsdt === 0n && {t("授权USDT")}}
diff --git a/src/server/api.ts b/src/server/api.ts
index 76cdfaa..95576ce 100644
--- a/src/server/api.ts
+++ b/src/server/api.ts
@@ -1,7 +1,7 @@
/*
* @LastEditors: John
* @Date: 2024-06-18 10:28:21
- * @LastEditTime: 2024-06-25 14:47:34
+ * @LastEditTime: 2024-06-27 09:52:45
* @Author: John
*/
import { GET, POST } from "./client";
@@ -11,7 +11,9 @@ import {
IncomeRecordType,
NftConfigurationData,
NftOrder,
+ NodeOrder,
PreprelionListItem,
+ RecommendedList,
UpgradeOrder,
UserHomeData,
UserIncome,
@@ -20,7 +22,7 @@ import {
// 检查账号是否注册
export function api_check_account_registration() {
- return GET<{ account: string }, { exist: boolean }>({
+ return GET<{ account: string; chainType: 2 }, { exist: boolean }>({
url: "/api/account/exist",
requiresToken: false,
});
@@ -69,9 +71,7 @@ export function api_get_wallet_signature_string() {
// 获取首页用户数据
export function api_get_homepage_user_data() {
return GET({
- url: "/api/common/getUserData",
- requiresToken: false,
- requiresAddress: false,
+ url: "/api/user-node/getHomeData",
});
}
@@ -106,8 +106,8 @@ export function api_pagling_query_income_record() {
}
// NFT下单
-export function api_nft_order() {
- return POST({ url: "/api/nft/payNft" });
+export function api_node_order() {
+ return POST<{ number: number }, NodeOrder>({ url: "/api/user-node/payNode" });
}
// 用户取消订单告诉我
@@ -115,9 +115,11 @@ export function api_users_cancel_orders() {
return POST({ url: "/api/nft/cancel" });
}
-// 直推列表
-export function api_preprelion_list() {
- return GET({ url: "/api/user/getDirectPushList" });
+// 推荐列表
+export function api_recommended_list() {
+ return GET<{ pageNum: number; pageSize: number }, RecommendedList>({
+ url: "/api/user-node/recommendedLists",
+ });
}
// 升级
@@ -145,3 +147,10 @@ export function api_query_whether_the_user_is_binding_relationship() {
url: "/api/account/bindOrNot",
});
}
+
+// 查询用户邀请码
+export function api_query_user_invitation_code() {
+ return GET({
+ url: "/api/invite/invitationCode",
+ });
+}
diff --git a/src/server/module.d.ts b/src/server/module.d.ts
index 56317fa..27425c6 100644
--- a/src/server/module.d.ts
+++ b/src/server/module.d.ts
@@ -5,21 +5,16 @@ export type BASE_RESPONSE = {
timeMillis: number;
}; // What's returned from request
-export type Level = 0 | 1 | 2 | 3; // 0=无等级 1=会员 2=社长 3=基金会
+export type Level = 0 | 1 | 2 | 3 | 4; // 0=无等级 1=区代理 2=市代理 3=省代理 4=超级节点
export interface UserHomeData {
address: string;
- airdropNumber: number;
- foundation: number;
- invitationCode: string;
+ directPushNode: number;
level: Level;
- mintNumber: number;
- nftId: number;
- pools: string;
- president: number;
- presidentNumber: number;
+ nodeNumber: number;
+ nodePrice: string;
+ revenueUsdt: string;
+ teamNode: number;
userImg: string;
- userIncomes: UserIncome[];
- active: 0 | 1; // "0=非活跃 1=活跃用户"
}
export interface UserIncome {
coinId: number;
@@ -137,3 +132,52 @@ export interface ClaimIncome {
orderNumber: string;
time: number;
}
+
+export interface RecommendedList {
+ countId: string;
+ current: number;
+ maxLimit: string;
+ optimizeCountSql: boolean;
+ orders: Order[];
+ pages: number;
+ records: RecommendedListItem[];
+ searchCount: boolean;
+ size: number;
+ total: number;
+}
+export interface RecommendedListItem {
+ walletAddress: string;
+ nodeNumber: number;
+ promotionUsdt: string;
+ nodeCount: number;
+}
+
+export interface NodeOrder {
+ time: number;
+ addressFour: string;
+ addressOne: string;
+ addressThree: string;
+ addressTwo: string;
+ awardFour: string;
+ awardOne: string;
+ awardThree: string;
+ awardTwo: string;
+ buyAmount: string;
+ collectionAddress: string;
+ collectionAmount: string;
+ createBy: string;
+ createTime: number;
+ dataJson: string;
+ hash: string;
+ id: number;
+ illustrate: string;
+ nodeNumber: number;
+ nodeSettingId: number;
+ orderNumber: string;
+ payCoin: string;
+ status: number;
+ updateBy: string;
+ updateTime: string;
+ userId: number;
+ walletAddress: string;
+}
diff --git a/src/style/ant-cover-m.css b/src/style/ant-cover-m.css
index 03be39d..fa8a2f0 100644
--- a/src/style/ant-cover-m.css
+++ b/src/style/ant-cover-m.css
@@ -3,13 +3,13 @@
border-bottom: 0.25px solid #333333;
.adm-tabs-tab-line {
- background-color: #fc872b;
+ background-color: #2dfcfc;
}
.adm-tabs-tab {
opacity: 1;
- font-family: DM Sans;
+ font-family: Space Grotesk;
font-size: 14px;
font-weight: 500;
line-height: normal;
@@ -51,7 +51,7 @@
opacity: 1;
box-sizing: border-box;
- border: 1px solid #fc872b;
+ border: 1px solid #2dfcfc;
z-index: 1;
background-color: transparent;
@@ -59,7 +59,7 @@
/* 自动布局子元素 */
opacity: 1;
- font-family: DM Sans;
+ font-family: Space Grotesk;
font-size: 10px;
font-weight: 500;
line-height: 25px;
@@ -80,14 +80,14 @@
border-radius: 8px;
opacity: 1;
- background: #fc872b;
+ background: #2dfcfc;
z-index: 0;
/* 自动布局子元素 */
opacity: 1;
- font-family: DM Sans;
+ font-family: Space Grotesk;
font-size: 10px;
font-weight: 500;
line-height: 25px;
@@ -111,7 +111,7 @@
.adm-picker-header-title {
opacity: 1;
- font-family: DM Sans;
+ font-family: Space Grotesk;
font-size: 17px;
font-weight: bold;
line-height: 24px;
@@ -124,7 +124,7 @@
.adm-picker-header-button {
opacity: 1;
- font-family: DM Sans;
+ font-family: Space Grotesk;
font-size: 17px;
font-weight: 500;
line-height: 24px;
@@ -147,7 +147,7 @@
.adm-picker-view-column-item {
/* height: 34px; */
.adm-picker-view-column-item-label {
- /* font-family: DM Sans;
+ /* font-family: Space Grotesk;
font-size: 16px;
font-weight: 500;
line-height: 34px;
@@ -192,7 +192,7 @@
/* background: rgba(252, 135, 43, 0.5) !important; */
box-sizing: border-box !important;
- border: 1px solid #fc872b !important;
+ border: 1px solid #2dfcfc !important;
/* backdrop-filter: blur(10px); */
@@ -200,7 +200,7 @@
/* 自动布局子元素 */
opacity: 1;
- font-family: DM Sans;
+ font-family: Space Grotesk;
font-size: 14px;
font-weight: 500;
line-height: normal;
@@ -240,7 +240,7 @@
/* 自动布局子元素 */
opacity: 1;
- font-family: DM Sans;
+ font-family: Space Grotesk;
font-size: 14px;
font-weight: normal;
line-height: normal;
@@ -256,3 +256,104 @@
}
}
}
+
+/* adm-stepper */
+.adm-stepper {
+ width: calc(100%) !important;
+ height: 42px;
+ border-radius: 5px !important;
+ opacity: 1;
+ background: rgba(37, 33, 39, 0.2);
+ box-sizing: border-box !important;
+ border: 1px solid #2dfcfc !important;
+ .adm-button {
+ width: 42px;
+ height: 42px;
+ border-radius: 5px;
+ opacity: 1;
+
+ background: #2dfcfc;
+
+ svg {
+ width: 23px;
+ height: 23px;
+ }
+ }
+
+ .adm-stepper-middle {
+ .adm-stepper-input {
+ height: 44px;
+ background-color: transparent;
+
+ .adm-input-element {
+ opacity: 1;
+
+ font-family: Space Grotesk;
+ font-size: 22px;
+ font-weight: bold;
+ line-height: normal;
+ letter-spacing: 0em;
+
+ font-variation-settings: "opsz" auto;
+ font-feature-settings: "kern" on;
+ color: #ffffff;
+ }
+ }
+ }
+}
+
+.adm-dialog {
+ .adm-center-popup-body {
+ box-sizing: border-box !important;
+ border: 1px solid #2dfcfc !important;
+ border-radius: 10px !important;
+ background-color: transparent !important;
+ backdrop-filter: blur(10px);
+ .adm-dialog-content {
+ .adm-auto-center-content {
+ opacity: 1;
+
+ font-family: Space Grotesk;
+ font-size: 14px;
+ font-weight: 500;
+ line-height: normal;
+ letter-spacing: 0px;
+
+ font-variation-settings: "opsz" auto;
+ color: #ffffff;
+
+ z-index: 0;
+ }
+ }
+
+ .adm-dialog-footer {
+ .adm-dialog-action-row {
+ border-top: 1px solid #2dfcfc !important;
+
+ .adm-dialog-button {
+ span {
+ color: #2dfcfc;
+ }
+ }
+ }
+ }
+ }
+}
+
+/* adm-pull-to-refresh */
+.adm-pull-to-refresh {
+ .adm-pull-to-refresh-head-content {
+ /* 自动布局子元素 */
+ font-family: Space Grotesk;
+ font-size: 14px;
+ font-weight: 500;
+ line-height: normal;
+ letter-spacing: 0em;
+
+ font-variation-settings: "opsz" auto;
+ font-feature-settings: "kern" on;
+ color: #9e9e9e;
+
+ z-index: 0;
+ }
+}
diff --git a/src/style/react-data-table-component-cover-m.css b/src/style/react-data-table-component-cover-m.css
index 9054f4a..c3281b5 100644
--- a/src/style/react-data-table-component-cover-m.css
+++ b/src/style/react-data-table-component-cover-m.css
@@ -16,7 +16,7 @@
div {
opacity: 1;
- font-family: DM Sans;
+ font-family: Space Grotesk;
font-size: 12px;
font-weight: 500;
line-height: normal;
@@ -41,7 +41,7 @@
div {
opacity: 1;
- font-family: DM Sans;
+ font-family: Space Grotesk;
font-size: 14px;
font-weight: bold;
line-height: normal;
diff --git a/src/utils/index.ts b/src/utils/index.ts
index f72c18e..e74f9a9 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -1,7 +1,7 @@
/*
* @LastEditors: John
* @Date: 2024-06-17 18:19:27
- * @LastEditTime: 2024-06-25 15:29:51
+ * @LastEditTime: 2024-06-27 11:40:59
* @Author: John
*/
import { type ClassValue, clsx } from "clsx";
@@ -87,14 +87,37 @@ export function cn(...inputs: ClassValue[]) {
export function getLevelName(level: Level) {
switch (level) {
case 0:
- return i18next.t("普通非活跃");
+ return "No Node";
case 1:
- return i18next.t("普通活跃");
+ return "Regional agent";
case 2:
- return i18next.t("社长");
+ return "Municipal agent";
case 3:
- return i18next.t("基金会社长");
+ return "Provincial agent";
+ case 4:
+ return "Super Node";
default:
break;
}
}
+
+export function filterAddressBeforeZero(arr: string[]) {
+ let result = [];
+ for (let i = 0; i < arr.length; i++) {
+ if (arr[i] === "0") {
+ break;
+ }
+ result.push(arr[i]);
+ }
+ return result;
+}
+export function filterAmountBeforeZero(arr: bigint[]) {
+ let result = [];
+ for (let i = 0; i < arr.length; i++) {
+ if (arr[i] === 0n) {
+ break;
+ }
+ result.push(arr[i]);
+ }
+ return result;
+}
diff --git a/src/utils/wallet.ts b/src/utils/wallet.ts
index 1e2910f..91807a5 100644
--- a/src/utils/wallet.ts
+++ b/src/utils/wallet.ts
@@ -1,7 +1,7 @@
/*
* @LastEditors: John
* @Date: 2024-06-19 15:55:07
- * @LastEditTime: 2024-06-25 14:47:58
+ * @LastEditTime: 2024-06-27 15:09:45
* @Author: John
*/
import { config } from "@/components/WalletProvider";
@@ -89,7 +89,7 @@ export async function signAndLogin(address?: `0x${string}`): Promise {
});
const { data: isExitData } = await api_check_account_registration().send({
- queryParams: { account: address },
+ queryParams: { account: address, chainType: 2 },
});
if (isExitData?.data?.exist) {
// 登录
@@ -106,8 +106,6 @@ export async function signAndLogin(address?: `0x${string}`): Promise {
});
} catch (error) {
// 用户拒绝签名或者遇到错误，断开链接
- const { connector } = getAccount(config);
- await disconnect(config, { connector });
loadingToast.close();
loginOut();
throw new Error("用户拒绝签名或者遇到错误，断开链接");
@@ -128,32 +126,24 @@ export async function signAndLogin(address?: `0x${string}`): Promise {
return { ...state, Token: loginInfoData.data?.token };
});
- // TODO 判断用户是否绑定关系✔
- const { data } =
- await api_query_whether_the_user_is_binding_relationship().send({});
- if (
- typeof data?.data.result == "boolean" &&
- data?.data.result === false
- ) {
- const inviteCode = getUrlQueryParam(UrlQueryParamsKey.INVITE_CODE);
- if (inviteCode) {
- const { data } = await api_binding_invitation_relationship().send({
- data: {
- shareCode: inviteCode,
- },
- });
- }
- }
reslove();
loadingToast.close();
}
} else {
+ const inviteCode = getUrlQueryParam(UrlQueryParamsKey.INVITE_CODE);
+ if (!inviteCode) {
+ Toast.show({
+ icon: "fail",
+ content: i18next.t("invalid invitation link"),
+ });
+ return loginOut();
+ }
// 注册
await api_signUp().send({
data: {
account: address,
publicKey,
- shareCode: "",
+ shareCode: inviteCode,
chainType: 2,
},
});
@@ -164,7 +154,9 @@ export async function signAndLogin(address?: `0x${string}`): Promise {
});
}
-export function loginOut() {
+export async function loginOut() {
+ const { connector } = getAccount(config);
+ await disconnect(config, { connector });
useUserStore.setState((state) => {
return { ...state, Address: "", Token: "" };
});
diff --git a/vite.config.ts b/vite.config.ts
index 7acc4e3..55e06ef 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -1,7 +1,7 @@
/*
* @LastEditors: John
* @Date: 2024-06-17 17:20:03
- * @LastEditTime: 2024-06-24 10:08:56
+ * @LastEditTime: 2024-06-26 17:50:12
* @Author: John
*/
import { defineConfig } from "vite";
@@ -16,7 +16,7 @@ export default defineConfig({
host: "192.168.10.167",
proxy: {
"/dev": {
- target: "http://192.168.10.106:8100",
+ target: "http://192.168.10.106:8102",
changeOrigin: true,
rewrite: (path) => path.replace(/^\/dev/, ""),
},
+ Cost:
- {t(
- "{{value1}} USDT起，每增加 {{value2}} 名普通会员，NFT价格上涨 {{value3}}，既：前 {{value2}} 名价格为 {{value1}} USDT/枚，value4 名价格为{{value1}}u+{{value1}}u*{{value3}}={{value5}} USDT/枚，以此类推。",
- {
- value1: nftConfig?.initialPrice || 0,
- value2: nftConfig?.floatingQuantity || 0,
- value3: nftConfig?.kamibutsu || "0%",
- value4: `${
- parseInt(nftConfig?.floatingQuantity || "0") + 1
- } - ${parseInt(nftConfig?.floatingQuantity || "0") * 2}`,
- value5:
- parseFloat(nftConfig?.initialPrice || "0") +
- (parseFloat(nftConfig?.initialPrice || "0") *
- parseFloat(
- (nftConfig?.kamibutsu || "0%").replace("%", "")
- )) /
- 100,
- }
- )}
+ {parseFloat(`${nodeConfig?.nodePrice || "0"}`) * num} USDT
@@ -154,7 +162,7 @@ export default function () {
duration: 0,
content: t("正在授权USDT"),
});
- authorizedU(approvePrice)
+ authorizedU(costNum)
.then(async () => {
setApproveUsdt(await getApproveUsdt());
approveLoadingToast.current?.close();
@@ -173,18 +181,46 @@ export default function () {
content: t("购买中"),
maskClickable: false,
});
- const { data: orderRes } = await api_nft_order().send({});
+ const { data: orderRes } = await api_node_order().send({
+ data: {
+ number: num,
+ },
+ });
orderInfo.current = orderRes?.data;
if (!orderInfo.current?.orderNumber) return;
- const buyAmount = BigInt(orderInfo.current?.buyAmount || "");
+ const {
+ collectionAddress,
+ collectionAmount,
+ addressOne,
+ addressTwo,
+ addressThree,
+ addressFour,
+ awardOne,
+ awardTwo,
+ awardThree,
+ awardFour,
+ } = orderInfo.current;
payByContract(
- buyAmount,
- orderInfo.current?.orderNumber,
- orderInfo.current.payInduction
+ filterAddressBeforeZero([
+ collectionAddress,
+ addressOne,
+ addressTwo,
+ addressThree,
+ addressFour,
+ ]),
+ filterAmountBeforeZero([
+ BigInt(toWei(`${collectionAmount}`, "ether")),
+ BigInt(toWei(`${awardOne}`, "ether")),
+ BigInt(toWei(`${awardTwo}`, "ether")),
+ BigInt(toWei(`${awardThree}`, "ether")),
+ BigInt(toWei(`${awardFour}`, "ether")),
+ ]),
+ orderInfo.current.orderNumber,
+ orderInfo.current.time
)
.then((hash) => {
console.log("购买成功！hash:", hash);
- updateNftConfig();
+ updateNodeConfig();
startPollingCheckBuyStatus(hash);
})
.catch(async (err: BaseError) => {
@@ -194,14 +230,14 @@ export default function () {
icon: "fail",
});
// 取消购买
- await api_users_cancel_orders().send({
- queryParams: { orderId: orderInfo.current?.id! },
- });
+ // await api_users_cancel_orders().send({
+ // queryParams: { orderId: orderInfo.current?.id! },
+ // });
});
}}
>