diff --git a/components.d.ts b/components.d.ts index aeb2ceb..5b30dff 100644 --- a/components.d.ts +++ b/components.d.ts @@ -31,7 +31,6 @@ declare module 'vue' { ChipCard: typeof import('./src/components/home/ChipCard.vue')['default'] Collectibles: typeof import('./src/components/assets/collectibles.vue')['default'] ConfirmDialog: typeof import('./src/components/Dialogs/confirmDialog.vue')['default'] - copy: typeof import('./src/components/common/hangingCard copy.vue')['default'] GameFeatures: typeof import('./src/components/home/GameFeatures.vue')['default'] GameVideo: typeof import('./src/components/home/GameVideo.vue')['default'] Gold: typeof import('./src/components/common/searchView/gold.vue')['default'] @@ -47,7 +46,6 @@ declare module 'vue' { LatestNew: typeof import('./src/components/about/LatestNew.vue')['default'] Layout: typeof import('./src/components/layout/index.vue')['default'] LoadingDialog: typeof import('./src/components/Dialogs/loadingDialog.vue')['default'] - MessageDialog: typeof import('./src/components/Dialogs/messageDialog.vue')['default'] MktContent: typeof import('./src/components/marketplace/mktContent.vue')['default'] MktHeader: typeof import('./src/components/marketplace/mktHeader.vue')['default'] NavBar: typeof import('./src/components/layout/NavBar.vue')['default'] @@ -65,7 +63,6 @@ declare module 'vue' { StarTimer: typeof import('./src/components/common/starTimer.vue')['default'] Status: typeof import('./src/components/common/searchView/status.vue')['default'] StatusRadio: typeof import('./src/components/common/searchView/statusRadio.vue')['default'] - StatusRido: typeof import('./src/components/common/searchView/statusRido.vue')['default'] TeamMember: typeof import('./src/components/about/TeamMember.vue')['default'] TeamVision: typeof import('./src/components/about/TeamVision.vue')['default'] Trading: typeof import('./src/components/assets/trading.vue')['default'] diff --git a/src/assets/img/marketplace/Add shopping cart.png b/src/assets/img/marketplace/Add_shopping_cart.png similarity index 100% rename from src/assets/img/marketplace/Add shopping cart.png rename to src/assets/img/marketplace/Add_shopping_cart.png diff --git a/src/assets/img/marketplace/Add shopping cart02.png b/src/assets/img/marketplace/Add_shopping_cart02.png similarity index 100% rename from src/assets/img/marketplace/Add shopping cart02.png rename to src/assets/img/marketplace/Add_shopping_cart02.png diff --git a/src/assets/img/marketplace/Calendar .png b/src/assets/img/marketplace/Calendar.png similarity index 100% rename from src/assets/img/marketplace/Calendar .png rename to src/assets/img/marketplace/Calendar.png diff --git a/src/assets/img/marketplace/Close counter.png b/src/assets/img/marketplace/Close_counter.png similarity index 100% rename from src/assets/img/marketplace/Close counter.png rename to src/assets/img/marketplace/Close_counter.png diff --git a/src/assets/img/marketplace/Delete icon.png b/src/assets/img/marketplace/Delete_icon.png similarity index 100% rename from src/assets/img/marketplace/Delete icon.png rename to src/assets/img/marketplace/Delete_icon.png diff --git a/src/assets/img/marketplace/Empty state.png b/src/assets/img/marketplace/Empty_state.png similarity index 100% rename from src/assets/img/marketplace/Empty state.png rename to src/assets/img/marketplace/Empty_state.png diff --git a/src/assets/img/marketplace/Links web icon.png b/src/assets/img/marketplace/Links_web_icon.png similarity index 100% rename from src/assets/img/marketplace/Links web icon.png rename to src/assets/img/marketplace/Links_web_icon.png diff --git a/src/assets/img/marketplace/Move out.png b/src/assets/img/marketplace/Move_out.png similarity index 100% rename from src/assets/img/marketplace/Move out.png rename to src/assets/img/marketplace/Move_out.png diff --git a/src/assets/img/marketplace/On SeLL.png b/src/assets/img/marketplace/On_SeLL.png similarity index 100% rename from src/assets/img/marketplace/On SeLL.png rename to src/assets/img/marketplace/On_SeLL.png diff --git a/src/assets/img/marketplace/loding .png b/src/assets/img/marketplace/loding.png similarity index 100% rename from src/assets/img/marketplace/loding .png rename to src/assets/img/marketplace/loding.png diff --git a/src/components/Dialogs/buyDialog.vue b/src/components/Dialogs/buyDialog.vue index bf68ab0..3c0c7b3 100644 --- a/src/components/Dialogs/buyDialog.vue +++ b/src/components/Dialogs/buyDialog.vue @@ -14,7 +14,7 @@ Submit -->
- +
Transaction confirmation ( {{ props.buyDataArr.length }} )
@@ -36,6 +36,7 @@
{{ priceCalculated(item.event.data.buy[0].amount) }}
+
diff --git a/src/components/Dialogs/loadingDialog.vue b/src/components/Dialogs/loadingDialog.vue index 3a214ad..3eae0cf 100644 --- a/src/components/Dialogs/loadingDialog.vue +++ b/src/components/Dialogs/loadingDialog.vue @@ -6,7 +6,7 @@ -->
- +
diff --git a/src/components/Dialogs/sellDialog.vue b/src/components/Dialogs/sellDialog.vue index 29ef799..abc794b 100644 --- a/src/components/Dialogs/sellDialog.vue +++ b/src/components/Dialogs/sellDialog.vue @@ -10,7 +10,7 @@ destroyOnClose >
- +
On the shelves NFT
@@ -53,7 +53,7 @@
- + {{ formatDateGMT() }} PM
@@ -171,8 +171,6 @@ const isPriceListShow = ref(false); // 出售 const currency = import.meta.env.VUE_APP_MARKET_CURRENCY; const sellConfirm = async () => { - console.log(message) - return if (priceValue.value) { let curDate = new Date(); let orderData = new Date(curDate.getTime() + Number(optionDayValue.value)); diff --git a/src/components/assets/card.vue b/src/components/assets/card.vue index 0b59639..251f15c 100644 --- a/src/components/assets/card.vue +++ b/src/components/assets/card.vue @@ -8,7 +8,7 @@
Cotnesford park
- +
diff --git a/src/components/assets/collectibles.vue b/src/components/assets/collectibles.vue index a50865e..5b55ae3 100644 --- a/src/components/assets/collectibles.vue +++ b/src/components/assets/collectibles.vue @@ -17,7 +17,7 @@
- +

No NFT yet

diff --git a/src/components/assets/trading.vue b/src/components/assets/trading.vue index ea1fbec..2c2ea7a 100644 --- a/src/components/assets/trading.vue +++ b/src/components/assets/trading.vue @@ -79,61 +79,9 @@ onMounted(() => { width: calc(100% - 300px); padding-right: 40px; // background: #fff; - .content-right-header { - width: calc(100% - 10px); - height: 60px; - display: flex; - align-items: center; - border-bottom: 2px solid #3a3b57; - .bg-cor { - width: 15px; - height: 15px; - background: #18ff00; - margin-left: 10px; - border-radius: 50%; - } - .results-total { - display: flex; - align-items: center; - margin-left: 15px; - font-size: 14px; - color: #b3b5da; - } - .search-list { - display: flex; - align-items: center; - color: #fff; - li { - margin-left: 10px; - background: #2d2738; - padding: 5px 10px; - border-radius: 10px; - font-size: 12px; - cursor: pointer; - } - .clear-all { - background: #5a4a6d; - } - } - } .content-right-content { + width: 1488px; margin-top: 30px; - .pages-horizontal { - display: flex; - // justify-content: space-between; - flex-wrap: wrap; - clear: both; - li { - width: calc(25% - 10px); - // height: 360px; - margin-right: 10px; - margin-bottom: 10px; - cursor: pointer; - &:nth-child(4n) { - margin-right: 0; - } - } - } .pages-vertical { color: #fff; } diff --git a/src/components/cart/index.vue b/src/components/cart/index.vue index a585e83..f41129b 100644 --- a/src/components/cart/index.vue +++ b/src/components/cart/index.vue @@ -23,7 +23,7 @@
- +
diff --git a/src/components/common/card.vue b/src/components/common/card.vue index ba61d2b..f10c24e 100644 --- a/src/components/common/card.vue +++ b/src/components/common/card.vue @@ -21,10 +21,10 @@
Buy Now
- +
- +
@@ -65,8 +65,12 @@ const buyDataArr = ref([]) // 确认购买弹窗 const buyNft = async (val) => { + props.nftData['icon'] = icon.value + // props.nftData['icon'] = price.value buyDataArr.value = [] - buyDataArr.value.push(val) + buyDataArr.value.push(props.nftData) + console.log("buy",buyDataArr.value) + // return const buyResult = await createModal(BuyDialog, { buyDataArr: buyDataArr.value, }).show() diff --git a/src/components/common/hangingCard.vue b/src/components/common/hangingCard.vue index d4532d9..2b5d166 100644 --- a/src/components/common/hangingCard.vue +++ b/src/components/common/hangingCard.vue @@ -91,6 +91,7 @@ div { background: #16141b; border-color: #34354e; text-align: center; + font-size: 24px; &::before { display: none; } diff --git a/src/components/common/tradingCard.vue b/src/components/common/tradingCard.vue index 39d0d55..3da1198 100644 --- a/src/components/common/tradingCard.vue +++ b/src/components/common/tradingCard.vue @@ -76,7 +76,7 @@
Etherscan - +
@@ -128,6 +128,7 @@ div { background: #16141b; border-color: #34354e; text-align: center; + font-size: 24px; &::before { display: none; } diff --git a/src/components/layout/NavBar.vue b/src/components/layout/NavBar.vue index cb1a3e6..cbab3a2 100644 --- a/src/components/layout/NavBar.vue +++ b/src/components/layout/NavBar.vue @@ -38,7 +38,7 @@
- +
{{ marketplaceStore.getCartList.data?.length || 0 }} diff --git a/src/views/DetailView.vue b/src/views/DetailView.vue index 594fa40..4494296 100644 --- a/src/views/DetailView.vue +++ b/src/views/DetailView.vue @@ -43,13 +43,13 @@
Add to cart
- +
Remove from cart
- +