1

components/cwg-custom-footer.vue

@@ -57,6 +57,7 @@ const linkList = [
             .desc-text {
                 margin-bottom: px2rpx(8);
                 line-height: px2rpx(20);
+                color: var(--bs-emphasis-color);
             }
 
             .desc-link {

components/cwg-footer-link.vue

@@ -47,6 +47,7 @@ const linkList = [
         justify-content: space-between;
         box-sizing: border-box;
         padding: 0;
+        color: var(--bs-emphasis-color);
 
         @media screen and (max-width: 1504px) {
             padding: 0 px2rpx(16);

components/cwg-icon.vue

@@ -1,9 +1,12 @@
 <template>
-
-	<SvgIcon :color="color" :icon="props.name || props.icon" class="icon" :height="size" :width="size" />
+	<SvgIcon :color="isDark ? darkColor : color" :icon="props.name || props.icon" class="icon" :height="size" :width="size" />
 </template>
 
 <script setup>
+import { computed } from 'vue'
+import useGlobalStore from '@/stores/use-global-store'
+const globalStore = useGlobalStore()
+const isDark = computed(() => globalStore.theme === 'dark')
 import SvgIcon from "@/uni_modules/cwg-svg-icon/components/cwg-svg-icon/cwg-svg-icon.vue";
 import {
 	ref,
@@ -27,6 +30,10 @@ const props = defineProps({
 		type: String,
 		default: ""
 	},
+	darkColor: {
+		type: String,
+		default: "#fff"
+	}
 });
 
 </script>

components/cwg-notice-drawer.vue

@@ -140,7 +140,7 @@ defineExpose({
     align-items: center;
     justify-content: center;
     gap: 8px;
-    color: #ff9800;
+    color: #fff;
     font-weight: 600;
     cursor: pointer;
 }

components/cwg-notice.vue

@@ -22,7 +22,7 @@
                     </view>
 
                     <view class="logout-wrap">
-                        <view class="logout-btn" @click="goMore">
+                        <view class="logout-btn btn btn-primary" @click="goMore">
                             <cwg-icon name="crm-mb" :size="16" color="#ff9800" />
                             <text v-t="'News.More'" />
                         </view>
@@ -204,13 +204,14 @@ onUnmounted(() => {
 
     .logout-btn {
         height: 44px;
-        background: #f4eadf;
+        background-color: var(--bs-btn-bg);
         display: flex;
         align-items: center;
         justify-content: center;
         gap: 8px;
-        color: #ff9800;
+        color: #fff;
         font-weight: 600;
+        font-size: 16px;
         cursor: pointer;
     }
 }

components/cwg-payment.vue

@@ -444,7 +444,7 @@ onUnmounted(() => {
     align-items: center;
     justify-content: center;
     gap: 8px;
-    color: #ff9800;
+    color: #fff;
     font-weight: 600;
     cursor: pointer;
   }

components/cwg-right-drawer.vue

@@ -10,7 +10,8 @@
                         <image class="avatar" src="/static/images/avatars.png" mode="aspectFill" />
                         <view class="user-info">
                             <text class="name">{{ _displayName }}</text>
-                            <text class="cid">CID: <text class="cwg-cursor" @click="copy(_displayCid)">{{ _displayCid }}</text></text>
+                            <text class="cid">CID: <text class="cwg-cursor" @click="copy(_displayCid)">{{ _displayCid
+                                    }}</text></text>
                         </view>
                     </view>
                     <view class="menu-list">
@@ -21,7 +22,7 @@
                         </view>
                     </view>
                     <view class="logout-wrap">
-                        <view class="logout-btn" @click="handleLogout">
+                        <view class="logout-btn btn btn-danger" @click="handleLogout">
                             <cwg-icon name="logout" :size="16" color="#ff9800" />
                             <text v-t="'language.i6'"></text>
                         </view>
@@ -232,13 +233,14 @@ defineExpose({ openNotice, close })
 
     .logout-btn {
         height: 44px;
-        background: #f4eadf;
+        background-color: var(--bs-btn-bg);
         display: flex;
         align-items: center;
         justify-content: center;
         gap: 8px;
-        color: #ff9800;
+        color: #fff;
         font-weight: 600;
+        font-size: 16px;
         cursor: pointer;
     }
 }

components/cwg-tabs.vue

@@ -48,11 +48,12 @@ const handleTabClick = (index: number) => {
         border-radius: px2rpx(2);
         background-color: var(--bs-bg-color);
         justify-content: center;
+        color: var(--bs-emphasis-color);
     }
 
     .active {
         background-color: var(--color-error);
-        color: var(--bs-emphasis-color);
+        color: #fff;
         border: 1px solid var(--bs-bg-color);
     }
 }

pages/customer/components/AccountList.vue

@@ -348,7 +348,7 @@ onMounted(async () => {
     align-items: center;
     font-size: px2rpx(22);
     font-weight: 500;
-    color: var(--bs-emphasis-color);
+    color: #fff;
     background-color: rgba(255, 255, 255, 0);
 
     .content-title-btns {
@@ -361,7 +361,7 @@ onMounted(async () => {
         .btn-primary {
             min-width: px2rpx(120);
             background-color: var(--color-error);
-            color: var(--bs-emphasis-color);
+            color: #fff;
             padding: 0 px2rpx(12);
             border: none;
             font-size: px2rpx(14);

pages/customer/components/AmountWallet.vue

@@ -126,7 +126,7 @@ getPendingWithdrawAmount()
             .btn-primary {
                 min-width: px2rpx(120);
                 background-color: var(--color-error);
-                color: var(--color-slate-150);
+                color: #fff;
                 padding: 0 px2rpx(12);
                 border: none;
                 font-size: px2rpx(14);

pages/follow/account-management.vue

@@ -274,7 +274,7 @@ onMounted(() => {
         .btn-primary {
             min-width: px2rpx(120);
             background-color: var(--color-error);
-            color: var(--bs-emphasis-color);
+            color: #fff;
             padding: 0 px2rpx(12);
             border: none;
             font-size: px2rpx(14);

pages/follow/follow-list.vue

@@ -350,7 +350,7 @@ onMounted(() => {
         .btn-primary {
             min-width: px2rpx(120);
             background-color: var(--color-error);
-            color: var(--bs-emphasis-color);
+            color: #fff;
             padding: 0 px2rpx(12);
             border: none;
             font-size: px2rpx(14);

pages/follow/subscribe-list.vue

@@ -60,7 +60,7 @@
                             <view class="delete-item">
                                 <text class="delete-label">{{ t('Documentary.tradingCenter.item29') }}</text>
                                 <text class="delete-value">{{ numberDesensitization(dialogSubscribeDataCancel.dealLogin)
-                                }}</text>
+                                    }}</text>
                             </view>
                             <view class="delete-item">
                                 <text class="delete-label">{{ t('Documentary.console.item3') }}</text>
@@ -71,7 +71,7 @@
                             <view class="delete-item">
                                 <text class="delete-label">{{ t('Documentary.console.item7') }}</text>
                                 <text class="delete-value">{{ numberFormat(dialogSubscribeDataCancel.dealBalance || 0)
-                                }}</text>
+                                    }}</text>
                             </view>
                             <view class="delete-item">
                                 <text class="delete-label">{{ t('Label.AccountType') }}</text>
@@ -83,7 +83,7 @@
                             <view class="delete-item">
                                 <text class="delete-label">{{ t('Documentary.console.item6') }}</text>
                                 <text class="delete-value">{{ numberFormat(dialogSubscribeDataCancel.dealEquity || 0)
-                                }}</text>
+                                    }}</text>
                             </view>
                             <view class="delete-item">
                                 <text class="delete-label">{{ t('Documentary.tradingCenter.item30') }}</text>
@@ -98,12 +98,12 @@
                             <view class="delete-item">
                                 <text class="delete-label">{{ t('Label.Credit') }}</text>
                                 <text class="delete-value">{{ numberFormat(dialogSubscribeDataCancel.dealCredit || 0)
-                                }}</text>
+                                    }}</text>
                             </view>
                             <view class="delete-item">
                                 <text class="delete-label">{{ t('Documentary.tradingCenter.item31') }}</text>
                                 <text class="delete-value">{{ dialogSubscribeDataCancel.distributionRatio || '0'
-                                }}%</text>
+                                    }}%</text>
                             </view>
                         </view>
                         <view class="delete-row">
@@ -114,7 +114,7 @@
                             <view class="delete-item">
                                 <text class="delete-label">{{ t('Documentary.tradingCenter.item32') }}</text>
                                 <text class="delete-value">{{ dialogSubscribeDataCancel.settlementCycle || '--'
-                                }}</text>
+                                    }}</text>
                             </view>
                         </view>
                     </view>
@@ -132,7 +132,7 @@
                             <view class="delete-item">
                                 <text class="delete-label">{{ t('Label.Leverage') }}</text>
                                 <text class="delete-value">1:{{ dialogSubscribeDataCancel.followLeverage || '--'
-                                }}</text>
+                                    }}</text>
                             </view>
                         </view>
                         <view class="delete-row">
@@ -171,12 +171,12 @@
                             <view class="delete-item" v-if="dialogSubscribeDataCancel.protectType == 1">
                                 <text class="delete-label">{{ t('Documentary.tradingCenter.item39') }}</text>
                                 <text class="delete-value">{{ dialogSubscribeDataCancel.protectAmount || '--'
-                                }}($)</text>
+                                    }}($)</text>
                             </view>
                             <view class="delete-item" v-if="dialogSubscribeDataCancel.protectType == 2">
                                 <text class="delete-label">{{ t('Documentary.tradingCenter.item122') }}</text>
                                 <text class="delete-value">{{ dialogSubscribeDataCancel.protectRatio || '--'
-                                }}(%)</text>
+                                    }}(%)</text>
                             </view>
                         </view>
                     </view>
