From 45fd6b3b244849cdae227a0cf5dd6825ec0c2fba Mon Sep 17 00:00:00 2001 From: vee <897831508@qq.com> Date: Fri, 19 Nov 2021 11:07:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 3 + package-lock.json | 15 +- package.json | 1 + pages.json | 14 +- pages/menu/sendToken/addAddress/index2.vue | 381 - pages/menu/sendToken/address/index.vue | 44 +- pages/menu/sendToken/address/index2.vue | 314 - pages/menu/sendToken/transfer/index.vue | 12 +- pages/menu/setting/currency/index.vue | 2 +- pages/menu/setting/index.vue | 8 +- pages/menu/wallet/cwallet/index.vue | 4 +- pages/menu/wallet/index.vue | 2 + .../dist/dev/app-plus/app-config-service.js | 4 +- unpackage/dist/dev/app-plus/app-service.js | 59287 +++++++--------- unpackage/dist/dev/app-plus/app-view.js | 35564 +++++---- utils/EthUtil.js | 24 +- utils/SystemConfiguration.js | 6 +- utils/axios.js | 86 +- 18 files changed, 44208 insertions(+), 51563 deletions(-) delete mode 100644 pages/menu/sendToken/addAddress/index2.vue delete mode 100644 pages/menu/sendToken/address/index2.vue diff --git a/manifest.json b/manifest.json index 33ed003..1705dce 100644 --- a/manifest.json +++ b/manifest.json @@ -5,6 +5,9 @@ "versionName" : "1.0", "versionCode" : "100", "transformPx" : false, + "networkTimeout": { + "request": 10000 //多长时间算超时(单位毫秒) + }, /* 5+App特有相关 */ "app-plus" : { // 静止弹出h5+runtime diff --git a/package-lock.json b/package-lock.json index 240f615..595c09a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2393,11 +2393,24 @@ "resolved": "https://registry.nlark.com/next-tick/download/next-tick-1.0.0.tgz", "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=" }, + "node": { + "version": "17.1.0", + "resolved": "https://registry.npmmirror.com/node/download/node-17.1.0.tgz", + "integrity": "sha512-1gg810R7sKtFkCYMdIhOyYDCuRJZyLvP+lTX8Z9AMAiUdHPoeNu0KQN59CzBud5L/vMtFPkbsCwWOy1aTYOL8g==", + "requires": { + "node-bin-setup": "^1.0.0" + } + }, "node-addon-api": { "version": "2.0.2", "resolved": "https://registry.nlark.com/node-addon-api/download/node-addon-api-2.0.2.tgz", "integrity": "sha1-Qyz6gpYs5JSxMunXKhWyn3H/XTI=" }, + "node-bin-setup": { + "version": "1.0.6", + "resolved": "https://registry.npm.taobao.org/node-bin-setup/download/node-bin-setup-1.0.6.tgz", + "integrity": "sha1-S1ybuTfs5wLXBps2ynivRoRndSg=" + }, "node-gyp-build": { "version": "4.3.0", "resolved": "https://registry.nlark.com/node-gyp-build/download/node-gyp-build-4.3.0.tgz?cache=0&sync_timestamp=1631436711963&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnode-gyp-build%2Fdownload%2Fnode-gyp-build-4.3.0.tgz", @@ -2761,7 +2774,7 @@ }, "semver": { "version": "5.7.1", - "resolved": "https://registry.nlark.com/semver/download/semver-5.7.1.tgz?cache=0&sync_timestamp=1618847119601&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsemver%2Fdownload%2Fsemver-5.7.1.tgz", + "resolved": "https://registry.nlark.com/semver/download/semver-5.7.1.tgz?cache=0&sync_timestamp=1622604551741&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsemver%2Fdownload%2Fsemver-5.7.1.tgz", "integrity": "sha1-qVT5Ma66UI0we78Gnv8MAclhFvc=" }, "send": { diff --git a/package.json b/package.json index 77f3054..8b76461 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ "ethereumjs-tx": "^1.3.7", "ethers": "^5.5.1", "js-md5": "^0.7.3", + "node": "^17.1.0", "tki-qrcode": "^0.1.6", "tronweb": "^3.2.6", "vue-clipboard2": "^0.3.3", diff --git a/pages.json b/pages.json index b8e2930..59eb98d 100644 --- a/pages.json +++ b/pages.json @@ -191,12 +191,7 @@ } }, - { - "path": "pages/menu/sendToken/addAddress/index2", - "style": { - "navigationStyle": "custom" - } - }, + { "path": "pages/menu/profile/index", @@ -211,12 +206,7 @@ "navigationStyle": "custom" } }, - { - "path": "pages/menu/sendToken/address/index2", - "style": { - "navigationStyle": "custom" - } - }, + { "path": "pages/menu/sendToken/address/index", "style": { diff --git a/pages/menu/sendToken/addAddress/index2.vue b/pages/menu/sendToken/addAddress/index2.vue deleted file mode 100644 index ad74ef7..0000000 --- a/pages/menu/sendToken/addAddress/index2.vue +++ /dev/null @@ -1,381 +0,0 @@ - - - - - - diff --git a/pages/menu/sendToken/address/index.vue b/pages/menu/sendToken/address/index.vue index 0af1ef8..120aed1 100644 --- a/pages/menu/sendToken/address/index.vue +++ b/pages/menu/sendToken/address/index.vue @@ -11,7 +11,7 @@ - + @@ -37,16 +37,16 @@ - {{i18n.edit}} + {{i18n.edit}} - {{i18n.Delete}} + {{i18n.Delete}} - + @@ -71,11 +71,11 @@ - {{i18n.edit}} + {{i18n.edit}} - {{i18n.Delete}} + {{i18n.Delete}} @@ -84,7 +84,7 @@ - + @@ -113,7 +113,7 @@ - {{i18n.Delete}} + {{i18n.Delete}} @@ -150,7 +150,7 @@ export default { data() { return { - sourcePage:'', + sourcePage: '', ethIndex: 0, btcIndex: 0, trxIndex: 0, @@ -162,7 +162,7 @@ itemCoin: '', itemAddress: '', info: {}, - transfer: '', + isSelect: false, show: false, show2: false, show3: false, @@ -191,25 +191,27 @@ }, methods: { // 点击把地址带到去交易页 - goTransfer(item) { - console.log(this.transfer,12316546) - if (this.transfer) { - uni.setStorageSync('myTransAddress', item) + goTransfer(address) { + + if (this.isSelect) { + let transInfoPass = uni.getStorageSync('transInfoPass') + transInfoPass.toAddress = address + uni.setStorageSync('transInfoPass',transInfoPass) uni.navigateTo({ - url: '../transfer/index' + url: '../transfer/index?item=address' }) } }, back() { uni.removeStorageSync("sourcePage") - if(this.sourcePage){ + if (this.sourcePage) { uni.reLaunch({ url: this.sourcePage }) - }else{ + } else { uni.navigateBack({ - + }) } @@ -303,11 +305,11 @@ } }, onLoad(item) { - - this.sourcePage=uni.getStorageSync('sourcePage') + + this.sourcePage = uni.getStorageSync('sourcePage') // 判断是否是从交易页面来的 if (item.item) { - this.transfer = item.item + this.isSelect = true; } diff --git a/pages/menu/sendToken/address/index2.vue b/pages/menu/sendToken/address/index2.vue deleted file mode 100644 index b136de1..0000000 --- a/pages/menu/sendToken/address/index2.vue +++ /dev/null @@ -1,314 +0,0 @@ - - - - - - diff --git a/pages/menu/sendToken/transfer/index.vue b/pages/menu/sendToken/transfer/index.vue index aacb849..c15d217 100644 --- a/pages/menu/sendToken/transfer/index.vue +++ b/pages/menu/sendToken/transfer/index.vue @@ -611,13 +611,19 @@ goAddress(text) { + uni.setStorageSync('transInfoPass',this.transInfoPass) uni.navigateTo({ - url: '../address/index2' + url: '../address/index?item=transfer' }) } }, - onLoad() { - + onLoad(a) { + if(a.item){ + this.transInfoPass=uni.getStorageSync('transInfoPass'); + }else{ + uni.removeStorageSync('transInfoPass') + } + this.coin = uni.getStorageSync('coin') if (this.coin.balancePrice) { diff --git a/pages/menu/setting/currency/index.vue b/pages/menu/setting/currency/index.vue index 72673b7..d276f4c 100644 --- a/pages/menu/setting/currency/index.vue +++ b/pages/menu/setting/currency/index.vue @@ -1,7 +1,7 @@