From d5ff9af6bb6b1974f6e50c3330ea7d8e5ad9fa76 Mon Sep 17 00:00:00 2001
From: 李凌 <344137771@qq.com>
Date: Thu, 11 Sep 2025 18:32:00 +0800
Subject: [PATCH] 9.11
---
src/views/quotes/components/head.vue | 7
src/assets/imgs/footer/trade.png | 0
src/views/homePage/components/head.vue | 11 +
src/assets/imgs/footer/assets.png | 0
src/assets/imgs/footer/quotes-active.png | 0
src/views/my/assets.vue | 106 +++++++++++++++++---
src/views/cryptos/Trade/index.vue | 4
src/components/fx-footer/index.vue | 29 ++++-
src/views/quotes/List.vue | 2
src/views/optional/Search.vue | 3
src/assets/imgs/footer/assets-active.png | 0
src/config/index.js | 4
src/assets/imgs/footer/quotes.png | 0
src/assets/image/assets-center/as_bg.png | 0
src/assets/imgs/footer/home.png | 0
src/views/my/index.vue | 6
src/views/cryptos/TrendDetails/index.vue | 6
src/components/Transform/trade-head/index.vue | 8
src/views/homePage/index.vue | 11 +-
src/views/trade/index.vue | 6
src/assets/imgs/footer/trade-active.png | 0
src/assets/imgs/footer/spot.png | 0
src/assets/imgs/home/user.png | 0
src/components/Transform/list-quotation/index.vue | 10 +-
src/assets/css/variable.scss | 16 +-
src/components/Transform/assets-head/index.vue | 2
src/assets/imgs/footer/home-active.png | 0
src/App.vue | 9 -
src/assets/imgs/footer/spot-active.png | 0
src/components/Transform/perpetual-open/index.vue | 4
src/components/Transform/cryptos-trade-deep-data/index.vue | 4
31 files changed, 169 insertions(+), 79 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index 4fcc67d..b24fa60 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -119,7 +119,7 @@
}
#cryptos {
- background-color: $mainbgWhiteColor;
+ // background-color: $mainbgWhiteColor;
// 上传图片框大小设置
.van-uploader__upload {
@@ -218,8 +218,7 @@
.list-quatation {
.van-cell {
padding: 15px 0 !important;
- background: $mainbgWhiteColor;
- // background: $inp-b;
+ background: $selectSymbol_background;
&::after {
border: none;
@@ -347,7 +346,7 @@
}
.van-popup {
- background: $mainbgWhiteColor;
+ background: $main_background;
margin: 0 auto;
}
@@ -361,7 +360,7 @@
}
.van-dialog {
- background: $mainbgWhiteColor;
+ background: $main_background;
}
.van-dialog__header {
diff --git a/src/assets/css/variable.scss b/src/assets/css/variable.scss
index 0ee512e..6d88d42 100644
--- a/src/assets/css/variable.scss
+++ b/src/assets/css/variable.scss
@@ -11,10 +11,9 @@
$text_color4:#333; //浅色标题背景文字颜色
$text_color5:#878A96; //
$text_color6:#B7BDD1; // 文字更浅色
-// $tab_background:#27293B; //tab切换背景颜色
-$tab_background:#f7f7f7; //tab切换背景颜色
+$tab_background:#27293B; //tab切换背景颜色
$active_line:#1194F7; //tab选中样式颜色
-$footer_background:#252738; // 底部颜色
+$footer_background:#1a1a1a; // 底部颜色
$btn_main: #1194F7; //主题色按钮
$color_main:#1194F7; //主题色文字
$btn_background:#474B62; //按钮颜色
@@ -36,8 +35,7 @@
$c2c_background1: #27293B;
$c2c_tab_background:#27293B;
$c2c_tip_background: #131a2e;
-// $selectSymbol_background: #131a2e; //自选与选择币种背景颜色
-$selectSymbol_background: #f7f7f7; //自选与选择币种背景颜色
+$selectSymbol_background: #212121; //自选与选择币种背景颜色
$US_tab_background: #1D2439;
$US_tabActice_background: #112542;
$lable_color: #888;
@@ -54,6 +52,11 @@
:root:root {
--van-button-primary-background: #f7b600;
--van-button-primary-border-color:#f7b600;
+ --van-popup-background: #121212;
+ --van-cell-background: #121212;
+ --van-cell-text-color: #ccc;
+// --van-collapse-item-content-background: #121212;
+// --van-collapse-item-content-text-color: #ccc;
}
.yellow-bg{
background: $bg_yellow;
@@ -73,8 +76,7 @@
.c2cColor{color:$c2c_color}
.labelColor{color:$text_color6}
.tabBackground{
- // background: $tab_background;
- background: $inp-b;
+ background: $tab_background;
}
.activeLine{
background: $active_line;
diff --git a/src/assets/image/assets-center/as_bg.png b/src/assets/image/assets-center/as_bg.png
new file mode 100644
index 0000000..b0b55ce
--- /dev/null
+++ b/src/assets/image/assets-center/as_bg.png
Binary files differ
diff --git a/src/assets/imgs/footer/assets-active.png b/src/assets/imgs/footer/assets-active.png
index 91776b3..e29164e 100644
--- a/src/assets/imgs/footer/assets-active.png
+++ b/src/assets/imgs/footer/assets-active.png
Binary files differ
diff --git a/src/assets/imgs/footer/assets.png b/src/assets/imgs/footer/assets.png
index 941c985..d752af6 100644
--- a/src/assets/imgs/footer/assets.png
+++ b/src/assets/imgs/footer/assets.png
Binary files differ
diff --git a/src/assets/imgs/footer/home-active.png b/src/assets/imgs/footer/home-active.png
index 30438cb..98c571b 100644
--- a/src/assets/imgs/footer/home-active.png
+++ b/src/assets/imgs/footer/home-active.png
Binary files differ
diff --git a/src/assets/imgs/footer/home.png b/src/assets/imgs/footer/home.png
index 7bc0d8b..1a0b4ec 100644
--- a/src/assets/imgs/footer/home.png
+++ b/src/assets/imgs/footer/home.png
Binary files differ
diff --git a/src/assets/imgs/footer/quotes-active.png b/src/assets/imgs/footer/quotes-active.png
index 77e6109..c1e4d40 100644
--- a/src/assets/imgs/footer/quotes-active.png
+++ b/src/assets/imgs/footer/quotes-active.png
Binary files differ
diff --git a/src/assets/imgs/footer/quotes.png b/src/assets/imgs/footer/quotes.png
index a642973..8704d12 100644
--- a/src/assets/imgs/footer/quotes.png
+++ b/src/assets/imgs/footer/quotes.png
Binary files differ
diff --git a/src/assets/imgs/footer/spot-active.png b/src/assets/imgs/footer/spot-active.png
new file mode 100644
index 0000000..053786d
--- /dev/null
+++ b/src/assets/imgs/footer/spot-active.png
Binary files differ
diff --git a/src/assets/imgs/footer/spot.png b/src/assets/imgs/footer/spot.png
new file mode 100644
index 0000000..6b2adaf
--- /dev/null
+++ b/src/assets/imgs/footer/spot.png
Binary files differ
diff --git a/src/assets/imgs/footer/trade-active.png b/src/assets/imgs/footer/trade-active.png
index ddafb08..50da49d 100644
--- a/src/assets/imgs/footer/trade-active.png
+++ b/src/assets/imgs/footer/trade-active.png
Binary files differ
diff --git a/src/assets/imgs/footer/trade.png b/src/assets/imgs/footer/trade.png
index 187a07a..db1f1a8 100644
--- a/src/assets/imgs/footer/trade.png
+++ b/src/assets/imgs/footer/trade.png
Binary files differ
diff --git a/src/assets/imgs/home/user.png b/src/assets/imgs/home/user.png
new file mode 100644
index 0000000..f3131b2
--- /dev/null
+++ b/src/assets/imgs/home/user.png
Binary files differ
diff --git a/src/components/Transform/assets-head/index.vue b/src/components/Transform/assets-head/index.vue
index 9028eb2..a75a064 100644
--- a/src/components/Transform/assets-head/index.vue
+++ b/src/components/Transform/assets-head/index.vue
@@ -62,8 +62,6 @@
<style lang="scss" scoped>
:deep(.van-nav-bar) {
- // background-color: $selectSymbol_background !important;
- background-color: $mainbgWhiteColor !important;
.van-nav-bar__content {
height: 96px;
}
diff --git a/src/components/Transform/cryptos-trade-deep-data/index.vue b/src/components/Transform/cryptos-trade-deep-data/index.vue
index 55558cb..e59cc06 100644
--- a/src/components/Transform/cryptos-trade-deep-data/index.vue
+++ b/src/components/Transform/cryptos-trade-deep-data/index.vue
@@ -13,7 +13,7 @@
<div v-if="showType == 0 || showType == 2" class="flex justify-between pt-6 font-26" v-for="(item, index) in redData"
:key="item + index" @click="onPrice(item.price)" :style="{
- 'background': `linear-gradient(to right,${THEME == 'dark' ? '#131A2E' : '#fff'} 0%` +
+ 'background': `linear-gradient(to right,${THEME == 'dark' ? '#131A2E' : '#555'} 0%` +
(item.amount / greenData[greenData.length - 1].amount) * 100 + '%,rgba(246,70,93,.1) ' +
(item.amount / greenData[greenData.length - 1].amount) * 100 + '%,rgba(246,70,93,.1) 100%)'
}">
@@ -31,7 +31,7 @@
</div>
<div v-if="showType == 0 || showType == 1" class="flex justify-between pt-6 font-26"
v-for="(item, index) in greenData" :key="index" @click="onPrice(item.price)" :style="{
- 'background': `linear-gradient(to right,${THEME == 'dark' ? '#131A2E' : '#fff'} 0%` +
+ 'background': `linear-gradient(to right,${THEME == 'dark' ? '#131A2E' : '#555'} 0%` +
(item.amount / greenData[greenData.length - 1].amount) * 100 + '%,rgba(94,186,137,.1) ' +
(item.amount / greenData[greenData.length - 1].amount) * 100 + '%,rgba(94,186,137,.1) 100%)'
}">
diff --git a/src/components/Transform/list-quotation/index.vue b/src/components/Transform/list-quotation/index.vue
index ac397c4..ac81d0e 100644
--- a/src/components/Transform/list-quotation/index.vue
+++ b/src/components/Transform/list-quotation/index.vue
@@ -21,8 +21,8 @@
</van-cell>
<transition-group :name="type" tag="div">
<div v-if="active == 0" :key="active">
- <van-cell v-for="item in listData" :key="item.id">
- <ul class="flex justify-between w-full items-center" @click="onItemClick(item)">
+ <van-cell v-for="item in listData" :key="item.id" class="mt-30 rounded-2xl">
+ <ul class="flex justify-between w-full items-center px-20" @click="onItemClick(item)">
<li class="flex items-center left">
<img
:src="item.symbol ? `${HOST_URL}/symbol/${item.symbol_data}.png` : handleImage('../../../assets/loading-default.png')"
@@ -58,8 +58,8 @@
</van-cell>
</div>
<div v-else :key="active">
- <van-cell v-for="item in showList" :key="item.id">
- <ul class="flex justify-between w-full items-center" @click="onItemClick(item)">
+ <van-cell v-for="item in showList" :key="item.id" class="mt-30 rounded-2xl">
+ <ul class="flex justify-between w-full items-center px-20" @click="onItemClick(item)">
<li class="flex items-center left">
<img :src="`${HOST_URL}/symbol/${item.symbol_data}.png`" alt="logo"
class="w-72 h-72 rounded-full mr-16" />
@@ -241,7 +241,7 @@
}
.textColor{
- color: $text_color4;
+ color: $text_color;
}
.left-leave-active,
diff --git a/src/components/Transform/perpetual-open/index.vue b/src/components/Transform/perpetual-open/index.vue
index 34797f5..faa954a 100644
--- a/src/components/Transform/perpetual-open/index.vue
+++ b/src/components/Transform/perpetual-open/index.vue
@@ -260,7 +260,7 @@
<div v-if="showType == 0 || showType == 2" class="w-290 flex justify-between pt-1 font-26"
v-for="(item, index) in redData" :key="item + index" @click="onQuickPrice(item.price)" :style="{
background:
- `linear-gradient(to right,${THEME == 'dark' ? '#131A2E' : '#fff'
+ `linear-gradient(to right,${THEME == 'dark' ? '#131A2E' : '#555'
} 0%` +
(1 - item.amount / greenData[greenData.length - 1].amount) *
100 +
@@ -303,7 +303,7 @@
<div v-if="showType == 0 || showType == 1" class="w-290 flex justify-between pt-1 font-26"
v-for="(item, index) in greenData" :key="index" @click="onQuickPrice(item.price)" :style="{
background:
- `linear-gradient(to right,${THEME == 'dark' ? '#131A2E' : '#fff'
+ `linear-gradient(to right,${THEME == 'dark' ? '#131A2E' : '#555'
} 0%` +
(1 - item.amount / greenData[greenData.length - 1].amount) *
100 +
diff --git a/src/components/Transform/trade-head/index.vue b/src/components/Transform/trade-head/index.vue
index 71499ab..f48378c 100644
--- a/src/components/Transform/trade-head/index.vue
+++ b/src/components/Transform/trade-head/index.vue
@@ -9,13 +9,13 @@
<!-- <img v-if="isReturn" src="@/assets/image/icon_back_1.png" @click="backPath()" class="w-40 h-40 back mr-50"
alt=""> -->
- <img v-if="isReturn" src="@/assets/image/icon_back.png" @click="goBack()" class="w-40 h-40 back mr-50"
+ <img v-if="isReturn" src="@/assets/image/icon_back_1.png" @click="goBack()" class="w-40 h-40 back mr-50"
alt="">
<template v-if="!isChange">
- <!-- <img src="../../../assets/theme/dark/image/black-convert.png" alt="convert-img" class="w-35 h-35"
- @click="onSidebar" /> -->
- <img src="../../../assets/theme/white/image/black-convert.png" alt="convert-img" class="w-35 h-35"
+ <img src="../../../assets/theme/dark/image/black-convert.png" alt="convert-img" class="w-35 h-35"
@click="onSidebar" />
+ <!-- <img src="../../../assets/theme/white/image/black-convert.png" alt="convert-img" class="w-35 h-35"
+ @click="onSidebar" /> -->
</template>
<!-- 在切换模式下 -->
<template v-if="isChange">
diff --git a/src/components/fx-footer/index.vue b/src/components/fx-footer/index.vue
index 3e501f9..7b86cbd 100644
--- a/src/components/fx-footer/index.vue
+++ b/src/components/fx-footer/index.vue
@@ -1,6 +1,6 @@
<template>
<div class="relative z-30 footer">
- <van-tabbar route v-model="active" active-color="#292929" inactive-color="7f7f7f" @change="changeIndex" fixed
+ <van-tabbar route v-model="active" active-color="f7b328" inactive-color="868d9a" @change="changeIndex" fixed
safe-area-inset-bottom>
<!-- <van-tabbar-item name="optional" to="/optional">
<span :class="[active === 'optional' ? 'active' : '']">{{ $t('Optional') }}</span>
@@ -20,12 +20,21 @@
<img :src="props.active ? icon.quotes.active : icon.quotes.inactive" />
</template>
</van-tabbar-item>
+
+ <van-tabbar-item name="spot" to="/cryptos/trade/btcusdt">
+ <span :class="[active === 'spot' ? 'active' : '']">{{ $t('现货') }}</span>
+ <template #icon="props">
+ <img :src="props.active ? icon.spot.active : icon.spot.inactive" />
+ </template>
+ </van-tabbar-item>
+
<van-tabbar-item name="trade" to="/trade">
<span :class="[active === 'trade' ? 'active' : '']">{{ $t('trade') }}</span>
<template #icon="props">
<img :src="props.active ? icon.trade.active : icon.trade.inactive" />
</template>
</van-tabbar-item>
+
<!-- <van-tabbar-item name="funds" to="/cryptos/funds">
<span>{{ $t('资金') }}</span>
<template #icon="props">
@@ -39,7 +48,7 @@
<img :src="props.active ? icon.news.active : icon.news.inactive" />
</template>
</van-tabbar-item> -->
-
+
<!-- <van-tabbar-item name="documentation" to="/documentation">
<span :class="[active === 'documentation' ? 'active' : '']">{{ $t('跟单') }}</span>
<template #icon="props">
@@ -98,7 +107,7 @@
active.value = 'assets'
} else if (route.path == "/documentation/index") {
active.value = 'documentation'
-}
+}
let quotesStore = useQuotesStore()
watch(() => route.path, (nv) => {
@@ -146,6 +155,10 @@
active: new URL('@/assets/imgs/footer/trade-active.png', import.meta.url),
inactive: new URL('@/assets/imgs/footer/trade.png', import.meta.url),
},
+ spot: {
+ active: new URL('@/assets/imgs/footer/spot-active.png', import.meta.url),
+ inactive: new URL('@/assets/imgs/footer/spot.png', import.meta.url),
+ },
// funds: {
// active: new URL('@/assets/imgs/footer/funds-active.png', import.meta.url),
// inactive: new URL('@/assets/imgs/footer/funds.png', import.meta.url),
@@ -167,22 +180,22 @@
<style lang="scss" scoped>
:deep(.van-tabbar-item__text) {
font-size: 12px;
- color: #7f7f7f;
+ color: #868d9a;
}
:deep(.van-tabbar-item--active) {
- background-color: $white;
+ background-color: $footer_background;
}
.van-tabbar--fixed {
z-index: 10;
padding-bottom: constant(safe-area-inset-bottom);
padding-bottom: env(safe-area-inset-bottom);
- background-color: $white;
+ background-color: $footer_background;
}
.van-tabbar--fixed::after {
- border-color: $white;
+ border-color: $footer_background;
}
// .blue {
@@ -190,7 +203,7 @@
// }
.active {
- color: #292929 !important;
+ color: #f7b328 !important;
}
.footer {
diff --git a/src/config/index.js b/src/config/index.js
index bcbb6f1..c45be11 100644
--- a/src/config/index.js
+++ b/src/config/index.js
@@ -35,12 +35,12 @@
// const ENV_DEV = 'zhapi.coinbtcs.com' // dev
// const ENV_DEV = 'openapi.yanshiz.com' // dev
-const ENV_DEV = 'api.cme-coin.com' // dev
+const ENV_DEV = 'hkapi.yanshiz.com' // dev
// const ENV_DEV = '192.168.10.6:8086' // dev
// const ENV_PRO = 'qheufhj.site' // app域名
// const ENV_PRO = window.location.hostname // 接口域名跟随 H5zhapi.coinbtcs.com
-const ENV_PRO = 'api.cme-coin.com' // 接口域名跟随 H5zhapi.coinbtcs.com
+const ENV_PRO = 'hkapi.yanshiz.com' // 接口域名跟随 H5zhapi.coinbtcs.com
// const ENV_PRO = '192.168.10.6:8086' // 接口域名跟随 H5zhapi.coinbtcs.com
let base_url = ''
diff --git a/src/views/cryptos/Trade/index.vue b/src/views/cryptos/Trade/index.vue
index 368bc93..8d97938 100644
--- a/src/views/cryptos/Trade/index.vue
+++ b/src/views/cryptos/Trade/index.vue
@@ -542,7 +542,7 @@
@import "@/assets/init.scss";
#cryptos {
- background-color: $mainbgWhiteColor;
+ // background-color: $mainbgWhiteColor;
:v-deep(.px-4) {
padding-left: 30px !important;
padding-right: 30px !important;
@@ -554,7 +554,7 @@
}
.diviLine{
- background: $mainbgWhiteColor;
+ background: $main2_background;
}
.border-b-color{
diff --git a/src/views/cryptos/TrendDetails/index.vue b/src/views/cryptos/TrendDetails/index.vue
index b5141fc..3a36b21 100644
--- a/src/views/cryptos/TrendDetails/index.vue
+++ b/src/views/cryptos/TrendDetails/index.vue
@@ -73,7 +73,7 @@
</p>
</li>
<li v-for="(item, index) in bids" :key="index" class="flex justify-between font-26 py-15" :style="{
- 'background': `linear-gradient(to left,${THEME == 'dark' ? '#131A2E' : '#fff'} 0% ` +
+ 'background': `linear-gradient(to left,${THEME == 'dark' ? '#131A2E' : '#555'} 0% ` +
(item.amount / bids[bids.length - 1].amount) * 100 + '%,rgba(94,186,137,.1) ' +
(item.amount / bids[bids.length - 1].amount) * 100 + '%,rgba(94,186,137,.1) 100%)'
}">
@@ -92,7 +92,7 @@
</p>
</li>
<li v-for="(item, index) in asks" :key="index" class="flex justify-between font-26 py-15" :style="{
- 'background': `linear-gradient(to left,${THEME == 'dark' ? '#131A2E' : '#fff'} 0% ` +
+ 'background': `linear-gradient(to left,${THEME == 'dark' ? '#131A2E' : '#555'} 0% ` +
(item.amount / asks[asks.length - 1].amount) * 100 + '%,rgba(246,70,93,.1) ' +
(item.amount / asks[asks.length - 1].amount) * 100 + '%,rgba(246,70,93,.1) 100%)'
}">
@@ -282,7 +282,7 @@
order_no: '',
timer: null,
isChangeLine: false,
- isNight: false,
+ isNight: true,
isChange: true, //是否有切换黑夜白天模式
kineType: '',
deepBuy: [],
diff --git a/src/views/homePage/components/head.vue b/src/views/homePage/components/head.vue
index d1c457b..df1e8f5 100644
--- a/src/views/homePage/components/head.vue
+++ b/src/views/homePage/components/head.vue
@@ -1,6 +1,9 @@
<template>
<div class="head flex justify-between items-center ">
- <div class="more mr-5"><img src="@/assets/imgs/home/more.png" alt="" @click="onRoute('/my')"></div>
+ <div class="more mr-5"><img src="@/assets/imgs/home/user.png" alt="" @click="onRoute('/my')"></div>
+ <div class="flex-1 text-4xl" v-if="userStore.userInfo && userStore.userInfo.username">
+ {{ userStore.userInfo.username }}
+ </div>
<!-- <div class="more_input pl-5 pr-5 flex items-center justify-start mr-5 pt-2" @click="onRoute('/optional/search')">
<img src="@/assets/imgs/quotes/search.png" alt="">
<span class="pl-5">{{ $t('请输入关键词搜寻') }}</span>
@@ -15,6 +18,8 @@
<script setup>
import { useRouter } from 'vue-router';
import { useI18n } from "vue-i18n";
+import { useUserStore } from '@/store/user';
+const userStore = useUserStore()
const { t } = useI18n()
const router = useRouter()
@@ -32,12 +37,14 @@
$inp-c: #999;
margin-bottom: 1rem;
- .more,
.gift,
.scan,
.instruction {
width: 3.2rem;
}
+ .more{
+ width: 5rem;
+ }
.more_input {
// width: 26rem;
diff --git a/src/views/homePage/index.vue b/src/views/homePage/index.vue
index 12df164..d7ce8fb 100644
--- a/src/views/homePage/index.vue
+++ b/src/views/homePage/index.vue
@@ -20,7 +20,7 @@
</div>
</div>
- <van-notice-bar class="font-26 mt-10 index_notice" background="#fafbfc" :scrollable="false" wrapable
+ <van-notice-bar class="font-26 mt-10 index_notice" background="#333" :scrollable="false" wrapable
color="#333333">
<van-swipe vertical class="notice-swipe" :autoplay="2000" :show-indicators="false">
<van-swipe-item v-for="item in announceList" :key="item.id" @click="toAnnounceDetail(item.uuid)">
@@ -143,7 +143,7 @@
<style lang="scss">
.home_page {
- background: $white;
+ // background: $white;
min-height: 100vh;
width: 100%;
padding: 1rem 1rem 10rem 1rem;
@@ -167,9 +167,7 @@
}
.notice_content {
- &>div:first-child {
- color: $text_color1;
- }
+ color: $text_color;
}
}
@@ -205,6 +203,7 @@
.login_but_z {
background: $crd-b;
+ color: $text_color4;
}
.login_but_d {
@@ -217,7 +216,7 @@
.grid_item {
width: 24%;
- color: $tab-c;
+ color: $text_color3;
font-size: 1.6rem;
.grid_item_img {
diff --git a/src/views/my/assets.vue b/src/views/my/assets.vue
index 3b70fa7..464d177 100644
--- a/src/views/my/assets.vue
+++ b/src/views/my/assets.vue
@@ -1,5 +1,38 @@
<template>
<div class="assets">
+ <van-field v-model="value" :placeholder="$t('search')" class="assets_search" left-icon="search" />
+
+ <div class="assets_1">
+ <div class="price_box-tit">{{ $t('总资产估值') }}</div>
+
+ <div class="price_box-text assets_money font-bold mt-5 flex justify-center items-end">
+ {{ currency.currency_symbol }}{{ forexAssets?.money_contract ?
+ (forexAssets?.money_contract * (currency.rate ?? 0)).toFixed(2) : '0.00' }}
+
+ <div class="pricing_jj ml-5">
+ {{ pricing }}
+ </div>
+ <van-dropdown-menu>
+ <van-dropdown-item v-model="pricing" :options="pricingList" @change="changePricing">
+ <div @click="toPage('/cryptos/exchangeRate')" class="text-center">{{ $t('更多') }}</div>
+ </van-dropdown-item>
+ </van-dropdown-menu>
+ </div>
+
+ <div class="price-bot">
+ <div>
+ <div class="price-bot-tit mb-3">{{ $t('ProfitDay') }}</div>
+ <div class="price-bot-text">
+ {{ currency.currency_symbol }}{{
+ forexAssets?.money_contract_profit_today ?
+ (forexAssets?.money_contract_profit_today * (currency.rate ?? 0)).toFixed(2) :
+ '--' }}
+ </div>
+ </div>
+ </div>
+ </div>
+
+
<div class="assets_title">{{ $t('总资产估值') }}</div>
<div class="assets_money font-bold mt-5 flex justify-start items-end">
{{ currency.currency_symbol }}{{ forexAssets?.money_contract ?
@@ -30,7 +63,6 @@
<van-collapse v-model="activeNames" class="mt-10">
<van-collapse-item :title="$t('分布')" name="1">
- <!-- <div class="divider"></div> -->
<div class="percentage flex just-between items-center">
<div :style="`width:${assetObj.capital / (assetObj.capital + assetObj.contract) * 100}%`">
</div>
@@ -181,14 +213,11 @@
getContractBySymbolType()
</script>
-
<style lang="scss" scoped>
.assets {
min-height: 100vh;
- background: $mainbgWhiteColor;
padding: 2.8rem 2rem 10rem 2rem;
- $assets_title_color: #9a9a9a;
- color: $assets_title_color;
+ color: $text_color;
:deep(.van-cell) {
padding-left: 0;
@@ -209,12 +238,61 @@
font-weight: 600;
}
+ .assets_search {
+ background-color: $mainbgWhiteColor;
+ width: 100%;
+ border-radius: 2.5rem;
+ padding: .5rem 2rem;
+ }
+
+ .assets_1 {
+ background: url('@/assets/image/assets-center/as_bg.png');
+ background-size: 100% 100%;
+ padding: 2rem 2rem 2.375rem;
+ margin: 2.5rem 0 5rem 0;
+ border-radius: 1.125rem;
+
+ .price_box-tit {
+ font-size: 2.2rem;
+ margin-bottom: 1.4rem;
+ display: flex;
+ justify-content: center;
+ }
+
+ .price_box-text {
+ margin-bottom: 1.4rem;
+ font-size: 3.2rem;
+ }
+
+ .price-bot {
+ display: flex;
+ justify-content: space-around;
+ background: rgba(0, 0, 0, .4);
+ border-radius: .75rem;
+ padding: .75rem;
+
+ .price-bot-tit {
+ text-align: center;
+ font-size: 2rem;
+ }
+
+ .price-bot-text {
+ font-weight: 500;
+ color: #fb7171;
+ font-size: 3.2rem;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ }
+ }
+ }
+
.assets_title {
font-size: 2.1rem;
}
.assets_money {
- color: $text_color4;
+ color: $text_color3;
font-size: 3.4rem;
.pricing_jj {
@@ -247,11 +325,11 @@
.assets_revenue {
font-size: 2rem;
- color: #646464;
+ color: $text_color3;
font-weight: 600;
span {
- color: #6e6e6e;
+ color: $text_color3;
text-decoration: underline dotted;
font-weight: 400;
}
@@ -262,7 +340,7 @@
$item_width: 8.3rem;
width: $item_width;
font-size: 1.8rem;
- color: $text_color4;
+ color: $text_color3;
img {
height: $item_width;
@@ -270,12 +348,6 @@
}
}
}
-
- // .divider {
- // height: 1rem;
- // border-radius: 0.5rem;
- // background: $bg_yellow;
- // }
.percentage {
div {
@@ -294,7 +366,7 @@
}
.assets_item {
- color: $text_color4;
+ color: $text_color3;
font-size: 2.1rem;
.icon {
@@ -311,7 +383,7 @@
}
.assets_item_light {
- color: #9b9b9b;
+ color: $text_color3;
font-weight: 300;
}
}
diff --git a/src/views/my/index.vue b/src/views/my/index.vue
index 428114d..15f4b01 100644
--- a/src/views/my/index.vue
+++ b/src/views/my/index.vue
@@ -21,8 +21,8 @@
</h1>
<p class="sub-text" v-if="!(userStore.userInfo && userStore.userInfo.token)">{{ $t('全球最大的区块链资产平台') }}</p>
<p class="w-full flex mt-4 gap-x-4" v-if="!(userStore.userInfo && userStore.userInfo.token)">
- <van-button class="flex-1" round @click="onRoute('/register')">{{ $t('register') }}</van-button>
- <van-button class="flex-1" type="primary" round color="#f7b600" @click="onRoute('/login')">{{ $t('login')
+ <van-button class="flex-1" @click="onRoute('/register')">{{ $t('register') }}</van-button>
+ <van-button class="flex-1" type="primary" color="#f7b600" @click="onRoute('/login')">{{ $t('login')
}}</van-button>
</p>
@@ -313,7 +313,7 @@
.my-index {
padding-bottom: 60px;
- background: $mainbgWhiteColor;
+ // background: $mainbgWhiteColor;
.title_s {
font-size: 16px;
diff --git a/src/views/optional/Search.vue b/src/views/optional/Search.vue
index cb3334e..92ed67a 100644
--- a/src/views/optional/Search.vue
+++ b/src/views/optional/Search.vue
@@ -265,7 +265,7 @@
}
.pb-fix{
- background-color: $mainbgWhiteColor;
+ // background-color: $mainbgWhiteColor;
}
.search-container {
@@ -280,6 +280,7 @@
display: flex;
align-items: center;
width: 100%;
+ background-color: $main_background;
}
.header {
diff --git a/src/views/quotes/List.vue b/src/views/quotes/List.vue
index de6ba7b..3342fa1 100644
--- a/src/views/quotes/List.vue
+++ b/src/views/quotes/List.vue
@@ -49,7 +49,7 @@
</script>
<style lang="scss" scoped>
.quotes-list {
- background: $mainbgWhiteColor;
+ // background: $mainbgWhiteColor;
min-height: 100vh;
:deep(.active) {
diff --git a/src/views/quotes/components/head.vue b/src/views/quotes/components/head.vue
index bd47298..a44c9be 100644
--- a/src/views/quotes/components/head.vue
+++ b/src/views/quotes/components/head.vue
@@ -21,18 +21,17 @@
<style lang="scss" scoped>
+@import "@/assets/css/variable.scss";
.head {
width: 100%;
- $inp-bg: #F7F7F7;
- $inp-c: #999;
margin-bottom: 1rem;
.more_input {
width: 100%;
height: 4.5rem;
- background: $inp-bg;
+ background: $input_background;
border-radius: 2.25rem;
- color: $inp-c;
+ color: $text_color;
font-size: 1.5rem;
span {
diff --git a/src/views/trade/index.vue b/src/views/trade/index.vue
index 817e013..3b2d662 100644
--- a/src/views/trade/index.vue
+++ b/src/views/trade/index.vue
@@ -718,7 +718,7 @@
.trade_new {
color: $log-c;
- background: $mainbgWhiteColor;
+ // background: $mainbgWhiteColor;
min-height: 100vh;
padding: 1.4rem 1.4rem 7rem 1.4rem;
@@ -748,8 +748,8 @@
}
#cryptos {
- background: $mainbgWhiteColor;
- $inp-b: #f7f7f7;
+ // background: $mainbgWhiteColor;
+ $inp-b: $tab_background;
:deep(.textColor) {
color: $log-c;
--
Gitblit v1.9.3