From 427ca61d7a153d983268c39b19967cf081ad1bc6 Mon Sep 17 00:00:00 2001
From: CounterFire2023 <136581895+CounterFire2023@users.noreply.github.com>
Date: Tue, 25 Jun 2024 14:50:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=A6=E6=83=85=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E6=95=B0=E6=8D=AE=E8=8E=B7=E5=8F=96=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/assets/card.vue |  7 ++++---
 src/components/common/card.vue |  8 ++------
 src/router/index.js            | 10 ++++++++++
 src/utils/marketplace.js       |  5 +++++
 src/views/DetailView.vue       | 32 ++++++++++++++++++++------------
 5 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/src/components/assets/card.vue b/src/components/assets/card.vue
index d9eef3e..4bef8c3 100644
--- a/src/components/assets/card.vue
+++ b/src/components/assets/card.vue
@@ -2,7 +2,7 @@
   <div class="cards">
     <div class="card-top" v-if="nftData">
       <!-- @click="toDetail" -->
-      <div class="card-img">
+      <div class="card-img" @click="toDetail">
         <img :src="nftData.image" alt="图片">
       </div>
       <div class="card-name">
@@ -96,8 +96,9 @@ const getImageUrl = (name) => {
 const toDetail = () => {
   // detailData.nftData = toRaw(props.nftData)
   // router.push('/detail');
-  const nftData = toRaw(props.nftData)
-  router.push({name: 'Detail', state: { nftData }});
+  router.push(`/detail/${props.nftData.contract_address}/${props.nftData.token_id}`)
+  // const nftData = toRaw(props.nftData)
+  // router.push({name: 'Detail', state: { nftData }});
 }
 
 // 添加购物车
diff --git a/src/components/common/card.vue b/src/components/common/card.vue
index 98fa04b..e9aa4c4 100644
--- a/src/components/common/card.vue
+++ b/src/components/common/card.vue
@@ -66,12 +66,8 @@ const getImageUrl = (name) => {
 
 // 去详情页面
 const toDetail = () => {
-  // detailData.nftData = toRaw(props.nftData)
-  // router.push('/detail');
-  const _nftData = toRaw(props.nftData)
-  const nftData = _nftData.nft
-  nftData.event = _nftData.event
-  router.push({name: 'Detail', state: { nftData}});
+  const _data = toRaw(props.nftData)
+  router.push(`/detail/${_data.nft.contract_address}/${_data.nft.token_id}`)
 }
 
 // 添加购物车
diff --git a/src/router/index.js b/src/router/index.js
index 33506b3..ac9e84b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -43,6 +43,16 @@ const routes = [
       canonical: "https://.counterfire.games",
     },
   },
+  {
+    path: "/detail/:address/:tokenid",
+    name: "Detail",
+    component: Detail,
+    props: true,
+    meta: {
+      title: "Counter Fire-Detail",
+      canonical: "https://.counterfire.games",
+    },
+  },
   {
     path: "/assets",
     name: "Assets",
diff --git a/src/utils/marketplace.js b/src/utils/marketplace.js
index 624814d..e733272 100644
--- a/src/utils/marketplace.js
+++ b/src/utils/marketplace.js
@@ -93,3 +93,8 @@ export const apiDelCartList = async () => {
 export const apiClearCartList = async () => {
   const url = `${API_BASE}/api/shopcart/clear`
 }
+
+export const nftDetail = async(address, tokenId) => {
+  const url = `${API_BASE}/api/market/product/goods/${net_id}/${address}/${tokenId}`
+  return httpGet(url, {})
+}
\ No newline at end of file
diff --git a/src/views/DetailView.vue b/src/views/DetailView.vue
index d6a8a24..ba981f6 100644
--- a/src/views/DetailView.vue
+++ b/src/views/DetailView.vue
@@ -141,19 +141,21 @@
 import { ref, toRaw, onMounted } from "vue"
 import { useRouter } from "vue-router";
 import StarTimer from "@/components/common/starTimer.vue"
-import { apiDetail } from "@/utils/marketplace"
+import { nftDetail } from "@/utils/marketplace"
 import {priceCalculated} from "@/configs/priceCalculate.js"
-import { useDetailStore } from "@/store/detail"
-
-
 import { BlockChain } from "@/components/chain/BlockChain"
 import {walletStore} from "@/store/wallet";
 const router = useRouter();
 const localWalletStore = walletStore()
-const detailData = window.history.state.nftData
-console.log(detailData)
-const myAddress = localWalletStore.address
-const nftAbilities = ref(detailData.detail)
+const props = defineProps({
+  address: String,
+  tokenid: String
+})
+const detailData = ref(null)
+// const detailData = window.history.state.nftData
+// console.log(detailData)
+// const myAddress = localWalletStore.address
+// const nftAbilities = ref(detailData.detail)
 
 // 购买
 const buyNow = async () => {
@@ -227,10 +229,16 @@ const priceWei = (price) => {
 }
 
 const getDetail = async () => {
-  let address = localStorage.getItem('assessAddress')
-  let res = await apiDetail(address)
-  console.log('getDetail',toRaw(res))
-  nftData.value = res.rows
+  // let address = localStorage.getItem('assessAddress')
+  let { errcode, errmsg, data} = await nftDetail(props.address, props.tokenid)
+  if (errcode) {
+    console.log(errmsg)
+    //TODO:: 提示错误信息
+    return
+  }
+  const nftData = data.nft
+  nftData.event = data.event
+  detailData.value = nftData
 }
 
 onMounted(() => {