diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..a74be6f Binary files /dev/null and b/dist.zip differ diff --git a/src/assets/scss/_settings.scss b/src/assets/scss/_settings.scss index 073a3b0..411bdbb 100644 --- a/src/assets/scss/_settings.scss +++ b/src/assets/scss/_settings.scss @@ -41,8 +41,7 @@ $cls-white:rgba(0,0,0,1); // exchange & contract $decreace : #ff231f; // 酒红色 -// $increace: #26de81; // 青绿色 -$increace : #53b987; +$increase : #53b987; // status $success : green; diff --git a/src/assets/scss/base/_common.scss b/src/assets/scss/base/_common.scss index 7619678..b5f9c0f 100644 --- a/src/assets/scss/base/_common.scss +++ b/src/assets/scss/base/_common.scss @@ -6,8 +6,8 @@ @include face($opensans); // 标记上涨或者下跌的文本样式 -.increace { - color: $increace; // ⬆️ +.increase { + color: $increase; // ⬆️ } .decreace { @@ -28,7 +28,7 @@ .tri-inc { @extend .triangle; border-top: none; - border-bottom-color: $increace; + border-bottom-color: $increase; opacity: 0.6; // 淡化颜色 } @@ -124,7 +124,7 @@ } .green { - color: $increace; + color: $increase; } .red { @@ -402,6 +402,15 @@ $basew: 24; .modal-footer { // border-top-color: #4e4e5d;//改合约-一键平仓模态框注释的样式 } +.modal-body{ + .input-group-text{ + // background-color: #000; + } +} +.wallet-page .deposite-body .input-group .dopsite-control .input-group-text{ + background-color: #F7D558 !important; + border-color: #F7D558 !important; +} .el-pagination button:disabled, .el-dialog, @@ -518,6 +527,9 @@ $basew: 24; background-color: #ccc !important; } } + .el-button:focus{ + border: none; + } } } diff --git a/src/assets/scss/module/_option.scss b/src/assets/scss/module/_option.scss index 9cdca00..08f6b5c 100644 --- a/src/assets/scss/module/_option.scss +++ b/src/assets/scss/module/_option.scss @@ -37,7 +37,7 @@ width: 100%; &.buy { - background: $increace; + background: $increase; } &.sell { diff --git a/src/assets/scss/module/_wallet.scss b/src/assets/scss/module/_wallet.scss index d213f40..afff93c 100644 --- a/src/assets/scss/module/_wallet.scss +++ b/src/assets/scss/module/_wallet.scss @@ -15,7 +15,7 @@ // $cls-white cls-white, // // exchange & contract // $decreace decreace, - // $increace increace, + // $increase increase, // // tips // $caution caution, diff --git a/src/views/contract/account copy.vue b/src/views/contract/account copy.vue index 61cfa54..c86217f 100644 --- a/src/views/contract/account copy.vue +++ b/src/views/contract/account copy.vue @@ -30,7 +30,7 @@
{{$t('contract.a6')}}(USDT)
-
{{accountInfo.unRealProfit}}
+
{{accountInfo.unRealProfit}}
{{$t('contract.a7')}}(USDT)
diff --git a/src/views/contract/account.vue b/src/views/contract/account.vue index 185e304..fadb2bc 100644 --- a/src/views/contract/account.vue +++ b/src/views/contract/account.vue @@ -30,7 +30,7 @@
{{$t('contract.a6')}}(USDT)
-
{{accountInfo.unRealProfit}}
+
{{accountInfo.unRealProfit}}
-->
{{$t('contract.a7')}} diff --git a/src/views/contract/handicap copy.vue b/src/views/contract/handicap copy.vue index 5590c39..418202b 100644 --- a/src/views/contract/handicap copy.vue +++ b/src/views/contract/handicap copy.vue @@ -45,7 +45,7 @@ >
{{ $t("contract.g3") }}
-
+
{{ newPriceObj.price }}
@@ -92,7 +92,7 @@ @click="$emit('selectprice', item.price)" >
-
{{ item.price }}
+
{{ item.price }}
{{ omitTo(item.amount, 2) }}
diff --git a/src/views/contract/handicap.vue b/src/views/contract/handicap.vue index a864bb2..070a3ea 100644 --- a/src/views/contract/handicap.vue +++ b/src/views/contract/handicap.vue @@ -68,8 +68,9 @@ >
{{ $t("contract.g3") }}
-
+
{{ newPriceObj.price }} +
@@ -84,7 +85,7 @@ @click="$emit('selectprice', item.price)" >
-
{{ item.price }}
+
{{ item.price }}
{{ omitTo(item.amount, 2) }}
{{ item.total }}
@@ -112,7 +113,7 @@
{{ parseTime(item.ts, false, "{h}:{i}:{s}") }}
-
+
{{ item.price }}
@@ -170,12 +171,14 @@ export default { }; }, sellListShow() { - let list = this.sellList.splice(0, 12); - let total = 0; - list.forEach(item => { - item.total = total += item.amount; - }); - return list.reverse(); + let list = this.sellList.splice(0, 12); + let total = 0; + list.forEach(item => { + item.total = total += item.amount; + }); + // console.log(list,'sellListShow' ) + return list.reverse(); + // return []; }, buyListShow() { let list = this.buyList.splice(0, 12); @@ -183,7 +186,9 @@ export default { list.forEach(item => { item.total = total += item.amount; }); + // console.log(list, 'buyListShow') return list; + // return []; } }, created() { @@ -192,7 +197,8 @@ export default { this.linkSocket(); } bus.$on('collapse', msg => { - this.newPriceObj.price =this.symbol=='BTC'? (msg.close).toFixed(1):(msg.close).toFixed(3); + // +字符串转数字 + this.newPriceObj.price = +(this.symbol=='BTC'? (msg.close).toFixed(1):(msg.close).toFixed(3)); this.$emit("input", this.newPriceObj); }); }, @@ -208,7 +214,9 @@ export default { this.sellList = res.swapSellList; this.buyList = res.swapBuyList; this.tradeList = res.swapTradeList; - this.newPriceObj = this.tradeList[0]; + if(this.tradeList.length>0){ + this.newPriceObj = this.tradeList[0]; + } this.$emit("input", this.newPriceObj); }); }, diff --git a/src/views/contract/handicapRight.vue b/src/views/contract/handicapRight.vue index 7ff9891..5b1acf1 100644 --- a/src/views/contract/handicapRight.vue +++ b/src/views/contract/handicapRight.vue @@ -21,7 +21,7 @@
{{ parseTime(item.ts, false, "{h}:{i}:{s}") }}
-
+
{{ item.price }}
diff --git a/src/views/contract/hold-position.vue b/src/views/contract/hold-position.vue index 7d71c64..7623da3 100644 --- a/src/views/contract/hold-position.vue +++ b/src/views/contract/hold-position.vue @@ -51,7 +51,7 @@ {{ item.avg_price * 1 }} {{ item.realtimePrice }} {{ item.flatPrice }} - {{ (parseFloat(item.unRealProfit)).toFixed(2) }} + {{ (parseFloat(item.unRealProfit)).toFixed(2) }} {{ item.profitRate }} {{ item.tpPrice || "--" }}/{{ item.slPrice || "--" }} @@ -624,8 +624,8 @@ export default { }, }; - diff --git a/src/views/contract/transaction-record.vue b/src/views/contract/transaction-record.vue index 45a56c2..1ce258c 100644 --- a/src/views/contract/transaction-record.vue +++ b/src/views/contract/transaction-record.vue @@ -14,7 +14,7 @@ {{ item.log_type_text }} diff --git a/src/views/exchange/book-trades.vue b/src/views/exchange/book-trades.vue index 589cb10..e4b0dcc 100644 --- a/src/views/exchange/book-trades.vue +++ b/src/views/exchange/book-trades.vue @@ -32,7 +32,7 @@ {{ $t("exchange.last-price") }} - {{ newTrade.price}} + {{ newTrade.price}} CNY @@ -41,7 +41,7 @@ ≈ {{newTrade.price*priceCny|omitTo(2)}} ≈ {{newTrade.price|omitTo(2)}} - + {{ $t("exchange.change") }} {{ changeRate }} diff --git a/src/views/exchange/symbols.vue b/src/views/exchange/symbols.vue index 9a69719..bb5eb32 100644 --- a/src/views/exchange/symbols.vue +++ b/src/views/exchange/symbols.vue @@ -79,7 +79,7 @@ export default { marketInfoList: Array(10).fill({ coin_name: "-", price: "-", - increace: 0, + increase: 0, increaseStr: "+0.00%", }), }) @@ -108,7 +108,7 @@ export default { marketInfoList: Array(10).fill({ pair: "-", price: "-", - increace: 0, + increase: 0, increaseStr: "+0.00%", }), }, diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 3e758dc..4e49956 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -33,7 +33,7 @@
{{ item.price }} - + {{ item.increaseStr }}
@@ -145,7 +145,7 @@ {{ item.close }} @@ -153,7 +153,7 @@ {{ item.increaseStr }} @@ -236,7 +236,7 @@ {{ item.close }} @@ -245,7 +245,7 @@ - +
- {{ $t("xtzcoins3.a70") }} + +
{{ $t("xtzcoins3.a70") }}
@@ -733,6 +734,9 @@ export default { }) .catch(res => {}); }, + PageScrollTo(num){ + document.documentElement.scrollTop = num; + } }, created() { @@ -878,7 +882,7 @@ created() { /deep/ .form-control{ color: #999; background-color: #f8f8f8; - border-color: #f8f8f8; + border-color: #e5e5e5; } .dropdown-menu{ background-color: #fff; @@ -910,5 +914,7 @@ input[type=radio]{ color: #000!important; background-color: #F7D558; border-radius: 4px; + cursor: pointer; } + \ No newline at end of file diff --git a/src/views/wallet/funding.vue b/src/views/wallet/funding.vue index 377ce74..27978ad 100644 --- a/src/views/wallet/funding.vue +++ b/src/views/wallet/funding.vue @@ -64,7 +64,7 @@ {{$t('wallet.error')}} - {{$t('wallet.success')}} + {{$t('wallet.success')}} {{$t('wallet.underReview')}} diff --git a/项目文档.md b/项目文档.md index 468a5e2..d30ec91 100644 --- a/项目文档.md +++ b/项目文档.md @@ -166,7 +166,7 @@ UI框架选型为`ELEMNET`,为了适配当前站点风格,我们改写了ele @cls-purple : rgba(193, 187, 242, 1); // 经典浅紫色 // exchange & contract @claret : #FF5959; // decreace 酒红色 - @turquoise : #25BC67; // increace 青绿色 + @turquoise : #25BC67; // increase 青绿色 ```