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
No Data
+