From a474382f3196a60854ff3ed0b620a2ab2505687e Mon Sep 17 00:00:00 2001
From: yuyongdong <yuyongdong@kingsome.cn>
Date: Mon, 24 Jun 2024 11:27:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E7=BA=A6=E8=B0=83=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                        | 10 +---------
 src/components/Dialogs/buyDialog.vue   | 10 ++++++++--
 src/components/assets/card.vue         |  5 ++---
 src/components/assets/collectibles.vue |  1 +
 src/components/cart/index.vue          |  2 +-
 src/components/common/card.vue         |  3 ++-
 src/configs/priceCalculate.js          |  9 +++++++++
 src/main.js                            |  3 +--
 src/views/HomeView.vue                 |  2 +-
 9 files changed, 26 insertions(+), 19 deletions(-)
 create mode 100644 src/configs/priceCalculate.js

diff --git a/components.d.ts b/components.d.ts
index 401c125..e0038a1 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -7,27 +7,22 @@ export {}
 /* prettier-ignore */
 declare module 'vue' {
   export interface GlobalComponents {
-    AAutoComplete: typeof import('ant-design-vue/es')['AutoComplete']
     AboutFooter: typeof import('./src/components/about/AboutFooter.vue')['default']
     AButton: typeof import('ant-design-vue/es')['Button']
-    ACheckbox: typeof import('ant-design-vue/es')['Checkbox']
     ACheckboxGroup: typeof import('ant-design-vue/es')['CheckboxGroup']
     ACollapse: typeof import('ant-design-vue/es')['Collapse']
     ACollapsePanel: typeof import('ant-design-vue/es')['CollapsePanel']
     AInput: typeof import('ant-design-vue/es')['Input']
-    AInputSearch: typeof import('ant-design-vue/es')['InputSearch']
     AModal: typeof import('ant-design-vue/es')['Modal']
     ASelect: typeof import('ant-design-vue/es')['Select']
-    ASelectOption: typeof import('ant-design-vue/es')['SelectOption']
     ASpace: typeof import('ant-design-vue/es')['Space']
     AssetsContent: typeof import('./src/components/assets/assetsContent.vue')['default']
     AssetsHeader: typeof import('./src/components/assets/assetsHeader.vue')['default']
     ATable: typeof import('ant-design-vue/es')['Table']
     ATableColumn: typeof import('ant-design-vue/es')['TableColumn']
-    ATooltip: typeof import('ant-design-vue/es')['Tooltip']
     Banner: typeof import('./src/components/home/banner.vue')['default']
     BuyDialog: typeof import('./src/components/Dialogs/buyDialog.vue')['default']
-    Card: typeof import('./src/components/common/card.vue')['default']
+    Card: typeof import('./src/components/assets/card.vue')['default']
     Cart: typeof import('./src/components/cart/index.vue')['default']
     ChainModel: typeof import('./src/components/home/ChainModel.vue')['default']
     ChipCard: typeof import('./src/components/home/ChipCard.vue')['default']
@@ -40,7 +35,6 @@ declare module 'vue' {
     HangingCard: typeof import('./src/components/common/hangingCard.vue')['default']
     Hero: typeof import('./src/components/common/searchView/hero.vue')['default']
     HeroCard: typeof import('./src/components/home/HeroCard.vue')['default']
-    HeroCheckBox: typeof import('./src/components/common/searchView/heroCheckBox.vue')['default']
     HeroWeaponChipSelector: typeof import('./src/components/home/HeroWeaponChipSelector.vue')['default']
     HomeFooter: typeof import('./src/components/home/HomeFooter.vue')['default']
     ImageTextModal: typeof import('./src/components/global/ImageTextModal.vue')['default']
@@ -48,7 +42,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']
-    LodingDialog: typeof import('./src/components/Dialogs/lodingDialog.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 +58,6 @@ declare module 'vue' {
     Sort: typeof import('./src/components/common/searchView/Sort.vue')['default']
     StarTimer: typeof import('./src/components/common/starTimer.vue')['default']
     Status: typeof import('./src/components/common/searchView/status.vue')['default']
-    Stotus: typeof import('./src/components/common/searchView/stotus.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/components/Dialogs/buyDialog.vue b/src/components/Dialogs/buyDialog.vue
index 87684f7..c1d0126 100644
--- a/src/components/Dialogs/buyDialog.vue
+++ b/src/components/Dialogs/buyDialog.vue
@@ -24,7 +24,8 @@
             </div>
             <div class="id">2516</div>
             <div class="price">
-              <div>0.018</div>
+              <!-- <div>{{ priceCalculated(buyDataArr[0].event.data.buy[0].amount) }}</div> -->
+              <div>0.08</div>
               <div class="price-img"><img src="@/assets/img/marketplace/ETHicon.png" alt=""></div>
             </div>
           </li>
@@ -35,7 +36,8 @@
           <li>Total&nbsp;:&nbsp;</li>
           <li>
             <div>
-              <span>0.36</span>
+              <!-- <span>{{ priceCalculated(buyDataArr[0].event.data.buy[0].amount) }}</span> -->
+              <span>0.08</span>
               <img src="@/assets/img/marketplace/ETHicon.png" alt="">
             </div>
             <div class="money">$ 400</div>
@@ -47,6 +49,7 @@
 </template>
 <script setup>
 import { ref, toRaw, defineEmits } from "vue";
+import {priceCalculated} from "@/configs/priceCalculate.js"
 import {PassportWallet} from "@/wallet/passPort.js"
 // const passProd = ref(new PassportWallet())
 const props = defineProps({
@@ -77,6 +80,9 @@ const buyConfirm = async () => {
   let res = await pass.beginBuy(toRaw(props.buyDataArr)[0].nft.token_id)
   console.log('购买', res)
 }
+// const priceAmount = () => {
+//   return priceCalculated(price)
+// }
 
 const handleCancel = (e) => {
   emit('handleClose')
diff --git a/src/components/assets/card.vue b/src/components/assets/card.vue
index 02b4eae..ab6e220 100644
--- a/src/components/assets/card.vue
+++ b/src/components/assets/card.vue
@@ -50,9 +50,8 @@ const props = defineProps({
 const buyDialogVisible = ref(false)
 const buyDataArr = ref([])
 
-// 确认购买弹窗
+// 出售NFT
 const sellNft = async (val) => {
-  debugger
   const data = {
     // import.meta.env.VUE_APP_PASSPORT_MARKET_ADDRESS
     contractAddress: val.contract_address,
@@ -64,7 +63,7 @@ const sellNft = async (val) => {
   // buyDialogVisible.value = true
   const pass = new PassportWallet()
   let res = await pass.beginSellERC721(data)
-  console.log('购买', res)
+  console.log('售NFT', res)
 }
 
 const getImageUrl = (name) => {
diff --git a/src/components/assets/collectibles.vue b/src/components/assets/collectibles.vue
index 4587cb9..26bc5a6 100644
--- a/src/components/assets/collectibles.vue
+++ b/src/components/assets/collectibles.vue
@@ -81,6 +81,7 @@ const getMyAssets = async () => {
     search_name: ''
   }
   let res = await apiAssetsState(myADdress, data)
+  console.log(res)
   nftList.value = res.rows
 }
 
diff --git a/src/components/cart/index.vue b/src/components/cart/index.vue
index 007fd77..9e466c1 100644
--- a/src/components/cart/index.vue
+++ b/src/components/cart/index.vue
@@ -73,7 +73,7 @@ const getCartList = async () => {
 }
 
 onMounted(()=> {
-  // getCartList()
+  getCartList()
 })
 
 </script>
diff --git a/src/components/common/card.vue b/src/components/common/card.vue
index 44d362e..7b8983f 100644
--- a/src/components/common/card.vue
+++ b/src/components/common/card.vue
@@ -11,7 +11,7 @@
       <div class="card-price">
         <div>
           <span>
-            0.085
+            {{ priceCalculated(nftData.event.data.buy[0].amount) }}
           </span>
           <img src="@/assets/img/marketplace/ETHicon.png" alt="图片">
         </div>
@@ -31,6 +31,7 @@
 <script setup>
 import { ref, toRaw, onMounted, getCurrentInstance } from "vue"
 import BuyDialog from "@/components/Dialogs/buyDialog.vue"
+import {priceCalculated} from "@/configs/priceCalculate.js"
 import { useDetailStore } from "@/store/detail"
 import {
   apiAddCartList
diff --git a/src/configs/priceCalculate.js b/src/configs/priceCalculate.js
new file mode 100644
index 0000000..8ff8997
--- /dev/null
+++ b/src/configs/priceCalculate.js
@@ -0,0 +1,9 @@
+// 计算价格精度
+export const priceCalculated = (price) => {
+  console.log('----')
+  let priceNum = Number(price)/1e18
+  if(isNaN(priceNum)){return priceNum}
+  let str = ''+priceNum
+  if(!/e/i.test(str)){return priceNum}
+  return (priceNum).toFixed(18).replace(/\.?0+$/,"")
+}
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index 638b443..97d29f4 100644
--- a/src/main.js
+++ b/src/main.js
@@ -17,10 +17,9 @@ import Vue3Autocounter from 'vue3-autocounter';
 import { notification } from 'ant-design-vue';
 import { createPinia } from 'pinia'
 import piniaPluginPersistedstate from 'pinia-plugin-persistedstate'
-
 import {PassportWallet} from '@/wallet/passPort';
 const passPortCallback = new PassportWallet()
-
+console.log(passPortCallback,'---')
 const pinia = createPinia()
 pinia.use(piniaPluginPersistedstate)
 
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index 1db9fe6..a7d0208 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -99,7 +99,7 @@ onMounted(() => {
     // 初始化时进行一次检测
     updateOrientation();
   }
-  console.log(isLandscape.value, "-=-=-");
+  // console.log(isLandscape.value, "-=-=-");
 });
 
 onUnmounted(() => {