diff --git a/src/assets/img/home/qrcode.png b/src/assets/img/home/qrcode.png index f1fad82..fd3a9ee 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 39bb619..7d13d40 100644 --- a/src/components/CommonFooter.vue +++ b/src/components/CommonFooter.vue @@ -260,7 +260,7 @@
{{ $t("homeNewText.cc1") }}
{{ $t("homeNewText.hh17") }} {{ $t("homeNewText.cc2") }} - +
{{ $t("homeNewText.cc3") }}
diff --git a/src/components/CommonHeader.vue b/src/components/CommonHeader.vue index 5983765..5e8e3dd 100644 --- a/src/components/CommonHeader.vue +++ b/src/components/CommonHeader.vue @@ -135,7 +135,7 @@ diff --git a/src/components/KLine.vue b/src/components/KLine.vue index 11258c5..44c977f 100644 --- a/src/components/KLine.vue +++ b/src/components/KLine.vue @@ -311,7 +311,7 @@ export default { this.model.subscribe([ { cmd: "sub", - msg: `Kline_${this.symbol}_${this.interval}min` + msg: `Kline_${this.symbol}_1day` } ]); // console.log(this.lang) diff --git a/src/favicon.ico b/src/favicon.ico index c06d489..2a7951a 100644 Binary files a/src/favicon.ico and b/src/favicon.ico differ diff --git a/src/views/contract/account.vue b/src/views/contract/account.vue index b3606d1..d8dcf33 100644 --- a/src/views/contract/account.vue +++ b/src/views/contract/account.vue @@ -18,7 +18,8 @@
{{$t('contract.a3')}}(USDT)
-
{{(accountInfo.usable_balance).toFixed(2)}}
+ +
{{omitTo(accountInfo.usable_balance,2)}}
+ +
{{ $t("contract.h5") }}
+
{{ $t("contract.g3") }}
+
{{ $t("contract.h6") }}
+ - + - + + :class="item.increase < 0 ? 'decreace' : 'increase'" {{ item.close }} {{ item.increaseStr }} - + --> + +
+
+
{{ item.symbol }}/{{ parent.coin_name }}
+
+
+
+ {{ item.close }} +
+
+ {{ item.increaseStr }} +
+ @@ -269,22 +287,22 @@ export default { activeSymbol() { this.holdPosition(); }, - filterCoin: { - handler(n,o){ - if(!n){ - this.contractListFilter = this.contractList; - }else{ - this.contractListFilter = this.contractList.map((item1, index1)=>{ - let arr = item1; - arr.marketInfoList = item1.marketInfoList.filter(item2=>{ - return item2.symbol.indexOf(n.toUpperCase())!=-1 - }) - return arr; - }) - } - }, - immediate: true - } + // filterCoin: { + // handler(n,o){ + // if(!n){ + // this.contractListFilter = this.contractList; + // }else{ + // this.contractListFilter = this.contractList.map((item1, index1)=>{ + // let arr = item1; + // arr.marketInfoList = item1.marketInfoList.filter(item2=>{ + // return item2.symbol.indexOf(n.toUpperCase())!=-1 + // }) + // return arr; + // }) + // } + // }, + // immediate: true + // } }, destroyed() { clearInterval(this._time); @@ -433,7 +451,19 @@ export default { }, enterFilter(){ - } + }, + // 搜索关键字 + isShow(symbol) { + const reg = new RegExp(this.filterCoin, "gi"); + if (!this.filterCoin) return true; + else { + // let name = symbol.coinName || symbol.pair; + // return name.search(reg) >= 0; + let name = symbol.pair_name || symbol.symbol; + return name.search(reg) >= 0; + } + // return !this.keyword || symbol.coinName.concat(symbol.pair).search(reg) >= 0; + }, } }; @@ -503,4 +533,15 @@ export default { .min-width-B{ min-width: 130px; } + .trade-list{ + // width: 23vw; + height: 1110px; + overflow-y: auto; + display: block; + } + .width-32{ + display: inline-block !important; + vertical-align: top !important; + width: 31% !important; + } diff --git a/src/views/home/index.vue b/src/views/home/index.vue index e6d2317..63995f8 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -466,7 +466,7 @@
- +
{{ $t("homeNewText.hh13") }}
diff --git a/static/favicon.ico b/static/favicon.ico index c06d489..2a7951a 100644 Binary files a/static/favicon.ico and b/static/favicon.ico differ