diff --git a/.env.dev b/.env.dev index afca40a..ba8d61e 100644 --- a/.env.dev +++ b/.env.dev @@ -1,7 +1,7 @@ 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://game2006api.cebggame.com/' +VUE_APP_GPAL_API='https://game2006sapi.cebggame.com/' # VUE_APP_PASSPORT_PUBLISHABLE_KEY=pk_imapik-test-8c2FAlWxWAoRITk1v9rH VUE_APP_PASSPORT_PUBLISHABLE_KEY=pk_imapik-test-eRr-kyOKaZ0jIdrvrPCn VUE_APP_PASSPORT_REDIRECT_URI=http://localhost:4000 @@ -9,7 +9,7 @@ VUE_APP_PASSPORT_LOGOUT_URI=http://localhost:4000 # VUE_APP_PASSPORT_CLIENT_ID=eTmUah69p7ZdRhRYzBta6lZRKXXeXDYj VUE_APP_PASSPORT_CLIENT_ID=0FNfXxQywm7wjdbyLTDzWt4txc53yRrT VUE_APP_PASSPORT_MARKET_ADDRESS=0x7d117aA8BD6D31c4fa91722f246388f38ab1942c -VUE_APP_UAW_API='https://oauth-svr.cebggame.com' +VUE_APP_UAW_API='https://oauth-svr.cebggame.com/task' VUE_APP_MKT_API='https://market-test.kingsome.cn' VUE_APP_NET_ID='13473' VUE_APP_MARKET_CURRENCY='0xFd42bfb03212dA7e1A4608a44d7658641D99CF34' diff --git a/.env.development b/.env.development index 230bb17..84e3b97 100644 --- a/.env.development +++ b/.env.development @@ -1,7 +1,7 @@ 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://game2006api.cebggame.com/' +VUE_APP_GPAL_API='https://game2006sapi.cebggame.com/' # VUE_APP_PASSPORT_PUBLISHABLE_KEY=pk_imapik-test-8c2FAlWxWAoRITk1v9rH VUE_APP_PASSPORT_PUBLISHABLE_KEY=pk_imapik-test-eRr-kyOKaZ0jIdrvrPCn VUE_APP_PASSPORT_REDIRECT_URI=https://market.kingsome.cn @@ -9,7 +9,7 @@ VUE_APP_PASSPORT_LOGOUT_URI=https://market.kingsome.cn # VUE_APP_PASSPORT_CLIENT_ID=eTmUah69p7ZdRhRYzBta6lZRKXXeXDYj VUE_APP_PASSPORT_CLIENT_ID=0FNfXxQywm7wjdbyLTDzWt4txc53yRrT VUE_APP_PASSPORT_MARKET_ADDRESS=0x7d117aA8BD6D31c4fa91722f246388f38ab1942c -VUE_APP_UAW_API='https://oauth-svr.cebggame.com' +VUE_APP_UAW_API='https://oauth-svr.cebggame.com/task' VUE_APP_MKT_API='https://market-test.kingsome.cn' VUE_APP_NET_ID='13473' VUE_APP_MARKET_CURRENCY='0xFd42bfb03212dA7e1A4608a44d7658641D99CF34' diff --git a/package.json b/package.json index d32cd7a..923758d 100644 --- a/package.json +++ b/package.json @@ -4,6 +4,7 @@ "version": "0.0.0", "scripts": { "task": "vite --host --mode dev", + "test": "vite --host --mode test", "dev": "vite --host --mode development", "prod": "vite --host --mode production", "build:task": "vite build --mode dev", diff --git a/src/components/Dialogs/sellDialog.vue b/src/components/Dialogs/sellDialog.vue index 28b1a2b..3400d1f 100644 --- a/src/components/Dialogs/sellDialog.vue +++ b/src/components/Dialogs/sellDialog.vue @@ -300,10 +300,12 @@ onMounted(() => { height: 30px; top: 20px; left: 20px; + font-size: 18px; } .img-btm { bottom: 30px; left: 30px; + font-size: 18px; >div { width: 120px; height: 40px; diff --git a/src/components/assets/activity.vue b/src/components/assets/activity.vue index e99ae97..80957d1 100644 --- a/src/components/assets/activity.vue +++ b/src/components/assets/activity.vue @@ -139,9 +139,9 @@ const getMyAssets = async () => { reqData.value.cursor = next_cursor.value.next_cursor // let res = await apiLockState(myADdress, reqData.value) let res = await apiActivity(data, myADdress) - console.log(res,'--------------------------------') - return - // nftList.value = [...nftList.value, ...res.rows] + // console.log(res,'--------------------------------') + // return + nftList.value = [...nftList.value, ...res.rows] // nftListBox = nftList.value.reduce((acc, obj) => { // const existingObj = acc.find(item => item.token_id == obj.token_id) // if(!existingObj) { diff --git a/src/components/assets/assetsHeader.vue b/src/components/assets/assetsHeader.vue index 3a99df1..26eb550 100644 --- a/src/components/assets/assetsHeader.vue +++ b/src/components/assets/assetsHeader.vue @@ -10,7 +10,7 @@

