feat：颜色调整

components/cwg-label-line-value.vue

@@ -36,7 +36,7 @@ const props = defineProps({
     line-height: px2rpx(24);
 
     .label {
-        color: var(--bs-card-cap-color);
+        color: var(--bs-emphasis-color);
     }
     .line {
         flex: 1;
@@ -49,7 +49,7 @@ const props = defineProps({
         display: flex;
         align-items: flex-end;
         font-weight: 500;
-        color: rgba(var(--bs-dark-rgb), var(--bs-text-opacity)) !important;
+        color: var(--bs-emphasis-color) !important;
     }
 }
 </style>

components/cwg-tabel.vue

@@ -816,22 +816,20 @@ defineExpose({
             height: 4px !important;
             display: block !important;
             /* 强制在某些webkit浏览器中显示 */
-            background-color: transparent !important;
+            background-color: #ccc !important;
         }
 
         &::-webkit-scrollbar-track {
-            background-color: var(--color-slate-800);
-            ;
+            background-color: #ccc;
             border-radius: 4px;
         }
 
         &::-webkit-scrollbar-thumb {
-            background-color: var(--color-slate-800);
-            ;
+            background-color:#ccc;
             border-radius: 4px;
 
             &:hover {
-                background-color: var(--color-slate-800);
+                background-color: #ccc;
             }
         }
     }
@@ -877,7 +875,7 @@ defineExpose({
         .uni-table-tr {
             transition: background-color 0.2s ease;
             border-bottom: 1px solid var(--bs-light-bg-subtle) !important;
-            color: rgb(var(--bs-white-rgb)) !important;
+            color: var(--bs-emphasis-color) !important;
 
             // 奇数行背景颜色
             &:nth-child(odd) {
@@ -913,7 +911,7 @@ defineExpose({
 
         .uni-table-td {
             padding: px2rpx(16) px2rpx(5);
-            color: rgb(var(--bs-white-rgb)) !important;
+            color: var(--bs-emphasis-color) !important;
             border-bottom: 1px solid var(--bs-light-bg-subtle) !important;
             box-sizing: border-box;
             vertical-align: middle;

pages/customer/style.scss

@@ -50,7 +50,7 @@
   .s-btn {
     &.reselect {
       background-color: var(--color-zinc-100);
-      color: var(--color-navy-700);
+      color: #fff;
       border: none;
       font-size: px2rpx(14);
       padding: px2rpx(8) px2rpx(20);

pages/follow/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <cwg-page-wrapper class="create-page" :isHeaderFixed="true" :bgColor="'#f8f9f9'">
+  <cwg-page-wrapper class="create-page" :isHeaderFixed="true">
     <cwg-header :title="t('Documentary.console.item1')" :showBack="false" />
     <uni-loading v-if="loading" />
     <uni-row v-else class="demo-uni-row uni-row1" :gutter="20">
@@ -459,12 +459,14 @@ onMounted(async () => {
 
 .custom-number,
 .custom-money {
-  background: #fff;
+  background: var(--bs-body-bg);
+  border: 1px solid var(--bs-border-color);
   padding: 15px;
+
   border-radius: 4px;
   margin-bottom: 20px;
   box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
-  min-height: 100px;
+  min-height: px2rpx(125);
 }
 
 .custom-number .title,

pages/follow/trading-center-single.vue

@@ -3,7 +3,7 @@
     <cwg-header :title="t('Custom.Settings.Title')">
       <template #right>
         <view class="time-header">
-          <text>{{ t('Documentary.console.item2') }}: </text>
+          <text>{{ t('Documentary.console.item2') }}:</text>
           <text class="time-value" @click="toReload">{{ time }}</text>
           <cwg-icon name="crm-refresh" @click="toReload" style="margin-left: 6px; cursor: pointer;" />
         </view>
@@ -19,19 +19,23 @@
         <view class="section-row">
           <view class="section-col">
             <view class="fllow-title">
-              <view class="title"><text>{{ t('TradingCenter.item12') }}</text></view>
+              <view class="title">
+                <text>{{ t('TradingCenter.item12') }}</text>
+              </view>
             </view>
             <view class="fllow-info-list">
               <cwg-label-line-value :label="t('TradingCenter.item13')" :value="DailyIndex1.nickname || '--'" />
               <cwg-label-line-value :label="t('TradingCenter.item14')" :value="DailyIndex1.personalSignature || '--'" />
               <cwg-label-line-value :label="t('TradingCenter.item11')"
-                :value="getAccountTypeText(DailyIndex.groupType)" />
+                                    :value="getAccountTypeText(DailyIndex.groupType)" />
               <cwg-label-line-value :label="t('TradingCenter.item15')" :value="DailyIndex1.addTime || '--'" />
             </view>
           </view>
           <view class="section-col">
             <view class="fllow-title">
-              <view class="title"><text>{{ t('TradingCenter.item16') }}</text></view>
+              <view class="title">
+                <text>{{ t('TradingCenter.item16') }}</text>
+              </view>
             </view>
             <view class="chart-container">
               <cwg-charts type="pie" :chartData="symbolSummaryData" :opts="pieOpts" />
@@ -44,23 +48,27 @@
           <!-- 历史表现 -->
           <view class="section-col">
             <view class="fllow-title">
-              <view class="title"><text>{{ t('TradingCenter.item17') }}</text></view>
+              <view class="title">
+                <text>{{ t('TradingCenter.item17') }}</text>
+              </view>
             </view>
             <view class="fllow-info-grid">
               <cwg-label-line-value :label="t('TradingCenter.item18')"
-                :value="formatCurrency(DailyIndex.pl, DailyIndex.currency, DailyIndex.groupType)" />
+                                    :value="formatCurrency(DailyIndex.pl, DailyIndex.currency, DailyIndex.groupType)" />
               <cwg-label-line-value :label="t('TradingCenter.item21')"
-                :value="formatCurrency(DailyIndex.loss, DailyIndex.currency, DailyIndex.groupType)" />
+                                    :value="formatCurrency(DailyIndex.loss, DailyIndex.currency, DailyIndex.groupType)" />
               <cwg-label-line-value :label="t('TradingCenter.item19')" :value="DailyIndex.plRate || '0'" />
               <cwg-label-line-value :label="t('TradingCenter.item7')" :value="DailyIndex.maxDdRate || '0'" />
               <cwg-label-line-value :label="t('TradingCenter.item20')"
-                :value="formatCurrency(DailyIndex.profit, DailyIndex.currency, DailyIndex.groupType)" />
+                                    :value="formatCurrency(DailyIndex.profit, DailyIndex.currency, DailyIndex.groupType)" />
             </view>
           </view>
           <!-- 交易规模与效率 -->
           <view class="section-col">
             <view class="fllow-title">
-              <view class="title"><text>{{ t('TradingCenter.item22') }}</text></view>
+              <view class="title">
+                <text>{{ t('TradingCenter.item22') }}</text>
+              </view>
             </view>
             <view class="fllow-info-grid">
               <cwg-label-line-value :label="t('TradingCenter.item23')" :value="DailyIndex.trades || '0'" />
@@ -83,26 +91,30 @@
           <!-- 资金流向 -->
           <view class="section-col">
             <view class="fllow-title">
-              <view class="title"><text>{{ t('TradingCenter.item33') }}</text></view>
+              <view class="title">
+                <text>{{ t('TradingCenter.item33') }}</text>
+              </view>
             </view>
             <view class="fllow-info-grid">
               <cwg-label-line-value :label="t('TradingCenter.item34')"
-                :value="formatCurrency(DailyIndex.deposit, DailyIndex.currency, DailyIndex.groupType)" />
+                                    :value="formatCurrency(DailyIndex.deposit, DailyIndex.currency, DailyIndex.groupType)" />
               <cwg-label-line-value :label="t('TradingCenter.item36')"
-                :value="formatCurrency(DailyIndex.credit, DailyIndex.currency, DailyIndex.groupType)" />
+                                    :value="formatCurrency(DailyIndex.credit, DailyIndex.currency, DailyIndex.groupType)" />
               <cwg-label-line-value :label="t('TradingCenter.item35')"
-                :value="formatCurrency(DailyIndex.withdraw, DailyIndex.currency, DailyIndex.groupType)" />
+                                    :value="formatCurrency(DailyIndex.withdraw, DailyIndex.currency, DailyIndex.groupType)" />
             </view>
           </view>
           <!-- 订阅与跟单 -->
           <view class="section-col">
             <view class="fllow-title">
-              <view class="title"><text>{{ t('TradingCenter.item40') }}</text></view>
+              <view class="title">
+                <text>{{ t('TradingCenter.item40') }}</text>
+              </view>
             </view>
             <view class="fllow-info-grid">
               <cwg-label-line-value :label="t('TradingCenter.item37')" :value="DailyIndex.follows || '0'" />
               <cwg-label-line-value :label="t('TradingCenter.item38')"
-                :value="formatCurrency(DailyIndex.followsPl, DailyIndex.currency, DailyIndex.groupType)" />
+                                    :value="formatCurrency(DailyIndex.followsPl, DailyIndex.currency, DailyIndex.groupType)" />
             </view>
           </view>
         </view>
@@ -112,7 +124,9 @@
           <!-- 排名曲线 -->
           <view class="section-col">
             <view class="fllow-title">
-              <view class="title"><text>{{ t('TradingCenter.item41') }}</text></view>
+              <view class="title">
+                <text>{{ t('TradingCenter.item41') }}</text>
+              </view>
             </view>
             <view class="chart-container">
               <cwg-charts type="line" :chartData="rankingChartData" :opts="rankingChartOpts" />
@@ -121,7 +135,9 @@
           <!-- 净值曲线 -->
           <view class="section-col">
             <view class="fllow-title">
-              <view class="title"><text>{{ t('Documentary.tradingCenter.item140') }}</text></view>
+              <view class="title">
+                <text>{{ t('Documentary.tradingCenter.item140') }}</text>
+              </view>
             </view>
             <view class="chart-container">
               <cwg-charts type="line" :chartData="equityChartData" />
@@ -133,9 +149,9 @@
       <!-- Tab 2: 交易订单 -->
       <view v-if="activeTab === '2'" class="tab-content">
         <cwg-complex-search :fields="tab2FilterFields" v-model="tab2SearchParams" @search="handleTab2Search"
-          @reset="handleTab2Reset" />
+                            @reset="handleTab2Reset" />
         <cwg-tabel ref="table2Ref" :columns="tab2Columns" :immediate="true" :queryParams="tab2QueryParams"
-          :api="tab2Api" :show-operation="false" :showSummary="true" :summaryMethod="getSummaries1">
+                   :api="tab2Api" :show-operation="false" :showSummary="true" :summaryMethod="getSummaries1">
           <template #openClosePrice="{ row }">
             <view class="sp-div-tab">{{ formatNumber(row.openPrice) }}</view>
             <view class="sp-div-tab-b">{{ formatNumber(row.closePrice) }}</view>
@@ -155,16 +171,18 @@
       <view v-if="activeTab === '3'" class="tab-content">
         <view class="summary-top">
           <view class="search-operation-l">
-            <text>{{ t('Documentary.tradingCenter.item123') }}</text>: {{ tableSumData.profit || '0' }}
+            <text>{{ t('Documentary.tradingCenter.item123') }}</text>
+            : {{ tableSumData.profit || '0' }}
           </view>
           <view class="search-operation-r">
-            <text>{{ t('Documentary.tradingCenter.item124') }}</text>: {{ tableSumData.volume || '0' }}
+            <text>{{ t('Documentary.tradingCenter.item124') }}</text>
+            : {{ tableSumData.volume || '0' }}
           </view>
         </view>
         <cwg-complex-search :fields="tab3FilterFields" v-model="tab3SearchParams" @search="handleTab3Search"
-          @reset="handleTab3Reset" />
+                            @reset="handleTab3Reset" />
         <cwg-tabel ref="table3Ref" :columns="tab3Columns" :immediate="true" :queryParams="tab3QueryParams"
-          :api="tab3Api" :show-operation="false" />
+                   :api="tab3Api" :show-operation="false" />
       </view>
 
     </view>
@@ -172,420 +190,468 @@
 </template>
 
 <script setup lang="ts">
-import { computed, ref, onMounted, onUnmounted, nextTick, watch } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { documentaryApi } from '@/service/documentary';
-import { onLoad, onShow } from '@dcloudio/uni-app';
-
-const { t } = useI18n();
-
-// --- Params ---
-const myLogin = ref('');
-const myRanking = ref('');
-const myId = ref('');
-
-onLoad((options: any) => {
-  myLogin.value = options.dealLogin || options.login || '';
-  myRanking.value = options.ranking || '';
-  myId.value = options.id || '';
-
-  activeTab.value = '1';
-  getDate();
-  getPersonalIndicators();
-});
-
-// --- Time fetching ---
-const time = ref('');
-
-const getLocalTime = () => {
-  let timezone = 2;
-  let offset_GMT = new Date().getTimezoneOffset();
-  let nowDate = new Date().getTime();
-  let now = new Date(nowDate + offset_GMT * 60 * 1000 + timezone * 60 * 60 * 1000);
-  let year = now.getFullYear();
-  let month = String(now.getMonth() + 1).padStart(2, '0');
-  let day = String(now.getDate()).padStart(2, '0');
-  let hh = String(now.getHours()).padStart(2, '0');
-  let mm = String(now.getMinutes()).padStart(2, '0');
-  time.value = `${year}/${month}/${day}  ${hh}:${mm}`;
-};
-
-const getDate = async () => {
-  try {
-    let res = await documentaryApi.followDealSignalRefreshDate();
-    if (res.code === 200 && res.data) {
-      time.value = res.data;
-    } else {
-      getLocalTime();
+  import { computed, ref, onMounted, onUnmounted, nextTick, watch } from 'vue'
+  import { useI18n } from 'vue-i18n'
+  import { documentaryApi } from '@/service/documentary'
+  import { onLoad, onShow } from '@dcloudio/uni-app'
+
+  const { t } = useI18n()
+
+  // --- Params ---
+  const myLogin = ref('')
+  const myRanking = ref('')
+  const myId = ref('')
+
+  onLoad((options: any) => {
+    myLogin.value = options.dealLogin || options.login || ''
+    myRanking.value = options.ranking || ''
+    myId.value = options.id || ''
+
+    activeTab.value = '1'
+    getDate()
+    getPersonalIndicators()
+  })
+
+  // --- Time fetching ---
+  const time = ref('')
+
+  const getLocalTime = () => {
+    let timezone = 2
+    let offset_GMT = new Date().getTimezoneOffset()
+    let nowDate = new Date().getTime()
+    let now = new Date(nowDate + offset_GMT * 60 * 1000 + timezone * 60 * 60 * 1000)
+    let year = now.getFullYear()
+    let month = String(now.getMonth() + 1).padStart(2, '0')
+    let day = String(now.getDate()).padStart(2, '0')
+    let hh = String(now.getHours()).padStart(2, '0')
+    let mm = String(now.getMinutes()).padStart(2, '0')
+    time.value = `${year}/${month}/${day}  ${hh}:${mm}`
+  }
+
+  const getDate = async () => {
+    try {
+      let res = await documentaryApi.followDealSignalRefreshDate()
+      if (res.code === 200 && res.data) {
+        time.value = res.data
+      } else {
+        getLocalTime()
+      }
+    } catch (error) {
+      getLocalTime()
     }
-  } catch (error) {
-    getLocalTime();
   }
-};
-
-const toReload = () => {
-  getDate();
-  if (activeTab.value === '1') {
-    getPersonalIndicators();
-  } else if (activeTab.value === '2') {
-    table2Ref.value?.refreshTable();
-  } else if (activeTab.value === '3') {
-    table3Ref.value?.refreshTable();
+
+  const toReload = () => {
+    getDate()
+    if (activeTab.value === '1') {
+      getPersonalIndicators()
+    } else if (activeTab.value === '2') {
+      table2Ref.value?.refreshTable()
+    } else if (activeTab.value === '3') {
+      table3Ref.value?.refreshTable()
+    }
   }
-};
-
-onMounted(() => {
-});
-
-onUnmounted(() => {
-});
-
-// --- Tabs ---
-const activeTab = ref('1');
-const tabs = computed(() => [
-  { text: t('Documentary.tradingCenter.item60'), value: '1' },
-  { text: t('Documentary.tradingCenter.item58'), value: '2' },
-  { text: t('Documentary.tradingCenter.item59'), value: '3' }
-]);
-
-// --- Tab 1 Data ---
-const DailyIndex = ref<any>({});
-const DailyIndex1 = ref<any>({});
-
-const symbolSummaryData = ref<any>({ series: [] });
-const pieOpts = ref({
-  color: ["#5470C6", "#91CC75", "#EE6666", "#FAC858", "#73C0DE", "#3BA272"],
-  padding: [5, 5, 5, 5],
-  legend: {
-    show: true,
-    position: "left"
+
+  onMounted(() => {
+  })
+
+  onUnmounted(() => {
+  })
+
+  // --- Tabs ---
+  const activeTab = ref('1')
+  const tabs = computed(() => [
+    { text: t('Documentary.tradingCenter.item60'), value: '1' },
+    { text: t('Documentary.tradingCenter.item58'), value: '2' },
+    { text: t('Documentary.tradingCenter.item59'), value: '3' },
+  ])
+
+  // --- Tab 1 Data ---
+  const DailyIndex = ref<any>({})
+  const DailyIndex1 = ref<any>({})
+
+  const symbolSummaryData = ref<any>({ series: [] })
+  const pieOpts = ref({
+    color: ['#5470C6', '#91CC75', '#EE6666', '#FAC858', '#73C0DE', '#3BA272'],
+    padding: [5, 5, 5, 5],
+    legend: {
+      show: true,
+      position: 'left',
+    },
+  })
+
+  const rankingChartData = ref<any>({ categories: [], series: [] })
+  const rankingChartOpts = ref({
+    yAxis: {
+      data: [{
+        axisLine: false,
+        inverse: false,
+      }],
+    },
+  })
+  const equityChartData = ref<any>({ categories: [], series: [] })
+
+  const getAccountTypeText = (type: number) => {
+    const map: Record<number, string> = {
+      1: 'AccountType.ClassicAccount',
+      2: 'AccountType.SeniorAccount',
+      5: 'AccountType.SpeedAccount',
+      6: 'AccountType.SpeedAccount',
+      7: 'AccountType.StandardAccount',
+      8: 'AccountType.CentAccount',
+    }
+    return type && map[type] ? t(map[type]) : '--'
   }
-});
-
-const rankingChartData = ref<any>({ categories: [], series: [] });
-const rankingChartOpts = ref({
-  yAxis: {
-    data: [{
-      axisLine: false,
-      inverse: false
-    }]
+
+  const formatCurrency = (val: any, currency?: string, groupType?: number) => {
+    if (!val) return '0'
+    let symbol = '$'
+    if (currency === 'GBP') symbol = '£'
+    else if (currency === 'EUR') symbol = '€'
+    else if (currency === 'USC' || groupType == 8) symbol = '¢'
+    return `${symbol}${val}`
   }
-});
-const equityChartData = ref<any>({ categories: [], series: [] });
-
-const getAccountTypeText = (type: number) => {
-  const map: Record<number, string> = {
-    1: 'AccountType.ClassicAccount',
-    2: 'AccountType.SeniorAccount',
-    5: 'AccountType.SpeedAccount',
-    6: 'AccountType.SpeedAccount',
-    7: 'AccountType.StandardAccount',
-    8: 'AccountType.CentAccount'
-  };
-  return type && map[type] ? t(map[type]) : '--';
-};
-
-const formatCurrency = (val: any, currency?: string, groupType?: number) => {
-  if (!val) return '0';
-  let symbol = '$';
-  if (currency === 'GBP') symbol = '£';
-  else if (currency === 'EUR') symbol = '€';
-  else if (currency === 'USC' || groupType == 8) symbol = '¢';
-  return `${symbol}${val}`;
-};
-
-const getPersonalIndicators = async () => {
-  if (myId.value) {
-    let res = await documentaryApi.followDealSignalSearchSingle({ id: myId.value });
-    if (res.code === 200 && res.data) {
-      DailyIndex.value = res.data;
-      DailyIndex1.value = res.data;
-      if (res.data.login) {
-        myLogin.value = res.data.login;
+
+  const getPersonalIndicators = async () => {
+    if (myId.value) {
+      let res = await documentaryApi.followDealSignalSearchSingle({ id: myId.value })
+      if (res.code === 200 && res.data) {
+        DailyIndex.value = res.data
+        DailyIndex1.value = res.data
+        if (res.data.login) {
+          myLogin.value = res.data.login
+        }
+        if (res.data.symbolSummary) {
+          drawSymbolSummary(res.data.symbolSummary)
+        }
+        getChart4()
+        getChart5()
       }
-      if (res.data.symbolSummary) {
-        drawSymbolSummary(res.data.symbolSummary);
+    } else {
+      // Fallback
+      documentaryApi.followDailyIndex({ login: myLogin.value }).then(res => {
+        if (res.code === 200) DailyIndex.value = res.data || {}
+      })
+      documentaryApi.followDealCard({ login: myLogin.value }).then(res => {
+        if (res.code === 200) DailyIndex1.value = res.data || {}
+      })
+      documentaryApi.followDailyChartSymbol({ login: myLogin.value }).then(res => {
+        if (res.code === 200 && res.data && res.data[0] && res.data[0].volumes) {
+          drawSymbolSummary(res.data[0].volumes)
+        }
+      })
+      getChart4()
+      getChart5()
+    }
+  }
+
+  const drawSymbolSummary = (data: any[]) => {
+    let pieData = data.map(item => {
+      let name = item.symbol || item.name || ''
+      if (!name && item.symbolType) {
+        const types = ['', t('Documentary.Report.item11'), t('Documentary.Report.item12'), t('Documentary.Report.item13'), t('Documentary.Report.item14'), t('Documentary.Report.item15'), t('Documentary.Report.item16')]
+        name = types[item.symbolType] || ''
       }
-      getChart4();
-      getChart5();
+      let value = item.volume !== undefined ? item.volume : (item.value !== undefined ? item.value : (item.amount || 0))
+      return { name, value }
+    })
+    symbolSummaryData.value = {
+      series: [{ data: pieData }],
     }
-  } else {
-    // Fallback
-    documentaryApi.followDailyIndex({ login: myLogin.value }).then(res => {
-      if (res.code === 200) DailyIndex.value = res.data || {};
-    });
-    documentaryApi.followDealCard({ login: myLogin.value }).then(res => {
-      if (res.code === 200) DailyIndex1.value = res.data || {};
-    });
-    documentaryApi.followDailyChartSymbol({ login: myLogin.value }).then(res => {
-      if (res.code === 200 && res.data && res.data[0] && res.data[0].volumes) {
-        drawSymbolSummary(res.data[0].volumes);
+  }
+
+  const getChart4 = async () => {
+    let res = await documentaryApi.getEquityChart({ login: myLogin.value })
+    if (res.code === 200 && res.data) {
+      let categories = []
+      let seriesData = []
+      res.data.forEach((item: any) => {
+        categories.push(item.date.split(' ')[0])
+        seriesData.push(item.amount !== null ? item.amount : item.doubleAmount)
+      })
+      equityChartData.value = {
+        categories,
+        series: [{ name: t('Documentary.tradingCenter.item140'), data: seriesData }],
       }
-    });
-    getChart4();
-    getChart5();
+    }
   }
-};
-
-const drawSymbolSummary = (data: any[]) => {
-  let pieData = data.map(item => {
-    let name = item.symbol || item.name || '';
-    if (!name && item.symbolType) {
-      const types = ['', t('Documentary.Report.item11'), t('Documentary.Report.item12'), t('Documentary.Report.item13'), t('Documentary.Report.item14'), t('Documentary.Report.item15'), t('Documentary.Report.item16')];
-      name = types[item.symbolType] || '';
+
+  const getChart5 = async () => {
+    let res = await documentaryApi.getRankingChart({ login: myLogin.value })
+    if (res.code === 200 && res.data) {
+      let categories = []
+      let seriesData = []
+      res.data.forEach((item: any) => {
+        categories.push(item.date.split(' ')[0])
+        seriesData.push(item.amount !== null ? item.amount : item.doubleAmount)
+      })
+      rankingChartData.value = {
+        categories,
+        series: [{ name: t('TradingCenter.item41'), data: seriesData }],
+      }
+    }
+  }
+
+  // --- Formatters ---
+  const formatNumber = (value: any) => {
+    if (value == '***') return '***'
+    if (isNaN(value)) return '0'
+    let valStr = String(value)
+    const parts = valStr.split('.')
+    parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ',')
+    return parts.join('.')
+  }
+
+  // --- Tab 2 ---
+  const table2Ref = ref(null)
+  const combined = ref<any>({})
+  const tab2SearchParams = ref({
+    tab4Type: 1,
+    date: [],
+  })
+  const tab2FilterFields = computed(() => [
+    {
+      key: 'tab4Type', type: 'select', label: t('Documentary.tradingCenter.item114'), options: [
+        { value: 1, text: t('Documentary.tradingCenter.item114') },
+        // { value: 2, text: t('Documentary.tradingCenter.item115') }
+      ],
+    },
+    { key: 'date', type: 'daterange', label: t('placeholder.choose') },
+  ])
+  const tab2QueryParams = computed(() => {
+    return { ...tab2SearchParams.value, login: myLogin.value }
+  })
+  const tab2Columns = computed(() => [
+    { prop: 'order', label: t('Label.OrderNumber'), align: 'center' },
+    { prop: 'platform', label: t('Label.Platform'), align: 'center' },
+    { prop: 'cmd', label: t('Label.Type'), align: 'center' },
+    { prop: 'symbol', label: t('Label.Varieties'), align: 'center' },
+    {
+      prop: 'openClosePrice',
+      label: t('Label.OpenPrice') + '/' + t('Label.ClosePrice'),
+      align: 'center',
+      slot: 'openClosePrice',
+    },
+    {
+      prop: 'openCloseTime',
+      label: t('Label.OpenTime') + '/' + t('Label.CloseTime'),
+      align: 'center',
+      slot: 'openCloseTime',
+    },
+    { prop: 'tpSl', label: t('Label.EP') + '/' + t('Label.EL'), align: 'center', slot: 'tpSl' },
+    {
+      prop: 'volume',
+      label: t('Documentary.tradingCenter.item99'),
+      align: 'center',
+      formatter: ({ row }: any) => formatNumber(row.volume || '0'),
+    },
+    {
+      prop: 'storage',
+      label: t('Label.StorageFee'),
+      align: 'center',
+      formatter: ({ row }: any) => formatNumber(row.storage || '0'),
+    },
+    {
+      prop: 'profit',
+      label: t('Label.ProfitLoss'),
+      align: 'center',
+      formatter: ({ row }: any) => formatNumber(row.profit || '0'),
+    },
+    {
+      prop: 'totalProfit',
+      label: t('Label.TotalProfitLoss'),
+      align: 'center',
+      formatter: ({ row }: any) => formatNumber(row.totalProfit || '0'),
+    },
+  ])
+
+  const tab2Api = async (params: any) => {
+    let res = await documentaryApi.followOrderRecordList(params)
+    if (res.code === 200 || res.code === 0 || res.code === 10000) {
+      combined.value = res.sum || {}
+    }
+    return res
+  }
+
+  const getSummaries1 = ({ columns }: any) => {
+    let sums = Array(columns.length).fill('')
+    if (Object.keys(combined.value).length > 0) {
+      sums[0] = t('Label.Total')
+      const volIdx = columns.findIndex((c: any) => c.prop === 'volume')
+      const proIdx = columns.findIndex((c: any) => c.prop === 'profit')
+      const totIdx = columns.findIndex((c: any) => c.prop === 'totalProfit')
+      if (volIdx > -1) sums[volIdx] = combined.value.volume ? formatNumber(combined.value.volume) : 0
+      if (proIdx > -1) sums[proIdx] = combined.value.profit ? formatNumber(combined.value.profit) : 0
+      if (totIdx > -1) sums[totIdx] = combined.value.totalProfit ? formatNumber(combined.value.totalProfit) : 0
     }
-    let value = item.volume !== undefined ? item.volume : (item.value !== undefined ? item.value : (item.amount || 0));
-    return { name, value };
-  });
-  symbolSummaryData.value = {
-    series: [{ data: pieData }]
-  };
-};
-
-const getChart4 = async () => {
-  let res = await documentaryApi.getEquityChart({ login: myLogin.value });
-  if (res.code === 200 && res.data) {
-    let categories = [];
-    let seriesData = [];
-    res.data.forEach((item: any) => {
-      categories.push(item.date.split(' ')[0]);
-      seriesData.push(item.amount !== null ? item.amount : item.doubleAmount);
-    });
-    equityChartData.value = {
-      categories,
-      series: [{ name: t('Documentary.tradingCenter.item140'), data: seriesData }]
-    };
+    return sums
   }
-};
-
-const getChart5 = async () => {
-  let res = await documentaryApi.getRankingChart({ login: myLogin.value });
-  if (res.code === 200 && res.data) {
-    let categories = [];
-    let seriesData = [];
-    res.data.forEach((item: any) => {
-      categories.push(item.date.split(' ')[0]);
-      seriesData.push(item.amount !== null ? item.amount : item.doubleAmount);
-    });
-    rankingChartData.value = {
-      categories,
-      series: [{ name: t('TradingCenter.item41'), data: seriesData }]
-    };
+
+  const handleTab2Search = (params: any) => {
+    tab2SearchParams.value = params
+    nextTick(() => {
+      table2Ref.value?.refreshTable()
+    })
+  }
+  const handleTab2Reset = (params: any) => {
+    tab2SearchParams.value = params
+    nextTick(() => {
+      table2Ref.value?.refreshTable()
+    })
   }
-};
-
-// --- Formatters ---
-const formatNumber = (value: any) => {
-  if (value == "***") return "***";
-  if (isNaN(value)) return "0";
-  let valStr = String(value);
-  const parts = valStr.split('.');
-  parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ",");
-  return parts.join('.');
-};
-
-// --- Tab 2 ---
-const table2Ref = ref(null);
-const combined = ref<any>({});
-const tab2SearchParams = ref({
-  tab4Type: 1,
-  date: []
-});
-const tab2FilterFields = computed(() => [
-  {
-    key: 'tab4Type', type: 'select', label: t('Documentary.tradingCenter.item114'), options: [
-      { value: 1, text: t('Documentary.tradingCenter.item114') },
-      // { value: 2, text: t('Documentary.tradingCenter.item115') }
-    ]
-  },
-  { key: 'date', type: 'daterange', label: t('placeholder.choose') }
-]);
-const tab2QueryParams = computed(() => {
-  return { ...tab2SearchParams.value, login: myLogin.value };
-});
-const tab2Columns = computed(() => [
-  { prop: 'order', label: t('Label.OrderNumber'), align: 'center' },
-  { prop: 'platform', label: t('Label.Platform'), align: 'center' },
-  { prop: 'cmd', label: t('Label.Type'), align: 'center' },
-  { prop: 'symbol', label: t('Label.Varieties'), align: 'center' },
-  { prop: 'openClosePrice', label: t('Label.OpenPrice') + '/' + t('Label.ClosePrice'), align: 'center', slot: 'openClosePrice' },
-  { prop: 'openCloseTime', label: t('Label.OpenTime') + '/' + t('Label.CloseTime'), align: 'center', slot: 'openCloseTime' },
-  { prop: 'tpSl', label: t('Label.EP') + '/' + t('Label.EL'), align: 'center', slot: 'tpSl' },
-  { prop: 'volume', label: t('Documentary.tradingCenter.item99'), align: 'center', formatter: ({ row }: any) => formatNumber(row.volume || '0') },
-  { prop: 'storage', label: t('Label.StorageFee'), align: 'center', formatter: ({ row }: any) => formatNumber(row.storage || '0') },
-  { prop: 'profit', label: t('Label.ProfitLoss'), align: 'center', formatter: ({ row }: any) => formatNumber(row.profit || '0') },
-  { prop: 'totalProfit', label: t('Label.TotalProfitLoss'), align: 'center', formatter: ({ row }: any) => formatNumber(row.totalProfit || '0') }
-]);
-
-const tab2Api = async (params: any) => {
-  let res = await documentaryApi.followOrderRecordList(params);
-  if (res.code === 200 || res.code === 0 || res.code === 10000) {
-    combined.value = res.sum || {};
+
+  // --- Tab 3 ---
+  const table3Ref = ref(null)
+  const tableSumData = ref<any>({})
+  const tab3SearchParams = ref({
+    platform: 'MT4',
+    date: [],
+  })
+  const tab3FilterFields = computed(() => [
+    {
+      key: 'platform', type: 'select', label: t('Label.Platform'), options: [
+        { value: 'MT4', text: 'MT4' },
+        { value: 'MT5', text: 'MT5' },
+      ],
+    },
+    { key: 'date', type: 'daterange', label: t('placeholder.choose') },
+  ])
+  const tab3QueryParams = computed(() => {
+    return { ...tab3SearchParams.value, login: myLogin.value }
+  })
+  const tab3Columns = computed(() => [
+    { prop: 'followLogin', label: t('Documentary.tradingCenter.item102'), align: 'center' },
+    { prop: 'platform', label: t('Label.Platform'), align: 'center' },
+    { prop: 'startTime', label: t('Documentary.tradingCenter.item103'), align: 'center' },
+    { prop: 'endTime', label: t('Documentary.tradingCenter.item104'), align: 'center' },
+    {
+      prop: 'profit',
+      label: t('Documentary.tradingCenter.item105'),
+      align: 'center',
+      formatter: ({ row }: any) => formatNumber(row.profit || '0'),
+    },
+    {
+      prop: 'volume',
+      label: t('Documentary.tradingCenter.item99'),
+      align: 'center',
+      formatter: ({ row }: any) => formatNumber(row.volume || '0'),
+    },
+  ])
+
+  const tab3Api = async (params: any) => {
+    let res = await documentaryApi.followDealSubscribeSummary(params)
+    if (res.code === 200 || res.code === 0 || res.code === 10000) {
+      tableSumData.value = res.sum || {}
+    }
+    return res
   }
-  return res;
-};
-
-const getSummaries1 = ({ columns }: any) => {
-  let sums = Array(columns.length).fill('');
-  if (Object.keys(combined.value).length > 0) {
-    sums[0] = t('Label.Total');
-    const volIdx = columns.findIndex((c: any) => c.prop === 'volume');
-    const proIdx = columns.findIndex((c: any) => c.prop === 'profit');
-    const totIdx = columns.findIndex((c: any) => c.prop === 'totalProfit');
-    if (volIdx > -1) sums[volIdx] = combined.value.volume ? formatNumber(combined.value.volume) : 0;
-    if (proIdx > -1) sums[proIdx] = combined.value.profit ? formatNumber(combined.value.profit) : 0;
-    if (totIdx > -1) sums[totIdx] = combined.value.totalProfit ? formatNumber(combined.value.totalProfit) : 0;
+
+  const handleTab3Search = (params: any) => {
+    tab3SearchParams.value = params
+    nextTick(() => {
+      table3Ref.value?.refreshTable()
+    })
   }
-  return sums;
-};
-
-const handleTab2Search = (params: any) => {
-  tab2SearchParams.value = params;
-  nextTick(() => { table2Ref.value?.refreshTable(); });
-};
-const handleTab2Reset = (params: any) => {
-  tab2SearchParams.value = params;
-  nextTick(() => { table2Ref.value?.refreshTable(); });
-};
-
-// --- Tab 3 ---
-const table3Ref = ref(null);
-const tableSumData = ref<any>({});
-const tab3SearchParams = ref({
-  platform: 'MT4',
-  date: []
-});
-const tab3FilterFields = computed(() => [
-  {
-    key: 'platform', type: 'select', label: t('Label.Platform'), options: [
-      { value: 'MT4', text: 'MT4' },
-      { value: 'MT5', text: 'MT5' }
-    ]
-  },
-  { key: 'date', type: 'daterange', label: t('placeholder.choose') }
-]);
-const tab3QueryParams = computed(() => {
-  return { ...tab3SearchParams.value, login: myLogin.value };
-});
-const tab3Columns = computed(() => [
-  { prop: 'followLogin', label: t('Documentary.tradingCenter.item102'), align: 'center' },
-  { prop: 'platform', label: t('Label.Platform'), align: 'center' },
-  { prop: 'startTime', label: t('Documentary.tradingCenter.item103'), align: 'center' },
-  { prop: 'endTime', label: t('Documentary.tradingCenter.item104'), align: 'center' },
-  { prop: 'profit', label: t('Documentary.tradingCenter.item105'), align: 'center', formatter: ({ row }: any) => formatNumber(row.profit || '0') },
-  { prop: 'volume', label: t('Documentary.tradingCenter.item99'), align: 'center', formatter: ({ row }: any) => formatNumber(row.volume || '0') }
-]);
-
-const tab3Api = async (params: any) => {
-  let res = await documentaryApi.followDealSubscribeSummary(params);
-  if (res.code === 200 || res.code === 0 || res.code === 10000) {
-    tableSumData.value = res.sum || {};
+  const handleTab3Reset = (params: any) => {
+    tab3SearchParams.value = params
+    nextTick(() => {
+      table3Ref.value?.refreshTable()
+    })
   }
-  return res;
-};
-
-const handleTab3Search = (params: any) => {
-  tab3SearchParams.value = params;
-  nextTick(() => { table3Ref.value?.refreshTable(); });
-};
-const handleTab3Reset = (params: any) => {
-  tab3SearchParams.value = params;
-  nextTick(() => { table3Ref.value?.refreshTable(); });
-};
 
 </script>
 
 <style scoped lang="scss">
-@import "@/uni.scss";
-
-.time-header {
-  display: flex;
-  align-items: center;
-  font-size: 14px;
-  font-weight: 500;
-  color: var(--bs-heading-color);
+  @import "@/uni.scss";
 
-  .time-value {
-    margin-left: 6px;
+  .time-header {
+    display: flex;
+    align-items: center;
+    font-size: 14px;
+    font-weight: 500;
     color: var(--bs-heading-color);
+
+    .time-value {
+      margin-left: 6px;
+      color: var(--bs-heading-color);
+    }
+  }
+
+  .info-card {
+    padding: 16px;
+    background: var(--bs-body-bg);
+    border-radius: 8px;
+  }
+
+  .tab-content {
+    margin-top: 16px;
+  }
+
+  .section-row {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 20px;
+    margin-bottom: 20px;
+  }
+
+  .section-col {
+    flex: 1;
+    min-width: 300px;
+    border: 1px solid #f0f0f0;
+    border-radius: 8px;
+    padding: 16px;
+    box-sizing: border-box;
   }
-}
-
-.info-card {
-  padding: 16px;
-  background: #fff;
-  border-radius: 8px;
-}
-
-.tab-content {
-  margin-top: 16px;
-}
-
-.section-row {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 20px;
-  margin-bottom: 20px;
-}
-
-.section-col {
-  flex: 1;
-  min-width: 300px;
-  border: 1px solid #f0f0f0;
-  border-radius: 8px;
-  padding: 16px;
-  box-sizing: border-box;
-}
-
-.fllow-title {
-  display: flex;
-  justify-content: space-between;
-  border-bottom: 1px solid #eee;
-  padding-bottom: 10px;
-  margin-bottom: 10px;
-
-  .title {
+
+  .fllow-title {
+    display: flex;
+    justify-content: space-between;
+    border-bottom: 1px solid #eee;
+    padding-bottom: 10px;
+    margin-bottom: 10px;
+
+    .title {
+      font-weight: bold;
+      color: var(--bs-heading-color);
+      padding-left: 8px;
+      border-left: 4px solid #eb3f57;
+      font-size: 16px;
+    }
+  }
+
+  .fllow-info-list {
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+  }
+
+  .fllow-info-grid {
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+    gap: 8px 20px;
+  }
+
+  .chart-container {
+    width: 100%;
+    height: 250px;
+  }
+
+  .sp-div-tab {
+    border-bottom: 1px dashed #eee;
+    padding-bottom: 4px;
+    margin-bottom: 4px;
+  }
+
+  .sp-div-tab-b {
+    padding-top: 4px;
+  }
+
+  .summary-top {
+    display: flex;
+    gap: 20px;
+    margin-bottom: 16px;
+    font-size: 14px;
     font-weight: bold;
-    color: var(--bs-heading-color);
-    padding-left: 8px;
-    border-left: 4px solid #eb3f57;
-    font-size: 16px;
+    color: #4497ff;
   }
-}
-
-.fllow-info-list {
-  display: flex;
-  flex-direction: column;
-  gap: 8px;
-}
-
-.fllow-info-grid {
-  display: grid;
-  grid-template-columns: 1fr 1fr;
-  gap: 8px 20px;
-}
-
-.chart-container {
-  width: 100%;
-  height: 250px;
-}
-
-.sp-div-tab {
-  border-bottom: 1px dashed #eee;
-  padding-bottom: 4px;
-  margin-bottom: 4px;
-}
-
-.sp-div-tab-b {
-  padding-top: 4px;
-}
-
-.summary-top {
-  display: flex;
-  gap: 20px;
-  margin-bottom: 16px;
-  font-size: 14px;
-  font-weight: bold;
-  color: #4497ff;
-}
 </style>

pages/ib/components/applyIbDialog.vue

@@ -20,7 +20,7 @@
               <th>ENERGY</th>
               <th>CFD</th>
               <th>INDEX</th>
-              <th>Crypto</th>
+              <th>CRYPTO</th>
             </tr>
             </thead>
             <tbody v-for="(group, gIndex) in commissionTemplateTableData" :key="gIndex">

pages/login/reset.vue

@@ -1,19 +1,20 @@
 <template>
-  <cwg-page-wrapper :isLoginPage="true">
+  <cwg-page-wrapper :isLoginPage="true" >
     <view class="main-content">
 
       <view class="global-header-bar pc-header">
         <view class="header-inner">
           <view class="logo-placeholder"></view> <!-- 左侧可预留放logo或留空 -->
           <!-- 这里由于没有深色背景，传递深色文字颜色 -->
-          <LoginHeaderGroup text-color="#141d22" icon-color="#141d22" />
+          <LoginHeaderGroup text-color="#fff" :icon-color="isDark ? '#fff' : '#97A1C0' " />
         </view>
       </view>
 
 
       <view class="reset-container">
         <view class="company u-flex-y u-flex-y-center">
-          <image src="/static/images/logo-full.svg" class="company-icon" mode="widthFix"></image>
+          <image v-if="!isDark" src="/static/images/vu/logo-full.svg" class="company-icon" mode="widthFix"></image>
+          <image v-else src="/static/images/vu/logo-full-white.svg" class="company-icon" mode="widthFix"></image>
         </view>
         <uni-row class="content">
           <uni-col :span="20" :offset="2" :sm="{ span: 14, offset: 5 }">
@@ -24,7 +25,7 @@
               </uni-easyinput>
 
               <view class="reset-button">
-                <button class="btn" block :loading="loading" @click="handleReset">{{ t('forget.forget') }}</button>
+                <button class="btn btn-danger" @click="handleReset">{{ t('forget.forget') }}</button>
               </view>
               <view class="login-link">
                 <button @click="handleLogin" class="link-text">{{ t('forget.cancel') }}</button>
@@ -49,13 +50,17 @@ import { userApi } from '@/api/user'
 import config from '@/config'
 import LoginHeaderGroup from './components/LoginHeaderGroup.vue'
 import { useWindowWidth } from '@/composables/useWindowWidth'
+import LiveChatService from '@/utils/liveChat.js'
+import useGlobalStore from '@/stores/use-global-store'
 const windowWidth = useWindowWidth(300)
 const isMobile = computed(() => windowWidth.value <= 991)
 const { t } = useI18n()
 const router = useRouter()
 const loading = ref(false)
 const email = ref('')
-import LiveChatService from '@/utils/liveChat.js'
+
+const globalStore = useGlobalStore()
+const isDark = computed(() => globalStore.theme === 'dark')
 
 async function handleReset() {
   if (!email.value) {
@@ -240,8 +245,11 @@ function handleLogin() {
     height: px2rpx(44);
     line-height: px2rpx(44);
     border-radius: px2rpx(22);
-    background-color: var(--color-error);
+    background-color: var(--bs-btn-bg);
     border: none;
+    display: flex;
+    align-items: center;
+    justify-content: center;
     color: var(--bs-emphasis-color);
     font-size: px2rpx(16);
     font-weight: 500;
@@ -252,9 +260,6 @@ function handleLogin() {
     }
   }
 
-  :deep(u-button--loading) {
-    opacity: 0.8;
-  }
 }
 
 .login-link {
@@ -265,7 +270,7 @@ function handleLogin() {
     height: px2rpx(44);
     line-height: px2rpx(44);
     border-radius: px2rpx(22);
-    background-color: var(--color-white);
+    background-color: transparent;
     border: 1px solid #e4e4e4;
     color: var(--bs-heading-color);
     font-size: px2rpx(16);

static/scss/global/global.scss

@@ -1281,7 +1281,7 @@ uni-content.collapsed {
 .s-btn {
     &.reselect {
         background-color: var(--color-zinc-100);
-        color: var(--color-navy-700);
+        color: #fff;
         border: none;
         font-size: px2rpx(14);
         padding: px2rpx(8) px2rpx(20);
@@ -1332,7 +1332,7 @@ uni-content.collapsed {
     .s-btn {
         width: px2rpx(224);
         background-color: var(--color-error);
-        color: var(--color-white);
+        color: #fff;
         padding: px2rpx(10) px2rpx(20);
         border: none;
         font-size: px2rpx(15);