Merge branch 'new-CounterFire' of http://git.kingsome.cn/huangjinming/CounterFireGames into new-CounterFire

.env.dev

@@ -11,3 +11,4 @@ VUE_APP_PASSPORT_CLIENT_ID=0FNfXxQywm7wjdbyLTDzWt4txc53yRrT
 VUE_APP_PASSPORT_MARKET_ADDRESS=0x7d117aA8BD6D31c4fa91722f246388f38ab1942c
 VUE_APP_MKT_API='https://market-test.kingsome.cn'
 VUE_APP_NET_ID='13473'
+VUE_APP_MARKET_CURRENCY='0xFd42bfb03212dA7e1A4608a44d7658641D99CF34'

src/components/assets/card.vue

@@ -50,7 +50,7 @@ const props = defineProps({
 
 const sellDialogVisible = ref(false)
 const sellDataArr = ref([])
-
+const currency = import.meta.env.VUE_APP_MARKET_CURRENCY
 // 出售NFT
 const sellNft = async (val) => {
   console.log(val)
@@ -61,7 +61,7 @@ const sellNft = async (val) => {
     // import.meta.env.VUE_APP_PASSPORT_MARKET_ADDRESS
     contractAddress: val.contract_address,
     tokenId: val.token_id,
-    currencyAddress: val.owner_address,
+    currencyAddress: currency,
     currencyAmount: '1000000000000000000'
   }
   // sellDataArr.value.push(val)

src/wallet/passPort.js

@@ -27,7 +27,9 @@ class LPassportWallet {
         disableBlockedPopupOverlay: false, // Set to true to disable the blocked pop-up overlay
       }
     });
-    this.passportInstance.loginCallback();
+    this.passportInstance.loginCallback().then(()=>{}).catch(err=>{
+      console.log(err.message)
+    })
     this.client = new orderbook.Orderbook({ baseConfig });
   }
   async initWidget() {