From 7face64d013ac1697be4b1a61fd7c5d5307ffb7a Mon Sep 17 00:00:00 2001
From: yuyongdong <yuyongdong@kingsome.cn>
Date: Fri, 21 Jun 2024 10:45:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=9D=E5=A7=8B=E5=8C=96pa?=
 =?UTF-8?q?ssprod?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/layout/NavBar.vue |  6 ++++++
 src/wallet/passPort.js           | 14 +++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/components/layout/NavBar.vue b/src/components/layout/NavBar.vue
index e9a21c6..c28380a 100644
--- a/src/components/layout/NavBar.vue
+++ b/src/components/layout/NavBar.vue
@@ -282,6 +282,12 @@ watch(() => route.path,(newPath, oldPath) => {
   }
 })
 
+onMounted( async () => {
+  if( immutableStore.accessToken) {
+    await new PassportWallet().connect()
+  }
+})
+
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/wallet/passPort.js b/src/wallet/passPort.js
index b3b46da..1021f9a 100644
--- a/src/wallet/passPort.js
+++ b/src/wallet/passPort.js
@@ -55,7 +55,7 @@ class LPassportWallet {
     connect.mount('wallet');
   }
   async connect() {
-    const profile = await this.passportInstance.login();
+    // const profile = await this.passportInstance.login();
     // console.log(profile,'-----------------------------------------------------------------')
     const passportProvider = this.passportInstance.connectEvm();
     this.web3Provider = new providers.Web3Provider(passportProvider);
@@ -65,7 +65,7 @@ class LPassportWallet {
     // console.log('accessToken:', accessToken)
     // const idToken = await passportInstance.getIdToken();
     // console.log('idToken:', idToken)
-    return {profile, accounts, accessToken}
+    return { accounts, accessToken}
   }
 
   async logout() {
@@ -179,8 +179,8 @@ class LPassportWallet {
    * @param {*} listingId 
    */
   async beginBuy(listingId) {
-    // const fulfiller = await this.signer.getAddress();
-    const fulfiller = marketAddress
+    const fulfiller = await this.signer.getAddress();
+    // const fulfiller = marketAddress
     console.log(listingId,fulfiller)
     const { actions, expiration, order } = await this.client.fulfillOrder(
       listingId,
@@ -202,8 +202,8 @@ class LPassportWallet {
    * @param { string[] } listingIds: listingId列表
    */
   async batchBuy(listingIds) {
-    // const fulfiller = await this.signer.getAddress();
-    console.log(listingIds, marketAddress,'---')
+    const fulfiller = await this.signer.getAddress();
+    // console.log(listingIds, marketAddress,'---')
     // return
     try {
       const fulfillResponse = await this.client.fulfillBulkOrders(
@@ -212,7 +212,7 @@ class LPassportWallet {
           // you could have up to 2 marketplace fees
           takerFees: [],
         })),
-        marketAddress
+        fulfiller
       );
   
       if (fulfillResponse.sufficientBalance) {