diff --git a/src/assets/img/home/Ewmlogin.png b/src/assets/img/home/Ewmlogin.png deleted file mode 100644 index f26b886..0000000 Binary files a/src/assets/img/home/Ewmlogin.png and /dev/null differ diff --git a/src/assets/img/home/catyapp.png b/src/assets/img/home/catyapp.png deleted file mode 100644 index c9d88e9..0000000 Binary files a/src/assets/img/home/catyapp.png and /dev/null differ diff --git a/src/assets/img/home/coinobserv.png b/src/assets/img/home/coinobserv.png new file mode 100644 index 0000000..7019400 Binary files /dev/null and b/src/assets/img/home/coinobserv.png differ diff --git a/src/assets/img/home/dfiqr.png b/src/assets/img/home/dfiqr.png deleted file mode 100644 index 5ae1c95..0000000 Binary files a/src/assets/img/home/dfiqr.png and /dev/null differ diff --git a/src/assets/img/home/qrcode.png b/src/assets/img/home/qrcode.png deleted file mode 100644 index 5939517..0000000 Binary files a/src/assets/img/home/qrcode.png and /dev/null differ diff --git a/src/components/CommonFooter.vue b/src/components/CommonFooter.vue index c42115e..cf7f425 100644 --- a/src/components/CommonFooter.vue +++ b/src/components/CommonFooter.vue @@ -251,7 +251,7 @@
{{ $t("homeNewText.hh44",{name:"Coinobserv"}) }}
{{ $t("homeNewText.hh48") }} {{ $t("homeNewText.hh45") }} - +
{{ $t("homeNewText.hh46",{name:"Coinobserv"}) }}
diff --git a/src/components/NewMsg.vue b/src/components/NewMsg.vue index be80581..87f8369 100644 --- a/src/components/NewMsg.vue +++ b/src/components/NewMsg.vue @@ -86,6 +86,7 @@ export default { this.list = []; this.more = true; this.myNotifiables(); + this.myNotifiablesCount() }, load() { if (!this.more) return; diff --git a/src/views/home/index.vue b/src/views/home/index.vue index f6b597b..eadcafc 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -218,7 +218,7 @@
-
+
{{ $t("homeNewText.hh24") }}
IOS & Android apps
diff --git a/src/views/signIn/index.vue b/src/views/signIn/index.vue index 82e4e0a..9b3e525 100644 --- a/src/views/signIn/index.vue +++ b/src/views/signIn/index.vue @@ -3,7 +3,7 @@
- +
{{ $t("homeNewText.hh46",{name:"Coinobserv"}) }}
diff --git a/src/views/signUp/index.vue b/src/views/signUp/index.vue index 3c3c325..eabe20f 100644 --- a/src/views/signUp/index.vue +++ b/src/views/signUp/index.vue @@ -9,7 +9,7 @@
-
+
{{$t('login.goRegister')}} diff --git a/src/views/wallet/exchange-assets.vue b/src/views/wallet/exchange-assets.vue index a8caf10..57acc3d 100644 --- a/src/views/wallet/exchange-assets.vue +++ b/src/views/wallet/exchange-assets.vue @@ -565,6 +565,9 @@ getEmailCodeLock: false, JStime: 0, tiemr: null, + bool:false, + address1:"", + address2:"" }; }, @@ -575,7 +578,18 @@ depositeAdressType() { this.getDepositeAdress(); }, - + // 协议改变时 重新获取地址 + depositeAdressType() { + 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) { if (val) { this.cacheInputAssets = this.withdraw.amount; @@ -668,6 +682,13 @@ }) .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 => {}); }, @@ -679,6 +700,7 @@ this.deposite.coin_id = item.coin_id; // 初始化充值地址 this.getDepositeAdress(); + this.bool = true; $("#deposite").modal("show"); } else { // this.$message.error(this.$t("wallet.auth"))