Commit ecc0394e authored by web's avatar web

up

parent 164e02a2
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
"name": "AONET", "name": "AONET",
"version": "0.0.0", "version": "0.0.0",
"dependencies": { "dependencies": {
"@metamask/detect-provider": "^2.0.0",
"aonweb": "^1.0.2", "aonweb": "^1.0.2",
"aos": "^2.3.4", "aos": "^2.3.4",
"axios": "^1.6.8", "axios": "^1.6.8",
...@@ -1031,6 +1032,14 @@ ...@@ -1031,6 +1032,14 @@
"@jridgewell/sourcemap-codec": "^1.4.14" "@jridgewell/sourcemap-codec": "^1.4.14"
} }
}, },
"node_modules/@metamask/detect-provider": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/@metamask/detect-provider/-/detect-provider-2.0.0.tgz",
"integrity": "sha512-sFpN+TX13E9fdBDh9lvQeZdJn4qYoRb/6QF2oZZK/Pn559IhCFacPMU1rMuqyXoFQF3JSJfii2l98B87QDPeCQ==",
"engines": {
"node": ">=14.0.0"
}
},
"node_modules/@noble/curves": { "node_modules/@noble/curves": {
"version": "1.4.0", "version": "1.4.0",
"resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.4.0.tgz", "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.4.0.tgz",
...@@ -5040,6 +5049,11 @@ ...@@ -5040,6 +5049,11 @@
"@jridgewell/sourcemap-codec": "^1.4.14" "@jridgewell/sourcemap-codec": "^1.4.14"
} }
}, },
"@metamask/detect-provider": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/@metamask/detect-provider/-/detect-provider-2.0.0.tgz",
"integrity": "sha512-sFpN+TX13E9fdBDh9lvQeZdJn4qYoRb/6QF2oZZK/Pn559IhCFacPMU1rMuqyXoFQF3JSJfii2l98B87QDPeCQ=="
},
"@noble/curves": { "@noble/curves": {
"version": "1.4.0", "version": "1.4.0",
"resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.4.0.tgz", "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.4.0.tgz",
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
"type-check": "vue-tsc --build --force" "type-check": "vue-tsc --build --force"
}, },
"dependencies": { "dependencies": {
"@metamask/detect-provider": "^2.0.0",
"aonweb": "^1.0.2", "aonweb": "^1.0.2",
"aos": "^2.3.4", "aos": "^2.3.4",
"axios": "^1.6.8", "axios": "^1.6.8",
......
<script setup lang="ts"> <script setup lang="ts">
import { RouterView } from 'vue-router' import { RouterView } from 'vue-router'
import Header from '@/components/Header.vue';
</script> </script>
<template> <template>
<Header></Header>
<RouterView /> <RouterView />
</template> </template>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<div class="right"> <div class="right">
<div class="right_count"> <div class="right_count">
<img src="../assets/icons/money.png" class="moneyIcon"></img> <img src="../assets/icons/money.png" class="moneyIcon"></img>
<span class="count">{{balanceValue}}</span> <span class="count">{{ balanceValue }}</span>
</div> </div>
<img src="../assets/icons/user.png" v-if="!isUserPage" class="userIcon" @click="goUser"></img> <img src="../assets/icons/user.png" v-if="!isUserPage" class="userIcon" @click="goUser"></img>
</div> </div>
...@@ -16,11 +16,11 @@ ...@@ -16,11 +16,11 @@
<script setup> <script setup>
import { import {
defineProps, defineProps,
ref, ref,
onMounted, onMounted,
computed computed
} from 'vue'; } from 'vue';
import { useRouter,useRoute } from 'vue-router' import { useRouter, useRoute } from 'vue-router'
import { User } from 'aonweb' import { User } from 'aonweb'
import bus from '../eventBus.js'; import bus from '../eventBus.js';
...@@ -54,21 +54,23 @@ const goUser = () => { ...@@ -54,21 +54,23 @@ const goUser = () => {
const balance = async () => { const balance = async () => {
console.log("balance in") // console.log("balance in----")
let user = new User() try {
let result = await user.balance() let user = new User()
console.log("Header balance ",result) let result = await user.balance()
if (result && result._balances && result._balances.length) { console.log("Header balance ", result)
let temp = result._balances[0] if (result && result._balances && result._balances.length) {
balanceValue.value = temp / 1000000000000000000n let temp = result._balances[0]
balanceValue.value = temp / 1000000000000000000n
}
console.log("Header balanceValue.value ", balanceValue.value)
} catch (error) {
console.log(error, "balance error")
} }
console.log("Header balanceValue.value ",balanceValue.value)
}; };
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'
...@@ -76,9 +78,10 @@ const checkIfUserPage = () => { ...@@ -76,9 +78,10 @@ const checkIfUserPage = () => {
onMounted(() => { onMounted(() => {
checkIfUserPage(); checkIfUserPage();
// eventBus.config.globalProperties.$on('balance', (data) => { bus.on('get_balance', (data) => {
// handleBalance() console.log("get_balance", data)
// }); balance()
});
}); });
</script> </script>
......
<template> <template>
<Header></Header>
<div class="user"> <div class="user">
<div class="container complete"> <div class="container complete">
...@@ -28,11 +25,8 @@ import { ...@@ -28,11 +25,8 @@ import {
ref, ref,
} from 'vue'; } from 'vue';
import { useRoute,useRouter } from 'vue-router' import { useRoute,useRouter } from 'vue-router'
import Header from '../components/Header.vue';
const router = useRouter() const router = useRouter()
const goBack = () => { const goBack = () => {
router.back(); router.back();
} }
......
<template> <template>
<div class=""> <div class="">
<Header></Header>
<div class="container created"> <div class="container created">
<div class="resCon"> <div class="resCon">
<img class="res_img" :src="imageUrl" mode=""></img> <img class="res_img" :src="imageUrl" mode=""></img>
...@@ -26,8 +23,6 @@ import { ...@@ -26,8 +23,6 @@ import {
} from 'vue'; } from 'vue';
import { useRoute, useRouter } from 'vue-router' import { useRoute, useRouter } from 'vue-router'
import bus from '../eventBus.js'; import bus from '../eventBus.js';
import Header from '../components/Header.vue';
const router = useRouter() const router = useRouter()
const route = useRoute() const route = useRoute()
......
<template> <template>
<Header></Header>
<Loading :showLoading="showLoading" /> <Loading :showLoading="showLoading" />
<div> <div>
<!-- 页面内容 --> <!-- 页面内容 -->
...@@ -79,7 +78,6 @@ import { AI,AIOptions,User} from 'aonweb' ...@@ -79,7 +78,6 @@ import { AI,AIOptions,User} from 'aonweb'
import { getTemplate } from '../lib/getTemplate' import { getTemplate } from '../lib/getTemplate'
import 'vant/lib/index.css'; import 'vant/lib/index.css';
import Header from '../components/Header.vue';
import Loading from '../components/Loading.vue'; import Loading from '../components/Loading.vue';
import bus from '../eventBus.js'; import bus from '../eventBus.js';
......
<template> <template>
<Header></Header>
<div class="user"> <div class="user">
<div class="container"> <div class="container">
<div class="ava-con"> <div class="ava-con">
...@@ -41,13 +39,9 @@ import { ...@@ -41,13 +39,9 @@ import {
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
import { Options, User } from 'aonweb' import { Options, User } from 'aonweb'
import { showToast } from 'vant'; import { showToast } from 'vant';
import detectEthereumProvider from '@metamask/detect-provider';
import Header from '../components/Header.vue';
import bus from '../eventBus.js'; import bus from '../eventBus.js';
const router = useRouter() const router = useRouter()
const account = ref('') const account = ref('')
...@@ -76,25 +70,31 @@ function goToComplete() { ...@@ -76,25 +70,31 @@ function goToComplete() {
// https://app.aonet.ai/kvapi // https://app.aonet.ai/kvapi
async function getAccount() { async function getAccount() {
//User 的使用方法 try {
let user = new User() //User 的使用方法
if (!await user.islogin()) { let user = new User()
await user.login((acc,userId,error) => { const isLogin_status = await user.islogin()
console.log("getWeb3 account",acc) console.log(isLogin_status, 'isLogin_status')
console.log("getWeb3 userId",userId) if (!isLogin_status) {
console.log("getWeb3 error",error) await user.login((acc, userId, error) => {
account.value = acc console.log("getWeb3 account", acc)
bus.emit('get_balance',"login"); console.log("getWeb3 userId", userId)
// eventBus.config.globalProperties.$emit('balance'); console.log("getWeb3 error", error)
}) account.value = acc
} else { bus.emit('get_balance', "login");
let ethereum = await detectEthereumProvider() // eventBus.config.globalProperties.$emit('balance');
let get_account = await ethereum.request({ method: 'eth_requestAccounts' }) })
get_account = get_account[0] } else {
account.value = get_account let ethereum = await detectEthereumProvider()
bus.emit('get_balance',"login"); let get_account = await ethereum.request({ method: 'eth_requestAccounts' })
get_account = get_account[0]
account.value = get_account
bus.emit('get_balance', "login");
}
} catch (error) {
console.log(error, "getAccount error")
} }
// console.log("getWeb3 account", addr) // console.log("getWeb3 account", addr)
// account.value = addr[0] // account.value = addr[0]
......
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