Commit 484da319 authored by brent's avatar brent

update qonweb

parent e89bded1
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
"name": "AONET", "name": "AONET",
"version": "0.0.0", "version": "0.0.0",
"dependencies": { "dependencies": {
"aonweb": "^1.0.2", "aonweb": "^1.0.3",
"aos": "^2.3.4", "aos": "^2.3.4",
"axios": "^1.6.8", "axios": "^1.6.8",
"element-plus": "^2.7.5", "element-plus": "^2.7.5",
...@@ -1853,9 +1853,9 @@ ...@@ -1853,9 +1853,9 @@
} }
}, },
"node_modules/aonweb": { "node_modules/aonweb": {
"version": "1.0.2", "version": "1.0.3",
"resolved": "https://registry.npmjs.org/aonweb/-/aonweb-1.0.2.tgz", "resolved": "https://registry.npmjs.org/aonweb/-/aonweb-1.0.3.tgz",
"integrity": "sha512-js/hm0weUS1lbWpTgDWvfjttAxjmHl19pfpOWganrSVneFC89DEbI4x2wfPqSu+FGXyVtXoQbsY5Sv48tQQJVg==", "integrity": "sha512-TkYYhNpaqw53mrN+bTKmBcfIEf2kLt4pbRKPRb0izCj5qkJc1k1OUGCLtGwYjGNmFC3JaaMYesvRCgRz6dv/HQ==",
"dependencies": { "dependencies": {
"@fingerprintjs/fingerprintjs": "^4.4.0", "@fingerprintjs/fingerprintjs": "^4.4.0",
"bignumber.js": "^9.1.2", "bignumber.js": "^9.1.2",
...@@ -5621,9 +5621,9 @@ ...@@ -5621,9 +5621,9 @@
} }
}, },
"aonweb": { "aonweb": {
"version": "1.0.2", "version": "1.0.3",
"resolved": "https://registry.npmjs.org/aonweb/-/aonweb-1.0.2.tgz", "resolved": "https://registry.npmjs.org/aonweb/-/aonweb-1.0.3.tgz",
"integrity": "sha512-js/hm0weUS1lbWpTgDWvfjttAxjmHl19pfpOWganrSVneFC89DEbI4x2wfPqSu+FGXyVtXoQbsY5Sv48tQQJVg==", "integrity": "sha512-TkYYhNpaqw53mrN+bTKmBcfIEf2kLt4pbRKPRb0izCj5qkJc1k1OUGCLtGwYjGNmFC3JaaMYesvRCgRz6dv/HQ==",
"requires": { "requires": {
"@fingerprintjs/fingerprintjs": "^4.4.0", "@fingerprintjs/fingerprintjs": "^4.4.0",
"bignumber.js": "^9.1.2", "bignumber.js": "^9.1.2",
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
"type-check": "vue-tsc --build --force" "type-check": "vue-tsc --build --force"
}, },
"dependencies": { "dependencies": {
"aonweb": "^1.0.2", "aonweb": "^1.0.3",
"aos": "^2.3.4", "aos": "^2.3.4",
"axios": "^1.6.8", "axios": "^1.6.8",
"element-plus": "^2.7.5", "element-plus": "^2.7.5",
......
...@@ -71,6 +71,10 @@ const balance = async () => { ...@@ -71,6 +71,10 @@ const balance = async () => {
}; };
bus.on('get_balance', (data) => {
console.log("get_balance", data)
balance()
});
const checkIfUserPage = () => { const checkIfUserPage = () => {
isUserPage.value = route.path === '/user' isUserPage.value = route.path === '/user'
...@@ -78,10 +82,8 @@ const checkIfUserPage = () => { ...@@ -78,10 +82,8 @@ const checkIfUserPage = () => {
onMounted(() => { onMounted(() => {
checkIfUserPage(); checkIfUserPage();
bus.on('get_balance', (data) => {
console.log("get_balance", data) balance()
balance()
});
}); });
</script> </script>
......
...@@ -237,14 +237,15 @@ async function login() { ...@@ -237,14 +237,15 @@ async function login() {
let temp = await user.islogin() let temp = await user.islogin()
if (!temp) { if (!temp) {
console.log('index islogin') console.log('index islogin')
await user.login((acc,userId,error) => { user.login((acc,userId,error) => {
console.log("getWeb3 account",acc) console.log("getWeb3 account",acc)
console.log("getWeb3 userId",userId) console.log("getWeb3 userId",userId)
console.log("getWeb3 error",error) console.log("getWeb3 error",error)
bus.emit('get_balance',"login"); bus.emit('get_balance',"login");
}) })
return
} }
bus.emit('get_balance',"login"); // bus.emit('get_balance',"login");
console.log('index islogin sssss',temp) console.log('index islogin sssss',temp)
} }
......
...@@ -37,7 +37,7 @@ import { ...@@ -37,7 +37,7 @@ import {
onMounted onMounted
} from 'vue'; } from 'vue';
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
import { Options, User } from 'aonweb' import { Options, User ,detectEthereumProvider} from 'aonweb'
import { showToast } from 'vant'; import { showToast } from 'vant';
import bus from '../eventBus.js'; import bus from '../eventBus.js';
...@@ -75,7 +75,7 @@ async function getAccount() { ...@@ -75,7 +75,7 @@ async function getAccount() {
const isLogin_status = await user.islogin() const isLogin_status = await user.islogin()
console.log(isLogin_status, 'isLogin_status') console.log(isLogin_status, 'isLogin_status')
if (!isLogin_status) { if (!isLogin_status) {
await user.login((acc, userId, error) => { user.login((acc, userId, error) => {
console.log("getWeb3 account", acc) console.log("getWeb3 account", acc)
console.log("getWeb3 userId", userId) console.log("getWeb3 userId", userId)
console.log("getWeb3 error", error) console.log("getWeb3 error", error)
...@@ -88,7 +88,7 @@ async function getAccount() { ...@@ -88,7 +88,7 @@ async function getAccount() {
let get_account = await ethereum.request({ method: 'eth_requestAccounts' }) let get_account = await ethereum.request({ method: 'eth_requestAccounts' })
get_account = get_account[0] get_account = get_account[0]
account.value = get_account account.value = get_account
bus.emit('get_balance', "login"); // bus.emit('get_balance', "login");
} }
} catch (error) { } catch (error) {
console.log(error, "getAccount error") console.log(error, "getAccount error")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment