From 1220c32c3a8fb1de41cb05a3c99638f59ee8b96c Mon Sep 17 00:00:00 2001 From: yuyongdong Date: Wed, 3 Jul 2024 16:45:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F=E7=BB=86?= =?UTF-8?q?=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 8 +- package.json | 3 +- src/assets/img/marketplace/Icon_!.png | Bin 0 -> 1165 bytes src/components/Dialogs/loadingDialog.vue | 16 +- src/components/Dialogs/sellDialog.vue | 3 + src/components/assets/assetsHeader.vue | 2 +- src/components/common/card.vue | 2 - .../marketplace/mktContent copy.vue | 356 ------------------ src/components/marketplace/mktContent.vue | 2 +- src/configs/priceCalculate.js | 2 +- src/views/DetailView.vue | 77 +++- src/views/MarketplaceView.vue | 2 +- 12 files changed, 91 insertions(+), 382 deletions(-) create mode 100644 src/assets/img/marketplace/Icon_!.png delete mode 100644 src/components/marketplace/mktContent copy.vue 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 0000000000000000000000000000000000000000..754d7cc5d3bfd5fa782b560d6304f33648337d60 GIT binary patch literal 1165 zcmV;81akX{P)Px(M@d9MR9Hu?m|Lt}Qxt~3-<=SNOQLRZzXVUjC2k=uEg^&;9tfWB;8qoa2%=Ry zNGOq1c|!*J%9s&{eWG7?SReF#5!O#upIat_z3t4SSjhxuFt67hKSez*d90-I04un z_yYJC_!{^D_&sfGntOLmu=@a?0cKNfhl7+jDp{;kW!?f)ZUiwx;h z;Pe9O^%By#lD_M;vmTI$*b%rC*d2HnSS0D!K>+mbjfgGNyB8&I9+b4Ay>ASVh%g~9 zOA^ijKIs?NLBK`ChQI-NNRxVwq?L`0Q6LeqO(E3fz@EU}2_ibk?Dt1()BuhM?=_g| zz>-4l`z8G}^1gpEJe5b0UKWZ$ci>CoIvx-h{ldsE0L~NV~v5i>< za!M)7mpC+%zU(s4{GUKv9}HwMaIK_OweP1__exIAGZ1^jF}qiit7g?|0lA|EWW7Sw zk#(-VSBzBYh%j?s1fG%9^o>q13FM^o$cMlTN#A$A*xC>g?oZCvsRr^AaI2)Z1~lS^ zcw!F_H^G5cL>vX&Y#@uw5lL>_)hj(>AP$W^VvY?1#C2${f!N4-lH9VZR|2s#XajNS z9%w~`rNv|a*CPhvtZ^MNN2taoKazIsR?qZ}DFYup}= zEF$TeRAMgGKM!~qXU!Q!Fimr4ZYb{c1J{v}PFTBAXIQ_u*{zWDSM9srmmU8~V4Z=S zTJ)y{i&^j1T)nbPTT)t!t{DP|+smE6BL?C!>+1SK5y{UD*lVmw-5#uAA99E!_0=#f zlDgNN2G|iZo9=sdQQIcXZM7XVA~pfeH_=m%SPsmu867e#P4{&neX`Lbo>681?*UI# z>Je8~t1UN8Yue|F;9geak%;gtbnX~ElIT1@x#nM(b)i$C<$Km7ZkXnX$BWLeWZFBV zjY4ye`&Xg07;MezY3`mH&05Xs|Gv>^R;T>ZBGT_0qgh*Etl~XNc)FWx74J}bT(y1o zqzA@T@hvdTT(cW6ZxZL4Lvv{JJlub-X@O}by<=LF-YQAMPI_(y*0*m|PkJpdE>tF! zXWyNMn0-Abd2I0P`)$s?3kRBgTVN)-4X}1u*5@|B9d+*_FFwoL0GEZ~ZUfpG(Q`lI fkL)|y_apxRrnBY&@l>XA00000NkvXXu0mjfJe?&R literal 0 HcmV?d00001 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%; }