From 2ef71a196144c7fb5a142daadb9006dccf79c6a7 Mon Sep 17 00:00:00 2001 From: yuyongdong Date: Thu, 11 Jul 2024 20:03:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=8B=E9=93=BE=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/assets/assetsContent.vue | 11 +- src/components/assets/assetsHeader.vue | 21 +- src/components/assets/convert.vue | 264 ++++++++++++++++++++++ src/components/common/convertCard.vue | 255 +++++++++++++++++++++ src/components/common/searchView/gold.vue | 24 +- src/components/common/searchView/hero.vue | 15 +- src/components/marketplace/mktContent.vue | 4 +- src/configs/priceCalculate.js | 2 +- src/utils/marketplace.js | 6 + 9 files changed, 583 insertions(+), 19 deletions(-) create mode 100644 src/components/assets/convert.vue create mode 100644 src/components/common/convertCard.vue diff --git a/src/components/assets/assetsContent.vue b/src/components/assets/assetsContent.vue index 038dede..04ee405 100644 --- a/src/components/assets/assetsContent.vue +++ b/src/components/assets/assetsContent.vue @@ -6,9 +6,10 @@
- - - + + + +
@@ -20,6 +21,7 @@ import Status from "@/components/common/searchView/status.vue" import Collectibles from "./collectibles.vue" import Hanging from "./hanging.vue" import Trading from "./trading.vue" +import Convert from "./convert.vue" import { useMarketplaceStore } from "@/store/marketplace" const marketplaceList = useMarketplaceStore() @@ -34,6 +36,9 @@ const navList = ref([ { name: "Trading History" }, + { + name: "Activity" + }, ]) const navIndex = ref(0) const nftList = ref([]) diff --git a/src/components/assets/assetsHeader.vue b/src/components/assets/assetsHeader.vue index a3ed09f..f0287c5 100644 --- a/src/components/assets/assetsHeader.vue +++ b/src/components/assets/assetsHeader.vue @@ -9,6 +9,9 @@
+ @@ -38,10 +41,14 @@ const imageUrl = computed(() => { \ No newline at end of file diff --git a/src/components/assets/convert.vue b/src/components/assets/convert.vue new file mode 100644 index 0000000..4aaf43c --- /dev/null +++ b/src/components/assets/convert.vue @@ -0,0 +1,264 @@ + + + + + \ No newline at end of file diff --git a/src/components/common/convertCard.vue b/src/components/common/convertCard.vue new file mode 100644 index 0000000..a8377c1 --- /dev/null +++ b/src/components/common/convertCard.vue @@ -0,0 +1,255 @@ + + + + + \ No newline at end of file diff --git a/src/components/common/searchView/gold.vue b/src/components/common/searchView/gold.vue index fc894eb..d4d0fd4 100644 --- a/src/components/common/searchView/gold.vue +++ b/src/components/common/searchView/gold.vue @@ -6,7 +6,7 @@ {{ item.label }} {{ goldList.length }} --> - + @@ -17,20 +17,24 @@ import { ref, reactive } from "vue"; // import { SettingOutlined } from "@ant-design/icons-vue"; import { useMarketplaceStore } from "@/store/marketplace" const marketplaceList = useMarketplaceStore() + +const props = defineProps({ + goldArr: { + type: Array, + required: true, + }, +}); + const emit = defineEmits(['clickGoldChild']) - const goldList = [ + +const goldList = [ { label: "Gold Card", value: "10017" }, { label: "Black Gold Card", value: "10018" }, ]; -const checkArr = ref([]) -const state = reactive({ - value: ["10000"], -}); + + const expandIconPosition = ref("end"); -const handleClick = (event) => { - // If you don't want click extra trigger collapse, you can prevent this: - event.stopPropagation(); -}; + const onChangeValue = (e) => { // ToDo: 筛选 marketplaceList.gold = e diff --git a/src/components/common/searchView/hero.vue b/src/components/common/searchView/hero.vue index d286605..873f0c2 100644 --- a/src/components/common/searchView/hero.vue +++ b/src/components/common/searchView/hero.vue @@ -5,9 +5,9 @@ - +

Tier

- + @@ -19,6 +19,17 @@ import { ref, reactive } from "vue"; import { useMarketplaceStore } from "@/store/marketplace" const marketplaceList = useMarketplaceStore() +const props = defineProps({ + heroArr: { + type: Array, + required: true, + }, + rankArr: { + type: Array, + required: true, + }, +}); + const emit = defineEmits(['clickHeroChild','clickRankChild']) const heroList = [ diff --git a/src/components/marketplace/mktContent.vue b/src/components/marketplace/mktContent.vue index b88adb2..3ba3286 100644 --- a/src/components/marketplace/mktContent.vue +++ b/src/components/marketplace/mktContent.vue @@ -5,8 +5,8 @@

Type

- - + +
diff --git a/src/configs/priceCalculate.js b/src/configs/priceCalculate.js index 74e8c72..f66e4ff 100644 --- a/src/configs/priceCalculate.js +++ b/src/configs/priceCalculate.js @@ -30,7 +30,7 @@ export const sliceAddress = (address) => { // 处理时间 export const timeFormat = (value) => { - return moment(value).format('YYYY/MM/DD HH:mm') + return moment(value).format('YYYY-MM-DD HH:mm:ss') } export const royaltiesPrice = (price) => { diff --git a/src/utils/marketplace.js b/src/utils/marketplace.js index 4ef3c3f..124867b 100644 --- a/src/utils/marketplace.js +++ b/src/utils/marketplace.js @@ -71,6 +71,12 @@ export const apiHistoryState = async (account_address,data) => { return httpGet(url, data) } +// 账号游戏内资产 +export const apiLockState = async (account_address,data) => { + const url = `${API_BASE}/api/market/product/lock/${net_id}/${account_address}` + return httpPost(url, data) +} + // 详情 export const apiDetail = async (account_address) => { const url = `${API_BASE}/api/market/transaction/history/${net_id}/${account_address}`