huangjinming/CounterFireGames
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'new-CounterFire' of http://git.kingsome.cn/huangjinming/CounterFireGames into new-CounterFire

Browse Source
This commit is contained in:
yuyongdong 2024-07-04 06:02:48 +08:00
commit c0d89bd21f
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/Dialogs/sellDialog.vue
View File

@ -183,7 +183,7 @@ const sellConfirm = async () => {
contractAddress: props.sellDataArr.contract_address, contractAddress: props.sellDataArr.contract_address,
tokenId: props.sellDataArr.token_id, tokenId: props.sellDataArr.token_id,
currencyAddress: currency, currencyAddress: currency,
currencyAmount: ethers.utils.parseEther(totalPrice(priceValue.value)).toString(), currencyAmount: ethers.utils.parseEther(priceValue.value).toString(),
orderExpiry: orderData, orderExpiry: orderData,
}; };
console.log(data) console.log(data)

16
src/components/assets/myCard.vue
View File

@ -18,7 +18,7 @@
{{ nftPrice }} {{ nftPrice }}
<!-- {{cardPrice(nftData)}} --> <!-- {{cardPrice(nftData)}} -->
</span> </span>
<img src="@/assets/img/marketplace/ETHicon.png" alt="图片"> <img :src="icon" alt="">
</div> </div>
</div> </div>
<div v-if="nftData.type == 0 && nftData.on_sale == 0" class="enabled" @click="lockToGame('redeem')"> <div v-if="nftData.type == 0 && nftData.on_sale == 0" class="enabled" @click="lockToGame('redeem')">
@ -51,6 +51,7 @@ import {createModal} from "@/utils/model.util";
import ConfirmDialog from "@/components/Dialogs/confirmDialog.vue" import ConfirmDialog from "@/components/Dialogs/confirmDialog.vue"
import { timeFormat } from "@/configs/priceCalculate" import { timeFormat } from "@/configs/priceCalculate"
const emit = defineEmits(['renewMyNft']) const emit = defineEmits(['renewMyNft'])
import {formatPrice} from "@/components/chain/utils"
import { useRouter } from "vue-router"; import { useRouter } from "vue-router";
import { BlockChain } from "@/components/chain/BlockChain" import { BlockChain } from "@/components/chain/BlockChain"
@ -159,14 +160,17 @@ const lockToGameConfirm = async () => {
// 获取出售中价格价格 // 获取出售中价格价格
const nftPrice = ref() const nftPrice = ref('-')
const icon = ref('')
const cardPrice = async (val) => { const cardPrice = async (val) => {
let nftData = await getNftData(toRaw(val)) let nftData = await getNftData(toRaw(val))
if(nftData.event) { console.log(nftData)
nftPrice.value = priceCalculated(nftData.event.data.buy[0].amount) if (nftData?.event?.data) {
} else { const data = formatPrice(nftData?.event?.data)
return false icon.value = data.icon
nftPrice.value = data.tokenAmount
} }
} }