From a2b818d98a84f5a699fdb83240e6f89a5794c048 Mon Sep 17 00:00:00 2001
From: yuyongdong <yuyongdong@kingsome.cn>
Date: Tue, 2 Jul 2024 14:05:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=BB=9A=E5=8A=A8=E5=9B=BA?=
 =?UTF-8?q?=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Dialogs/loadingDialog.vue  |  4 ---
 src/components/Dialogs/sellDialog.vue     |  3 +-
 src/components/assets/hanging.vue         |  2 ++
 src/components/assets/myCard.vue          |  8 ++---
 src/components/marketplace/mktContent.vue |  5 +++
 src/views/MarketplaceView.vue             | 37 ++++++++++++++++++++---
 6 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/src/components/Dialogs/loadingDialog.vue b/src/components/Dialogs/loadingDialog.vue
index 7690991..b68df43 100644
--- a/src/components/Dialogs/loadingDialog.vue
+++ b/src/components/Dialogs/loadingDialog.vue
@@ -21,10 +21,6 @@ const props = defineProps({
   type: Boolean,
   required: true,
 },
-buyDataArr: {
-  type: Array,
-  required: true,
-},
 });
 
 const emit = defineEmits(['handleClose'])
diff --git a/src/components/Dialogs/sellDialog.vue b/src/components/Dialogs/sellDialog.vue
index a21c7d7..9e0b7a4 100644
--- a/src/components/Dialogs/sellDialog.vue
+++ b/src/components/Dialogs/sellDialog.vue
@@ -195,7 +195,8 @@ const sellConfirm = async () => {
       message.error('Your product failed to be listed')
     }
   } else {
-    alert("价格不能为空");
+    // alert("Price cannot be empty");
+    message.error('Price cannot be empty')
   }
 };
 
diff --git a/src/components/assets/hanging.vue b/src/components/assets/hanging.vue
index 294a038..6b8dc47 100644
--- a/src/components/assets/hanging.vue
+++ b/src/components/assets/hanging.vue
@@ -55,6 +55,8 @@ const getHistoryList = async () => {
   }
   if(myAddress) {
     let res = await apiHangingState(data)
+    console.log(res)
+    return
     for (let sub of res.rows) {
       if (sub.event?.data) {
         const _data = formatPrice(sub.event.data)
diff --git a/src/components/assets/myCard.vue b/src/components/assets/myCard.vue
index e9c8dd1..11cffb0 100644
--- a/src/components/assets/myCard.vue
+++ b/src/components/assets/myCard.vue
@@ -25,14 +25,14 @@
           Enabled
         </div>
         <div v-if="nftData.type == 1 && nftData.on_sale == 0" class="link-below" @click="lockToGame">
-          Link below
+          Convert
         </div>
         <!-- <div>{{ nftData.owner_address.substr(0,6) }}...{{ nftData.owner_address.substr(-6) }}</div> -->
       </div>
     </div>
     <div class="card-btn">
-      <div class="card-sell" v-if="nftData.on_sale == 0" @click="sellNft(nftData)">List for Sale</div>
-      <div class="card-cancel" v-if="nftData.on_sale == 1" @click="cancelNft(nftData)">Off the shelves</div>
+      <div class="card-sell" v-if="nftData.on_sale == 0" @click="sellNft(nftData)">List</div>
+      <div class="card-cancel" v-if="nftData.on_sale == 1" @click="cancelNft(nftData)">Cancel listing</div>
     </div>
     <SellDialog :sellDialogVisible="sellDialogVisible" :floorPrice="floorPrice" :sellDataArr="sellDataArr" @handleClose="sellHandleClose" />
   </div>
@@ -86,7 +86,7 @@ const getNftData = async (val) => {
   if(errcode == 0) {
     nftDetailData = data
   } else {
-    alert(errmsg)
+    // alert('0000')
   }
   return nftDetailData
 }
diff --git a/src/components/marketplace/mktContent.vue b/src/components/marketplace/mktContent.vue
index 9257b00..a11b7aa 100644
--- a/src/components/marketplace/mktContent.vue
+++ b/src/components/marketplace/mktContent.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="mkt-content">
+    <div class="content"></div>
     <div class="mkt-content-left">
       <OverView :overviewValue="marketplaceList.overview" @clickOverviewChild="overviewChild" />
       <Sort @clickSortChild="sortChild" />
@@ -64,6 +65,9 @@
         <div class="pages" v-if="nftList != undefined && nftList.length > 0">
           <li v-for="(item, index) in nftList" :key="index">
             <Card v-if="nftList != undefined || nftList.length > 0" @renewNft="renewNft" :nftData="item" />
+              <Card v-if="nftList != undefined || nftList.length > 0" @renewNft="renewNft" :nftData="item" />
+              <Card v-if="nftList != undefined || nftList.length > 0" @renewNft="renewNft" :nftData="item" />
+                <Card v-if="nftList != undefined || nftList.length > 0" @renewNft="renewNft" :nftData="item" />
           </li>
         </div>
         <div class="pages-no" v-else>
@@ -267,6 +271,7 @@ onMounted(() => {
   }
   .mkt-content-right {
     width: calc(100% - 300px);
+    // box-sizing: border-box;
     padding-right: 40px;
     .mkt-content-right-header {
       width: calc(100% - 10px);
diff --git a/src/views/MarketplaceView.vue b/src/views/MarketplaceView.vue
index 5a4b296..53cea41 100644
--- a/src/views/MarketplaceView.vue
+++ b/src/views/MarketplaceView.vue
@@ -1,7 +1,8 @@
 <template>
-  <div class="market">
-    <MktHeader />
-    <MktContent class="content" />
+  <div class="market" ref="market" :style="{overflow: marketOverflow}">
+      <MktHeader />
+      <!-- <MktContent  @wheel="handleScroll" :style="{ position: isFixed, top: 90+ 'px', }" ref="marketplaceContent" /> -->
+      <MktContent />
   </div>
 </template>
 
@@ -11,13 +12,39 @@ import { ref, reactive, onMounted, onUnmounted } from "vue";
 import MktHeader from '@/components/marketplace/mktHeader.vue'
 import MktContent from '@/components/marketplace/mktContent.vue'
 
+const marketOverflow = ref()
+const headerHeight = ref()
+const marketplaceContent = ref()
+const isFixed = ref(false)
+const handleScroll = (e) => {
+  
+  // console.log(marketplaceContent.value.$el.getBoundingClientRect().top, headerHeight.value.offsetHeight, marketplaceContent.value.$el.getBoundingClientRect().top - headerHeight.value.offsetHeight, e.offsetY)
+  // console.log(marketplaceContent.value.scrollTop)
+  if(marketplaceContent.value.$el.getBoundingClientRect().top < e.offsetY) {
+  //   console.log('固定 ')
+  //   // isFixed.value = true
+    isFixed.value = 'fixed'
+  //   marketOverflow.value = 'hidden'
+  } else {
+  //   // isFixed.value = false
+    isFixed.value = 'static'
+  //   console.log('滚动')
+  //   marketOverflow.value = 'auto'
+  }
+}
 
+onMounted(() => {
+  // marketplaceContent.value.addEventListener('scroll', doScroll)
+})
 
-
+onUnmounted(() => {
+  // content.value.removeEventListener('scroll', doScroll)
+})
 </script>
 
 <style lang="scss" scoped>
 .market {
-  background: #16141b;
+  width: 100%;
+  // height: 100vh;
 }
 </style>