From 942cd8610bcdb2f27aea9941da92f53f54481399 Mon Sep 17 00:00:00 2001 From: huangjinming Date: Thu, 12 Jan 2023 19:30:19 +0800 Subject: [PATCH] fix --- src/components/market/AccountCard.vue | 4 ++-- src/components/market/ChipBuyDialog.vue | 9 ++++++++ src/components/market/Chipdialog.vue | 11 +++++++-- src/components/market/Dundialog.vue | 7 ++++++ src/components/market/Herodialog.vue | 29 ++++++++++++++---------- src/components/market/Piecedialog.vue | 11 +++++++-- src/components/market/TheSellDialog.vue | 21 ++++++++++++++++- src/components/market/nft/Chip.vue | 4 ++++ src/components/market/nft/HeroNft.vue | 13 +++++++---- src/components/market/nft/PieceNft.vue | 22 +++++++++++++++--- src/components/market/nft/WeaponList.vue | 20 +++++++++------- 11 files changed, 116 insertions(+), 35 deletions(-) diff --git a/src/components/market/AccountCard.vue b/src/components/market/AccountCard.vue index 26c9d48..95c222c 100644 --- a/src/components/market/AccountCard.vue +++ b/src/components/market/AccountCard.vue @@ -10,8 +10,8 @@
-
History:
-
#3006985843100103 (NFTLink)
+
diff --git a/src/components/market/ChipBuyDialog.vue b/src/components/market/ChipBuyDialog.vue index 5b8d5b7..5bb80df 100644 --- a/src/components/market/ChipBuyDialog.vue +++ b/src/components/market/ChipBuyDialog.vue @@ -191,6 +191,15 @@ export default { this.$emit("getMarketNftList"); },1000) }, 1000); + }else{ + setTimeout(() => { + this.$emit("handMessageHide"); + this.closeTip(); + this.$emit("closeTip",false); + setTimeout(()=>{ + this.$emit("getMarketNftList"); + },1000) + }, 1000); } } console.log(nftres, "beginBuy"); diff --git a/src/components/market/Chipdialog.vue b/src/components/market/Chipdialog.vue index 3849877..ae834e5 100644 --- a/src/components/market/Chipdialog.vue +++ b/src/components/market/Chipdialog.vue @@ -76,8 +76,8 @@
{{ time }} UTC
-
History :
-
#3006985843100103 (NFTLink)
+
@@ -208,6 +208,13 @@ export default { if (nftres.status == true) { this.$emit("handMessage", 1); this.hideLoading(); + setTimeout(() => { + this.$emit("handMessageHide"); + this.$emit("on-close"); + setTimeout(() => { + this.$emit("getMarketNftList"); + }, 1000); + }, 1000); } } catch (err) { console.log("query order status error", err); diff --git a/src/components/market/Dundialog.vue b/src/components/market/Dundialog.vue index 2648322..02f11ec 100644 --- a/src/components/market/Dundialog.vue +++ b/src/components/market/Dundialog.vue @@ -352,6 +352,13 @@ export default { this.$emit("handMessage", 1); this.hideLoading(); + setTimeout(() => { + this.$emit("handMessageHide"); + this.$emit("on-close"); + setTimeout(() => { + this.$emit("getMarketNftList"); + }, 1000); + }, 1000); } } catch (err) { this.hideLoading(); diff --git a/src/components/market/Herodialog.vue b/src/components/market/Herodialog.vue index d373a75..a9ab0b8 100644 --- a/src/components/market/Herodialog.vue +++ b/src/components/market/Herodialog.vue @@ -54,8 +54,7 @@
- {{ hero.c_name ? hero.c_name : hero.detail.hero_name - }} + {{ hero.c_name ? hero.c_name : hero.detail.hero_name }}
@@ -349,16 +348,16 @@ export default { isTabs: false, type: "hero", orderId: 6, - visible:this.dialogVisible, + visible: this.dialogVisible, loadingInstance: null, chainManager: new ChainManager(), }; }, - watch:{ - dialogVisible(val){ - this.visible = val - } -}, + watch: { + dialogVisible(val) { + this.visible = val; + }, + }, methods: { closeMyself(hide) { this.$emit("on-close", hide); @@ -412,10 +411,16 @@ export default { CONTRACT_ADDRESS[AppModule.chainId].marketDddress ); console.log(nftres, "beginSell"); - if (nftres.status == true) { + if (nftres.status == true) { this.$emit("handMessage", 1); this.hideLoading(); - + setTimeout(() => { + this.$emit("handMessageHide"); + this.$emit("on-close"); + setTimeout(() => { + this.$emit("getMarketNftList"); + }, 1000); + }, 1000); } } catch (err) { this.hideLoading(); @@ -540,7 +545,7 @@ export default { color: #ffffff; } .token-id { - margin-top: 36px; + margin-top: 36px; width: 345px; height: 41px; font-size: 30px; @@ -654,7 +659,7 @@ export default { .price-number { line-height: 89px; margin-left: 78px; - margin-right:10px; + margin-right: 10px; } } .mynft { diff --git a/src/components/market/Piecedialog.vue b/src/components/market/Piecedialog.vue index 44be65b..5599dcf 100644 --- a/src/components/market/Piecedialog.vue +++ b/src/components/market/Piecedialog.vue @@ -64,8 +64,8 @@
{{ time }} UTC
-->
-
History :
-
#3006985843100103 (NFTLink)
+
@@ -197,6 +197,13 @@ export default { if (nftres.status == true) { this.$emit("handMessage", 1); this.hideLoading(); + setTimeout(() => { + this.$emit("handMessageHide"); + this.$emit("closeTip", false); + setTimeout(() => { + this.$emit("getMarketNftList"); + }, 1000); + }, 1000); } } catch (err) { this.hideLoading(); diff --git a/src/components/market/TheSellDialog.vue b/src/components/market/TheSellDialog.vue index 5ffa987..2cb8946 100644 --- a/src/components/market/TheSellDialog.vue +++ b/src/components/market/TheSellDialog.vue @@ -178,7 +178,16 @@ export default { if (nftres.status == true) { this.hideLoading(); this.$emit("handMessage", 1); + setTimeout(() => { + this.$emit("handMessageHide"); this.closeTip(); + this.type == "piece" + ? this.$emit("closeTip", false) + : this.$emit("on-close"); + setTimeout(() => { + this.$emit("getMarketNftList"); + }, 1000); + }, 1000); } } catch (err) { this.hideLoading(); @@ -285,7 +294,17 @@ export default { if (nftres.status == true) { this.hideLoading(); this.$emit("handMessage", 1); - this.closeTip(); + + setTimeout(() => { + this.$emit("handMessageHide"); + this.closeTip(); + this.type == "piece" + ? this.$emit("closeTip", false) + : this.$emit("on-close"); + setTimeout(() => { + this.$emit("getMarketNftList"); + }, 1000); + }, 1000); } console.log(nftres, "beginSell"); } catch (err) { diff --git a/src/components/market/nft/Chip.vue b/src/components/market/nft/Chip.vue index 93024b6..48c69b7 100644 --- a/src/components/market/nft/Chip.vue +++ b/src/components/market/nft/Chip.vue @@ -67,6 +67,7 @@ @handBuyShow="handBuyShow" @handBuyHide="handBuyHide" @handMessage="handMessage" + @handMessageHide="handMessageHide" :data="chip" :isType="isType" :isPiecePut="isPiecePut" @@ -87,6 +88,9 @@ :data="chip" v-if="currencyTypeList" :currencyTypeList="currencyTypeList" + @on-close="chipDialoghide" + @getMarketNftList="getMarketNftList" + @handMessageHide="handMessageHide" :isPiecePut="isPiecePut" @handMessage="handMessage" @handPutShow="handPutShow" diff --git a/src/components/market/nft/HeroNft.vue b/src/components/market/nft/HeroNft.vue index 01e079a..00de214 100644 --- a/src/components/market/nft/HeroNft.vue +++ b/src/components/market/nft/HeroNft.vue @@ -105,6 +105,7 @@ :isBuy="isBuy" @handBuyShow="handBuyShow" @handBuyHide="handBuyHide" + @handMessageHide="handMessageHide" @handMessage="handMessage" @closeTip="closeTip" @showTip="showTip" @@ -120,9 +121,12 @@ :data="data" v-if="currencyTypeList" :currencyTypeList="currencyTypeList" + @getMarketNftList="getMarketNftList" @handPutShow="handPutShow" @handPutHide="handPutHide" + @on-close="handDialoghide" @handMessage="handMessage" + @handMessageHide="handMessageHide" > @@ -104,7 +108,10 @@ ref="buydialog" :isBuy="isBuy" v-if="isType !== 'mynft'" + @closeTip="closeTip" + @getMarketNftList="getMarketNftList" @handMessage="handMessage" + @handMessageHide="handMessageHide" @handBuyShow="handBuyShow" @handBuyHide="handBuyHide" > @@ -155,7 +162,9 @@ export default { this.$refs.selldialog.init(piece); }); }, - + getMarketNftList() { + this.$emit("getMarketNftList"); + }, handPutHide() { this.isPiecePut = false; }, @@ -168,6 +177,13 @@ export default { handBuyHide(handBuyHide) { this.isBuy = handBuyHide; }, + handMessageHide() { + this.$nextTick(() => { + this.$nextTick(() => { + this.$refs.message.close(); + }); + }); + }, handMessage(typeNumber) { this.$nextTick(() => { this.$refs.message.open(typeNumber); @@ -305,8 +321,8 @@ export default { width: 97px; height: 40px; } - .rent-olink{ - width:80px ; + .rent-olink { + width: 80px; text-align: right; line-height: 40px; font-size: 18px; diff --git a/src/components/market/nft/WeaponList.vue b/src/components/market/nft/WeaponList.vue index 57bc173..1553fd5 100644 --- a/src/components/market/nft/WeaponList.vue +++ b/src/components/market/nft/WeaponList.vue @@ -90,6 +90,7 @@ @handPutShow="handPutShow" @handPutHide="handPutHide" @handMessage="handMessage" + @handMessageHide="handMessageHide" > { this.$nextTick(() => { - this.$refs.message.close(); + this.$nextTick(() => { + this.$refs.message.close(); + }); }); - }); - }, + }, handBuyHide() { this.isBuy = false; }, @@ -363,7 +367,7 @@ export default { width: 135px; height: 40px; } - .rent-olink{ + .rent-olink { text-align: right; width: 135px; margin-right: 60px;