From 3f1ab7f7f65fe665f6977f94899c763cc1ef1faf Mon Sep 17 00:00:00 2001
From: 李凌 <344137771@qq.com>
Date: Tue, 02 Jun 2026 15:56:14 +0800
Subject: [PATCH] 1
---
src/components/foreign/foreign-contract-header/index.vue | 6 +-
src/views/homePage/components/head.vue | 1
.env | 2
src/views/cryptos/TrendDetails/index.vue | 13 ++++--
src/components/Transform/trade-head/index.vue | 12 +++---
src/views/quotes/Detail.vue | 6 +-
src/assets/image/icon_back_1.png | 0
src/assets/css/variable.scss | 2
src/main.js | 2
src/config/index.js | 4 +-
src/assets/image/icon_back.png | 0
src/views/quotes/OpenTrade.vue | 6 +-
src/views/usStock/Detail.vue | 6 +-
src/components/Transform/perpetual-open/index.vue | 7 ++-
src/assets/imgs/home/more.png | 0
src/components/Transform/cryptos-trade-deep-data/index.vue | 6 ++-
16 files changed, 40 insertions(+), 33 deletions(-)
diff --git a/.env b/.env
index 9b38f03..2530958 100644
--- a/.env
+++ b/.env
@@ -1,2 +1,2 @@
VITE_APP__TITLE = "FracTionxEX"
-VUE_APP_THEME = "dark"
\ No newline at end of file
+VUE_APP_THEME = "theme"
\ No newline at end of file
diff --git a/src/assets/css/variable.scss b/src/assets/css/variable.scss
index 9850b22..eb4b2cd 100644
--- a/src/assets/css/variable.scss
+++ b/src/assets/css/variable.scss
@@ -1,6 +1,6 @@
$mainBgColor: #131a2e;
$mainTextColor: #fff;
-$mainbgWhiteColor: #111;
+$mainbgWhiteColor: #fff;
$main_background:#f7f7f7; //主题色
$main2_background:#1F233D; //主题浅色背景
diff --git a/src/assets/image/icon_back.png b/src/assets/image/icon_back.png
index f6a8c43..13b2635 100644
--- a/src/assets/image/icon_back.png
+++ b/src/assets/image/icon_back.png
Binary files differ
diff --git a/src/assets/image/icon_back_1.png b/src/assets/image/icon_back_1.png
index 13b2635..f6a8c43 100644
--- a/src/assets/image/icon_back_1.png
+++ b/src/assets/image/icon_back_1.png
Binary files differ
diff --git a/src/assets/imgs/home/more.png b/src/assets/imgs/home/more.png
index 0aff816..5967e46 100644
--- a/src/assets/imgs/home/more.png
+++ b/src/assets/imgs/home/more.png
Binary files differ
diff --git a/src/components/Transform/cryptos-trade-deep-data/index.vue b/src/components/Transform/cryptos-trade-deep-data/index.vue
index 35c354c..55d3979 100644
--- a/src/components/Transform/cryptos-trade-deep-data/index.vue
+++ b/src/components/Transform/cryptos-trade-deep-data/index.vue
@@ -45,7 +45,7 @@
<script>
import { WS_URL } from '@/config'
import { fixDate, strToArr } from "@/utils/utis";
-import { THEME } from '@/config/theme'
+// import { THEME } from '@/config/theme'
import { _getHomeList } from '@/service/home.api'
import { mapGetters } from 'vuex'
let DEEP_LENGTH = 6
@@ -74,7 +74,6 @@
init.push({ amount: '', price: '' })
}
return {
- THEME,
fixDate,
greenData: init,
redData: init,
@@ -107,6 +106,9 @@
},
computed: {
...mapGetters('home', ['currency']),
+ THEME() {
+ return this.$store.state.vant.theme
+ }
},
methods: {
getHomeList() {
diff --git a/src/components/Transform/perpetual-open/index.vue b/src/components/Transform/perpetual-open/index.vue
index 78ecf33..acbed0c 100644
--- a/src/components/Transform/perpetual-open/index.vue
+++ b/src/components/Transform/perpetual-open/index.vue
@@ -367,7 +367,6 @@
import ContractFutrue from '@/components/Transform/contract-futrue/index.vue'
import PopupDelivery from "@/components/Transform/popup-delivery/index.vue";
import { fixDate } from "@/utils/index.js";
-import { THEME } from '@/config/theme'
import AmountSlider from "./amountSlider.vue";
import "vue-slider-component/theme/default.css";
import { _getHomeList } from "@/service/home.api";
@@ -536,11 +535,13 @@
// console.log("dddddd", max, this.form.lever_rate, (1 / this.form.lever_rate + this.initData.fee));
return max
+ },
+ THEME() {
+ return this.$store.state.vant.theme
}
},
data() {
return {
- THEME,
fixDate,
bfbindex: null,
bfblist: [
@@ -1186,7 +1187,7 @@
.select-box {
width: 220px;
border-radius: 2.5rem;
- background: #1E1E1E;
+ background: #aaa;
margin-right: 20px;
}
diff --git a/src/components/Transform/trade-head/index.vue b/src/components/Transform/trade-head/index.vue
index b8e7794..c0cb022 100644
--- a/src/components/Transform/trade-head/index.vue
+++ b/src/components/Transform/trade-head/index.vue
@@ -12,10 +12,10 @@
<img v-if="isReturn" src="@/assets/image/icon_back.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"
+ <img v-if="$store.state.vant.theme == 'dark'" 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" /> -->
+ <img v-else src="../../../assets/theme/white/image/black-convert.png" alt="convert-img" class="w-35 h-35"
+ @click="onSidebar" />
</template>
<!-- 在切换模式下 -->
<template v-if="isChange">
@@ -26,10 +26,10 @@
</template>
<template v-else>
<img src="../../../assets/image/icon_back.png" class="w-40 h-40 back mr-50" alt="" @click="backPath()">
- <img src="../../../assets/theme/dark/image/black-convert.png" alt="convert-img" class="w-35 h-35"
+ <img v-if="$store.state.vant.theme == 'dark'" 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" /> -->
+ <img v-else src="../../../assets/theme/white/image/black-convert.png" alt="convert-img" class="w-35 h-35"
+ @click="onSidebar" />
</template>
</template>
<div class="flex flex-col pl-21" @click="onSidebar">
diff --git a/src/components/foreign/foreign-contract-header/index.vue b/src/components/foreign/foreign-contract-header/index.vue
index f6e6a5f..f5e26c0 100644
--- a/src/components/foreign/foreign-contract-header/index.vue
+++ b/src/components/foreign/foreign-contract-header/index.vue
@@ -6,10 +6,10 @@
<div class="flex justify-start pt-10 pb-5 before">
<img src="@/assets/image/icon_back_1.png" class="icon_back_1" alt="" @click="jump()">
<div class="flex items-center font-14">
- <img src="@/assets/theme/dark/image/black-convert.png" alt="convert-img" class="w-18 h-18"
+ <img v-if="$store.state.vant.theme == 'dark'" src="@/assets/theme/dark/image/black-convert.png" alt="convert-img" class="w-18 h-18"
@click="onSidebar">
- <!-- <img src="@/assets/theme/white/image/black-convert.png" alt="convert-img" class="w-18 h-18"
- @click="onSidebar"> -->
+ <img v-else src="@/assets/theme/white/image/black-convert.png" alt="convert-img" class="w-18 h-18"
+ @click="onSidebar">
<div class="flex pl-10 textColor font-700" @click="onSidebar">
<div class="font-35">{{ symbol.toUpperCase() || '--' }}</div>
<div class="ml-15">{{ $t('delivery') }}</div>
diff --git a/src/config/index.js b/src/config/index.js
index a9e7ab2..195c07f 100644
--- a/src/config/index.js
+++ b/src/config/index.js
@@ -35,8 +35,8 @@
// const ENV_DEV = 'zhapi.coinbtcs.com' // dev
// const ENV_DEV = 'openapi.yanshiz.com' // dev
-const ENV_DEV = 'api.waonjinzai.top' // dev
-// const ENV_DEV = '192.168.10.6:8086' // dev
+// const ENV_DEV = 'api.waonjinzai.top' // dev
+const ENV_DEV = 'localhost:8235' // dev
// const ENV_PRO = 'qheufhj.site' // app域名
// const ENV_PRO = window.location.hostname // 接口域名跟随 H5zhapi.coinbtcs.com
diff --git a/src/main.js b/src/main.js
index 063cd07..ea15346 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,7 +18,7 @@
pinia.use(piniaPluginPersistedstate)
// 初始化主题为黑夜模式
-const theme = getStorage('theme') || 'dark'
+const theme = getStorage('theme') || 'theme'
window.document.documentElement.setAttribute('data-theme', theme)
const app = createApp(App)
diff --git a/src/views/cryptos/TrendDetails/index.vue b/src/views/cryptos/TrendDetails/index.vue
index 81cc86b..5d1eeba 100644
--- a/src/views/cryptos/TrendDetails/index.vue
+++ b/src/views/cryptos/TrendDetails/index.vue
@@ -232,7 +232,7 @@
import PopupDelivery from "@/components/Transform/popup-delivery/index.vue";
import PopupConfirmOrder from '@/components/Transform/popup-confirm-order/index.vue'
import deepChart from '@/components/Transform/deepChart/index.vue'
-import { THEME } from '@/config/theme'
+// import { THEME } from '@/config/theme'
export default {
name: 'TrendDetails',
components: {
@@ -253,7 +253,7 @@
})
}
return {
- THEME,
+ // THEME,
show: false,
direction: 'buy',
initFutrue: {},
@@ -295,7 +295,10 @@
}
},
computed: {
- ...mapGetters({ currency: 'home/currency', userInfo: 'user/userInfo' })
+ ...mapGetters({ currency: 'home/currency', userInfo: 'user/userInfo' }),
+ THEME() {
+ return this.$store.state.vant.theme
+ }
},
mounted() {
console.log('sss', this.$route.query)
@@ -550,8 +553,8 @@
}
:deep(.van-tabs__nav) {
- background-color: $night !important;
- // background-color: $inp-b !important;
+ // background-color: $night !important;
+ background-color: $inp-b !important;
}
@keyframes animate1 {
diff --git a/src/views/homePage/components/head.vue b/src/views/homePage/components/head.vue
index 29ffc8f..0f50ded 100644
--- a/src/views/homePage/components/head.vue
+++ b/src/views/homePage/components/head.vue
@@ -42,6 +42,7 @@
<style lang="scss" scoped>
@import '@/assets/theme/index.scss';
+// @import '@/assets/init.scss';
.head {
width: 100%;
margin-bottom: 1rem;
diff --git a/src/views/quotes/Detail.vue b/src/views/quotes/Detail.vue
index a0d9aee..8faa69e 100644
--- a/src/views/quotes/Detail.vue
+++ b/src/views/quotes/Detail.vue
@@ -7,10 +7,10 @@
<img src="@/assets/image/back.png" alt="">
</div>
<div class="name-box">
- <img src="@/assets/theme/dark/image/black-convert.png" alt="convert-img" class="convert-img"
+ <img v-if="$store.state.vant.theme == 'dark'" src="@/assets/theme/dark/image/black-convert.png" alt="convert-img" class="convert-img"
@click="onSidebar" />
- <!-- <img src="@/assets/theme/white/image/black-convert.png" alt="convert-img" class="convert-img"
- @click="onSidebar" /> -->
+ <img v-else src="@/assets/theme/white/image/black-convert.png" alt="convert-img" class="convert-img"
+ @click="onSidebar" />
<p class="title">{{ chartData?.name }} </p>
<p class="type">{{ symbol }}</p>
</div>
diff --git a/src/views/quotes/OpenTrade.vue b/src/views/quotes/OpenTrade.vue
index f6738b5..e83f09c 100644
--- a/src/views/quotes/OpenTrade.vue
+++ b/src/views/quotes/OpenTrade.vue
@@ -7,10 +7,10 @@
<img src="@/assets/image/back.png" alt="" @click="onRoute">
</div>
<p class="title">
- <img src="@/assets/theme/dark/image/black-convert.png" alt="convert-img" class="convert-img"
+ <img v-if="$store.state.vant.theme == 'dark'" src="@/assets/theme/dark/image/black-convert.png" alt="convert-img" class="convert-img"
@click="onSidebar" />
- <!-- <img src="@/assets/theme/white/image/black-convert.png" alt="convert-img" class="convert-img"
- @click="onSidebar" /> -->
+ <img v-else src="@/assets/theme/white/image/black-convert.png" alt="convert-img" class="convert-img"
+ @click="onSidebar" />
<span class="text">{{ `${symbolName} (${symbol})` }}</span>
</p>
</div>
diff --git a/src/views/usStock/Detail.vue b/src/views/usStock/Detail.vue
index 5046206..001f1f8 100644
--- a/src/views/usStock/Detail.vue
+++ b/src/views/usStock/Detail.vue
@@ -7,10 +7,10 @@
<img src="@/assets/image/back.png" alt="">
</div>
<div class="name-box">
- <img src="@/assets/theme/dark/image/black-convert.png" alt="convert-img" class="convert-img"
+ <img v-if="$store.state.vant.theme == 'dark'" src="@/assets/theme/dark/image/black-convert.png" alt="convert-img" class="convert-img"
@click="onSidebar" />
- <!-- <img src="@/assets/theme/white/image/black-convert.png" alt="convert-img" class="convert-img"
- @click="onSidebar" /> -->
+ <img v-else src="@/assets/theme/white/image/black-convert.png" alt="convert-img" class="convert-img"
+ @click="onSidebar" />
<p class="title">{{ enName }} </p>
<p class="type">{{ symbol }}</p>
</div>
--
Gitblit v1.9.3