@@ -207,7 +207,7 @@
             <template #footer>
                 <button @click="ToUnSubscribeCancel">{{ t('Btn.Cancel') }}</button>
                 <button type="primary" @click="dialogSubscribeCancelTipOpen" :disabled="flag">{{ t('Btn.Confirm')
-                }}</button>
+                    }}</button>
             </template>
         </cwg-popup>
 
@@ -226,7 +226,7 @@
                             <view class="delete-item">
                                 <text class="delete-label">{{ t('Documentary.tradingCenter.item29') }}</text>
                                 <text class="delete-value">{{ numberDesensitization(dialogSubscribeFllowData.dealLogin)
-                                }}</text>
+                                    }}</text>
                             </view>
                             <view class="delete-item">
                                 <text class="delete-label">{{ t('Documentary.console.item3') }}</text>
@@ -237,19 +237,19 @@
                             <view class="delete-item">
                                 <text class="delete-label">{{ t('Documentary.console.item7') }}</text>
                                 <text class="delete-value">{{ numberFormat(dialogSubscribeFllowData.dealBalance)
-                                }}</text>
+                                    }}</text>
                             </view>
                             <view class="delete-item">
                                 <text class="delete-label">{{ t('Label.AccountType') }}</text>
                                 <text class="delete-value">{{ accountTypeName(dialogSubscribeFllowData.dealLoginType)
-                                }}</text>
+                                    }}</text>
                             </view>
                         </view>
                         <view class="delete-row">
                             <view class="delete-item">
                                 <text class="delete-label">{{ t('Documentary.console.item6') }}</text>
                                 <text class="delete-value">{{ numberFormat(dialogSubscribeFllowData.dealEquity)
-                                }}</text>
+                                    }}</text>
                             </view>
                             <view class="delete-item">
                                 <text class="delete-label">{{ t('Documentary.tradingCenter.item30') }}</text>
