diff --git a/src/assets/img/home/qrcode.png b/src/assets/img/home/qrcode.png index 5939517..b2abaa9 100644 Binary files a/src/assets/img/home/qrcode.png and b/src/assets/img/home/qrcode.png differ diff --git a/src/components/CommonFooter.vue b/src/components/CommonFooter.vue index 6f6b0a5..c6f6f85 100644 --- a/src/components/CommonFooter.vue +++ b/src/components/CommonFooter.vue @@ -129,10 +129,10 @@ > {{ $t("common.contactUs") }}

-

+

{{ $t("common.email") }}:

-

+

{{ email }}

@@ -260,7 +260,7 @@
{{ $t("homeNewText.ee19",{name:'QNTcoin'}) }}
{{ $t("homeNewText.ee21") }} {{ $t("homeNewText.ee22") }} - +
{{ $t("homeNewText.ee20",{name:'QNTcoin'}) }}
diff --git a/src/router/index.js b/src/router/index.js index 77047d8..05dac42 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -147,6 +147,11 @@ const routes = [{ const router = new VueRouter({ routes }); +// 跳转路由后进行回到顶部 +router.afterEach((to, from) => { + // 在路由跳转后滚动到顶部 + window.scrollTo(0, 0); +}) // 添加路由导航守卫 非登录状态禁止进入wallet diff --git a/src/views/contract/index.vue b/src/views/contract/index.vue index 1bd1957..2c0f16a 100644 --- a/src/views/contract/index.vue +++ b/src/views/contract/index.vue @@ -9,7 +9,7 @@
- +
{{ activeContract.pair_name }}
diff --git a/src/views/exchange/index.vue b/src/views/exchange/index.vue index 43768d5..d90e12f 100644 --- a/src/views/exchange/index.vue +++ b/src/views/exchange/index.vue @@ -9,7 +9,7 @@
- +
{{ activeContract.pair_name }}
diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 78528f7..6c704de 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -484,7 +484,7 @@
-
+
{{ $t("homeNewText.ee18") }}
IOS & Android apps
diff --git a/src/views/wallet/contract-assets.vue b/src/views/wallet/contract-assets.vue index bd2e25b..2bbbddf 100644 --- a/src/views/wallet/contract-assets.vue +++ b/src/views/wallet/contract-assets.vue @@ -49,7 +49,7 @@ - + diff --git a/src/views/wallet/exchange-assets.vue b/src/views/wallet/exchange-assets.vue index f100f41..b253096 100644 --- a/src/views/wallet/exchange-assets.vue +++ b/src/views/wallet/exchange-assets.vue @@ -511,7 +511,10 @@ export default { JStime: 0, tiemr: null, // Graph_che: '', - lang:'' + lang:'', + bool:false, + address1:"", + address2:"" }; }, @@ -520,7 +523,15 @@ export default { watch: { // 协议改变时 重新获取地址 depositeAdressType() { - this.getDepositeAdress(); + this.deposite.address = "" + if(this.depositeAdressType==3&&this.bool==true){ + this.getDepositeAdress(); + }else{ + this.deposite.address = this.address2 + } + if(this.depositeAdressType==2){ + this.deposite.address = this.address1 + } }, allAssets(val) { @@ -619,6 +630,13 @@ export default { }) .then(data => { this.deposite.address = data.address; + if(this.depositeAdressType==2){ + this.address1 = data.address + } + if(this.depositeAdressType==3){ + this.address2 = data.address + this.bool = false + } }) .catch(err => { }); }, @@ -630,6 +648,7 @@ export default { this.deposite.coin_id = item.coin_id; // 初始化充值地址 this.getDepositeAdress(); + this.bool = true; $("#deposite").modal("show"); }else{ // this.$message.error(this.$t("wallet.auth"))