zhb преди 1 месец
родител
ревизия
cd5fce5fda

+ 4 - 1
components/cwg-header.vue

@@ -2,7 +2,7 @@
   <view class="pages-header" v-if="showBack">
     <view class="header">
       <view v-if="showBackIcon" class="back">
-        <cwg-icon name="dropdown" class="back-icon" color="#fff" @click="handleBack" />
+        <cwg-icon name="dropdown" class="back-icon" :color="isDark ? '#fff' : '#000000'" @click="handleBack" />
       </view>
       <view>{{ headerTitleReady ? headerTitle : '' }}</view>
     </view>
@@ -20,6 +20,9 @@ import { useI18n } from 'vue-i18n'
 const { t } = useI18n()
 const router = useRouter()
 const route = useRoute()
+import useGlobalStore from '@/stores/use-global-store'
+const globalStore = useGlobalStore()
+const isDark = computed(() => globalStore.theme === 'dark')
 const showBack = computed(() => {
   // 不显示返回按钮的页面
   const noBackPages = [

+ 6 - 6
pages/customer/account-select.vue

@@ -21,10 +21,10 @@
                         <view class="account-row" v-if="account.showCondition()" @click="onAccountSelect(account.id)"
                             :class="{ 'active': account.id == selectedAccountId }">
                             <view class="row-cell type-cell">
-                                <radio-group @change="(e) => onAccountSelect(account.id)" class="radio-group">
+                                <radio-group @change="(e) => onAccountSelect(account.id)" class="radio-group" >
                                     <label class="radio-label">
                                         <radio :value="account.id" :checked="selectedAccountId === account.id"
-                                            color="#1e2a3a" />
+                                            color="#cf1322" />
                                         <image class="account-icon" :src="account.icon" mode="aspectFit" />
                                         <view class="account-info">
                                             <text class="account-name" v-t="account.name" />
@@ -307,7 +307,7 @@ onMounted(() => {
         text-align: center;
         padding: 0 px2rpx(8);
         font-size: px2rpx(12);
-        color: #1e2a3a;
+        color: var(--bs-emphasis-color);
         white-space: normal;
         word-break: break-word;
     }
@@ -353,7 +353,7 @@ radio {
     .account-name {
         font-size: px2rpx(14);
         font-weight: 500;
-        color: #1e2a3a;
+        color: var(--bs-emphasis-color);
         margin-bottom: px2rpx(4);
     }
 
@@ -423,7 +423,7 @@ radio {
         .card-title {
             font-size: px2rpx(24);
             font-weight: 700;
-            color: #1e2a3a;
+            color: var(--bs-emphasis-color);
             margin-bottom: px2rpx(8);
         }
 
@@ -475,7 +475,7 @@ radio {
                 }
 
                 .value {
-                    color: #1e2a3a;
+                    color: var(--bs-emphasis-color);
                     font-weight: 500;
                     order: 3;
                 }

+ 1 - 1
pages/customer/components/AccountCardDesktop.vue

@@ -395,7 +395,7 @@ onBeforeUnmount(() => {
             color: rgba(var(--bs-dark-rgb), var(--bs-text-opacity)) !important;
 
             &:hover {
-                color: #1e2a3a;
+                color: var(--bs-emphasis-color);
             }
         }
 

+ 1 - 1
pages/customer/components/AccountCardMobile.vue

@@ -306,7 +306,7 @@ onBeforeUnmount(() => {
             color: var(--bs-emphasis-color);
 
             &:hover {
-                color: #1e2a3a;
+                color: var(--bs-emphasis-color);
             }
         }
 

+ 1 - 1
pages/customer/components/CheckPopup.vue

@@ -93,7 +93,7 @@ const CopyShareLink = (link) => {
   .des1 {
     font-size: 20px;
     font-weight: bold;
-    color: #1e2a3a;
+    color: var(--bs-emphasis-color);
     margin: 0 0 20px 0;
     line-height: 1.4;
   }

+ 1 - 1
pages/customer/components/TerminalChangePasswordDialog.vue

@@ -180,7 +180,7 @@ watch(() => props.visible, (newVal) => {
     .notice-item {
         text-align: left;
         font-size: px2rpx(14);
-        color: var(--color-yellow-800);
+        color: var(--bs-emphasis-color);
         line-height: px2rpx(24);
     }
 

+ 5 - 5
pages/customer/create-account.vue

@@ -518,7 +518,7 @@ watch(() => formData.platform, (newVal) => {
         formData.leverage = ''
         formData.balance = ''
         formData.password = ''
-        
+
         checkPlatform(newVal === 'MT4' ? 'mt4s' : 'mt5s');
     }
 });
@@ -743,7 +743,7 @@ onMounted(() => {
 
     .notice-item {
         font-size: px2rpx(14);
-        color: var(--color-yellow-800);
+        color: var(--bs-emphasis-color);
         line-height: px2rpx(24);
     }
 
@@ -806,7 +806,7 @@ onMounted(() => {
         display: block;
         font-size: px2rpx(18);
         font-weight: 600;
-        color: #1e2a3a;
+        color: var(--bs-emphasis-color);
         padding-bottom: px2rpx(16);
         padding-left: px2rpx(20);
         border-left: 1px solid #f0f2f5;
@@ -826,14 +826,14 @@ onMounted(() => {
         .info-value {
             font-size: px2rpx(14);
             font-weight: 500;
-            color: #1e2a3a;
+            color: var(--bs-emphasis-color);
         }
 
         .link-item {
             line-height: px2rpx(20);
             font-size: px2rpx(12);
             letter-spacing: px2rpx(0.5);
-            color: #0066cc;
+            color: #cf1322;
             text-decoration: underline;
             cursor: pointer;
 

+ 6 - 4
pages/mine/components/SecurityCenterTab.vue

@@ -34,7 +34,8 @@
                             </view>
                         </uni-col>
                         <uni-col :xs="24">
-                            <view class="btn btn-confirm" @click="passwordUpdate">{{ locale == 'es' ? 'Actualizarcontraseña' : t('Btn.Application') }}</view>
+                            <view class="btn btn-confirm" @click="passwordUpdate">{{ locale == 'es' ?
+                                'Actualizarcontraseña' : t('Btn.Application') }}</view>
                         </uni-col>
                     </uni-row>
                 </uni-forms>
@@ -68,7 +69,8 @@
                             </view>
                         </uni-col>
                         <uni-col :xs="24">
-                            <view class="btn btn-confirm" @click="emailUpdate">{{ locale == 'es' ? 'Actualizarcontraseña' : t('Btn.Application') }}</view>
+                            <view class="btn btn-confirm" @click="emailUpdate">{{ locale == 'es' ?
+                                'Actualizarcontraseña' : t('Btn.Application') }}</view>
                         </uni-col>
                     </uni-row>
                 </uni-forms>
@@ -121,7 +123,7 @@ const rule3 = computed(() => {
     );
 });
 const rule4 = computed(() => {
-    console.log( /^(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.*[~!@&%$^*./\\(\\)\\+\\=#_-])[A-Za-z0-9~!@&%$^*./\\(\\)\\+\\=#_-]{8,16}$/.test(passwordInfo.value.newPassword))
+    console.log(/^(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.*[~!@&%$^*./\\(\\)\\+\\=#_-])[A-Za-z0-9~!@&%$^*./\\(\\)\\+\\=#_-]{8,16}$/.test(passwordInfo.value.newPassword))
     return /^(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.*[~!@&%$^*./\\(\\)\\+\\=#_-])[A-Za-z0-9~!@&%$^*./\\(\\)\\+\\=#_-]{8,16}$/.test(
         passwordInfo.value.newPassword
     );
@@ -260,7 +262,7 @@ onMounted(() => {
 
     .notice-item {
         font-size: px2rpx(14);
-        color: var(--color-yellow-800);
+        color: var(--bs-emphasis-color);
         line-height: px2rpx(24);
     }
 

+ 1 - 0
uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue

@@ -734,6 +734,7 @@ $uni-info: #909399 !default;
 	font-size: 14px;
 	/* border-bottom: solid 1px $uni-border-3; */
 	padding: 0px 10px;
+	color: var(--bs-heading-color);
 }
 
 .uni-select__selector-item--actived {