Total Contribution Credits:  {{ contributionPointTotal }}

- +

Daily Expected:   +{{ contributionPoint }}/d

@@ -42,17 +42,59 @@

CEC: - {{ priceCalculated(BigInt(cecInfo?.total),18) }} + {{ priceCalculated(BigInt(cecInfo?.total),18).toString().match(/^\d+(?:\.\d{0,2})?/)[0] }} 0

- Collection - Collection +
-
- -
CEC Incentives Record
+
+ +
Staking Contribution Credits Record
+
+ +
+
+
+ +
  • + Date +
  • +
  • + Reward +
  • +
    +
    +
    +
    + +
    +

    No Data

    +
    +
    + +
  • + {{ timeFormat(item.date*1000) }} +
  • +
  • + + {{item.contribution_point.match(/^\d+(?:\.\d{0,.})?/)[0]}} + +
  • +
    +
    +
    +
    +
    +
    + +
    CEC Allocation Record
    @@ -74,13 +116,14 @@ Hill's Treasure Hunt Wheel of Fortune P2E Season 1 + {{ item.desc }}
  • {{ item.earnTime }}
  • - {{ priceCalculated(BigInt(item.amount),18) }} - + {{ priceCalculated(BigInt(item.amount),18).toString().match(/^\d+(?:\.\d{0,2})?/)[0] }} +
  • @@ -266,8 +309,8 @@ import { ref, watch, computed, onMounted } from "vue" import ConfirmDialog from "@/components/Dialogs/confirmDialog.vue"; import {createModal} from "@/utils/model.util"; -import { apiCecInfo, apiExpected, apiUserData } from "@/utils/marketplace" -import { priceCalculated } from "@/configs/priceCalculate" +import { apiCecInfo, apiExpected, apiUserData, apiContribution } from "@/utils/marketplace" +import { priceCalculated, timeFormat } from "@/configs/priceCalculate" import { useMarketplaceStore } from "@/store/marketplace" import {walletStore} from "@/store/wallet"; @@ -338,6 +381,20 @@ const getCecInfo = async () => { } } +const conLogDialogVisible = ref(false) +const contributionList = ref() +const getContribution = async () => { + let address = localWalletStore.address + if(address) { + const {Rows, errcode} = await apiContribution(address) + if(errcode == 0) { + contributionList.value = Rows + } + } else { + return + } +} + const contributionPoint = ref(0) const getExpected = async () => { let address = localWalletStore.address @@ -367,6 +424,7 @@ const getUserData = async () => { const dataInfo = async () => { await getCecInfo() + await getContribution() await getExpected() await getUserData() } @@ -458,6 +516,11 @@ onMounted(() => { height: 23px; margin-left: 10px; } + .icon { + width: 27px; + height: 27px; + cursor: pointer; + } } .day { font-family: 'Poppins'; @@ -589,7 +652,250 @@ onMounted(() => { } } } - :deep(.logModal) { + :deep(.conLogModal) { + width: 1052px !important; + height: 714px; + background: #1A1821; + box-shadow: 0px 15px 28px 3px rgba(22,22,22,0.13); + border-radius: 100px; + border: 1px solid #B966FF; + .ant-modal-content { + padding: 0 99px; + color: #FFF; + background: #1A1821; + box-shadow: 0px 0px 0px 0px rgba(22,22,22,0.13); + border-radius: 100px; + .ant-modal-body { + overflow: hidden; + .log-title { + font-family: 'Anton'; + font-weight: 400; + font-size: 48px; + color: #FFFFFF; + margin-top: 23px; + } + .closable { + position: absolute; + right: -30px; + top: -30px; + z-index: 99; + cursor: pointer; + img { + width: 120px; + height: 120px; + } + } + .log-content { + min-height: 510px; + .log-header { + display: flex; + li { + width: 50%; + height: 48px; + line-height: 48px; + text-align: center; + font-family: 'Poppins'; + font-weight: 400; + font-size: 14px; + color: #A8A5AC; + background: #2d2738; + &:nth-child(1) { + border-radius: 50px 0 0 50px; + } + // &:nth-child(2) { + // width: 40%; + // } + &:nth-child(2) { + border-radius: 0 50px 50px 0; + } + } + } + .log-body { + width: 100%; + height: 520px; + overflow-y: auto; + .pages { + display: flex; + width: 100%; + li { + width: 50%; + height: 60px; + line-height: 60px; + font-weight: 600; + font-size: 16px; + font-family: 'Poppins'; + text-align: center; + } + .cec-amount { + display: flex; + justify-content: center; + align-items: center; + color: #9950FA; + span { + display: flex; + justify-content: end; + // width: 80px; + text-align: right; + } + img { + width: 28px; + height: 25px; + margin-left: 15px; + } + } + } + .no-data { + position: relative; + margin-top: 60px; + div { + width: 260px; + height: 260px; + margin: 0 auto; + } + p { + position: absolute; + bottom: 50px; + left: 52%; + transform: translateX(-50%); + font-family: 'Poppins'; + font-weight: bold; + font-size: 28px; + color: #8587B2; + } + } + &::-webkit-scrollbar { + width: 5px; + } + &::-webkit-scrollbar-track { + background: #171220; + border-radius: 2px; + } + &::-webkit-scrollbar-corner { + display: block; + } + &::-webkit-scrollbar-thumb { + height: 15px; + background: #9950fd; + border-radius: 10px; + } + } + } + .pagination { + display: flex; + align-items: center; + justify-content: space-between; + // background: #1778f1; + // .prev { + // // width: 100px; + // // height: 100px; + // display: flex; + // align-items: center; + // div { + // width: 100px; + // height: 100px; + // } + // } + .pager { + span { + display: inline-block; + width: 29px; + height: 29px; + line-height: 29px; + text-align: center; + border-radius: 10px; + margin: 0 5px; + background: #2d2738; + font-family: 'Poppins'; + font-weight: 200; + font-size: 14px; + cursor: pointer; + } + .active { + background: #5d5275; + } + } + .prev, .next { + // width: 100px; + // height: 100px; + display: flex; + align-items: center; + font-family: 'Poppins'; + font-weight: 600; + font-size: 16px; + color: #9950FD; + cursor: pointer; + div { + width: 100px; + height: 100px; + } + } + img { + width: 100%; + height: 100%; + } + } + .ant-table-wrapper { + .ant-spin-nested-loading { + .ant-spin-container { + .ant-table { + background: #2d2738; + border-bottom: 0px solid #2d2738; + color: #FFF; + .ant-table-container { + .ant-table-content { + .ant-table-thead { + border-radius: 60px; + tr { + border-radius: 60px; + overflow: hidden; + height: 40px; + line-height: 40px; + th { + background: #2d2738; + border-color: rgba(0,0,0,0); + text-align: center; + font-family: 'Poppins'; + font-weight: 400; + font-size: 14px; + color: #A8A5AC; + border-radius: 50px !important; + padding: 0; + overflow: hidden; + &::before { + display: none; + } + } + .ant-table-cell { + overflow: hidden; + border-radius: 50px !important; + } + } + .ant-table-cell { + overflow: hidden; + border-radius: 50px !important; + } + } + .ant-table-tbody { + tr { + background: #16141b; + td { + border-color: rgba(0,0,0,0); + background: #16141b !important; + overflow: visible !important; + vertical-align: middle; + } + } + } + } + } + } + } + } + } + } + } + } + :deep(.cecLogModal) { width: 1052px !important; height: 714px; background: #1A1821; @@ -626,7 +932,7 @@ onMounted(() => { .log-header { display: flex; li { - width: 33%; + width: 30%; height: 48px; line-height: 48px; text-align: center; @@ -638,6 +944,9 @@ onMounted(() => { &:nth-child(1) { border-radius: 50px 0 0 50px; } + &:nth-child(2) { + width: 40%; + } &:nth-child(3) { border-radius: 0 50px 50px 0; } @@ -649,13 +958,16 @@ onMounted(() => { display: flex; width: 100%; li { - width: 33%; + width: 30%; height: 60px; line-height: 60px; font-weight: 600; font-size: 16px; font-family: 'Poppins'; text-align: center; + &:nth-child(2) { + width: 40%; + } } .cec-amount { display: flex; @@ -663,7 +975,7 @@ onMounted(() => { align-items: center; color: #9950FA; img { - width: 20px; + width: 25px; height: 28px; margin-left: 15px; } @@ -671,6 +983,7 @@ onMounted(() => { } .no-data { position: relative; + margin-top: 60px; div { width: 260px; height: 260px; diff --git a/src/components/assets/myCard.vue b/src/components/assets/myCard.vue index 2c8d5d8..246af98 100644 --- a/src/components/assets/myCard.vue +++ b/src/components/assets/myCard.vue @@ -43,7 +43,7 @@
    - loading + loading List
    Cancel listing
    @@ -53,10 +53,10 @@ loading Unstake
    -
    +
    @@ -504,6 +504,16 @@ onMounted(() => { width: 140px; height: 48px; } + span { + display: flex; + justify-content: center; + border-radius: 10px; + align-items: center; + width: 100%; + height: 100%; + color: #FF6271; + border: 2px solid #ff6978; + } } .enabled { justify-content: center; @@ -548,6 +558,12 @@ onMounted(() => { .card-cancel { background: #ff6271; } + .card-sell { + .bgC { + background: #ff6271; + border-radius: 12px; + } + } .card-cat { width: 71px; display: flex; diff --git a/src/components/common/convertCard.vue b/src/components/common/convertCard.vue index f97f730..aa91fd9 100644 --- a/src/components/common/convertCard.vue +++ b/src/components/common/convertCard.vue @@ -11,11 +11,14 @@
    - - - - - -