From 90ca1b49b589e83c4d86cf7c979543fb62e8103a Mon Sep 17 00:00:00 2001
From: liaoxinyu <liaoxinyu@xingtongworld.com>
Date: Mon, 31 Mar 2025 17:43:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=88=E7=BA=A6=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/js/tvStyle.js                  |  6 ++++--
 src/views/contract/history-commission.vue | 12 +++++++++---
 src/views/home/index.vue                  | 12 ++++++------
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/assets/js/tvStyle.js b/src/assets/js/tvStyle.js
index c8c8d7d..28915f0 100644
--- a/src/assets/js/tvStyle.js
+++ b/src/assets/js/tvStyle.js
@@ -8,8 +8,10 @@ let light={
 
 let dark = {
     "paneProperties.background": "#222e3d",
-    "paneProperties.vertGridProperties.color": "#646566",
-    "paneProperties.horzGridProperties.color": "#646566",
+    // "paneProperties.vertGridProperties.color": "#646566",
+    // "paneProperties.horzGridProperties.color": "#646566",
+	"paneProperties.vertGridProperties.color": "#222e3d",
+	"paneProperties.horzGridProperties.color": "#222e3d",
     "scalesProperties.backgroundColor": "#222e3d",
     "scalesProperties.textColor" : "#7b9ca7"
 }
diff --git a/src/views/contract/history-commission.vue b/src/views/contract/history-commission.vue
index 035ded5..f483f99 100644
--- a/src/views/contract/history-commission.vue
+++ b/src/views/contract/history-commission.vue
@@ -7,11 +7,12 @@
                 <th>{{$t('contract.b0')}}</th>
                 <th>{{$t('contract.b1')}}</th>
                 <th>{{$t('contract.b2')}}</th>
-                <th>{{$t('contract.b3')}}/{{$t('contract.b4')}}</th>
+                <!-- <th>{{$t('contract.b3')}}/{{$t('contract.b4')}}</th> -->
                 <th>{{$t('contract.b5')}}/{{$t('contract.b6')}}</th>
                 <th>{{$t('contract.b7')}}</th>
                 <th>{{$t('contract.b8')}}</th>
                 <th>{{$t('contract.j0')}}</th>
+                <th>{{$t('contract.j0')}}</th>
                 <!-- <th>{{$t('contract.k1')}}</th> -->
                 <th>{{$t('contract.b9')}}</th>
                 <!-- <th>{{$t('contract.c0')}}</th> -->
@@ -23,8 +24,12 @@
                 <td>{{ item.lever_rate }}X</td>
                 <td>{{ item.updated_ats | parseTime}}</td>
                 <!-- <td>{{ item.created_at | parseTime}}</td> -->
-                <td>{{ cals(item.side, item.order_type) }}</td>
-                <td>{{ item.traded_amount }}/{{ item.amount }}</td>
+                <td>
+					<div :class="item.order_type==2? 'btn-danger' : 'btn-success'" style="color: #fff;border-radius: 5px;text-align: center;width: 80px;height: 30px;line-height: 30px;">
+						{{ cals(item.side, item.order_type) }}
+					</div>
+				</td>
+                <!-- <td>{{ item.traded_amount }}/{{ item.amount }}</td> -->
                 <td>{{item.avg_price||'--'}}/{{ item.entrust_price || "--" }}</td>
                 <td>{{ item.margin * 1 }}</td>
                 <td>{{ item.fee * 1 }}</td>
@@ -34,6 +39,7 @@
                 <!-- <td>
                     {{item.settle_profit||'--'}}
                 </td> -->
+				<td :class="item.profit>0?'increace':item.profit<0?'decreace':''">{{ item.profitRate }}</td>
                 <td>{{ status(item.status) }}</td>
                 <!-- <td>
                     <button class="btn btn-sm btn-primary" @click="showDetail(item)">
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index f4db0fc..4827e60 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -70,10 +70,10 @@
       </div>
     </div>
 	
-	<div class="marquee" v-if="marketList[0]" style="background: linear-gradient(90deg, #1fa2ff, #12d8fa, #a6ffcb);">
+	<div class="marquee" v-if="marketList[0]">
 		<div class="marquee-pargress d-flex">
 			<ul class="marquee-list d-flex" v-for="box in 4" :key="box+'box'">
-				<li class="item" v-for="item in marketList[0].marketInfoList" :key="item.coin_name + '' + box" style="color: #000;">
+				<li class="item" v-for="item in marketList[0].marketInfoList" :key="item.coin_name + '' + box">
 					<div class="price-info d-flex">
 						<div class="symbol" style="margin-right: 5px">{{ item.pair_name }}</div>
 						<div class="d-flex">
@@ -1503,7 +1503,7 @@ path {
 .marquee {
   width: 100%;
   height: 60px;
-  background-color: #0F4DF5;
+  // background-color: #0F4DF5;
   background-size: 100% 100%;
   .marquee-pargress {
     align-items: center;
@@ -1512,9 +1512,9 @@ path {
     //   background: ("../../assets/img/bg/5.png") no-repeat !important;
     // background-size: 100% 100%;
   }
-  .marquee-list{
-    background: transparent;
-  }
+  // .marquee-list{
+  //   background: transparent;
+  // }
 
   li.item {
     font-size: 24px;