huangjinming/cebg-website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://git.kingsome.cn/huangjinming/cebg-website

Browse Source
This commit is contained in:
huangjinming 2023-03-10 13:12:51 +08:00
commit 411d4a38e2
10 changed files with 57 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
.env.dev → .env.development
View File

98
package-lock.json generated
View File

@ -11,6 +11,7 @@
"@animxyz/core": "^0.6.6",
"@animxyz/vue3": "^0.6.7",
"@esbuild-plugins/node-globals-polyfill": "^0.2.3",
"@metamask/safe-event-emitter": "^2.0.0",
"@vueuse/core": "^9.12.0",
"@walletconnect/web3-provider": "^1.8.0",
"ant-design-vue": "^3.2.15",
@ -3296,39 +3297,6 @@
"typedarray": "^0.0.6"
}
},
"node_modules/concat-stream/node_modules/readable-stream": {
"version": "2.3.7",
"resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-2.3.7.tgz",
"integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
"dev": true,
"license": "MIT",
"dependencies": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
"isarray": "~1.0.0",
"process-nextick-args": "~2.0.0",
"safe-buffer": "~5.1.1",
"string_decoder": "~1.1.1",
"util-deprecate": "~1.0.1"
}
},
"node_modules/concat-stream/node_modules/safe-buffer": {
"version": "5.1.2",
"resolved": "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.1.2.tgz",
"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
"dev": true,
"license": "MIT"
},
"node_modules/concat-stream/node_modules/string_decoder": {
"version": "1.1.1",
"resolved": "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.1.1.tgz",
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
"dev": true,
"license": "MIT",
"dependencies": {
"safe-buffer": "~5.1.0"
}
},
"node_modules/content-disposition": {
"version": "0.5.4",
"resolved": "https://registry.npmmirror.com/content-disposition/-/content-disposition-0.5.4.tgz",
@ -5241,6 +5209,19 @@
"dev": true,
"license": "ISC"
},
"node_modules/fsevents": {
"version": "2.3.2",
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
"integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
"hasInstallScript": true,
"optional": true,
"os": [
"darwin"
],
"engines": {
"node": "^8.16.0 || ^10.6.0 || >=11.0.0"
}
},
"node_modules/function-bind": {
"version": "1.1.1",
"resolved": "https://registry.npmmirror.com/function-bind/-/function-bind-1.1.1.tgz",
@ -10239,11 +10220,10 @@
}
},
"node_modules/vite": {
"version": "4.1.1",
"resolved": "https://registry.npmmirror.com/vite/-/vite-4.1.1.tgz",
"integrity": "sha512-LM9WWea8vsxhr782r9ntg+bhSFS06FJgCvvB0+8hf8UWtvaiDagKYWXndjfX6kGl74keHJUcpzrQliDXZlF5yg==",
"version": "4.1.4",
"resolved": "https://registry.npmjs.org/vite/-/vite-4.1.4.tgz",
"integrity": "sha512-3knk/HsbSTKEin43zHu7jTwYWv81f8kgAL99G5NWBcA1LKvtvcVAC4JjBH1arBunO9kQka+1oGbrMKOjk4ZrBg==",
"dev": true,
"license": "MIT",
"dependencies": {
"esbuild": "^0.16.14",
"postcss": "^8.4.21",
@ -13524,38 +13504,6 @@
"inherits": "^2.0.3",
"readable-stream": "^2.2.2",
"typedarray": "^0.0.6"
},
"dependencies": {
"readable-stream": {
"version": "2.3.7",
"resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-2.3.7.tgz",
"integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
"dev": true,
"requires": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
"isarray": "~1.0.0",
"process-nextick-args": "~2.0.0",
"safe-buffer": "~5.1.1",
"string_decoder": "~1.1.1",
"util-deprecate": "~1.0.1"
}
},
"safe-buffer": {
"version": "5.1.2",
"resolved": "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.1.2.tgz",
"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
"dev": true
},
"string_decoder": {
"version": "1.1.1",
"resolved": "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.1.1.tgz",
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
"dev": true,
"requires": {
"safe-buffer": "~5.1.0"
}
}
}
},
"content-disposition": {
@ -15044,6 +14992,12 @@
"integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
"dev": true
},
"fsevents": {
"version": "2.3.2",
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
"integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
"optional": true
},
"function-bind": {
"version": "1.1.1",
"resolved": "https://registry.npmmirror.com/function-bind/-/function-bind-1.1.1.tgz",
@ -18644,9 +18598,9 @@
}
},
"vite": {
"version": "4.1.1",
"resolved": "https://registry.npmmirror.com/vite/-/vite-4.1.1.tgz",
"integrity": "sha512-LM9WWea8vsxhr782r9ntg+bhSFS06FJgCvvB0+8hf8UWtvaiDagKYWXndjfX6kGl74keHJUcpzrQliDXZlF5yg==",
"version": "4.1.4",
"resolved": "https://registry.npmjs.org/vite/-/vite-4.1.4.tgz",
"integrity": "sha512-3knk/HsbSTKEin43zHu7jTwYWv81f8kgAL99G5NWBcA1LKvtvcVAC4JjBH1arBunO9kQka+1oGbrMKOjk4ZrBg==",
"dev": true,
"requires": {
"esbuild": "^0.16.14",

3
src/chain/Chain.ts
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

3
src/chain/ChainManager.ts
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 {

20
src/components/layout/NavBar.vue
View File

@ -54,34 +54,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 "-";
}

4
src/main.js
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')

3
src/store/app.js
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;

4
src/store/user.js
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;
}

1
src/utils/request.ts
View File

@ -3,6 +3,7 @@ import { message } from 'ant-design-vue'
import glodata from '@/store/user_global';
console.log(import.meta.env);
const service = axios.create({
baseURL: import.meta.env.VUE_APP_BASE_API,

28
yarn.lock
View File

@ -560,7 +560,7 @@
"@metamask/safe-event-emitter@^2.0.0":
version "2.0.0"
resolved "https://registry.npmmirror.com/@metamask/safe-event-emitter/-/safe-event-emitter-2.0.0.tgz#af577b477c683fad17c619a78208cede06f9605c"
resolved "https://registry.npmmirror.com/@metamask/safe-event-emitter/-/safe-event-emitter-2.0.0.tgz"
integrity sha512-/kSXhY692qiV1MXu6EeOZvg5nECLclxNXcKCxJ3cXQgYuRymRHpdx/t7JXfsK+JLjwA1e1c1/SBrlQYpusC29Q==
"@nodelib/fs.scandir@2.1.5":
@ -3165,6 +3165,11 @@ fs.realpath@^1.0.0:
resolved "https://registry.npmmirror.com/fs.realpath/-/fs.realpath-1.0.0.tgz"
integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
fsevents@~2.3.2:
version "2.3.2"
resolved "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz"
integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
function-bind@^1.1.1:
version "1.1.1"
resolved "https://registry.npmmirror.com/function-bind/-/function-bind-1.1.1.tgz"
@ -4998,7 +5003,7 @@ readable-stream@^1.0.33:
isarray "0.0.1"
string_decoder "~0.10.x"
readable-stream@^2.0.0, readable-stream@^2.2.9:
readable-stream@^2.0.0, readable-stream@^2.2.2, readable-stream@^2.2.9:
version "2.3.8"
resolved "https://registry.npmmirror.com/readable-stream/-/readable-stream-2.3.8.tgz"
integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==
@ -5011,19 +5016,6 @@ readable-stream@^2.0.0, readable-stream@^2.2.9:
string_decoder "~1.1.1"
util-deprecate "~1.0.1"
readable-stream@^2.2.2:
version "2.3.7"
resolved "https://registry.npmmirror.com/readable-stream/-/readable-stream-2.3.7.tgz"
integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
dependencies:
core-util-is "~1.0.0"
inherits "~2.0.3"
isarray "~1.0.0"
process-nextick-args "~2.0.0"
safe-buffer "~5.1.1"
string_decoder "~1.1.1"
util-deprecate "~1.0.1"
readable-stream@^3.5.0:
version "3.6.1"
resolved "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.1.tgz"
@ -6075,9 +6067,9 @@ vite-plugin-require-transform@^1.0.9:
"@babel/types" "^7.15.6"
vite@^4.0.0, vite@^4.1.0, vite@>=2.0.0:
version "4.1.1"
resolved "https://registry.npmmirror.com/vite/-/vite-4.1.1.tgz"
integrity sha512-LM9WWea8vsxhr782r9ntg+bhSFS06FJgCvvB0+8hf8UWtvaiDagKYWXndjfX6kGl74keHJUcpzrQliDXZlF5yg==
version "4.1.4"
resolved "https://registry.npmjs.org/vite/-/vite-4.1.4.tgz"
integrity sha512-3knk/HsbSTKEin43zHu7jTwYWv81f8kgAL99G5NWBcA1LKvtvcVAC4JjBH1arBunO9kQka+1oGbrMKOjk4ZrBg==
dependencies:
esbuild "^0.16.14"
postcss "^8.4.21"