@@ -264,12 +264,12 @@
                             <view class="delete-item">
                                 <text class="delete-label">{{ t('Label.Credit') }}</text>
                                 <text class="delete-value">{{ numberFormat(dialogSubscribeFllowData.dealCredit)
-                                }}</text>
+                                    }}</text>
                             </view>
                             <view class="delete-item">
                                 <text class="delete-label">{{ t('Documentary.tradingCenter.item31') }}</text>
                                 <text class="delete-value">{{ dialogSubscribeFllowData.distributionRatio || '0'
-                                }}%</text>
+                                    }}%</text>
                             </view>
                         </view>
                         <view class="delete-row">
@@ -297,7 +297,7 @@
                             <view class="delete-item">
                                 <text class="delete-label">{{ t('Label.Leverage') }}</text>
                                 <text class="delete-value">1:{{ dialogSubscribeFllowData.followLeverage || '--'
-                                }}</text>
+                                    }}</text>
                             </view>
                         </view>
                     </view>
@@ -951,7 +951,7 @@ onMounted(() => {
         .btn-primary {
             min-width: px2rpx(120);
             background-color: var(--color-error);
-            color: var(--bs-emphasis-color);
+            color: #fff;
             padding: 0 px2rpx(12);
             border: none;
             font-size: px2rpx(14);

pages/follow/trading-management.vue

@@ -1216,7 +1216,7 @@ onMounted(() => {
         .btn-primary {
             min-width: px2rpx(120);
             background-color: var(--color-error);
-            color: var(--bs-emphasis-color);
+            color: #fff;
             padding: 0 px2rpx(12);
             border: none;
             font-size: px2rpx(14);