From dc02cf62b469d5d8a5851b655f211e61f7f3ecba Mon Sep 17 00:00:00 2001 From: luyisha Date: Mon, 8 May 2023 19:11:12 +0800 Subject: [PATCH] 1 --- src/App.vue | 6 +++- src/assets/js/tvStyle.js | 2 +- src/assets/scss/base/_common.scss | 12 +++---- src/assets/scss/base/_init.scss | 3 +- src/assets/scss/module/_contact-us.scss | 2 +- src/assets/scss/module/_contract.scss | 18 +++++++---- src/assets/scss/module/_exchange.scss | 8 ++--- src/assets/scss/module/_home.css | 5 --- src/assets/scss/module/_home.scss | 9 ++---- src/assets/scss/module/_market-book.scss | 2 +- src/assets/scss/module/_market-history.scss | 2 +- src/assets/scss/module/_market-pairs.scss | 2 +- src/assets/scss/module/_market-trade.scss | 3 +- src/components/CommonFooter.vue | 23 ++++++------- src/components/CommonHeader.vue | 9 +++--- src/views/contactUs/index.vue | 8 ++--- src/views/contract/account.vue | 2 +- src/views/contract/exchange-store.vue | 10 +++--- src/views/contract/handicap.vue | 8 ++--- src/views/contract/page-bottom.vue | 32 ++++++++++++++++--- src/views/exchange/book-trades.vue | 23 +++++++++++-- src/views/exchange/index.vue | 2 +- src/views/exchange/make-deal.vue | 13 ++++++++ src/views/exchange/symbols.vue | 11 ++++++- src/views/home/index.vue | 2 +- src/views/option/kline.vue | 5 ++- ...brary.a8de6f8cf4dda6895071c6ec45f900d9.css | 2 +- .../static/css/tradingview_black.css | 18 ++++++----- 28 files changed, 156 insertions(+), 86 deletions(-) diff --git a/src/App.vue b/src/App.vue index 1867fb3..8bdd65d 100644 --- a/src/App.vue +++ b/src/App.vue @@ -32,7 +32,8 @@ export default { // 需要切换主题的页面 let paths = ["option", "exchange","contract"]; if (paths.includes(current)) { - return this.theme + "-app"; + // return this.theme + "-app"; + return ""; } else { return ""; } @@ -97,4 +98,7 @@ export default { } } } +body{ + background-color: #fff!important; +} diff --git a/src/assets/js/tvStyle.js b/src/assets/js/tvStyle.js index 28e78c4..baf596a 100644 --- a/src/assets/js/tvStyle.js +++ b/src/assets/js/tvStyle.js @@ -8,7 +8,7 @@ let light={ let dark = { // "paneProperties.background": "#222e3d", - "paneProperties.background": "#171A1E", + "paneProperties.background": "#FAFAFA", "paneProperties.vertGridProperties.color": "#646566", "paneProperties.horzGridProperties.color": "#646566", "scalesProperties.backgroundColor": "#222e3d", diff --git a/src/assets/scss/base/_common.scss b/src/assets/scss/base/_common.scss index c51294e..6902ac4 100644 --- a/src/assets/scss/base/_common.scss +++ b/src/assets/scss/base/_common.scss @@ -358,13 +358,13 @@ $basew: 24; .el-range-editor.is-active, .el-input.el-date-editor .el-input__inner:focus, .el-input.is-focus .el-input__inner { - background-color: black; - color: #F2F2F2; - border-color: #4e4e5d; + background-color: #FAFAFA; + color: #999; + border: none; &:focus { - background-color: black; - color: #F2F2F2; + background-color: #F5F5F5; + color: #666; } &::-webkit-input-placeholder { @@ -386,7 +386,7 @@ $basew: 24; .form-control:disabled, .form-control[readonly] { - background-color: #000000; + background-color: #fafafa; color: #999; } diff --git a/src/assets/scss/base/_init.scss b/src/assets/scss/base/_init.scss index f672a24..7b438e9 100644 --- a/src/assets/scss/base/_init.scss +++ b/src/assets/scss/base/_init.scss @@ -40,7 +40,8 @@ tbody tr { } tbody tr:hover { - background: #141e2c; + // background: #141e2c; + background: #ffffde; } ::-webkit-scrollbar { diff --git a/src/assets/scss/module/_contact-us.scss b/src/assets/scss/module/_contact-us.scss index c8efc26..c0e34f4 100644 --- a/src/assets/scss/module/_contact-us.scss +++ b/src/assets/scss/module/_contact-us.scss @@ -3,7 +3,7 @@ .light-purple{ } .form-content{ - background:#000 url('~@/assets/img/concat_us.png'); + background:#fff url('~@/assets/img/concat_us.png'); background-size: cover; max-width: 700px; } diff --git a/src/assets/scss/module/_contract.scss b/src/assets/scss/module/_contract.scss index 8b5d27e..080f77f 100644 --- a/src/assets/scss/module/_contract.scss +++ b/src/assets/scss/module/_contract.scss @@ -1,16 +1,20 @@ .contract-page { - background: #212121; + background: #fff; .bg-plain { // background: $cls-white; - background: #171A1E; + background: #fff; } .page-top { padding-top: 1px; + background-color: #f5f5f5; + border-bottom: 1px solid #ebebeb; .kline-box { - background: $cls-white; + // background: $cls-white; + background: #fff; + // border: 1px solid #ebebeb; .coin-change { height: 50px; @@ -20,7 +24,8 @@ } .el-button { - color: $clr; + // color: $clr; + color: #666; } } } @@ -121,11 +126,10 @@ .dark-app { $header: #2b2839; // $page-bg: #141e2c; - $page-bg: #171A1E; + $page-bg: #fff; // $head: #1e2834; - $head: #171A1E; + $head: #fff; $panel: #222e3d; - // $panel: #171A1E; $panel-1: #455c71; $border: #2a2e39; //$color: #c0c4cc; diff --git a/src/assets/scss/module/_exchange.scss b/src/assets/scss/module/_exchange.scss index d7a1a10..6776e19 100644 --- a/src/assets/scss/module/_exchange.scss +++ b/src/assets/scss/module/_exchange.scss @@ -1,11 +1,10 @@ .dark-app { $header: #2b2839; // $page-bg: #141e2c; - $page-bg: #171A1E; + $page-bg: #fff; // $head: #1e2834; - $head: #171A1E; + $head: #fff; $panel:#222e3d; - // $panel:#171A1E; $panel-1: #455c71; $border: #2a2e39; // $color: #c0c4cc; @@ -13,7 +12,8 @@ background: $page-bg; .market-pairs,.order-book,.market-history,.market-news,.market-order{ - border-color: $border; + // border-color: $border; + // border-color: #ebebeb; } .exchange-history .nav,.market-history .nav{ background: $head; diff --git a/src/assets/scss/module/_home.css b/src/assets/scss/module/_home.css index c400d51..4eafeb2 100644 --- a/src/assets/scss/module/_home.css +++ b/src/assets/scss/module/_home.css @@ -3789,11 +3789,6 @@ sub.transmoney-value { color: #1652f0; } -.footer-bottom { - padding: 15px 0; - border-top: 1px solid rgba(255, 255, 255, 0.08); -} - .trade-volume-block { -webkit-box-ordinal-group: 3; -ms-flex-order: 2; diff --git a/src/assets/scss/module/_home.scss b/src/assets/scss/module/_home.scss index f60ef07..d117f70 100644 --- a/src/assets/scss/module/_home.scss +++ b/src/assets/scss/module/_home.scss @@ -3726,8 +3726,8 @@ sub.transmoney-value { |---------------------------------------------------------------------------- */ .footer { - background: black; - border-top: 1px solid #c7c7c7; + background: #f5f5f5; + border-top: 1px solid #ddd; } .footer-upper-section { @@ -3810,11 +3810,6 @@ sub.transmoney-value { color: #1652f0; } -.footer-bottom { - padding: 15px 0; - border-top: 1px solid rgba(255, 255, 255, 0.08); -} - .trade-volume-block { -webkit-box-ordinal-group: 3; -ms-flex-order: 2; diff --git a/src/assets/scss/module/_market-book.scss b/src/assets/scss/module/_market-book.scss index 6ed3ed7..dbd8f02 100644 --- a/src/assets/scss/module/_market-book.scss +++ b/src/assets/scss/module/_market-book.scss @@ -22,7 +22,7 @@ border: none; } .order-book { - border: 1px solid #FFFFFF; + border: 1px solid #ebebeb; border-radius: 2px; } .red-bg-80, diff --git a/src/assets/scss/module/_market-history.scss b/src/assets/scss/module/_market-history.scss index cfa5c30..ea07d78 100644 --- a/src/assets/scss/module/_market-history.scss +++ b/src/assets/scss/module/_market-history.scss @@ -35,6 +35,6 @@ width: 100%; } .market-history { - border: 1px solid #FFFFFF; + border: 1px solid #ebebeb; border-radius: 2px; } diff --git a/src/assets/scss/module/_market-pairs.scss b/src/assets/scss/module/_market-pairs.scss index 0af21e6..8fbe192 100644 --- a/src/assets/scss/module/_market-pairs.scss +++ b/src/assets/scss/module/_market-pairs.scss @@ -1,5 +1,5 @@ .market-pairs { - border: 1px solid #FFFFFF; + border: 1px solid #ebebeb; padding-top: 14px; border-radius: 2px; } diff --git a/src/assets/scss/module/_market-trade.scss b/src/assets/scss/module/_market-trade.scss index 99b4fbd..26f24de 100644 --- a/src/assets/scss/module/_market-trade.scss +++ b/src/assets/scss/module/_market-trade.scss @@ -24,7 +24,8 @@ } .market-trade .nav .nav-item .nav-link.active { - background: #fff; + // background: #fff; + background: none; color: #007bff; } diff --git a/src/components/CommonFooter.vue b/src/components/CommonFooter.vue index a1b5ed8..6cef14a 100644 --- a/src/components/CommonFooter.vue +++ b/src/components/CommonFooter.vue @@ -24,7 +24,7 @@ style=" font-size: 20px; - color: white; + color: #333; font-weight: 700; " > @@ -63,7 +63,7 @@ style=" font-size: 20px; - color: white; + color: #333; font-weight: 700; " > @@ -96,14 +96,14 @@

{{ $t("common.contactUs") }}

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

-

+

{{ email }}

@@ -336,7 +336,7 @@ export default { // margin-left: 233px; justify-content: center; padding: 0 400px; - background-color: #000; + background-color: #f5f5f5; .footer-upper-section-left { display: flex; justify-content: space-between; @@ -392,12 +392,13 @@ export default { .footer-bottom { width: 100%; height: 57px; - background-color: rgba(0, 0, 0, 1); + background-color: #F5F5F5; text-align: center; - border: 1px solid #0C0C0C; + border: 1px solid #ddd; .container { width: 100%; - height: 57px; + height: 55px; + line-height: 55px; margin: 0 auto; } } @@ -408,16 +409,16 @@ export default { .foot_p { - color: #797979; + color: #bbb; font-size: 14px; margin: 0; a:hover { - color: #797979; + color: #bbb; } a:visited { - color: #797979; + color: #bbb; } } diff --git a/src/components/CommonHeader.vue b/src/components/CommonHeader.vue index ae6375c..6f65629 100644 --- a/src/components/CommonHeader.vue +++ b/src/components/CommonHeader.vue @@ -608,9 +608,10 @@ color: #000 !important; } .btn-outline-light { - color: #fff !important; + color: #000 !important; - background-color: $underpainting; + // background-color: $underpainting; + background-color: #fff; &:hover { color: #000 !important; @@ -631,8 +632,8 @@ color: #000 !important; .nav-bar .router-link-active { // color: #c99445; // color: black; - // color: #fff; - border-bottom: 2px solid black; + color: #F7D558; + border-bottom: 2px solid #F7D558; // background-color:rgba(53, 83, 210, 0.2) ; } diff --git a/src/views/contactUs/index.vue b/src/views/contactUs/index.vue index cb79a6a..ec34e88 100644 --- a/src/views/contactUs/index.vue +++ b/src/views/contactUs/index.vue @@ -1,14 +1,14 @@