diff --git a/src/assets/market/chip/adjust.png b/src/assets/market/chip/adjust.png new file mode 100644 index 0000000..78a2e31 Binary files /dev/null and b/src/assets/market/chip/adjust.png differ diff --git a/src/assets/market/chip/remove.png b/src/assets/market/chip/remove.png new file mode 100644 index 0000000..1546383 Binary files /dev/null and b/src/assets/market/chip/remove.png differ diff --git a/src/assets/market/hero/adjust.png b/src/assets/market/hero/adjust.png new file mode 100644 index 0000000..e7a6ab4 Binary files /dev/null and b/src/assets/market/hero/adjust.png differ diff --git a/src/assets/market/hero/remove.png b/src/assets/market/hero/remove.png new file mode 100644 index 0000000..9dd61f4 Binary files /dev/null and b/src/assets/market/hero/remove.png differ diff --git a/src/assets/market/piece/adjust.png b/src/assets/market/piece/adjust.png new file mode 100644 index 0000000..9156f4e Binary files /dev/null and b/src/assets/market/piece/adjust.png differ diff --git a/src/assets/market/piece/remove.png b/src/assets/market/piece/remove.png new file mode 100644 index 0000000..b3cc0eb Binary files /dev/null and b/src/assets/market/piece/remove.png differ diff --git a/src/components/market/Chipdialog.vue b/src/components/market/Chipdialog.vue index 0924381..afd025c 100644 --- a/src/components/market/Chipdialog.vue +++ b/src/components/market/Chipdialog.vue @@ -87,7 +87,7 @@ v-for="(item, i) in data.detail.rand_attr" :key="i" > -
{{chipArrid[item.attr_id]}}
+
{{ chipArrid[item.attr_id] }}
{{ parseFloat(item.val).toFixed(2) * 100 }}%
Sell
@@ -140,7 +144,7 @@ export default { props: ["dialogVisible", "data", "isType"], data() { return { - chipArrid: { + chipArrid: { 39: "Hp Pct", 40: "Atk Pct", 41: "Def Pct", @@ -151,7 +155,7 @@ export default { 46: "Hp Recover Pct", 47: "Brain Life Pct", 48: "Reload Time Pct", - 49:"Bullet Speed", + 49: "Bullet Speed", 50: "Bullet Speed Pct", 51: "Cool Down Pct", }, @@ -439,5 +443,25 @@ export default { background: url("../../assets/market/chip/sell-btn.png") no-repeat; background-size: contain; } + .for-rent-btn { + display: flex; + // margin-top: 170px; + .adjust { + width: 277px; + height: 72px; + cursor: pointer; + // margin-left: 14px; + background: url("../../assets/market/chip/adjust.png") no-repeat; + background-size: 100% 100%; + } + .remove { + width: 277px; + height: 72px; + cursor: pointer; + margin-left: 14px; + background: url("../../assets/market/chip/remove.png") no-repeat; + background-size: 100% 100%; + } + } } diff --git a/src/components/market/Dundialog.vue b/src/components/market/Dundialog.vue index 07f3b97..50310a0 100644 --- a/src/components/market/Dundialog.vue +++ b/src/components/market/Dundialog.vue @@ -231,8 +231,13 @@ >
+
Sell
+
@@ -592,6 +597,26 @@ export default { height: 100px; margin-right: 30px; } + .for-rent-btn { + display: flex; + // margin-top: 170px; + .adjust { + width: 384px; + height: 89px; + cursor: pointer; + // margin-left: 14px; + background: url("../../assets/market/hero/adjust.png") no-repeat; + background-size: 100% 100%; + } + .remove { + width: 384px; + height: 89px; + cursor: pointer; + margin-left: 14px; + background: url("../../assets/market/hero/remove.png") no-repeat; + background-size: 100% 100%; + } + } } .tabs { position: absolute; diff --git a/src/components/market/Herodialog.vue b/src/components/market/Herodialog.vue index 5e7b556..723dbcb 100644 --- a/src/components/market/Herodialog.vue +++ b/src/components/market/Herodialog.vue @@ -107,7 +107,9 @@
{{ hero.detail.rand_attr[0].val - ? hero.detail.rand_attr[0].val>=100 ? parseInt(hero.detail.rand_attr[0].val*1) : (hero.detail.rand_attr[0].val*1).toFixed(2) + ? hero.detail.rand_attr[0].val >= 100 + ? parseInt(hero.detail.rand_attr[0].val * 1) + : (hero.detail.rand_attr[0].val * 1).toFixed(2) : "" }}
@@ -126,7 +128,9 @@
{{ hero.detail.rand_attr[1].val - ? hero.detail.rand_attr[1].val>=100 ? parseInt(hero.detail.rand_attr[1].val*1) : (hero.detail.rand_attr[1].val*1).toFixed(2) + ? hero.detail.rand_attr[1].val >= 100 + ? parseInt(hero.detail.rand_attr[1].val * 1) + : (hero.detail.rand_attr[1].val * 1).toFixed(2) : "" }}
@@ -146,7 +150,9 @@
{{ hero.detail.rand_attr[2].val - ? hero.detail.rand_attr[2].val>=100 ? parseInt(hero.detail.rand_attr[2].val*1) : (hero.detail.rand_attr[2].val*1).toFixed(2) + ? hero.detail.rand_attr[2].val >= 100 + ? parseInt(hero.detail.rand_attr[2].val * 1) + : (hero.detail.rand_attr[2].val * 1).toFixed(2) : "" }}
@@ -165,7 +171,7 @@
{{ hero.detail.rand_attr[4].val - ? ((hero.detail.rand_attr[4].val *1)*100).toFixed(2) + ? (hero.detail.rand_attr[4].val * 1 * 100).toFixed(2) : "0" }}%
@@ -184,7 +190,7 @@
{{ hero.detail.rand_attr[5].val - ? ((hero.detail.rand_attr[5].val *1)*100).toFixed(2) + ? (hero.detail.rand_attr[5].val * 1 * 100).toFixed(2) : "0" }}%
@@ -203,7 +209,7 @@
{{ hero.detail.rand_attr[6].val - ? ((hero.detail.rand_attr[6].val *1)*100).toFixed(2) + ? (hero.detail.rand_attr[6].val * 1 * 100).toFixed(2) : "0" }}%
@@ -222,7 +228,7 @@
{{ hero.detail.rand_attr[7].val - ? ((hero.detail.rand_attr[7].val *1)*100).toFixed(2) + ? (hero.detail.rand_attr[7].val * 1 * 100).toFixed(2) : "0" }}%
@@ -266,6 +272,10 @@ >
+
Sell
@@ -628,6 +638,26 @@ export default { height: 89px; margin-right: 35px; } + .for-rent-btn { + display: flex; + // margin-top: 170px; + .adjust { + width: 384px; + height: 89px; + cursor: pointer; + // margin-left: 14px; + background: url("../../assets/market/hero/adjust.png") no-repeat; + background-size: 100% 100%; + } + .remove { + width: 384px; + height: 89px; + cursor: pointer; + margin-left: 14px; + background: url("../../assets/market/hero/remove.png") no-repeat; + background-size: 100% 100%; + } + } } .tabs { position: absolute; diff --git a/src/components/market/Piecedialog.vue b/src/components/market/Piecedialog.vue index 05a4a0b..0126299 100644 --- a/src/components/market/Piecedialog.vue +++ b/src/components/market/Piecedialog.vue @@ -7,14 +7,12 @@ v-if="piece.c_id" width="214px" :src=" - require('@/assets/market/piece/details/' + - piece.c_id + - '_full.png') + require('@/assets/market/piece/details/' + piece.c_id + '_full.png') " alt="" /> - {{ piece.amount}} + {{ piece.amount }}
@@ -75,6 +73,10 @@
+
Sell
@@ -156,7 +158,7 @@ export default { console.log(this.piece.detail.balance, "this.piece.detail.balance"); }, handPutShow() { - this.$emit("handPutShow",this.piece); + this.$emit("handPutShow", this.piece); console.log("ppwowerw"); }, showTip() { @@ -164,7 +166,7 @@ export default { this.$emit("showTip"); }, handBuyShow() { - this.$emit("handBuyShow",this.piece); + this.$emit("handBuyShow", this.piece); console.log("handBuyShow"); }, }, @@ -384,5 +386,25 @@ export default { background: url("../../assets/market/chip/sell-btn.png") no-repeat; background-size: 100% 100%; } + .for-rent-btn { + display: flex; + // margin-top: 170px; + .adjust { + width: 229px; + height: 72px; + cursor: pointer; + // margin-left: 14px; + background: url("../../assets/market/piece/adjust.png") no-repeat; + background-size: 100% 100%; + } + .remove { + width: 229px; + height: 72px; + cursor: pointer; + margin-left: 14px; + background: url("../../assets/market/piece/remove.png") no-repeat; + background-size: 100% 100%; + } + } } diff --git a/src/components/market/TheSellDialog.vue b/src/components/market/TheSellDialog.vue index 47dd37e..fd59ff7 100644 --- a/src/components/market/TheSellDialog.vue +++ b/src/components/market/TheSellDialog.vue @@ -80,7 +80,7 @@ import WeaponSellTop from "./WeaponSellTop.vue"; import PieceSellTop from "./PieceSellTop.vue"; import HeroSellTop from "./HeroSellTop.vue"; import ChipSellTop from "./ChipSellTop.vue"; -import { sellMyNft, getSupportedCurrenTypes } from "@/api/Market"; +import { getSupportedCurrenTypes } from "@/api/Market"; import { AppModule } from "@/store/modules/app"; import { CONTRACT_ADDRESS } from "@/configs/config_chain"; import ChainManager from "@/chain/ChainManager"; diff --git a/src/components/market/nft/HeroNft.vue b/src/components/market/nft/HeroNft.vue index 9d77fa9..b3a95f5 100644 --- a/src/components/market/nft/HeroNft.vue +++ b/src/components/market/nft/HeroNft.vue @@ -2,11 +2,16 @@