Commit 73e8ac1e authored by web's avatar web

up

parent b56b4c38
...@@ -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.6", "aonweb": "^1.0.7",
"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",
...@@ -1854,9 +1854,9 @@ ...@@ -1854,9 +1854,9 @@
} }
}, },
"node_modules/aonweb": { "node_modules/aonweb": {
"version": "1.0.6", "version": "1.0.7",
"resolved": "https://registry.npmjs.org/aonweb/-/aonweb-1.0.6.tgz", "resolved": "https://registry.npmjs.org/aonweb/-/aonweb-1.0.7.tgz",
"integrity": "sha512-whtEW2EVyEu3Ig8ZSM6lzCeT5DkjMedSqOsIID4e0z07j2gFDaJ6jGZk9SjQi6Qd0wl0KfgmumkOIEhcNDcM7w==", "integrity": "sha512-sckRqHLBcFt5GHEEgxmZ8RUAJ+eZEZQsmMyuXCup5mHcBj46GHDHg9XcE44GgjJYSTk5MDC+5Xh/k3J/DuAZoQ==",
"dependencies": { "dependencies": {
"@fingerprintjs/fingerprintjs": "^4.4.0", "@fingerprintjs/fingerprintjs": "^4.4.0",
"bignumber.js": "^9.1.2", "bignumber.js": "^9.1.2",
...@@ -5672,9 +5672,9 @@ ...@@ -5672,9 +5672,9 @@
} }
}, },
"aonweb": { "aonweb": {
"version": "1.0.6", "version": "1.0.7",
"resolved": "https://registry.npmjs.org/aonweb/-/aonweb-1.0.6.tgz", "resolved": "https://registry.npmjs.org/aonweb/-/aonweb-1.0.7.tgz",
"integrity": "sha512-whtEW2EVyEu3Ig8ZSM6lzCeT5DkjMedSqOsIID4e0z07j2gFDaJ6jGZk9SjQi6Qd0wl0KfgmumkOIEhcNDcM7w==", "integrity": "sha512-sckRqHLBcFt5GHEEgxmZ8RUAJ+eZEZQsmMyuXCup5mHcBj46GHDHg9XcE44GgjJYSTk5MDC+5Xh/k3J/DuAZoQ==",
"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.6", "aonweb": "^1.0.7",
"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",
......
...@@ -210,12 +210,16 @@ const formSubmit = async () => { ...@@ -210,12 +210,16 @@ const formSubmit = async () => {
goToComplete(url) goToComplete(url)
} else { } else {
showLoading.value = false showLoading.value = false
showToast('AI processing failed') let task_error = response && response.task && response.task.task_error
let api_error = response && response.task && response.task.api_error
let message = response && response.message
let msg = task_error || api_error || message
showToast(msg || 'AI processing failed')
} }
} catch (error) { } catch (error) {
showLoading.value = false showLoading.value = false
// showToast('AI processing failed') // showToast('AI processing failed')
if (error && typeof error == 'string'){ if (error && typeof error == 'string') {
showToast(error); showToast(error);
} else { } else {
showToast(error.message); showToast(error.message);
...@@ -249,19 +253,20 @@ async function login() { ...@@ -249,19 +253,20 @@ async function login() {
message: 'Loading...', message: 'Loading...',
}); });
console.log(`demo index login after showLoadingToast time = ${new Date().getTime() - time}`) console.log(`demo index login after showLoadingToast time = ${new Date().getTime() - time}`)
let user = new User() let user = new User()
let temp = await user.islogin() let temp = await user.islogin()
console.log(`demo index islogin res time = ${new Date().getTime() - time}`) console.log(`demo index islogin res time = ${new Date().getTime() - time}`)
if (!temp) { if (!temp) {
console.log(`demo index before login time = ${new Date().getTime() - time}`) console.log(`demo index before login time = ${new Date().getTime() - time}`)
user.login((acc, userId, error) => { user.login((acc, userId, error) => {
closeToast();
console.log(`demo index login res time = ${new Date().getTime() - time}`) console.log(`demo index login res time = ${new Date().getTime() - time}`)
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)
if (error) { if (error) {
if (error && typeof error == 'string'){ if (error && typeof error == 'string') {
showToast(error); showToast(error);
} else { } else {
showToast(error.message); showToast(error.message);
...@@ -275,14 +280,14 @@ async function login() { ...@@ -275,14 +280,14 @@ async function login() {
} }
bus.emit('get_balance', "login"); bus.emit('get_balance', "login");
} catch (error) { } catch (error) {
console.log("index demo error",error) console.log("index demo error", error)
if (error && typeof error == 'string'){ closeToast();
if (error && typeof error == 'string') {
showToast(error); showToast(error);
} else { } else {
showToast(error.message); showToast(error.message);
} }
} finally { } finally {
closeToast();
} }
} }
......
...@@ -80,6 +80,7 @@ async function getAccount() { ...@@ -80,6 +80,7 @@ async function getAccount() {
console.log(isLogin_status, 'isLogin_status') console.log(isLogin_status, 'isLogin_status')
if (!isLogin_status) { if (!isLogin_status) {
user.login((acc, userId, error) => { user.login((acc, userId, error) => {
closeToast()
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)
...@@ -95,14 +96,15 @@ async function getAccount() { ...@@ -95,14 +96,15 @@ async function getAccount() {
bus.emit('get_balance', "login"); bus.emit('get_balance', "login");
} }
} catch (error) { } catch (error) {
closeToast()
console.log(error, "getAccount error") console.log(error, "getAccount error")
if (error && typeof error == 'string'){ if (error && typeof error == 'string') {
showToast(error); showToast(error);
} else { } else {
showToast(error.message); showToast(error.message);
} }
} finally { } finally {
closeToast()
} }
// console.log("getWeb3 account", addr) // console.log("getWeb3 account", addr)
......
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