From aa50f290e4a587c28e1a5f1f59196bddc2103f39 Mon Sep 17 00:00:00 2001 From: liaoxinyu Date: Mon, 22 Apr 2024 09:44:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=92=B1=E5=8C=85=E5=85=85?= =?UTF-8?q?=E5=80=BC=E4=B8=8D=E8=BF=9B=E8=A1=8C=E8=AF=B7=E6=B1=82=E5=A4=9A?= =?UTF-8?q?=E6=AC=A1=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=BA=8C=E7=BB=B4=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/img/home/qrcode.png | Bin 2441 -> 2628 bytes src/components/CommonFooter.vue | 6 +++--- src/router/index.js | 5 +++++ src/views/contract/index.vue | 2 +- src/views/exchange/index.vue | 2 +- src/views/home/index.vue | 2 +- src/views/wallet/contract-assets.vue | 2 +- src/views/wallet/exchange-assets.vue | 23 +++++++++++++++++++++-- 8 files changed, 33 insertions(+), 9 deletions(-) diff --git a/src/assets/img/home/qrcode.png b/src/assets/img/home/qrcode.png index 59395178bf9f755923d0581a598ce1233905c53d..b2abaa9a9972ec1b6c9a862200f0625ce4aee01a 100644 GIT binary patch literal 2628 zcma)8ZBSZQ8b%wVDG}N@jZ#38VOqOwmNsz%5)w#FD#^AhZD%`)nP%cg!sc^Z5AUu09UGTito1EBN4(Wv`95aZ49eAsQeIfa zJ3Q)jH|t4n=6SO$mhT+#yl}F&p~Lgz2KeA}+qUd$KfSRpcE`G3Z}QgDX&5qnm38sB zU~{Peu{c=dZ*Vbwm`C$dHVV_J*9mp!EDrbcP&brc&A{8p_K2u#ds({|(k(fY+$P zH^`fOj{YH=_nU{NyYqJ0&}gX5^(iEYRW&MYnU}NNy<}AATyU(hm)ymAqI2CELmEmR zE7PL06L~Qu6=R<2C9@-uE`?6aZq1#U6d@M}Jruw8evlDxtjXp+guo3XIO+YAw5yMYDC=uZ;gR$K4cmt zjjCCL^EP2S2b$Y)-=fRqbLO>wRDSr#Fuy=w=8ltNj)e-{h{sy1n2klbuukY~*2dFGbVngc z);w|+==9;~3T@&e>XbgXQ_0r$;+YT7&}dydGEA2cSgjb|^^$?fSx%=3%l%3??E)Ts z%+U5I`lAwCoKTtc%FU{A;g1Jz(Tqp`;$d+rU+Zb-x-)Uae=S?`Mw1{NBcQ-uz|i(r zaE@}8w^%`!$(UQg_PilPD?MDnK1=<+;Y3-iwkf*T{0ui3x_0T1U)YCCu1%3+R;yWW z@a~IHCSoARNjD$RFZDUbOKm|JrL4CHy54yxOpsgP;JSCOcEGVrAFp8D%3#I= z1`&9HO}o%R+8JsK>Y+*M#(bb9r=1e;?XG=J1C~4x>d#-SXYZNP)qm_HLA#dynEj)Q z)*0nWt=?Fb5`KkRjQIEU+>hq3Sp!ne@cByUijVL^{|pr>Zv_*jxUs@*a;s$tPCYsU ziqv1*iNMLx67Zu@1?Ik=PJu7)c*|7EY1Fn6pR__;Q(x!BxE4Mq; z4cD#3p?pH%RcN@8UK62crW0;BD<9!on3``-A?<|X!#%V-|8xlWWQ~LxGb#blF_-mU zaQlF|N0$7b%R;N(L;y>Z3;!$+?6Br7)<8$6P+K$<;Vu3qPyOd$j=f~Ie_<3PoeZeF z(_dDe2BP)9NFDRYEkZ%|ocF3(RHrFP{;Xbh#6J-+JrQoc1VWlm+h{FGcFJsxHRV$H z0ivuJQ(e^;uY_kp%K3jW7SH`olegXKJv%Mp54&*;c literal 2441 zcma)8ZB&wH7{=UYYHH_{_905tJQjyPm-_l7Kz>GK~9yY)Gj=TJF+O-* zn-XIOXU!qhF>tqjEV#$Q2GzkA;xH9t2`ZdbFup}st{l$si8R@f_UZQR#d?8;EvVKbqG)7TdvZ7TLGuWyAZg z>k_L5O>=YMpUl56z>CDIN-eGchcT=DG3R~jQuC?{(zv14Gvi6+84mm{Ab zA=M{MYlNe$(19rE>AO(mvRq9VDY?ou*71t7pZh(()GinLL(o?-=Ck}W^C}b{HAxYs zdf|InajF{zdjWt%5H)6MyOzK`gWXp9ARKw7Wz2Gp6{^D?4yk7`IydJ{zhLY#h;Jfn zlI@CUb}iB(q`bGt#rX)&d$9RB+I+jmr1gr$`zCzI0^Y04H&Hm#%g{Me8>uH(%ug3l z?KRR;CNYH8g}S}h7_p;bj?dOwRzA)_dG>R5Gvl=4Qr3arYw0Y4VQc{w@@Qp)tKarB zA>-U7B{f;0DaC~gGA_!H=z-wmF{EKF6&2(C9Ip`FoS(Zw34~s1J<kIVTPK3db7>aMsst_;_7nY<-UGQz2!fjtUmDJvz-(+q zdtOt^8!7CA_*AU70HRNlMQ0TFGm28%e2x0UMBX&3c7$r%4t48qb9s0lohT03bB8#T zI%ODTzz%^%k&^^FmDIS=**jQeSDK(M;L6UCm*!a55S`JMCEpv!O`I;pRt zi;>dC5M?2tyMXn5e<<`W!6(<m%^nlnhefjGP;yb2A?MDp)N*FJ@C!5=*3%>HesPm>cHDjBSbY zn>A`{Clz??RYzBnTiQxO;n{&F4DkF?vz=WjxD?Bg{9LTtdjP!2Net*Z|qb(OC`FBLc zRFohBh~I2*bZ0$6s0%#cEp0y!Z42As1u35F>1t)fGdMFaqmsO^)808fU9k zbre$|hv!SWM|K;ov)0XXc-WdCP8hiv^$Q?3aeQ_0!L?{B*wY*(#zhOufKLjmp`uBftBSMK;m&w+H55+*JqsTY(VAg9B=g HolpA*8*~7$ 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"))