diff --git a/components/tabBar/tabBar.vue b/components/tabBar/tabBar.vue index 49c1cf7..09a45eb 100644 --- a/components/tabBar/tabBar.vue +++ b/components/tabBar/tabBar.vue @@ -14,7 +14,7 @@ - + NFT diff --git a/manifest.json b/manifest.json index fd0e358..a367c7d 100644 --- a/manifest.json +++ b/manifest.json @@ -84,7 +84,12 @@ }, "splashscreen" : { "androidStyle" : "default", - "iosStyle" : "default" + "iosStyle" : "default", + "android" : { + "hdpi" : "", + "xhdpi" : "", + "xxhdpi" : "" + } } } }, diff --git a/package-lock.json b/package-lock.json index 6d86c5e..5fef04e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,24 +12,6 @@ "regenerator-runtime": "^0.13.4" } }, - "@ethereumjs/common": { - "version": "2.5.0", - "resolved": "https://registry.npmmirror.com/@ethereumjs/common/download/@ethereumjs/common-2.5.0.tgz?cache=0&sync_timestamp=1632736982733&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40ethereumjs%2Fcommon%2Fdownload%2F%40ethereumjs%2Fcommon-2.5.0.tgz", - "integrity": "sha1-7GFVGzG+96adHcY02JMkaIZqQmg=", - "requires": { - "crc-32": "^1.2.0", - "ethereumjs-util": "^7.1.1" - } - }, - "@ethereumjs/tx": { - "version": "3.3.2", - "resolved": "https://registry.npmmirror.com/@ethereumjs/tx/download/@ethereumjs/tx-3.3.2.tgz", - "integrity": "sha1-NI1GJL8kiqq2xE/sKuZyZe/j2wA=", - "requires": { - "@ethereumjs/common": "^2.5.0", - "ethereumjs-util": "^7.1.2" - } - }, "@ethersproject/abi": { "version": "5.0.7", "resolved": "https://registry.npmmirror.com/@ethersproject/abi/download/@ethersproject/abi-5.0.7.tgz", @@ -482,7 +464,7 @@ }, "ajv": { "version": "6.12.6", - "resolved": "https://registry.nlark.com/ajv/download/ajv-6.12.6.tgz?cache=0&sync_timestamp=1631470912358&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fajv%2Fdownload%2Fajv-6.12.6.tgz", + "resolved": "https://registry.npmmirror.com/ajv/download/ajv-6.12.6.tgz?cache=0&sync_timestamp=1636406052395&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fajv%2Fdownload%2Fajv-6.12.6.tgz", "integrity": "sha1-uvWmLoArB9l3A0WG+MO69a3ybfQ=", "requires": { "fast-deep-equal": "^3.1.1", @@ -999,15 +981,6 @@ "vary": "^1" } }, - "crc-32": { - "version": "1.2.0", - "resolved": "https://registry.nlark.com/crc-32/download/crc-32-1.2.0.tgz", - "integrity": "sha1-yy224puIUI4y2d0OwWk+e0Ghggg=", - "requires": { - "exit-on-epipe": "~1.0.1", - "printj": "~1.1.0" - } - }, "create-ecdh": { "version": "4.0.4", "resolved": "https://registry.nlark.com/create-ecdh/download/create-ecdh-4.0.4.tgz", @@ -1314,6 +1287,11 @@ "js-sha3": "^0.8.0" } }, + "ethereum-common": { + "version": "0.0.18", + "resolved": "https://registry.nlark.com/ethereum-common/download/ethereum-common-0.0.18.tgz", + "integrity": "sha1-L9w1dvIykDNYl26znaeDIT/5Uj8=" + }, "ethereum-cryptography": { "version": "0.1.3", "resolved": "https://registry.npmmirror.com/ethereum-cryptography/download/ethereum-cryptography-0.1.3.tgz", @@ -1338,59 +1316,46 @@ }, "ethereumjs-common": { "version": "1.5.2", - "resolved": "https://registry.nlark.com/ethereumjs-common/download/ethereumjs-common-1.5.2.tgz", + "resolved": "https://registry.npmmirror.com/ethereumjs-common/download/ethereumjs-common-1.5.2.tgz", "integrity": "sha1-IGXb6SFOhQ8ulVqA5lDLaZkGaXk=" }, "ethereumjs-tx": { - "version": "2.1.2", - "resolved": "https://registry.nlark.com/ethereumjs-tx/download/ethereumjs-tx-2.1.2.tgz", - "integrity": "sha1-Xf52iL8Xe0XJoj+Gz5EE1H6jX+0=", + "version": "1.3.7", + "resolved": "https://registry.npmmirror.com/ethereumjs-tx/download/ethereumjs-tx-1.3.7.tgz", + "integrity": "sha1-iDI6LYdbEFSbg0fgn0hitUbz2Jo=", "requires": { - "ethereumjs-common": "^1.5.0", - "ethereumjs-util": "^6.0.0" + "ethereum-common": "^0.0.18", + "ethereumjs-util": "^5.0.0" }, "dependencies": { "ethereumjs-util": { - "version": "6.2.1", - "resolved": "https://registry.npmmirror.com/ethereumjs-util/download/ethereumjs-util-6.2.1.tgz?cache=0&sync_timestamp=1634210709178&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fethereumjs-util%2Fdownload%2Fethereumjs-util-6.2.1.tgz", - "integrity": "sha1-/LTk3Vzqy50jBUJqsaXNk+MWO2k=", + "version": "5.2.1", + "resolved": "https://registry.npmmirror.com/ethereumjs-util/download/ethereumjs-util-5.2.1.tgz?cache=0&sync_timestamp=1634210709178&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fethereumjs-util%2Fdownload%2Fethereumjs-util-5.2.1.tgz", + "integrity": "sha1-qDPw5fyn5bNhOE3HYwGnIfU3v2U=", "requires": { - "@types/bn.js": "^4.11.3", "bn.js": "^4.11.0", "create-hash": "^1.1.2", "elliptic": "^6.5.2", "ethereum-cryptography": "^0.1.3", - "ethjs-util": "0.1.6", - "rlp": "^2.2.3" + "ethjs-util": "^0.1.3", + "rlp": "^2.0.0", + "safe-buffer": "^5.1.1" } } } }, "ethereumjs-util": { - "version": "7.1.3", - "resolved": "https://registry.npmmirror.com/ethereumjs-util/download/ethereumjs-util-7.1.3.tgz?cache=0&sync_timestamp=1634210709178&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fethereumjs-util%2Fdownload%2Fethereumjs-util-7.1.3.tgz", - "integrity": "sha1-tV17ZN3j4+RXSeTEEogjjt7DLSM=", + "version": "6.2.1", + "resolved": "https://registry.npmmirror.com/ethereumjs-util/download/ethereumjs-util-6.2.1.tgz?cache=0&sync_timestamp=1634210709178&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fethereumjs-util%2Fdownload%2Fethereumjs-util-6.2.1.tgz", + "integrity": "sha1-/LTk3Vzqy50jBUJqsaXNk+MWO2k=", "requires": { - "@types/bn.js": "^5.1.0", - "bn.js": "^5.1.2", + "@types/bn.js": "^4.11.3", + "bn.js": "^4.11.0", "create-hash": "^1.1.2", + "elliptic": "^6.5.2", "ethereum-cryptography": "^0.1.3", - "rlp": "^2.2.4" - }, - "dependencies": { - "@types/bn.js": { - "version": "5.1.0", - "resolved": "https://registry.nlark.com/@types/bn.js/download/@types/bn.js-5.1.0.tgz", - "integrity": "sha1-MsXScVA6EmU8Ys9NK0Xm6rjOvGg=", - "requires": { - "@types/node": "*" - } - }, - "bn.js": { - "version": "5.2.0", - "resolved": "https://registry.npm.taobao.org/bn.js/download/bn.js-5.2.0.tgz", - "integrity": "sha1-NYhgZ0OWxpl3canQUfzBtX1K4AI=" - } + "ethjs-util": "0.1.6", + "rlp": "^2.2.3" } }, "ethers": { @@ -1466,7 +1431,7 @@ }, "ethjs-util": { "version": "0.1.6", - "resolved": "https://registry.npm.taobao.org/ethjs-util/download/ethjs-util-0.1.6.tgz", + "resolved": "https://registry.npmmirror.com/ethjs-util/download/ethjs-util-0.1.6.tgz", "integrity": "sha1-8wi2Lxhfn+YjcTL7KpgYhmpc1TY=", "requires": { "is-hex-prefixed": "1.0.0", @@ -1487,11 +1452,6 @@ "safe-buffer": "^5.1.1" } }, - "exit-on-epipe": { - "version": "1.0.1", - "resolved": "https://registry.nlark.com/exit-on-epipe/download/exit-on-epipe-1.0.1.tgz", - "integrity": "sha1-C92S6H1ShdJn2qgXHQ6wYVlolpI=" - }, "express": { "version": "4.17.1", "resolved": "https://registry.nlark.com/express/download/express-4.17.1.tgz?cache=0&sync_timestamp=1618847120573&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fexpress%2Fdownload%2Fexpress-4.17.1.tgz", @@ -2078,7 +2038,7 @@ }, "json-schema": { "version": "0.2.3", - "resolved": "https://registry.npm.taobao.org/json-schema/download/json-schema-0.2.3.tgz?cache=0&sync_timestamp=1609553637722&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjson-schema%2Fdownload%2Fjson-schema-0.2.3.tgz", + "resolved": "https://registry.npmmirror.com/json-schema/download/json-schema-0.2.3.tgz?cache=0&sync_timestamp=1636423494254&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fjson-schema%2Fdownload%2Fjson-schema-0.2.3.tgz", "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" }, "json-schema-traverse": { @@ -2179,20 +2139,20 @@ }, "mime": { "version": "1.6.0", - "resolved": "https://registry.npmmirror.com/mime/download/mime-1.6.0.tgz?cache=0&sync_timestamp=1635900726749&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime%2Fdownload%2Fmime-1.6.0.tgz", + "resolved": "https://registry.npmmirror.com/mime/download/mime-1.6.0.tgz", "integrity": "sha1-Ms2eXGRVO9WNGaVor0Uqz/BJgbE=" }, "mime-db": { - "version": "1.50.0", - "resolved": "https://registry.nlark.com/mime-db/download/mime-db-1.50.0.tgz", - "integrity": "sha1-q9SslOmNPA4YUBbGerRdX95AwR8=" + "version": "1.51.0", + "resolved": "https://registry.npmmirror.com/mime-db/download/mime-db-1.51.0.tgz?cache=0&sync_timestamp=1636425951030&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-db%2Fdownload%2Fmime-db-1.51.0.tgz", + "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==" }, "mime-types": { - "version": "2.1.33", - "resolved": "https://registry.npmmirror.com/mime-types/download/mime-types-2.1.33.tgz?cache=0&sync_timestamp=1633108176041&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-types%2Fdownload%2Fmime-types-2.1.33.tgz", - "integrity": "sha1-H6EqkERy+v0GjkjZ6EAfdNP3Dts=", + "version": "2.1.34", + "resolved": "https://registry.npmmirror.com/mime-types/download/mime-types-2.1.34.tgz?cache=0&sync_timestamp=1636432355847&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-types%2Fdownload%2Fmime-types-2.1.34.tgz", + "integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==", "requires": { - "mime-db": "1.50.0" + "mime-db": "1.51.0" } }, "mimic-response": { @@ -2474,11 +2434,6 @@ "resolved": "https://registry.nlark.com/prepend-http/download/prepend-http-2.0.0.tgz?cache=0&sync_timestamp=1628547439455&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fprepend-http%2Fdownload%2Fprepend-http-2.0.0.tgz", "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=" }, - "printj": { - "version": "1.1.2", - "resolved": "https://registry.nlark.com/printj/download/printj-1.1.2.tgz", - "integrity": "sha1-2Q3rKXWoufYA+zoclOP0xTx4oiI=" - }, "process": { "version": "0.11.10", "resolved": "https://registry.npm.taobao.org/process/download/process-0.11.10.tgz", @@ -3085,6 +3040,11 @@ "which-boxed-primitive": "^1.0.2" } }, + "underscore": { + "version": "1.9.1", + "resolved": "https://registry.nlark.com/underscore/download/underscore-1.9.1.tgz", + "integrity": "sha1-BtzjSg5op7q8KbNluOdLiSUgOWE=" + }, "universalify": { "version": "0.1.2", "resolved": "https://registry.nlark.com/universalify/download/universalify-0.1.2.tgz", @@ -3204,138 +3164,144 @@ } }, "web3": { - "version": "1.6.0", - "resolved": "https://registry.npmmirror.com/web3/download/web3-1.6.0.tgz?cache=0&sync_timestamp=1633745194975&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fweb3%2Fdownload%2Fweb3-1.6.0.tgz", - "integrity": "sha1-2PoM2ee/JS+f5Du3fcQrxmca/94=", + "version": "1.3.4", + "resolved": "https://registry.npmmirror.com/web3/download/web3-1.3.4.tgz", + "integrity": "sha1-MeAUhzNgqlhA6xf58XEZDJZ8/7c=", "requires": { - "web3-bzz": "1.6.0", - "web3-core": "1.6.0", - "web3-eth": "1.6.0", - "web3-eth-personal": "1.6.0", - "web3-net": "1.6.0", - "web3-shh": "1.6.0", - "web3-utils": "1.6.0" + "web3-bzz": "1.3.4", + "web3-core": "1.3.4", + "web3-eth": "1.3.4", + "web3-eth-personal": "1.3.4", + "web3-net": "1.3.4", + "web3-shh": "1.3.4", + "web3-utils": "1.3.4" } }, "web3-bzz": { - "version": "1.6.0", - "resolved": "https://registry.npmmirror.com/web3-bzz/download/web3-bzz-1.6.0.tgz", - "integrity": "sha1-WEtRM58h7t/xWavJI5tLfvbe2EA=", + "version": "1.3.4", + "resolved": "https://registry.npmmirror.com/web3-bzz/download/web3-bzz-1.3.4.tgz", + "integrity": "sha1-m+UpNTxAY7xoOVNwy12OQUxrbIc=", "requires": { "@types/node": "^12.12.6", "got": "9.6.0", - "swarm-js": "^0.1.40" + "swarm-js": "^0.1.40", + "underscore": "1.9.1" } }, "web3-core": { - "version": "1.6.0", - "resolved": "https://registry.npmmirror.com/web3-core/download/web3-core-1.6.0.tgz?cache=0&sync_timestamp=1633745190480&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fweb3-core%2Fdownload%2Fweb3-core-1.6.0.tgz", - "integrity": "sha1-FE6wD2UcmBL69xdqvX7pnV9F4hI=", + "version": "1.3.4", + "resolved": "https://registry.npmmirror.com/web3-core/download/web3-core-1.3.4.tgz", + "integrity": "sha1-LMe6fzXMFn96Ckb9WFX4blHTTOg=", "requires": { "@types/bn.js": "^4.11.5", "@types/node": "^12.12.6", "bignumber.js": "^9.0.0", - "web3-core-helpers": "1.6.0", - "web3-core-method": "1.6.0", - "web3-core-requestmanager": "1.6.0", - "web3-utils": "1.6.0" + "web3-core-helpers": "1.3.4", + "web3-core-method": "1.3.4", + "web3-core-requestmanager": "1.3.4", + "web3-utils": "1.3.4" } }, "web3-core-helpers": { - "version": "1.6.0", - "resolved": "https://registry.npmmirror.com/web3-core-helpers/download/web3-core-helpers-1.6.0.tgz", - "integrity": "sha1-d+FhtrqTCkAIoN+ASrN54Kp+Hn8=", + "version": "1.3.4", + "resolved": "https://registry.npmmirror.com/web3-core-helpers/download/web3-core-helpers-1.3.4.tgz", + "integrity": "sha1-uFSXQL8k1ccWiNicPN2ALY02tOQ=", "requires": { - "web3-eth-iban": "1.6.0", - "web3-utils": "1.6.0" + "underscore": "1.9.1", + "web3-eth-iban": "1.3.4", + "web3-utils": "1.3.4" } }, "web3-core-method": { - "version": "1.6.0", - "resolved": "https://registry.npmmirror.com/web3-core-method/download/web3-core-method-1.6.0.tgz", - "integrity": "sha1-6+TqUfWk+oCbtoGFV2GGNZ05guk=", + "version": "1.3.4", + "resolved": "https://registry.npmmirror.com/web3-core-method/download/web3-core-method-1.3.4.tgz", + "integrity": "sha1-bCgS2W3WyBG55sil0lBQ0sIrlSc=", "requires": { - "@ethereumjs/common": "^2.4.0", "@ethersproject/transactions": "^5.0.0-beta.135", - "web3-core-helpers": "1.6.0", - "web3-core-promievent": "1.6.0", - "web3-core-subscriptions": "1.6.0", - "web3-utils": "1.6.0" + "underscore": "1.9.1", + "web3-core-helpers": "1.3.4", + "web3-core-promievent": "1.3.4", + "web3-core-subscriptions": "1.3.4", + "web3-utils": "1.3.4" } }, "web3-core-promievent": { - "version": "1.6.0", - "resolved": "https://registry.npmmirror.com/web3-core-promievent/download/web3-core-promievent-1.6.0.tgz", - "integrity": "sha1-i2BTroPLRxZFQBZ/w2FGn8YE0t0=", + "version": "1.3.4", + "resolved": "https://registry.npmmirror.com/web3-core-promievent/download/web3-core-promievent-1.3.4.tgz", + "integrity": "sha1-0WYjkBLZFJbNy+kdXVQHHqgYvHM=", "requires": { "eventemitter3": "4.0.4" } }, "web3-core-requestmanager": { - "version": "1.6.0", - "resolved": "https://registry.npmmirror.com/web3-core-requestmanager/download/web3-core-requestmanager-1.6.0.tgz", - "integrity": "sha1-jvOjuJzQiYO9lFdPnFiT9wqKauo=", + "version": "1.3.4", + "resolved": "https://registry.npmmirror.com/web3-core-requestmanager/download/web3-core-requestmanager-1.3.4.tgz", + "integrity": "sha1-4QXO1zXCtfzt1XceDs+Yea6cNz8=", "requires": { + "underscore": "1.9.1", "util": "^0.12.0", - "web3-core-helpers": "1.6.0", - "web3-providers-http": "1.6.0", - "web3-providers-ipc": "1.6.0", - "web3-providers-ws": "1.6.0" + "web3-core-helpers": "1.3.4", + "web3-providers-http": "1.3.4", + "web3-providers-ipc": "1.3.4", + "web3-providers-ws": "1.3.4" } }, "web3-core-subscriptions": { - "version": "1.6.0", - "resolved": "https://registry.npmmirror.com/web3-core-subscriptions/download/web3-core-subscriptions-1.6.0.tgz", - "integrity": "sha1-jCOxW0NKfJ+TdlLsykXXEI4sVN8=", + "version": "1.3.4", + "resolved": "https://registry.npmmirror.com/web3-core-subscriptions/download/web3-core-subscriptions-1.3.4.tgz", + "integrity": "sha1-ewDpK94h95JiDNAublCPz09MMdM=", "requires": { "eventemitter3": "4.0.4", - "web3-core-helpers": "1.6.0" + "underscore": "1.9.1", + "web3-core-helpers": "1.3.4" } }, "web3-eth": { - "version": "1.6.0", - "resolved": "https://registry.npmmirror.com/web3-eth/download/web3-eth-1.6.0.tgz", - "integrity": "sha1-TJ1ftOzPn4dEgoKBdX5up2r1jL0=", - "requires": { - "web3-core": "1.6.0", - "web3-core-helpers": "1.6.0", - "web3-core-method": "1.6.0", - "web3-core-subscriptions": "1.6.0", - "web3-eth-abi": "1.6.0", - "web3-eth-accounts": "1.6.0", - "web3-eth-contract": "1.6.0", - "web3-eth-ens": "1.6.0", - "web3-eth-iban": "1.6.0", - "web3-eth-personal": "1.6.0", - "web3-net": "1.6.0", - "web3-utils": "1.6.0" + "version": "1.3.4", + "resolved": "https://registry.npmmirror.com/web3-eth/download/web3-eth-1.3.4.tgz", + "integrity": "sha1-fEYHaF5mocQ+PjFeUmyVnyT5aQc=", + "requires": { + "underscore": "1.9.1", + "web3-core": "1.3.4", + "web3-core-helpers": "1.3.4", + "web3-core-method": "1.3.4", + "web3-core-subscriptions": "1.3.4", + "web3-eth-abi": "1.3.4", + "web3-eth-accounts": "1.3.4", + "web3-eth-contract": "1.3.4", + "web3-eth-ens": "1.3.4", + "web3-eth-iban": "1.3.4", + "web3-eth-personal": "1.3.4", + "web3-net": "1.3.4", + "web3-utils": "1.3.4" } }, "web3-eth-abi": { - "version": "1.6.0", - "resolved": "https://registry.npmmirror.com/web3-eth-abi/download/web3-eth-abi-1.6.0.tgz", - "integrity": "sha1-QiVgj2HrsGB9gISbsrIPkQeAJT0=", + "version": "1.3.4", + "resolved": "https://registry.npmmirror.com/web3-eth-abi/download/web3-eth-abi-1.3.4.tgz", + "integrity": "sha1-EPXYtggNu2y6obzvfgxwVz2mVm8=", "requires": { "@ethersproject/abi": "5.0.7", - "web3-utils": "1.6.0" + "underscore": "1.9.1", + "web3-utils": "1.3.4" } }, "web3-eth-accounts": { - "version": "1.6.0", - "resolved": "https://registry.npmmirror.com/web3-eth-accounts/download/web3-eth-accounts-1.6.0.tgz", - "integrity": "sha1-Uwkn9MW3jfk7PqEgOru0Z94pzQQ=", + "version": "1.3.4", + "resolved": "https://registry.npmmirror.com/web3-eth-accounts/download/web3-eth-accounts-1.3.4.tgz", + "integrity": "sha1-z1E9eFMcE84Hml54YoIFcDUOeaU=", "requires": { - "@ethereumjs/common": "^2.3.0", - "@ethereumjs/tx": "^3.2.1", "crypto-browserify": "3.12.0", "eth-lib": "0.2.8", - "ethereumjs-util": "^7.0.10", + "ethereumjs-common": "^1.3.2", + "ethereumjs-tx": "^2.1.1", "scrypt-js": "^3.0.1", + "underscore": "1.9.1", "uuid": "3.3.2", - "web3-core": "1.6.0", - "web3-core-helpers": "1.6.0", - "web3-core-method": "1.6.0", - "web3-utils": "1.6.0" + "web3-core": "1.3.4", + "web3-core-helpers": "1.3.4", + "web3-core-method": "1.3.4", + "web3-utils": "1.3.4" }, "dependencies": { "eth-lib": { @@ -3348,6 +3314,15 @@ "xhr-request-promise": "^0.1.2" } }, + "ethereumjs-tx": { + "version": "2.1.2", + "resolved": "https://registry.npmmirror.com/ethereumjs-tx/download/ethereumjs-tx-2.1.2.tgz", + "integrity": "sha1-Xf52iL8Xe0XJoj+Gz5EE1H6jX+0=", + "requires": { + "ethereumjs-common": "^1.5.0", + "ethereumjs-util": "^6.0.0" + } + }, "uuid": { "version": "3.3.2", "resolved": "https://registry.npmmirror.com/uuid/download/uuid-3.3.2.tgz", @@ -3356,118 +3331,135 @@ } }, "web3-eth-contract": { - "version": "1.6.0", - "resolved": "https://registry.npmmirror.com/web3-eth-contract/download/web3-eth-contract-1.6.0.tgz", - "integrity": "sha1-3rlGhnrYbTK8u6iZ1zO2gbJepnQ=", + "version": "1.3.4", + "resolved": "https://registry.npmmirror.com/web3-eth-contract/download/web3-eth-contract-1.3.4.tgz", + "integrity": "sha1-HqLdcb4MSpz0dy1Pdduy+pl1FHI=", "requires": { "@types/bn.js": "^4.11.5", - "web3-core": "1.6.0", - "web3-core-helpers": "1.6.0", - "web3-core-method": "1.6.0", - "web3-core-promievent": "1.6.0", - "web3-core-subscriptions": "1.6.0", - "web3-eth-abi": "1.6.0", - "web3-utils": "1.6.0" + "underscore": "1.9.1", + "web3-core": "1.3.4", + "web3-core-helpers": "1.3.4", + "web3-core-method": "1.3.4", + "web3-core-promievent": "1.3.4", + "web3-core-subscriptions": "1.3.4", + "web3-eth-abi": "1.3.4", + "web3-utils": "1.3.4" } }, "web3-eth-ens": { - "version": "1.6.0", - "resolved": "https://registry.npmmirror.com/web3-eth-ens/download/web3-eth-ens-1.6.0.tgz", - "integrity": "sha1-rxOFIWjVb6cbkZjrCX6W+5ODHCo=", + "version": "1.3.4", + "resolved": "https://registry.npmmirror.com/web3-eth-ens/download/web3-eth-ens-1.3.4.tgz", + "integrity": "sha1-p+S7GEgfsOLOW/s7PaL7sK14zv4=", "requires": { "content-hash": "^2.5.2", "eth-ens-namehash": "2.0.8", - "web3-core": "1.6.0", - "web3-core-helpers": "1.6.0", - "web3-core-promievent": "1.6.0", - "web3-eth-abi": "1.6.0", - "web3-eth-contract": "1.6.0", - "web3-utils": "1.6.0" + "underscore": "1.9.1", + "web3-core": "1.3.4", + "web3-core-helpers": "1.3.4", + "web3-core-promievent": "1.3.4", + "web3-eth-abi": "1.3.4", + "web3-eth-contract": "1.3.4", + "web3-utils": "1.3.4" } }, "web3-eth-iban": { - "version": "1.6.0", - "resolved": "https://registry.npmmirror.com/web3-eth-iban/download/web3-eth-iban-1.6.0.tgz", - "integrity": "sha1-7b5GztxbFI1T+kVe3qa07vU7K+c=", + "version": "1.3.4", + "resolved": "https://registry.npmmirror.com/web3-eth-iban/download/web3-eth-iban-1.3.4.tgz", + "integrity": "sha1-XrelZODc9ocw1o9I+V3SB80XPYE=", "requires": { "bn.js": "^4.11.9", - "web3-utils": "1.6.0" + "web3-utils": "1.3.4" } }, "web3-eth-personal": { - "version": "1.6.0", - "resolved": "https://registry.npmmirror.com/web3-eth-personal/download/web3-eth-personal-1.6.0.tgz?cache=0&sync_timestamp=1633745189113&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fweb3-eth-personal%2Fdownload%2Fweb3-eth-personal-1.6.0.tgz", - "integrity": "sha1-t1phwHN7i4vMEdBdsu17/OfksmI=", + "version": "1.3.4", + "resolved": "https://registry.npmmirror.com/web3-eth-personal/download/web3-eth-personal-1.3.4.tgz", + "integrity": "sha1-DQ4KvqNEcoPX7lZY7TEpkMm/SN0=", "requires": { "@types/node": "^12.12.6", - "web3-core": "1.6.0", - "web3-core-helpers": "1.6.0", - "web3-core-method": "1.6.0", - "web3-net": "1.6.0", - "web3-utils": "1.6.0" + "web3-core": "1.3.4", + "web3-core-helpers": "1.3.4", + "web3-core-method": "1.3.4", + "web3-net": "1.3.4", + "web3-utils": "1.3.4" } }, "web3-net": { - "version": "1.6.0", - "resolved": "https://registry.npmmirror.com/web3-net/download/web3-net-1.6.0.tgz?cache=0&sync_timestamp=1633745190651&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fweb3-net%2Fdownload%2Fweb3-net-1.6.0.tgz", - "integrity": "sha1-LCj4eHBzEQp8IxAzaInS2tZH5QA=", + "version": "1.3.4", + "resolved": "https://registry.npmmirror.com/web3-net/download/web3-net-1.3.4.tgz", + "integrity": "sha1-12FYvwtKezsUNStPlUctue/Feio=", "requires": { - "web3-core": "1.6.0", - "web3-core-method": "1.6.0", - "web3-utils": "1.6.0" + "web3-core": "1.3.4", + "web3-core-method": "1.3.4", + "web3-utils": "1.3.4" } }, "web3-providers-http": { - "version": "1.6.0", - "resolved": "https://registry.npmmirror.com/web3-providers-http/download/web3-providers-http-1.6.0.tgz", - "integrity": "sha1-jbTliav3GX9dZbEq8b+XJsRfQWA=", + "version": "1.3.4", + "resolved": "https://registry.npmmirror.com/web3-providers-http/download/web3-providers-http-1.3.4.tgz", + "integrity": "sha1-iTieGOJxSPqi/vWIQnQP+tvdqMw=", "requires": { - "web3-core-helpers": "1.6.0", + "web3-core-helpers": "1.3.4", "xhr2-cookies": "1.1.0" } }, "web3-providers-ipc": { - "version": "1.6.0", - "resolved": "https://registry.npmmirror.com/web3-providers-ipc/download/web3-providers-ipc-1.6.0.tgz", - "integrity": "sha1-ajQQ/UemfEo2cZ+5f5lTSuEqrJg=", + "version": "1.3.4", + "resolved": "https://registry.npmmirror.com/web3-providers-ipc/download/web3-providers-ipc-1.3.4.tgz", + "integrity": "sha1-uWNRiYmxt4RwY83UYf9zuDhVg0o=", "requires": { "oboe": "2.1.5", - "web3-core-helpers": "1.6.0" + "underscore": "1.9.1", + "web3-core-helpers": "1.3.4" } }, "web3-providers-ws": { - "version": "1.6.0", - "resolved": "https://registry.npmmirror.com/web3-providers-ws/download/web3-providers-ws-1.6.0.tgz", - "integrity": "sha1-3BXcGMMAie/amSAV/VJUvSt3r18=", + "version": "1.3.4", + "resolved": "https://registry.npmmirror.com/web3-providers-ws/download/web3-providers-ws-1.3.4.tgz", + "integrity": "sha1-uUwuDsUaDEcqvexTpHK1v4F2vsE=", "requires": { "eventemitter3": "4.0.4", - "web3-core-helpers": "1.6.0", + "underscore": "1.9.1", + "web3-core-helpers": "1.3.4", "websocket": "^1.0.32" } }, "web3-shh": { - "version": "1.6.0", - "resolved": "https://registry.npmmirror.com/web3-shh/download/web3-shh-1.6.0.tgz", - "integrity": "sha1-g4o0NdzhA59mmkjlPpSAYt4ZeTE=", + "version": "1.3.4", + "resolved": "https://registry.npmmirror.com/web3-shh/download/web3-shh-1.3.4.tgz", + "integrity": "sha1-t9KeEY8mQWwadFdeWFvjecwBp3o=", "requires": { - "web3-core": "1.6.0", - "web3-core-method": "1.6.0", - "web3-core-subscriptions": "1.6.0", - "web3-net": "1.6.0" + "web3-core": "1.3.4", + "web3-core-method": "1.3.4", + "web3-core-subscriptions": "1.3.4", + "web3-net": "1.3.4" } }, "web3-utils": { - "version": "1.6.0", - "resolved": "https://registry.npmmirror.com/web3-utils/download/web3-utils-1.6.0.tgz", - "integrity": "sha1-GXXF7lt9uKCDbrcASEinzZYtHdw=", + "version": "1.3.4", + "resolved": "https://registry.npmmirror.com/web3-utils/download/web3-utils-1.3.4.tgz", + "integrity": "sha1-mxqjDXVJ+GC1c+e7fmkJmecZIZg=", "requires": { "bn.js": "^4.11.9", + "eth-lib": "0.2.8", "ethereum-bloom-filters": "^1.0.6", - "ethereumjs-util": "^7.1.0", "ethjs-unit": "0.1.6", "number-to-bn": "1.7.0", "randombytes": "^2.1.0", + "underscore": "1.9.1", "utf8": "3.0.0" + }, + "dependencies": { + "eth-lib": { + "version": "0.2.8", + "resolved": "https://registry.npm.taobao.org/eth-lib/download/eth-lib-0.2.8.tgz", + "integrity": "sha1-sZQFi+9LIgrRLqSXQx1stqoGI8g=", + "requires": { + "bn.js": "^4.11.6", + "elliptic": "^6.4.0", + "xhr-request-promise": "^0.1.2" + } + } } }, "websocket": { @@ -3523,7 +3515,7 @@ }, "ws": { "version": "3.3.3", - "resolved": "https://registry.npmmirror.com/ws/download/ws-3.3.3.tgz?cache=0&sync_timestamp=1633200039582&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fws%2Fdownload%2Fws-3.3.3.tgz", + "resolved": "https://registry.npmmirror.com/ws/download/ws-3.3.3.tgz", "integrity": "sha1-8c+E/i1ekB686U767OeF8YeiKPI=", "requires": { "async-limiter": "~1.0.0", diff --git a/package.json b/package.json index bf664d0..30156ed 100644 --- a/package.json +++ b/package.json @@ -18,12 +18,12 @@ "bip32": "^2.0.6", "bip39": "^3.0.4", "bitcoinjs-lib": "^5.2.0", - "ethereumjs-tx": "^2.1.2", + "ethereumjs-tx": "^1.3.7", "ethers": "^5.5.1", "js-md5": "^0.7.3", "tki-qrcode": "^0.1.6", "tronweb": "^4.0.0", "vue-clipboard2": "^0.3.3", - "web3": "^1.6.0" + "web3": "^1.3.4" } } diff --git a/pages.json b/pages.json index 0094bb9..65cbb31 100644 --- a/pages.json +++ b/pages.json @@ -3,6 +3,52 @@ "^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue" }, "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages + { + "path": "pages/register/index", + "style": { + "navigationStyle": "custom" + } + + }, + { + "path": "pages/menu/index/index", + "style": { + "navigationStyle": "custom" + } + + }, + + { + "path": "pages/menu/index/index", + "style": { + "navigationStyle": "custom" + } + + }, + + + { + "path": "pages/menu/token/btc/index", + "style": { + "navigationStyle": "custom" + } + }, + + + { + "path": "pages/menu/wallet/search/index", + "style": { + "navigationStyle": "custom" + } + + }, + { + "path": "pages/menu/collection/collectionDetailtrue/index", + "style": { + "navigationStyle": "custom" + } + + }, { "path": "pages/menu/collection/addCollection/index", "style": { @@ -24,13 +70,7 @@ } }, - { - "path": "pages/register/index", - "style": { - "navigationStyle": "custom" - } - - }, + { "path": "pages/menu/token/btctrue/index", "style": { @@ -52,13 +92,7 @@ } }, -{ - "path": "pages/menu/index/index", - "style": { - "navigationStyle": "custom" - } - - }, + { "path": "pages/menu/backUp/index", @@ -247,15 +281,15 @@ - - - { - "path": "pages/menu/token/btc/index", + { + "path": "pages/menu/token/btc/index2", "style": { "navigationStyle": "custom" } }, + + { diff --git a/pages/menu/backUp/backUp5/index.vue b/pages/menu/backUp/backUp5/index.vue index ee1d049..c8d4d69 100644 --- a/pages/menu/backUp/backUp5/index.vue +++ b/pages/menu/backUp/backUp5/index.vue @@ -4,63 +4,67 @@ Import via private key - - Private key import verification - - - Please enter your private key and do not disclose it to othersThe external address cannot be recovered by mnemonics. Please keep it properly - - - - - Confirm - - - - - - - Successful - - - Backup mnemonic completed! - - - Confirm - - - - - - - - Invalid Seed - - - You entered the wrong booster words,
please try again. - - - - Cancel - - - Confirm - - - - - - - - - - - + + + Confirm + + + + + + + + Successful + + + Backup mnemonic completed! + + + Confirm + + + + + + + + + Invalid Seed + + + You entered the wrong booster words,
please try again. + + + + Cancel + + + Confirm + + + + + + + + + + - + + diff --git a/pages/menu/collection/collectionDetail/index.css b/pages/menu/collection/collectionDetail/index.css index 6ada64e..d33ee8d 100644 --- a/pages/menu/collection/collectionDetail/index.css +++ b/pages/menu/collection/collectionDetail/index.css @@ -4,24 +4,58 @@ position: absolute; right: 30rpx; } +page{ + background-color: #FAFAFA; +} +.aaa{ + background-color: #FAFAFA !important; +} .main{ margin-top: 50rpx; padding: 0 24rpx; + padding-bottom: 100rpx; } .main .item{ - background-color: #F2F2F2; - border-radius: 8rpx; - padding: 24rpx; + background-color: #fff; + border-radius: 24rpx; + padding: 0 30rpx; + box-shadow: 0 12rpx 12rpx 12rpx #E9ECEF; + margin-bottom: 40rpx; +} +.lfet{ + position: absolute; + right: 0rpx; + top: 50%; + transform: translateY(-50%); } .main .item .top{ - margin-bottom: 20rpx; + position: relative; font-size: 32rpx; display: flex; - align-items: center; word-break: break-word; + padding: 32rpx 0; + border-bottom: 2rpx solid #F4F7FE; +} +.main .item .top:last-child{ + border-bottom: none; } .main .item .top .img{ width: 48rpx; height: 48rpx; margin-right: 16rpx; -} \ No newline at end of file +} +.textleft{ + color: #7D87A6; + margin-right: 24rpx; +} +.texttt{ + width: 80rpx; +} + .back{ + width: 16rpx; + height: 24rpx; + position: absolute; + left:36rpx; + top: 50%; + transform: translateY(-50%); + } \ No newline at end of file diff --git a/pages/menu/collection/collectionDetail/index.vue b/pages/menu/collection/collectionDetail/index.vue index 53c0de4..cf990de 100644 --- a/pages/menu/collection/collectionDetail/index.vue +++ b/pages/menu/collection/collectionDetail/index.vue @@ -1,25 +1,27 @@