From 2d9c8ba3af5d390ad47ceebd65c790b8cdcd3948 Mon Sep 17 00:00:00 2001
From: yuyongdong <yuyongdong@kingsome.cn>
Date: Wed, 3 Jul 2024 21:45:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Dialogs/confirmDialog.vue      |  4 +-
 src/components/Dialogs/sellDialog.vue         |  6 ++-
 src/components/assets/assetsContent.vue       |  6 +--
 src/components/assets/collectibles.vue        |  2 +-
 src/components/assets/myCard.vue              | 36 ++++++++++---
 src/components/common/hangingCard.vue         |  4 +-
 src/components/common/searchView/Overview.vue |  2 +-
 .../common/searchView/nftStatusRadio.vue      | 54 +++++++++++++++++++
 .../common/searchView/statusRadio.vue         |  4 +-
 src/components/common/tradingCard.vue         |  4 +-
 src/configs/configchain.js                    |  2 +-
 src/views/DetailView.vue                      | 36 ++++++++++---
 vite.config.js                                |  1 +
 13 files changed, 133 insertions(+), 28 deletions(-)
 create mode 100644 src/components/common/searchView/nftStatusRadio.vue

diff --git a/src/components/Dialogs/confirmDialog.vue b/src/components/Dialogs/confirmDialog.vue
index 865ecc0..6a59c5a 100644
--- a/src/components/Dialogs/confirmDialog.vue
+++ b/src/components/Dialogs/confirmDialog.vue
@@ -110,7 +110,9 @@ function hideModal(result = null) {
     }
   }
   .cf-content-text {
-    width: 80%;
+    width: 75%;
+    margin: 0 auto;
+    margin-top: 10px;
     text-align: left;
     .cf-text {
       font-family: 'Poppins';
diff --git a/src/components/Dialogs/sellDialog.vue b/src/components/Dialogs/sellDialog.vue
index 91c552e..86d6868 100644
--- a/src/components/Dialogs/sellDialog.vue
+++ b/src/components/Dialogs/sellDialog.vue
@@ -186,8 +186,10 @@ const sellConfirm = async () => {
       currencyAmount: ethers.utils.parseEther(totalPrice(priceValue.value)).toString(),
       orderExpiry: orderData,
     };
-    const bc = new BlockChain();
+    console.log(data)
+    // return
     try {
+      const bc = new BlockChain();
       let res = await bc.market.beginSellERC721(data);
       if (res.result) {
         let timer = setTimeout(() => {
@@ -197,7 +199,7 @@ const sellConfirm = async () => {
         }, 2000);
       }
     } catch (e) {
-      console.log(e.message)
+      console.log(e)
       message.error("Your product failed to be listed");
     }
   } else {
diff --git a/src/components/assets/assetsContent.vue b/src/components/assets/assetsContent.vue
index 9c6a74a..4e56941 100644
--- a/src/components/assets/assetsContent.vue
+++ b/src/components/assets/assetsContent.vue
@@ -26,13 +26,13 @@ const marketplaceList = useMarketplaceStore()
 
 const navList = ref([
   {
-    name: "Collectibles"
+    name: "NFTs"
   },
   {
-    name: "Hanging list"
+    name: "Listings"
   },
   {
-    name: "Trading history"
+    name: "Trading History"
   },
 ])
 const navIndex = ref(0)
diff --git a/src/components/assets/collectibles.vue b/src/components/assets/collectibles.vue
index a04cbac..9452d79 100644
--- a/src/components/assets/collectibles.vue
+++ b/src/components/assets/collectibles.vue
@@ -31,7 +31,7 @@
 <script setup>
 import { ref, onMounted, toRaw, onUnmounted, watch } from "vue";
 import OverView from "@/components/common/searchView/Overview.vue";
-import Status from "@/components/common/searchView/statusRadio.vue";
+import Status from "@/components/common/searchView/nftStatusRadio.vue";
 import Card from "./myCard.vue";
 import NftId from "@/configs/item.json"
 import { apiAssetsState } from "@/utils/marketplace"
diff --git a/src/components/assets/myCard.vue b/src/components/assets/myCard.vue
index ef0bd67..f87bd3f 100644
--- a/src/components/assets/myCard.vue
+++ b/src/components/assets/myCard.vue
@@ -21,10 +21,10 @@
             <img src="@/assets/img/marketplace/ETHicon.png" alt="图片">
           </div>
         </div>
-        <div v-if="nftData.type == 0 && nftData.on_sale == 0" class="enabled" @click="lockToGame">
-          Enabled
+        <div v-if="nftData.type == 0 && nftData.on_sale == 0" class="enabled" @click="lockToGame('redeem')">
+          Redeem
         </div>
-        <div v-if="nftData.type == 1 && nftData.on_sale == 0" class="link-below" @click="lockToGame">
+        <div v-if="nftData.type == 1 && nftData.on_sale == 0" class="link-below" @click="lockToGame('convert')">
           Convert
         </div>
         <!-- <div>{{ nftData.owner_address.substr(0,6) }}...{{ nftData.owner_address.substr(-6) }}</div> -->
@@ -47,6 +47,8 @@ import ImgCard from "@/components/common/imgCard.vue"
 import { priceCalculated } from "@/configs/priceCalculate"
 import LazyLoadImg from "@/components/lazyloadimg"
 import placeholderImg from '@/assets/img/marketplace/GenesisHeroes_NFT.png'
+import {createModal} from "@/utils/model.util";
+import ConfirmDialog from "@/components/Dialogs/confirmDialog.vue"
 import { timeFormat } from "@/configs/priceCalculate"
 const emit = defineEmits(['renewMyNft'])
 
@@ -119,20 +121,40 @@ const cancelNft = async (val) => {
 }
 
 // 下链使用
-const lockToGame = async() => {
+const lockToGame = async(type) => {
 // console.log('lockToGame',toRaw(props.nftData).contract_address, [toRaw(props.nftData).token_id])
 // return
+  if(type == 'redeem') {
+    const confirmResult = await createModal(ConfirmDialog, {
+        title: '', 
+        message: 'Once enabled, the gold coin card will be consumed, and you will receive 100,000 gold coins in the game. Do you wish to continue with this?'
+      }).show()
+      if (confirmResult.errcode == 0) {
+        lockToGameConfirm()
+      }
+  } else if(type == 'convert') {
+    const confirmResult = await createModal(ConfirmDialog, {
+      title: '', 
+      message: ' After the hero links, you can use in the game, and can re-link in the game, whether to continue the next link?'
+    }).show()
+    console.log('confirmResult',confirmResult)
+    if (confirmResult.errcode == 0) {
+      lockToGameConfirm()
+    }
+  }
+}
+
+const lockToGameConfirm = async () => {
   try {
     const bc = new BlockChain()
     let res = await bc.locker.lock(toRaw(props.nftData).contract_address, [toRaw(props.nftData).token_id])
-    console.log('lockToGame success', res)
+    // console.log('lockToGame success', res)
     message.success('lockToGame success')
     router.go(-1)
   } catch (e) {
     console.log('lockToGame fail', e.message)
-    // message.error('lockToGame fail.')
+    message.error('lockToGame fail.')
   }
-
 }
 
 
diff --git a/src/components/common/hangingCard.vue b/src/components/common/hangingCard.vue
index 23e8baf..dcae232 100644
--- a/src/components/common/hangingCard.vue
+++ b/src/components/common/hangingCard.vue
@@ -29,14 +29,14 @@
           </div>
         </template>
       </a-table-column>
-      <a-table-column title="Create time" data-index="event">
+      <a-table-column title="Listing Time" data-index="event">
         <template  #default="{ text: event }">
           <div>
             {{ showTime(event.data.created_at) }}
           </div>
       </template>
       </a-table-column>
-      <a-table-column title="Expiry date" data-index="event">
+      <a-table-column title="Expiration Time" data-index="event">
         <template  #default="{ text: event }">
           <div>
             {{ showTime(event.data.end_at) }}
diff --git a/src/components/common/searchView/Overview.vue b/src/components/common/searchView/Overview.vue
index 3daf0b5..bd108e0 100644
--- a/src/components/common/searchView/Overview.vue
+++ b/src/components/common/searchView/Overview.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <h2>Search</h2>
-    <a-input :value="overviewValue" @pressEnter="overviewData" placeholder="Basic usage">
+    <a-input :value="overviewValue" @pressEnter="overviewData" placeholder="Search">
       <template #prefix>
         <search-outlined style="color: #9588ac;" />
       </template>
diff --git a/src/components/common/searchView/nftStatusRadio.vue b/src/components/common/searchView/nftStatusRadio.vue
new file mode 100644
index 0000000..480b4cd
--- /dev/null
+++ b/src/components/common/searchView/nftStatusRadio.vue
@@ -0,0 +1,54 @@
+<template>
+  <div class="hero-check">
+    <h2>Status</h2>
+    <a-radio-group v-model:value="props.statusValue" @change="onChangeValue">
+      <a-radio value="0">All</a-radio>
+      <a-radio value="1">Listed</a-radio>
+      <a-radio value="2">Unlisted</a-radio>
+    </a-radio-group>
+  </div>
+</template>
+<script setup>
+import { ref, reactive } from "vue";
+import { useMarketplaceStore } from "@/store/marketplace"
+const marketplaceList = useMarketplaceStore()
+const props = defineProps({
+  statusValue: {
+    type: Number,
+    required: true,
+  },
+});
+const emit = defineEmits(['clickStatusChild'])
+// const 
+const onChangeValue = (e) => {
+  emit('clickStatusChild',e.target.value)
+};
+</script>
+
+<style lang="scss" scoped>
+.hero-check {
+  h2 {
+    font-family: "Poppins";
+    font-weight: bold;
+    font-size: 20px;
+    color: #bb7fff;
+    margin-bottom: 10px;
+  }
+  :deep(.ant-radio-group) {
+    display: block;
+    .ant-radio-wrapper {
+      display: block !important;
+      span {
+        color: #BB7FFF;
+      }
+    }
+    .ant-checkbox-group-item {
+      display: flex !important;
+      background: #16141b;
+      span {
+        color: #BB7FFF !important;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/components/common/searchView/statusRadio.vue b/src/components/common/searchView/statusRadio.vue
index 480b4cd..1e6c056 100644
--- a/src/components/common/searchView/statusRadio.vue
+++ b/src/components/common/searchView/statusRadio.vue
@@ -3,8 +3,8 @@
     <h2>Status</h2>
     <a-radio-group v-model:value="props.statusValue" @change="onChangeValue">
       <a-radio value="0">All</a-radio>
-      <a-radio value="1">Listed</a-radio>
-      <a-radio value="2">Unlisted</a-radio>
+      <a-radio value="1">Sale</a-radio>
+      <a-radio value="2">Purchase</a-radio>
     </a-radio-group>
   </div>
 </template>
diff --git a/src/components/common/tradingCard.vue b/src/components/common/tradingCard.vue
index 49aaf97..cad4b3a 100644
--- a/src/components/common/tradingCard.vue
+++ b/src/components/common/tradingCard.vue
@@ -41,7 +41,7 @@
           </div>
         </template>
       </a-table-column>
-      <a-table-column title="Sender" data-index="event" :width="400">
+      <a-table-column title="From" data-index="event" :width="400">
         <template  #default="{ text: event }">
           <div class="sender">
             <div class="nft-sender">{{ sliceAddress(event.data.details.from) }}</div>
@@ -56,7 +56,7 @@
           </div>
         </template>
       </a-table-column>
-      <a-table-column title="recipient" data-index="event" :width="400">
+      <a-table-column title="To" data-index="event" :width="400">
         <template  #default="{ text: event }">
           <div class="recipient">
             <div class="nft-recipient">{{ sliceAddress(event.data.details.to) }}</div>
diff --git a/src/configs/configchain.js b/src/configs/configchain.js
index 92920f7..ea1b3bc 100644
--- a/src/configs/configchain.js
+++ b/src/configs/configchain.js
@@ -57,7 +57,7 @@ export const CURRENCYS = {
       id_query: 'ethereum'
     },
   },
-  13471: {
+  13371: {
     'NATIVE': {
       name: 'tIMX',
       decimals: 18,
diff --git a/src/views/DetailView.vue b/src/views/DetailView.vue
index 37899d8..80acb4f 100644
--- a/src/views/DetailView.vue
+++ b/src/views/DetailView.vue
@@ -60,8 +60,8 @@
               <div v-else>
                 <div class="sell" @click="beginSell" v-if="detailData.nft.on_sale == 0">List</div>
                 <div class="cancel" @click="cancelSell" v-if="detailData.nft.on_sale == 1">Cancel listing</div>
-                <div class="redeem" @click="lockToGame" v-if="detailData.nft.on_sale == 0 && detailData.nft.type == 1">Convert</div>
-                <div class="redeem" @click="lockToGame" v-if="detailData.nft.on_sale == 0 && detailData.nft.type == 0">Redeem</div>
+                <div class="redeem" @click="lockToGame('convert')" v-if="detailData.nft.on_sale == 0 && detailData.nft.type == 1">Convert</div>
+                <div class="redeem" @click="lockToGame('redeem')" v-if="detailData.nft.on_sale == 0 && detailData.nft.type == 0">Redeem</div>
               </div>
             </div>
             <div class="info">
@@ -165,6 +165,7 @@ import { ref, toRaw, onMounted , inject} from "vue"
 const message = inject('$message')
 import { useRouter } from "vue-router";
 import BuyDialog from "@/components/Dialogs/buyDialog.vue"
+import ConfirmDialog from "@/components/Dialogs/confirmDialog.vue"
 import ImgCard from "@/components/common/imgCard.vue"
 import StarTimer from "@/components/common/starTimer.vue"
 import SellDialog from "@/components/Dialogs/sellDialog.vue"
@@ -272,15 +273,38 @@ const clearCart = async () => {
   }
 }
 
-const lockToGame = async() => {
+const lockToGame = async(type) => {
+  if(type == 'redeem') {
+    const confirmResult = await createModal(ConfirmDialog, {
+        title: '', 
+        message: 'Once enabled, the gold coin card will be consumed, and you will receive 100,000 gold coins in the game. Do you wish to continue with this?'
+      }).show()
+      if (confirmResult.errcode == 0) {
+        lockToGameConfirm()
+      }
+  } else if(type == 'convert') {
+    const confirmResult = await createModal(ConfirmDialog, {
+      title: '', 
+      message: ' After the hero links, you can use in the game, and can re-link in the game, whether to continue the next link?'
+    }).show()
+    console.log('confirmResult',confirmResult)
+    if (confirmResult.errcode == 0) {
+      lockToGameConfirm()
+    }
+  }
+}
+
+const lockToGameConfirm = async () => {
+
   try {
     await new BlockChain().locker.lock(detailData.value.nft.contract_address, [detailData.value.nft.token_id])
-    console.log('lockToGame success')
+    // console.log('lockToGame success')
+    message.success('lockToGame success')
     router.go(-1)
   } catch (e) {
-    console.log('lockToGame fail', e.message)
+    // console.log('lockToGame fail', e.message)
+    message.error('lockToGame fail.')
   }
-
 }
 
 
diff --git a/vite.config.js b/vite.config.js
index 20a34d3..162e013 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -28,6 +28,7 @@ export default defineConfig({
       '@' : resolve(__dirname, 'src'),
       process: "process/browser",
       stream: "stream-browserify",
+      crypto: "crypto-browserify",
       // zlib: "browserify-zlib",
       util: 'util',
       web3: resolve(__dirname, 'node_modules/web3/dist/web3.min.js')