This commit is contained in:
lightings 2023-03-10 12:02:49 +08:00
parent 40daef4c40
commit d6edaaf64e
6 changed files with 20 additions and 17 deletions

View File

@ -1,8 +1,9 @@
import Web3 from 'web3'
import { useAppStore } from '@/store/app'
import { ERC20ABI } from '@/configs/contracts'
import pinia from '@/store';
const AppModule = useAppStore();
const AppModule = useAppStore(pinia);
export class Chain {
private web3: Web3

View File

@ -1,5 +1,6 @@
import { Blockchain } from '@/chain/blockchain'
import { getNonce } from '@/api/User'
import pinia from '@/store';
import { useAppStore } from '@/store/app'
import { useUserStore } from '@/store/user'
import { message } from 'ant-design-vue'
@ -8,7 +9,7 @@ import { AVAILABLE_CHAINS } from '@/configs/configchain'
import { AllChains } from '@/configs/allchain'
import { ACTIVATE_PROXY_ABI, MYSTERY_BOX_ABI, MYSTERY_PROXY_ABI } from '@/configs/contracts'
const AppModule = useAppStore();
const AppModule = useAppStore(pinia);
const UserModule = useUserStore();
export default class ChainManager {

View File

@ -53,34 +53,32 @@
import { ref, reactive, onMounted, computed } from "vue";
import { useChainStore } from "@/store/chain";
import { useAppStore } from "@/store/app";
import pinia from "@/store";
import { useRouter, useRoute } from "vue-router";
import ChainModel from "../../components/home/ChainModel.vue";
const AppModule = useAppStore(pinia);
const AppModule = useAppStore();
const router = useRouter();
const chain = useChainStore();
const app = useAppStore();
function click(event) {
router.push(event.key);
}
const formatAddress = computed(() => {
console.log(AppModule.accountId.value,'AppModule.accountId');
if(!AppModule.accountId.value){
console.log(AppModule.accountId,'AppModule.accountId');
if(!AppModule.accountId){
return '-'
}
if (AppModule.accountId.value.length >= 10) {
if (AppModule.accountId.length >= 10) {
return (
AppModule.accountId.value.substring(0, 6) +
AppModule.accountId.substring(0, 6) +
"......" +
AppModule.accountId.value.substring(AppModule.accountId.value.length - 4)
AppModule.accountId.substring(AppModule.accountId.length - 4)
);
} else if (
AppModule.accountId.value.length > 0 &&
AppModule.accountId.value.length < 10
AppModule.accountId.length > 0 &&
AppModule.accountId.length < 10
) {
return AppModule.accountId.value
return AppModule.accountId
} else {
return "-";
}

View File

@ -5,7 +5,7 @@ import 'normalize.css';
import "@/assets/text/text.css";
import Antd from 'ant-design-vue';
import 'ant-design-vue/dist/antd.css';
import { createPinia } from "pinia";
import pinia from "@/store";
import router from "./router/index";
import VueAnimXyz from '@animxyz/vue3'
import '@animxyz/core' // Import css here if you haven't elsewhere
@ -13,4 +13,4 @@ import App from './App.vue'
import vue3dLoader from "vue-3d-loader";
const app = createApp(App);
app.use(createPinia()).use(VueAnimXyz).use(vue3dLoader).use(Antd).use(router).mount('#app')
app.use(pinia).use(VueAnimXyz).use(vue3dLoader).use(Antd).use(router).mount('#app')

View File

@ -27,8 +27,9 @@ export const useAppStore = defineStore('app', () => {
}
function updateAccount(_accountId) {
console.log("updateAccount start", accountId, _accountId);
accountId.value = _accountId;
console.log("updateAccount end", accountId, _accountId);
}
function updateChainID(_chainId) {
chainId.value = _chainId;

View File

@ -26,7 +26,7 @@ export const useUserStore = defineStore("user", () => {
const token = ref(getToken());
const accountId = ref(getAccountId());
AppModule.updateAccount(accountId);
AppModule.updateAccount(accountId.value);
if(token.value && accountId.value){
AppModule.updateStep(1);
@ -66,9 +66,11 @@ export const useUserStore = defineStore("user", () => {
console.log("login data: ", authData);
const res = await login(authData);
if (!res.errcode && res.token) {
accountId.value = account;
setToken(res.token);
console.log(res, "resres");
setAccountId(account);
AppModule.updateAccount(account);
AppModule.updateToken(res.token);
token.value = res.token;
}