diff --git a/.env.development b/.env.development index d9e7f5e..2d0ac21 100644 --- a/.env.development +++ b/.env.development @@ -4,10 +4,10 @@ VUE_APP_BASE_API2='https://invitation.counterfire.games' VUE_APP_GPAL_API='https://game2006api.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 -VUE_APP_PASSPORT_LOGOUT_URI=https://market.kingsome.cn -VUE_APP_PASSPORT_CLIENT_ID=eTmUah69p7ZdRhRYzBta6lZRKXXeXDYj -# VUE_APP_PASSPORT_CLIENT_ID=0FNfXxQywm7wjdbyLTDzWt4txc53yRrT +VUE_APP_PASSPORT_REDIRECT_URI=http://localhost:4000 +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_MKT_API='https://market-test.kingsome.cn' VUE_APP_NET_ID='13473' diff --git a/package.json b/package.json index 6f42d1b..c844e71 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,8 @@ "private": true, "version": "0.0.0", "scripts": { - "dev": "vite --host --mode dev", + "task": "vite --host --mode dev", + "dev": "vite --host --mode development", "build:task": "vite build --mode dev", "build:dev": "vite build --mode development", "build:test": "vite build --mode test", diff --git a/src/assets/img/marketplace/Icon_!.png b/src/assets/img/marketplace/Icon_!.png new file mode 100644 index 0000000..754d7cc Binary files /dev/null and b/src/assets/img/marketplace/Icon_!.png differ diff --git a/src/components/Dialogs/loadingDialog.vue b/src/components/Dialogs/loadingDialog.vue index b68df43..fd2c105 100644 --- a/src/components/Dialogs/loadingDialog.vue +++ b/src/components/Dialogs/loadingDialog.vue @@ -14,8 +14,6 @@ - - \ No newline at end of file diff --git a/src/components/marketplace/mktContent.vue b/src/components/marketplace/mktContent.vue index 531bac1..372f08c 100644 --- a/src/components/marketplace/mktContent.vue +++ b/src/components/marketplace/mktContent.vue @@ -281,7 +281,7 @@ onUnmounted(() => { display: flex; justify-content: space-between; background: #16141b; - box-shadow: 0 -10px 10px #16141b; + box-shadow: 0 -80px 80px #16141b; .mkt-content-left { position: -webkit-sticky; position: sticky; diff --git a/src/configs/priceCalculate.js b/src/configs/priceCalculate.js index b96f667..221e8f3 100644 --- a/src/configs/priceCalculate.js +++ b/src/configs/priceCalculate.js @@ -44,7 +44,7 @@ export const feePrice = (price) => { } export const totalPrice = (price) => { - return Number(Number(price) + Number(price) * 0.02).toFixed(5) + return Number(Number(price) + Number(price) * 0.02 + Number(price) * 0.02).toFixed(5) } // 处理时间回显 diff --git a/src/views/DetailView.vue b/src/views/DetailView.vue index 310c356..9756e9a 100644 --- a/src/views/DetailView.vue +++ b/src/views/DetailView.vue @@ -7,6 +7,7 @@
+
@@ -90,7 +91,7 @@
-
+

Property

  • @@ -133,6 +134,23 @@
  • +
    +

    Property

    +
    +
    +

    Gold coins

    +

    1000

    +
    +
    +
    + +
    +
    + It can be enabled on your home page and you will receive 100,000 gold coins in counter Fire. +
    +
    +
    +
    @@ -651,6 +669,63 @@ onMounted(() => { } } } + .gold-content { + width: 455px; + height: 84px; + background: #2D2738; + border-radius: 20px; + display: flex; + justify-content: space-between; + .left { + padding: 10px 19px; + font-family: 'Poppins'; + font-size: 22px; + h4 { + height: 18px; + font-weight: 400; + color: #B3B5DA; + } + p { + height: 20px; + font-weight: bold; + color: #FFFFFF; + margin-top: 18px; + } + } + .right { + position: relative; + cursor: pointer; + margin-top: 9px; + margin-right: 10px; + .right-img { + width: 34px; + height: 33px; + img { + width: 100%; + height: 100%; + } + } + .right-tips { + display: none; + position: absolute; + top: 45px; + left: -20px; + width: 313px; + height: 82px; + padding: 20px; + box-sizing: border-box; + background: #1A1821; + box-shadow: 0px 15px 28px 3px rgba(22,22,22,0.13); + border-radius: 10px; + border: 1px solid #B966FF; + } + &:hover { + .right-tips { + display: block; + } + } + } + } } &:nth-child(2) { padding-top: 20px; diff --git a/src/views/MarketplaceView.vue b/src/views/MarketplaceView.vue index dbcbd61..7f7af71 100644 --- a/src/views/MarketplaceView.vue +++ b/src/views/MarketplaceView.vue @@ -49,7 +49,7 @@ onUnmounted(() => { .market { width: 100%; .header { - height: 480px; + height: 440px; background: url('@/assets/img/marketplace/rolesbg.png') no-repeat; background-size: 100%; }